Revision bump: EAPI 5, epatch_user, fix underlinking wrt bug #463684, enable verbose ebuild, respect compiler. Drop old revision

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

5 files changed, 74 insertions, 37 deletions

diff --git a/app-admin/fsvs/ChangeLog b/app-admin/fsvs/ChangeLog
index 06b9a5c7ca44..70a98871cf20 100644
--- a/app-admin/fsvs/ChangeLog
+++ b/app-admin/fsvs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/fsvs
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fsvs/ChangeLog,v 1.8 2012/11/01 17:08:14 pinkbyte Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fsvs/ChangeLog,v 1.9 2013/08/19 09:57:46 pinkbyte Exp $
+
+*fsvs-1.2.5-r1 (19 Aug 2013)
+
+  19 Aug 2013; Sergey Popov <pinkbyte@gentoo.org>
+  -files/fsvs-1.2.4-as-needed.patch, -fsvs-1.2.5.ebuild, +fsvs-1.2.5-r1.ebuild,
+  +files/fsvs-1.2.5-as-needed.patch:
+  Revision bump: EAPI 5, epatch_user, fix underlinking wrt bug #463684, enable
+  verbose ebuild, respect compiler. Drop old revision
 
   01 Nov 2012; Sergey Popov <pinkbyte@gentoo.org> -fsvs-1.2.4.ebuild:
   Drop old
diff --git a/app-admin/fsvs/Manifest b/app-admin/fsvs/Manifest
index a6a0ac3791f1..ef7d11cae3b8 100644
--- a/app-admin/fsvs/Manifest
+++ b/app-admin/fsvs/Manifest
@@ -1,5 +1,19 @@
-AUX fsvs-1.2.4-as-needed.patch 746 SHA256 3a11f8dce8782a029507c093a7bd488478476cf746329f30eec664068ea4b08a SHA512 e44b6993fd04d048da060efc009a30de502dcd0f675d186228b76241c6654d55b83c9539b8c369d6a22a0742ad989307cb0ac7b1d0e5470492d33a76f221e206 WHIRLPOOL b36d9777f0ae3337839758a35664eca07613ed0c1ca1e33830233cd3d1095235ee8bda07d2726db18b72e860f14bd37d96e75b45612f4c8129566ab387974b9a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX fsvs-1.2.5-as-needed.patch 1103 SHA256 5e318d49c522846c2a0deb7657d2a37e59d49caee89a02d9cbd6e220887f6ca0 SHA512 88fd50841504b3661e2505e4627a8c4fd938d6bca708fdaf568cf09fefc3f2e50062e292b582d9d58dca86af71ecf583bc9d25425acaef2c8506530408b9d126 WHIRLPOOL 72e6e947f806476dc3feb554207a9f76f4cec0de97dacd0af4f3dc2dd27898dc90b3edbefc70965c831cb39e180e55a9af2d4c5aaf17bd514b698707bccc87bf
 DIST fsvs-1.2.5.tar.bz2 427494 SHA256 3c957d29e0e568d46ce2fd659a88ed6ea93a05267bdc11dc93131a88b7cb44d2 SHA512 36ab5d04491d506b2891548f3ad458e7977bbd2e7d4b03e135b13d07adb22aedb261c28d5ddd3df895771806ef54c1bca6a1ef7bc5aa2e50e4b234ddf6cbe19c WHIRLPOOL c44213b5f2ce42ad67914fe07198a4f8404b9303d59806e521059d1f5b6335ef6ba3b84862bb9b890b8a29ef2b4543f2e897ef341c16ccb96e6e7a6d1ac8dd66
