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.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

8 files changed, 27 insertions, 261 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/Manifest b/media-libs/libcanberra/Manifest
index 2da84aa27074..18a0c1b95ef1 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -1,12 +1,16 @@
-AUX libcanberra-0.14-am-gconf-source-2-m4.patch 2069 RMD160 92f29321e7c3b6bc131057e0f09f5ac1e240b6fa SHA1 296e5b150edfc256fbe92a0ef57105060881bcbf SHA256 648b40fcf5a146c60263be14f8295cae2f2e1c14b667ea08badff6e33d858245
-AUX libcanberra-0.14-backward-compatibility-libtool.patch 932 RMD160 32e5faad5b3355434388f629f393cad96e1ffe01 SHA1 e62707680ebd8c8168ed52a8fe5df397a4b5dd3e SHA256 60b0a068384047c34d2be124043b6c2b84ece2dfb3e1335980361546615f18a7
-DIST libcanberra-0.11.tar.gz 530273 RMD160 77a38ec12d0c9e5f2ee460fc2150298a81e595c7 SHA1 009b0c914970bf6f0fa19158483b6f7dfdf7021f SHA256 ea7c2731e31c77cdaa2a1319dff3bf9e4ee26a51e9ade8d2dec3147c28ce2e6d
-DIST libcanberra-0.22.tar.gz 459404 RMD160 3cccf6b7955aa2926514d5f3e6f48849edea0c1f SHA1 b1c642b0e1322dcbf1a791d4d87dd92cdc002b12 SHA256 6a87737c3d045549a4a9c789cfc565a48185a586aa1a59243dea6421e9978581
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libcanberra-0.23.tar.gz 460205 RMD160 5165384d4ebbe2a692ed3eadbe2bf2d68cf93e8c SHA1 20ba6a3c16b0d93baacfa411a49966fdbb578d0a SHA256 a7d0cf282a9fc8d1e41c082b72a2bf4cf86a6d599f0262484bac95bab57a0960
 DIST libcanberra-0.25.tar.gz 463014 RMD160 eb05114133638f5e27a237da6ea74f64de1b4d26 SHA1 cb86b88af99936134929e120b2a8d55466de1d0a SHA256 46329eda4c877206232d4c906e8f5f401518cec52859395cde3a9e39ea97553c
-EBUILD libcanberra-0.11.ebuild 1728 RMD160 6c14475fadaa4b8743e68d691918aefafa6f3880 SHA1 bcc3f576091884e54ed62e0e4a7f7c9cca93df17 SHA256 fa7ec7f7251eb1373aecf4848662dbd767f73e6b9fbd0f4246e3d041cd773c6c
-EBUILD libcanberra-0.22.ebuild 2367 RMD160 48b689a4deea3f38408a89715ad626273d74c029 SHA1 6bbf85c883a05209bca9e2336f8589900ebbfeee SHA256 ab3d0a175d330b13ecd117f1d19f1b7a1e6bf6ddeba215922401f4b0867b5f52
 EBUILD libcanberra-0.23.ebuild 1467 RMD160 a9201b4e4b760b020a40393e69ea77a3fb7e5f32 SHA1 2da0e481bf34438006f1d5025d1e74a1d567676c SHA256 7a6ffcb28df188ae06c381f0884c54ca79c64d749d79d0020045377b809b5e07
-EBUILD libcanberra-0.25.ebuild 1764 RMD160 4ada9436c542e44c2e9c38ee4bbe80eec599268d SHA1 765e5df0b4370ca556a04a0cfe9ddd71a4d2cdb5 SHA256 e3f9e93be9cfba0e595c2ab88737e6ccfca28a09a5be9fa87395fe0020acd80c
-MISC ChangeLog 8202 RMD160 3bc9085ab08325b5a534e7f8ea4e303436226a3a SHA1 03881a18d8cccfc0d137d31f9e95dc99f19b7747 SHA256 5cfe531e338043098eef772a15ba9f44793d8a6f4c01ef120c7dd1378136286f
-MISC metadata.xml 1100 RMD160 2b090276db79bfa2036a7d12e5d644410dbb3c24 SHA1 eb40123883d82bc3148b2af0d1c1b7c45a10fb88 SHA256 b719c63a7e7c777ae8afb2526f840e4cb24fcd357a41705f85253354fcf9032c
+EBUILD libcanberra-0.25.ebuild 1647 RMD160 621c43065fef96514067f113684e78664867452f SHA1 aab1db58deee5fa8ad0fca44cd2f9bdede69f540 SHA256 286c923b331e1097a573c52182a031ef4094c0151b84fe0a9cf12c9e336b39a1
+MISC ChangeLog 8726 RMD160 5e9accc6a927996344f542250836c49d294f858c SHA1 72f3c97b0b8fb5a6ece2f70c7996c24f2e9bfc1a SHA256 dd40d3e1506f99944ba492458975b513c03cb2811ce3694292dffc7bcb984cc3
+MISC metadata.xml 1204 RMD160 b52e5fa7fcd0ba682ce3bed90d8522460f281bd5 SHA1 7dcbf395ea94a13b07d0a58fe22374c60a3986d2 SHA256 9ea6a807c752539c860761c6948404cbd05e6f8cbff1224b915a5b7fffddc278
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkybGkwACgkQCaWpQKGI+9R87wCbBzOficbXncKchN57DYBXohdd
+6qYAnjMiSL+rKQazYwEg8Yhp83LZGYZJ
+=7yMM
+-----END PGP SIGNATURE-----
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>