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

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

4 files changed, 57 insertions, 34 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/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}