Removed stripping from the Makefiles. Fixes bug 137640.

Removed dependencies on packages now in the base profile.
Package-Manager: portage-2.1.3.5

4 files changed, 67 insertions, 19 deletions

diff --git a/app-text/ispell/ChangeLog b/app-text/ispell/ChangeLog
index 2283e95f601f..cc77ebd850c5 100644
--- a/app-text/ispell/ChangeLog
+++ b/app-text/ispell/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/ispell
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ispell/ChangeLog,v 1.30 2007/02/21 23:32:14 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ispell/ChangeLog,v 1.31 2007/08/18 13:37:30 philantrop Exp $
+
+  18 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/ispell-3.2.06-stripping.diff, ispell-3.2.06-r6.ebuild:
+  Removed stripping from the Makefiles. Fixes bug 137640. Removed dependencies
+  on packages now in the base profile.
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-text/ispell/Manifest b/app-text/ispell/Manifest
index 9b804d5a6ffc..2689031e7cc1 100644
--- a/app-text/ispell/Manifest
+++ b/app-text/ispell/Manifest
@@ -1,21 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ispell-3.2.06-patch.diff 7112 RMD160 e65f0bdd0928e6e22472d2489837f9c47d2a48b0 SHA1 c6523dfc9abd591d42375cb826b4680695307353 SHA256 7dbaa324e58e0655db69c67fdd19680a29dffa7c2c06cd7e2c2c2ae4159648c1
 MD5 968d9a6f9d7e309c232f22b4e72f4a9d files/ispell-3.2.06-patch.diff 7112
 RMD160 e65f0bdd0928e6e22472d2489837f9c47d2a48b0 files/ispell-3.2.06-patch.diff 7112
 SHA256 7dbaa324e58e0655db69c67fdd19680a29dffa7c2c06cd7e2c2c2ae4159648c1 files/ispell-3.2.06-patch.diff 7112
+AUX ispell-3.2.06-stripping.diff 942 RMD160 777e309c1ef3cea52f9a099ff240998a9b997aa6 SHA1 a7e2b56d7b96e9714328696ee104092b2aaa41fc SHA256 7464635ef36df5983c9662ae5bc83ee57550aa1f4ca975096f542d55570290cc
+MD5 c458d8f5cc69dab935ee6073e0f6fe6e files/ispell-3.2.06-stripping.diff 942
+RMD160 777e309c1ef3cea52f9a099ff240998a9b997aa6 files/ispell-3.2.06-stripping.diff 942
+SHA256 7464635ef36df5983c9662ae5bc83ee57550aa1f4ca975096f542d55570290cc files/ispell-3.2.06-stripping.diff 942
 AUX local.h.gentoo 6015 RMD160 9953b4d51e71d52378528960d4677ff9054bff13 SHA1 7347541ff822cbb91ddbb2e3b5f27834da2bcd1e SHA256 f919ac4220a7f7859e89141eb62eb7c4eca092a9be0f55a660ba61f697a8770d
 MD5 912424a0edd789568666782416a410a2 files/local.h.gentoo 6015
 RMD160 9953b4d51e71d52378528960d4677ff9054bff13 files/local.h.gentoo 6015
 SHA256 f919ac4220a7f7859e89141eb62eb7c4eca092a9be0f55a660ba61f697a8770d files/local.h.gentoo 6015
 DIST ispell-3.2.06-r6-gentoo-0.1.diff.bz2 8787 RMD160 d821b99da52ed9d326d653d0bf01b277c30c18ab SHA1 46472cdb0d59efea3dc438fd098d6de7345ce9b5 SHA256 e577e996cb465222ae3c12f53e0a712d97a1c5f3786eaab51d28769f3a9af114
 DIST ispell-3.2.06.tar.gz 580742 RMD160 3f6a3840540ebc753146c427da8ce2d54317b46e SHA1 35f496322cda172d56610417e4e1c7b962f734d7 SHA256 34a27fc4a2089bd5074aacf69323731770e5b605a2fc9a053d389f45b01c7966
