Allow people to not RDEPEND on x11-themes/sound-theme-freedesktop unsetting 'sound' USE flag, but turn it on by default for better 'user experience' with Gnome and Xfce desktops (thanks to Samuli Suominen for his patch on bug #323379). Also remove old versions.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

7 files changed, 14 insertions, 252 deletions

diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog
index 45bc5f8f7236..761c4064d9c8 100644
--- a/media-libs/libcanberra/ChangeLog
+++ b/media-libs/libcanberra/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/libcanberra
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.52 2010/09/22 16:15:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.53 2010/09/23 09:13:40 pacho Exp $
+
+  23 Sep 2010; Pacho Ramos <pacho@gentoo.org> -libcanberra-0.11.ebuild,
+  -files/libcanberra-0.14-am-gconf-source-2-m4.patch,
+  -files/libcanberra-0.14-backward-compatibility-libtool.patch,
+  -libcanberra-0.22.ebuild, libcanberra-0.25.ebuild, metadata.xml:
+  Allow people to not RDEPEND on x11-themes/sound-theme-freedesktop
+  unsetting 'sound' USE flag, but turn it on by default for better 'user
+  experience' with Gnome and Xfce desktops (thanks to Samuli Suominen for
+  his patch on bug #323379). Also remove old versions.
 
   22 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
   libcanberra-0.25.ebuild:
diff --git a/media-libs/libcanberra/files/libcanberra-0.14-am-gconf-source-2-m4.patch b/media-libs/libcanberra/files/libcanberra-0.14-am-gconf-source-2-m4.patch
deleted file mode 100644
index 9d4b096d261c..000000000000
--- a/media-libs/libcanberra/files/libcanberra-0.14-am-gconf-source-2-m4.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-backport copy of /usr/share/aclocal/gconf-2.m4 into m4/ source directory,
-in case where gconf isn't installed on the system.
-Never use aclocal.m4 as reference , see diego's blog about that.
-
- m4/gconf-2.m4 |   44 ++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 44 insertions(+), 0 deletions(-)
-
-diff --git a/m4/gconf-2.m4 b/m4/gconf-2.m4
-new file mode 100644
-index 0000000..4a0936e
---- /dev/null
-+++ m4/gconf-2.m4
-@@ -0,0 +1,44 @@
-+dnl AM_GCONF_SOURCE_2
-+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-+dnl  (i.e. pass to gconftool-2
-+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-+dnl  you should install foo.schemas files
-+dnl
-+
-+AC_DEFUN([AM_GCONF_SOURCE_2],
-+[
-+  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-+    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-+  else
-+    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-+  fi
-+
-+  AC_ARG_WITH([gconf-source],
-+	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
-+			     [Config database for installing schema files.]),
-+	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-+
-+  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-+  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-+
-+  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-+    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-+  fi
-+
-+  AC_ARG_WITH([gconf-schema-file-dir],
-+	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-+			     [Directory for installing schema files.]),
-+	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
-+
-+  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-+  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-+
-+  AC_ARG_ENABLE(schemas-install,
-+  	AC_HELP_STRING([--disable-schemas-install],
-+		       [Disable the schemas installation]),
-+     [case ${enableval} in
-+       yes|no) ;;
-+       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
-+      esac])
-+  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-+])
diff --git a/media-libs/libcanberra/files/libcanberra-0.14-backward-compatibility-libtool.patch b/media-libs/libcanberra/files/libcanberra-0.14-backward-compatibility-libtool.patch
deleted file mode 100644
index 54428f00f1dd..000000000000
--- a/media-libs/libcanberra/files/libcanberra-0.14-backward-compatibility-libtool.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- configure.ac |    9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e804538..1e96988 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -68,8 +68,11 @@ for flag in $DESIRED_FLAGS ; do
- done
- 
- #### libtool stuff ####
--LT_PREREQ(2.2)
--LT_INIT([dlopen win32-dll disable-static])
-+AC_LIBTOOL_DLOPEN
-+AC_LIBTOOL_WIN32_DLL
-+AC_DISABLE_STATIC
-+AM_DISABLE_STATIC
-+AC_PROG_LIBTOOL
- 
- dnl Unfortunately, even up to libtool 2.2.6a there is no way to know
- dnl exactly which version of libltdl is present in the system, so we
-@@ -89,7 +92,7 @@ dnl can give the proper place to find libltdl through the standard
- dnl variables like LDFLAGS and CPPFLAGS.
- 
- AC_CHECK_HEADER([ltdl.h],
--    [AC_CHECK_LIB([ltdl], [lt_dladvise_init], [LIBLTDL=-lltdl], [LIBLTDL=])],
-+    [AC_CHECK_LIB([ltdl], [lt_dlopen], [LIBLTDL=-lltdl], [LIBLTDL=])],
-     [LIBLTDL=])
- 
- AS_IF([test "x$LIBLTDL" = "x"],
diff --git a/media-libs/libcanberra/libcanberra-0.11.ebuild b/media-libs/libcanberra/libcanberra-0.11.ebuild
deleted file mode 100644
index 013d5dc4c59b..000000000000
--- a/media-libs/libcanberra/libcanberra-0.11.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.11.ebuild,v 1.12 2010/07/20 03:01:15 jer Exp $
-
-EAPI="1"
-
-inherit gnome2-utils
-
-DESCRIPTION="Portable Sound Event Library"
-HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="alsa doc gstreamer +gtk oss"
-
-RDEPEND="media-libs/libvorbis
-	sys-devel/libtool
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? ( >=media-libs/gstreamer-0.10.15 )
-	gtk? ( dev-libs/glib:2
-		>=x11-libs/gtk+-2.13.4:2
-		>=gnome-base/gconf-2 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.17
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-src_compile() {
-	econf --disable-static \
-		$(use_enable alsa) \
-		$(use_enable gstreamer) \
-		$(use_enable gtk) \
-		$(use_enable oss) \
-		$(use_enable doc gtk-doc) \
-		--disable-pulse \
-		--disable-tdb \
-		--disable-lynx
-	# tdb support would need a split-out from samba before we can use it
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	# we must delay gconf schema installation due to sandbox
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-	rm "${D}/usr/share/doc/${PN}/README"
-	# If the rmdir errors, you probably need to add a file to dodoc
-	# and remove the package installed above
-	rmdir "${D}/usr/share/doc/${PN}"
-	dodoc README
-}
-
-pkg_preinst() {
-	gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-}
-
-#pkg_prerm() {
-#	gnome2_gconf_uninstall
-#}
diff --git a/media-libs/libcanberra/libcanberra-0.22.ebuild b/media-libs/libcanberra/libcanberra-0.22.ebuild
deleted file mode 100644
index 9fdfe37bca9b..000000000000
--- a/media-libs/libcanberra/libcanberra-0.22.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.22.ebuild,v 1.9 2010/07/20 03:01:15 jer Exp $
-
-EAPI="1"
-
-inherit eutils gnome2-utils autotools
-
-DESCRIPTION="Portable Sound Event Library"
-HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="alsa doc gstreamer +gtk oss pulseaudio"
-
-RDEPEND="media-libs/libvorbis
-	sys-devel/libtool
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
-	gstreamer? ( >=media-libs/gstreamer-0.10.15 )
-	gtk? ( dev-libs/glib:2
-		>=x11-libs/gtk+-2.13.4:2
-		>=gnome-base/gconf-2 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.17
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix bug 277739, replace LT_PREREQ and LT_INIT by AC_LIBTOOL*
-	# macros (equivalent for earlier version), preserve backward
-	# compatibility with libtool-1
-	epatch "${FILESDIR}/${PN}-0.14-backward-compatibility-libtool.patch"
-
-	# Fix bug 278354, Backport AM_GCONF_SOURCE_2 macro to m4/ dir
-	# in case where gconf isn't installed on the system
-	# (eautoconf could fail)
-	epatch "${FILESDIR}/${PN}-0.14-am-gconf-source-2-m4.patch"
-
-	rm lt*    || die "clean-up ltmain.sh failed"
-	rm m4/lt* || die "clean-up lt scripts failed"
-	rm m4/libtool* || die "clean-up libtool script failed"
-
-	eautoreconf
-}
-
-src_compile() {
-	econf --disable-static \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable alsa) \
-		$(use_enable gstreamer) \
-		$(use_enable gtk) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable doc gtk-doc) \
-		--disable-tdb \
-		--disable-lynx \
-		--with-html-dir=/usr/share/doc/${PF}/html
-	# tdb support would need a split-out from samba before we can use it
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	# we must delay gconf schema installation due to sandbox
-	#export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	#unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-}
-
-pkg_preinst() {
-	gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-}
-
-#pkg_prerm() {
-#	gnome2_gconf_uninstall
-#}
diff --git a/media-libs/libcanberra/libcanberra-0.25.ebuild b/media-libs/libcanberra/libcanberra-0.25.ebuild
index 58ebfa302425..097e7750f300 100644
--- a/media-libs/libcanberra/libcanberra-0.25.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.25.ebuild,v 1.8 2010/09/22 16:15:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.25.ebuild,v 1.9 2010/09/23 09:13:40 pacho Exp $
 
 EAPI=2
 inherit gnome2-utils libtool
@@ -12,9 +12,8 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="alsa gstreamer +gtk oss pulseaudio tdb"
+IUSE="alsa gstreamer +gtk oss pulseaudio +sound tdb"
 
-INDEX_DEPEND="x11-themes/sound-theme-freedesktop" # Required for index.theme wrt #323379
 COMMON_DEPEND="media-libs/libvorbis
 	>=sys-devel/libtool-2.2.6b
 	alsa? ( media-libs/alsa-lib )
@@ -24,10 +23,7 @@ COMMON_DEPEND="media-libs/libvorbis
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
 	tdb? ( sys-libs/tdb )"
 RDEPEND="${COMMON_DEPEND}
-	alsa? ( ${INDEX_DEPEND} )
-	gstreamer? ( ${INDEX_DEPEND} )
-	oss? ( ${INDEX_DEPEND} )
-	pulseaudio? ( ${INDEX_DEPEND} )"
+	sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379"
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/pkgconfig-0.17"
 
diff --git a/media-libs/libcanberra/metadata.xml b/media-libs/libcanberra/metadata.xml
index 7f3f56948cc4..54e009705fad 100644
--- a/media-libs/libcanberra/metadata.xml
+++ b/media-libs/libcanberra/metadata.xml
@@ -13,6 +13,7 @@
   <flag name='pulseaudio'>Enables PulseAudio sound driver that should be able to support positional event sounds.
 	This is the preferred choice for best sound events experience and picked by default if compiled in and
 	possible to use at runtime.</flag>
+  <flag name='sound'>Install x11-themes/sound-theme-freedesktop to get sounds on Gnome and Xfce.</flag>
   <flag name='tdb'>Enables Trivial Database support</flag>
 </use>
 </pkgmetadata>