summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-gfx/graphite2/ChangeLog7
-rw-r--r--media-gfx/graphite2/Manifest33
-rw-r--r--media-gfx/graphite2/files/graphite2-includes-libs-perl.patch13
-rw-r--r--media-gfx/graphite2/graphite2-1.0.3-r1.ebuild95
-rw-r--r--media-gfx/graphite2/graphite2-1.1.1.ebuild4
5 files changed, 23 insertions, 129 deletions
diff --git a/media-gfx/graphite2/ChangeLog b/media-gfx/graphite2/ChangeLog
index 7eb249e2ef9a..692931e86b8a 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.26 2012/04/23 10:53:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.27 2012/04/26 07:27:51 scarabeus Exp $
+
+ 26 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+ -files/graphite2-includes-libs-perl.patch, -graphite2-1.0.3-r1.ebuild,
+ graphite2-1.1.1.ebuild:
+ ppc stable wrt bug#411449.
*graphite2-1.1.2 (23 Apr 2012)
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 263ef7cdedd2..eadb2daecc03 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -5,29 +5,26 @@ 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
-AUX graphite2-includes-libs-perl.patch 555 RMD160 72348bd7979b506ecf03a677815f3f3830b9b4a1 SHA1 90dbc4e187e07625481fd80a79b8a6d557dcc21a SHA256 a4d462eab477ba5d07540f56363a19bafdd13e46378a5363bfa094aae625f8a4
-DIST graphite2-1.0.3.tgz 4352127 RMD160 73d2e2bf2f6b0039b9d9ef05b204c1027b284e44 SHA1 2d3325198436e2e89cf0b30deefde78d34db9ddd SHA256 643c5307a3fdc31754a18c8c1398d4036a107e4bdc03d9a265fcadfc85d4a07a
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.0.3-r1.ebuild 1806 RMD160 cffd88c455a301e58c568a4c72f040618a8e422b SHA1 92ca6b109e892884bee323e11c5d17d011cab91a SHA256 920ff20ddcde021a2f537ffb95eae729361a0f40c6d3c87232694b7beac7abed
-EBUILD graphite2-1.1.1.ebuild 1812 RMD160 0738fb2bff70bf2eacec3041600b20bcbb935400 SHA1 5dc0885c3413a28c13251cd9a955fe59d57449cb SHA256 add995fa6cc3ba87344854d9e57d4bef2d6657b0815d781802dd1493ea3aac24
+EBUILD graphite2-1.1.1.ebuild 1811 RMD160 70325912c7864b10978d4e22e6c790c65d910a99 SHA1 834575a79a1aba6380323658fa472bde4c01a8fd SHA256 1f63f1297db4bc68d31eb5ae717ff7dbba0af4e3e7e0da2eb83589fad37912d3
EBUILD graphite2-1.1.2.ebuild 1814 RMD160 fc2d3e330c024342547894adadea097310c8a67a SHA1 501293b5442a50e954aed4aa4d3059ee0992ca1a SHA256 eac5e5f8c5727d2e1184d7a70ef37dc082fee3df03d64ca09864fb4f5b709d9f
-MISC ChangeLog 4966 RMD160 cabc1ccf1257c8be16c32863619e8143c9b20c64 SHA1 01afeb03b11de54927b0de76fb2fc9ed6be2cee0 SHA256 bc37f03a17d664b31eb965220d5036ffe5a9be8c8ce807ce79eefd8c28a10d9a
+MISC ChangeLog 5150 RMD160 55a4b522cf2a89d74d8c43f9eeb49abf079cad2c SHA1 5692bc2c1c649393c9fe8352affb534c6575553b SHA256 515827c77f410fe17e1d5d61bd96e20ccd9cc63ee5f4e590c73940b409cdd0be
MISC metadata.xml 163 RMD160 68888b3756b2cf14b88ff5aa31e4fd07c9cc9713 SHA1 bd3e6fae69f40f453bc382ae8f1a7644a590a9cc SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJPlTTNAAoJEOSiRoyO7jvoLV4P/jWF5fWfgqIuxcA0xVx0kg72
-ZeelaEO5T1Ub529+ZkpK5uU/5Y18+JkfbIe8A97qzokexHm04xGZh/HjXIZaoNqA
-Yn3qRM9FwcB32nd4DG+0GCcdZ5N7aPA7+iSPYaQXa+yuTy6xMQchpcFl6AmJ0iD2
-hddQyGUKu/Q58CCiinhsgJZBtm6bdBPGeDIZItbr6Fa6CGRtKyKXxBU+wdTtKOhb
-8ZHqByhajbhzJN4F0HYwxCFt78OQkm5TGxkjToqzM7wcae39K06f4FWGfSQDO9LF
-RXJfobCRr1Mz30Tm2pgyFN9PGpLonZKa5UNlxLfr7EUB14jagikE9zMclGC2xelW
-HOw7dFrjuj4LSHaX5xMKxXTQqZrp811xkSO8D5pjDxFUjb6ELX7O6MEMET+ad0R7
-xs2iypMPNuOMrgS10eZEs3rdHbz0biX0wDtLTgf8sbr90AoYpEpfFZ4AqHOzdOxe
-xip8B609lei3kWh/zIdVpbTNHHe0nudQkh3x2MpDShzTwZhOMmKTdXUhsctgZytu
-O641SV649FYAtSuXUqNr0kAqf8IXKWgYJVCKmSpClf6IrZ3LMMmZwCO9vkxj/it0
-sCDLnG7s9QYMPUdy31094LjhoDiPAVfCMVDg8EQnzf4eXAiz6ikqDu8dJfroY5nA
-sQtce4ksjxjeGnijmk1E
-=Hlh8
+iQIcBAEBAgAGBQJPmPj9AAoJEOSiRoyO7jvoPtcP/jEYcb8q3kAvwC9rMECJU6Ob
+PsNKBZyGifp/bvBNGGyIIaivsLPR4tnu7o4RoalnyOIGjROwjVfYF7l2HRFcsFc3
+6knchrd6aXz+eqQ8DVaCJ+up30luM1uqdQ7mnaMrzhZzeYzLXyHtzOA2C1qqbUAn
+Fsg6krHzSqQNRiHJXmBRVlXMwuLbFgwP9p+3KYVQS/u4R5dhhoHzEDReAQm7Rwl1
+bWu7dy8RZBlfV6rY+Yk0H2H2Y9Xh0wxCjAZhXRQzBv+n/foxlDjhYr4M9A648MJ9
+b8fNztCpazbHXTms+h4I7+eRQ+BQwLV1c6Rm8eB1w5UcVutDMyowBPNUUc/0Z8q3
+J3yKOGLGQ/76NVJl37xlzpr5TbryJVuJugLTr+IkKVCJ3IIeTuveXeF+v6sUtCuU
+TBPBDjHqDSEbNtyszThHi4LwAS0ESOgX0SIUHHXdM49KG9HB239xWHOwoSnaKF0b
+k0aglOYhbnqFZKwysj8zWQFlf1LGHf747GxwJQJbzTVygPriK4asBwQbFOsgD/jG
+hsmh9+WjMbWd71JV6L1DztQAaexhzdkpAPxSZFlAQI813mBvLGaQ1i9oFqxkgT0a
+VHIhHhRdhBi4wK57nhdgX8xiM6gOiTtJi6lqtuk1kH5zMfe3q5JwLkjmgE4M/BOb
+y09iPjKJHTguc2O55Var
+=rCKg
-----END PGP SIGNATURE-----
diff --git a/media-gfx/graphite2/files/graphite2-includes-libs-perl.patch b/media-gfx/graphite2/files/graphite2-includes-libs-perl.patch
deleted file mode 100644
index eb3783b1dc7a..000000000000
--- a/media-gfx/graphite2/files/graphite2-includes-libs-perl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- graphite2-0.9.3.orig/contrib/perl/Build.PL
-+++ graphite2-0.9.3/contrib/perl/Build.PL
-@@ -8,8 +8,8 @@ my $builder = Module::Build->new(
- dist_author => 'Simon Cozens <simon@cpan.org>',
- dist_version_from => 'lib/Text/Graphite2.pm',
- extra_compiler_flags => '-Wall -Wno-unused-variable',
-- extra_linker_flags => '-lgraphite2',
-- include_dirs => ['.'],
-+ extra_linker_flags => '-L @BUILD_DIR@ -lgraphite2',
-+ include_dirs => ['.', '../../include'],
- requires => {
- 'Test::More' => 0,
- },
diff --git a/media-gfx/graphite2/graphite2-1.0.3-r1.ebuild b/media-gfx/graphite2/graphite2-1.0.3-r1.ebuild
deleted file mode 100644
index a7b3acaa0a22..000000000000
--- a/media-gfx/graphite2/graphite2-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.0.3-r1.ebuild,v 1.3 2011/12/18 20:42:45 halcy0n 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}-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.1.ebuild b/media-gfx/graphite2/graphite2-1.1.1.ebuild
index b024f4daf538..d17e5a7cf8ea 100644
--- a/media-gfx/graphite2/graphite2-1.1.1.ebuild
+++ b/media-gfx/graphite2/graphite2-1.1.1.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.1.ebuild,v 1.2 2012/04/06 10:32:18 scarabeus Exp $
+# $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
@@ -12,7 +12,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="