Drop -O0. Bug #382265

Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64

4 files changed, 36 insertions, 25 deletions

diff --git a/x11-misc/pcmanfm/ChangeLog b/x11-misc/pcmanfm/ChangeLog
index 983b92c51de5..49b16fcb2ee7 100644
--- a/x11-misc/pcmanfm/ChangeLog
+++ b/x11-misc/pcmanfm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/pcmanfm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/ChangeLog,v 1.65 2011/09/08 13:36:32 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/ChangeLog,v 1.66 2011/09/10 11:40:05 hwoarang Exp $
+
+  10 Sep 2011; Markos Chandras <hwoarang@gentoo.org> pcmanfm-0.9.9.ebuild,
+  pcmanfm-9999.ebuild:
+  Drop -O0. Bug #382265
 
   08 Sep 2011; Tony Vroon <chainsaw@gentoo.org> pcmanfm-0.9.9.ebuild:
   Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo &
diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest
index 2f584bd25484..024503b25534 100644
--- a/x11-misc/pcmanfm/Manifest
+++ b/x11-misc/pcmanfm/Manifest
@@ -1,21 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 DIST pcmanfm-0.9.7.tar.gz 469027 RMD160 a5899e804af75771b3bf9a79b277c5e6ace8e94b SHA1 d1f0b68c650959ad4d54ec54f8c0c2503d6dd5c0 SHA256 38eeb2525b830c09efb229df0c8820c74c7312ac6c8acf2fcdebc35005508411
 DIST pcmanfm-0.9.9.tar.gz 561710 RMD160 793124a8ae309e9b28f6293330ff3c53d77bfd1b SHA1 de7099f57d7139a3d184cd162e02f5f5601667ec SHA256 bc48af4ade638b47e4207cc274f6e38c2bd3786a811d20da47c3df9907c6fb6c
 DIST pcmanfm-0.9.9_pre20110422.tar.gz 221796 RMD160 654195b6f0dcd40da417e8158232208e3b2e01b9 SHA1 5d608fe0cd9db887469d6672ea310a9aac8cce4f SHA256 a03b3649d1f1aeadcee883b7b7c2fe925ba67a0daddecfbd99e871eb05606377
 DIST pcmanfm-0.9.9_pre20110614.tar.gz 232107 RMD160 f3ee57c0c26d35642dbcb01b687c15f0fb1fc952 SHA1 ae3e4b2e935045216a1d9364da0a87fca09c7a25 SHA256 185c603f558ab2629f6c3e9174eeb14708c9aa6d953698dc6d5d4338544a71f1
 EBUILD pcmanfm-0.9.7-r2.ebuild 1204 RMD160 4b194ffd4212ec3368447352fe17101adec50fe2 SHA1 9b99e7b818efefda69d54fd83b6a1461cc6d93fd SHA256 8a49a6b401ec38218d61093db2b798b5499bb0de8061e6cb33913967e8756219
-EBUILD pcmanfm-0.9.9.ebuild 1265 RMD160 673bacd28cc317d2244be99684f7c876a53fa2b6 SHA1 be559108a81df690c5822ea1499af4d079d02a84 SHA256 5d117b03e2239668dd4ce0d66855523892811a5575b4e1a0453a63028b9d7b91
+EBUILD pcmanfm-0.9.9.ebuild 1355 RMD160 2dad8ac0f52a8f80295cbc08fe5fa1770910923c SHA1 6a88dbccbbdef19b27fdfdbfdec12fec13369b9c SHA256 9b6fa0696647cbae64c201bd5a83934ea94941d17ee3adb65ea704941977bde8
 EBUILD pcmanfm-0.9.9_pre20110422.ebuild 1647 RMD160 b58717b266a6c1f3cf2c940a214c876d2f296794 SHA1 76044c3eac875f215c2ddd8b24e6b63de6bd2f53 SHA256 3d0292c054ed20bf7dae86aae18a55e55d1404b4cf88a57f74ae63ac338ef187
 EBUILD pcmanfm-0.9.9_pre20110614.ebuild 1705 RMD160 a694621fc5cf77b6345c8309f8d0086939e3a7ed SHA1 238a4865abb967527b61fe6b0b5a96f757c47c31 SHA256 5be9c5f69a14a1e530ce1e0c886b072b15138fd86ad522ec088c3173a2e7b9f2
-EBUILD pcmanfm-9999.ebuild 1434 RMD160 43afda0f09fa6c48e67b96c129a4e99b1e68193b SHA1 4cf041b1ad3f58239a4095f797a778b0aef38501 SHA256 d9deb69aff93c703b2b6015adfaf4e64fc9706df8ecbdb271334bd9893d0688c
-MISC ChangeLog 10261 RMD160 ddd0a281deb960d00bea798b871fb3f5e9547be1 SHA1 8177ea25d6c32ff6bffefd689651801111569a1c SHA256 8e6dd42b717fa82fe0d991265c5f995095265126dffd4c2715aa4b9b4ceda543
+EBUILD pcmanfm-9999.ebuild 1315 RMD160 2e70379094d1ac5cdc98d28b3cc0a0a552929cf4 SHA1 b3a992bdef8793e63c24475082d6d43a87d94cab SHA256 d7deba5019d4fb3139504d9bb9237e302015cbb4f2444f277ff3bd09ca328471
+MISC ChangeLog 10384 RMD160 e5d75b03719c9f92cb9d070c89b26fb56cb0d278 SHA1 d066f51a0b6b39d374edd7e2184eb7fa1c745557 SHA256 f977b0be99ec4738386ab1c9c37f2d3ab767f0572b66661bc524b1dd75b829e7
 MISC metadata.xml 258 RMD160 76f57e6a789f82fc2431659ada7d63dc89e11c52 SHA1 9a1dd3846551b0bb5ce1b2888290540fb40868e6 SHA256 8ca1876e89d1f46e2238b73f2e8f88589e2bc13dae7237d153bfe8c711531e92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5oxOoACgkQp5vW4rUFj5o1DACcCigwEGRS3bnuyVsL9wiuk2sg
