make gnomecd optional, bug #200502. clean up old revisions.

Package-Manager: portage-2.1.5_rc6

5 files changed, 29 insertions, 128 deletions

diff --git a/gnome-extra/gnome-media/ChangeLog b/gnome-extra/gnome-media/ChangeLog
index b81623b8131f..ff3bfe55a3ff 100644
--- a/gnome-extra/gnome-media/ChangeLog
+++ b/gnome-extra/gnome-media/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-media
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.166 2008/04/24 18:18:04 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.167 2008/05/08 14:02:38 eva Exp $
+
+  08 May 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-media-2.18.0.ebuild, -gnome-media-2.18.0-r1.ebuild,
+  gnome-media-2.22.0.ebuild:
+  make gnomecd optional, bug #200502.
+  clean up old revisions.
 
   24 Apr 2008; Markus Rothe <corsair@gentoo.org> gnome-media-2.22.0.ebuild:
   Added ~ppc64; bug #218794
diff --git a/gnome-extra/gnome-media/Manifest b/gnome-extra/gnome-media/Manifest
index f17f6c9f9321..e3648c54d9cd 100644
--- a/gnome-extra/gnome-media/Manifest
+++ b/gnome-extra/gnome-media/Manifest
@@ -1,10 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-media-2.18.0-noesd.patch 3540 RMD160 64ed133bbe345a4d0e4d29c3a3e5c3e29c370eac SHA1 2714bfe15a94c4758e16ae60466436de3502397f SHA256 b2e4eb3c027beb032ee0d6cac6d0c19f306062a2427581ee9299ed811bcc3654
-DIST gnome-media-2.18.0.tar.bz2 3007639 RMD160 7968d0cd5c00b0b36cbdc9c6c0eb1e5a35936e5f SHA1 954b4d5069e29d60f28f63d3e2b7cd654247948f SHA256 9d52a03f98c5ad9230ac2bcf1cb65644786c71a1ded2f47f7c46a79ad7d769e3
 DIST gnome-media-2.20.1.tar.bz2 1927211 RMD160 1dfb8f6d03a85c2c0e2c59cd479f3136121a0836 SHA1 ac05a883f45e50c18770d9714f26d41adcb8dc77 SHA256 273b9eb4bc5a0cd7f1589f4eb242b995b05d64db20c05ec379d07af3b90d9c29
 DIST gnome-media-2.22.0.tar.bz2 2237463 RMD160 3e88758867df535668c29322bf27aefb2b79cd21 SHA1 9dc92fbde0dda0ef2e7028bf2b80f190b8b6b016 SHA256 9bafcc1d766ea3b0c30d79c33eb77ad8ceaad8631337f66f7797524e90281b4a
-EBUILD gnome-media-2.18.0-r1.ebuild 1596 RMD160 e9a278baad16ddbe491796344af91eed1c56dff7 SHA1 ae0fc38e6b62bef52fed3f9cece75c71c752986d SHA256 7c0ebbf017944b9a61b93e733cc36477b074583dab9f21709cc9c13abc25ffc2
-EBUILD gnome-media-2.18.0.ebuild 1457 RMD160 0d5bccc8021b3d70cc05d72f07a531d9d3e3060d SHA1 2af66eade92d1db2c01951b005013d6f79f5733d SHA256 f8cd8c8e40516ee96d4a57ba833e712adb7d1ecdc66df7410803c8b0f00a03b7
 EBUILD gnome-media-2.20.1.ebuild 1687 RMD160 d6388800168ae2996da7f34bc12e3cd7fa708dbd SHA1 2617e421e4a3100a012c7d1f62e7719a9930a5c6 SHA256 b752c76b145cc9a4f06bac504b5aad9e3222b7d0c3f5073d86988d1371dea0c8
