Make libcanberra non-optional as per herd policy. Clean old revisions.

(Portage version: 2.2_rc89/cvs/Linux x86_64)

5 files changed, 13 insertions, 161 deletions

diff --git a/gnome-base/libgnome/ChangeLog b/gnome-base/libgnome/ChangeLog
index 489a92a91739..6e766f7f3637 100644
--- a/gnome-base/libgnome/ChangeLog
+++ b/gnome-base/libgnome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/libgnome
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.200 2010/10/17 15:09:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.201 2010/10/21 21:33:15 eva Exp $
+
+  21 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -libgnome-2.24.1.ebuild, -libgnome-2.26.0.ebuild, -libgnome-2.28.0.ebuild,
+  libgnome-2.32.0.ebuild:
+  Make libcanberra non-optional as per herd policy. Clean old revisions.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org> libgnome-2.30.0.ebuild:
   alpha/ia64/sh/sparc stable wrt #324077
diff --git a/gnome-base/libgnome/libgnome-2.24.1.ebuild b/gnome-base/libgnome/libgnome-2.24.1.ebuild
deleted file mode 100644
index 4305aef3b15f..000000000000
--- a/gnome-base/libgnome/libgnome-2.24.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.24.1.ebuild,v 1.13 2010/07/20 02:08:59 jer Exp $
-
-inherit gnome2
-
-DESCRIPTION="Essential Gnome Libraries"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc esd"
-
-RDEPEND=">=gnome-base/gconf-2
-	>=dev-libs/glib-2.16
-	>=gnome-base/gnome-vfs-2.5.3
-	>=gnome-base/libbonobo-2.13
-	>=dev-libs/popt-1.7
-	esd? (
-		>=media-sound/esound-0.2.26
-		>=media-libs/audiofile-0.2.3 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-PDEPEND="gnome-base/gvfs"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-schemas-install $(use_enable esd)"
-}
diff --git a/gnome-base/libgnome/libgnome-2.26.0.ebuild b/gnome-base/libgnome/libgnome-2.26.0.ebuild
deleted file mode 100644
index b74c502b5da4..000000000000
--- a/gnome-base/libgnome/libgnome-2.26.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.26.0.ebuild,v 1.12 2010/07/20 02:08:59 jer Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Essential Gnome Libraries"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="branding doc esd"
-
-SRC_URI="${SRC_URI}
-	branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
-
-RDEPEND=">=gnome-base/gconf-2
-	>=dev-libs/glib-2.16
-	>=gnome-base/gnome-vfs-2.5.3
-	>=gnome-base/libbonobo-2.13
-	>=dev-libs/popt-1.7
-	esd? (
-		>=media-sound/esound-0.2.26
-		>=media-libs/audiofile-0.2.3 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-PDEPEND="gnome-base/gvfs[gnome]"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-schemas-install $(use_enable esd)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	use branding && epatch "${FILESDIR}"/${P}-branding.patch
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use branding; then
-		# Add gentoo backgrounds
-		dodir /usr/share/pixmaps/backgrounds/gnome/gentoo
-		insinto /usr/share/pixmaps/backgrounds/gnome/gentoo
-		doins "${WORKDIR}"/gentoo-emergence/gentoo-emergence.png || die "doins 1 failed"
-		doins "${WORKDIR}"/gentoo-cow/gentoo-cow-alpha.png || die "doins 2 failed"
-	fi
-}
diff --git a/gnome-base/libgnome/libgnome-2.28.0.ebuild b/gnome-base/libgnome/libgnome-2.28.0.ebuild
deleted file mode 100644
index ab30c197a56f..000000000000
--- a/gnome-base/libgnome/libgnome-2.28.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.28.0.ebuild,v 1.7 2010/08/18 21:36:10 maekke Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Essential Gnome Libraries"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ~ppc ~ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="branding doc esd"
-
-SRC_URI="${SRC_URI}
-	branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
-
-RDEPEND=">=gnome-base/gconf-2
-	>=dev-libs/glib-2.16
-	>=gnome-base/gnome-vfs-2.5.3
-	>=gnome-base/libbonobo-2.13
-	>=dev-libs/popt-1.7
-	esd? (
-		>=media-sound/esound-0.2.26
-		>=media-libs/audiofile-0.2.3 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-PDEPEND="gnome-base/gvfs"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-schemas-install $(use_enable esd)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Make sure menus have icons. People don't like change
-	epatch "${FILESDIR}/${PN}-2.28.0-menus-have-icons.patch"
-
-	use branding && epatch "${FILESDIR}"/${PN}-2.26.0-branding.patch
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use branding; then
-		# Add gentoo backgrounds
-		dodir /usr/share/pixmaps/backgrounds/gnome/gentoo
-		insinto /usr/share/pixmaps/backgrounds/gnome/gentoo
-		doins "${WORKDIR}"/gentoo-emergence/gentoo-emergence.png || die "doins 1 failed"
-		doins "${WORKDIR}"/gentoo-cow/gentoo-cow-alpha.png || die "doins 2 failed"
-	fi
-}
diff --git a/gnome-base/libgnome/libgnome-2.32.0.ebuild b/gnome-base/libgnome/libgnome-2.32.0.ebuild
index ea70344103c0..9ae9c623fbe3 100644
--- a/gnome-base/libgnome/libgnome-2.32.0.ebuild
+++ b/gnome-base/libgnome/libgnome-2.32.0.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/gnome-base/libgnome/libgnome-2.32.0.ebuild,v 1.1 2010/10/12 18:26:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.32.0.ebuild,v 1.2 2010/10/21 21:33:15 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="branding doc esd +sound"
+IUSE="branding doc esd"
 
 SRC_URI="${SRC_URI}
 	branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
@@ -23,12 +23,13 @@ RDEPEND=">=gnome-base/gconf-2
 	>=gnome-base/gnome-vfs-2.5.3
 	>=gnome-base/libbonobo-2.13
 	>=dev-libs/popt-1.7
-	sound? ( media-libs/libcanberra )
+	media-libs/libcanberra
 	esd? (
 		>=media-sound/esound-0.2.26
 		>=media-libs/audiofile-0.2.3 )"
 
 DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
 	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.17
 	doc? ( >=dev-util/gtk-doc-1 )"
@@ -38,8 +39,8 @@ PDEPEND="gnome-base/gvfs"
 pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-schemas-install
-		$(use_enable esd)
-		$(use_enable sound canberra)"
+		--enable-sound
+		$(use_enable esd)"
 	DOCS="AUTHORS ChangeLog NEWS README"
 }
 
@@ -57,7 +58,7 @@ src_install() {
 
 	if use branding; then
 		# Add gentoo backgrounds
-		dodir /usr/share/pixmaps/backgrounds/gnome/gentoo
+		dodir /usr/share/pixmaps/backgrounds/gnome/gentoo || die "dodir failed"
 		insinto /usr/share/pixmaps/backgrounds/gnome/gentoo
 		doins "${WORKDIR}"/gentoo-emergence/gentoo-emergence.png || die "doins 1 failed"
 		doins "${WORKDIR}"/gentoo-cow/gentoo-cow-alpha.png || die "doins 2 failed"