summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-libs/harfbuzz/ChangeLog7
-rw-r--r--media-libs/harfbuzz/harfbuzz-0.9.20.ebuild6
-rw-r--r--media-libs/harfbuzz/harfbuzz-9999.ebuild6
3 files changed, 14 insertions, 5 deletions
diff --git a/media-libs/harfbuzz/ChangeLog b/media-libs/harfbuzz/ChangeLog
index 4348bf5dd61f..87a952c021a1 100644
--- a/media-libs/harfbuzz/ChangeLog
+++ b/media-libs/harfbuzz/ChangeLog
@@ -1,6 +1,11 @@
# 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.45 2013/09/02 19:28:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.46 2013/09/10 13:52:46 tetromino Exp $
+
+ 10 Sep 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+ harfbuzz-0.9.20.ebuild, harfbuzz-9999.ebuild:
+ Don't require gobject-introspection-common if we are not doing eautoreconf
+ (bug #484312, thanks to grey dot).
*harfbuzz-0.9.20 (02 Sep 2013)
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.20.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.20.ebuild
index 445997546f58..ab5aa8f14f15 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.20.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-0.9.20.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-0.9.20.ebuild,v 1.1 2013/09/02 19:28:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.20.ebuild,v 1.2 2013/09/10 13:52:46 tetromino Exp $
EAPI=5
@@ -30,11 +30,13 @@ RDEPEND="
truetype? ( media-libs/freetype:2= )
"
DEPEND="${RDEPEND}
- >=dev-libs/gobject-introspection-common-1.32
dev-util/gtk-doc-am
dev-util/ragel
virtual/pkgconfig
"
+# eautoreconf requires gobject-introspection-common
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+ >=dev-libs/gobject-introspection-common-1.32"
src_prepare() {
if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 5ea7ec16ccf6..a5f557eb6bd6 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.16 2013/09/02 19:28:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.17 2013/09/10 13:52:46 tetromino Exp $
EAPI=5
@@ -30,11 +30,13 @@ RDEPEND="
truetype? ( media-libs/freetype:2= )
"
DEPEND="${RDEPEND}
- >=dev-libs/gobject-introspection-common-1.32
dev-util/gtk-doc-am
dev-util/ragel
virtual/pkgconfig
"
+# eautoreconf requires gobject-introspection-common
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+ >=dev-libs/gobject-introspection-common-1.32"
src_prepare() {
if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then