Version bump, drop old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

diff --git a/media-libs/harfbuzz/ChangeLog b/media-libs/harfbuzz/ChangeLog
index 8ea2814ca7b87428711fb8d34c469f82412f9882..f3693339840290ec83c8eaba5f20d51f9f26f249 100644 (file)
--- a/media-libs/harfbuzz/ChangeLog
+++ b/media-libs/harfbuzz/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/harfbuzz
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.99 2015/03/03 08:36:27 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.100 2015/03/28 18:06:23 tetromino Exp $
+
+*harfbuzz-0.9.40 (28 Mar 2015)
+
+  28 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -harfbuzz-0.9.37.ebuild, +harfbuzz-0.9.40.ebuild, harfbuzz-9999.ebuild,
+  -files/harfbuzz-0.9.12-hb-version.h.patch:
+  Version bump, drop old.
 
   03 Mar 2015; Yixun Lan <dlan@gentoo.org> harfbuzz-0.9.38.ebuild:
   add arm64 support, tested on A53 board

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index fdf3fc640678990b332fb76ec280eb243daee945..92808077fc889bbf04c0cb5a4ac1910a9823a49a 100644 (file)
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,12 +1,33 @@
-AUX harfbuzz-0.9.12-hb-version.h.patch 2003 SHA256 39b7689aac2e60c105b17acd3fb0cf5d1333d1276909660c1b4dac8045d8fdda SHA512 5b0072805a8e6a2063be9e6902714196d28a51b5853a3b36c8a63ce34e6381f55cf7669a15c7d7959ed27546abbd1475cfcc41a9f6c05a955eea803a69b89aec WHIRLPOOL 8d49e7bae164d90f9e08c880c65fb18968c61a86a85a694e632aac4afbba4078bbc092a6db9f206eaf6beb77f575541e3a801f7b8addac470f4fda07110f29d6
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST harfbuzz-0.9.28.tar.bz2 1063769 SHA256 a567f7c58018af0a9751e18641fd8434bfcef8307122dabe47dd652ce8bde048 SHA512 6b475cc05fc7707d60138573bfcf97f2415c3b8a17ddf844dcf919c215eee882f220a54792ceb9a15b009a5f574f965a06ed1d8b2cbcc990b758fcca3503f021 WHIRLPOOL cbb3a9ae0d3e00c8cd28b145982f396d75a7e56f659657e21f2ed9767c756b0a72e43c3b5b233667dcd29102a8307a791f5ef48e64d9abd1a45a495066264048
 DIST harfbuzz-0.9.35.tar.bz2 1165359 SHA256 0aa1a8aba6f502321cf6fef3c9d2c73dde48389c5ed1d3615a7691944c2a06ed SHA512 843555b33a5cfb96a909f14a558818a10fa59b70e5284e749c96ec0273fc17b59d535fba314992e8b6713fddfcf3cb96826e5420e88a251e5d39802fd07aadc1 WHIRLPOOL de15ac4fa6680b10121c50b0dcb0412aa04d98729955ea8bd58d83ef629098eb2eeccab36d0e8b9a224b2d4ff19201b294ca27e5552ea4cefdb1abe73eb3c780
-DIST harfbuzz-0.9.37.tar.bz2 1172911 SHA256 255f3b3842dead16863d1d0c216643d97b80bfa087aaa8fc5926da24ac120207 SHA512 0884b0b672e8c99070f488dc7b1054d633c66dd1cd5f298dacb5246d280d1e8aace243dd38958b5c42d7b43fc832ac6031cacaf36e1fc6b58a82c12235eddd5a WHIRLPOOL 725bc9dbf63d4885df8fb11936f0208ee9cddf4082ded5a69c1daf814a314833bd4913cef557a3329f02914053cba886f25825a00fd0714482d06c5a3d117577
 DIST harfbuzz-0.9.38.tar.bz2 1177106 SHA256 6736f383b4edfcaaeb6f3292302ca382d617d8c79948bb2dd2e8f86cdccfd514 SHA512 7638853a33bafa139d3a87b2733e89d19239c2ef13afcd1bb0dac3a0f95f786caaaf327560c1714d502ee0adcc2bb068ee6095e81b501a66f8c7559394f1458e WHIRLPOOL 79278d7db00a401af036f35bb90d7dd058b99bc13095f5ba4dac97e68372b51b8192dc0538667ff67b13e39c97318df8351c9c5f5482cc1af7c3bc6764cd534e
