Fixed the patch _again_ and made sure it worked 3 times over. This will still fail I bet...

(Portage version: 2.0.51.22-r1)

3 files changed, 51 insertions, 24 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index 85a10665beb6..2dbd044fd42d 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/flac
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.64 2005/06/12 08:03:24 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.65 2005/06/12 09:21:51 chriswhite Exp $
+
+  12 Jun 2005; Chris White <chriswhite@gentoo.org>
+  files/flac-1.1.2-noogg.patch:
+  Fixed the patch _again_ and made sure it worked 3 times over. This will
+  still fail I bet...
 
   12 Jun 2005; Chris White <chriswhite@gentoo.org> :
   Patch reversion until compile error I just found gets fixed...
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 690c7b5ead0e..d87dfc3470c5 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d66596e93383075c2aa5f90d73707a6e ChangeLog 8391
 MD5 67683a1745142256ab2198a061ac85e0 flac-1.1.2-r2.ebuild 1961
 MD5 038e7f5da79649a9aec46a9b894325e5 flac-1.1.0-r2.ebuild 1380
@@ -23,11 +20,4 @@ MD5 bf28df385b4747a614fb93e31411b5de files/flac-1.1.2-libtool.patch 4041
 MD5 97d7acba1f1548757a56330dd8ba7aa0 files/flac-1.1.2-m4.patch 1175
 MD5 86b29504f63f0ebfe0ddd971fc6b2470 files/flac-1.1.2-makefile.patch 511
 MD5 96fbd16daecafb18ff0c203d9d041ee2 files/flac-1.1.2-xmms-config.patch 373
-MD5 c1f9ecf4351858a72b4767313277455c files/flac-1.1.2-noogg.patch 807
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCq+xpFdQwWVoAgN4RAj9ZAJ9HMnqxLBg0wMnpFOyW1iizxGwp6QCg9ZRl
-L1P5PmJhjsvIbRtRdOo+VIo=
-=Hbhx
------END PGP SIGNATURE-----
+MD5 953fea1d2ac1b75673f2c9bdcb0620c3 files/flac-1.1.2-noogg.patch 1442
diff --git a/media-libs/flac/files/flac-1.1.2-noogg.patch b/media-libs/flac/files/flac-1.1.2-noogg.patch
index ec901aefdf45..2d1973db3f24 100644
--- a/media-libs/flac/files/flac-1.1.2-noogg.patch
+++ b/media-libs/flac/files/flac-1.1.2-noogg.patch
@@ -1,19 +1,51 @@
-diff -x '*~' -ur flac-1.1.2/configure.in flac-1.1.2-noogg/configure.in
---- flac-1.1.2/configure.in	2005-02-03 06:03:25.000000000 +0100
-+++ flac-1.1.2-noogg/configure.in	2005-05-07 02:37:21.504620688 +0200
-@@ -151,7 +151,14 @@
+--- configure.in.old	2005-06-12 06:42:52.000000000 +0000
++++ configure.in	2005-06-12 08:36:15.000000000 +0000
+@@ -35,6 +35,7 @@
+ AM_PROG_AS
+ AC_PROG_CXX
+ AC_PROG_MAKE_SET
++AC_PATH_PROG(PKGCONFIG, pkg-config)
+ 
+ AC_CHECK_TYPES(socklen_t, [], [])
+ 
+@@ -151,10 +152,36 @@
  fi
  
  dnl check for ogg library
 -XIPH_PATH_OGG(have_ogg=yes, AC_MSG_WARN([*** Ogg development enviroment not installed - Ogg support will not be built]))
+-AM_CONDITIONAL(FLaC__HAS_OGG, [test x$have_ogg = xyes])
+-if test x$have_ogg = xyes ; then
+-AC_DEFINE(FLAC__HAS_OGG)
 +AC_ARG_ENABLE([ogg],
-+	AC_HELP_STRING([--disable-ogg], [Disable ogg support (default:test)]),
-+	[ want_ogg=$enableval ], [ want_ogg=yes ] )
++	      AC_HELP_STRING([--disable-ogg], [Disable ogg support (default:test)]),
++	      [want_ogg=$enableval ], [ want_ogg=yes ] )
 +
-+if test "x$want_ogg" != "xno"; then
-+	XIPH_PATH_OGG(have_ogg=yes, AC_MSG_WARN([*** Ogg development enviroment not installed - Ogg support will not be built]))
-+fi
++AM_CONDITIONAL(FLaC__HAS_OGG, test x$want_ogg = xyes)
 +
- AM_CONDITIONAL(FLaC__HAS_OGG, [test x$have_ogg = xyes])
- if test x$have_ogg = xyes ; then
- AC_DEFINE(FLAC__HAS_OGG)
++if test "x$want_ogg" = "xyes"; then
++	AC_CHECK_HEADER(ogg/ogg.h, 
++	[ogg_ok=yes
++	OGG_CFLAGS="`$PKGCONFIG ogg --cflags`"
++	OGG_LIBS="`$PKGCONFIG ogg --libs`"
++	AC_SUBST(OGG_CFLAGS)
++	AC_SUBST(OGG_LIBS)
++	], [ogg_ok=no
++	OGG_CFLAGS=""
++	OGG_LIBS=""
++	AC_SUBST(OGG_CFLAGS)
++	AC_SUBST(OGG_LIBS)
++	])
++	if test "x$ogg_ok" = "xyes"; then
++		AC_DEFINE(FLAC__HAS_OGG)
++	else
++		AC_MSG_WARN(*** Ogg headers not found.  Ogg support disabled.)
++	fi
++else
++	AC_MSG_RESULT([checking for ogg support... disabled])
++	OGG_CFLAGS=""
++	OGG_LIBS=""
++	AC_SUBST(OGG_CFLAGS)
++	AC_SUBST(OGG_LIBS)
+ fi
+ 
+ AM_PATH_XMMS(0.9.5.1, , AC_MSG_WARN([*** XMMS >= 0.9.5.1 not installed - xmms support will not be built]))