Added pch USE and do not mix CFLAGS/CXXFLAGS

Package-Manager: portage-2.2_rc83/cvs/Linux x86_64

6 files changed, 26 insertions, 301 deletions

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 6505d1142c9a..fb8550097532 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/p7zip
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.128 2010/08/13 13:41:00 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.129 2010/09/19 09:26:59 jlec Exp $
+
+*p7zip-9.13-r1 (19 Sep 2010)
+
+  19 Sep 2010; Justin Lecher <jlec@gentoo.org> -p7zip-4.57.ebuild,
+  -p7zip-4.58-r1.ebuild, -p7zip-4.65.ebuild, -p7zip-9.04.ebuild,
+  +p7zip-9.13-r1.ebuild:
+  Added pch USE and do not mix CFLAGS/CXXFLAGS
 
   13 Aug 2010; Joseph Jezak <josejx@gentoo.org> p7zip-9.13.ebuild:
   Marked ppc stable for bug #326831.
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 82a0bed2c3f4..c9dca57423b0 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -7,24 +7,19 @@ AUX 4.65-makefile.patch 450 RMD160 9f3de770dd3d74d3546c871364ee527bb9c9d3b6 SHA1
 AUX 9.04-kde4.patch 5185 RMD160 57433a9b1dbfb44b7d8b362e1cee5a5a9b5e641c SHA1 e2bbbc7ac6563ac5f097e66263b5801ecdebbc80 SHA256 facc613f8c684ca2c0baff4c89e99f0abe29b12b96ef2281e17a0041e07631c3
 AUX 9.04-makefile.patch 470 RMD160 3b114968d83174ef78acc0e9fce81fcfc7fe862e SHA1 3a3333d4703955664fdd4023c624ab4828af0ab1 SHA256 c8ef2898ed994929600c04ed0ecfd2dc2b94982d274ee217cbc05234c37750f6
 AUX p7zip 1210 RMD160 0f331392eb77077ea6c100011326202661e9b6ab SHA1 b4e1e02081e28ece33d2a8303ee69c5f0e9ad239 SHA256 28d181cd1c43628da0adb485e20f270461b6cf8d743d2187a3380f7799fbc2d5
-DIST p7zip_4.57_src_all.tar.bz2 1473608 RMD160 af40563b4ead84d138e9fff03a2677540c50d29d SHA1 eda5de3d35567e2633373dbe60313527a6a4db27 SHA256 00e923386dd53d532a86331d1694eaeee626783afa503f91edf7370357e05b53
 DIST p7zip_4.58_src_all.tar.bz2 1948207 RMD160 2c31ab657275dc01d2d23c5de2327d5ee46f4e8a SHA1 7525bbb12ec94186e9e40d3614cdfd5f6f63cab6 SHA256 52391559b7782d2bad45b783579ea9825f28670ba6f234fd0d9248af3e82bedd
 DIST p7zip_4.65_src_all.tar.bz2 2501418 RMD160 1749032c16e7c5afaa79bc123db33d61acc79eba SHA1 988f6ec63e93e6ec23492fd39e3b48a58fd695d1 SHA256 691cc9419a73a9348319f5b2c3ba2655471bee052c6c7fa57a226800c89ab07f
-DIST p7zip_9.04_src_all.tar.bz2 3759021 RMD160 2d9caf81dd3fc038441be7e1e592a972a1114df7 SHA1 6430fcd3a5e16d0a30f1eebf34a085e5372b813b SHA256 ddfbb6795a14bcab1f9622096fe9385c239b43c3f6a9a80d85021849f738f9ab
 DIST p7zip_9.13_src_all.tar.bz2 3753579 RMD160 beb9181330f4dfa75aa4f473c68a462c76b7ab19 SHA1 81da0729561ce123c0a82656ec96a04ad5bfa522 SHA256 fc9c0fa2eabd367d6adbc3ea07bb305dbdc1f68717eea362c8c074b91c03d923
