Version bump, drop old. Fix intermittent parallel make failure (bug #450920, thanks to Michał Górny). Add subslot dependencies on libraries with non-0 soname versions (bug #455900, thanks to Pacho Ramos).

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

6 files changed, 121 insertions, 29 deletions

diff --git a/media-libs/harfbuzz/ChangeLog b/media-libs/harfbuzz/ChangeLog
index ae08e28ef08d..c79c5b0b288d 100644
--- a/media-libs/harfbuzz/ChangeLog
+++ b/media-libs/harfbuzz/ChangeLog
@@ -1,6 +1,15 @@
 # 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.26 2013/02/08 15:28:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.27 2013/02/12 03:18:45 tetromino Exp $
+
+*harfbuzz-0.9.12 (12 Feb 2013)
+
+  12 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -harfbuzz-0.9.10.ebuild, harfbuzz-0.9.11.ebuild, +harfbuzz-0.9.12.ebuild,
+  +files/harfbuzz-0.9.12-hb-version.h.patch, harfbuzz-9999.ebuild:
+  Version bump, drop old. Fix intermittent parallel make failure (bug #450920,
+  thanks to Michał Górny). Add subslot dependencies on libraries with non-0
+  soname versions (bug #455900, thanks to Pacho Ramos).
 
   08 Feb 2013; Agostino Sarubbo <ago@gentoo.org> harfbuzz-0.9.11.ebuild:
   Add ~sh, wrt bug #449220
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 3da48e07a33b..2c95a1850597 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,7 +1,22 @@
-DIST harfbuzz-0.9.10.tar.bz2 885141 SHA256 1f8c281ded05290fd1964c0e11a2bde607713b33d0c8122a8d230452d99c2e23 SHA512 853d4435309acbb4590719ae1932ffc510e06d88981e7663781b015da37f7b062c391e61d27bf0a30ae39c9d2fcd16ae53b767d08562449e708aee53e5c2b418 WHIRLPOOL 897eeb4663dab437d4558886a4f5ecd902f9bc35987f8d16c67a9a521e0809acbbcd32063ccd3f1d7f6d95b7ecd6c6ac16d2594ef8cde056d17ce4076628289c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX harfbuzz-0.9.12-hb-version.h.patch 2003 SHA256 39b7689aac2e60c105b17acd3fb0cf5d1333d1276909660c1b4dac8045d8fdda SHA512 5b0072805a8e6a2063be9e6902714196d28a51b5853a3b36c8a63ce34e6381f55cf7669a15c7d7959ed27546abbd1475cfcc41a9f6c05a955eea803a69b89aec WHIRLPOOL 8d49e7bae164d90f9e08c880c65fb18968c61a86a85a694e632aac4afbba4078bbc092a6db9f206eaf6beb77f575541e3a801f7b8addac470f4fda07110f29d6
 DIST harfbuzz-0.9.11.tar.bz2 885927 SHA256 b516fa2612871f4a5372b7bf5029cb3b997e5917056e183fbd74a1f0051b5788 SHA512 972d2d4973fd53a55b070d33e5c09af6a0288585e08cf704d92ab5e63d0f97a18d3a4bf69c6cdc2527bec22ca3dbe279d1b1c19ce8ccf40c83f98505bf4f887e WHIRLPOOL 461654234b9f92d7900e78e0468591a49294c8fe91fb87f6b37f0323cc4d63d7d8a7eefe0f390564f6b2ef01e7411e5b50ba38fdb6fde62b54526672b041a9e1
-EBUILD harfbuzz-0.9.10.ebuild 1495 SHA256 9e7d9faa2468dd111724c0cf8c79f8b86ac5a28c1d62dce736c86ddd38ed0a42 SHA512 5dc2625c41c73512f42a9f11e2af54c25be2dd36d9ffb0fb13a7b02e144a3fecd2caa7f2d0e705f092ab928653eb34d1e1dd5c2537aa42e65e569ffa31277abe WHIRLPOOL f739b9e8b51473e9ec50d52d99a6e7afff391d20ab120db06a561cf4ac353ee0ce03a3a075ca986761fe42eb73eb71708c0078c33bd88241395303abe7022938
-EBUILD harfbuzz-0.9.11.ebuild 1515 SHA256 70530789ce4583660a760eefb0c1eece9c89bd02bfa3000ebb5359731453e00a SHA512 31db898a04b6f72108dfc33b8652a373d08d4f9175e20a08ef402c757989857b466958f0dfcb0b026befd5cd7d6ae71499f3a4d4757ffd7d98445d83fd9eea14 WHIRLPOOL 1961e5a21513caf16e13aca78698968cf5b077f100f767a591233e2b9e6ea00d2a4d0a6ee5d57253aa30155cf55e26612253498d3d7ee37ba373aea3ef2391fa
-EBUILD harfbuzz-9999.ebuild 1505 SHA256 9771c1d15d624f654d4a8b8ab6a9b309fbe960071740253d4cba96e8f9840e00 SHA512 a8dfdc83f376d4a6fde4aa6967dfd144af63e9987d180dbe819237dae9571767e35766e15d59b9491ffa9af2586f3852b74925bfeece6d6a756b9a2b5ea332c5 WHIRLPOOL 77262262ba5691e11793b6949ea8662139ad3645241a49d76db1bdde34d3985a4e3bdb2d467c4a60655df8e3c7f6c6dc6229b3fc2c129d2aef12a50682a857dc
-MISC ChangeLog 4055 SHA256 f58b54a26863e4ce2d449d0a4e1c5d0c1bc2903f0ec82e3498439345f695f8af SHA512 6b61c4eb04416abe78398e20ba944c29265f5868267aa9aabd4a73dad1a76aabbb83f656f1edb2ba9ecb1e216bae633838dd3e8afb8e13bb86a9a3c20933f771 WHIRLPOOL 47a75df0fc5585b5aee0266edf9d4d23a980f5e8dfef84253ad803f2aa082a20d7fc95ead76222b78825554899c187228112b0e8c75bd831224dc3625ccfff1a
+DIST harfbuzz-0.9.12.tar.bz2 886353 SHA256 c653f70a275e98d109a9f1271373a6e80978c97298d723cb3f370351852f9da5 SHA512 10c0e174789e36a02e616cf922962a7c75d6f89cb378a33487b81947e16818347c888c39703c64d620eb3d29bf90cd900ae832dd573f5081eb4de25ba4737bff WHIRLPOOL 6228766b74a46482811ce0e4c85b6bd80d4c0e37aaade3c2b75b790ed1409255d481688e0def89b75a9a1df3ef10bab221dce105439a433e5b33e65ac8685c63
+EBUILD harfbuzz-0.9.11.ebuild 1532 SHA256 94ac8df02ac84b26f365de954e298783e9f82b65e19f32a52017947a3f1dd4fe SHA512 8d1b059e2f65f40a5a273184d2d6b79fb0bac8ef288a8806bfebae9e446c191a3b9439d29c376f3420f40fcffa63a174ba4d3b93e5ce10c94158a1b66406388e WHIRLPOOL bcdd8945803c25611cc657807088c1223254b6755695c580e538fad2ba1574959a03b721366ee81021ad142652f86ec278ead374a68065ffc5080955d463d7a5
+EBUILD harfbuzz-0.9.12.ebuild 1678 SHA256 2bc1e0fe6bcd681f088c1af143bd365dc9909a759db948efa78d56fe29cce1bc SHA512 4688a291c9b6e0ce47cce980fd7ca441bda74b42f16fee0a65f5a5182b15744fc276b1a092e0edde67184c0f436738209cfc915efbc79677f78ff10b77567de4 WHIRLPOOL 9bc5fc6cc8ec9576fd5c3a6934c13ebaf2b549a3bd78c1c857defb57ec619630da103cc5c3c78c391a8ea62859460a2dfb240405871f9ecead81f77d76ab461b
+EBUILD harfbuzz-9999.ebuild 1531 SHA256 037ead8f222af65e306c16f29fdf862b3a89882299b592ce5e50879cb7e9e058 SHA512 26fcd4f481ce9e8ead2281d6ee508ee3529d6b489acf141b3f4fb198268f4921aeb376f888e50bf0b33868306bf269162a8351a2f25e3254ee01f4d54c911be0 WHIRLPOOL 577d8b56d5664e1c147375660ec636b5174fb7214c076afcb2b820c6b4cdf4d80963fd889f277fbf276374b9a4f8a45c786bd9ea1f9adadd687386fa7f17ebcd
+MISC ChangeLog 4509 SHA256 8d84fc7e1f5070966ffbfb24e2cc32d7882891b1b3b03b4426850a2a1004adeb SHA512 f44ce52e6121a627ebea601328b0128d94ec300e9689914052bc1507e8bdbf54b1b3c869492f29655f932858a3481269496e4fb91c24a5b374fbe18865592fb9 WHIRLPOOL 8930073695ec7f86d97ab387bd35df7231e8f41a36dd64435fe8044b85d6f8c93e29a4321e761e633459797247bb3e67e89928e9cf2b0f5d2780a8f60f2bbe4a
 MISC metadata.xml 184 SHA256 865929d2ba13ab30c5c648a333363f77b912363ded0b3b0c6170ed7d1340b37c SHA512 c6aedda10236299c8bdc93890c7099e3274ed50419ddf8acb93ead18ba913615e5b3ab17ad51f121dd69ae4578a4da2ff1760a92355129ea7fb4d0bd05721717 WHIRLPOOL 159a9b328f6666422cf38022d4cc6e9d3b1bbfbf3ac5a4fb382c08c4aa18d78a0f1017ad19fc6a9e127068ef647a505f425d3ea30d6418712aeb4aac11340f2f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRGbSWAAoJEJ0WA1zPCt1hdacH/ifYHCQS/HqEATEF2BKyuvTA
+/4znOiNJe/MvCMMiF2IGfJu86vzveGcZOL30EPRkCX5DnjbnppBctqt/N2asRg/s
+Vtd59NsyfBkAdoSYiMd2ylfF+vim+i2C0kY1R6mE8vffEjfEh8Wb507Mi0Qi4VQ+
+5xW4OEmmO873b55CKx2xD43bn97kH6m8X6qXhbymgIdE+E4fjhWJCgGWQ5+ImnuM
+DhtrqQse6w0/+XwwJdBzJwfDIeoOCiJwNZbdve1Yv61Zmd6TuDfT0usME0yUsIfj
+eTXskpQUd4vPaZiAY5cgj+CFnjio6Q9pFJJiOl9kCDGLM32G2ddqyV9j+cSj/1o=
+=Zadc
+-----END PGP SIGNATURE-----
diff --git a/media-libs/harfbuzz/files/harfbuzz-0.9.12-hb-version.h.patch b/media-libs/harfbuzz/files/harfbuzz-0.9.12-hb-version.h.patch
new file mode 100644
index 000000000000..7e486d22dda9
--- /dev/null
+++ b/media-libs/harfbuzz/files/harfbuzz-0.9.12-hb-version.h.patch
@@ -0,0 +1,64 @@
+From 9de5f98f363d96f308adc33f1c2286e5c33117de Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad@behdad.org>
+Date: Mon, 4 Feb 2013 23:28:22 -0500
+Subject: [PATCH] Bug 60035 - intermittent make install failure on hb-version.h
+
+---
+ src/Makefile.am | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 79a91d7..a5c888a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -63,6 +63,8 @@ HBHEADERS = \
+ 	hb-shape.h \
+ 	hb-shape-plan.h \
+ 	hb-unicode.h \
++	$(NULL)
++HBNODISTHEADERS = \
+ 	hb-version.h \
+ 	$(NULL)
+ 
+@@ -207,17 +209,17 @@ endif
+ endif
+ endif
+ 
+-libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS)
++libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS) $(HBNODISTHEADERS)
+ nodist_libharfbuzz_la_SOURCES = $(nodist_HBSOURCES)
+ libharfbuzz_la_CPPFLAGS = $(HBCFLAGS)
+ libharfbuzz_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HB_LIBTOOL_VERSION_INFO) $(export_symbols) -no-undefined
+ libharfbuzz_la_LIBADD = $(HBLIBS)
+ EXTRA_libharfbuzz_la_DEPENDENCIES = $(harfbuzz_def_dependency)
+ pkginclude_HEADERS = $(HBHEADERS)
+-nodist_pkginclude_HEADERS = hb-version.h
++nodist_pkginclude_HEADERS = $(HBNODISTHEADERS)
+ 
+ CLEANFILES += harfbuzz.def
+-harfbuzz.def: $(HBHEADERS)
++harfbuzz.def: $(HBHEADERS) $(HBNODISTHEADERS)
+ 	$(AM_V_GEN) (echo EXPORTS; \
+ 	(cat $^ || echo 'hb_ERROR ()' ) | \
+ 	$(EGREP) '^hb_.* \(' | \
+@@ -296,7 +298,7 @@ TESTS_ENVIRONMENT = \
+ 	srcdir="$(srcdir)" \
+ 	MAKE="$(MAKE) $(AM_MAKEFLAGS)" \
+ 	HBSOURCES="$(HBSOURCES)" \
+-	HBHEADERS="$(HBHEADERS)" \
++	HBHEADERS="$(HBHEADERS) $(HBNODISTHEADERS)" \
+ 	$(NULL)
+ 
+ #-include $(INTROSPECTION_MAKEFILE)
+@@ -310,7 +312,7 @@ TESTS_ENVIRONMENT = \
+ #hb_1_0_gir_INCLUDES = GObject-2.0
+ #hb_1_0_gir_CFLAGS = $(INCLUDES) $(HBCFLAGS) -DHB_H -DHB_H_IN -DHB_OT_H -DHB_OT_H_IN
+ #hb_1_0_gir_LIBS = libharfbuzz.la
+-#hb_1_0_gir_FILES = $(HBHEADERS)
++#hb_1_0_gir_FILES = $(HBHEADERS) $(HBNODISTHEADERS)
+ #
+ #girdir = $(datadir)/gir-1.0
+ #gir_DATA = $(INTROSPECTION_GIRS)
+-- 
+1.8.1.2
+
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.11.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.11.ebuild
index d2a28ca1fed9..23f9606382b4 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.11.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-0.9.11.ebuild
@@ -1,6 +1,6 @@
 # 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.11.ebuild,v 1.4 2013/02/08 15:28:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.11.ebuild,v 1.5 2013/02/12 03:18:45 tetromino Exp $
 
 EAPI=5
 
@@ -21,10 +21,10 @@ IUSE="static-libs"
 
 RDEPEND="
 	dev-libs/glib:2
-	dev-libs/icu
-	media-gfx/graphite2
-	media-libs/freetype:2
-	x11-libs/cairo
+	dev-libs/icu:=
+	media-gfx/graphite2:=
+	media-libs/freetype:2=
+	x11-libs/cairo:=
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -53,5 +53,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	prune_libtool_files --modules
 }
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.10.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.12.ebuild
index bd734eff2a6b..a2c5cf3852a5 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.10.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-0.9.12.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-0.9.10.ebuild,v 1.2 2013/01/13 21:34:13 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.12.ebuild,v 1.1 2013/02/12 03:18:45 tetromino Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
 [[ ${PV} == 9999 ]] && inherit git-2 autotools
 
