New revision, adding support for the 'esd' USE flag (bug #6920)

(Portage version: 2.0.51.22-r1)

5 files changed, 68 insertions, 11 deletions

diff --git a/gnome-base/libgnome/ChangeLog b/gnome-base/libgnome/ChangeLog
index 8f785653afbf..42de29a60845 100644
--- a/gnome-base/libgnome/ChangeLog
+++ b/gnome-base/libgnome/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/libgnome
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.88 2005/07/19 07:57:35 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.89 2005/07/19 12:25:10 leonardop Exp $
+
+*libgnome-2.10.1-r1 (19 Jul 2005)
+
+  19 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  libgnome-2.10.1-r1.ebuild, files/libgnome-2.10.1-esd_swith.patch:
+  Implement --enable-esd switch, related to bug #6920.
 
 *libgnome-2.10.1 (19 Jul 2005)
 
diff --git a/gnome-base/libgnome/Manifest b/gnome-base/libgnome/Manifest
index 35adfa94f2f8..361c2959015a 100644
--- a/gnome-base/libgnome/Manifest
+++ b/gnome-base/libgnome/Manifest
@@ -1,7 +1,8 @@
-MD5 678389378ef2ca5bfb8dcad56f148119 ChangeLog 9870
-MD5 a4168d1c2c2e4d73ff509dde77e264a1 libgnome-2.10.1.ebuild 983
+MD5 c6ee83564182ed7c74f4975cd74b8dab ChangeLog 10084
+MD5 19d623ee2d5eac25130fdc4f1011d553 libgnome-2.10.1-r1.ebuild 1254
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 838e34b163bd061ae18b4899e3a7813c libgnome-2.10.0.ebuild 961
-MD5 0216190dd7ef123c458e740d241ee252 files/digest-libgnome-2.10.1 69
+MD5 1be586cdc4d2e5cb606b6efd70db2e33 files/libgnome-2.10.1-esd_switch.patch 1346
+MD5 0216190dd7ef123c458e740d241ee252 files/digest-libgnome-2.10.1-r1 69
 MD5 3111d83a6edd0cd8430b893cbbaedd88 files/digest-libgnome-2.10.0 68
 MD5 ce5833278452053c32262d4da9f4832f files/libgnome-gcc4.patch 457
diff --git a/gnome-base/libgnome/files/digest-libgnome-2.10.1 b/gnome-base/libgnome/files/digest-libgnome-2.10.1-r1
index 1da158996924..1da158996924 100644
--- a/gnome-base/libgnome/files/digest-libgnome-2.10.1
+++ b/gnome-base/libgnome/files/digest-libgnome-2.10.1-r1
diff --git a/gnome-base/libgnome/files/libgnome-2.10.1-esd_switch.patch b/gnome-base/libgnome/files/libgnome-2.10.1-esd_switch.patch
new file mode 100644
index 000000000000..a8b8a6c554ac
--- /dev/null
+++ b/gnome-base/libgnome/files/libgnome-2.10.1-esd_switch.patch
@@ -0,0 +1,42 @@
+diff -NurdB libgnome-2.10.1/configure.in libgnome-2.10.1-patched/configure.in
+--- libgnome-2.10.1/configure.in	2005-06-09 04:00:33.000000000 -0500
++++ libgnome-2.10.1-patched/configure.in	2005-07-19 07:05:55.000000000 -0500
+@@ -119,19 +119,29 @@
+ dnl
+ dnl Start of pkg-config checks
+ dnl
++
++PKG_PROG_PKG_CONFIG()
++
+ dnl We first check for esound and audiofile (which has conditional
+ dnl support built in)
+ dnl
+ 
+-SOUND_MODULES="esound >= esound_required_version dnl
+- audiofile >= audiofile_required_version"
+-PKG_CHECK_MODULES(SOUND_TEST, [$SOUND_MODULES],
+-[
+-  AC_DEFINE(HAVE_LIBAUDIOFILE,, [Compile with audiofile support])
+-  AC_DEFINE(HAVE_ESD,, [Compile with esd support])
+-],[
+-  SOUND_MODULES=""
+-])
++AC_MSG_CHECKING([whether ESounD support is requested])
++AC_ARG_ENABLE([esd],
++    AS_HELP_STRING([--enable-esd],[Enable ESounD (default=yes)]),
++    [enable_esd=$enableval],
++    [enable_esd=yes])
++AC_MSG_RESULT([$enable_esd])
++
++if test x$enable_esd = xyes; then
++	SOUND_MODULES="esound >= esound_required_version dnl
++		audiofile >= audiofile_required_version"
++	PKG_CHECK_MODULES(SOUND_TEST, [$SOUND_MODULES])
++	AC_DEFINE(HAVE_LIBAUDIOFILE,, [Compile with audiofile support])
++	AC_DEFINE(HAVE_ESD,, [Compile with esd support])
++else
++	SOUND_MODULES=""
++fi
+ 
+ PKG_CHECK_MODULES(LIBGNOME, dnl
+  [glib-2.0 >= glib_required_version dnl
diff --git a/gnome-base/libgnome/libgnome-2.10.1.ebuild b/gnome-base/libgnome/libgnome-2.10.1-r1.ebuild
index 64df176172bc..37181b2aa335 100644
--- a/gnome-base/libgnome/libgnome-2.10.1.ebuild
+++ b/gnome-base/libgnome/libgnome-2.10.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.10.1.ebuild,v 1.1 2005/07/19 07:57:35 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.10.1-r1.ebuild,v 1.1 2005/07/19 12:25:10 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -10,31 +10,39 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc static"
+IUSE="doc esd static"
 
 RDEPEND=">=dev-libs/glib-2.0.3
 	>=gnome-base/gconf-2
 	>=gnome-base/libbonobo-2
 	>=gnome-base/gnome-vfs-2.5.3
-	>=media-sound/esound-0.2.26
-	>=media-libs/audiofile-0.2.3
-	>=dev-libs/popt-1.5"
+	>=dev-libs/popt-1.5
+	esd? ( >=media-sound/esound-0.2.26
+		>=media-libs/audiofile-0.2.3 )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.21
 	dev-util/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1 )"
 
-G2CONF="${G2CONF} --disable-schemas-install $(use_enable static)"
+G2CONF="${G2CONF} --disable-schemas-install $(use_enable static) \
+$(use_enable esd)"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 USE_DESTDIR="1"
 
 src_unpack() {
 	unpack ${A}
-
 	cd ${S}
+
 	# patch to fix gcc4 compile problem see: bug #85558
 	epatch ${FILESDIR}/${PN}-gcc4.patch
+	# Adding switch to properly enable/disable esound support. See bug #6920.
+	epatch ${FILESDIR}/${P}-esd_switch.patch
+
+	einfo "Running aclocal"
+	aclocal || die "Aclocal failed"
+	einfo "Running autoconf"
+	autoconf || die "Autoconf failed"
 }