-EBUILD fsvs-1.2.5.ebuild 1409 SHA256 b5db7d867d80f11fea51b8cd6415f42eddb52766944a3e0dc2a36eb9e6d2b0a0 SHA512 bfaaf264be24dfb8a668e467490f454179c487367a757d2b46bf84837e763960e09c25b825f0ab05a33786dc6c81a1030a5fe805c02e614126600e72f5d27cf2 WHIRLPOOL b0bb30831f6723299e15c7b2724d25759c3075f20a0be4f17c6f940fe3867d348ce7804682f0f59a1677ed8e1bdc0fe19b7a2d76198f1a3d45a391f096719998
-MISC ChangeLog 1411 SHA256 a97f76d2cd63f6a7c6638e48179313c9a913ce131f443c618acb1ea860abf6fd SHA512 f5e580dad6abf2d0de8504ff138acc48f6e8a058eb35c417f8d792547836fa0a852b65702879ce50c9b9327cf30b42446a11f5d5dfd23cb4952f9241493a6102 WHIRLPOOL 596a8459c3413ce3a02683810bd14408c60a6f378e78b1d5ebe943e56e7a9177c67a467f906998ba22f81f221ddd9284ab4e50194687689b4f2d77104a892f2f
+EBUILD fsvs-1.2.5-r1.ebuild 1444 SHA256 195e51c13b358ae24034cf382cc12d80b3538baf85861ccc08290dfc27eb0a55 SHA512 36434c61247d442f04c55da6f32a05419ca85460648b85444021f803c7998fe5276255d79c79f9694057b9a0d320a3535bcee0fa025ef1b7325dc80a984519a4 WHIRLPOOL 7594ef8d361296319e8c15a1ee254e9a3e825042dfe1cdce8bbb2ee4e769e4007a9c9c1afb4ac7e37b448a60d67b3047ab55a0c4765f572dbdbe26dd6080dae2
+MISC ChangeLog 1742 SHA256 0f77d5993ae17b7c7e9160e8ce7fc99c543afad8399a75c1a726d842a257996f SHA512 86d2422ddc3865b1d3a1f7b02d5184b143f0058e875aa16e17358a375977cfb6ef5f14083981bfec9b1d47a6dfeef137267b913eb8a143ec98c7d323160d9664 WHIRLPOOL 2350ddebe1c007d95ab55f4d64705483593f2347a155deb1c304a0b224102d257f44ee3e8c249108ef6fed847a6eab66e18718a3c1aeb2a703744a91d2c377d1
 MISC metadata.xml 212 SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757 SHA512 85ac7770baae8cc7c2c52dcd077a448cfb394ec6585e274ffa01c8f92a862d22c6ba0553b71cf2ae6b6f28f6faa5c3d615537f35f9fe0da9f43a2c9043953784 WHIRLPOOL 221b2f4e9b984954eb7268028287339e8678c794c7b4e40ab2baaa037c8e87bac30c8b64473efade9b3ee1ce226aab4ad36760147eee5af7cfd7c081473c839b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQEcBAEBCAAGBQJSEeu7AAoJECo/aRed92673MkIAIUOck3UmW0OAr8DvMmyxa/f
