Stabilise 1.2.1 on amd64 x86 and ppc. Drop overshadowed.

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

4 files changed, 23 insertions, 122 deletions

diff --git a/media-gfx/graphite2/ChangeLog b/media-gfx/graphite2/ChangeLog
index 913a446c7a41..cae028b73774 100644
--- a/media-gfx/graphite2/ChangeLog
+++ b/media-gfx/graphite2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/graphite2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.51 2013/03/09 18:04:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.52 2013/03/25 07:45:29 scarabeus Exp $
+
+  25 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> -graphite2-1.2.0.ebuild,
+  graphite2-1.2.1.ebuild:
+  Stabilise 1.2.1 on amd64 x86 and ppc. Drop overshadowed.
 
   09 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> graphite2-1.2.1.ebuild:
   Restrict to python2 only for tests. Wrt bug#460964.
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 46dd2bce5a79..625b5206f56c 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -5,26 +5,24 @@ AUX graphite2-1.0.2-no_harfbuzz_tests.patch 551 SHA256 901b0ec71b9ca8323dc4dce38
 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
 DIST graphite2-1.2.1.tgz 4665169 SHA256 7b15b749ae65c1ce3cfb4b98b8d4125e91b695ca31fa83aa51d6542109ab449d SHA512 834de9185c861f1fe54cffc2b6d12117cdd956e64167b0021ea5cb1b83deacff91a2e9d78df9a1a1c038016bf2aad252c88836c49315ca027a0fd0386d8392d9 WHIRLPOOL ec13995a19f9251bf66eeb3d66b7c8ff504ae8993868aa716cb475a69db8f675012445cd2dcb1ac594121c657aafcc1276abfa5ee38620dc6d428c1c8f51e755
-EBUILD graphite2-1.2.0.ebuild 2041 SHA256 e2da91a38da7840e6c41f5c0c4726072cc859e371cc3af16c852418f0af4e8cf SHA512 e2c149aff59152d8e7a9975a0e430d36ddac3874c0a1e2378769e5501e2063e985381b3aa999ca73770c112b951e618814461408cc69e227ddf7d9fea21d3290 WHIRLPOOL 3baa09ff12defe4aa264efbf13d5b39670d4a0a0236e29836f6ae429ce5144dafbf2b3daa152d82560b96e330d4968e7505d2a17a0a341764423e6e359a30971
-EBUILD graphite2-1.2.1.ebuild 2039 SHA256 fcf4363d205ce2ba031eedd0ab2bce18e7cbf2df72b9ad9798a04a9d0e1abdfa SHA512 151082c76c0d4857cc963913c7a41a35fadec35a7bd9496ac13c92ece89f37156859e5250b382d9b3099e5dd2fad2acf666149d39f1b5fea40e7120e3dd631dc WHIRLPOOL 994d229f430bc8e2a063d27de00580c82d1862d806a2e61f3608edf26fb62dfd9c8734f48ae71ccb9fd0b3bd96f55b6ab03d7825d587116e396bb2e7cf5848ac
-MISC ChangeLog 8064 SHA256 9e7d3ad39d2639b5f1a51298d75213fa06bfa27520b67407cbe53c6c62ba4b61 SHA512 ab33d7f245d32e5d4ba6f9d791c130d80ebc8fe723771acdcb4dcc19cfdc6f801256d3e6eceadba581c391c78f02851e31be6fbd4e943c324d86236e3c3218bd WHIRLPOOL 40badfd770ad12f114b68debadfb57b5a464ab5d06bce9ce8575e5458ccea7694e62bf8ec92151b10844a1b8e4b2e1273e57a7b133a45de5b35f1f911a624a3b
+EBUILD graphite2-1.2.1.ebuild 2036 SHA256 1ce456ef55e30bd67c3f92e5acd478ebd6deabf3a79c0335bf605ff2b57fdf3b SHA512 2c8a34700399d49e0811da6cea44a40be3632e5bae9cbace2f187b5eea974f2c186065f0a7467544cef8a133ec1f13d53bbd973ee42810b117584b2a89caf0f7 WHIRLPOOL 6ee5016518636b93823b271b9e6d8ea6c023c3c588d85ff232e170e9f6465532d8a4ab63d149a1fc7e467dacb910cc1dcb311dd3821822b881393e44d8b9e010
+MISC ChangeLog 8230 SHA256 7d57f32c8a4a358e0fe5edcf477b67bb393aaab629c8f21b6252e23169856a98 SHA512 9f6e161e86f476799c70be76ce8a3d7ac9d5e37a62c2c646e3f3d9e3846451290ed8de4aeae7807b94f27757e7855e35e407c2e67057f392f1332afdae35e537 WHIRLPOOL 0d3540ef7890a753765e358dccb136ef07a90d6a1a4b231e3b6888a3781a7d3e1ccca8771e8adc1ebe53dd2c14341fe8043cf11531060bb647b77ddfbaff2c5c
 MISC metadata.xml 163 SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2 SHA512 44b0091513637625b4b535bbe66410dde135890a60411dcdffc2cfd1750b840bc9655c90b032612ff41499007f45db7bbff28d0874e287ae7411230eea9e0446 WHIRLPOOL 142e95052e96ae05c79dc2e03bb300cc5fcf9a4fa751a55f1f85cad7ab1e597d21acec98517bf92d28a44742b98c7ff0756b660b8e7a86f77e15ed94b6e183a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRO3mwAAoJEOSiRoyO7jvogFEQAKEkom1ElsTzQf4xwYdlpSzl
