Patched Makefiles so they don't strip binaries, bug #135208.

Package-Manager: portage-2.1_rc3-r5

4 files changed, 59 insertions, 13 deletions

diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog
index a7b1c774babd..0e36df0677c0 100644
--- a/app-text/djvu/ChangeLog
+++ b/app-text/djvu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/djvu
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.40 2006/05/30 09:31:32 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.41 2006/06/02 07:33:38 ehmsen Exp $
+
+  02 Jun 2006; Martin Ehmsen <ehmsen@gentoo.org>
+  +files/djvu-3.5.17-dont-prestrip-bins.patch, djvu-3.5.17.ebuild:
+  Patched Makefiles so they don't strip binaries, bug #135208.
 
   30 May 2006; Martin Ehmsen <ehmsen@gentoo.org> djvu-3.5.17.ebuild:
   Fixed problem with nspluging being installed also with unset use flag, 
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index adef0cfd98c1..8c16b17c9148 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -9,6 +9,10 @@ AUX djvu-3.5.16-gcc41.patch 1101 RMD160 aacb8ee4217323b36b7e0ce7d15cbaa8a86b7a5e
 MD5 24b806f27bb6ea3af18cbf288a784d8c files/djvu-3.5.16-gcc41.patch 1101
 RMD160 aacb8ee4217323b36b7e0ce7d15cbaa8a86b7a5e files/djvu-3.5.16-gcc41.patch 1101
 SHA256 febb7593e80136ec3b25817ab620efd1754b4b063a4800bec57f2f3e9c096571 files/djvu-3.5.16-gcc41.patch 1101
+AUX djvu-3.5.17-dont-prestrip-bins.patch 1586 RMD160 0dfc6e238a795ae1017366c7461f4b11ca732a31 SHA1 94e8e145b8743444f0a85232122da91bc207757f SHA256 9f82c40011fbac673d2d28587af63a8d13d9e3503e7554a5f26964e4d206cc45
+MD5 d6c0c71675e509501f69b0f47f991560 files/djvu-3.5.17-dont-prestrip-bins.patch 1586
+RMD160 0dfc6e238a795ae1017366c7461f4b11ca732a31 files/djvu-3.5.17-dont-prestrip-bins.patch 1586
+SHA256 9f82c40011fbac673d2d28587af63a8d13d9e3503e7554a5f26964e4d206cc45 files/djvu-3.5.17-dont-prestrip-bins.patch 1586
 AUX gentoo-acdesktop.m4 2491 RMD160 1795c1b9bcb6aacd54962a65d5b8d551c15c17d4 SHA1 946fe237382867a0d580bcf6b57b2f818e6338e7 SHA256 0a9ec40c7ebe2a75025cd832a1d6eba25dc904593702e4e312662eb689ae5eef
 MD5 0da6de34d8db09192d2c881416108427 files/gentoo-acdesktop.m4 2491
 RMD160 1795c1b9bcb6aacd54962a65d5b8d551c15c17d4 files/gentoo-acdesktop.m4 2491
@@ -33,14 +37,14 @@ EBUILD djvu-3.5.16.ebuild 1989 RMD160 435b7d179f8f15fc7aa861d4c5fa8f39e188d788 S
 MD5 81d9bda0294ccf56a66d3499dab6955a djvu-3.5.16.ebuild 1989
 RMD160 435b7d179f8f15fc7aa861d4c5fa8f39e188d788 djvu-3.5.16.ebuild 1989
 SHA256 e905850bc24a128f9b5671bf448671de8b7836d1869da17e49eb7c9126f19626 djvu-3.5.16.ebuild 1989
-EBUILD djvu-3.5.17.ebuild 1847 RMD160 c60f79e93ad3278d73e3b0c4b9aae10ccfa24c6c SHA1 f4708e55cb680bdd7f079c5f162e0002866e1afb SHA256 800793cbba1bec0b91fab474c3e7a2bd36794c59a2224bd559ec144ec84ea5d6
-MD5 738bccdecf639a11d6e2c64d4449b5ed djvu-3.5.17.ebuild 1847
-RMD160 c60f79e93ad3278d73e3b0c4b9aae10ccfa24c6c djvu-3.5.17.ebuild 1847
-SHA256 800793cbba1bec0b91fab474c3e7a2bd36794c59a2224bd559ec144ec84ea5d6 djvu-3.5.17.ebuild 1847
-MISC ChangeLog 4829 RMD160 45e76778c42c05dc6eb2f74a4929985b833adf42 SHA1 66cc785c6e6166205a718a1ac149dea981d4df41 SHA256 65114a990bb8dd701a5047d236fe759d075afb003cf8ea649facf555687e75b1
-MD5 4f2fcd384562f08ecbf03f07d1152d21 ChangeLog 4829
-RMD160 45e76778c42c05dc6eb2f74a4929985b833adf42 ChangeLog 4829
-SHA256 65114a990bb8dd701a5047d236fe759d075afb003cf8ea649facf555687e75b1 ChangeLog 4829
+EBUILD djvu-3.5.17.ebuild 1922 RMD160 13780a1dd29c1e01b84ba0666fb00bf7225ddc47 SHA1 b55cf372317ae0f2b85a4edda72fd32494e5b3d4 SHA256 6efd256de0d890c0258f45de9ea98d98ea42d03aeb666de5cb2180cebb2653c3
+MD5 2c3820b21cc5455802c722fd537021b6 djvu-3.5.17.ebuild 1922
+RMD160 13780a1dd29c1e01b84ba0666fb00bf7225ddc47 djvu-3.5.17.ebuild 1922
+SHA256 6efd256de0d890c0258f45de9ea98d98ea42d03aeb666de5cb2180cebb2653c3 djvu-3.5.17.ebuild 1922
+MISC ChangeLog 5009 RMD160 db1515a124c40774c7f96124107bd30f6e137ad4 SHA1 250d247b1353addd656ce028fab707449da8b5a4 SHA256 dbcd81f68a8e42d230ac229c0fcc9ada89c0902e36ce867ab304aad539ba9abc
+MD5 cc2cc073d55d50a784e0ad0f1c35b70e ChangeLog 5009
+RMD160 db1515a124c40774c7f96124107bd30f6e137ad4 ChangeLog 5009
+SHA256 dbcd81f68a8e42d230ac229c0fcc9ada89c0902e36ce867ab304aad539ba9abc ChangeLog 5009
 MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