-EBUILD p7zip-4.57.ebuild 2524 RMD160 8559df68a75b045a97cf4de50a521f6797097483 SHA1 d18c522002c6240cd6db595fce9b2b6c8d1ca113 SHA256 9f83a19a9e06732263b4b7879be8f78f21b992382c234eac7f1bc2631cab23f7
-EBUILD p7zip-4.58-r1.ebuild 2314 RMD160 4110d47453070a41cd567aba2f14cf8698df7ce4 SHA1 197cc7670f4a3362062a6e6eccf049c38a52cd9a SHA256 9efeda274daf10f1ea62e7312910aa1d3a17216ded8496af6d70749654eddbe4
 EBUILD p7zip-4.58.ebuild 2276 RMD160 9755629c5d99b60afae5b56a64b1d0407b3c9b3e SHA1 e8de5f15c4b1850068e7134de55425633334adda SHA256 4e87189dfefe899161a7aaa8349d9a2a7842b219185e50b8ef0cb9359b42e3fd
 EBUILD p7zip-4.65-r1.ebuild 3705 RMD160 eabb596da9883417ecd255a64d644afe6f227eef SHA1 744a4983d4fcac91f0ba7f536f951f7d0af49901 SHA256 e65498de7ba3c3e8ca87085102a2f6edeedb96afb13b70167f008dc969c27817
-EBUILD p7zip-4.65.ebuild 3569 RMD160 69d6e9832afda983f9d49152098477f6f30bb31f SHA1 4f518c09fb52758e55c6d8386ac0bf84f8b04bf5 SHA256 e9fc6d80a362b239d06e76fa6b211b44739ca9107c0b82ba19a9d03dd4f8c82f
-EBUILD p7zip-9.04.ebuild 3853 RMD160 e3bbef3c3cf2964b8a59eb0c124470d4717bf285 SHA1 152cb137784ff2ba5af503874be03c6cb3079a09 SHA256 ff4216229edc3944fc5e2c6505dca1cf2d04f3c257c6f1b16777de14edada6e8
+EBUILD p7zip-9.13-r1.ebuild 4066 RMD160 77160b72c0dd870c7b35c806cbb973d5e13716ad SHA1 80d423bb178ebaf956bdfdf3b8802e28d4e0fe39 SHA256 c40ef20a20cfdd2e46ed7b03b1c8fa7a1f6f65c8698ec40cc2514c7f2f38fffb
 EBUILD p7zip-9.13.ebuild 3845 RMD160 028d662c756ff34c98ed22d2a77761824b4c766c SHA1 e7c59d5aa7cf37a67f73e855f8d6f549e5cb042f SHA256 082e2c9753ae128480b0bdf4e9fe8402e44ec386cc48c6503a36009d5cfb3cb3
-MISC ChangeLog 16244 RMD160 0e3c0989b7f9df04c8503b69e9abd19af52839f9 SHA1 f3a749b93f2c78717f476e8a317f096491bac825 SHA256 6264d7ee700c04aa33bc6754846e64f292fa2b4f5b78b5d1896822e9bb619eae
+MISC ChangeLog 16477 RMD160 686b53aecfbd91c868827ffe5001a0cb753d3a01 SHA1 1767c32938a6fe466afb5729fb49ba864dacfc9c SHA256 0afd3254a6fe6f9c05b9dd2ddda4a25dda6f7d8f8c5bd1b7694d9eb1fc56e045
 MISC metadata.xml 403 RMD160 e0525b688d7e49c113379f1da3cb48f7dd283339 SHA1 b792f63297087a3671ac45773e8f4b111f624572 SHA256 7a27b824829214305e00f9a9732fb3ba6325da30425b5e04b775d2bf2d93cedb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxlSxoACgkQcsIHjyDViGS5cACgm5dUSQNe7xjwLlPLPpNF3G4d
