Pass extra-cflags to configure instead, bug #449238 by Stef Simoens. Simplifies the ebuild.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 14 insertions, 26 deletions

diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index 9275be9eb9dd..f081e4b426aa 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/gpac
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.108 2013/08/14 20:08:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.109 2013/08/14 20:25:17 aballier Exp $
+
+  14 Aug 2013; Alexis Ballier <aballier@gentoo.org> gpac-0.5.0.ebuild:
+  Pass extra-cflags to configure instead, bug #449238 by Stef Simoens.
+  Simplifies the ebuild.
 
   14 Aug 2013; Alexis Ballier <aballier@gentoo.org> gpac-0.5.0.ebuild:
   factorize some code and sort alphabetically econf args
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index c2d29373602c..3f1a547a50d4 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -13,13 +13,13 @@ DIST gpac-0.4.5.tar.gz 4269054 SHA256 f4039763ebec6630dc38e5e030c6573b47ced28fd0
 DIST gpac-0.5.0.tar.gz 7861057 SHA256 42971ac39511a1b6d1db39af664ce887b38c8657328c88cd200d87a02de81c24 SHA512 dee7701c791c441c1f050d9591d4e4dd7bdd2908f535233b114959c9a0adc256b3d5e40f5c84fd0f8b1c6764bfe6b35ec0af6bfd1fb056d593aeedca75105278 WHIRLPOOL 1797afa09864a1e9632c121dc2076963ec5e73395abdcd76896d23dc675e03847a42d733ae9fc3bb29bd26b7b336ea0f49e6e8e79c87a0bd0458cd429a7bf271
 EBUILD gpac-0.4.5-r4.ebuild 4043 SHA256 69707121dc8df5ab7626d119e245860dde8531f06453bfdabc01eb85466f2964 SHA512 3e3e83ec3b85cc68ee02c6aae333dd5744f695644a9ba2059d52985c53d28ef34a46b12e20e8d64c44abc0b53646bd25afb5f98705251debf27d29c8973134ec WHIRLPOOL dfdb53525c535db7690ad946d359b7c96f3917ac42a8333fcfed14f6a0266f0ae1fbea0b5485e6e498ebdac7a66c50d8a76e2290d0ae80b2b11a17c7a5955acd
 EBUILD gpac-0.4.5-r5.ebuild 3925 SHA256 87648fbff68242aab58c11923d7789d9eab0f3148425fb035b73db2338b1bc92 SHA512 abb935789d504001b7727c7ca0ce44f86c0726d37812b1562f98e0df888c09c95c907049f7578ba76a5ac0016fdd16a795263851e8a9aac3b74fa3cb6a4587ab WHIRLPOOL 22d33b1056c127ec918031884bae543e7fdb9b1286d8586fab3ab7f99abcaf9097c08d960f0ef6ab31eca4c589c9b97e9dbdc4f7419ebe2ad27571a842527ac9
