From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E5F871396D0 for ; Fri, 18 Aug 2017 15:02:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 388FFE0D33; Fri, 18 Aug 2017 15:02:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0C9A4E0D33 for ; Fri, 18 Aug 2017 15:02:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ADA2E341910 for ; Fri, 18 Aug 2017 15:02:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 589037A22 for ; Fri, 18 Aug 2017 15:02:53 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1503068569.3b68e1adaa846f544156dc17db2e520b5f10f8e9.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/harfbuzz/harfbuzz-9999.ebuild X-VCS-Directories: media-libs/harfbuzz/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 3b68e1adaa846f544156dc17db2e520b5f10f8e9 X-VCS-Branch: master Date: Fri, 18 Aug 2017 15:02:53 +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: 208ff7b1-a3d0-4393-bf2a-d9166c30627d X-Archives-Hash: 7fe23b3e90f43debcfe8443a49e10648 commit: 3b68e1adaa846f544156dc17db2e520b5f10f8e9 Author: Lars Wendler gentoo org> AuthorDate: Fri Aug 18 15:02:35 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Aug 18 15:02:49 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b68e1ad media-libs/harfbuzz: Sync (and improve) live ebuild. Package-Manager: Portage-2.3.8, Repoman-2.3.3 media-libs/harfbuzz/harfbuzz-9999.ebuild | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild index fbd9ff51526..c785260b6c4 100644 --- a/media-libs/harfbuzz/harfbuzz-9999.ebuild +++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild @@ -3,21 +3,24 @@ EAPI=6 -EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git" -[[ ${PV} == 9999 ]] && inherit git-r3 autotools - PYTHON_COMPAT=( python2_7 ) inherit eutils flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils DESCRIPTION="An OpenType text shaping engine" HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz" -[[ ${PV} == 9999 ]] || SRC_URI="https://www.freedesktop.org/software/harfbuzz/release/${P}.tar.bz2" + +if [[ ${PV} != 9999 ]] ; then + SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2" + 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" +else + inherit git-r3 autotools + #EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz" + EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git" +fi 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 debug fontconfig +glib +graphite icu +introspection static-libs test +truetype" REQUIRED_USE="introspection? ( glib )" @@ -25,7 +28,7 @@ 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}] ) + glib? ( >=dev-libs/glib-2.38: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:= ) @@ -38,7 +41,7 @@ DEPEND="${RDEPEND} " # eautoreconf requires gobject-introspection-common # ragel needed if regenerating *.hh files from *.rl -[[ ${PV} = 9999 ]] && DEPEND="${DEPEND} +[[ ${PV} = 9999 ]] && DEPEND+=" >=dev-libs/gobject-introspection-common-1.34 dev-util/ragel " @@ -46,7 +49,6 @@ DEPEND="${RDEPEND} pkg_setup() { use test && python-any-r1_pkg_setup if ! use debug ; then - append-cppflags -DNDEBUG append-cppflags -DHB_NDEBUG fi }