3 files changed, 130 insertions, 23 deletions
diff --git a/media-gfx/graphite2/ChangeLog b/media-gfx/graphite2/ChangeLog
index 7fe09e5bd7c5..e0031971bde4 100644
--- a/media-gfx/graphite2/ChangeLog
+++ b/media-gfx/graphite2/ChangeLog
@@ -1,6 +1,11 @@
 # 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.32 2012/06/29 11:54:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.33 2012/09/25 13:56:58 scarabeus Exp $
+
+*graphite2-1.2.0 (25 Sep 2012)
+
+  25 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> +graphite2-1.2.0.ebuild:
+  Version bump to latest version.
 
   29 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> -graphite2-1.1.2.ebuild,
   graphite2-1.1.3.ebuild:
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 6d3df3d60839..706d53127b7a 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,28 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX graphite2-1.0.2-no_harfbuzz_tests.patch 551 RMD160 716d3a068e30aa42074d593fdb9e7bb0514c56b4 SHA1 8619896e176d1983fe95fa8729952a832a56c68e SHA256 901b0ec71b9ca8323dc4dce38e45932fc51549cb00a1672f9cc681826e4e261d
-AUX graphite2-1.0.3-no-test-binaries.patch 620 RMD160 ccd578085925a33d0cf59be6ae710d52e496f0ae SHA1 e4227456d3159b125c65a38feb737a3cc4b7c875 SHA256 c51a69ed5e8ff6301d35aa97ca585aec6976d2ee3d7715c0fb04684dd0151660
-AUX graphite2-1.1.0-includes-libs-perl.patch 685 RMD160 4cc4d60919f48cedc43cfe7ff181e53809b88aa7 SHA1 6dc156b4d934a90dde8f3bbf0a53cc769f4010e3 SHA256 da7a24551fa9029214a909ae6a49070c12f889eae287ce2c392555b0299db32e
-AUX graphite2-fix_wrong_linker_opts.patch 760 RMD160 d471cdcf96a027c37409a5430a87549f1cebf46b SHA1 3ad5d80d27afec6fb0d0fae7e49c26f3f0b37967 SHA256 95c943e57043f7368c44e1cd5fbadd5fabeb91ba4799072d1ffc2ef8d818454d
-DIST graphite2-1.1.3.tgz 3680838 RMD160 f6858b233753020b83624fe5c8b3e98c3ea1802b SHA1 f5612a5009e52e388eb1f31c692f3ce6bae78209 SHA256 0eb19282a1941bdd5e6d7165718c5d4692d62bac6c1eea56d9e522715cb144f7
-EBUILD graphite2-1.1.3.ebuild 1941 RMD160 757b4368d3d3274ebb119218b52643bb5f4523a6 SHA1 dd9534a419d78efc71736f6cf14961b47aa16526 SHA256 8be9be9ab6f116f8f33d23352deab7d399346cee76dd5e271f8032a07661b018
-MISC ChangeLog 5864 RMD160 f97f49f029ef2f1107c494ae7fd5ce396ad5a12a SHA1 d54e35527e253ba37deb4c71477e843a84087649 SHA256 2d31bc7f5df390d8806b62b2358e68b174ec2f6f05af174c7edfd64fb4d72e32
-MISC metadata.xml 163 RMD160 68888b3756b2cf14b88ff5aa31e4fd07c9cc9713 SHA1 bd3e6fae69f40f453bc382ae8f1a7644a590a9cc SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2
+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-fix_wrong_linker_opts.patch 760 SHA256 95c943e57043f7368c44e1cd5fbadd5fabeb91ba4799072d1ffc2ef8d818454d SHA512 d194041213a439a50a58edd699d17e0c07bb4b2bb65dcc969e6f551187207763a151db25b116f2809a54b13bbc8b1cd8621187fa30ee46fc42fa324c0718e1d6 WHIRLPOOL bdf27de3672958af7b256b01d2d86b332bcc665fc786f67df038cbc6ecfe6a664480e7dfdbd6adbf88452af3095a0deae0b8b0aa93e0664d4e164647cea8b37f
+DIST graphite2-1.1.3.tgz 3680838 SHA256 0eb19282a1941bdd5e6d7165718c5d4692d62bac6c1eea56d9e522715cb144f7
+DIST graphite2-1.2.0.tgz 4663935 SHA256 630fba251c7e570f2b0c4a0c63a7abb4d45b0246d390f53188b1a9b73de7b96e SHA512 56b88e1665f4aa7316ec4b3975dd5aa24b4420bbb86991ade0130f28c082c9121f651a351cffa893f32b1fc28085315c7b7521a9976eacd066e34bc54febdd21 WHIRLPOOL 8a679b9455cafb5bd2ca6d460bca5ea004191e81d353e38c6712c364b2e0334581d59c578e956bdd3317af0ca3a1d8d62c0f676bb768fe37065e9c972e944901
+EBUILD graphite2-1.1.3.ebuild 1941 SHA256 8be9be9ab6f116f8f33d23352deab7d399346cee76dd5e271f8032a07661b018 SHA512 a24fae49513653e3d0ec4a96a3aed3c99744b894a71a64cbd5807c4d95e9c73e05f0fb5aaace101445ec306802fa6e864646f7a634563c928fd35202911de11a WHIRLPOOL 975be1838c53bf898a9ab191db637954e1873aaabd60ad68a5ac81726d7ee3b98fb577cbeb1af428d0925e5f0e511f2c4e2cad0f514b9c14779d8b0619f3cc45
+EBUILD graphite2-1.2.0.ebuild 1895 SHA256 a694dcf494af127a267dc73acb6992432835913bccfdf881008e97af70f9cbc5 SHA512 8eae6de05732f91954efdadcbd582b3c4bafb47dd0f9201e39597499fd3dcb819fdf2e36dc987a8031a098389dda7b9d1873c5f76d502f89c179512ec1248c11 WHIRLPOOL 2c37e9718dff45d8293b2f53633142362aeb9b1c437b06be16b528b48818c2e886aa700de717676423806f5b1b2963b1e60d984823ef4a1f3c2a2c6fb19ab2eb
+MISC ChangeLog 6011 SHA256 8ef34f70ebe080f95d535deb4b05b7432bebe83f3144fb7b84cef380f6fbc200 SHA512 0b39f8e7218b59006b6543318e8c7b6eb7bf8ad863f96bc041fb3d243a4f40b0be19de87f9912761e16bbded4840277860bdd8f62d744a4c89342abdcca2c9d5 WHIRLPOOL c83efb6bb6e1aced1dfb2355fb1cb6e092b3c77fd663f4352eeec27b040f70a0f55296cb149f16f50ee01d0f41b60e57fdf1177018601d9330e1f6b42d19d994
+MISC metadata.xml 163 SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2 SHA512 44b0091513637625b4b535bbe66410dde135890a60411dcdffc2cfd1750b840bc9655c90b032612ff41499007f45db7bbff28d0874e287ae7411230eea9e0446 WHIRLPOOL 142e95052e96ae05c79dc2e03bb300cc5fcf9a4fa751a55f1f85cad7ab1e597d21acec98517bf92d28a44742b98c7ff0756b660b8e7a86f77e15ed94b6e183a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP7ZeZAAoJEOSiRoyO7jvoY2oP/3DIF0kcWZniselYfTNPuGMx
-WRFFQcfG/RlPWDn3+gmIXcjlPze98j9OKvnvbDCpBtUADpoxbyGzd6CqMeKvhPYT
-Q7GaiWWLabnCKVlPxK2Ao4HE7MkOwMXQXLGrrufdReyQfL85lafi3NvzkHJH6/bP
-WnG1aknFaDHtVrh5MYgxmDfoBJRJSxMJFaVzWYwP7KFWlxpGluGrdT3OQJo2nfMR
-e3JD2eEn2PoiG1dYEZw9Ggai82J8b1T8hVqSiDGQQuhoBvxXHUB/ZZAC9LL4d+Vz
-JYojlH27E46Fo8HYf3nAcx8j0mDfZyxb4fqoVdT/c/fzRODSlLKz8vvvINOxJ6Ga
-0/U+JmvOtcS2YLih6HPS7oU44g+k4uSt3+uxoS2ssjmZbngipufyHXZJgZ7WY/wl
-EtqEJ1Oec3NZNxJkuYtVfZGrqFpIfrQAtMMPsTm/DwuNLoYZV/Ea/GGSI34CWdz3
-rYaG2+cdw4/HwNAnkhRCAg2IBnw8/GwJ1SAG+cDtNwVUu/ZAsYf6HOKC9LM1imlL
-fU75rOKOTgoLLDISMTjIabK8ZfUd+KdTCOXyV4Zf0DiuqfG3f0SK1eI9lWYUgzL/
-VyXDC6la6L/FV+S959fOyAmTYMzdItS63MTHmizx2ut3Bd/JLZEacAbHEzy4SXGN
-6INr2YY1D1c2rX7+w/2q
-=31F6
+iQIcBAEBCAAGBQJQYbgSAAoJEOSiRoyO7jvoqLwQAIx7WSmNLyMSD9xs7SWTvOEn
+mMgeAXfA5/G2WTWBO6Ho0LZvxN3bo/lp9Rel2HgZPLrjnk0eVo5K3uP9Z/3tqUfT
+grlyJ8Elcmm/e3ebjSArHz6PMjt02YdVzPOmurclUEx/Es7cHUZhBoKAFzzzwAuV
+NpXTyo5Ur16QoKyXbTTcfLdFmzgOmyGPpVAKBCT4vduGRdKaElfE1auWbXqiUOPZ
+d3d4Ayw/PNN+w2sYamoPtU5LHDnDB1L2MYdusqYw3rDTwuf/2M2UNnQWo+bG+wCP
+5a1UhSvgYG3CmP5QUj3dIIJepMx40kzPeyps+x4Y5+QElFt/teue1r7/hcWsRAg8
+XqnG0b8Fg2REulpwLJ0UejEapjDjEuaxEg8SJm8PgTuZWVOYJlNcKCRYTh1YC3ir
+SgANoVbPUpt2l71dri+ZtHPYyd91AmIUUDwbmvta6wYjMzdoutjsguO5eEAgw+Lg
+NAcAl3Fugnkh9Sa0HfLxtktlS+VLR1AM8Aky/NPQbAsrS66Fg+UTG/Gz79zdaCld
+YSXfZAVArNf3NfEs1rwpvCj5xc6L0W9w482XPMOB/UTeqPu0BFP/DhIkRk1z3uzT
+ahnME9PvJYFqy55A2HYlDe9BBNGrCqIFL6TcDrvpGFLp4slly36F0dVwgUjWZfDl
+FavMtv3ozqxxI6U2sz9O
+=y/Ts
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphite2/graphite2-1.2.0.ebuild b/media-gfx/graphite2/graphite2-1.2.0.ebuild
new file mode 100644
index 000000000000..2430048a0cc0
--- /dev/null
+++ b/media-gfx/graphite2/graphite2-1.2.0.ebuild
@@ -0,0 +1,100 @@
+# 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.1 2012/09/25 13:56:58 scarabeus Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="test? 2"
+GENTOO_DEPEND_ON_PERL="no"
+inherit base cmake-utils perl-module python
+
+DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
+HOMEPAGE="http://graphite.sil.org/"
+SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="perl test"
+
+RDEPEND="
+	perl? ( dev-lang/perl )
+"
+DEPEND="${RDEPEND}
+	perl? ( virtual/perl-Module-Build )
+	test? (
+		dev-libs/glib:2
+		media-libs/fontconfig
+		media-libs/silgraphite
+	)
+"
+
+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"
+)
+
+pkg_setup() {
+	use perl && perl-module_pkg_setup
+	if use test; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	base_src_prepare
+
+	# fix perl linking
+	if use perl; then
+		_check_build_dir init
+		sed -i \
+			-e "s:@BUILD_DIR@:\"${CMAKE_BUILD_DIR}/src\":" \
+			contrib/perl/Build.PL || die
+	fi
+
+	# make tests optional
+	if ! use test; then
+		sed -i \
+			-e '/tests/d' \
+			CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DVM_MACHINE_TYPE=direct"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use perl; then
+		cd contrib/perl
+		perl-module_src_prep
+		perl-module_src_compile
+	fi
+}
+
+src_test() {
+	cmake-utils_src_test
+	if use perl; then
+		cd contrib/perl
+		perl-module_src_test
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use perl; then
+		cd contrib/perl
+		perl-module_src_install
+		fixlocalpod
+	fi
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+}