Disable harfbuzz tests as they create circular deps only anyway.

(Portage version: 2.2.0_alpha53/cvs/Linux x86_64)

4 files changed, 33 insertions, 20 deletions

diff --git a/media-gfx/graphite2/ChangeLog b/media-gfx/graphite2/ChangeLog
index 3755ddee0498..c22c12daab20 100644
--- a/media-gfx/graphite2/ChangeLog
+++ b/media-gfx/graphite2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/graphite2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.13 2011/09/04 11:29:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.14 2011/09/04 11:44:33 scarabeus Exp $
+
+  04 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> graphite2-1.0.2.ebuild,
+  +files/graphite2-1.0.2-no_harfbuzz_tests.patch,
+  -files/graphite2-1.0.2-notests.patch:
+  Disable harfbuzz tests as they create circular deps only anyway.
 
   04 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> graphite2-1.0.2.ebuild:
   Bump the harfbuzz dependency to make this compile.
diff --git a/media-gfx/graphite2/files/graphite2-1.0.2-no_harfbuzz_tests.patch b/media-gfx/graphite2/files/graphite2-1.0.2-no_harfbuzz_tests.patch
new file mode 100644
index 000000000000..eb413345ca79
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.0.2-no_harfbuzz_tests.patch
@@ -0,0 +1,12 @@
+diff -urN graphite2-1.0.2.old/tests/comparerenderer/CMakeLists.txt graphite2-1.0.2/tests/comparerenderer/CMakeLists.txt
+--- graphite2-1.0.2.old/tests/comparerenderer/CMakeLists.txt	2011-09-04 13:39:16.206450690 +0200
++++ graphite2-1.0.2/tests/comparerenderer/CMakeLists.txt	2011-09-04 13:39:44.516450716 +0200
+@@ -43,7 +43,7 @@
+     find_package(PkgConfig)
+ 
+     pkg_check_modules(GR silgraphite)
+-    pkg_check_modules(HB harfbuzz)
++    #pkg_check_modules(HB harfbuzz)
+     pkg_check_modules(GLIB glib-2.0)
+     # pkg_check_modules(GRNG graphite)
+ 
diff --git a/media-gfx/graphite2/files/graphite2-1.0.2-notests.patch b/media-gfx/graphite2/files/graphite2-1.0.2-notests.patch
deleted file mode 100644
index c3a9c7d33224..000000000000
--- a/media-gfx/graphite2/files/graphite2-1.0.2-notests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN graphite2-1.0.2.orig/CMakeLists.txt graphite2-1.0.2/CMakeLists.txt
---- graphite2-1.0.2.orig/CMakeLists.txt	2011-08-15 09:29:58.000000000 +0200
-+++ graphite2-1.0.2/CMakeLists.txt	2011-08-29 00:18:30.346197643 +0200
-@@ -61,7 +61,7 @@
- 
- add_subdirectory(src)
- add_subdirectory(gr2fonttest)
--add_subdirectory(tests)
-+# add_subdirectory(tests)
- add_subdirectory(doc)
- set(version 2.0.0)
- set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
diff --git a/media-gfx/graphite2/graphite2-1.0.2.ebuild b/media-gfx/graphite2/graphite2-1.0.2.ebuild
index cadcfbcc8dd4..7558e39bdf93 100644
--- a/media-gfx/graphite2/graphite2-1.0.2.ebuild
+++ b/media-gfx/graphite2/graphite2-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.0.2.ebuild,v 1.3 2011/09/04 11:29:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.0.2.ebuild,v 1.4 2011/09/04 11:44:33 scarabeus Exp $
 
 EAPI=4
 
@@ -13,23 +13,24 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="perl"
+IUSE="perl test"
 
 RDEPEND="
-	dev-libs/glib:2
-	media-libs/fontconfig
-	>=media-libs/harfbuzz-0.7.0_pre20110904
-	media-libs/silgraphite
 	perl? ( dev-lang/perl )
 "
 DEPEND="${RDEPEND}
 	perl? ( virtual/perl-Module-Build )
+	test? (
+		dev-libs/glib:2
+		media-libs/fontconfig
+		media-libs/silgraphite
+	)
 "
 
 PATCHES=(
 	"${FILESDIR}/${PN}-includes-libs-perl.patch"
 	"${FILESDIR}/${PN}-fix_wrong_linker_opts.patch"
-	"${FILESDIR}/${P}-notests.patch"
+	"${FILESDIR}/${PN}-1.0.2-no_harfbuzz_tests.patch"
 )
 
 pkg_setup() {
@@ -46,6 +47,13 @@ src_prepare() {
 			-e "s:@BUILD_DIR@:\"${CMAKE_BUILD_DIR}/src\":" \
 			contrib/perl/Build.PL || die
 	fi
+
+	# make tests optional
+	if ! use test; then
+		sed -i \
+			-e '/tests/d' \
+			CMakeLists.txt || die
+	fi
 }
 
 src_configure() {