From: Akinori Hattori Date: Mon, 12 Mar 2007 14:04:29 +0000 (+0000) Subject: fixes bug #170523. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9ad8c0abb9bcabe181dc64a7110446cc29603450;p=gentoo.git fixes bug #170523. Package-Manager: portage-2.1.2.2 --- diff --git a/dev-db/qdbm/ChangeLog b/dev-db/qdbm/ChangeLog index 2d84dd753c68..4a7da91ff69e 100644 --- a/dev-db/qdbm/ChangeLog +++ b/dev-db/qdbm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-db/qdbm # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/ChangeLog,v 1.100 2007/03/11 16:08:12 hattya Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/ChangeLog,v 1.101 2007/03/12 14:04:29 hattya Exp $ + + 12 Mar 2007; Akinori Hattori + +files/qdbm-1.8.75-runpath.diff, -files/qdbm-perl-runpath.diff, + qdbm-1.8.75.ebuild: + fixes bug #170523. 11 Mar 2007; Akinori Hattori -qdbm-1.8.46.ebuild, -qdbm-1.8.70-r2.ebuild, -qdbm-1.8.73.ebuild, qdbm-1.8.74.ebuild: diff --git a/dev-db/qdbm/Manifest b/dev-db/qdbm/Manifest index ac75a6ab0132..e210998def2c 100644 --- a/dev-db/qdbm/Manifest +++ b/dev-db/qdbm/Manifest @@ -1,11 +1,11 @@ +AUX qdbm-1.8.75-runpath.diff 1689 RMD160 e5f358b2c37ce69a4a5f814f62d87e2cb23288db SHA1 5a65a4aa0ad6f4260aff71e1dca82da988d04fb1 SHA256 216f308394592ff8f8c4ee3da36e29b5d99e9b38d27d015c63a26efadb223af2 +MD5 1dedd54a023736f0d5dbc22d1459b88d files/qdbm-1.8.75-runpath.diff 1689 +RMD160 e5f358b2c37ce69a4a5f814f62d87e2cb23288db files/qdbm-1.8.75-runpath.diff 1689 +SHA256 216f308394592ff8f8c4ee3da36e29b5d99e9b38d27d015c63a26efadb223af2 files/qdbm-1.8.75-runpath.diff 1689 AUX qdbm-perl-runpath-vendor.diff 1257 RMD160 1e120cfd5fa3e51d2b353323229ab573684dea7f SHA1 ced72afc98e5288edc0a330d6cff632c83bb3d0b SHA256 b64ec547408bd8b0524c673ef01041653ae5ba7a5f1f5ab96986ed1b34ca864c MD5 e9f8454e4926014acecee8ede5432df5 files/qdbm-perl-runpath-vendor.diff 1257 RMD160 1e120cfd5fa3e51d2b353323229ab573684dea7f files/qdbm-perl-runpath-vendor.diff 1257 SHA256 b64ec547408bd8b0524c673ef01041653ae5ba7a5f1f5ab96986ed1b34ca864c files/qdbm-perl-runpath-vendor.diff 1257 -AUX qdbm-perl-runpath.diff 1344 RMD160 e26e45f7df9b244cc36bd139b0fb9c4a8c691359 SHA1 6a3200d232cff020e68423bf6605882122fb31c9 SHA256 8c6b2ac8c7862e88d0d28e50f6c897aa698624c320a5cf65eb964bfd1a425458 -MD5 481bf1a867128b4b4f9b9f1949b40d66 files/qdbm-perl-runpath.diff 1344 -RMD160 e26e45f7df9b244cc36bd139b0fb9c4a8c691359 files/qdbm-perl-runpath.diff 1344 -SHA256 8c6b2ac8c7862e88d0d28e50f6c897aa698624c320a5cf65eb964bfd1a425458 files/qdbm-perl-runpath.diff 1344 AUX qdbm-runpath.diff 1619 RMD160 1da634633ab370f61ab38f4643901fb2f9a65923 SHA1 c0ce96b114cd811426b5009b613419227a385ce1 SHA256 7a815b72acff53a0c99d927e67500a807ec0661a462a1787edbdc1a048c505c2 MD5 d6c67f1c36e5b0e3b50ff50e0e9f6f22 files/qdbm-runpath.diff 1619 RMD160 1da634633ab370f61ab38f4643901fb2f9a65923 files/qdbm-runpath.diff 1619 @@ -21,14 +21,14 @@ EBUILD qdbm-1.8.74.ebuild 1837 RMD160 c95824b6629c48b5fa61bd5af165cca201416d01 S MD5 9c6df3324aeb0fce5b307757b2e30b18 qdbm-1.8.74.ebuild 1837 RMD160 c95824b6629c48b5fa61bd5af165cca201416d01 qdbm-1.8.74.ebuild 1837 SHA256 130f2b3ddff773ab5c92a5378b27e02ef623c1cc0a51c6009f29ff62e4cd6641 qdbm-1.8.74.ebuild 1837 -EBUILD qdbm-1.8.75.ebuild 1838 RMD160 91c01968f4f9470a6732a1b494e0fa99d93c8592 SHA1 123cae1c515adf628513273cdfeaaa5ced4d178b SHA256 1c0b38b418f5425a267c2ac74536c14eeccce3fb4003dce4fad9b2d83d9baf0f -MD5 259f7316f9a395bda50c47d0d6dc75f8 qdbm-1.8.75.ebuild 1838 -RMD160 91c01968f4f9470a6732a1b494e0fa99d93c8592 qdbm-1.8.75.ebuild 1838 -SHA256 1c0b38b418f5425a267c2ac74536c14eeccce3fb4003dce4fad9b2d83d9baf0f qdbm-1.8.75.ebuild 1838 -MISC ChangeLog 11282 RMD160 f22d4669d08443b5443116efcb1dd981a2cc89f3 SHA1 787ee05e2e37c858da5d26ab2aa346893f4bb08d SHA256 b07ec8edc3c3a8d7c32b5538f077fda37f094d1a84867e0f1db2cbb2c86b5c11 -MD5 e47681dfc93b5462871a63081f4f5f4e ChangeLog 11282 -RMD160 f22d4669d08443b5443116efcb1dd981a2cc89f3 ChangeLog 11282 -SHA256 b07ec8edc3c3a8d7c32b5538f077fda37f094d1a84867e0f1db2cbb2c86b5c11 ChangeLog 11282 +EBUILD qdbm-1.8.75.ebuild 1837 RMD160 d71908fbf6cbfead636a1ab806a0bac6134e8a5b SHA1 8b3d8f585c5e57ba889b1ebc3470e98af1a3a742 SHA256 4bd3cba21fb390b1fb9022d69e2da54522347b48e1c9d245ba12885e12ed526f +MD5 ddbe88d9bb281c1d37a2121be7d330ba qdbm-1.8.75.ebuild 1837 +RMD160 d71908fbf6cbfead636a1ab806a0bac6134e8a5b qdbm-1.8.75.ebuild 1837 +SHA256 4bd3cba21fb390b1fb9022d69e2da54522347b48e1c9d245ba12885e12ed526f qdbm-1.8.75.ebuild 1837 +MISC ChangeLog 11443 RMD160 9c79f387e43ca6afa987da8ab283546aa1cb3a66 SHA1 ccd794a1bebd7c772f411edd6431742ce642fe9a SHA256 6dd95b7cee651a8edf56ebc71edf4e19f5147b3b0ae0b465e2d099805c342405 +MD5 f2cbfa77c44c6625387014431dc681b9 ChangeLog 11443 +RMD160 9c79f387e43ca6afa987da8ab283546aa1cb3a66 ChangeLog 11443 +SHA256 6dd95b7cee651a8edf56ebc71edf4e19f5147b3b0ae0b465e2d099805c342405 ChangeLog 11443 MISC metadata.xml 230 RMD160 8e45109dbaf3c193afdb318002c1def7cb62dfa1 SHA1 9bd7aea9376c216b3f55303d1334a337cd6f06a2 SHA256 87fc07a55ee7814a0505ae1c24a871ac29ae7691c5383550647382a2b26277ae MD5 c9f54ac0eadf3d14a44e5dc692f0df73 metadata.xml 230 RMD160 8e45109dbaf3c193afdb318002c1def7cb62dfa1 metadata.xml 230 diff --git a/dev-db/qdbm/files/qdbm-1.8.75-runpath.diff b/dev-db/qdbm/files/qdbm-1.8.75-runpath.diff new file mode 100644 index 000000000000..cde2c65d8906 --- /dev/null +++ b/dev-db/qdbm/files/qdbm-1.8.75-runpath.diff @@ -0,0 +1,36 @@ +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.diff b/dev-db/qdbm/files/qdbm-perl-runpath.diff deleted file mode 100644 index d67e27c23e02..000000000000 --- a/dev-db/qdbm/files/qdbm-perl-runpath.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- perl/Makefile.in.orig 2005-10-09 16:35:47.000000000 +1000 -+++ perl/Makefile.in 2005-10-09 16:41:46.000000000 +1000 -@@ -43,15 +43,15 @@ - cd depot && [ -f Makefile ] || \ - $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \ - LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \ -- $(RUNENV) make -+ $(RUNENV) make LD_RUN_PATH="" - cd curia && [ -f Makefile ] || \ - $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \ - LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \ -- $(RUNENV) make -+ $(RUNENV) make LD_RUN_PATH="" - cd villa && [ -f Makefile ] || \ - $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \ - LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \ -- $(RUNENV) make -+ $(RUNENV) make LD_RUN_PATH="" - @printf '\n' - @printf '#================================================================\n' - @printf '# Ready to install.\n' -@@ -69,9 +69,9 @@ - - - install : -- cd depot && $(RUNENV) make install -- cd curia && $(RUNENV) make install -- cd villa && $(RUNENV) make install -+ cd depot && $(RUNENV) make LD_RUN_PATH="" install -+ cd curia && $(RUNENV) make LD_RUN_PATH="" install -+ cd villa && $(RUNENV) make LD_RUN_PATH="" install - mkdir -p $(DESTDIR)$(MYBINDIR) - cp -f $(MYBINS) $(DESTDIR)$(MYBINDIR) - mkdir -p $(DESTDIR)$(MYDATADIR) diff --git a/dev-db/qdbm/qdbm-1.8.75.ebuild b/dev-db/qdbm/qdbm-1.8.75.ebuild index 2aa2a4f3d1cc..e210c9654ee4 100644 --- a/dev-db/qdbm/qdbm-1.8.75.ebuild +++ b/dev-db/qdbm/qdbm-1.8.75.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.75.ebuild,v 1.1 2007/03/11 16:21:54 hattya Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.75.ebuild,v 1.2 2007/03/12 14:04:29 hattya Exp $ inherit eutils java-pkg-opt-2 multilib @@ -26,7 +26,7 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${PN}-runpath.diff + epatch "${FILESDIR}"/${P}-runpath.diff epatch "${FILESDIR}"/${PN}-perl-runpath-vendor.diff }