Replace the patch to disable tests with two, one disable examples and one makes the test build during 'make check'.

Package-Manager: portage-2.1.5.5

6 files changed, 137 insertions, 128 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index 21da0388ef74..7ecba989ca63 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.140 2008/06/13 21:45:02 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.141 2008/06/16 11:15:01 flameeyes Exp $
+
+  16 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/flac-1.2.1-dontbuild-examples.patch,
+  +files/flac-1.2.1-dontbuild-tests.patch,
+  -files/flac-1.2.1-tests-optional.patch, flac-1.2.1-r3.ebuild:
+  Replace the patch to disable tests with two, one disable examples and one
+  makes the test build during 'make check'.
 
 *flac-1.2.1-r3 (13 Jun 2008)
 
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 65ed14c5ab2f..a6e7edaac244 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,11 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX flac-1.2.1-asm.patch 2844 RMD160 7e2f1dbdf1dbe7c019089f5359f794123cb388f9 SHA1 9cf5708bcc181b66632868e95e23a84b0a1644af SHA256 b9a6d2011b9902924372316f3544e94cb066fe202e256b9696bf6cd6ee8a490b
 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-dontbuild-examples.patch 1014 RMD160 3d15c25b66c46815b2e3c72920de39616681fd90 SHA1 29c555097b6aa675ec93f8bbd26a7575cb1825ce SHA256 73e3ac8aa17bbe6d22f6c1b28993de35061e967a3a6c27d8e68261ba740d5e85
+AUX flac-1.2.1-dontbuild-tests.patch 2721 RMD160 9a66b075f1cede2f4f535ed46623cadabe3d80a3 SHA1 caa022ad88e81e296ebeb46ebd825b1a0ed8a399 SHA256 1fa075309ed3e42391d767a6401511b76baf0782702ff39eef06e38ea3bc3ed7
 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
