Fix wrong commit, bug 502160

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 13 insertions, 21 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/Manifest b/media-libs/harfbuzz/Manifest
index 499c99cf0c1c..2e8f0e737275 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -6,19 +6,15 @@ DIST harfbuzz-0.9.12.tar.bz2 886353 SHA256 c653f70a275e98d109a9f1271373a6e80978c
 DIST harfbuzz-0.9.23.tar.bz2 1027508 SHA256 171ab7f58e7243082a4582f4d1f21b3f44462931ea92a6909d303ad3614794c7 SHA512 b6ddc3e9401d0719757b54aa797cd3a5df58c0740998b95f4d73380cf1734d865099b95683774b393d372bd94fdece2dbee172a10242f36769dd848ec30ce558 WHIRLPOOL d6248a590ef639937483e1b67a21770dc393fbdc57c03fab2c060cea3569ad7d47f07a01854c9b565cb80d41d44e0f09d3f07fb4d81828c7eb346ddcade8196d
 DIST harfbuzz-0.9.26.tar.bz2 1060264 SHA256 5ded7dc3d15fb5c9230d7a224b9256b67b35fde30193b4c3a4c3f6b13110e257 SHA512 73a6588fddb7f33ee90f96f3e34b8c6ba4bafffc4879560e38c4b7550adbd56154169de916c48bd46b34e771641a1f83226e9bfae7ea04ccb31576c4a1aca802 WHIRLPOOL a5758675f42a47de766b695698b242baff9a127b28c24727210341aa5bfbcf7a6e86bf2ec1ab2b68a389dff9d54d672d2d7fbda71f4b2d535e0705dfbc3dc27e
 EBUILD harfbuzz-0.9.12.ebuild 1695 SHA256 e6841761c214dbda69c314c5bf1ff6e84d38909a49bfe9d54767ac071b943999 SHA512 5becf409cad878a9a8b6dbbb112aa93bd6376e0d5be79b58b269e663c036761851da80590bc13cc99fff92bcfa3d5f2b633ce3c6cc1218494293808979dadb28 WHIRLPOOL f1caba836acca66390503e7ca2a17d971172dc55ebf24258e543a873f2279a0996662b3465155b0527bc827203c6b041b4f19857a6c8237f9034fe65f5fc4802
-EBUILD harfbuzz-0.9.23.ebuild 2589 SHA256 857e0e8a3a344e9548bc69e2e78653d614c2f2d5b29b9ed75be5a0aa19a94894 SHA512 ec369b2627d9cee36a985870b1169b135bb76ada42df457cf9fa85ace3ed2487e6a6ec0383fae0e545be6445502f4faeb9befb4da5d290632048ea123e6ab063 WHIRLPOOL 463f0a849840c77beb68d490e65688caecfcce2bd28e81d6e4b864375037332275b886958df84671a7b1f2d466ecd72652674347772046e832d0baf409b4ef5f
+EBUILD harfbuzz-0.9.23.ebuild 2468 SHA256 3f43718b586f794caa46a56943e1973026d2583dc1d21fac24f06bb2ff786426 SHA512 ad28c506bc658f661df16a3af3681982ecd2b886369831cf9149e3868d9c0b7afcdbaab5465e79ddafaff9dc203bc3295bc7e71da15d11ae614f09b953ad6b6f WHIRLPOOL 84a547b4e58ddc53db5f19e9231474230493a5274a53862da68bbc76fadf698631eadd064814d740e1aee9e9acda0c87b8c3fdfcebaa36959ad44904f787ec9d
 EBUILD harfbuzz-0.9.26.ebuild 2517 SHA256 d8a978c06ac4dc08f3db3e7c96ae1d878cbbc393628f706dfb239e73133af032 SHA512 86c8b0dc4ec86e60ca7b4a8bf6b7894b0cce46ac518729718b7e24ef8933936630c5c96f14d8823bd3b18b520896415b4825701999c405fb7e42d10456ee78bb WHIRLPOOL 63962d2898e4b28be04da4a0850c98b95ea420f4606ec588eb92f7193eaa6560abc9c3ecb4dcf8bc16e9f705a93720369aebcc46176ac9f27f2c2df45833e02b
 EBUILD harfbuzz-9999.ebuild 2516 SHA256 e4bb2175b3f339c44941c06b18c01830822fbe6519c3f71eb75412311ba593e8 SHA512 7177516922d2427db969f56f515cd625b68c1720cbc14eb66f6ab7eecbb41efd7a245b9043feb5829b2a20e57cf5c6b66f0ad62bfae476e1d796b7234897b5b6 WHIRLPOOL 3b5954e806e46340fb8cae9363f79caed350e22a69b41745e6758ba0c396c100b122949a6af4b4fe61499859f70a511e7e7dfd9ecc496fce4ef1df4092a59821
