fixes bug #221179 and bug #265054.

(Portage version: 2.1.8.3/cvs/Linux i686)

5 files changed, 22 insertions, 51 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/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 -