-EBUILD flac-1.2.1-r3.ebuild 1498 RMD160 75fb617c4f5ca1b8389fa307f104f3b3af215555 SHA1 38ad39eef8c60601d5b5c041533180b867596a10 SHA256 2a62ae30a5bc1e2e576f0b213321cadbd0e97bbcb842efa2266a3a7d9e5ddf34
-MISC ChangeLog 19882 RMD160 1d0798d31218a360734c6896ef49501697eb13ca SHA1 6dd14757968d5318a87cd2997718c2087c269dcb SHA256 5564cf99e71161f867d45f6ec7ac640673812e2b846861dc124983a1c637778c
+EBUILD flac-1.2.1-r3.ebuild 1525 RMD160 7f2cb56415f7331a698be42c3a97a08e66f5ab41 SHA1 fae0d6b9f30dc2b19f99130b735ccb4c7bba0b26 SHA256 0689c07243c18a7dcce45b5fe6c3bfca03a8adcb741d5e00ed08a0e5ee080be6
+MISC ChangeLog 20210 RMD160 b3a68d2f2f18dbb7c521a4061173783515c6b94b SHA1 9b92329f17754dad044b02b55c100b7e23da30a7 SHA256 79c9127b8d3f47eb003c611a2ad7cc2880714f2c52613388793555334730883c
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhWSzsACgkQAiZjviIA2XjyRwCfaqpBdURI6vA4xW5oeXAQEuQW
+EdUAoJ8FhUJql04NxNSfYQgGdiUA7xAz
+=0w1n
+-----END PGP SIGNATURE-----
diff --git a/media-libs/flac/files/flac-1.2.1-dontbuild-examples.patch b/media-libs/flac/files/flac-1.2.1-dontbuild-examples.patch
new file mode 100644
index 000000000000..2c1d55a62428
--- /dev/null
+++ b/media-libs/flac/files/flac-1.2.1-dontbuild-examples.patch
@@ -0,0 +1,34 @@
+Index: flac-1.2.1/configure.in
+===================================================================
+--- flac-1.2.1.orig/configure.in
++++ flac-1.2.1/configure.in
+@@ -255,6 +255,12 @@ AC_DEFINE(FLAC__HAS_OGG)
+ AH_TEMPLATE(FLAC__HAS_OGG, [define if you have the ogg library])
+ fi
+ 
++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
+Index: flac-1.2.1/Makefile.am
+===================================================================
+--- flac-1.2.1.orig/Makefile.am
++++ flac-1.2.1/Makefile.am
+@@ -30,7 +30,11 @@
+ 
+ AUTOMAKE_OPTIONS = foreign 1.7
+ 
+-SUBDIRS = doc include m4 man src examples test build obj
++SUBDIRS = doc include m4 man src test build obj
++
++if EXAMPLES
++SUBDIRS += examples
++endif
+ 
+ DISTCLEANFILES = libtool-disable-static
+ 
diff --git a/media-libs/flac/files/flac-1.2.1-dontbuild-tests.patch b/media-libs/flac/files/flac-1.2.1-dontbuild-tests.patch
new file mode 100644
index 000000000000..4be64a120cee
--- /dev/null
+++ b/media-libs/flac/files/flac-1.2.1-dontbuild-tests.patch
@@ -0,0 +1,78 @@
+Index: flac-1.2.1/src/test_grabbag/cuesheet/Makefile.am
+===================================================================
+--- flac-1.2.1.orig/src/test_grabbag/cuesheet/Makefile.am
++++ flac-1.2.1/src/test_grabbag/cuesheet/Makefile.am
+@@ -20,7 +20,7 @@ EXTRA_DIST = \
+ 	test_cuesheet.dsp \
+ 	test_cuesheet.vcproj
+ 
+-noinst_PROGRAMS = test_cuesheet
++check_PROGRAMS = test_cuesheet
+ test_cuesheet_SOURCES = \
+ 	main.c
+ test_cuesheet_LDADD = \
+Index: flac-1.2.1/src/test_grabbag/picture/Makefile.am
+===================================================================
+--- flac-1.2.1.orig/src/test_grabbag/picture/Makefile.am
++++ flac-1.2.1/src/test_grabbag/picture/Makefile.am
+@@ -20,7 +20,7 @@ EXTRA_DIST = \
+ 	test_picture.dsp \
+ 	test_picture.vcproj
+ 
+-noinst_PROGRAMS = test_picture
++check_PROGRAMS = test_picture
+ test_picture_SOURCES = \
+ 	main.c
+ test_picture_LDADD = \
+Index: flac-1.2.1/src/test_libFLAC/Makefile.am
+===================================================================
+--- flac-1.2.1.orig/src/test_libFLAC/Makefile.am
++++ flac-1.2.1/src/test_libFLAC/Makefile.am
+@@ -22,7 +22,7 @@ EXTRA_DIST = \
+ 
+ INCLUDES = -I$(top_srcdir)/src/libFLAC/include
+ 
+-noinst_PROGRAMS = test_libFLAC
++check_PROGRAMS = test_libFLAC
+ test_libFLAC_LDADD = \
+ 	$(top_builddir)/src/share/grabbag/libgrabbag.la \
+ 	$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
+Index: flac-1.2.1/src/test_libFLAC++/Makefile.am
+===================================================================
+--- flac-1.2.1.orig/src/test_libFLAC++/Makefile.am
++++ flac-1.2.1/src/test_libFLAC++/Makefile.am
+@@ -20,7 +20,7 @@ EXTRA_DIST = \
+ 	test_libFLAC++.dsp \
+ 	test_libFLAC++.vcproj
+ 
+-noinst_PROGRAMS = test_libFLAC++
++check_PROGRAMS = test_libFLAC++
+ test_libFLAC___LDADD = \
+ 	$(top_builddir)/src/share/grabbag/libgrabbag.la \
+ 	$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
+Index: flac-1.2.1/src/test_seeking/Makefile.am
+===================================================================
+--- flac-1.2.1.orig/src/test_seeking/Makefile.am
++++ flac-1.2.1/src/test_seeking/Makefile.am
+@@ -24,7 +24,7 @@ AM_CFLAGS = @OGG_CFLAGS@
+ 
+ INCLUDES = 
+ 
+-noinst_PROGRAMS = test_seeking
++check_PROGRAMS = test_seeking
+ test_seeking_LDADD = \
+ 	$(top_builddir)/src/libFLAC/libFLAC.la \
+ 	@OGG_LIBS@ \
+Index: flac-1.2.1/src/test_streams/Makefile.am
+===================================================================
+--- flac-1.2.1.orig/src/test_streams/Makefile.am
++++ flac-1.2.1/src/test_streams/Makefile.am
+@@ -20,7 +20,7 @@ EXTRA_DIST = \
+ 	test_streams.dsp \
+ 	test_streams.vcproj
+ 
+-noinst_PROGRAMS = test_streams
++check_PROGRAMS = test_streams
+ test_streams_SOURCES = \
+ 	main.c
+ test_streams_LDADD = -lm
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
deleted file mode 100644
index e673aefd7b50..000000000000
--- a/media-libs/flac/files/flac-1.2.1-tests-optional.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-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
index f3b01edd0d9f..45312f247a69 100644
--- a/media-libs/flac/flac-1.2.1-r3.ebuild
+++ b/media-libs/flac/flac-1.2.1-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2008/06/13 22:01:47 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r3.ebuild,v 1.3 2008/06/16 11:15:01 flameeyes Exp $
 
 EAPI=1
 
@@ -26,7 +26,8 @@ RESTRICT="test"
 PATCHES=( "${FILESDIR}/${P}-asneeded.patch"
 	"${FILESDIR}/${P}-cflags.patch"
 	"${FILESDIR}/${P}-asm.patch"
-	"${FILESDIR}/${P}-tests-optional.patch"
+	"${FILESDIR}/${P}-dontbuild-tests.patch"
+	"${FILESDIR}/${P}-dontbuild-examples.patch"
 	"${FILESDIR}/${P}-gcc-4.3-includes.patch" )
 
 src_unpack() {
@@ -43,7 +44,6 @@ src_compile() {
 		$(use_enable debug) \
 		$(use_enable cxx cpplibs) \
 		--disable-examples \
-		--disable-tests \
 		--disable-doxygen-docs \
 		--disable-dependency-tracking \
 		--disable-xmms-plugin