Stabilise 1.2.1 on amd64 x86 and ppc. Drop overshadowed.

(Portage version: 2.2.0_alpha168/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

3 files changed, 8 insertions, 105 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/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="