Version bump; fixes various bugs, adds API docs and experimental gobject-introspection support. Drop old.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 106 insertions, 74 deletions

diff --git a/media-libs/harfbuzz/ChangeLog b/media-libs/harfbuzz/ChangeLog
index 0322b02f3dfd..4348bf5dd61f 100644
--- a/media-libs/harfbuzz/ChangeLog
+++ b/media-libs/harfbuzz/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/harfbuzz
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.44 2013/07/13 08:18:34 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.45 2013/09/02 19:28:22 tetromino Exp $
+
+*harfbuzz-0.9.20 (02 Sep 2013)
+
+  02 Sep 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -harfbuzz-0.9.17.ebuild, +harfbuzz-0.9.20.ebuild, harfbuzz-9999.ebuild:
+  Version bump; fixes various bugs, adds API docs and experimental
+  gobject-introspection support. Drop old.
 
   13 Jul 2013; Fabian Groffen <grobian@gentoo.org> harfbuzz-0.9.18-r1.ebuild:
   Fix linking on Solaris, same fix as necessary for Darwin
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index f3ffa108cd6e..3176f6c7c424 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -4,18 +4,22 @@ Hash: SHA256
 AUX harfbuzz-0.9.12-hb-version.h.patch 2003 SHA256 39b7689aac2e60c105b17acd3fb0cf5d1333d1276909660c1b4dac8045d8fdda SHA512 5b0072805a8e6a2063be9e6902714196d28a51b5853a3b36c8a63ce34e6381f55cf7669a15c7d7959ed27546abbd1475cfcc41a9f6c05a955eea803a69b89aec WHIRLPOOL 8d49e7bae164d90f9e08c880c65fb18968c61a86a85a694e632aac4afbba4078bbc092a6db9f206eaf6beb77f575541e3a801f7b8addac470f4fda07110f29d6
 AUX harfbuzz-0.9.18-ldadd.patch 722 SHA256 ba662d39a7e1b704c403c76c7e40c523998cb5011b100c7a025369d2b96d7a2f SHA512 4774c697b608a262362630c1a0987fa051cd1a128474e5b3f4c3a188aa59def37a55270ae1bd80d79d320ea977f5913e40546912a557dedfd0462fe90d885184 WHIRLPOOL 17eae4c25cdb2a34774043b21040b3620408aa0343a37378a3e2da84760eb0eb1183d8f975088afd19f191665f80b83bead05c4bd4275c2db08442785ddbfdaf
 DIST harfbuzz-0.9.12.tar.bz2 886353 SHA256 c653f70a275e98d109a9f1271373a6e80978c97298d723cb3f370351852f9da5 SHA512 10c0e174789e36a02e616cf922962a7c75d6f89cb378a33487b81947e16818347c888c39703c64d620eb3d29bf90cd900ae832dd573f5081eb4de25ba4737bff WHIRLPOOL 6228766b74a46482811ce0e4c85b6bd80d4c0e37aaade3c2b75b790ed1409255d481688e0def89b75a9a1df3ef10bab221dce105439a433e5b33e65ac8685c63
-DIST harfbuzz-0.9.17.tar.bz2 902229 SHA256 a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed SHA512 0d10ba7075338b912f19a1a26d64502b772f5574a45fb43d92eaa56434cf5d2a844f23897ecb0abbdd26e1a0aec5f6ded7e533451ee6e4a03725f42aed7f9bcd WHIRLPOOL 8bb7f0b30aaf632b7bf4df4f62a05d321f0715b8f2de79047a1ed044fb5e825c8d524e825576c7d3b361dabf16658e480fcb5365dc52959cff6bb509f1777f15
 DIST harfbuzz-0.9.18.tar.bz2 902395 SHA256 fef0fbbc6d6492cb4074a5e26a699d87d88bef8adc25dda62af6077735a7d908 SHA512 cf873e903b620391efbd681a01620f1719d278bf10a61a8f583abb9ba116ec494459cef1f81f137cf2dbb089c9d6a8460576ccabd46ab3f23a50e3731b427f5d WHIRLPOOL 57ecc5fdb9ed879113fac335aa3a222963183832257a58944c561e671e3d514bde462a323b776184d10b2bfe1abc9151c93cff8d9098abedcfa03415708a0fea
