Don't build tests and examples which aren't installed anyway wrt bug 226301.

Package-Manager: portage-2.1.5.5

4 files changed, 192 insertions, 2 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index 1bbe78c17da2..21da0388ef74 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/flac
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.139 2008/05/15 20:39:51 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.140 2008/06/13 21:45:02 loki_val Exp $
+
+*flac-1.2.1-r3 (13 Jun 2008)
+
+  13 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/flac-1.2.1-tests-optional.patch, +flac-1.2.1-r3.ebuild:
+  Don't build tests and examples which aren't installed anyway wrt bug
+  226301.
 
   15 May 2008; Samuli Suominen <drac@gentoo.org> flac-1.2.1-r2.ebuild:
   Revert commit for bug 173464, it doesn't solve the entire problem. Stop
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 8469a5031f98..5fd2cca9d18e 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -2,8 +2,10 @@ AUX flac-1.2.1-asm.patch 2844 RMD160 7e2f1dbdf1dbe7c019089f5359f794123cb388f9 SH
 AUX flac-1.2.1-asneeded.patch 840 RMD160 42570f0d4c8bb6ff2f188e81952ac774fa9cfd0d SHA1 a87abf76cbc9db5cf65d6282cdfcf3b5cfcd329c SHA256 cb112fcc85fa57fb68e9fb0d1f735225132fb25b3cd41bb08febfc2d2154bb63
 AUX flac-1.2.1-cflags.patch 435 RMD160 49cb14f8c107fada76252a67e6ef693dcc0f82b1 SHA1 5698376e901679398b6dac850d8015b1386f1983 SHA256 cc9397825c966839edcd4a30406ff3590a21c825d4e1cb043bd35145a608bc21
 AUX flac-1.2.1-gcc-4.3-includes.patch 423 RMD160 d7502f5185e8b9bcefbadfa30014b91cc0446267 SHA1 7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560 SHA256 b9826946fb8372cf7da1b68538bce9a6069c1be0e6e288cba5522ce977a1d8d4
+AUX flac-1.2.1-tests-optional.patch 3032 RMD160 10277313c42dde0b3ff5b9103f3b14cbab60f450 SHA1 00568a132afab84dda0f130c13094d791e9d1a9d SHA256 d90570165037fc21ab7f9c821c5a76fefd799693f50e280fc4afa4b340dcaf4c
 DIST flac-1.2.1.tar.gz 2009217 RMD160 bd3223c848054f0a75d11200b30f903bdd375bfc SHA1 bd54354900181b59db3089347cc84ad81e410b38 SHA256 9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf
 EBUILD flac-1.2.1-r1.ebuild 1438 RMD160 a2c6cc0c462990ebc66c208abd23dfe5c6918d2a SHA1 5d23ca787fc69d0b790de0133ff4f2ccd97e1313 SHA256 b928002d6e7e51e675a029f713d991f10af32e6c91081ebd44238c231e47da95
 EBUILD flac-1.2.1-r2.ebuild 1543 RMD160 8fb0440a7f71cb599571aaa671ae1325c3de678b SHA1 99eea839011e1b36cf3e80684bce5f9bdf7a81ff SHA256 a1497678fbf7e7bb50d3a330986fc708511f691e8aa592c5b799efce2109eef5
