diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-12-31 21:12:01 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-12-31 21:12:01 +0000 |
| commit | c247567f55cd988204fc4fef33bf8acd510adae4 (patch) | |
| tree | 883af41d7c6b4232b3750a4e54da9f22ca7b6807 /media-libs/harfbuzz | |
| parent | Version bump and switch to ESRs homepage. Requested by Christoph Junghans in ... (diff) | |
| download | gentoo-2-c247567f55cd988204fc4fef33bf8acd510adae4.tar.gz gentoo-2-c247567f55cd988204fc4fef33bf8acd510adae4.tar.bz2 gentoo-2-c247567f55cd988204fc4fef33bf8acd510adae4.zip | |
Fixed and keyworded for ~x64-macos, bug #449126
(Portage version: 2.2.01.21476-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'media-libs/harfbuzz')
| -rw-r--r-- | media-libs/harfbuzz/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/harfbuzz/harfbuzz-0.9.9.ebuild | 15 | ||||
| -rw-r--r-- | media-libs/harfbuzz/harfbuzz-9999.ebuild | 13 |
3 files changed, 30 insertions, 4 deletions
diff --git a/media-libs/harfbuzz/ChangeLog b/media-libs/harfbuzz/ChangeLog index c66921faea24..1465df3a2568 100644 --- a/media-libs/harfbuzz/ChangeLog +++ b/media-libs/harfbuzz/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/harfbuzz # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.17 2012/12/28 12:28:27 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.18 2012/12/31 21:12:01 grobian Exp $ + + 31 Dec 2012; Fabian Groffen <grobian@gentoo.org> harfbuzz-0.9.9.ebuild, + harfbuzz-9999.ebuild: + Fixed and keyworded for ~x64-macos, bug #449126 28 Dec 2012; Fabian Groffen <grobian@gentoo.org> harfbuzz-0.9.9.ebuild, harfbuzz-9999.ebuild: diff --git a/media-libs/harfbuzz/harfbuzz-0.9.9.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.9.ebuild index 176ab668a6b8..e2dce8123b8e 100644 --- a/media-libs/harfbuzz/harfbuzz-0.9.9.ebuild +++ b/media-libs/harfbuzz/harfbuzz-0.9.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.9.ebuild,v 1.4 2012/12/28 12:28:27 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.9.ebuild,v 1.5 2012/12/31 21:12:01 grobian Exp $ EAPI=5 @@ -16,7 +16,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz" LICENSE="MIT" SLOT="0" [[ ${PV} == 9999 ]] || \ -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" IUSE="static-libs" RDEPEND=" @@ -33,6 +33,17 @@ DEPEND="${RDEPEND} [[ ${PV} == 9999 ]] && DEPEND+=" dev-util/gtk-doc-am" 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/\<LINK\>/CXXLINK/' \ + src/Makefile.am || die + sed -i \ + -e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \ + src/Makefile.in || die + fi [[ ${PV} == 9999 ]] && eautoreconf elibtoolize # for building a shared library on x64-solaris } diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild index 06e5839e6e5d..133c0988dfad 100644 --- a/media-libs/harfbuzz/harfbuzz-9999.ebuild +++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.6 2012/12/28 12:28:27 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.7 2012/12/31 21:12:01 grobian Exp $ EAPI=5 @@ -33,6 +33,17 @@ DEPEND="${RDEPEND} [[ ${PV} == 9999 ]] && DEPEND+=" dev-util/gtk-doc-am" 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/\<LINK\>/CXXLINK/' \ + src/Makefile.am || die + sed -i \ + -e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \ + src/Makefile.in || die + fi [[ ${PV} == 9999 ]] && eautoreconf elibtoolize # for building a shared library on x64-solaris } |