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

(Portage version: 2.1.5.5)

5 files changed, 123 insertions, 125 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/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