diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2004-07-15 08:38:34 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2004-07-15 08:38:34 +0000 |
| commit | ff0d4653ac671bc17fdf248d090fcf10c52634d7 (patch) | |
| tree | 943b1d351f338a9b9d88234e0b8854657aac711e | |
| parent | fix header (diff) | |
| download | gentoo-2-ff0d4653ac671bc17fdf248d090fcf10c52634d7.tar.gz gentoo-2-ff0d4653ac671bc17fdf248d090fcf10c52634d7.tar.bz2 gentoo-2-ff0d4653ac671bc17fdf248d090fcf10c52634d7.zip | |
Fix my stupidity.
| -rw-r--r-- | media-sound/zinf/files/zinf-2.2.5-configure.patch | 36 | ||||
| -rw-r--r-- | media-sound/zinf/zinf-2.2.5-r1.ebuild | 9 |
2 files changed, 6 insertions, 39 deletions
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 |