From: Tomas Chvatal Date: Sun, 4 Sep 2011 11:44:33 +0000 (+0000) Subject: Disable harfbuzz tests as they create circular deps only anyway. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=74d80023680bedfb1f9b1e5ad65df1646bfd06ac;p=gentoo.git Disable harfbuzz tests as they create circular deps only anyway. Package-Manager: portage-2.2.0_alpha53/cvs/Linux x86_64 --- 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 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 graphite2-1.0.2.ebuild: Bump the harfbuzz dependency to make this compile. diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest index 70cfb65d7870..207d19e28314 100644 --- a/media-gfx/graphite2/Manifest +++ b/media-gfx/graphite2/Manifest @@ -1,27 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX graphite2-1.0.2-notests.patch 447 RMD160 60d1b2dc1234f3bc0d39b2a39b52d5d7b08f02e5 SHA1 ecf298f768ffa839f0235e9eedd24b28576b04a5 SHA256 d5a374e2c76ed84fd56eddb14be3c7547024622dca56a36a23ea17b5c9b61255 +AUX graphite2-1.0.2-no_harfbuzz_tests.patch 551 RMD160 716d3a068e30aa42074d593fdb9e7bb0514c56b4 SHA1 8619896e176d1983fe95fa8729952a832a56c68e SHA256 901b0ec71b9ca8323dc4dce38e45932fc51549cb00a1672f9cc681826e4e261d AUX graphite2-fix_wrong_linker_opts.patch 1156 RMD160 d833b7173ac49f70bd9d8fbba2b0fd7117d0e531 SHA1 6be0c6b8892bd902a8a8b105217fb76f4632095e SHA256 9830a775fb2324105280b8b8ee3814ab5a5cc134c29d72825f8582d264a8ed9c AUX graphite2-includes-libs-perl.patch 555 RMD160 72348bd7979b506ecf03a677815f3f3830b9b4a1 SHA1 90dbc4e187e07625481fd80a79b8a6d557dcc21a SHA256 a4d462eab477ba5d07540f56363a19bafdd13e46378a5363bfa094aae625f8a4 DIST graphite2-1.0.2.tgz 4351965 RMD160 428f0cb29a0536718b5f821e387cf95586eeaec0 SHA1 7f9224b1682f07d32e33a0df872c37edc0049386 SHA256 635165a49cec93ac95ca3ee6c9a6ea1c43078d25becbbdfd6d73096bbe0fc91c -EBUILD graphite2-1.0.2.ebuild 1658 RMD160 0b2fd24f8f08c1c5bad7222ced6dad37f30e489b SHA1 bab09ebc9872171c06124f7f5e04acacb1d28ed0 SHA256 ded45237dd4256e184a1e217ab66dc1d85c1c2f831fda42289875246a2761c07 -MISC ChangeLog 2704 RMD160 d0eda66d8f1e0b4a6350196d19ec28d99aa6de90 SHA1 6267be16b2fe23bfdb651eeec399d58cf69d1af6 SHA256 53a7ab14f8e09ccd528a28cb463247b04fd89d78343650ec072a7fce87e517c3 +EBUILD graphite2-1.0.2.ebuild 1758 RMD160 7002290afdffc7025955c51c4ae3e9af6fd79bb7 SHA1 d15dfbb4f5dfda99d724d2f4fd74316300660cca SHA256 42d0af0735c26141041b87c29840f21d646c1ade7f2912a2861d79fdfe50eecf +MISC ChangeLog 2941 RMD160 e6bdb9b2e78046ef4b681e6c667978f7d20b820b SHA1 dd28c05222e3419b1a875d6368e83f0c575e2e20 SHA256 a0c61aeaf6538b3ff1843eb2c37200cd1a0c2faa1a725c11f6d7feb9b4b1a70f MISC metadata.xml 163 RMD160 68888b3756b2cf14b88ff5aa31e4fd07c9cc9713 SHA1 bd3e6fae69f40f453bc382ae8f1a7644a590a9cc SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJOY2EsAAoJEOSiRoyO7jvo4wEP/2BQcsFuWKn5oHoKfuHDF258 -dKXUoVw6kULXXyl34ufvgE8bwdqfEfjJ0nNFQsVqFTcW2qw34DtfWOZtKoBjOTQt -dEH5ge1b9xnRlQEWJaTHI3y4gQt9StQcEXhuSDgeB5o5h99EpkhtNXYL25xaChAV -1XK7hwBjTHaDrBeE50XcmEvmwCR/eT6okYisN2PpKVKHcCTiDeonor1XlExx/Eoi -ytmhutK15kfBe565H/mdrRm7dWkBGCxXHXTXHb5SuP+E6yQnjNkIjZ+CZ+lvSFf+ -HZji8tXrDXrw9+5QSF6OKqKkXl/jDHFLwYMCOdzWRnJA5+gVg1J6pNW2CEzDGN/4 -92J8Dfab6ed7+VB5lK7Yg37upBW8CumVegO8ezHK7BXiDBVhYKpciA4UKtK7qgNw -zebznWz6zCxSq4il5Y/gH6caYhyzudd9sfn85CHGQYqjmS1/ImtWwIg8uWEUn0Kt -eib5B8otoctGdeM3COzyGg68VOuL1lKG3J9jsnDbmYDJLVF5WFyO7TjBAkQJzySo -S8Z2CsHBS6ogbFElDu62pZpENH5n+IYeBAGCrtmRBO5NqlczcxfCF5xRWQWTopGW -98FvqH5bY5V+zEBVsWC5l7TgXrSgJLJdsKOoDPg9tknjbsQNvDvgfPL2BESZweoy -J1ZWcpiqmQDeRphd3S5b -=D9gm +iQIcBAEBAgAGBQJOY2SkAAoJEOSiRoyO7jvo1v8QAJGmo8a0NV2SKfgWoKcCsuRa +knrUd0KVU7AyzXf7s8GpxlRSIZhV2mQiGPGLiHE8UU0pIaM5gv2cwQLNH/MzswAI +xvXMlCXpQIBIUyYKPwT/nJLDFPZ9m0TMgWRZHGWZzKu8LFAdYPCVqt01xFOfuNX6 +uIEIugKCd+sg8YkCCZyZxOBl7TtLSeAl+5c2+p0nRfDoggyVuWEUiZKOWw2ljsE2 +Mb2jd/v8co+HfB+tL6kduqh94CV9RM61pvTKVVWnPwKvGpVu6V2rDy11sZhaPBgQ +u6SiqMeAZL2kd8xFD5JuyFUAGC3f8UsM8mGHCuF3pmidY3HORHVsi7xW4awTEYZW +7UEl7r//H+WTzW11gFpzzWftSUsL3CEhxh1jjS8LRxs92NqJLwfFtBiiOlO5mJO6 +MVVVWahwcBseA0lwVtBCxCFYIo8WBw+2g/eyn/RSSsxEPEgnl0s3K8D95UQo/hq3 +fy/6RjFQjQc/heDbZbEYkbnGAo7yZ7DPH2H5G5pyAdH1WP2vbD3bLVRVIJAfu6TE +J15FlXwEOx4KcXfV7IAVRR51U+4MN8Rg8TNIkN6ZFc1wjMMgZoz9QrM7JvbP7Dj/ +OBEhPdMt1z90auNnOoNj1bKtBVYKoXA5wRR8zS9hVrg9gV2kt5AxOlNr9VUxefbn +z8B3nbpAYpaX1maF+goH +=ZOOA -----END PGP SIGNATURE----- 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() {