-EBUILD ispell-3.2.06-r6.ebuild 1598 RMD160 e4f742d1b68427d8550d81655e45bb107b096908 SHA1 a870ae56142ae608bb54202a10ea08520099fef9 SHA256 35b8ce9b712cbc640abd6ad123015c06b7be6591373cbc782379df6b804dad51
-MD5 d916c4f8cf68ee2656d3f357d45f119a ispell-3.2.06-r6.ebuild 1598
-RMD160 e4f742d1b68427d8550d81655e45bb107b096908 ispell-3.2.06-r6.ebuild 1598
-SHA256 35b8ce9b712cbc640abd6ad123015c06b7be6591373cbc782379df6b804dad51 ispell-3.2.06-r6.ebuild 1598
-MISC ChangeLog 4673 RMD160 1cd458cd9472fe2dc7c2b98f852f070cbb9a9b85 SHA1 0ad4ca6e7c8cda688eb10f6f37637cbdd27ec7f1 SHA256 f6903e45ffbd03f431496ee5e48b2083c35ee2222133d457b7780b2fb9441bec
-MD5 4e9423ba4b5cb5e8bf29b64cc882c97a ChangeLog 4673
-RMD160 1cd458cd9472fe2dc7c2b98f852f070cbb9a9b85 ChangeLog 4673
-SHA256 f6903e45ffbd03f431496ee5e48b2083c35ee2222133d457b7780b2fb9441bec ChangeLog 4673
+EBUILD ispell-3.2.06-r6.ebuild 1651 RMD160 5b980b7e87db1101ab77a39b9f35803cba42db9a SHA1 6c25e54d3825a0ba7d6e270f2b44aa48de1271f1 SHA256 f919c66aa84a9959922d0d9931f1c4bf13711a81a2ec05af241a90e76ae6d437
+MD5 8a08bd4e4de8e604e1ee87a263aa0734 ispell-3.2.06-r6.ebuild 1651
+RMD160 5b980b7e87db1101ab77a39b9f35803cba42db9a ispell-3.2.06-r6.ebuild 1651
+SHA256 f919c66aa84a9959922d0d9931f1c4bf13711a81a2ec05af241a90e76ae6d437 ispell-3.2.06-r6.ebuild 1651
+MISC ChangeLog 4916 RMD160 84db8b7d9129d03d7574ee101fce4bae5bf15a04 SHA1 0faf6be77324e3dd2ebd373caabde99c0e8420d2 SHA256 6e0c23542cdd6f66549ac3e8b4526ce0e4ca49644c0460c3fecfb5be529ca6ea
+MD5 298f9204e0f73568fdc0ae9f2e72e53f ChangeLog 4916
+RMD160 84db8b7d9129d03d7574ee101fce4bae5bf15a04 ChangeLog 4916
+SHA256 6e0c23542cdd6f66549ac3e8b4526ce0e4ca49644c0460c3fecfb5be529ca6ea ChangeLog 4916
 MISC metadata.xml 162 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 SHA1 0d9e341c4b61e23adc1f3806989a0236b83257a0 SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22
 MD5 eb03775ece62e57725480e782cd84ee8 metadata.xml 162
 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 metadata.xml 162