-EBUILD gpac-0.5.0.ebuild 3932 SHA256 9bd2a04b55b7f44c0c09f150d6b60d651a50d95cd4c32621bd1c46b310d244f7 SHA512 63625d99238f1547ccdab2c87a382730955721dbdeb652c6c071c9c43b62d65b8545f4fd3e1582aa789fcada19dc3aedf57f36a87518c789cbe7dcbe05ee2c19 WHIRLPOOL ebe96016ccc13145e75f0b9989a555d755643a52cedee6c22752a25682cb8a36b08605d67d2bffd490e9de0ab63d8001e3f5ac36fd4046d88649cddea722bdcc
-MISC ChangeLog 16036 SHA256 2872dc5a5e82517a86540919ef443dd88a3dfe7df7a4bb576a9cfa11b0db73be SHA512 b3a982e27662fdd2fa43fbfbef1702ca4876999f86867aeea01739ccd3b3130f7bb7c17f4576fc992eeaf9091e57971e91c4ac5259ba32cbb75e6f2dd6efcc56 WHIRLPOOL 86741c4a2117f11794cc97b650ac4466433a067efc2914078c53ff10624be98c63dc5a48401ea138eeeca1ad22626b2211cf80b46d63e1d72e1114ddaac56335
+EBUILD gpac-0.5.0.ebuild 3494 SHA256 42a74bddcd3f80d75400006dd610a22c73bef1aeea950986b78388be3ecd66d1 SHA512 5c8c96e05d1f9af9260d071165e0cc0804c1077b17bde1513d793d7d0e37330d8172249eca69191ef23454edb71c292f8c85a53c5214f689845c4911924c434e WHIRLPOOL e8f64f02bc48ba8400f49b411d8465552026fd430f77f325d261fa1df1cceecf18b8a04ba76d3dcdd388aeadc8ea5fc11d97462a4e561118072ba9ce83da8f7b
+MISC ChangeLog 16204 SHA256 0b5ba3e6a7bcb11879898b587aa02d919f058a8280baf84758ed597265c0b434 SHA512 ff366c819cfa66c2d3ffae04869b7eb75c86b7ad6883217d1269ba7f9b38a8c3346afe876b95a86dc7f68118b33f00e74101b339bb3f3c631fa583d3c1ae5ac0 WHIRLPOOL 5965d5d3406d4d37235ddf161f26a38cc53f90a00b3a4bd0491282282f99f67f266bba8e4dfc3f3b5c0866cff1557f8a069c73b722ae128b0f633d793ad4d2be
 MISC metadata.xml 233 SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a SHA512 89b49780f54132f4768196e82bc7c534157728f4ec8db2a2ce9c2748859d136a7622d5239848010ab72aea19ebfb0eea3d8563737b5b888a09f56134e3424c87 WHIRLPOOL 86f0c2c9825ec94c962485b82d678e412401eb73e74d030cdc4308e015880b0a0e77bf5ea671f0920d5e9e91b5c732c13bdb5903fbb6d0485dfad9026d554e6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIL49cACgkQvFcC4BYPU0rdPACdFUItMPW5CMK9H+U8OL0Yw6ve
-FhAAniDLoK22Ir4eSblW6IvgDVib2bML
-=DGx4
+iEYEAREIAAYFAlIL568ACgkQvFcC4BYPU0oc+gCeNZwfPbyGDvR9guGDqyUYh78W
+cJ8An16iIllURO98i2WRyW7glu58Igw4
+=kp3o
 -----END PGP SIGNATURE-----
diff --git a/media-video/gpac/gpac-0.5.0.ebuild b/media-video/gpac/gpac-0.5.0.ebuild
index 3198be8d6df5..3dba2c23b382 100644
--- a/media-video/gpac/gpac-0.5.0.ebuild
+++ b/media-video/gpac/gpac-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.5.0.ebuild,v 1.7 2013/08/14 20:08:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.5.0.ebuild,v 1.8 2013/08/14 20:25:17 aballier Exp $
 
 EAPI=4
 
@@ -79,14 +79,6 @@ src_prepare() {
 	else
 		sed -i -e "s:wx-config:wx-config-doesnotexist:g" configure || die
 	fi
-
-	# remove default rule for building objects from code, so that
-	# default make rules apply (fixes -fPIC issues)
-	sed -i -e '/^\%\.o: \%\.c/{N;d;}' \
-		src/Makefile modules/*/Makefile ||die
-
-	# use this to cut down on the warnings noise
-	#append-flags -fno-strict-aliasing
 }
 
 src_configure() {
@@ -121,22 +113,14 @@ src_configure() {
 		$(my_use truetype ft) \
 		$(my_use vorbis) \
 		$(my_use xvid) \
+		--extra-cflags="${CFLAGS}" \
 		--cc="$(tc-getCC)" \
 		--libdir="/$(get_libdir)"
-
-	#temporary build fix
-	cp config.h include/gpac/
-}
-
-src_compile() {
-#	#emake OPTFLAGS="${CFLAGS} -fPIC"
-#	LD="$(tc-getCC)" \
-	emake OPTFLAGS="${CFLAGS}"
 }
 
 src_install() {
-	emake STRIP="true" OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install
-	emake STRIP="true" OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install-lib
+	emake STRIP="true" DESTDIR="${D}" install
+	emake STRIP="true" DESTDIR="${D}" install-lib
 	dodoc AUTHORS BUGS Changelog README TODO INSTALLME
 	dodoc doc/*.txt
 	dohtml doc/*.html