Add a subslot due to ABI change (some symbols moved to libharfbuzz-icu), bug #472416.

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

4 files changed, 23 insertions, 22 deletions

diff --git a/media-libs/harfbuzz/ChangeLog b/media-libs/harfbuzz/ChangeLog
index f793f1d059f0..48946ab0ec40 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.34 2013/06/05 11:29:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.35 2013/06/06 05:23:28 tetromino Exp $
+
+*harfbuzz-0.9.18-r1 (06 Jun 2013)
+
+  06 Jun 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -harfbuzz-0.9.18.ebuild, +harfbuzz-0.9.18-r1.ebuild, harfbuzz-9999.ebuild:
+  Add a subslot due to ABI change (some symbols moved to libharfbuzz-icu), bug
+  #472416.
 
 *harfbuzz-0.9.18 (05 Jun 2013)
 
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index d5369300c896..459b0770aad6 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -8,24 +8,18 @@ DIST harfbuzz-0.9.17.tar.bz2 902229 SHA256 a4773003512035cb5c559de23e1d53f292bcb
 DIST harfbuzz-0.9.18.tar.bz2 902395 SHA256 fef0fbbc6d6492cb4074a5e26a699d87d88bef8adc25dda62af6077735a7d908 SHA512 cf873e903b620391efbd681a01620f1719d278bf10a61a8f583abb9ba116ec494459cef1f81f137cf2dbb089c9d6a8460576ccabd46ab3f23a50e3731b427f5d WHIRLPOOL 57ecc5fdb9ed879113fac335aa3a222963183832257a58944c561e671e3d514bde462a323b776184d10b2bfe1abc9151c93cff8d9098abedcfa03415708a0fea
 EBUILD harfbuzz-0.9.12.ebuild 1695 SHA256 03c840b96c588595581f8bb4bcd031037df0fcb6fbfc84d7101a66bd733abef5 SHA512 60d77c09cf4740ced67cdf85054863b80b5c57d4467f7d1500bb16ff3cbeb95408879f17afc9cbc2306255f420d0f4070a536d518d452c3d36c9c8886e3a0d58 WHIRLPOOL dfde9152c32518d9692e198f9974752eb790f85218b71a8500850ab7ba94e2d892b806078871cfe87b6c60eee140c5ca400c05ece5e16856404d04f5e342ca36
 EBUILD harfbuzz-0.9.17.ebuild 1554 SHA256 5ae5909f79ba385f26b026b451be5f90c3c1f053b36d81d3de1ab16b2650e07b SHA512 f399f3fb8e50840ead63318138707d03adfc67dfd7582c3cce7b8b46d77909868977586814c57942c162aa40753fceaba7d574005cdd86bb9c0b5cf41b3ced41 WHIRLPOOL 59a679328ab7d8a2fdc07d2b6e05f085ebc6f072d487ffa73fb02f9dbeb7ae9bf2665feb6ce2232a4845e093d3c9ebb3f12881e7874085a9db444b8d61468666
-EBUILD harfbuzz-0.9.18.ebuild 1909 SHA256 c9e76502a2ad128d5904384377dd6632f27fe3fa944ce67ac310c40285234cb2 SHA512 034cd06818afec8a8f823ecdae9f2f229ba8f6a0ab741765e5cfccceca9f97d88bb30c4a4a14fb5556b33b0d1cfbe82a9158b5f4929f5be1c958790706beae43 WHIRLPOOL 80f71347b8ffb8965b92a9a20b6a66b12f06071b2a1549ced559bd3c59068aba1532589cb6098e63a14d48925f28a37b0e628a9e2d188ada0e4fcb40a0ceb725
-EBUILD harfbuzz-9999.ebuild 1844 SHA256 ba2c0c514c4d07841289d6152daf3c8248c40fd8f3aba1913e84e90239bb7f97 SHA512 d0619e2a8e2c80dfce172876953bbe6217dc3f3dc4c36aa1db10fd99f871da9a26ab8ea8f894e942420a3b430c11d64cebfc488d31b553ab38e0e90df424d2e9 WHIRLPOOL 1789398897849cff130f3597ae121099f931e5d27bfd75b8463d4debc0ccb652f167760715cdc05c3b1129784f3fbe9daa9c4053e483478510f95c875d384376
-MISC ChangeLog 5682 SHA256 b1daa8f80034dac87156778adfa8c1c3adfef13498a1bed6bfd0fb4a60408b32 SHA512 318b237ebf53ddef2cb8753a4a307e92484cb51fff8e57dedc8e4049253a94a41d1ba2033723983c2b0aae89b7744a70bfd2b4e33df0ea417930b826e560fdca WHIRLPOOL bface119b2196b160257a299fd2a82059c7d8e52009a28df63f2ad91682aaca16f316bf61b61c28928c844770bbfd502065f020800023812f1b8e1201ef2d861
+EBUILD harfbuzz-0.9.18-r1.ebuild 1975 SHA256 06dafcd770b195339fe1874f4edaad9fe0ed90d0cecb4895442988e2ee214e7c SHA512 152f0292f80eade378e1ecdde23633e06465fa031291e5212c1df66cb728668b4a6b5d980fc74dd2ca6dc8626314151361710a87125c34d694e6f0310ad527bf WHIRLPOOL 88d0427bcd3fb669a74814917aa564c3cde287045fd6f7db7d64176fdc26fa1028269eeffc95f2371c6040d3f0c1edc4d28f8bf295f587536f6ea36a9da0617e
+EBUILD harfbuzz-9999.ebuild 1907 SHA256 68e9f38cffa8e843fb6124a826cbb1f7e81d63787ab992af31241fa954b49395 SHA512 cb204fcff4ee7121d9ce722c468976da35b9bbdc9c98e40236b258674fa9be2e3cafa6218cffd62da810fd26df5e96b63f17252a82955442bc28238425f51803 WHIRLPOOL 18c57413e0a759c39e06ae5f647c4d55b15ab5126e22a33d15b76d996b1eb0478686033de30ac15395c5d84396185374b281c24e5b39a2f84a47abb7df8a9fdd
+MISC ChangeLog 5944 SHA256 540823d5a6d50521ea84f1b7b3a1d9b7ae0272d38cb19eaf416198b429b789d1 SHA512 e3a452639e2e57a4b21a839ff2a7b5cea4ebd5565876f9e4dfa936e52d989e2440720de378193cadc5de5fd2c4b0c2bc25bb35e45585ed004106f000c2899c3e WHIRLPOOL eb53169725f11068efd8e8f23267d6d0f62ba1a9237c444beca3a7d0727a005802c03994416a1280966c2636d032f1d86d9683754ac13e559941ee24917a8399
 MISC metadata.xml 348 SHA256 ab40ba306c3499687d57b89247a77e7e8093c88196e6c0fb2333f014ee37c3da SHA512 057542963b2698ddd474970f6b49a6b99c5ff1982c29d7495b6ea05a8bc5266007e328b6658c13052cad8cd2b1c44e2bd6d60ef3e4ef43755c6b4c785b908485 WHIRLPOOL f1799f9bedccd73989ce42f234a28222de692f147553bf4a8bdf154bb544f22ead4ade109700fea7785747d27adbcf30c5543d435f3584f43817b1ed1111b1a6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRryFBAAoJEOSiRoyO7jvoZxIP/2Q2yDVaEvv6yP3kAFCvXPzZ