-inherit eutils libtool
+inherit autotools eutils libtool
 
 DESCRIPTION="An OpenType text shaping engine"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -16,15 +16,15 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
 LICENSE="Old-MIT ISC icu"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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
+	dev-libs/icu:=
+	media-gfx/graphite2:=
+	media-libs/freetype:2=
+	x11-libs/cairo:=
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -42,8 +42,12 @@ 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
+#	[[ ${PV} == 9999 ]] && eautoreconf
+#	elibtoolize  # for building a shared library on x64-solaris
+
+	# parallel make failure, fixed in 0.9.13, needs eautoreconf; bug #450920
+	epatch "${FILESDIR}/${P}-hb-version.h.patch"
+	eautoreconf
 }
 
 src_configure() {
@@ -53,5 +57,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	prune_libtool_files --modules
 }
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 5f00767db761..c9ab0d32a5f2 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.10 2013/01/28 13:50:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.11 2013/02/12 03:18:45 tetromino Exp $
 
 EAPI=5
 
@@ -16,15 +16,15 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
 LICENSE="Old-MIT ISC icu"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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
+	dev-libs/icu:=
+	media-gfx/graphite2:=
+	media-libs/freetype:2=
+	x11-libs/cairo:=
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -53,5 +53,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	prune_libtool_files --modules
 }