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

Package-Manager: portage-2.2_rc89/cvs/Linux x86_64

6 files changed, 25 insertions, 169 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/Manifest b/gnome-base/libgnome/Manifest
index 1d895dba10a6..4ec3ff42bb6e 100644
--- a/gnome-base/libgnome/Manifest
+++ b/gnome-base/libgnome/Manifest
@@ -1,15 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libgnome-2.26.0-branding.patch 839 RMD160 044966b14e3735c4b95a865f9ff35eeb4aae1b33 SHA1 ea7befc52039d1f5bf19e0cde2d5a18d3eb1a04e SHA256 b7bfd8ea5a29e860d291abd3866ade0a0fa4d6bd9538c8cd7c2b2f6afd2b473a
 AUX libgnome-2.28.0-menus-have-icons.patch 538 RMD160 f5655320509e0729c78811760f9dbabf9c1d1fe6 SHA1 60a54e3cc5316ba0a27db919661158841d0e0c60 SHA256 55cba8a533b509bf2ae20b7679f4502f3b240f08caf976f99240f57acd111d75
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 SHA1 246a7ce67ad9d826b1cca6d90b53369b88be72ac SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68
-DIST libgnome-2.24.1.tar.bz2 1416606 RMD160 8dc93692e878bd22143fb7f0bfaf375acb70758a SHA1 f9d1d922569cb8f8a44834f5eadc42ac21d184e1 SHA256 16c05ef6b1bbb057ceea512300de35f2d704609d7a3cacfd5301bc1a138e015a
-DIST libgnome-2.26.0.tar.bz2 1414016 RMD160 0c98138b3e19c70ea331ffb84019c8bdd277337b SHA1 a78143105f61ec2c65cc852a9e3da7a7b56e51a0 SHA256 2ef0287ab19fd34a7d20bc8beef86bb22db13cfc414367cb48e6121b8163e318
-DIST libgnome-2.28.0.tar.bz2 1407385 RMD160 32da234935fa0019c447ae090e386f513b2058f0 SHA1 08649a5922c4ab764118fe8388d8d430f3cb3525 SHA256 9b5b05085b814406f75abfaa1a85395bcf92c8f933248219e1bd738d500d0c0e
 DIST libgnome-2.30.0.tar.bz2 1736034 RMD160 b3b6cad9593feed7b4dc91e48e1559a3954d8e40 SHA1 202c58f1aec5240439af032a88ad087a1805d1cf SHA256 3ed932b94f16614cb03c7661f39b574845970c6ce3ca46e46338409283856f1f
 DIST libgnome-2.32.0.tar.bz2 1731179 RMD160 6568dd1fea181c82006ff85f68465df58ed9584d SHA1 8053b1d888b6285df0dd39c2e0bb03569f73fc09 SHA256 d65e49bf075eb2b3efebec38ceb409693154d18396365765da1a71630bc3dd02
-EBUILD libgnome-2.24.1.ebuild 881 RMD160 3e75ee7b858a71bdeb43186b92cac4f65871dce4 SHA1 95b08a7ec0193fe255caaec7179a16c8e0947fa6 SHA256 bd4f1eff8f5726c3c5bccbc5896a824fdba9d8bf1c03de61a1e6768039cecb2c
-EBUILD libgnome-2.26.0.ebuild 1453 RMD160 2ee90451361f8fd79def0933ff4b523513a9fc83 SHA1 dbbf8d17f63ab199804b66633f0e2bbe27820bc6 SHA256 6710c83f4c40c8b3623249c7af00a9401673e0f7894981eab238e5aeffcfd2b7
-EBUILD libgnome-2.28.0.ebuild 1638 RMD160 eff579162e972045f7cddb4b16a42d2e60bb9283 SHA1 6a96977ba7eb0c66fd75b4b0a916a9c027f320ff SHA256 be5cb2745af25ae09dc97f44a8136ec4611b04936981f6dad2dce89e1777b48f
 EBUILD libgnome-2.30.0.ebuild 1726 RMD160 f4e7699dc4f6b12bfac91d35bf01532253ebce25 SHA1 14a9c67750fca1a4b5de6110f321362dbd2c1338 SHA256 ab9e4331d18cdf8bf30ab8e65b5e6972fb3609d31d4368493c7109285f81c95c
-EBUILD libgnome-2.32.0.ebuild 1739 RMD160 bf01736d6ad0ed4ea98fd7b281c98c7e8bdb6845 SHA1 8b73df87fd02f5d9be414d183eea8e6ac527dfb9 SHA256 6c6886f6fcd03d1137573f3b621c5ad4fe8acdf076a68608398ec91a625706b3
-MISC ChangeLog 23649 RMD160 07cc36324fdd3dbaec332b61d7ed36c71ae29d05 SHA1 9bd22e4092f0141bab91db5fd01c57b3eba2b266 SHA256 cb57314732f78b097981230fdc17743bddb5959be3bcf445ed9a67074e46ede4
+EBUILD libgnome-2.32.0.ebuild 1746 RMD160 34630b75a51bf9cd1ff3c4af5f9d96b1d13e5757 SHA1 9456ccca4aa0cb956ac777a507d58629402d8a85 SHA256 fa49d0343105dfd3a9101665446b5c96f213dff02a8cf9f02cc01a984a273010
+MISC ChangeLog 23876 RMD160 6cf9256082f7d98cebcb1f6afea92fbe325f7ad3 SHA1 2d63835f6cfb3f753e352cb98b87428a82b2adda SHA256 6c4a21bf86b77a8d9d97c096e44323237171c85ea064832b128eb2d11ef4e19a
 MISC metadata.xml 252 RMD160 8d4bc4c0b9a135e826ff4c418277de694a35d66e SHA1 0d4e9ee700d887611f0dc21e29da68e44eaf0a1a SHA256 497a104bf716e26fbff2f1b8e2b029986921ecd8d94afc87a0182929212a94ee
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzAsaAACgkQ1fmVwcYIWAZdOwCfRk6P5ilO7A36fCBFqWxSVPyz
+lXAAniw7G24N8MXNerczjLtfkLuzYizh
+=dtLS
+-----END PGP SIGNATURE-----
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"