+DIST harfbuzz-0.9.20.tar.bz2 1030152 SHA256 83384fa03fbcf0c5d8203374bae2efef7dcac650f428d2216d8a6d2251dbbc67 SHA512 2473885cf77f2353a28779f55aa5eb323190fd5432d2bba0026a0b337986d293e8a38d7a5bd6c68e7bc3843e6ad3ed3a592d12b896fc28ff7119c67a8c7d6f45 WHIRLPOOL 0a35408913a042a3055f30b743d4e278b903254e762a6daa37f8955aa9907480b670120a6520e7b2487cfcc00959d43930c845293d8a674826fe90f8c2d3f18f
 EBUILD harfbuzz-0.9.12.ebuild 1686 SHA256 bb37abe8e6425b37dee64cd95e4a0e31b6ab8bf64ba0085b3cfeb422b620ce0c SHA512 9e5da3fe6be6e95a3ff5cd968e09dc13434e5e1591eee8f1ddc05552be59ce7b09a6b3d3d3d6522197be1213d86fcd3fe5894a3c3514d746297d4615227d3e3b WHIRLPOOL a36fe247b2f54dbc8b5db2c3344e042f18d7f2e52679fb94784e870cc6309e9d86e61d9f0a9ab729da82325c0bd34c274030c269013cce6daa5efb52de5c7bb9
-EBUILD harfbuzz-0.9.17.ebuild 1554 SHA256 5ae5909f79ba385f26b026b451be5f90c3c1f053b36d81d3de1ab16b2650e07b SHA512 f399f3fb8e50840ead63318138707d03adfc67dfd7582c3cce7b8b46d77909868977586814c57942c162aa40753fceaba7d574005cdd86bb9c0b5cf41b3ced41 WHIRLPOOL 59a679328ab7d8a2fdc07d2b6e05f085ebc6f072d487ffa73fb02f9dbeb7ae9bf2665feb6ce2232a4845e093d3c9ebb3f12881e7874085a9db444b8d61468666
 EBUILD harfbuzz-0.9.18-r1.ebuild 1946 SHA256 e8baab01829217a046eb369a565b601494b202fdc402322dc5b1247982a5e47c SHA512 8b16d82a5a52cceae19e6c5380d8e7c24de7a252202d7804b67cad4fbca13697e859d7b330e56a095c4c5be10ad5e3311bbe03af66c98c942b2a2224431ad971 WHIRLPOOL 2f7df3064047b4e3558b2f478bb1a17a08707e86e3e9f6a8cb52fea01a9a15f865851aa23520204019d6b299b7842d6e9ccb3b6482fdebdd17b5b6d3d1bada36