-EBUILD gnome-media-2.22.0.ebuild 1688 RMD160 ace65bcab21e471ceaffbf643175d16273c942c2 SHA1 9438bf687ffefa6951b24b4d824de93ffe328f3e SHA256 bb9df2374d5f3b27695a988a435f69f54cf4bf2399f7598e0abcf004533223c2
-MISC ChangeLog 20338 RMD160 944031bfd7d57ae75377fe79141cd220712de0c2 SHA1 491de209d3f1f76fed690a22b9472d27937d529f SHA256 8b25b660203d223053d3ee9d4c24a6c4438373cb1c5d7ac5e38f3a1d3125271f
+EBUILD gnome-media-2.22.0.ebuild 1689 RMD160 a1dba3d1232fe63adffd4ad12d83fcdefe50db57 SHA1 8b50d200bb737f57484b10f8a5d31ebbe5f7f95f SHA256 45796cd6851dbae56fa344c79e81c7dee4fbb8f7a935ac3f2110e47fe9b3cfdf
+MISC ChangeLog 20543 RMD160 bbdea49a9fe87d8a57c289a185598b9559a623d6 SHA1 dc7cdf56b26cc57e293200ced85192b5f58681c8 SHA256 dac5cc51f644f27a33f42826f9fe695ee1099cf19f85dc37515cad3fc36fb665
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgjJCkACgkQ1fmVwcYIWAbFewCaAlU3U3pjTYrA6h7F5Q1wUtnt
+GoUAnjvwL3s9q407pRKSOm0UWoBXeoyz
+=Mio7
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-media/gnome-media-2.18.0-r1.ebuild b/gnome-extra/gnome-media/gnome-media-2.18.0-r1.ebuild
deleted file mode 100644
index 062617679454..000000000000
--- a/gnome-extra/gnome-media/gnome-media-2.18.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.18.0-r1.ebuild,v 1.10 2008/04/20 02:10:19 vapier Exp $
-
-inherit gnome2 eutils autotools
-
-DESCRIPTION="Multimedia related programs for the GNOME desktop"
-HOMEPAGE="http://ronald.bitfreak.net/gnome-media.php"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="esd ipv6 mad ogg vorbis"
-
-RDEPEND=">=dev-libs/glib-1.3.7
-	>=gnome-base/libgnome-2.13.7
-	>=gnome-base/libgnomeui-2.13.2
-	esd? ( >=media-sound/esound-0.2.23 )
-	>=gnome-base/libbonobo-2
-	>=x11-libs/gtk+-2.10
-	>=media-libs/gstreamer-0.10.3
-	>=media-libs/gst-plugins-base-0.10.3
-	>=media-libs/gst-plugins-good-0.10
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/orbit-2
-	>=gnome-extra/nautilus-cd-burner-2.12
-	>=gnome-base/gail-0.0.3
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	>=gnome-base/gconf-2
-	ogg? ( >=media-plugins/gst-plugins-ogg-0.10 )
-	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10 )
-	mad? ( >=media-plugins/gst-plugins-mad-0.10 )
-	>=media-plugins/gst-plugins-gconf-0.10.1"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/intltool-0.35.0"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable esd vumeter)
-	--disable-esdtest"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	epatch "${FILESDIR}"/${P}-noesd.patch
-}
-
-src_compile() {
-	addpredict "/root/.gconfd"
-	addpredict "/root/.gconf"
-
-	gnome2_src_compile
-}
diff --git a/gnome-extra/gnome-media/gnome-media-2.18.0.ebuild b/gnome-extra/gnome-media/gnome-media-2.18.0.ebuild
deleted file mode 100644
index c48a422fd1e5..000000000000
--- a/gnome-extra/gnome-media/gnome-media-2.18.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.18.0.ebuild,v 1.11 2007/08/28 19:53:16 jer Exp $
-
-inherit gnome2
-
-DESCRIPTION="Multimedia related programs for the GNOME desktop"
-HOMEPAGE="http://ronald.bitfreak.net/gnome-media.php"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="ipv6 mad ogg vorbis"
-
-RDEPEND=">=dev-libs/glib-1.3.7
-	>=gnome-base/libgnome-2.13.7
-	>=gnome-base/libgnomeui-2.13.2
-	>=media-sound/esound-0.2.23
-	>=gnome-base/libbonobo-2
-	>=x11-libs/gtk+-2.10
-	>=media-libs/gstreamer-0.10.3
-	>=media-libs/gst-plugins-base-0.10.3
-	>=media-libs/gst-plugins-good-0.10
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/orbit-2
-	>=gnome-extra/nautilus-cd-burner-2.12
-	>=gnome-base/gail-0.0.3
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	>=gnome-base/gconf-2
-	ogg? ( >=media-plugins/gst-plugins-ogg-0.10 )
-	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10 )
-	mad? ( >=media-plugins/gst-plugins-mad-0.10 )
-	>=media-plugins/gst-plugins-gconf-0.10.1"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/intltool-0.35.0"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable ipv6) --disable-esdtest"
-}
-
-src_compile() {
-	addpredict "/root/.gconfd"
-	addpredict "/root/.gconf"
-
-	gnome2_src_compile
-}
diff --git a/gnome-extra/gnome-media/gnome-media-2.22.0.ebuild b/gnome-extra/gnome-media/gnome-media-2.22.0.ebuild
index 886667c8e9fc..b689d575272d 100644
--- a/gnome-extra/gnome-media/gnome-media-2.22.0.ebuild
+++ b/gnome-extra/gnome-media/gnome-media-2.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.22.0.ebuild,v 1.4 2008/04/24 18:18:04 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.22.0.ebuild,v 1.5 2008/05/08 14:02:38 eva Exp $
 
 EAPI="1"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://ronald.bitfreak.net/gnome-media.php"
 LICENSE="GPL-2 FDL-1.1"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86"
-IUSE="esd ipv6 "
+IUSE="esd gnomecd ipv6"
 
 RDEPEND=">=dev-libs/glib-1.3.7
 	>=gnome-base/libgnome-2.13.7
@@ -25,8 +25,9 @@ RDEPEND=">=dev-libs/glib-1.3.7
 	>=media-libs/gst-plugins-good-0.10
 	>=gnome-base/gnome-vfs-2
 	>=gnome-base/orbit-2
-	>=gnome-extra/nautilus-cd-burner-2.12
-	>=gnome-base/gail-0.0.3
+	gnomecd? (
+		>=gnome-extra/nautilus-cd-burner-2.12
+		>=gnome-base/gail-0.0.3 )
 	>=gnome-base/libglade-2
 	dev-libs/libxml2
 	>=gnome-base/gconf-2
@@ -41,9 +42,12 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
-		$(use_enable ipv6)
 		$(use_enable esd vumeter)
-		--disable-esdtest"
+		$(use_enable gnomecd)
+		$(use_enable ipv6)
+		--disable-esdtest
+		--disable-scrollkeeper
+		--disable-schemas-install"
 }
 
 src_unpack() {
@@ -53,13 +57,6 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-2.18.0-noesd.patch
 }
 
-src_compile() {
-	addpredict "/root/.gconfd"
-	addpredict "/root/.gconf"
-
-	gnome2_src_compile
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 	ewarn