summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-02-22 22:15:52 +0000
committerPacho Ramos <pacho@gentoo.org>2014-02-22 22:15:52 +0000
commitbe38a0456ef152d632c6ac6b37ddcd0319742b0d (patch)
tree8fe81aa0b813e4eb22b2aff1ea69d30bd6233079 /media-libs
parentFix wrong commit, bug 502160 (diff)
downloadgentoo-2-be38a0456ef152d632c6ac6b37ddcd0319742b0d.tar.gz
gentoo-2-be38a0456ef152d632c6ac6b37ddcd0319742b0d.tar.bz2
gentoo-2-be38a0456ef152d632c6ac6b37ddcd0319742b0d.zip
Fix wrong commit, bug 502160
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/harfbuzz/ChangeLog5
-rw-r--r--media-libs/harfbuzz/harfbuzz-0.9.23.ebuild15
2 files changed, 8 insertions, 12 deletions
diff --git a/media-libs/harfbuzz/ChangeLog b/media-libs/harfbuzz/ChangeLog
index 652942ef23a5..7bc610cd8221 100644
--- a/media-libs/harfbuzz/ChangeLog
+++ b/media-libs/harfbuzz/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/harfbuzz
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.62 2014/02/22 19:26:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.63 2014/02/22 22:15:52 pacho Exp $
+
+ 22 Feb 2014; Pacho Ramos <pacho@gentoo.org> harfbuzz-0.9.23.ebuild:
+ Fix wrong commit, bug 502160
*harfbuzz-0.9.26 (22 Feb 2014)
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.23.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.23.ebuild
index 4c6f38296638..55d592e7c2bc 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.23.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-0.9.23.ebuild
@@ -1,15 +1,13 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.23.ebuild,v 1.9 2014/02/22 19:26:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.23.ebuild,v 1.10 2014/02/22 22:15:52 pacho Exp $
EAPI=5
EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
[[ ${PV} == 9999 ]] && inherit git-2 autotools
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils libtool python-any-r1
+inherit eutils libtool autotools
DESCRIPTION="An OpenType text shaping engine"
HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -18,9 +16,9 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
LICENSE="Old-MIT ISC icu"
SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
[[ ${PV} == 9999 ]] || \
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~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 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
# TODO: +introspection when it's closer to finished and useful (0.9.21 hopefully)
-IUSE="+cairo +glib +graphite icu introspection static-libs test +truetype"
+IUSE="+cairo +glib +graphite icu introspection static-libs +truetype"
REQUIRED_USE="introspection? ( glib )"
RDEPEND="
@@ -34,7 +32,6 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-util/gtk-doc-am
virtual/pkgconfig
- test? ( ${PYTHON_DEPS} )
"
# eautoreconf requires gobject-introspection-common
# ragel needed if regenerating *.hh files from *.rl
@@ -43,10 +40,6 @@ DEPEND="${RDEPEND}
dev-util/ragel
"
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
src_prepare() {
if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
# on Darwin/Solaris we need to link with g++, like automake defaults