-EBUILD harfbuzz-9999.ebuild 1907 SHA256 68e9f38cffa8e843fb6124a826cbb1f7e81d63787ab992af31241fa954b49395 SHA512 cb204fcff4ee7121d9ce722c468976da35b9bbdc9c98e40236b258674fa9be2e3cafa6218cffd62da810fd26df5e96b63f17252a82955442bc28238425f51803 WHIRLPOOL 18c57413e0a759c39e06ae5f647c4d55b15ab5126e22a33d15b76d996b1eb0478686033de30ac15395c5d84396185374b281c24e5b39a2f84a47abb7df8a9fdd
-MISC ChangeLog 6967 SHA256 ddb4337b3a59f5ac9bd0ce90a54e1194fd400571ddcb9db1105b06f9ce4902f3 SHA512 631022d0cc4eb10ed0583db0cc9e81e14afd24c1b68f4bdafc9bcb8299d951dc9e56a5864161372a34ee7364636b65ef54e556b9e77644bb6430f652104b9085 WHIRLPOOL 7b8709b3540bcbd54422b1526ee90ef3afba08c6cfd8ccfd8aa324349831f804ce1416ba5f9ad7241ebbe1cd86fd1f9be871c57e94aac6d223d87899cfb40cd2
+EBUILD harfbuzz-0.9.20.ebuild 2212 SHA256 6e9180b2d337d75ff6f229b025451428d8187c3bd07305a6904b2b8a3473d3cd SHA512 cb0f364135a3d092038036f5bc78e794fe58fffbcb7703a7e8a14f95086baef844c6ed497d3362ed079999a3bc20f4a668f0779e91b48db37c387555214833a3 WHIRLPOOL a3f510562a2ab596620a1455214b76b1442ed45b3c7e523b8a494412a778ecc0f7aaafcb3f9b1e2c8b26a55b60dddfda42508a4a823341dec4969c5109037016
+EBUILD harfbuzz-9999.ebuild 2211 SHA256 2a172da8e239b5fd6288ae78f6097e792448e5d8d419287641fd2e56d69b2af6 SHA512 d83b58240b643aa2415ce8e41cccdb10d601bdd2fa4293a713ddc477274a6190a5a2cd4ec07fe485d8345f57ea81ee79e3ac51ee390891d064c8f561aa71b653 WHIRLPOOL 066a044c67b86c774ef3e35f66ac4e2647b517e42c432b16b5159edd15e5fc042223e5b228d4f422f2ef2a1b8bbcb16ac8742ed3a7d19b457c3bb820fbe17204
+MISC ChangeLog 7245 SHA256 a3b1f23d2b7ca87092cbb0080503ddf0a92683f82eb655c5635a19527eac2ce7 SHA512 419f7bd465c2c6a3c4b28ae2fe9b831def5fa84c8ff27aedeb72221d1da5b97941713d880d1f824b069cb9064fcce8b09bfef98205b076a24efb6bf9c260a324 WHIRLPOOL 5b0ff118f3c98d46f08d7edba9347dfdf4b4b7046c0ee02e2e3b66835f237a72a7f77ae1043bc19cb857b858000eba4f71f29d471874a499d22f96f835655891
 MISC metadata.xml 348 SHA256 ab40ba306c3499687d57b89247a77e7e8093c88196e6c0fb2333f014ee37c3da SHA512 057542963b2698ddd474970f6b49a6b99c5ff1982c29d7495b6ea05a8bc5266007e328b6658c13052cad8cd2b1c44e2bd6d60ef3e4ef43755c6b4c785b908485 WHIRLPOOL f1799f9bedccd73989ce42f234a28222de692f147553bf4a8bdf154bb544f22ead4ade109700fea7785747d27adbcf30c5543d435f3584f43817b1ed1111b1a6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (SunOS)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlHhDVsACgkQX3X2B8XHTokyngCgpEOBwdR3cJiOe0dLQtwjBoAk
