Stable on amd64, x86 and ppc. Remove overshadowed.

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

4 files changed, 22 insertions, 115 deletions

diff --git a/media-gfx/graphite2/ChangeLog b/media-gfx/graphite2/ChangeLog
index 499d8d8013df..2162c9f8b6b9 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.28 2012/04/26 07:30:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.29 2012/05/23 08:49:11 scarabeus Exp $
+
+  23 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> -graphite2-1.1.1.ebuild,
+  graphite2-1.1.2.ebuild:
+  Stable on amd64, x86 and ppc. Remove overshadowed.
 
   26 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> graphite2-1.1.2.ebuild:
   Fix test phase for python3.
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 60fb644d00b2..8350d11689ee 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 RMD160 716d3a068e30aa42074d593fd
 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.1.tgz 4468216 RMD160 c500f833d4620b3ddf875e0817e6e1a5f8c5ed91 SHA1 bebf2e5837ffa838c01ed165a0c3984eb114e7c1 SHA256 7140a1eb22e41138e01e76ae4088bb07e3293ca981cafedfeebc8439ed7d3149
 DIST graphite2-1.1.2.tgz 3677920 RMD160 389819c589a448d68626356566768dee39a451fe SHA1 afc07f4afd9aa4a2f8ac37bb7178635fd20dc9a7 SHA256 3e96d503bd8014b5ea06741487f5db2aab2d5785d43aa046c7d6de74e1b24f87
-EBUILD graphite2-1.1.1.ebuild 1811 RMD160 70325912c7864b10978d4e22e6c790c65d910a99 SHA1 834575a79a1aba6380323658fa472bde4c01a8fd SHA256 1f63f1297db4bc68d31eb5ae717ff7dbba0af4e3e7e0da2eb83589fad37912d3
-EBUILD graphite2-1.1.2.ebuild 1917 RMD160 1f68c02a5d51f84550687ea253a1058b0e4c9a4e SHA1 8cac8951ef698acced195fa6984e3d8621240c17 SHA256 1bdb0f95469c6dfc2b2c1dd269ad1afd2b5beb6b10286839405fbd1881434130
-MISC ChangeLog 5260 RMD160 7f5d023670e00314bf63eb8b71050aeac24481d2 SHA1 964dad015673bc46245ffc97f579e975175b950d SHA256 cf368fc7cd2de2cd7226b8f928fd713d1d7c2510c52b7f586cdf688093fcab5d
+EBUILD graphite2-1.1.2.ebuild 1914 RMD160 63322a86bec3d3e79de548421a71ee431a108864 SHA1 08eccda4757cfeb46fc11919464af05c439e4c7a SHA256 169b8c8d4bea2e2966022275db9035eb4530aeb8c2367978b50b8ede45a64af6
+MISC ChangeLog 5420 RMD160 9358d42557f2a7f2a6146955d79e4aaa586b308b SHA1 6ea9ea8498053e4a939495caf9165a5a7f6011bf SHA256 81c371fd1d8acc1b9749cdd164433cdbee3f34bf450cee001872476ee3569f6e
 MISC metadata.xml 163 RMD160 68888b3756b2cf14b88ff5aa31e4fd07c9cc9713 SHA1 bd3e6fae69f40f453bc382ae8f1a7644a590a9cc SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPmPmVAAoJEOSiRoyO7jvobfwP/jGnPFoDYfI8LaiNtXm4dfJ/