@@ -23,3 +30,10 @@ SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22 metadata
 MD5 1807d88fc35553dcc67ef87a044d744c files/digest-ispell-3.2.06-r6 524
 RMD160 ad71651e16693b5f28d9269f00fd0777388f32c3 files/digest-ispell-3.2.06-r6 524
 SHA256 a40a394c389a994a40614f782c25212556308adfb2450bcf97184b6818a1b13b files/digest-ispell-3.2.06-r6 524
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGxvYhCkvF58q80IkRAkSfAJ9gB1OuUeJV/Pne+q0hvfauWOvfAACdH34u
++DQRp+8lbQ7OUWH8kQt94QM=
+=dKSO
+-----END PGP SIGNATURE-----
diff --git a/app-text/ispell/files/ispell-3.2.06-stripping.diff b/app-text/ispell/files/ispell-3.2.06-stripping.diff
new file mode 100644
index 000000000000..d53678c8e64c
--- /dev/null
+++ b/app-text/ispell/files/ispell-3.2.06-stripping.diff
@@ -0,0 +1,30 @@
+diff -Naur ispell-3.2.06.orig/Makefile ispell-3.2.06/Makefile
+--- ispell-3.2.06.orig/Makefile	2007-08-18 15:15:59.000000000 +0200
++++ ispell-3.2.06/Makefile	2007-08-18 15:17:44.000000000 +0200
+@@ -254,7 +254,6 @@
+ 	@. ./config.sh; \
+ 	  set -x; \
+ 	  cd $$BINDIR; \
+-	  strip ispell; \
+ 	  chmod 755 ispell
+ 	@. ./config.sh; \
+ 	  set -x; \
+@@ -294,7 +293,6 @@
+ 	@. ./config.sh; \
+ 	  set -x; \
+ 	  cd $$BINDIR; \
+-	  strip buildhash icombine ijoin sq unsq; \
+ 	  chmod 755 buildhash icombine ijoin \
+ 	    munchlist findaffix tryaffix sq unsq
+ 	@. ./config.sh; \
+diff -Naur ispell-3.2.06.orig/deformatters/Makefile ispell-3.2.06/deformatters/Makefile
+--- ispell-3.2.06.orig/deformatters/Makefile	2001-07-25 23:51:48.000000000 +0200
++++ ispell-3.2.06/deformatters/Makefile	2007-08-18 15:25:47.000000000 +0200
+@@ -76,7 +76,6 @@
+ 	@. ../config.sh; \
+ 	  set -x; \
+ 	  cd $$BINDIR; \
+-	  strip $(PROGRAMS); \
+ 	  chmod 755 $(PROGRAMS)
+ 
+ clean:
diff --git a/app-text/ispell/ispell-3.2.06-r6.ebuild b/app-text/ispell/ispell-3.2.06-r6.ebuild
index ae111ba2f1ca..1485c178e8b4 100644
--- a/app-text/ispell/ispell-3.2.06-r6.ebuild
+++ b/app-text/ispell/ispell-3.2.06-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ispell/ispell-3.2.06-r6.ebuild,v 1.16 2006/03/25 06:38:14 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ispell/ispell-3.2.06-r6.ebuild,v 1.17 2007/08/18 13:37:30 philantrop Exp $
 
 inherit eutils
 
@@ -15,16 +15,15 @@ LICENSE="as-is"
 KEYWORDS="alpha amd64 hppa mips ppc ppc-macos sparc x86"
 IUSE=""
 
-DEPEND="sys-apps/sed
-	sys-devel/bison
-	sys-apps/miscfiles
-	>=sys-libs/ncurses-5.2"
+DEPEND="sys-apps/miscfiles
+		>=sys-libs/ncurses-5.2"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/${PF}-gentoo-${PATCH_VER}.diff
-	epatch ${FILESDIR}/${P}-patch.diff
+	cd "${S}"
+	epatch "${WORKDIR}/${PF}-gentoo-${PATCH_VER}.diff"
+	epatch "${FILESDIR}/${P}-patch.diff"
+	epatch "${FILESDIR}/${P}-stripping.diff"
 }
 
 src_compile() {
@@ -57,7 +56,7 @@ src_install() {
 	rmdir ${D}/usr/share/man/man5
 	rmdir ${D}/usr/share/info
 
-	dodoc Contributors README WISHES
+	dodoc Contributors README WISHES || die "installing docs failed"
 
 	dosed ${D}/usr/share/man/man1/ispell.1
 }