-oWUAnjpP9f35ylorM74vSZdYCBFmP+De
-=ufyB
+iQEcBAEBCAAGBQJSJObYAAoJEJ0WA1zPCt1hFNwH/RcD4ElVtmgP+ZUFgMx1+mK3
+Bxdpmc8mnkIK7v5M2KRMCgxzOMZAtF9wjlmnp8eTeIltvYhyHgd5mdm5snitEIAo
+qR0PfANy6ghJ2vX6DoRFjEh+dKqasM69CHnLJSlmEgy0dPWlpfSNPVYcQBgJGc+c
+Pk6Se26/QH+kpAdeQuFgdFGBmD+l8EDwk5TKpOLjOinVs0nKHqXVbWmdmoy9GfRv
+fD/i5pzie9QqtTd8FK2JYfHvjbyqvsQZVZj1E2VijjIyIR58yR4IV5L5rqKu3MxP
+umkSocMUnjKRT6d+JPvhlyOMbce6+BYfpnA1HgDHJz47nlYOsfkngg/XM2nC04s=
+=MFpy
 -----END PGP SIGNATURE-----
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.17.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.17.ebuild
deleted file mode 100644
index 8ee5ba2dcbcc..000000000000
--- a/media-libs/harfbuzz/harfbuzz-0.9.17.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.17.ebuild,v 1.1 2013/05/21 10:31:14 scarabeus Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
-[[ ${PV} == 9999 ]] && inherit git-2 autotools
-
-inherit eutils libtool
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
-[[ ${PV} == 9999 ]] || SRC_URI="http://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-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="static-libs"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/icu:=
-	media-gfx/graphite2:=
-	media-libs/freetype:2=
-	x11-libs/cairo:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# on Darwin we need to link with g++, like automake defaults to,
-		# but overridden by upstream because on Linux this is not
-		# necessary, bug #449126
-		sed -i \
-			-e 's/\<LINK\>/CXXLINK/' \
-			src/Makefile.am || die
-		sed -i \
-			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-			src/Makefile.in || die
-	fi
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize  # for building a shared library on x64-solaris
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.20.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.20.ebuild
new file mode 100644
index 000000000000..445997546f58
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-0.9.20.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.20.ebuild,v 1.1 2013/09/02 19:28:22 tetromino Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
+[[ ${PV} == 9999 ]] && inherit git-2 autotools
+
+inherit eutils libtool autotools
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
+[[ ${PV} == 9999 ]] || SRC_URI="http://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+
+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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~x64-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 +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( dev-libs/glib:2 )
+	graphite? ( media-gfx/graphite2:= )
+	icu? ( dev-libs/icu:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.32
+	dev-util/gtk-doc-am
+	dev-util/ragel
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-coretext \
+		--without-uniscribe \
+		$(use_enable static-libs static) \
+		$(use_with cairo) \
+		$(use_with glib) \
+		$(use_with glib gobject) \
+		$(use_with graphite graphite2) \
+		$(use_with icu) \
+		$(use_enable introspection) \
+		$(use_with truetype freetype)
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index dd7e4cf2281c..5ea7ec16ccf6 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.15 2013/06/06 05:23:28 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.16 2013/09/02 19:28:22 tetromino Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
 [[ ${PV} == 9999 ]] && inherit git-2 autotools
 
-inherit eutils libtool
+inherit eutils libtool autotools
 
 DESCRIPTION="An OpenType text shaping engine"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -17,24 +17,29 @@ 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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~x64-macos ~x64-solaris"
-IUSE="+cairo +glib +graphite icu static-libs +truetype"
+# TODO: +introspection when it's closer to finished and useful (0.9.21 hopefully)
+IUSE="+cairo +glib +graphite icu introspection static-libs +truetype"
+REQUIRED_USE="introspection? ( glib )"
 
 RDEPEND="
 	cairo? ( x11-libs/cairo:= )
 	glib? ( dev-libs/glib:2 )
 	graphite? ( media-gfx/graphite2:= )
 	icu? ( dev-libs/icu:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )
 	truetype? ( media-libs/freetype:2= )
 "
 DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.32
+	dev-util/gtk-doc-am
 	dev-util/ragel
 	virtual/pkgconfig
 "
 
 src_prepare() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# on Darwin we need to link with g++, like automake defaults to,
-		# but overridden by upstream because on Linux this is not
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
 		# necessary, bug #449126
 		sed -i \
 			-e 's/\<LINK\>/CXXLINK/' \
@@ -43,8 +48,8 @@ src_prepare() {
 			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
 			src/Makefile.in || die
 	fi
+
 	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize  # for building a shared library on x64-solaris
 }
 
 src_configure() {
@@ -54,10 +59,11 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_with cairo) \
 		$(use_with glib) \
+		$(use_with glib gobject) \
 		$(use_with graphite graphite2) \
 		$(use_with icu) \
+		$(use_enable introspection) \
 		$(use_with truetype freetype)
-
 }
 
 src_install() {