-eOQAn1P7CNB0vjM/gV3W9tTqZtr3m2bc
-=cXHs
+iEYEARECAAYFAkyV12oACgkQgAnW8HDreRZoiQCfYFIwVAWjjJK60VYrFrvNxlxY
+hhsAoKBfqq1b7Sin22KyaKNcnR8ZbsmC
+=teT0
 -----END PGP SIGNATURE-----
diff --git a/app-arch/p7zip/p7zip-4.57.ebuild b/app-arch/p7zip/p7zip-4.57.ebuild
deleted file mode 100644
index 63bfb58a3831..000000000000
--- a/app-arch/p7zip/p7zip-4.57.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.57.ebuild,v 1.7 2008/03/16 17:40:56 nixnut Exp $
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="Port of 7-Zip archiver for Unix"
-HOMEPAGE="http://p7zip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="static doc"
-
-DEPEND=""
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e "/^CXX=/s:g++:$(tc-getCXX):" \
-		-e "/^CC=/s:gcc:$(tc-getCC):" \
-		-e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \
-		-e 's:-s ::' \
-		-e '/Rar/d' \
-		makefile* || die "changing makefiles"
-
-	if use amd64; then
-		ewarn "Using suboptimal -fPIC upstream makefile due to amd64 being detected. See #126722"
-		cp -f makefile.linux_amd64 makefile.machine
-	elif [[ ${CHOST} == *-darwin* ]] ; then
-		# Mac OS X needs this special makefile, because it has a non-GNU linker
-		cp -f makefile.macosx makefile.machine
-	elif use x86-fbsd; then
-		# FreeBSD needs this special makefile, because it hasn't -ldl
-		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
-	fi
-	use static && sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine
-
-	# patching to not included nonfree RAR decompression code is higher a sed call
-	# But we're removing nonfree code just in case sed wasnt enough
-	rm -rf CPP/7zip/Compress/Rar
-}
-
-src_compile() {
-	emake all3 || die "compilation error"
-}
-
-src_install() {
-	# this wrappers can not be symlinks, p7zip should be called with full path
-	make_wrapper 7zr "/usr/lib/${PN}/7zr"
-	make_wrapper 7za "/usr/lib/${PN}/7za"
-	make_wrapper 7z "/usr/lib/${PN}/7z"
-
-	dobin "${FILESDIR}/p7zip" || die
-
-	# gzip introduced in 4.42, so beware :)
-	# mv needed just as rename, because dobin installs using old name
-	mv contrib/gzip-like_CLI_wrapper_for_7z/p7zip contrib/gzip-like_CLI_wrapper_for_7z/7zg || die
-	dobin contrib/gzip-like_CLI_wrapper_for_7z/7zg || die
-
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx || die "doexe bins"
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe bin/*.so || die "doexe *.so files"
-
-	doman man1/7z.1 man1/7za.1 man1/7zr.1
-	dodoc ChangeLog README TODO
-
-	if use doc ; then
-		dodoc DOCS/*.txt
-		dohtml -r DOCS/MANUAL/*
-	fi
-
-	einfo "Please be aware that rar support was removed (it's nonfree)"
-	einfo "You can use app-arch/rar for rar support"
-}
diff --git a/app-arch/p7zip/p7zip-4.58-r1.ebuild b/app-arch/p7zip/p7zip-4.58-r1.ebuild
deleted file mode 100644
index 5a5c9f04f988..000000000000
--- a/app-arch/p7zip/p7zip-4.58-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.58-r1.ebuild,v 1.1 2010/02/15 21:10:46 jlec Exp $
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="Port of 7-Zip archiver for Unix"
-HOMEPAGE="http://p7zip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="static doc"
-
-DEPEND=""
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e "/^CXX=/s:g++:$(tc-getCXX):" \
-		-e "/^CC=/s:gcc:$(tc-getCC):" \
-		-e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \
-		-e 's:-s ::' \
-		-e '/Rar/d' \
-		makefile* || die "changing makefiles"
-
-	if use amd64; then
-		cp -f makefile.linux_amd64 makefile.machine
-	elif [[ ${CHOST} == *-darwin* ]] ; then
-		# Mac OS X needs this special makefile, because it has a non-GNU linker
-		cp -f makefile.macosx makefile.machine
-	elif use x86-fbsd; then
-		# FreeBSD needs this special makefile, because it hasn't -ldl
-		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
-	fi
-	use static && sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine
-
-	# patching to not included nonfree RAR decompression code is higher a sed call
-	# But we're removing nonfree code just in case sed wasnt enough
-	rm -rf CPP/7zip/Compress/Rar
-}
-
-src_compile() {
-	emake all3 || die "compilation error"
-}
-
-src_install() {
-	# this wrappers can not be symlinks, p7zip should be called with full path
-	make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
-	make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
-	make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
-
-	dobin "${FILESDIR}/p7zip" || die
-
-	# gzip introduced in 4.42, so beware :)
-	newbin contrib/gzip-like_CLI_wrapper_for_7z/p7zip 7zg || die
-
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx || die "doexe bins"
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe bin/*.so || die "doexe *.so files"
-
-	doman man1/7z.1 man1/7za.1 man1/7zr.1
-	dodoc ChangeLog README TODO
-
-	if use doc ; then
-		dodoc DOCS/*.txt
-		dohtml -r DOCS/MANUAL/*
-	fi
-
-	einfo "Please be aware that rar support was removed (it's nonfree)"
-	einfo "You can use app-arch/rar for rar support"
-}
diff --git a/app-arch/p7zip/p7zip-4.65.ebuild b/app-arch/p7zip/p7zip-4.65.ebuild
deleted file mode 100644
index 88cbeda0f8cf..000000000000
--- a/app-arch/p7zip/p7zip-4.65.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild,v 1.10 2010/06/07 06:43:56 jlec Exp $
-
-EAPI="2"
-WX_GTK_VER="2.8"
-
-inherit eutils toolchain-funcs multilib wxwidgets
-
-DESCRIPTION="Port of 7-Zip archiver for Unix"
-HOMEPAGE="http://p7zip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
-
-LICENSE="LGPL-2.1 rar? ( unRAR )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc kde rar static wxwidgets"
-
-RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/konqueror )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}_${PV}
-
-pkg_setup() {
-	use wxwidgets && wxwidgets_pkg_setup
-}
-
-src_prepare() {
-	if use kde && ! use wxwidgets ; then
-		einfo "USE-flag kde needs wxwidgets flag"
-		einfo "silently enabling wxwidgets flag"
-	fi
-
-	# remove non-free RAR codec
-	if use rar; then
-		ewarn "Enabling nonfree RAR decompressor"
-	else
-		sed -e '/Rar/d' -i makefile*
-		rm -rf CPP/7zip/Compress/Rar
-		epatch "${FILESDIR}"/${PV}-makefile.patch
-	fi
-
-	sed -i \
-		-e "/^CXX=/s:g++:$(tc-getCXX):" \
-		-e "/^CC=/s:gcc:$(tc-getCC):" \
-		-e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \
-		-e 's:-s ::' \
-		makefile* || die "changing makefiles"
-
-	if use amd64; then
-		cp -f makefile.linux_amd64 makefile.machine
-	elif [[ ${CHOST} == *-darwin* ]] ; then
-		# Mac OS X needs this special makefile, because it has a non-GNU linker
-		cp -f makefile.macosx makefile.machine
-		# bundles have extension .bundle
-		sed -i -e '/^PROG=/s/\.so/.bundle/' \
-			CPP/7zip/Bundles/Format7zFree/makefile || die
-	elif use x86-fbsd; then
-		# FreeBSD needs this special makefile, because it hasn't -ldl
-		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
-	fi
-	use static && sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine
-
-	# We can be more parallel
-	cp -f makefile.parallel_jobs makefile
-
-	epatch "${FILESDIR}"/${PV}-hardlink.patch
-}
-
-src_compile() {
-	emake all3 || die "compilation error"
-	if use kde || use wxwidgets; then
-		emake 7zG || die "error building GUI"
-	fi
-}
-
-src_test() {
-	emake test_7z test_7zr || die "test failed"
-}
-
-src_install() {
-	# this wrappers can not be symlinks, p7zip should be called with full path
-	make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
-	make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
-	make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
-
-	if use kde || use wxwidgets; then
-		make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
-
-		dobin GUI/p7zipForFilemanager
-		exeinto /usr/$(get_libdir)/${PN}
-		doexe bin/7zG
-
-		insinto /usr/$(get_libdir)/${PN}
-		doins -r GUI/{Lang,help}
-
-		if use kde; then
-			insinto /usr/share/icons/hicolor/16x16/apps/
-			newins GUI/p7zip_16_ok.png p7zip.png
-
-			insinto  /usr/share/apps/konqueror/servicemenus/
-			doins GUI/kde/*.desktop
-		fi
-	fi
-
-	dobin "${FILESDIR}/p7zip" || die
-
-	# gzip introduced in 4.42, so beware :)
-	newbin contrib/gzip-like_CLI_wrapper_for_7z/p7zip 7zg || die
-
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx || die "doexe bins"
-	doexe bin/*$(get_modname) || die "doexe *$(get_modname) files"
-	if use rar; then
-		exeinto /usr/$(get_libdir)/${PN}/Codecs/
-		doexe bin/Codecs/*$(get_modname) || die "doexe Codecs/*$(get_modname) files"
-	fi
-
-	doman man1/7z.1 man1/7za.1 man1/7zr.1
-	dodoc ChangeLog README TODO
-
-	if use doc ; then
-		dodoc DOCS/*.txt
-		dohtml -r DOCS/MANUAL/*
-	fi
-}
diff --git a/app-arch/p7zip/p7zip-9.04.ebuild b/app-arch/p7zip/p7zip-9.13-r1.ebuild
index 0edf1c783df7..405ab4092759 100644
--- a/app-arch/p7zip/p7zip-9.04.ebuild
+++ b/app-arch/p7zip/p7zip-9.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.04.ebuild,v 1.5 2010/06/07 06:43:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.13-r1.ebuild,v 1.1 2010/09/19 09:26:59 jlec Exp $
 
 EAPI="2"
 WX_GTK_VER="2.8"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc kde rar static wxwidgets"
+IUSE="doc kde rar +pch static wxwidgets"
 
 RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/konqueror )
 	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
@@ -27,6 +27,14 @@ pkg_setup() {
 }
 
 src_prepare() {
+	if ! use pch; then
+		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
+	fi
+
+	sed \
+		-e "/^CC/s:\$(ALLFLAGS):${CFLAGS} \$(ALLFLAGS):g" \
+		-e "/^CXX/s:\$(ALLFLAGS):${CXXFLAGS} \$(ALLFLAGS):g" \
+		-i makefile* || die
 	if use kde && ! use wxwidgets ; then
 		einfo "USE-flag kde needs wxwidgets flag"
 		einfo "silently enabling wxwidgets flag"
@@ -38,13 +46,12 @@ src_prepare() {
 	else
 		sed -e '/Rar/d' -i makefile*
 		rm -rf CPP/7zip/Compress/Rar
-		epatch "${FILESDIR}"/${PV}-makefile.patch
+		epatch "${FILESDIR}"/9.04-makefile.patch
 	fi
 
 	sed -i \
 		-e "/^CXX=/s:g++:$(tc-getCXX):" \
 		-e "/^CC=/s:gcc:$(tc-getCC):" \
-		-e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \
 		-e '/ALLFLAGS/s:-s ::' \
 		makefile* || die "changing makefiles"
 
@@ -69,7 +76,7 @@ src_prepare() {
 	# We can be more parallel
 	cp -f makefile.parallel_jobs makefile
 
-	epatch "${FILESDIR}"/${PV}-kde4.patch
+	epatch "${FILESDIR}"/9.04-kde4.patch
 
 	if use kde || use wxwidgets; then
 		einfo "Preparing dependency list"