fixes bug #221179 and bug #265054.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

6 files changed, 26 insertions, 56 deletions

diff --git a/dev-db/qdbm/ChangeLog b/dev-db/qdbm/ChangeLog
index e9f1820caf63..ea9ef022bee8 100644
--- a/dev-db/qdbm/ChangeLog
+++ b/dev-db/qdbm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/qdbm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/ChangeLog,v 1.129 2009/12/19 14:59:33 hattya Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/ChangeLog,v 1.130 2010/07/31 10:28:55 hattya Exp $
+
+  31 Jul 2010; Akinori Hattori <hattya@gentoo.org>
+  -files/qdbm-1.8.75-runpath.diff, qdbm-1.8.77.ebuild,
+  -files/qdbm-1.8.77-runpath.diff, files/qdbm-perl-runpath-vendor.diff,
+  +files/qdbm-runpath.diff:
+  fixes bug #221179 and bug #265054.
 
   19 Dec 2009; Akinori Hattori <hattya@gentoo.org> qdbm-1.8.77.ebuild:
   fixes bug #297294.
diff --git a/dev-db/qdbm/Manifest b/dev-db/qdbm/Manifest
index dcfbb08d0659..63621d4dc931 100644
--- a/dev-db/qdbm/Manifest
+++ b/dev-db/qdbm/Manifest
@@ -1,7 +1,6 @@
-AUX qdbm-1.8.75-runpath.diff 1689 RMD160 e5f358b2c37ce69a4a5f814f62d87e2cb23288db SHA1 5a65a4aa0ad6f4260aff71e1dca82da988d04fb1 SHA256 216f308394592ff8f8c4ee3da36e29b5d99e9b38d27d015c63a26efadb223af2
-AUX qdbm-1.8.77-runpath.diff 1658 RMD160 bf7f1a6bfee257b4f196d4867e29a710bd2fedeb SHA1 dbc56a83cb9ee15be9df094447e9c26223d8b81c SHA256 385fd412f79856cdba16c77ec6dc380d40e96e6e944c7a2f6647a2520d45b6ef
-AUX qdbm-perl-runpath-vendor.diff 1257 RMD160 1e120cfd5fa3e51d2b353323229ab573684dea7f SHA1 ced72afc98e5288edc0a330d6cff632c83bb3d0b SHA256 b64ec547408bd8b0524c673ef01041653ae5ba7a5f1f5ab96986ed1b34ca864c
+AUX qdbm-perl-runpath-vendor.diff 1184 RMD160 adf9924a55e20586377d264041ff662743ba9892 SHA1 f5e0039177eaa1bc2a6af288d0a7c74607439bad SHA256 c1bd36aff7c4b8f3939d8064cd14921f055362e0008e683420a6e383ea02d9bd
+AUX qdbm-runpath.diff 1585 RMD160 95ea0b97a86342f3b54b586b542699e970fd9333 SHA1 e2dbd37b6f57604b3a1b7544f394e370577cafcf SHA256 d3e70c6b172fc5c379ede598b793bd1262a6209e99653af929e8c633ffebccf4
 DIST qdbm-1.8.77.tar.gz 948271 RMD160 3c684a4127204faf32472d29d7fd64a07e394332 SHA1 e277e77bc0209cc4c8eb205a9082ef880048445c SHA256 e413a57b28061f65c6e26fbec584f0d1c9c06f3142ee513fec4061f65533c772
-EBUILD qdbm-1.8.77.ebuild 2100 RMD160 82633120ed1b17b8f155ea22b7db647e60400d5c SHA1 325bf6f17f723c7a5d30fa350b320ed3610641b9 SHA256 4670e6a0780bab82eeb0ba707a356d08db7b0886482da8e2606aba6202f26aae
-MISC ChangeLog 14477 RMD160 c79a6f978974e147bf36635d9452f583c3749ef8 SHA1 5e0f3f492bee79c1c73f81b7946ba424c108eb54 SHA256 869498d554fa17772290a2aa795c1c26b5b2daefffa6a6eeaeb90b1f903e6154
+EBUILD qdbm-1.8.77.ebuild 2162 RMD160 132a724307b86ae5570e03e8bac5a963934bef28 SHA1 40118b5796e5342b119c43ab9bdf33a470ccf359 SHA256 7794079d94a38b7a90adae4095388b9082359db4b1430500309a9422184beb71
+MISC ChangeLog 14721 RMD160 f076c7b6b57bf1bbd5104bd1c25a8fd379cd95b0 SHA1 0ae563c626a270483868263d14d47e444a86d7a1 SHA256 c6362425121947c1397e12ead7e3b9d0ca58487164ee37cc5cde9de0dafda004
 MISC metadata.xml 230 RMD160 8e45109dbaf3c193afdb318002c1def7cb62dfa1 SHA1 9bd7aea9376c216b3f55303d1334a337cd6f06a2 SHA256 87fc07a55ee7814a0505ae1c24a871ac29ae7691c5383550647382a2b26277ae
