Fix the test building with a slightly different patch, that doesn't expose a conditional during configure (and thus an USE flag).

Package-Manager: portage-2.1.5.5

3 files changed, 17 insertions, 35 deletions

diff --git a/media-libs/a52dec/ChangeLog b/media-libs/a52dec/ChangeLog
index de0e87b8910f..bfc3048bee12 100644
--- a/media-libs/a52dec/ChangeLog
+++ b/media-libs/a52dec/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/a52dec
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/ChangeLog,v 1.52 2008/06/13 14:06:16 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/ChangeLog,v 1.53 2008/06/16 10:42:16 flameeyes Exp $
+
+  16 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
+  files/a52dec-0.7.4-tests-optional.patch, a52dec-0.7.4-r6.ebuild:
+  Fix the test building with a slightly different patch, that doesn't expose
+  a conditional during configure (and thus an USE flag).
 
 *a52dec-0.7.4-r6 (13 Jun 2008)
 
diff --git a/media-libs/a52dec/a52dec-0.7.4-r6.ebuild b/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
index 7caeee12b7c7..4060696dfba0 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r6.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/a52dec/a52dec-0.7.4-r6.ebuild,v 1.1 2008/06/13 14:06:16 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/a52dec-0.7.4-r6.ebuild,v 1.2 2008/06/16 10:42:16 flameeyes Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -14,7 +14,7 @@ SRC_URI="http://liba52.sourceforge.net/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="oss djbfft test"
+IUSE="oss djbfft"
 
 RDEPEND="djbfft? ( sci-libs/djbfft )"
 DEPEND="${RDEPEND}"
@@ -38,7 +38,6 @@ src_compile() {
 	use oss || myconf="${myconf} --disable-oss"
 	econf \
 		$(use_enable djbfft) \
-		$(use_enable test tests) \
 		${myconf} || die
 	emake CFLAGS="${CFLAGS}" || die "emake failed"
 }
diff --git a/media-libs/a52dec/files/a52dec-0.7.4-tests-optional.patch b/media-libs/a52dec/files/a52dec-0.7.4-tests-optional.patch
index d8c647534401..6958ef7b4904 100644
--- a/media-libs/a52dec/files/a52dec-0.7.4-tests-optional.patch
+++ b/media-libs/a52dec/files/a52dec-0.7.4-tests-optional.patch
@@ -1,32 +1,10 @@
-diff -NrU5 a52dec-0.7.4.orig/configure.in a52dec-0.7.4/configure.in
---- a52dec-0.7.4.orig/configure.in	2008-06-13 16:13:46.000000000 +0200
-+++ a52dec-0.7.4/configure.in	2008-06-13 16:12:20.000000000 +0200
-@@ -106,10 +106,16 @@
- elif test x"$TENDRA" = x"yes"; then
-     dnl TenDRA portability checking compiler
-     CFLAGS="$CFLAGS -DTenDRA_check"
- fi
+Index: a52dec-0.7.4/test/Makefile.am
+===================================================================
+--- a52dec-0.7.4.orig/test/Makefile.am
++++ a52dec-0.7.4/test/Makefile.am
+@@ -1,4 +1,4 @@
+-noinst_PROGRAMS = compare
++check_PROGRAMS = compare
+ compare_SOURCES = compare.c
+ compare_LDADD = -lm
  
-+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"])
-+
- builtin([include],[src/configure.incl])
- 
- AC_C_ATTRIBUTE_ALIGNED
- 
- AC_OUTPUT
-diff -NrU5 a52dec-0.7.4.orig/Makefile.am a52dec-0.7.4/Makefile.am
---- a52dec-0.7.4.orig/Makefile.am	2008-06-13 16:13:46.000000000 +0200
-+++ a52dec-0.7.4/Makefile.am	2008-06-13 16:12:33.000000000 +0200
-@@ -1,3 +1,7 @@
--SUBDIRS = autotools include doc liba52 libao src vc++ test
-+SUBDIRS = autotools include doc liba52 libao src vc++
-+
-+if TESTS
-+SUBDIRS += test
-+endif
- 
- EXTRA_DIST = HISTORY bootstrap