-NoMb0ZC8OLOc+j8P3OX3fmt51SDq03G0BsJbkmZ6iH+euEAeb3Q58QVNbEFQ1QNF
-e9GXOjTz/GHIa79stMMIZEeJvxDN9dMTLx/00D3sgfbzISBDJsBLO58WUdg2tqZ8
-L010QQWwXeA3YdVGPfP4Gp7AN3zRyMBcdB0/HSwrXODovHBMWRsXClYXQx8Y3wKI
-xMOhL2aJGxdl+arDMAPdtzFBehKcoZ2Ifc6n69KUxS3zIj16t963gGkYH5QKJKb1
-bE63H1QYHz9nOwVPfmC9szHxBiweLo6o6w3EbPiSqNXUpo+7TzUXPzeMMUDZSnTc
-koFx7KNfeU/B89wZQyvehjYM0hJaRCTBwAf5DjG9pvt94CC7YvvXxGnSVTAu5ctr
-9BZ75wuFnor7PGbi6yBY+FJtOt6jeD0rAOkY83Go1TQRxL6e7wLlgO/d+ZfgjGLu
-IwYq4K2RMIVJ5OQrbd0J6tATQgMLNTtfWA1aS/ZwKItv4dksBS3G0E8ofPdmXC48
-l/Tff48MQavqp5lBqPGpi9VgCQ8gigzRIqFMRGLFCAvVGqc5i9SOXb5/EURlMhUE
-HzNs+EqrrttiGgj36LDhy+ccE0TxUwmlDRg5xCYgbjVAc7W+Qm/RoSNkBV6Hej44
-4gPNSEur+KXH1oZ5Y8Nl
-=143i
+iQIcBAEBCAAGBQJRUACwAAoJEOSiRoyO7jvo4PUP/2fQdLWbXpNFle8eA4Ldkg4A
+fO7Y/0tUMYZf8bmfzS+jSmmNFF5EFEtiWX9IjRQ411PCXG30U7lEVFlrqn1wDiF7
+ss9uF9Udgc2M3wczV6yzE63XvePTgrd4o9KMNUI4+K22Nf2TpeSsb9c8x10Rp/Dr
+t6fwFVfuIFnABcKM+bXyq/+p17A982xGhWNjI/OjFlDdDAlQruvUVaNk4mGPQaKC
+qIuSmNrV0Qck+21QD0sH04+psWw5hKdKI/dP6mQERwZ4lM2VixVrHUyiSSR7SZlu
+4ehPsH/j4t4oSYO1Nc3nyGGWbRIMI/S6Ga0upzwCf40Z1OUDwC/LIE9f/YjjgUhr
+CSNUK6Tvfc2SFxmManz7Xf/XwyF5PD11E7ZVDJEDCt4FlYzf24ru/1F1AH5U8OEU
+6I2Wd+0OWjcWIJypJIi20W9q/vV2cMMX1MSQpJNdjMCouQeg71vTkS98WIIOfmir
+s+DRJdycVvzfDMiieZmaqlM2wRgYPNsT9vhCHoXMQHOGPfUs4mVjpBLTzDrrFLdm
+U1OuAtSKfvlFMyXPgM4+oHu3FuEZ9MMyiPHcXX/shn8+iZZRiAeM56qwoBYGGr9E
+0lRf1AhQj35ucEPJa1ZQJQBopmXh5NhvTnyOzxmYDqSaoKVuRCN/o1t4p910JG5Z
+hzAHgATI+M4EJplnh4pM
+=PcDi
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphite2/graphite2-1.2.0.ebuild b/media-gfx/graphite2/graphite2-1.2.0.ebuild
deleted file mode 100644
index 358a0f084ed6..000000000000
--- a/media-gfx/graphite2/graphite2-1.2.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2013 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.15 2013/02/27 23:30:23 ottxor 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="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~x64-macos ~x64-solaris"
-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"
-	"${FILESDIR}/${PN}-1.2.0-solaris.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 {} +
-
-}
diff --git a/media-gfx/graphite2/graphite2-1.2.1.ebuild b/media-gfx/graphite2/graphite2-1.2.1.ebuild
index b908a957a409..688eb6ed1939 100644
--- a/media-gfx/graphite2/graphite2-1.2.1.ebuild
+++ b/media-gfx/graphite2/graphite2-1.2.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.2.1.ebuild,v 1.3 2013/03/09 18:04:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.2.1.ebuild,v 1.4 2013/03/25 07:45:29 scarabeus Exp $
 
-EAPI=4
+EAPI=5
 
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="perl test"
 
 RDEPEND="