diff --git a/dev-db/qdbm/files/qdbm-1.8.75-runpath.diff b/dev-db/qdbm/files/qdbm-1.8.75-runpath.diff
deleted file mode 100644
index cde2c65d8906..000000000000
--- a/dev-db/qdbm/files/qdbm-1.8.75-runpath.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urN qdbm-1.8.75.orig/Makefile.in qdbm-1.8.75/Makefile.in
---- qdbm-1.8.75.orig/Makefile.in	2007-02-21 17:44:33.000000000 +0900
-+++ qdbm-1.8.75/Makefile.in	2007-03-06 22:28:09.573574612 +0900
-@@ -60,7 +60,7 @@
- LIBS = -lqdbm @LIBS@
- LIBLDFLAGS = -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
- LDFLAGS = -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)
--LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
-+LDENV =
- AR = @AR@
- ARFLAGS = rcsv
- RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
-diff -urN qdbm-1.8.75.orig/cgi/Makefile.in qdbm-1.8.75/cgi/Makefile.in
---- qdbm-1.8.75.orig/cgi/Makefile.in	2006-08-24 11:55:12.000000000 +0900
-+++ qdbm-1.8.75/cgi/Makefile.in	2007-03-06 22:28:57.918463514 +0900
-@@ -28,7 +28,7 @@
- CFLAGS = -Wall -ansi -pedantic -fsigned-char -O2
- LIBS = -lqdbm @LIBS@
- LDFLAGS = -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS)
--LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:$(prefix)/lib
-+LDENV =
- 
- # Install destinations
- prefix = @prefix@
-diff -urN qdbm-1.8.75.orig/plus/Makefile.in qdbm-1.8.75/plus/Makefile.in
---- qdbm-1.8.75.orig/plus/Makefile.in	2007-02-21 17:47:23.000000000 +0900
-+++ qdbm-1.8.75/plus/Makefile.in	2007-03-06 22:28:50.954878529 +0900
-@@ -48,7 +48,7 @@
- LIBS = -lqdbm @LIBS@
- LIBLDFLAGS = -L. -L$(srcdir)/.. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)
- LDFLAGS = -L. -L$(srcdir)/.. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib -lxqdbm $(LIBS)
--LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
-+LDENV =
- AR = @AR@
- ARFLAGS = rcsv
- RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
diff --git a/dev-db/qdbm/files/qdbm-perl-runpath-vendor.diff b/dev-db/qdbm/files/qdbm-perl-runpath-vendor.diff
index 69a91c5031a0..e5395ec4719a 100644
--- a/dev-db/qdbm/files/qdbm-perl-runpath-vendor.diff
+++ b/dev-db/qdbm/files/qdbm-perl-runpath-vendor.diff
@@ -1,6 +1,6 @@
-diff -urN qdbm-1.8.62.orig/perl/Makefile.in qdbm-1.8.62/perl/Makefile.in
---- qdbm-1.8.62.orig/perl/Makefile.in	2006-01-17 17:25:15.000000000 +0900
-+++ qdbm-1.8.62/perl/Makefile.in	2006-07-23 22:52:23.000000000 +0900
+diff -ur qdbm-1.8.62.orig/perl/Makefile.in qdbm-1.8.62/perl/Makefile.in
+--- qdbm-1.8.62.orig/perl/Makefile.in
++++ qdbm-1.8.62/perl/Makefile.in
 @@ -42,16 +42,16 @@
  all :
  	cd depot && [ -f Makefile ] || \
diff --git a/dev-db/qdbm/files/qdbm-1.8.77-runpath.diff b/dev-db/qdbm/files/qdbm-runpath.diff
index 9d83fb4dcd83..4fc1a1f70291 100644
--- a/dev-db/qdbm/files/qdbm-1.8.77-runpath.diff
+++ b/dev-db/qdbm/files/qdbm-runpath.diff
@@ -1,6 +1,6 @@
-diff -urN qdbm-1.8.77.orig/Makefile.in qdbm-1.8.77/Makefile.in
---- qdbm-1.8.77.orig/Makefile.in	2007-03-07 11:40:47.000000000 +0900
-+++ qdbm-1.8.77/Makefile.in	2007-12-15 22:02:36.719642580 +0900
+diff -ur qdbm-1.8.77.orig/Makefile.in qdbm-1.8.77/Makefile.in
+--- qdbm-1.8.77.orig/Makefile.in
++++ qdbm-1.8.77/Makefile.in
 @@ -61,7 +61,7 @@
  LIBS = -lqdbm @LIBS@
  LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
diff --git a/dev-db/qdbm/qdbm-1.8.77.ebuild b/dev-db/qdbm/qdbm-1.8.77.ebuild
index e1350c05a311..5d745ea844e6 100644
--- a/dev-db/qdbm/qdbm-1.8.77.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.77.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.77.ebuild,v 1.10 2009/12/19 14:59:33 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.77.ebuild,v 1.11 2010/07/31 10:28:55 hattya Exp $
 
 inherit eutils java-pkg-opt-2 multilib
 
@@ -16,7 +16,7 @@ SLOT="0"
 
 RDEPEND="java? ( >=virtual/jre-1.4 )
 	perl? ( dev-lang/perl )
-	ruby? ( virtual/ruby )
+	ruby? ( dev-lang/ruby )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	java? ( >=virtual/jdk-1.4 )"
@@ -26,12 +26,12 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-runpath.diff
+	epatch "${FILESDIR}"/${PN}-perl-runpath-vendor.diff
+
 	sed -i "/^CFLAGS/s/$/ ${CFLAGS}/" Makefile.in || die
 	sed -i "/^JAVACFLAGS/s/$/ ${JAVACFLAGS}/" java/Makefile.in || die
 
-	epatch "${FILESDIR}"/${P}-runpath.diff
-	epatch "${FILESDIR}"/${PN}-perl-runpath-vendor.diff
-
 	# replace make -> $(MAKE)
 	sed -i "s/make\( \|$\)/\$(MAKE)\1/g" \
 		Makefile.in \
@@ -108,7 +108,8 @@ src_install() {
 				rm -f "${D}"/usr/$(get_libdir)/*.jar
 				;;
 			perl)
-				rm "${D}"/$(perl -V:installarchlib | cut -d\' -f2)/*.pod
+				rm -f "${D}"/$(perl -V:installarchlib | cut -d\' -f2)/*.pod
+				find "${D}" -name .packlist -print0 | xargs -0 rm -f
 				;;
 		esac
 		cd -