summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Scherbaum <dertobi123@gentoo.org>2009-12-23 09:05:34 +0000
committerTobias Scherbaum <dertobi123@gentoo.org>2009-12-23 09:05:34 +0000
commit8a3736b4a740d96b54968d76aaac5a77129a74af (patch)
tree0600a095e644aa3e8aaab138ec96b872afa77279 /app-admin
parentVersion bump. (diff)
downloadhistorical-8a3736b4a740d96b54968d76aaac5a77129a74af.tar.gz
historical-8a3736b4a740d96b54968d76aaac5a77129a74af.tar.bz2
historical-8a3736b4a740d96b54968d76aaac5a77129a74af.zip
Fix for forced as-needed, patch by Kacper Kowalik (#294834)
Package-Manager: portage-2.2_rc58/cvs/Linux i686
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/fsvs/ChangeLog6
-rw-r--r--app-admin/fsvs/Manifest5
-rw-r--r--app-admin/fsvs/files/fsvs-1.2.1-as-needed.patch20
-rw-r--r--app-admin/fsvs/fsvs-1.2.1.ebuild10
4 files changed, 37 insertions, 4 deletions
diff --git a/app-admin/fsvs/ChangeLog b/app-admin/fsvs/ChangeLog
index 0074e5d5da4f..66c93d7e0372 100644
--- a/app-admin/fsvs/ChangeLog
+++ b/app-admin/fsvs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/fsvs
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fsvs/ChangeLog,v 1.1 2009/10/27 19:04:52 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fsvs/ChangeLog,v 1.2 2009/12/23 09:05:33 dertobi123 Exp $
+
+ 23 Dec 2009; Tobias Scherbaum <dertobi123@gentoo.org> fsvs-1.2.1.ebuild,
+ +files/fsvs-1.2.1-as-needed.patch:
+ Fix for forced as-needed, patch by Kacper Kowalik (#294834)
*fsvs-1.2.1 (27 Oct 2009)
diff --git a/app-admin/fsvs/Manifest b/app-admin/fsvs/Manifest
index 63d33f100d92..f114061c0b11 100644
--- a/app-admin/fsvs/Manifest
+++ b/app-admin/fsvs/Manifest
@@ -1,4 +1,5 @@
+AUX fsvs-1.2.1-as-needed.patch 744 RMD160 10f14353f6148eadeb7002e45270c042f752d985 SHA1 ce04ea06378c85332555ab7e580209c526c51426 SHA256 8bf3376977ea08fb1bdcef80ec464bad10029e72523ab8d10069077a0d62d19d
DIST fsvs-1.2.1.tar.bz2 422301 RMD160 3245ef4c5cc74579342b5bf9f1be4fef92596b77 SHA1 522da85d2fdf693c0f449ee1acf2e17fa72a0ece SHA256 a8c2ceb2ed116c40e3ba687a8385ec85c485f34543f5a4886aa4f90ebed89dd6
-EBUILD fsvs-1.2.1.ebuild 1320 RMD160 561b4e3e6fc31cdbfd7bc7bc12422e799050f9f6 SHA1 71b5fd71788a3f087409a2ec380e7c81b7297bbc SHA256 c6a7703e3f1b48de017f934a0b486b6c00108fb686f93156b852df1a1db84e3e
-MISC ChangeLog 409 RMD160 1c2d15e2a56223aefa24844e0a9335c633c1ba43 SHA1 b47ae4bf92ac13ace47df278689701bb233a96c7 SHA256 ece75c08e83e7041801979ad88b912c8a4ee27810053289ecfb2a15bc8a636c9
+EBUILD fsvs-1.2.1.ebuild 1412 RMD160 608c6c6591a876f68aae24b3850be23a70799b1c SHA1 912f7ed504cc669f3f2a94162fd40c73aa728366 SHA256 b530e930b633125356ce74aa596f246aa9f706a08a4d9365809395043660939b
+MISC ChangeLog 584 RMD160 d6dc60a364e8c41341919c0e77df974bd3770045 SHA1 a32b2ee31b7e3424278eda837a8b5ee98596cc5b SHA256 a966a9a004a42437a467ac71fbd12176187c158cd4424f96d2d4ecc41647f436
MISC metadata.xml 258 RMD160 19a3b278f3249c7d5fd4e038ba1efe02e84c4b3b SHA1 f511fc25bb4831367e8cf714089fddea3fe81d96 SHA256 b443368472af12269f3a9c5a645eedb6fd9f2781dc25047b208568c94b1bc95c
diff --git a/app-admin/fsvs/files/fsvs-1.2.1-as-needed.patch b/app-admin/fsvs/files/fsvs-1.2.1-as-needed.patch
new file mode 100644
index 000000000000..28be2dcdcdf4
--- /dev/null
+++ b/app-admin/fsvs/files/fsvs-1.2.1-as-needed.patch
@@ -0,0 +1,20 @@
+--- fsvs-1.2.1.orig/src/Makefile.in 2009-10-12 19:05:54.000000000 +0000
++++ fsvs-1.2.1/src/Makefile.in 2009-12-22 16:30:07.057583489 +0000
+@@ -18,7 +18,7 @@
+ CFLAGS := @CFLAGS@
+ 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/fsvs-1.2.1.ebuild b/app-admin/fsvs/fsvs-1.2.1.ebuild
index 072d1685606e..ee25a943c855 100644
--- a/app-admin/fsvs/fsvs-1.2.1.ebuild
+++ b/app-admin/fsvs/fsvs-1.2.1.ebuild
@@ -1,6 +1,10 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fsvs/fsvs-1.2.1.ebuild,v 1.1 2009/10/27 19:04:52 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fsvs/fsvs-1.2.1.ebuild,v 1.2 2009/12/23 09:05:33 dertobi123 Exp $
+
+EAPI=2
+
+inherit eutils
DESCRIPTION="Backup/restore for subversion backends"
HOMEPAGE="http://fsvs.tigris.org/"
@@ -18,6 +22,10 @@ DEPEND=">=dev-util/subversion-1.2
dev-util/ctags"
RDEPEND="${DEPEND}"
+src_prepare() {
+ epatch "${FILESDIR}/fsvs-1.2.1-as-needed.patch"
+}
+
src_install() {
dobin src/fsvs
dodir /etc/fsvs