-Xs4uMIT50wJHh0QZ1NlCwp438BZKJtrb4ovK4+G0kiwHn3LoE6nfEJ45CLj61PUn
-ZWFP5CvomIXMJP7pk/v+o08KQwL9fQuzn3p4dAvjIh7KFwu1LV77sNUGikSk3xOx
-i6MA3bw9Cr+7F2Yt3PyhFlOuIoqqTk/0qC0SSeyh2jejbZ/BuWxRAGdrHxV7ToxY
-t4YvUiSA4Njz1Dov5B77pzUd3tLjx7Rws9KHrXtRF9sGreneySR80uTFYlHjsuj9
-2vdRQ2TRVU8/ZHpHAgKL67ZkdO/FDxGerxPgv9c5JHkQj9GbSqKIVX632Pqmv80e
-fCvnLxOzSlqzKnoLllM7A9kS8lSIVylU25s3NNlle9PVahuWdfiC2VXbBJQPR3xM
-/tPvcmWfmwsYodnQmgUyQeYpwN8/paeY4rgmXY3E+A3fvYcGgPEfVW30e9ECZfA2
-SBXQxYcIWMJ4W8QD2t+2ANRCRveppc/5NnJvBkHzpRoi/4lyhXop0F3/loa+61vx
-CI2r1q20NqZEsOmE6ZOOfi86smu+BFl1Hgjv0BPFbIloFXXnVTxusWNLRpyDbtNj
-vuzT/UQGz2+F/5EskEwpxtBXI8q4s77sBWSpclcH+lOC3RNkwL317Nnptb3pqw3h
-dU6K2PUjpF624j3FYW69
-=upeX
+iQEcBAEBCAAGBQJRsBzRAAoJEJ0WA1zPCt1hJcwH/183JCNBRguQcwhgoCI+DwQ4
+YUdOE/GAhQtHEt4SxMawyc1gYNYu+QqCFEp/++eAsMeSAa3NKw2dyeW1fW7SERs4
+H7liTO+bFPZn26UoPvO1Ga1b/OjpjflE1k3gOLdoJSsL6kRpYOnFxrzVJkDTrwl9
+YzOsTTDOiRrGBnhkrs3uTmuN86tcaZTmRLxA6BmWhO1vIJQy7oEw0O3GvR8Yk41q
+eVvNXQ15NTdX0IoAEgUDz67yB2ZKj7+czoQdrKqL3UbYVEzFL41abnWTstPDAdH3
+MH7kV1UlL0I3CD7tgwRpQX9JpMwRActRbTa7w/NF+2KDPpQ+afg1+px6fw5780A=
+=qfhV
 -----END PGP SIGNATURE-----
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.18.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.18-r1.ebuild
index 0ac05c67e61b..18714a39cd00 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.18.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-0.9.18-r1.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.18.ebuild,v 1.1 2013/06/05 11:29:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.18-r1.ebuild,v 1.1 2013/06/06 05:23:28 tetromino Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ 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"
+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"
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index c7a2f3eddef1..dd7e4cf2281c 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.14 2013/06/05 11:29:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.15 2013/06/06 05:23:28 tetromino Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ 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"
+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"