From 3e7db453795b0dc0004191cc222aac190eafaddd Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Thu, 6 Jun 2013 05:23:28 +0000 Subject: Add a subslot due to ABI change (some symbols moved to libharfbuzz-icu), bug #472416. (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) --- media-libs/harfbuzz/ChangeLog | 9 +++- media-libs/harfbuzz/harfbuzz-0.9.18-r1.ebuild | 70 +++++++++++++++++++++++++++ media-libs/harfbuzz/harfbuzz-0.9.18.ebuild | 70 --------------------------- media-libs/harfbuzz/harfbuzz-9999.ebuild | 4 +- 4 files changed, 80 insertions(+), 73 deletions(-) create mode 100644 media-libs/harfbuzz/harfbuzz-0.9.18-r1.ebuild delete mode 100644 media-libs/harfbuzz/harfbuzz-0.9.18.ebuild (limited to 'media-libs') 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 + -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/harfbuzz-0.9.18-r1.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.18-r1.ebuild new file mode 100644 index 000000000000..18714a39cd00 --- /dev/null +++ b/media-libs/harfbuzz/harfbuzz-0.9.18-r1.ebuild @@ -0,0 +1,70 @@ +# 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-r1.ebuild,v 1.1 2013/06/06 05:23:28 tetromino Exp $ + +EAPI=5 + +EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz" +[[ ${PV} == 9999 ]] && inherit git-2 autotools + +inherit eutils libtool autotools + +DESCRIPTION="An OpenType text shaping engine" +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/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" + +RDEPEND=" + cairo? ( x11-libs/cairo:= ) + glib? ( dev-libs/glib:2 ) + graphite? ( media-gfx/graphite2:= ) + icu? ( dev-libs/icu:= ) + truetype? ( media-libs/freetype:2= ) +" +DEPEND="${RDEPEND} + dev-util/ragel + virtual/pkgconfig +" + +src_prepare() { + if [[ ${CHOST} == *-darwin* ]] ; then + # on Darwin we need to link with g++, like automake defaults to, + # but overridden by upstream because on Linux this is not + # necessary, bug #449126 + sed -i \ + -e 's/\/CXXLINK/' \ + src/Makefile.am || die + sed -i \ + -e '/libharfbuzz_la_LINK = /s/\/CXXLINK/' \ + src/Makefile.in || die + fi + + [[ ${PV} == 9999 ]] && eautoreconf + elibtoolize # for building a shared library on x64-solaris + + epatch "${FILESDIR}/${P}-ldadd.patch" + eautoreconf +} + +src_configure() { + econf \ + --without-coretext \ + --without-uniscribe \ + $(use_enable static-libs static) \ + $(use_with cairo) \ + $(use_with glib) \ + $(use_with graphite graphite2) \ + $(use_with icu) \ + $(use_with truetype freetype) + +} + +src_install() { + default + prune_libtool_files --modules +} diff --git a/media-libs/harfbuzz/harfbuzz-0.9.18.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.18.ebuild deleted file mode 100644 index 0ac05c67e61b..000000000000 --- a/media-libs/harfbuzz/harfbuzz-0.9.18.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# 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 $ - -EAPI=5 - -EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz" -[[ ${PV} == 9999 ]] && inherit git-2 autotools - -inherit eutils libtool autotools - -DESCRIPTION="An OpenType text shaping engine" -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" -[[ ${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" - -RDEPEND=" - cairo? ( x11-libs/cairo:= ) - glib? ( dev-libs/glib:2 ) - graphite? ( media-gfx/graphite2:= ) - icu? ( dev-libs/icu:= ) - truetype? ( media-libs/freetype:2= ) -" -DEPEND="${RDEPEND} - dev-util/ragel - virtual/pkgconfig -" - -src_prepare() { - if [[ ${CHOST} == *-darwin* ]] ; then - # on Darwin we need to link with g++, like automake defaults to, - # but overridden by upstream because on Linux this is not - # necessary, bug #449126 - sed -i \ - -e 's/\/CXXLINK/' \ - src/Makefile.am || die - sed -i \ - -e '/libharfbuzz_la_LINK = /s/\/CXXLINK/' \ - src/Makefile.in || die - fi - - [[ ${PV} == 9999 ]] && eautoreconf - elibtoolize # for building a shared library on x64-solaris - - epatch "${FILESDIR}/${P}-ldadd.patch" - eautoreconf -} - -src_configure() { - econf \ - --without-coretext \ - --without-uniscribe \ - $(use_enable static-libs static) \ - $(use_with cairo) \ - $(use_with glib) \ - $(use_with graphite graphite2) \ - $(use_with icu) \ - $(use_with truetype freetype) - -} - -src_install() { - default - prune_libtool_files --modules -} 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" -- cgit v1.2.3-65-gdbad