+DIST harfbuzz-0.9.40.tar.bz2 1182989 SHA256 1771d53583be6d91ca961854b2a24fb239ef0545eed221ae3349abae0ab8321f SHA512 9dcc8f5790b78efa14d328e48c68d97f44fce8658fdad9f6d46a79feb715a57903064087d2aef6cea84904936c27c623583b4c67d0e21511a4b82a9213d86eff WHIRLPOOL 4b450d4a1a02bb846de582f84a63483182d3b2f071e54abd2a58b2b9d88c25eb7b880a961584ad087bee8c1eae2789446a9da29634f22467f00d72e7b90eb0d2
 EBUILD harfbuzz-0.9.28.ebuild 2728 SHA256 6fb6a7ae7f7252fc24d9701dc328b522a8338b268a5b97b8b03997e2a387376c SHA512 0e7f1109cff353bd613b1e2d1cbebdd3dd2c0154fd770c0c7340a0a3348ba692293c2e573a7fc640f9e32b36863fc041242d9f575c355217c875a622a9c18f49 WHIRLPOOL c10958f78f0440cbc9a4a8f3202dd1cc2436b77f9a523df61adafa913b41e7a1fa30cb12f0a34629273988857571a79eaecc94d306cd280da97b66dd14977a3f
 EBUILD harfbuzz-0.9.35.ebuild 2829 SHA256 953cd733200fd15ca9d29f3106bd9fb3d3609e900f5c28078b2fad888769ae7b SHA512 ec8c55e86f12976bd7415059afbcbbd48c6a5ce68d927473113303189358795197478cdf1a601bd520c5776f47fa1f13c2e20bad8c097ba98713186ccea1fedd WHIRLPOOL ee5aa1f211b03141708632f65c606eb0bad27632eb5b4a31f75c70e124fd435cc640702537ed2fe13c95e713d53e9fa854762fca0a0daca5edfa58151e03ec6c
-EBUILD harfbuzz-0.9.37.ebuild 2840 SHA256 abedf9cd67c6fd4d00fba4a83b154069e60c74369b39378e6afb94582f7640b4 SHA512 bae0fbf4ee91eb8d559232e4b9fefea22d498425839e5d59786fe1ebccec05129f19316a930bda647335af5c2bf1609bc585821aefa67e47d606d30a62c31aca WHIRLPOOL 031ec4e49ce5af4d326e4cfcae650780a40483bf03d73962b612cdaf6fc32cc852107831d141890cb184865f6a2dc4c51bea50909e3223ea61cb1c0d9eab74a5
 EBUILD harfbuzz-0.9.38.ebuild 3080 SHA256 c76d4cf98ab049a7b4d080a22663ce683eb1157f5f77955bbc67d0f0586fc05f SHA512 ce9ef4b847b3fd4cf681a578b6dced4444e01fbcc64e214d9f7743507f42cf3aefb1e1257d58a99edbc067c081b634918361bb1b7cc25171685bbdc6dd0e0d7f WHIRLPOOL 5024748d29f34275abc446598aaef8518df9c7d6a6d4a7d83600e41fa65ab3fcafee92864c0cc69e515264b2466d02b6e4770e45a5c05d4fe9c170bde2aafd03
-EBUILD harfbuzz-9999.ebuild 3077 SHA256 e4039e22aef9e54b210ce2fc248d6c29b3543df414602246f09de0cf30a7b2c0 SHA512 16a6bad68592bbdfd8faaf68dce64d2629681f9064e3e11ff1215028c4fba6d21155daba7e3760672b6bc3d7a551a5cc5f9ec6b967fff1a649b32b644eea9d81 WHIRLPOOL 8fae9e26e02aab63469f99c287b958dd573b7041370428fbe11bab5eec64a128156c4d032e0632df5e174da902ec707d5268505b89237b9fd3818d150dff20b7
-MISC ChangeLog 14795 SHA256 3a1e8546c1c96d4dfe6fff26fb9633f7cffb2c9300aa0f34edceff7649f42fda SHA512 bcf6d2fe08388cacd71550a2422c2ef06ed434fdad754a4753e0aa632331ed58c329d11db4c5709e3acf0f38930ce56881fc337af3257dc99438ba0418ad98e9 WHIRLPOOL 3b2904121e7c01217a2ddc28ad3d5e1568549a60a2f3856663570610398906426c1c8d6f1084f40d47dbd0dafafcd649b9357379e4306bb9b6043b82f3330ae3
+EBUILD harfbuzz-0.9.40.ebuild 3085 SHA256 be1cccf853bbd6b820065e39863d9be80918c64ad0e67e2489d1f9d98e037ed1 SHA512 4782600429c30dadcd773bb193c6f21629b5c046bc493fce0bbbf8bf7b3d4a4f0e75f7a9e0e5355d1b4c7728c61aa489bdb87e88c79f4ba27e3771f219f272b5 WHIRLPOOL 9ba7146f411e8ce442d153e2670117c2de56d91cdd9984f319ef6ae2c98067e0c868a4f9896eae1ef777fa1bfa10b700dcb7dc2f76e5d0cec59c9d4dedb88953
+EBUILD harfbuzz-9999.ebuild 3084 SHA256 6520367b5bd1416b96b40e8765aecdaf60cb6a39835daf036a12b2eaa20bfb4e SHA512 0d76f10e2137679d3ee222a2806539d96666654c3f7b86e29dd6139252cf21312003a900775b181b01522b9044087338721aea5eb739ad1c2823079421b70338 WHIRLPOOL 9c08ecd69e40b827d01d5277084aa3d4a953fd7e9a41a41c3def70c0d91a64e8a5f813f88ebbd2b573cc4e0c9bcf5a96c57e257a3a24705a34dd07537348f1fa
+MISC ChangeLog 15038 SHA256 a0c26b323a5338093b4a296471201b3ed1834c5a160602dd0dbcbc84567f0391 SHA512 959ecda864e1c72958f3fa06176f084fd6d3f0387a2856233ebbc5de28281ebf82020d3a033a45b8781769c46450fcc16a30d55a5dfe82f336865b26359cfb0c WHIRLPOOL 82facbe6af806141f0c0bba747772171f05255cab13cfbfc5acf9e982433eca53f7d39599089339449406cef178579b6f8e5ebd2a8557e9563042597d5512367
 MISC metadata.xml 348 SHA256 ab40ba306c3499687d57b89247a77e7e8093c88196e6c0fb2333f014ee37c3da SHA512 057542963b2698ddd474970f6b49a6b99c5ff1982c29d7495b6ea05a8bc5266007e328b6658c13052cad8cd2b1c44e2bd6d60ef3e4ef43755c6b4c785b908485 WHIRLPOOL f1799f9bedccd73989ce42f234a28222de692f147553bf4a8bdf154bb544f22ead4ade109700fea7785747d27adbcf30c5543d435f3584f43817b1ed1111b1a6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJVFu2gXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNLvkP/0gSdUbJOdRIGceaKyH6YJIK
