Add patch to disable/enable hal/gdk-pixbuf forcefully instead of auto-detecting

(Portage version: 2.0.53)

4 files changed, 81 insertions, 15 deletions

diff --git a/media-libs/libgpod/ChangeLog b/media-libs/libgpod/ChangeLog
index 62f003772268..47478c47c234 100644
--- a/media-libs/libgpod/ChangeLog
+++ b/media-libs/libgpod/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libgpod
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/ChangeLog,v 1.5 2005/12/12 02:20:31 joem Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/ChangeLog,v 1.6 2006/01/01 19:23:44 tester Exp $
+
+  01 Jan 2006; Olivier Crête <tester@gentoo.org>
+  +files/libgpod-0.3.0-config-enables.diff, libgpod-0.3.0.ebuild:
+  Add patch to disable/enable hal/gdk-pixbuf forcefully instead of auto-detecting
 
 *libgpod-0.3.0 (12 Dec 2005)
 
diff --git a/media-libs/libgpod/Manifest b/media-libs/libgpod/Manifest
index 129bd242d0ac..56a10a90923a 100644
--- a/media-libs/libgpod/Manifest
+++ b/media-libs/libgpod/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ac2515fb229b6432383dcebd532e6bfd ChangeLog 832
 MD5 f263da0a6f7b7b2e32a4031f225b0931 files/digest-libgpod-0.2.0 65
 MD5 58ab9db0046c8764986a9f6fcde3ad11 files/digest-libgpod-0.3.0 65
+MD5 a87b6f5715acd8e479e1be7152f9f2b9 files/libgpod-0.3-config-enables.diff 2433
 MD5 6f6669bcb02284038145ce41434c603e libgpod-0.2.0.ebuild 1076
-MD5 a722489e52b531478fd523e08d237fbb libgpod-0.3.0.ebuild 1076
+MD5 b8d07cccc6dd4c62ad409e3fecb040e6 libgpod-0.3.0.ebuild 1246
 MD5 41c5337491a2b640b8d2edfbdd109d29 metadata.xml 423
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDnZbEI1lqEGTUzyQRAtCWAJ4+k/Ppj0VKEeUtPrsKsvTjuXFgOQCfdU5s
-SBdNHBX3ToF4SU2HgBwbFWs=
-=xNYg
------END PGP SIGNATURE-----
diff --git a/media-libs/libgpod/files/libgpod-0.3.0-config-enables.diff b/media-libs/libgpod/files/libgpod-0.3.0-config-enables.diff
new file mode 100644
index 000000000000..6d3eb264b31d
--- /dev/null
+++ b/media-libs/libgpod/files/libgpod-0.3.0-config-enables.diff
@@ -0,0 +1,54 @@
+--- configure.ac.orig	2006-01-01 13:44:30.000000000 -0500
++++ configure.ac	2006-01-01 14:09:57.000000000 -0500
+@@ -56,25 +56,40 @@
+ dnl **************************************************
+ dnl * GDKPIXBUF is optional
+ dnl **************************************************
++
++AC_ARG_ENABLE(gdk-pixbuf, [AC_HELP_STRING([--disable-gdk-pixbuf],[ArtworkDB will be disabled without gdk-pixbuf])], 
++[case "${enableval}" in
++  no) have_gdkpixbuf=no ;;
++  *) have_gdkpixbuf=yes;;
++esac], have_gdkpixbuf=yes)
+ AH_TEMPLATE([HAVE_GDKPIXBUF], [Whether gdk-pixbuf is installed, ArtworkDB writing support will be disabled if it can't be found])
+-PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0, have_gdkpixbuf=yes, have_gdkpibux=no)
+-AM_CONDITIONAL(HAVE_GDKPIXBUF, test x"$have_gdkpixbuf" = xyes)
+-if test x"$have_gdkpixbuf" = xyes; then
+-   AC_DEFINE_UNQUOTED(HAVE_GDKPIXBUF, 1)
++if test x$have_gdkpixbuf = xyes; then
++   PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0, have_gdkpixbuf=yes, have_gdkpixbuf=no)
++   if test x"$have_gdkpixbuf" = xyes; then
++      AC_DEFINE_UNQUOTED(HAVE_GDKPIXBUF, 1)
++   fi
++   LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $GDKPIXBUF_CFLAGS"
++   LIBGPOD_LIBS="$LIBGPOD_LIBS $GDKPIXBUF_LIBS"
+ fi
+-LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $GDKPIXBUF_CFLAGS"
+-LIBGPOD_LIBS="$LIBGPOD_LIBS $GDKPIXBUF_LIBS"
++AM_CONDITIONAL(HAVE_GDKPIXBUF, test x"$have_gdkpixbuf" = xyes)
+ 
+ dnl **************************************************
+ dnl * hal is optional
+ dnl **************************************************
+ 
+-PKG_CHECK_MODULES(HAL, dbus-1 dbus-glib-1 hal >= 0.5.2 hal < 0.6, enable_hal05=yes, enable_hal05=no)
+-if test x$enable_hal05 == xyes; then
+-   AC_DEFINE_UNQUOTED(HAVE_LIBHAL, 1, [Whether HAL is available or not])
++AC_ARG_ENABLE(hal, [AC_HELP_STRING([--enable-hal],[support hal])], 
++[case "${enableval}" in
++  yes) enable_hal05=yes ;;
++  *) enable_hal05=no;;
++esac], enable_hal05=no)
++if test x$enable_hal05 = xyes; then
++   PKG_CHECK_MODULES(HAL, dbus-1 dbus-glib-1 hal >= 0.5.2 hal < 0.6, enable_hal05=yes, enable_hal05=no)
++   if test x$enable_hal05 = xyes; then
++      AC_DEFINE_UNQUOTED(HAVE_LIBHAL, 1, [Whether HAL is available or not])
++   fi
++   LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $HAL_CFLAGS"
++   LIBGPOD_LIBS="$LIBGPOD_LIBS $HAL_LIBS"
+ fi
+-LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $HAL_CFLAGS"
+-LIBGPOD_LIBS="$LIBGPOD_LIBS $HAL_LIBS"
+ 
+ dnl **************************************************
+ dnl * necessary for the HAL libipoddevice code
diff --git a/media-libs/libgpod/libgpod-0.3.0.ebuild b/media-libs/libgpod/libgpod-0.3.0.ebuild
index a92fa0179545..aae90bbe567b 100644
--- a/media-libs/libgpod/libgpod-0.3.0.ebuild
+++ b/media-libs/libgpod/libgpod-0.3.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/libgpod-0.3.0.ebuild,v 1.1 2005/12/12 02:20:31 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/libgpod-0.3.0.ebuild,v 1.2 2006/01/01 19:23:44 tester Exp $
+
+inherit eutils
 
 DESCRIPTION="Shared library to access the contents of an iPod"
 HOMEPAGE="http://www.gtkpod.org/libgpod.html"
@@ -18,11 +20,26 @@ RDEPEND=">=dev-libs/glib-2.4
 				>=sys-apps/pmount-0.9.6 )
 		sys-apps/eject"
 DEPEND="${RDEPEND}
+		sys-devel/autoconf
+		sys-devel/libtool
 		>=dev-util/intltool-0.2.9"
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-config-enables.diff
+	autoreconf
+	libtoolize --force --copy
+}
 
 src_compile() {
 
 	local myconf=""
+
+	myconf="${myconf}
+		$(use_enable hal)
+		$(use_enable gtk gdk-pixbuf)"
+
 	if use hal ; then
 		myconf="${myconf} --with-eject-comand=/usr/bin/eject \
 						--with-unmount-command=/usr/bin/pumount"