Fix CFLAGS parameters. Should fix build on gcc-4.6. Fixes bug #376567.

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

diff --git a/media-gfx/graphite2/ChangeLog b/media-gfx/graphite2/ChangeLog
index ccc7e219ca0774b44700d4465c926c3b0933fbce..7d5ace21621bc58a5de3d5695fbbae9bea378fd3 100644 (file)
--- a/media-gfx/graphite2/ChangeLog
+++ b/media-gfx/graphite2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/graphite2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.2 2011/07/27 09:59:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.3 2011/07/27 10:06:52 scarabeus Exp $
+
+  27 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> graphite2-0.9.4.ebuild:
+  Fix CFLAGS parameters. Should fix build on gcc-4.6. Fixes bug #376567.
 
   27 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   +files/graphite2-disablefonttest.patch,

diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index ef73a3ed592bb71a8db201547383a19a4dc0a075..0a64320b2f27c44bb6057e6cedd342ade302a705 100644 (file)
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 AUX graphite2-disablefonttest.patch 3239 RMD160 05de65868555648df40abd219f18855d24440ffe SHA1 4ae5238eaf376ac362e0e70c6f5ba5eded404b3f SHA256 4f216133001c45c0748f870fdfb2afce03be3369409ff63717edecec7b5f2e9d
 AUX graphite2-includes-libs-perl.patch 536 RMD160 ae964c2aacd8a8d6383b25c1f045fe4771558b09 SHA1 9209a91a11f3e9feb6fd3a449b85d8d1b185788f SHA256 84a1bff6793b9fd49268b9e5927ac249e960d34cac119fe17b8cf35032c9f11b
 DIST graphite2-0.9.4.tgz 3548861 RMD160 6181dd3ecc9741f36255cc431a630243fc7c90cb SHA1 bf7c359c5338b8e0ea54a72985c6c9adb16f6fb8 SHA256 75ea41360ddf0d84364a790c0494708a4e14643915ad517309d330ceb34b60ee
-EBUILD graphite2-0.9.4.ebuild 1700 RMD160 f96eebba29e8dd5f647310364ec94b030e92f557 SHA1 979fc580598376afd4765c0184ea24abb4b6b7c4 SHA256 5a2e5425909304c78eb68bd4deb024ae9bb2044e7fce415bef85967bbd8da61d
-MISC ChangeLog 618 RMD160 cfbd9a26647aa033978cd82670d4e1354b6d80d2 SHA1 b2b51bec82dea9a3b8515623fb6a7ccaf4171848 SHA256 32d041d7fcd4414bbd264fc681a39df591eb6196dcab40a6c42f4b6e73eec54c
+EBUILD graphite2-0.9.4.ebuild 1792 RMD160 e50a8c09dfab23ef525657c5a78888f84a8e24a4 SHA1 00b001790b26b77bcca97603e35805cced4fc791 SHA256 8e2c2ac9a439feed0365a1c20c914f2bec8101bb9d019a405d611282a14ae20e
+MISC ChangeLog 771 RMD160 af56f68e4c73eb27402ff73dd35692339af47d0c SHA1 5d6b9439e6671b205bdad4a3c550fcfe0ebf8bf8 SHA256 63a924d240c9687be7747048c1845ede0d7cafe4566b4116cfb671ab7d1fc744
 MISC metadata.xml 163 RMD160 68888b3756b2cf14b88ff5aa31e4fd07c9cc9713 SHA1 bd3e6fae69f40f453bc382ae8f1a7644a590a9cc SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4v4Z8ACgkQHB6c3gNBRYeJOwCgw/YXJDA5SasqIhy0RSltOEjI
-y5wAn2V41kWFpXZfPl5/dRjCphFmJQWw
-=tenK
+iEYEARECAAYFAk4v4z0ACgkQHB6c3gNBRYcqqACeI4I2FfotwRFTos5/ILG/ue7+
+ldcAoK4IMUCFfuGlPkwBTy3vFz9kwq9f
+=1YLZ
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/graphite2/graphite2-0.9.4.ebuild b/media-gfx/graphite2/graphite2-0.9.4.ebuild
index ce13097a9fa0542c2b3590f7cdb304e26c43eedb..4f50cb2cf3996b1a49d2599579f51a1eea89949d 100644 (file)
--- a/media-gfx/graphite2/graphite2-0.9.4.ebuild
+++ b/media-gfx/graphite2/graphite2-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-0.9.4.ebuild,v 1.2 2011/07/27 09:59:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-0.9.4.ebuild,v 1.3 2011/07/27 10:06:52 scarabeus Exp $
 
 EAPI=4
 
@@ -40,6 +40,11 @@ pkg_setup() {
 src_prepare() {
        base_src_prepare
 
+       # fix CFLAGS
+       sed -i \
+               -e 's:-nodefaultlibs -nostdlibs::' \
+               src/CMakeLists.txt || die
+
        # fix perl linking
        if use perl; then
                _check_build_dir init