do not screw with flags; fix gcc #148285

Package-Manager: portage-2.1.2_pre1

3 files changed, 25 insertions, 17 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index 3b10f1283e46..53b4d6117696 100644
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,11 +1,10 @@
 # ChangeLog for app-text/ghostscript-gpl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.5 2006/09/22 23:13:30 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.6 2006/09/23 02:37:18 vapier Exp $
 
   22 Sep 2006; Stefan Schweizer <genstef@gentoo.org>
   ghostscript-gpl-8.54.ebuild:
-  -O0 fails, thanks Salah Coronya <salahx@yahoo.com> in bug 148285 and
-  automake fixes, bug 148368
+  automake fixes #148368.
 
   14 Sep 2006; Stefan Schweizer <genstef@gentoo.org>
   ghostscript-gpl-8.54.ebuild:
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 1f9848773e04..aaef3a37894d 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gdevcups.patch 14468 RMD160 957e089ff3c85bec4412fa876570503eeedab167 SHA1 23798ea3a739b71fadcf9066b27ad6f3b4c1c608 SHA256 6759754addb447874b682f99058e3f620819814ae51ca24b97c2d70452f98869
 MD5 8b3c391af1131b4fce97bef3659e57d3 files/gdevcups.patch 14468
 RMD160 957e089ff3c85bec4412fa876570503eeedab167 files/gdevcups.patch 14468
@@ -51,14 +54,14 @@ DIST adobe-cmaps-200406.tar.gz 5001983 RMD160 284b943b3476f6f7e2bc49842fd027c6f7
 DIST cups-1.1.23-source.tar.bz2 8705521 RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 SHA1 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e
 DIST gdevhl12.c.gz 7613 RMD160 3adffbf7df824abd02242dadf847b09246f411bb SHA1 b5ac9ebe654b0ace453f1aec501dd363311efeed SHA256 3905677ab494a1b82ee2a6cc78975a5fdc08d81a65c12af35746bb3d2889b3e2
 DIST ghostscript-8.54-gpl.tar.bz2 12365361 RMD160 f61f6da568ffe440a466cd0d7b5871a3d87d1116 SHA1 5da69b04ddc8a4660a2c40b0e561a358c737c310 SHA256 64f43553223390a3e519efed2b3dfee8a4c79df5a373a0e96861483565957e1b
-EBUILD ghostscript-gpl-8.54.ebuild 5065 RMD160 cebf0cec2dd4b70b80504dcd8c23663ee36907b2 SHA1 00850844a1f616265b6a05738cc61c323ffd26c5 SHA256 4654fc87b9be979777871ad39fdd1ebf0ca90c81d9f6218bfe27d13adcf5aa7d
-MD5 f391411105ca6f475127f315ca00f7e8 ghostscript-gpl-8.54.ebuild 5065
-RMD160 cebf0cec2dd4b70b80504dcd8c23663ee36907b2 ghostscript-gpl-8.54.ebuild 5065
-SHA256 4654fc87b9be979777871ad39fdd1ebf0ca90c81d9f6218bfe27d13adcf5aa7d ghostscript-gpl-8.54.ebuild 5065
-MISC ChangeLog 1752 RMD160 cc052f109618335810ca563e99e940e751820489 SHA1 40db0b3f13db6ebb3e98d9ba867172d554ad36df SHA256 5a132688c6f69de4f628cb4b3edaf151d81f213fb6f4d328dde7d81ab632efa4
-MD5 bf558dabbf309561fc289af798c68ad5 ChangeLog 1752
-RMD160 cc052f109618335810ca563e99e940e751820489 ChangeLog 1752
-SHA256 5a132688c6f69de4f628cb4b3edaf151d81f213fb6f4d328dde7d81ab632efa4 ChangeLog 1752
+EBUILD ghostscript-gpl-8.54.ebuild 5021 RMD160 88084145729b2c9b94f3e3345b8ef0a9c687bd6d SHA1 d9bc8a79478cc26fb66accefcc39eed000fb6e5d SHA256 98a0c83c89439c60389d08636d465d686681da90f33d72c83b22af809d4aead2
+MD5 20bc6872e27aaf34c8eccf2bd1240874 ghostscript-gpl-8.54.ebuild 5021
+RMD160 88084145729b2c9b94f3e3345b8ef0a9c687bd6d ghostscript-gpl-8.54.ebuild 5021
+SHA256 98a0c83c89439c60389d08636d465d686681da90f33d72c83b22af809d4aead2 ghostscript-gpl-8.54.ebuild 5021
+MISC ChangeLog 1677 RMD160 7650bde2a22fe8836acb333c55d99530c4322c67 SHA1 dcd21f63d33eef0bc045613929159c59f859b546 SHA256 5c68c3aef2c49a389774fc3cc5e5c7d4366fdcb60240c2cdf177147c96be9bd3
+MD5 b0bc4c9812180302713dcfb552943903 ChangeLog 1677
+RMD160 7650bde2a22fe8836acb333c55d99530c4322c67 ChangeLog 1677
+SHA256 5c68c3aef2c49a389774fc3cc5e5c7d4366fdcb60240c2cdf177147c96be9bd3 ChangeLog 1677
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -66,3 +69,10 @@ SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata
 MD5 f413f662af5f87988a599dc33e91d034 files/digest-ghostscript-gpl-8.54 1256
 RMD160 791369f9e6660f57a5ea66017149ebfd9681d38f files/digest-ghostscript-gpl-8.54 1256
 SHA256 54f7d51625c2e99b3c3b66ea76109a8168805dd3b4314f35a749837c3dad5762 files/digest-ghostscript-gpl-8.54 1256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFFJ3uamhnQswr0vIRAiKyAKC9HDR4N6+oPrT8v2ITkOTgEqd+QwCgr1vf
+fFcSPoAenqrT2YLnumzC56k=
+=K9du
+-----END PGP SIGNATURE-----
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.54.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.54.ebuild
index e3b6d5829899..65e493966c8b 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.54.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-8.54.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/ghostscript-gpl/ghostscript-gpl-8.54.ebuild,v 1.5 2006/09/22 23:13:30 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.54.ebuild,v 1.6 2006/09/23 02:37:18 vapier Exp $
 
 WANT_AUTOMAKE=1.6
 inherit autotools elisp-common eutils versionator flag-o-matic
@@ -114,16 +114,15 @@ src_unpack() {
 	sed -i -e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
 		-e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
 		src/Makefile.in src/*.mak || die "sed failed"
-	
-	# -O0 broken, bug 148285
-	replace-flags -O0 -O2
 }
 
 src_compile() {
-	econf $(use_with X x) \
+	econf \
+		$(use_with X x) \
 		$(use_with jpeg2k jasper) \
 		--with-ijs \
-		--with-jbig2dec || die "econf failed"
+		--with-jbig2dec \
+		|| die "econf failed"
 	emake STDDIRS || die "emake failed"
 
 	cd ijs