-tUpHoZoebIKu4PL0BdL3z5GjOnesPTg84ORPXB9NSzw5AkchZyot32qhm3OrQvT+
-Pne+hcaOpB2fKXPcvMVoGhdsrYE2NGiOptuLIL3Pu+noHPPcnAEl05KLzej+UEYx
-kwAvLZFGU4oRSjqjLDeba6ttWJS5QEidETH4wce9i0hiaFZSmi6OkkTeZwJe81YZ
-waWJuM0ZxmpQBC+hK2IT1ZBmfJ7WAqH/NqTyP7jF7O9TGl5f+S5+kcPe1np7EWGj
-+54VJkJfurEvixOC7jCtdFH2mlC6SxQKSRPJEqPHsVLxI+rsYoGxDL2+F1JFvdL7
-nSEXOqXgrMTDqlgDLFDK83ZIqFOfVH2KWkcVERsdTH4FzRAzNOGTCybZl7sSn/+j
-64sWxrcWDWdMLevOzZBKVA+hwbJDC1hmx+Wqsh2pVduMufokcG1ReJSL6E9xsJAc
-3uHOPwbEcek+DxU5Lf8sxKDngIdn2gN2yk9nPqvkkTYL/Zn1H8/c25j1M3QVq/XJ
-t/ROKL9/343pGll6ETuziGH8BMX8UJVPrijDdq+ehyQ466P/gGa/Nk5BJZ7a7Obi
-7R7jwFneYfykaOiYPtz43HxsnRtMT6adBZRPPH3MKGjaQOWv6VTtFIU3NiFTcZRB
-6b7E2Za1J9313wBu0iZw
-=Orvn
+iQIcBAEBAgAGBQJPvKSQAAoJEOSiRoyO7jvoggsP/08pfU82a9zZubnneOiBJdlq
+PQQ2MQovqMJZBzFUbni88SPMHNxh+5Q5TnWUXlaG85PVueKQh9MH+DYxbhHOSXC/
+8Kx7jDDoWLWSTmGfoWSAMlAt/JfgM5mHiTkD3abz27PvM+kMJhPdbHb4jUjOJM49
+JeMMErqcqugCkpcGmaPP4oz9vRQNydGUS5FD1YvFDST5Xfa/scwWIJWb1Y3tI5fe
+kgJSspgD89Xz7tceJ7GFb01BNzcGCIsPUC56XSCJe4V8V8rOg2AXuturtDeO1Cfx
+YRocCyHxZaa2P19fB1Gw9xIiZgtCggETcL92xag7cJCGKB7owLVfHMAPybnBxeuE
+B7N7ctcc3deZfRKgiErHyf7PoJfakMyC/Hsd0v87UBjObOOfN68qaoahlHa9wkdN
+ywPZIBQj9CcpP6IX6ro8drsx711DppEWYTOaaOxtqQAEkQcvBrkN8Xm6aVkuxC26
+IFzfCQGeQL5WAHiJu6zuV3UdMiQ/hiib/1GSzO4xh1LR/68qkep5afN5aNwBmHH5
+KkUMlTt2uci9wxDFoDLpAQoBfdbfvGVjCgSU3yAExWKKt902tpAPGh+77x2UBIyS
+NwfT8BtjmUXlZuARV3jRbLlogG+awm1xwka0tZmlIKNSToFm0vpcq7SKb5tm2yCT
+a9hXYVhsj+OpbHUKF4nJ
+=Xpio
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphite2/graphite2-1.1.1.ebuild b/media-gfx/graphite2/graphite2-1.1.1.ebuild
deleted file mode 100644
index d17e5a7cf8ea..000000000000
--- a/media-gfx/graphite2/graphite2-1.1.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.1.1.ebuild,v 1.3 2012/04/26 07:27:51 scarabeus Exp $
-
-EAPI=4
-
-inherit base cmake-utils perl-module
-
-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}-fix_wrong_linker_opts.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
-}
-
-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.1.2.ebuild b/media-gfx/graphite2/graphite2-1.1.2.ebuild
index 1445f562eb5b..13071f92ef06 100644
--- a/media-gfx/graphite2/graphite2-1.1.2.ebuild
+++ b/media-gfx/graphite2/graphite2-1.1.2.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.1.2.ebuild,v 1.2 2012/04/26 07:30:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.1.2.ebuild,v 1.3 2012/05/23 08:49:11 scarabeus Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="perl test"
 
 RDEPEND="