+mRYPWO/eImeIzBqHU3AViiwCoy0wABR4d62x0W5MLHaooVc8qjrbOlHy7CT59S10
+MY9IjZN1W9AOf7NItK7cZoX6KCHcKjiE5lXweeW0tyVfYAiA0G9MV0P3XH4tW0V9
+CsU2h9ftkd5d7zyjQLix7ybCY2RK3ZooovYTDYw6NyAHVz0z1hrJJSvc0EsuyAls
+/9sib5fM9MhYFEBa93SoLmN5486FSBfpfRVKHpb1XLjxNCvOSCIvHmBYw2S1rGP6
+UHsAGIFCLqRDYMjvGprIHUpN2DZLOSmoetsIdRfTZn3gkWZkbtxLXNt4wJnu22w=
+=OfFC
+-----END PGP SIGNATURE-----
diff --git a/app-admin/fsvs/files/fsvs-1.2.4-as-needed.patch b/app-admin/fsvs/files/fsvs-1.2.4-as-needed.patch
deleted file mode 100644
index 04a83d48ab7a..000000000000
--- a/app-admin/fsvs/files/fsvs-1.2.4-as-needed.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/Makefile.in	2011-11-11 19:19:12.000000000 +0100
-+++ src/Makefile.in.new	2012-01-24 02:57:15.523607932 +0100
-@@ -18,7 +18,7 @@
- CFLAGS	:= @CFLAGS@ @NEED_FNESTED_FUNCTIONS@
- CFLAGS	+= -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"'
- LDFLAGS	:= @LDFLAGS@
--FSVS_LDFLAGS = $(LDFLAGS) -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm 
-+FSVS_LIBS = -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm
- EXTRALIBS	:= @EXTRALIBS@
- WAA_CHARS?= @WAA_WC_MD5_CHARS@
- 
-@@ -152,7 +152,7 @@
- # change, too.
- $(DEST): $(C_FILES:%.c=%.o)
- 	@echo "     Link $@"
--	@$(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) $(EXTRALIBS) -o $@ $^
-+	@$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(LIBS) $(FSVS_LIBS) $(EXTRALIBS)
- ifeq (@ENABLE_RELEASE@, 1)
- 	-strip $@
- endif
diff --git a/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch b/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch
new file mode 100644
index 000000000000..6f833116f937
--- /dev/null
+++ b/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch
@@ -0,0 +1,31 @@
+Fixes --as-needed support(bug #294834)
+Verbose build
+Fixes underlinking(bug #463684) - patch went upstream
+
+--- src/Makefile.in.orig	2011-11-11 22:19:12.000000000 +0400
++++ src/Makefile.in	2013-08-19 13:30:16.186082295 +0400
+@@ -18,7 +18,7 @@
+ CFLAGS	:= @CFLAGS@ @NEED_FNESTED_FUNCTIONS@
+ CFLAGS	+= -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"'
+ LDFLAGS	:= @LDFLAGS@
+-FSVS_LDFLAGS = $(LDFLAGS) -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm 
++FSVS_LIBS = -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm -ldl
+ EXTRALIBS	:= @EXTRALIBS@
+ WAA_CHARS?= @WAA_WC_MD5_CHARS@
+ 
+@@ -146,13 +146,13 @@
+ ################################ Rules ######################################
+ %.o:	%.c
+ 	@echo "     CC $<"
+-	@$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ # if the Makefile has changed, the output will (at least sometimes)
+ # change, too.
+ $(DEST): $(C_FILES:%.c=%.o)
+ 	@echo "     Link $@"
+-	@$(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) $(EXTRALIBS) -o $@ $^
++	$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(LIBS) $(FSVS_LIBS) $(EXTRALIBS)
+ ifeq (@ENABLE_RELEASE@, 1)
+ 	-strip $@
+ endif
diff --git a/app-admin/fsvs/fsvs-1.2.5.ebuild b/app-admin/fsvs/fsvs-1.2.5-r1.ebuild
index a66857492165..3ee884250b9f 100644
--- a/app-admin/fsvs/fsvs-1.2.5.ebuild
+++ b/app-admin/fsvs/fsvs-1.2.5-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fsvs/fsvs-1.2.5.ebuild,v 1.1 2012/10/22 10:29:15 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fsvs/fsvs-1.2.5-r1.ebuild,v 1.1 2013/08/19 09:57:45 pinkbyte Exp $
 
-EAPI=4
+EAPI=5
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Backup/restore for subversion backends"
 HOMEPAGE="http://fsvs.tigris.org/"
@@ -13,23 +13,27 @@ SRC_URI="http://download.fsvs-software.org/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=">=dev-vcs/subversion-1.2
-	>=dev-libs/libpcre-6.4
-	>=sys-libs/gdbm-1.8
-	>=dev-libs/apr-util-1.2
+RDEPEND="dev-vcs/subversion
+	dev-libs/libpcre
+	sys-libs/gdbm
+	dev-libs/apr-util
 	dev-util/ctags"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/fsvs-1.2.4-as-needed.patch"
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+	epatch_user
+}
+
+src_compile() {
+	# respect compiler
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
 	dobin src/fsvs
 	dodir /etc/fsvs
-	dodir /var/spool/fsvs
 	keepdir /var/spool/fsvs
 	doman doc/*5 doc/*1
 	dodoc doc/{FAQ,IGNORING,PERFORMANCE,USAGE}