@@ -63,7 +67,7 @@ SHA256 d09697f4e47fd027ca22b391ecc4ee4f47d4f0d0c747fabe8bf3a041dc7ca16b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEfBEBzxUa4FWw6mwRAuZiAJ4kYWp709j8d/hhdMHwaVx261YZoQCZAeRp
-RDPFvMgcCJ8571Q6kgKbWBE=
-=hwc6
+iD8DBQFEf+oDzxUa4FWw6mwRAhbXAKCDvlVXBBLGQtJ+y/R29Jv4Tp5eLACeOrci
+n9poTfIlXXDAV2mZ+dUDCnc=
+=eScd
 -----END PGP SIGNATURE-----
diff --git a/app-text/djvu/djvu-3.5.17.ebuild b/app-text/djvu/djvu-3.5.17.ebuild
index 24d42bef9287..1f61e082469c 100644
--- a/app-text/djvu/djvu-3.5.17.ebuild
+++ b/app-text/djvu/djvu-3.5.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.17.ebuild,v 1.3 2006/05/30 09:31:32 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.17.ebuild,v 1.4 2006/06/02 07:33:38 ehmsen Exp $
 
 inherit nsplugins flag-o-matic fdo-mime eutils multilib toolchain-funcs
 
@@ -25,6 +25,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	epatch "${FILESDIR}/${P}-dont-prestrip-bins.patch" || die "patch failed"
+
 	# Replace autochecking acdesktop.m4 with a gentoo-specific one
 	cp "${FILESDIR}/gentoo-acdesktop.m4" "${S}/gui/desktop/acdesktop.m4"
 
diff --git a/app-text/djvu/files/djvu-3.5.17-dont-prestrip-bins.patch b/app-text/djvu/files/djvu-3.5.17-dont-prestrip-bins.patch
new file mode 100644
index 000000000000..87ebf9c1e197
--- /dev/null
+++ b/app-text/djvu/files/djvu-3.5.17-dont-prestrip-bins.patch
@@ -0,0 +1,36 @@
+diff -urN djvulibre-3.5.17.orig/gui/djview/Makefile.in djvulibre-3.5.17/gui/djview/Makefile.in
+--- djvulibre-3.5.17.orig/gui/djview/Makefile.in	2004-08-24 19:58:55.000000000 +0200
++++ djvulibre-3.5.17/gui/djview/Makefile.in	2006-06-02 09:11:29.000000000 +0200
+@@ -174,7 +174,7 @@
+ install-bin: ${PROGRAM} FORCE
+ 	${INSTALL} -d ${DESTDIR}${bindir}
+ 	${LIBTOOL} --mode=install \
+-	  ${INSTALL_PROGRAM} -s ${PROGRAM} ${DESTDIR}${bindir}
++	  ${INSTALL_PROGRAM} ${PROGRAM} ${DESTDIR}${bindir}
+ 
+ install-man: FORCE
+ 	${INSTALL} -d ${DESTDIR}${mandir}/man1
+diff -urN djvulibre-3.5.17.orig/tools/Makefile.in djvulibre-3.5.17/tools/Makefile.in
+--- djvulibre-3.5.17.orig/tools/Makefile.in	2005-08-23 18:49:23.000000000 +0200
++++ djvulibre-3.5.17/tools/Makefile.in	2006-06-02 09:10:52.000000000 +0200
+@@ -75,7 +75,7 @@
+ 	${INSTALL} -d ${DESTDIR}${bindir}
+ 	for n in ${PROGRAMS} ; do \
+ 	  ${LIBTOOL} --mode=install \
+-	    ${INSTALL_PROGRAM} -s $$n ${DESTDIR}${bindir} \
++	    ${INSTALL_PROGRAM} $$n ${DESTDIR}${bindir} \
+           || exit ; done
+ 
+ install-scripts: FORCE
+diff -urN djvulibre-3.5.17.orig/xmltools/Makefile.in djvulibre-3.5.17/xmltools/Makefile.in
+--- djvulibre-3.5.17.orig/xmltools/Makefile.in	2004-08-24 19:58:56.000000000 +0200
++++ djvulibre-3.5.17/xmltools/Makefile.in	2006-06-02 09:10:30.000000000 +0200
+@@ -63,7 +63,7 @@
+ 	${INSTALL} -d ${DESTDIR}${bindir}
+ 	for n in ${PROGRAMS} ; do \
+ 	  ${LIBTOOL} --mode=install \
+-	    ${INSTALL_PROGRAM} -s $$n ${DESTDIR}${bindir} \
++	    ${INSTALL_PROGRAM} $$n ${DESTDIR}${bindir} \
+           || exit ; done
+ 
+ install-data: FORCE