| 1 |
commit: 4a06c460a2261cc1421ed8a83f044d26901f9390 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 26 22:52:57 2015 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 26 22:53:40 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a06c460 |
| 7 |
|
| 8 |
media-libs/harfbuzz: Version bump, bug 566220; fixes tests, bug 567338 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
media-libs/harfbuzz/Manifest | 1 + |
| 13 |
.../harfbuzz/{harfbuzz-9999.ebuild => harfbuzz-1.1.2.ebuild} | 9 ++++++--- |
| 14 |
media-libs/harfbuzz/harfbuzz-9999.ebuild | 9 ++++++--- |
| 15 |
3 files changed, 13 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest |
| 18 |
index 95c4c1b..8d23d58 100644 |
| 19 |
--- a/media-libs/harfbuzz/Manifest |
| 20 |
+++ b/media-libs/harfbuzz/Manifest |
| 21 |
@@ -1,2 +1,3 @@ |
| 22 |
DIST harfbuzz-0.9.41.tar.bz2 1188176 SHA256 d81aa53d0c02b437beeaac159d7fc16394d676bbce0860fb6f6a10b587dc057c SHA512 821b2fbd0d668c90e9e0040f60b7cfd8d35954d218045cebfb5e9c6ba29aba4230d0cd8e951697c26afcc4da447177fe967fa323449499fa710b52dd7e1a7011 WHIRLPOOL 84ba899d8fbc27b19d255d3c40e2d1f92c8c0dcc0a764b5c83c8c470af4902891f954d11aa64b6eb69aac0e8cf55c36ee9babff0a9260fc9f6286ce48330accb |
| 23 |
DIST harfbuzz-1.0.6.tar.bz2 1240522 SHA256 f616a7fbdc78a627043f9029000bf08c0c71df59cde4143fc92a014f6a993b26 SHA512 20ee169389a784e4ad4e2ff006a59a36879dba0a37a999ff51c2b4d76da9496a1a747d5176e9611998187452e6d18f880295bdfb9f45338acddf772fc3f16021 WHIRLPOOL 63eab91311674417b66fa92e0b92a5482321dfa8dc48edcc3ae1ed459483222ab08229438356245cc183234a65388fbb6bdb73222359dea0ec2a35a1bf141c78 |
| 24 |
+DIST harfbuzz-1.1.2.tar.bz2 1233019 SHA256 4a2c5790bd3db7c3ca8c02e4858f2fd592df7932c1d2fa9f6b99acbce0f8461f SHA512 ac2866a3267d7a55311abbdb8f8c38511799c471fb750f203494749ad26edd91ad36c995ee1ce756fa1fcc1625633435cd616e90b794d70f4bb8d213c6d693f9 WHIRLPOOL ef744ddccf30a387823021606304c9f888b99686b397270c2e742191e4c4a885e5872e3c4e8370d0079175a1a026d4c4b21bacf9adf27ccc2837c73294fee121 |
| 25 |
|
| 26 |
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-1.1.2.ebuild |
| 27 |
similarity index 90% |
| 28 |
copy from media-libs/harfbuzz/harfbuzz-9999.ebuild |
| 29 |
copy to media-libs/harfbuzz/harfbuzz-1.1.2.ebuild |
| 30 |
index 7b07897..cdfd7a5 100644 |
| 31 |
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild |
| 32 |
+++ b/media-libs/harfbuzz/harfbuzz-1.1.2.ebuild |
| 33 |
@@ -19,15 +19,17 @@ LICENSE="Old-MIT ISC icu" |
| 34 |
SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416 |
| 35 |
[[ ${PV} == 9999 ]] || \ |
| 36 |
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" |
| 37 |
-IUSE="+cairo +glib +graphite icu +introspection static-libs test +truetype" |
| 38 |
+ |
| 39 |
+IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype" |
| 40 |
REQUIRED_USE="introspection? ( glib )" |
| 41 |
|
| 42 |
RDEPEND=" |
| 43 |
cairo? ( x11-libs/cairo:= ) |
| 44 |
+ fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] ) |
| 45 |
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) |
| 46 |
graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] ) |
| 47 |
icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) |
| 48 |
- introspection? ( >=dev-libs/gobject-introspection-1.34 ) |
| 49 |
+ introspection? ( >=dev-libs/gobject-introspection-1.34:= ) |
| 50 |
truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] ) |
| 51 |
" |
| 52 |
DEPEND="${RDEPEND} |
| 53 |
@@ -77,6 +79,7 @@ multilib_src_configure() { |
| 54 |
--without-uniscribe \ |
| 55 |
$(use_enable static-libs static) \ |
| 56 |
$(multilib_native_use_with cairo) \ |
| 57 |
+ $(use_with fontconfig) \ |
| 58 |
$(use_with glib) \ |
| 59 |
$(use_with introspection gobject) \ |
| 60 |
$(use_with graphite graphite2) \ |
| 61 |
@@ -85,7 +88,7 @@ multilib_src_configure() { |
| 62 |
$(use_with truetype freetype) |
| 63 |
|
| 64 |
if multilib_is_native_abi; then |
| 65 |
- ln -s "${S}"/docs/reference/html docs/reference/html || die |
| 66 |
+ ln -s "${S}"/docs/html docs/html || die |
| 67 |
fi |
| 68 |
} |
| 69 |
|
| 70 |
|
| 71 |
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild |
| 72 |
index 7b07897..cdfd7a5 100644 |
| 73 |
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild |
| 74 |
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild |
| 75 |
@@ -19,15 +19,17 @@ LICENSE="Old-MIT ISC icu" |
| 76 |
SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416 |
| 77 |
[[ ${PV} == 9999 ]] || \ |
| 78 |
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" |
| 79 |
-IUSE="+cairo +glib +graphite icu +introspection static-libs test +truetype" |
| 80 |
+ |
| 81 |
+IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype" |
| 82 |
REQUIRED_USE="introspection? ( glib )" |
| 83 |
|
| 84 |
RDEPEND=" |
| 85 |
cairo? ( x11-libs/cairo:= ) |
| 86 |
+ fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] ) |
| 87 |
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) |
| 88 |
graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] ) |
| 89 |
icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) |
| 90 |
- introspection? ( >=dev-libs/gobject-introspection-1.34 ) |
| 91 |
+ introspection? ( >=dev-libs/gobject-introspection-1.34:= ) |
| 92 |
truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] ) |
| 93 |
" |
| 94 |
DEPEND="${RDEPEND} |
| 95 |
@@ -77,6 +79,7 @@ multilib_src_configure() { |
| 96 |
--without-uniscribe \ |
| 97 |
$(use_enable static-libs static) \ |
| 98 |
$(multilib_native_use_with cairo) \ |
| 99 |
+ $(use_with fontconfig) \ |
| 100 |
$(use_with glib) \ |
| 101 |
$(use_with introspection gobject) \ |
| 102 |
$(use_with graphite graphite2) \ |
| 103 |
@@ -85,7 +88,7 @@ multilib_src_configure() { |
| 104 |
$(use_with truetype freetype) |
| 105 |
|
| 106 |
if multilib_is_native_abi; then |
| 107 |
- ln -s "${S}"/docs/reference/html docs/reference/html || die |
| 108 |
+ ln -s "${S}"/docs/html docs/html || die |
| 109 |
fi |
| 110 |
} |
Archives