+8zpBBNwvNzWNbIeHqyNq07IfdI+pdXUMYM1Ss/DzCCvcroIquMJycqWwG/DQFSrU
+DylvoJRgQKjQfUwK4O/ouBQjKpkOkRIzYigqN2a6RUZxqXDI8kfrr2Cncm3dtZ7q
+Ny30IKF5b40cH1NGN+oPBbCfIcypIcL9VOXpmf2IYAEbRh7WZIWCTpp4LWGiq967
+X1pbDvWQF7vkpgNZOUUVDFxRPdECWx/chviAcTCB5eCcl2FcmnifLB8UfWe19r6u
+ZAAIJL34MQdlcAIPChpY3KHlnapU+Cl83pzZ5VgKjV34AzFrFYVvbLTTugaNO6Lb
+Y0pSug1ExLViwRNdQJTMoTjegM5U+BiajxYCOyK966AQ8fhdLYytqw8wSvjBL5LC
+4zoHQn7CH3YAAkRHCZTp8UU9c1Cgj6WBK4lutrcO9VH6ZiGe539bX+mm62aEjLtr
+z0omJ/0dt9q0wb1Y8+sTFD1UJQBWd6BbWJRfgfs6yVneSgrlwDr6cIj7I0FLtLXt
+RTs/P9zyCGse7ZbsAZm48MABT2z3TxamJ9x6rlDNbTBJFkbBcAmbxXEgCgxrYbjL
+FIEPrtS0ObWx79xt6tJPj94TXT39ogtJnE15YiJVwAC9b7359e07eEYcHV4e065u
++n3d/ADIvcau9gVNjLQw
+=BJsC
+-----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
deleted file mode 100644 (file)
index 7e486d2..0000000
--- a/media-libs/harfbuzz/files/harfbuzz-0.9.12-hb-version.h.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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.37.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.40.ebuild
similarity index 82%
rename from media-libs/harfbuzz/harfbuzz-0.9.37.ebuild
rename to media-libs/harfbuzz/harfbuzz-0.9.40.ebuild
index 14d898b0ebec3fdd030296e4bb916cf5da9e3a84..9a053792f17acc98b71e34d510089b966db7932b 100644 (file)
--- a/media-libs/harfbuzz/harfbuzz-0.9.37.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-0.9.40.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.37.ebuild,v 1.1 2014/12/27 20:47:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.40.ebuild,v 1.1 2015/03/28 18:06:23 tetromino Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ 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 ~mips ~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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="+cairo +glib +graphite icu +introspection static-libs test +truetype"
 REQUIRED_USE="introspection? ( glib )"
 
@@ -64,17 +64,21 @@ src_prepare() {
 
        [[ ${PV} == 9999 ]] && eautoreconf
        elibtoolize # for Solaris
+
+       # failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
+       sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
 }
 
 multilib_src_configure() {
        ECONF_SOURCE="${S}" \
+       # harfbuzz-gobject only used for instrospection, bug #535852
        econf \
                --without-coretext \
                --without-uniscribe \
                $(use_enable static-libs static) \
                $(multilib_native_use_with cairo) \
                $(use_with glib) \
-               $(use_with glib gobject) \
+               $(use_with introspection gobject) \
                $(use_with graphite graphite2) \
                $(use_with icu) \
                $(multilib_native_use_enable introspection) \

diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 167c40beaf2005e32559ffb667a849bc4b5b3a4c..af1bd920d94d17e52ae1f63e5791210d35570d57 100644 (file)
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.32 2015/02/17 17:19:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.33 2015/03/28 18:06:23 tetromino Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ 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 ~mips ~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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="+cairo +glib +graphite icu +introspection static-libs test +truetype"
 REQUIRED_USE="introspection? ( glib )"