From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B42F51384B4 for ; Sat, 26 Dec 2015 22:53:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03766E07E2; Sat, 26 Dec 2015 22:53:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 72E9BE07E2 for ; Sat, 26 Dec 2015 22:53:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3BC9D34045C for ; Sat, 26 Dec 2015 22:53:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B4C4A4B for ; Sat, 26 Dec 2015 22:53:43 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1451170420.4a06c460a2261cc1421ed8a83f044d26901f9390.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/harfbuzz/Manifest media-libs/harfbuzz/harfbuzz-1.1.2.ebuild media-libs/harfbuzz/harfbuzz-9999.ebuild X-VCS-Directories: media-libs/harfbuzz/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 4a06c460a2261cc1421ed8a83f044d26901f9390 X-VCS-Branch: master Date: Sat, 26 Dec 2015 22:53:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1f4cd6f5-4222-49ac-b29c-224bb3db50fc X-Archives-Hash: 1eb0a02bb947672ce3b37e4ef4f23790 commit: 4a06c460a2261cc1421ed8a83f044d26901f9390 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Dec 26 22:52:57 2015 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Sat Dec 26 22:53:40 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a06c460 media-libs/harfbuzz: Version bump, bug 566220; fixes tests, bug 567338 Package-Manager: portage-2.2.26 media-libs/harfbuzz/Manifest | 1 + .../harfbuzz/{harfbuzz-9999.ebuild => harfbuzz-1.1.2.ebuild} | 9 ++++++--- media-libs/harfbuzz/harfbuzz-9999.ebuild | 9 ++++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest index 95c4c1b..8d23d58 100644 --- a/media-libs/harfbuzz/Manifest +++ b/media-libs/harfbuzz/Manifest @@ -1,2 +1,3 @@ DIST harfbuzz-0.9.41.tar.bz2 1188176 SHA256 d81aa53d0c02b437beeaac159d7fc16394d676bbce0860fb6f6a10b587dc057c SHA512 821b2fbd0d668c90e9e0040f60b7cfd8d35954d218045cebfb5e9c6ba29aba4230d0cd8e951697c26afcc4da447177fe967fa323449499fa710b52dd7e1a7011 WHIRLPOOL 84ba899d8fbc27b19d255d3c40e2d1f92c8c0dcc0a764b5c83c8c470af4902891f954d11aa64b6eb69aac0e8cf55c36ee9babff0a9260fc9f6286ce48330accb DIST harfbuzz-1.0.6.tar.bz2 1240522 SHA256 f616a7fbdc78a627043f9029000bf08c0c71df59cde4143fc92a014f6a993b26 SHA512 20ee169389a784e4ad4e2ff006a59a36879dba0a37a999ff51c2b4d76da9496a1a747d5176e9611998187452e6d18f880295bdfb9f45338acddf772fc3f16021 WHIRLPOOL 63eab91311674417b66fa92e0b92a5482321dfa8dc48edcc3ae1ed459483222ab08229438356245cc183234a65388fbb6bdb73222359dea0ec2a35a1bf141c78 +DIST harfbuzz-1.1.2.tar.bz2 1233019 SHA256 4a2c5790bd3db7c3ca8c02e4858f2fd592df7932c1d2fa9f6b99acbce0f8461f SHA512 ac2866a3267d7a55311abbdb8f8c38511799c471fb750f203494749ad26edd91ad36c995ee1ce756fa1fcc1625633435cd616e90b794d70f4bb8d213c6d693f9 WHIRLPOOL ef744ddccf30a387823021606304c9f888b99686b397270c2e742191e4c4a885e5872e3c4e8370d0079175a1a026d4c4b21bacf9adf27ccc2837c73294fee121 diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-1.1.2.ebuild similarity index 90% copy from media-libs/harfbuzz/harfbuzz-9999.ebuild copy to media-libs/harfbuzz/harfbuzz-1.1.2.ebuild index 7b07897..cdfd7a5 100644 --- a/media-libs/harfbuzz/harfbuzz-9999.ebuild +++ b/media-libs/harfbuzz/harfbuzz-1.1.2.ebuild @@ -19,15 +19,17 @@ 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 ~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" + +IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype" REQUIRED_USE="introspection? ( glib )" RDEPEND=" cairo? ( x11-libs/cairo:= ) + fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] ) glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] ) icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.34 ) + introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND} @@ -77,6 +79,7 @@ multilib_src_configure() { --without-uniscribe \ $(use_enable static-libs static) \ $(multilib_native_use_with cairo) \ + $(use_with fontconfig) \ $(use_with glib) \ $(use_with introspection gobject) \ $(use_with graphite graphite2) \ @@ -85,7 +88,7 @@ multilib_src_configure() { $(use_with truetype freetype) if multilib_is_native_abi; then - ln -s "${S}"/docs/reference/html docs/reference/html || die + ln -s "${S}"/docs/html docs/html || die fi } diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild index 7b07897..cdfd7a5 100644 --- a/media-libs/harfbuzz/harfbuzz-9999.ebuild +++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild @@ -19,15 +19,17 @@ 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 ~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" + +IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype" REQUIRED_USE="introspection? ( glib )" RDEPEND=" cairo? ( x11-libs/cairo:= ) + fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] ) glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] ) icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.34 ) + introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND} @@ -77,6 +79,7 @@ multilib_src_configure() { --without-uniscribe \ $(use_enable static-libs static) \ $(multilib_native_use_with cairo) \ + $(use_with fontconfig) \ $(use_with glib) \ $(use_with introspection gobject) \ $(use_with graphite graphite2) \ @@ -85,7 +88,7 @@ multilib_src_configure() { $(use_with truetype freetype) if multilib_is_native_abi; then - ln -s "${S}"/docs/reference/html docs/reference/html || die + ln -s "${S}"/docs/html docs/html || die fi }