-MISC ChangeLog 19648 RMD160 677a5f588c311ff3efb93c6125a9fb9d2a823ad6 SHA1 cda9745efcc54fe7118fee2ec3562cd1629f6ab4 SHA256 3d9c9bdf40a64544739a2835fbe84efa9bbbb4116784d46c804573e75058df28
+EBUILD flac-1.2.1-r3.ebuild 1503 RMD160 0255236906cd1af0d0cd249196d658aa100bd719 SHA1 7defaf4c8ef9be03b59c3ec1ce382a482cb8b350 SHA256 fe06dc70780632fe39c16233d124946be3ee704bd4e4fd01e272e0093e9c973a
+MISC ChangeLog 19882 RMD160 1d0798d31218a360734c6896ef49501697eb13ca SHA1 6dd14757968d5318a87cd2997718c2087c269dcb SHA256 5564cf99e71161f867d45f6ec7ac640673812e2b846861dc124983a1c637778c
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-libs/flac/files/flac-1.2.1-tests-optional.patch b/media-libs/flac/files/flac-1.2.1-tests-optional.patch
new file mode 100644
index 000000000000..e673aefd7b50
--- /dev/null
+++ b/media-libs/flac/files/flac-1.2.1-tests-optional.patch
@@ -0,0 +1,121 @@
+diff -NrU5 flac-1.2.1.orig/configure.in flac-1.2.1/configure.in
+--- flac-1.2.1.orig/configure.in	2008-06-13 16:20:47.000000000 +0200
++++ flac-1.2.1/configure.in	2008-06-13 23:26:57.000000000 +0200
+@@ -253,10 +253,24 @@
+ if test "x$have_ogg" = xyes ; then
+ AC_DEFINE(FLAC__HAS_OGG)
+ AH_TEMPLATE(FLAC__HAS_OGG, [define if you have the ogg library])
+ fi
+ 
++
++dnl Build tests?
++AC_ARG_ENABLE(tests,
++       AS_HELP_STRING([--disable-tests], [Don't build tests during make]),,
++       enable_tests="yes")
++AM_CONDITIONAL(TESTS, [test "$enable_tests" = "yes"])
++
++dnl Build examples?
++AC_ARG_ENABLE(examples,
++       AS_HELP_STRING([--disable-examples], [Don't build examples during make]),,
++       enable_examples="yes")
++AM_CONDITIONAL(EXAMPLES, [test "$enable_examples" = "yes"])
++
++
+ dnl check for i18n(internationalization); these are from libiconv/gettext
+ AM_ICONV
+ AM_LANGINFO_CODESET
+ 
+ AC_CHECK_PROGS(DOCBOOK_TO_MAN, docbook-to-man docbook2man)
+diff -NrU5 flac-1.2.1.orig/examples/Makefile.am flac-1.2.1/examples/Makefile.am
+--- flac-1.2.1.orig/examples/Makefile.am	2008-06-13 16:20:47.000000000 +0200
++++ flac-1.2.1/examples/Makefile.am	2008-06-13 23:24:27.000000000 +0200
+@@ -13,15 +13,19 @@
+ #  Since this particular file is relevant to all components of FLAC,
+ #  it may be distributed under the Xiph.Org license, which is the least
+ #  restrictive of those mentioned above.  See the file COPYING.Xiph in this
+ #  distribution.
+ 
++if EXAMPLES
++
+ if FLaC__WITH_CPPLIBS
+ CPPLIBS_DIRS = cpp
+ endif
+ 
+ SUBDIRS = c $(CPPLIBS_DIRS)
+ 
+ EXTRA_DIST = \
+ 	examples.dsp \
+ 	Makefile.lite \
+ 	README
++
++endif
+diff -NrU5 flac-1.2.1.orig/Makefile.am flac-1.2.1/Makefile.am
+--- flac-1.2.1.orig/Makefile.am	2008-06-13 16:20:47.000000000 +0200
++++ flac-1.2.1/Makefile.am	2008-06-13 16:30:03.000000000 +0200
+@@ -28,11 +28,15 @@
+ # distclean: remove everything except what goes in the distribution
+ #
+ 
+ AUTOMAKE_OPTIONS = foreign 1.7
+ 
+-SUBDIRS = doc include m4 man src examples test build obj
++SUBDIRS = doc include m4 man src examples build obj
++
++if TESTS
++SUBDIRS += test
++endif
+ 
+ DISTCLEANFILES = libtool-disable-static
+ 
+ EXTRA_DIST = \
+ 	COPYING.FDL \
+diff -NrU5 flac-1.2.1.orig/src/Makefile.am flac-1.2.1/src/Makefile.am
+--- flac-1.2.1.orig/src/Makefile.am	2008-06-13 16:20:47.000000000 +0200
++++ flac-1.2.1/src/Makefile.am	2008-06-13 23:17:42.000000000 +0200
+@@ -18,25 +18,39 @@
+ if FLaC__HAS_XMMS
+ XMMS_DIRS = plugin_common plugin_xmms
+ endif
+ 
+ if FLaC__WITH_CPPLIBS
+-CPPLIBS_DIRS = libFLAC++ test_libFLAC++
++
++CPPLIBS_DIRS = libFLAC++
++
++endif
++
++if TESTS
++
++TESTDIRS = \
++	test_grabbag \
++	test_libs_common \
++	test_libFLAC \
++	test_seeking \
++	test_streams
++
++if FLaC__WITH_CPPLIBS
++TESTDIRS += test_libFLAC++
+ endif
+ 
++endif
++
++
+ SUBDIRS = \
+ 	libFLAC \
+ 	share \
+ 	flac \
+ 	metaflac \
+ 	monkeys_audio_utilities \
+ 	$(XMMS_DIRS) \
+ 	plugin_winamp2 \
+-	test_grabbag \
+-	test_libs_common \
+-	test_libFLAC \
+-	test_seeking \
+-	test_streams \
+-	$(CPPLIBS_DIRS)
++	$(CPPLIBS_DIRS) \
++	$(TESTDIRS)
+ 
+ EXTRA_DIST = \
+ 	Makefile.lite
diff --git a/media-libs/flac/flac-1.2.1-r3.ebuild b/media-libs/flac/flac-1.2.1-r3.ebuild
new file mode 100644
index 000000000000..47f3cf82a52e
--- /dev/null
+++ b/media-libs/flac/flac-1.2.1-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r3.ebuild,v 1.1 2008/06/13 21:45:02 loki_val Exp $
+
+EAPI=1
+
+inherit autotools eutils base
+
+DESCRIPTION="free lossless audio encoder and decoder"
+HOMEPAGE="http://flac.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="3dnow altivec +cxx debug doc ogg sse test"
+
+RDEPEND="ogg? ( >=media-libs/libogg-1.1.3 )"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	!elibc_uclibc? ( sys-devel/gettext )
+	dev-util/pkgconfig"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-asneeded.patch"
+	"${FILESDIR}/${P}-cflags.patch"
+	"${FILESDIR}/${P}-asm.patch"
+	"${FILESDIR}/${P}-tests-optional.patch"
+	"${FILESDIR}/${P}-gcc-4.3-includes.patch" )
+
+src_unpack() {
+	base_src_unpack
+	cd "${S}"
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	econf $(use_enable ogg) \
+		$(use_enable sse) \
+		$(use_enable 3dnow) \
+		$(use_enable altivec) \
+		$(use_enable debug) \
+		$(use_enable cxx cpplibs) \
+		--disable-examples \
+		--disable-tests \
+		--disable-doxygen-docs \
+		--disable-dependency-tracking \
+		--disable-xmms-plugin
+
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	rm -rf "${D}"/usr/share/doc/${P}
+	dodoc AUTHORS README
+	use doc && dohtml -r doc/html/*
+}