Fix 'tdb' USE flag description (bug #360687 by Dean Matzkov), remove old.

(Portage version: 2.1.9.44/cvs/Linux x86_64)

4 files changed, 6 insertions, 117 deletions

diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog
index c7c752131dad..8fe257c80d2a 100644
--- a/media-libs/libcanberra/ChangeLog
+++ b/media-libs/libcanberra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libcanberra
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.64 2011/03/22 19:36:48 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.65 2011/03/27 14:45:55 pacho Exp $
+
+  27 Mar 2011; Pacho Ramos <pacho@gentoo.org> -libcanberra-0.23.ebuild,
+  -libcanberra-0.25.ebuild, metadata.xml:
+  Fix 'tdb' USE flag description (bug #360687 by Dean Matzkov), remove old.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> libcanberra-0.26.ebuild:
   Marking libcanberra-0.26 ppc stable for bug 353436
diff --git a/media-libs/libcanberra/libcanberra-0.23.ebuild b/media-libs/libcanberra/libcanberra-0.23.ebuild
deleted file mode 100644
index d0723588a887..000000000000
--- a/media-libs/libcanberra/libcanberra-0.23.ebuild
+++ /dev/null
@@ -1,55 +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.23.ebuild,v 1.10 2010/08/18 21:03:51 maekke Exp $
-
-EAPI=2
-inherit gnome2-utils libtool
-
-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 gstreamer +gtk oss pulseaudio tdb"
-
-RDEPEND="media-libs/libvorbis
-	>=sys-devel/libtool-2.2.6b
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? ( >=media-libs/gstreamer-0.10.15 )
-	gtk? ( >=x11-libs/gtk+-2.13.4:2
-		>=gnome-base/gconf-2 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
-	tdb? ( sys-libs/tdb )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.17"
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		$(use_enable alsa) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable gstreamer) \
-		$(use_enable gtk) \
-		$(use_enable tdb) \
-		--disable-lynx \
-		--disable-gtk-doc \
-		--disable-gtk-doc-html \
-		--disable-gtk-doc-pdf \
-		--with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	prepalldocs
-}
-
-pkg_preinst() { gnome2_gconf_savelist; }
-pkg_postinst() { gnome2_gconf_install; }
diff --git a/media-libs/libcanberra/libcanberra-0.25.ebuild b/media-libs/libcanberra/libcanberra-0.25.ebuild
deleted file mode 100644
index 18c13e7a5ad4..000000000000
--- a/media-libs/libcanberra/libcanberra-0.25.ebuild
+++ /dev/null
@@ -1,60 +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.25.ebuild,v 1.14 2010/10/17 14:47:51 armin76 Exp $
-
-EAPI=2
-inherit gnome2-utils libtool
-
-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 gstreamer +gtk oss pulseaudio +sound tdb"
-
-COMMON_DEPEND="media-libs/libvorbis
-	>=sys-devel/libtool-2.2.6b
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? ( >=media-libs/gstreamer-0.10.15 )
-	gtk? ( >=x11-libs/gtk+-2.20.0:2
-		>=gnome-base/gconf-2 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
-	tdb? ( sys-libs/tdb )"
-RDEPEND="${COMMON_DEPEND}
-	sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/pkgconfig-0.17"
-
-src_prepare() {
-	elibtoolize
-}
-
-# --disable-gtk3 for now
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		$(use_enable alsa) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable gstreamer) \
-		$(use_enable gtk) \
-		$(use_enable tdb) \
-		--disable-lynx \
-		--disable-gtk-doc \
-		--disable-gtk-doc-html \
-		--disable-gtk-doc-pdf \
-		--disable-gtk3 \
-		--with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	# Disable parallel installation until bug #253862 is solved
-	emake -j1 DESTDIR="${D}" install || die
-	prepalldocs
-}
-
-pkg_preinst() { gnome2_gconf_savelist; }
-pkg_postinst() { gnome2_gconf_install; }
diff --git a/media-libs/libcanberra/metadata.xml b/media-libs/libcanberra/metadata.xml
index 54e009705fad..75354d56856f 100644
--- a/media-libs/libcanberra/metadata.xml
+++ b/media-libs/libcanberra/metadata.xml
@@ -14,6 +14,6 @@
 	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>
+  <flag name='tdb'>Enables Trivial Database support for caching purposes.</flag>
 </use>
 </pkgmetadata>