Fixed and keyworded for ~x64-solaris

Package-Manager: portage-2.2.01.21418-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

4 files changed, 37 insertions, 9 deletions

diff --git a/media-gfx/graphite2/ChangeLog b/media-gfx/graphite2/ChangeLog
index f50cb4d002a0..e1f6551f4363 100644
--- a/media-gfx/graphite2/ChangeLog
+++ b/media-gfx/graphite2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/graphite2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.38 2012/12/24 04:04:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.39 2012/12/28 11:37:40 grobian Exp $
+
+  28 Dec 2012; Fabian Groffen <grobian@gentoo.org>
+  +files/graphite2-1.2.0-solaris.patch, graphite2-1.2.0.ebuild:
+  Fixed and keyworded for ~x64-solaris
 
   24 Dec 2012; Jeroen Roovers <jer@gentoo.org> graphite2-1.2.0.ebuild:
   Marked ~hppa (bug #447854).
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 54bc8b99aa74..253bdbb19069 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -4,14 +4,15 @@ Hash: SHA256
 AUX graphite2-1.0.2-no_harfbuzz_tests.patch 551 SHA256 901b0ec71b9ca8323dc4dce38e45932fc51549cb00a1672f9cc681826e4e261d SHA512 925c94bad27b6c870f684cad28440978475b0e920a0d644f7b668aa55c7f0b0f8dafd75f07a672a3c65f084aea39bc4d5d6d7e302b61069da99bff6065a7ce1f WHIRLPOOL 8f32282dd0bb738625e1b121bb5f5a6d4d2ab109fd785b7218a92cbe02c8df98f3462896d91b9dcc6a8ffeacfce6a83a76cf1444e82ec27be6109801872f2b45
 AUX graphite2-1.0.3-no-test-binaries.patch 620 SHA256 c51a69ed5e8ff6301d35aa97ca585aec6976d2ee3d7715c0fb04684dd0151660 SHA512 fb087122b0f4767aadb3e5a90b5e678b97ba61fe881f5f4d2346c2a3479a7795a95fec16ed00ed43f31c5f96a33299b37367adebf024d0c9a87ce5b5cc7a3be0 WHIRLPOOL 163ac65c4bf96e2b8ce4596994a6517f93791c21601adee626eca5d143cbff843229959a2e2a99949fdf9f3fa67fa7e05b7cc44d5c45fcddeab6d037a48e1b61
 AUX graphite2-1.1.0-includes-libs-perl.patch 685 SHA256 da7a24551fa9029214a909ae6a49070c12f889eae287ce2c392555b0299db32e SHA512 b041b81fd6cb787305ff2b08e32a99c2977b1c456c9f95e5909ade203403ac1f88d4ed88bd76e2062ef0149ce3d1256c254546e4dda14eaf808c17b8700570b1 WHIRLPOOL 284ba0607dc65d6c9eb4b0fd1ddeed45600be48cb3a1478f3f931b4cbdd0b41a3e4029ee5812f6d4f391fe5521af5242c0389691f3facb591d77eaf9f20f5fa1
+AUX graphite2-1.2.0-solaris.patch 512 SHA256 f79ba2b6c4f108fc02b76ec7e3ed046b153efc12c0cd5e0d8bb3e25398a72a4d SHA512 a21dc5e4eb57cbbd073f3a6ca24c8d0a635fe4713dbb1af717ab63e8d4ad89618af05a951abd325f472e26ce2a3fb4fa35652ea65cfcede99c9d85f5b67a47b8 WHIRLPOOL b09a0218f31b1816e3dd286dc70756f4b7da8fc7897cb18a7bcca2b442cbcf90e55d594fca2b98cda56e75d548eeb71185d4451eb136e32e5be4c13fcc1efe44
 DIST graphite2-1.2.0.tgz 4663935 SHA256 630fba251c7e570f2b0c4a0c63a7abb4d45b0246d390f53188b1a9b73de7b96e SHA512 56b88e1665f4aa7316ec4b3975dd5aa24b4420bbb86991ade0130f28c082c9121f651a351cffa893f32b1fc28085315c7b7521a9976eacd066e34bc54febdd21 WHIRLPOOL 8a679b9455cafb5bd2ca6d460bca5ea004191e81d353e38c6712c364b2e0334581d59c578e956bdd3317af0ca3a1d8d62c0f676bb768fe37065e9c972e944901
-EBUILD graphite2-1.2.0.ebuild 1904 SHA256 2bd36f06b90fcaa68f5ae3485cab8aaba45b5634a4ceaffc99fdef6467355781 SHA512 aeff987c62dbeb51383aeafbee9b342950621de8e0b85027b96be37fe232d401c17c3f5674ba808e3d88566752cb1338f8f93bd78465c9b05e0acc95957972cb WHIRLPOOL a6a0a8e0e9c58c34f4491c89c68d3ef6d88a4f8b77b10fadcac23681fc20a3120c91d76ed8fe489dcf798e0a08a6f5b2bd88889d8ae935ca16010fe61ec9668d
-MISC ChangeLog 6594 SHA256 e1720d2fe153e3d09df5caa7d29bbe512b7ddd14054e7b6a772e1dad459021a6 SHA512 ed181cf6f22c94532f8323ebd3a17e73f7dcbe881714ee5cf17970eecbfa2ff0cc75c2a14fdf8d7987c0fda764a2d5cd1ad8c05e65d43229fb62b8b967f7bee1 WHIRLPOOL 5324c2ca6510a46146149fdbd77a32452f67aa58c1d07ca0a39439e3ad1bdcb135a98fd49e464fa2b0f610f003a6cedcfe4b65e585ee27963f24540c6261e5fb
+EBUILD graphite2-1.2.0.ebuild 1962 SHA256 30fa321f9de6b7b2a9149342fc37965ccd464987c3c6b22a047fa90376081dec SHA512 2f85329ef57f3b618cba9b893dbcf201583130e3195c0a9a36963dff4ed07b331b7eedd0774ecff8958345dad1fe57c73af3e2b8e39554629e8c3631c1884cd5 WHIRLPOOL 33428a01a09a0b7eb02fe27f78d65856926d24f0869c5c20c6c63d42b042099ebab7047f37858a519fd6467d3b6e9422d761b110113ebed2977e570f8f871ede
+MISC ChangeLog 6753 SHA256 509e9939469056e7391285a52ed602d93c9f077eb2552becb3639cf7378acf5f SHA512 c40d40d5c94b689cd31a94b4efb29f1d7d9b360772e973a744393685788f3a170d052c9278baa29a4cc22b227e14740b467048b89f3ae38a814e7f0eb5d0c2fa WHIRLPOOL 1bbe7235263303700930d6d8b541881349a4bfe5410f305af1554cd3df471a8a7c8164eb0226d101b4baac4b6ee42c7feab47f2eb79120f05bb3077f52500cf3
 MISC metadata.xml 163 SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2 SHA512 44b0091513637625b4b535bbe66410dde135890a60411dcdffc2cfd1750b840bc9655c90b032612ff41499007f45db7bbff28d0874e287ae7411230eea9e0446 WHIRLPOOL 142e95052e96ae05c79dc2e03bb300cc5fcf9a4fa751a55f1f85cad7ab1e597d21acec98517bf92d28a44742b98c7ff0756b660b8e7a86f77e15ed94b6e183a8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.19 (SunOS)
 
-iEYEAREIAAYFAlDX1GYACgkQVWmRsqeSphNi8QCfdmnwi+vGl0/K/fqmtXh/wJSA
-O/YAnRDiuULuAawzIs0m9+i7c+rY4vWl
-=+QZ+
+iEYEAREIAAYFAlDdhIUACgkQX3X2B8XHTomUVQCdGLiLb2addCzZuYfIT+ZP061n
+oJcAoIvFKMtUNWqpRRV+HzHW8JMDtner
+=K3Xx
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphite2/files/graphite2-1.2.0-solaris.patch b/media-gfx/graphite2/files/graphite2-1.2.0-solaris.patch
new file mode 100644
index 000000000000..c3bbe51e8695
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.2.0-solaris.patch
@@ -0,0 +1,22 @@
+Bidi: undef conflicting constants
+
+On Solaris ES and CS are already defined, resulting in compilation
+errors.  Since we won't need Solaris' ones here, simply undef them.
+
+--- graphite2-1.2.0/src/Bidi.cpp
++++ graphite2-1.2.0/src/Bidi.cpp
+@@ -30,6 +30,14 @@
+ 
+ using namespace graphite2;
+ 
++/* Solaris' headers define these */
++#ifdef ES
++# undef ES
++#endif
++#ifdef CS
++# undef CS
++#endif
++
+ enum DirCode {  // Hungarian: dirc
+         Unk        = -1,
+         N          =  0,   // other neutrals (default) - ON
diff --git a/media-gfx/graphite2/graphite2-1.2.0.ebuild b/media-gfx/graphite2/graphite2-1.2.0.ebuild
index 2ef9813ccece..c76fc59039ee 100644
--- a/media-gfx/graphite2/graphite2-1.2.0.ebuild
+++ b/media-gfx/graphite2/graphite2-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.2.0.ebuild,v 1.5 2012/12/24 04:04:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.2.0.ebuild,v 1.6 2012/12/28 11:37:40 grobian Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="perl test"
 
 RDEPEND="
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.1.0-includes-libs-perl.patch"
 	"${FILESDIR}/${PN}-1.0.2-no_harfbuzz_tests.patch"
 	"${FILESDIR}/${PN}-1.0.3-no-test-binaries.patch"
+	"${FILESDIR}/${PN}-1.2.0-solaris.patch"
 )
 
 pkg_setup() {