Fix my stupidity.

3 files changed, 8 insertions, 41 deletions

diff --git a/media-sound/zinf/Manifest b/media-sound/zinf/Manifest
index 172d60a189bd..455083e4b0bd 100644
--- a/media-sound/zinf/Manifest
+++ b/media-sound/zinf/Manifest
@@ -1,7 +1,7 @@
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 fb2b2ae59eaecf5f7280ad117900a48a zinf-2.2.3.ebuild 1924
 MD5 c78ad902b3bc59c81fb06f1aa9bebd66 zinf-2.2.4.ebuild 1921
-MD5 5160ba269ec4fa4ba9d1941b20d682b9 zinf-2.2.5-r1.ebuild 2283
+MD5 19a37794dfddb02fbdc39516964636f2 zinf-2.2.5-r1.ebuild 2304
 MD5 140a4dc843f0990b77214076f11f7dcc ChangeLog 4561
 MD5 789bfd8c9959727ea1bd1176b15f8104 files/digest-zinf-2.2.3 63
 MD5 be366a51d3b8fec4068ae8a3f932dcae files/digest-zinf-2.2.4 63
@@ -9,4 +9,4 @@ MD5 e4ec1ffc5f5099848c9d55df07d85d5a files/digest-zinf-2.2.5-r1 63
 MD5 fe732feaa32b4d6a4f23daa309056288 files/zinf-2.2.3-id3.patch.bz2 12466
 MD5 2a5b9b0fb8d24a260c166417a2b2fd95 files/zinf-2.2.4-pref.patch 483
 MD5 5f73b5d7a0fb9346d25c7f59e71509b8 files/zinf-2.2.5-cdplay.patch 1042
-MD5 70f8e294daf252085833058f4041cbc9 files/zinf-2.2.5-configure.patch 4858
+MD5 ab18405737d54fde371a5e1ceb8dc3e7 files/zinf-2.2.5-configure.patch 3782
diff --git a/media-sound/zinf/files/zinf-2.2.5-configure.patch b/media-sound/zinf/files/zinf-2.2.5-configure.patch
index 83485a3c10a2..27d7609b6c27 100644
--- a/media-sound/zinf/files/zinf-2.2.5-configure.patch
+++ b/media-sound/zinf/files/zinf-2.2.5-configure.patch
@@ -1,6 +1,6 @@
 diff -Naur zinf-2.2.5.orig/configure.ac zinf-2.2.5/configure.ac
 --- zinf-2.2.5.orig/configure.ac	2004-02-17 14:09:01.000000000 -0800
-+++ zinf-2.2.5/configure.ac	2004-07-15 01:16:18.803000641 -0700
++++ zinf-2.2.5/configure.ac	2004-02-17 14:09:01.000000000 -0800
 @@ -260,7 +260,11 @@
  AC_ARG_ENABLE(x86opts, 
  	      AC_HELP_STRING([--disable-x86opts], 
@@ -118,37 +118,3 @@ diff -Naur zinf-2.2.5.orig/configure.ac zinf-2.2.5/configure.ac
  
  AC_SUBST(UI_PLUGINS)
  
-diff -Naur zinf-2.2.5.orig/m4/libxosd.m4 zinf-2.2.5/m4/libxosd.m4
---- zinf-2.2.5.orig/m4/libxosd.m4	1969-12-31 16:00:00.000000000 -0800
-+++ zinf-2.2.5/m4/libxosd.m4	2004-07-15 01:16:41.275272219 -0700
-@@ -0,0 +1,30 @@
-+# Oron Peled (Sun Jun 30 2002)
-+# Taken from libglade.m4
-+
-+# a macro to get the libs/cflags for libxosd
-+
-+dnl AM_PATH_LIBXOSD([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-+dnl Test to see if libxosd is installed, and define LIBXOSD_CFLAGS, LIBXOSDLIBS
-+dnl
-+AC_DEFUN(AM_PATH_LIBXOSD,
-+[dnl
-+dnl Get the cflags and libraries from the xosd-config script
-+dnl
-+AC_ARG_WITH(xosd-config,
-+AC_HELP_STRING([--with-xosd-config=LIBXOSD_CONFIG],[Location of xosd-config]),
-+LIBXOSD_CONFIG="$withval")
-+
-+AC_PATH_PROG(LIBXOSD_CONFIG, xosd-config, no)
-+AC_MSG_CHECKING(for libxosd)
-+if test "$LIBXOSD_CONFIG" = "no"; then
-+  AC_MSG_RESULT(no)
-+  ifelse([$2], , :, [$2])
-+else
-+  LIBXOSD_CFLAGS=`$LIBXOSD_CONFIG --cflags`
-+  LIBXOSD_LIBS=`$LIBXOSD_CONFIG --libs`
-+  AC_MSG_RESULT(yes)
-+  ifelse([$1], , :, [$1])
-+fi
-+AC_SUBST(LIBXOSD_CFLAGS)
-+AC_SUBST(LIBXOSD_LIBS)
-+])
diff --git a/media-sound/zinf/zinf-2.2.5-r1.ebuild b/media-sound/zinf/zinf-2.2.5-r1.ebuild
index ef5d03e6be7d..3b82d83bb7e6 100644
--- a/media-sound/zinf/zinf-2.2.5-r1.ebuild
+++ b/media-sound/zinf/zinf-2.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/zinf-2.2.5-r1.ebuild,v 1.5 2004/07/15 08:24:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/zinf-2.2.5-r1.ebuild,v 1.6 2004/07/15 08:38:34 eradicator Exp $
 
 inherit kde-functions eutils flag-o-matic
 
@@ -46,9 +46,10 @@ src_unpack() {
 	export WANT_AUTOMAKE=1.7
 	export WANT_AUTOCONF=2.5
 
-	ebegin "Running aclocal (${WANT_AUTOMAKE})"
-	aclocal -I m4
-	eend $?
+	#ebegin "Running aclocal (${WANT_AUTOMAKE})"
+	#aclocal -I m4
+	#eend $?
+	touch aclocal.m4
 
 	ebegin "Running automake (${WANT_AUTOMAKE})"
 	automake