-zScAoK/JGC3PLuzVTEPFpLBLGzshnDhf
-=XJYK
+iQIcBAEBCgAGBQJOa0yZAAoJEPqDWhW0r/LCB7MP/3gQMNNQ1DRUeIImYEDAbtE5
+FPHOUrq6TpbxhJMR19odon3x88NlAm464+Jh42ZiEYXYrWnP9uxpCU/Dt+EiejZj
+FMOq6gQyWd2dHujVrxU/wIYgIEtbdP2ulPFn/v4c35Wnz0eMJmTfEBh04s7AeCKS
+sNkV9e+rZYphDZkstKmC+MarTeV9vPPhwI0Lh9WF1EAM7ThEg7OYusJtZq0Y2Qp0
+PQ/ceDgXmshZbrIM7VZ17+NLxbswL9kKTOAOciVQOy4JdYSVHqu1K8h0zHWdMLkD
+4cdNlG74ZHdtBtIWX8qmtduLQPLc960Diq7BfuULywpKDzPp1kdPPcwVjQkTEKxd
+mlJDQcfR1IEa2UO2rUuLKOPs7XHsIxZRYZWi/3uUoxe5abwnKQ5pnn6+dbt/+hps
+43S4arfJYummOH/qiLGNZiDSZsQPU0Ih5kdgo0ylPUOjC2WYEr12Dynx3WvHZBU5
+gkt9Xy4JcW1vXsC/OYSnjywYhMeHk512hNBfVmX/s2kE2G8EFPZrTGG9x6qEc0/B
+XfAVmfDgANVfjA1MW9XrKRFwblhPMwYk118G+z3g2EOIByb5svaNqhjkecmKnzrU
+e890JEzpp/0m3TzwYxPrhmbaPL2ADJroiWDIGUz9MydtkrGzNaob1DE3ZwQIpySM
+JepWScNRKgNp6DuPhS7N
+=iYZb
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/pcmanfm/pcmanfm-0.9.9.ebuild b/x11-misc/pcmanfm/pcmanfm-0.9.9.ebuild
index 4532f3b00aea..f4c96304c7f1 100644
--- a/x11-misc/pcmanfm/pcmanfm-0.9.9.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-0.9.9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-0.9.9.ebuild,v 1.3 2011/09/08 13:36:32 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-0.9.9.ebuild,v 1.4 2011/09/10 11:40:05 hwoarang Exp $
 
 EAPI=4
 
-inherit fdo-mime
+inherit autotools fdo-mime
 
 DESCRIPTION="Fast lightweight tabbed filemanager"
 HOMEPAGE="http://pcmanfm.sourceforge.net/"
@@ -31,6 +31,10 @@ src_prepare() {
 	# Fix desktop icons
 	sed -i -e "/MimeType/s:=.*normal;:=:" "${S}"/data/${PN}.desktop \
 		|| die "failed to fix desktop icon"
+	# drop -O0. Bug #382265
+	sed -i -e "s:-O0::" "${S}"/configure.ac
+	eautoreconf
+
 }
 
 src_configure() {
diff --git a/x11-misc/pcmanfm/pcmanfm-9999.ebuild b/x11-misc/pcmanfm/pcmanfm-9999.ebuild
index 8c369d4f1c25..bfe0c3377255 100644
--- a/x11-misc/pcmanfm/pcmanfm-9999.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-9999.ebuild
@@ -1,19 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-9999.ebuild,v 1.11 2011/08/09 22:36:47 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-9999.ebuild,v 1.12 2011/09/10 11:40:05 hwoarang Exp $
 
 EAPI=3
 
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/${PN}"
-	inherit autotools git-2
-	SRC_URI=""
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-linux"
-fi
-
-inherit fdo-mime
+EGIT_REPO_URI="git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/${PN}"
+inherit autotools fdo-mime
 
 DESCRIPTION="Fast lightweight tabbed filemanager"
 HOMEPAGE="http://pcmanfm.sourceforge.net/"
@@ -21,6 +13,7 @@ HOMEPAGE="http://pcmanfm.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug"
+KEYWORDS=""
 
 COMMON_DEPEND=">=dev-libs/glib-2.18:2
 	>=x11-libs/gtk+-2.22.1:2
@@ -35,10 +28,10 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext"
 
 src_prepare() {
-	if [[ ${PV} == 9999 ]]; then
-		intltoolize --force --copy --automake || die
-		eautoreconf
-	fi
+	intltoolize --force --copy --automake || die
+	# drop -O0. Bug #382265
+	sed -i -e "s:-O0::" "${S}"/configure.ac
+	eautoreconf
 }
 
 src_configure() {