-MISC ChangeLog 9810 SHA256 c2c5307834e2e8f5d5569d8b2a34fdfd36d902125e5854aad790de7a1c4e34a5 SHA512 8646f0004f9ec1dacf32f2b1b2643fd32107bed4c29441cbfd6b8aba47b91e24da5d4c52a2deb1eff6a4768710c115643b952f0fa10cd474046c361f47e15c84 WHIRLPOOL bb6817d9e38654dfbc4f1c2adc111f7cd781416a02e8e896c3d599841faee6ada1285a8adff6a967e87c12398356d251c93e22fc49bbeaf6e1092e0f53906727
+MISC ChangeLog 9908 SHA256 bbee3a54bee5e16d153b9fb3f2ce1fd5e4ee989a2fdb1e584fb85555b1e4bcb1 SHA512 4eb2f26bfcc4580fe1e3e4a560dba7ec710c0d7dd014a61953cb5feb55e7af126736b58949dcbf06e901a9956409b400b2221fda07b114b4b41ce597bf2ca87c WHIRLPOOL 9f76514dd49ff674da834b20b4efa61649a90912347ec8dc3e7356cd5e4a20816ef1cee563e02d8b6a703b11d5277dc3345e3b0b9fac2ce7f8945945e357d8be
 MISC metadata.xml 348 SHA256 ab40ba306c3499687d57b89247a77e7e8093c88196e6c0fb2333f014ee37c3da SHA512 057542963b2698ddd474970f6b49a6b99c5ff1982c29d7495b6ea05a8bc5266007e328b6658c13052cad8cd2b1c44e2bd6d60ef3e4ef43755c6b4c785b908485 WHIRLPOOL f1799f9bedccd73989ce42f234a28222de692f147553bf4a8bdf154bb544f22ead4ade109700fea7785747d27adbcf30c5543d435f3584f43817b1ed1111b1a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTCPm0AAoJEJ0WA1zPCt1hDD4H/ifd8XsF32Jbz5L6d+TzMXkz
-eMUGxoKzN8EgEX9uCKJiA9OBJKqkRn6Iemo3u7eGb6TJIDT3D6yVKrBfZm5vLylN
-SAAUx+Kfu4ayBbYLRcqBPTWwY73XVKCKrvVDKAQrRcGQuhgf8bYJWwPUEPmCVrad
-5mDyTOEelYURCkMplSoB2iKVCbFUSTgAn6ZrdoOmvXCKD6D1hoUICmiLDwSdcA0O
-jcViJb3ijsedRZKphtY/zQDfRZ28JeRcSnm1BZ5rt1VFDsvDVQ9g/lK8qmH8hRum
-F1B02Vc7+kUwa4Yc/tAmn4EEkZ+Mth3UAfbfi3zcrX5wn7Xv+/Q4E1ofusLVstY=
-=/YGv
+iEYEAREIAAYFAlMJIZkACgkQCaWpQKGI+9SFawCeJc9leIC43FdR6cw9G0oWTzLt
+TgkAnA1LSu/qQXIEPfzg5rOPdx7xe+DE
+=46G4
 -----END PGP SIGNATURE-----
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