Fix gtk deps, bug 203198, dvd deps, bug 203967 and eclasses, bug 193223

Package-Manager: portage-2.1.4_rc14

6 files changed, 101 insertions, 17 deletions

diff --git a/app-cdr/brasero/ChangeLog b/app-cdr/brasero/ChangeLog
index cd5013d3186f..3f1c31c400d7 100644
--- a/app-cdr/brasero/ChangeLog
+++ b/app-cdr/brasero/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/brasero
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.29 2008/01/05 06:23:42 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.30 2008/01/05 16:44:59 beandog Exp $
+
+*brasero-0.6.90-r1 (05 Jan 2008)
+*brasero-0.6.1-r1 (05 Jan 2008)
+
+  05 Jan 2008; Steve Dibb <beandog@gentoo.org> +brasero-0.6.1-r1.ebuild,
+  -brasero-0.6.90.ebuild, +brasero-0.6.90-r1.ebuild:
+  Fix gtk deps, bug 203198, dvd deps, bug 203967 and eclasses, bug 193223
 
 *brasero-0.7.0 (05 Jan 2008)
 
diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
index f6e2ef78239f..5b38c7b4394d 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -1,22 +1,26 @@
 DIST brasero-0.6.1.tar.bz2 1189850 RMD160 49429be9687af963b438824f681ba0f86323df65 SHA1 0f162961ae9ae27df1daa20a5591f845ac422b0a SHA256 c11f26dd1d409e9a501d4af06a94f8689c739c11bfe831305c91066876253d09
 DIST brasero-0.6.90.tar.bz2 1433209 RMD160 7446a5a3441734f4fef972673d1f2d244af50cca SHA1 882bf2c826c27c9ded3afffdb003fb8224449f50 SHA256 94800d2e521b335902b07255c114efc493d208c2226714427dd39bbb364aa7aa
 DIST brasero-0.7.0.tar.bz2 1472221 RMD160 a28cd9e99d74efacf502869db11c9ff4b792c579 SHA1 154948d4993b15e1cc919360b627d4621e52d234 SHA256 96e5846ad828842f61cd8714c9f94b410b9564d4835a07a1f943487f2bc02e30
+EBUILD brasero-0.6.1-r1.ebuild 1885 RMD160 b5b84cc4f91b37c6b8ad5aa091dfecf54dab2b6d SHA1 1b58b9775be07188b93029afbc23feef0918a871 SHA256 e5c09a40449d157fb79704a43165009f42da468a5d60431f5876edf91231146b
+MD5 d8f9ab14ebb098042024644f9bbaafe0 brasero-0.6.1-r1.ebuild 1885
+RMD160 b5b84cc4f91b37c6b8ad5aa091dfecf54dab2b6d brasero-0.6.1-r1.ebuild 1885
+SHA256 e5c09a40449d157fb79704a43165009f42da468a5d60431f5876edf91231146b brasero-0.6.1-r1.ebuild 1885
 EBUILD brasero-0.6.1.ebuild 1866 RMD160 ea2d6222a908f9443c08385e4bcf06da726b7bd3 SHA1 313510a0cf4126e8fcb1fb1834350b998b23860d SHA256 14c63ef062438d84410211a9175c1bd71ec064defbddf1fc956322c71b7c78ee
 MD5 8e217593992eb03fa7f061121f16a649 brasero-0.6.1.ebuild 1866
 RMD160 ea2d6222a908f9443c08385e4bcf06da726b7bd3 brasero-0.6.1.ebuild 1866
 SHA256 14c63ef062438d84410211a9175c1bd71ec064defbddf1fc956322c71b7c78ee brasero-0.6.1.ebuild 1866
-EBUILD brasero-0.6.90.ebuild 1868 RMD160 1aaafd5735e140e4532a4adae047a6af4d21167c SHA1 8b01522e7905bead23343a99eea2a0c3c1e5d814 SHA256 ecf7fa7d55c9cfc69eea81cd370e004bc51d0d3b76b1df1b13fcb36d960f868a
-MD5 9f9697a45ce1684b711b4c4f4fcc7fd8 brasero-0.6.90.ebuild 1868
-RMD160 1aaafd5735e140e4532a4adae047a6af4d21167c brasero-0.6.90.ebuild 1868
-SHA256 ecf7fa7d55c9cfc69eea81cd370e004bc51d0d3b76b1df1b13fcb36d960f868a brasero-0.6.90.ebuild 1868
+EBUILD brasero-0.6.90-r1.ebuild 1888 RMD160 108534280962023bf14d7d2c24b83b5fda605b3c SHA1 967cdc9440b80eaccc44de65cdb74eff4bd0965a SHA256 5a8160ada6d68f1487173de6c38748d501d819dcebefe584a1c22d2a0cfcabcb
+MD5 4d32e820baf5f571a6cf13e34abb9a7f brasero-0.6.90-r1.ebuild 1888
+RMD160 108534280962023bf14d7d2c24b83b5fda605b3c brasero-0.6.90-r1.ebuild 1888
+SHA256 5a8160ada6d68f1487173de6c38748d501d819dcebefe584a1c22d2a0cfcabcb brasero-0.6.90-r1.ebuild 1888
 EBUILD brasero-0.7.0.ebuild 1945 RMD160 3410a1c0e58dcb08658b32c9b8cb67dacb28f3c7 SHA1 60a52a2c98941b73b842ce6cd359ce71f5152d9a SHA256 6124c684c86d4e2fbbc7f66dc6dd25f6fa6eaf9568c54f28ac4fdacf75ffed57
 MD5 669adfaa91e9672068f605d2a968bc9b brasero-0.7.0.ebuild 1945
 RMD160 3410a1c0e58dcb08658b32c9b8cb67dacb28f3c7 brasero-0.7.0.ebuild 1945
 SHA256 6124c684c86d4e2fbbc7f66dc6dd25f6fa6eaf9568c54f28ac4fdacf75ffed57 brasero-0.7.0.ebuild 1945
-MISC ChangeLog 4170 RMD160 9ac6cca070e5c1e1f9485d1537b4af4f7f64c8ac SHA1 9a0639b94eeb87c9c16ce9f736b86fc78cec674c SHA256 acb9884f2e288bff0a559c3b51ae2bd67610861fc8e8dd1a2c0333df44f18156
-MD5 cc2175bd02bc34c67bf78c599223920d ChangeLog 4170
-RMD160 9ac6cca070e5c1e1f9485d1537b4af4f7f64c8ac ChangeLog 4170
-SHA256 acb9884f2e288bff0a559c3b51ae2bd67610861fc8e8dd1a2c0333df44f18156 ChangeLog 4170
+MISC ChangeLog 4437 RMD160 0bcba3e56106dd953021720f7bd185a7c3ec3364 SHA1 d093b02332ad59a9befe64e3a0e89b88978115bc SHA256 120e50c5b209f175f09dadde1176d7686bdb43e6889e51fb45e864e365c15dda
+MD5 7a797ed3f1f962431daa3969f3975393 ChangeLog 4437
+RMD160 0bcba3e56106dd953021720f7bd185a7c3ec3364 ChangeLog 4437
+SHA256 120e50c5b209f175f09dadde1176d7686bdb43e6889e51fb45e864e365c15dda ChangeLog 4437
 MISC metadata.xml 213 RMD160 e7eebe9a94ea38913b2398603dc0918d0e0d3018 SHA1 be6cf57a333f2edb62c9eb412cd8422b82c581c9 SHA256 67509a7c572c24537b10470cebc82d6dd847d5ff25ac61e62404b5d45ad370a5
 MD5 23ab3a8b4a714380ed70025da81b04c0 metadata.xml 213
 RMD160 e7eebe9a94ea38913b2398603dc0918d0e0d3018 metadata.xml 213
@@ -24,9 +28,12 @@ SHA256 67509a7c572c24537b10470cebc82d6dd847d5ff25ac61e62404b5d45ad370a5 metadata
 MD5 42406627e5b1834ba74974375db4ac39 files/digest-brasero-0.6.1 247
 RMD160 318839db772a5a297e7ab7c870da67e59158b4d3 files/digest-brasero-0.6.1 247
 SHA256 cfff813019f72cede362631d8946b2d93add5f3555cae43ca18e10f43009d51c files/digest-brasero-0.6.1 247
-MD5 10741a18cbda012b8504b0d4e19a8347 files/digest-brasero-0.6.90 250
-RMD160 742c06afb3ec7edcf848d46346b612fa8c60840e files/digest-brasero-0.6.90 250
-SHA256 afb0f514e915980e4a1ba235d31506e8afc3e4960d414f3b6321fad88b7d5132 files/digest-brasero-0.6.90 250
+MD5 42406627e5b1834ba74974375db4ac39 files/digest-brasero-0.6.1-r1 247
+RMD160 318839db772a5a297e7ab7c870da67e59158b4d3 files/digest-brasero-0.6.1-r1 247
+SHA256 cfff813019f72cede362631d8946b2d93add5f3555cae43ca18e10f43009d51c files/digest-brasero-0.6.1-r1 247
+MD5 10741a18cbda012b8504b0d4e19a8347 files/digest-brasero-0.6.90-r1 250
+RMD160 742c06afb3ec7edcf848d46346b612fa8c60840e files/digest-brasero-0.6.90-r1 250
+SHA256 afb0f514e915980e4a1ba235d31506e8afc3e4960d414f3b6321fad88b7d5132 files/digest-brasero-0.6.90-r1 250
 MD5 e6a374a7033cdb1f82dfdef0a13420b5 files/digest-brasero-0.7.0 247
 RMD160 557860bb6530ead2d93498554067d4a61345c0bb files/digest-brasero-0.7.0 247
 SHA256 081fa35d23c6c8a1c5f090e567736c880199fcec064b6be68d7dd5511ffc19fc files/digest-brasero-0.7.0 247
diff --git a/app-cdr/brasero/brasero-0.6.1-r1.ebuild b/app-cdr/brasero/brasero-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..ef93bfad0bce
--- /dev/null
+++ b/app-cdr/brasero/brasero-0.6.1-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-0.6.1-r1.ebuild,v 1.1 2008/01/05 16:44:59 beandog Exp $
+
+inherit gnome2
+
+DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
+HOMEPAGE="http://www.gnome.org/projects/brasero"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="beagle dvd gdl libburn libnotify totem nls"
+
+RDEPEND=">=x11-libs/gtk+-2.10
+	>=gnome-base/libgnome-2.10
+	>=gnome-base/libgnomeui-2.10
+	>=gnome-base/gnome-vfs-2.14.2
+	>=media-libs/gstreamer-0.10.6
+	>=media-libs/gst-plugins-base-0.10.6
+	>=media-plugins/gst-plugins-ffmpeg-0.10
+	>=gnome-extra/nautilus-cd-burner-2.16.0
+	>=dev-libs/libxml2-2.6
+	>=sys-apps/hal-0.5.5
+	app-cdr/cdrdao
+	virtual/cdrtools
+	gnome-base/gnome-mount
+	dvd? ( media-libs/libdvdcss
+		app-cdr/dvd+rw-tools )
+	gdl? ( >=dev-libs/gdl-0.6 )
+	totem? ( >=media-video/totem-1.4.2 )
+	beagle? ( >=app-misc/beagle-0.2.5 )
+	libnotify? ( >=x11-libs/libnotify-0.3.0 )
+	libburn? ( >=dev-libs/libburn-0.3.4
+		>=dev-libs/libisofs-0.2.4 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext
+	dev-util/intltool"
+
+G2CONF="${G2CONF} \
+	$(use_enable totem playlist) \
+	$(use_enable beagle search) \
+	$(use_enable libburn) \
+	$(use_enable libnotify) \
+	--disable-caches"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO.tasks"
+USE_DESTDIR="1"
+
+src_install() {
+	gnome2_src_install
+	use nls || rm -rf "${D}"/usr/share/locale
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	elog
+	elog "For a best experience you should have a Linux Kernel >= 2.6.13"
+	elog "to enable system features such as Extended Attributes and inotify."
+	elog
+	elog "To use the libburn backend you need to add USE=libburn and activate"
+	elog "in gconf editor. Note that the default backend is the cdrtools/cdrkit."
+	elog
+}
diff --git a/app-cdr/brasero/brasero-0.6.90.ebuild b/app-cdr/brasero/brasero-0.6.90-r1.ebuild
index bedc71e6c6de..12c916da869a 100644
--- a/app-cdr/brasero/brasero-0.6.90.ebuild
+++ b/app-cdr/brasero/brasero-0.6.90-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-0.6.90.ebuild,v 1.1 2007/12/16 21:40:50 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-0.6.90-r1.ebuild,v 1.1 2008/01/05 16:44:59 beandog Exp $
 
-inherit gnome2 gnome.org
+inherit gnome2
 
 DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
 HOMEPAGE="http://www.gnome.org/projects/brasero"
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="beagle dvd gdl libburn libnotify totem nls"
 
-RDEPEND=">=x11-libs/gtk+-2.10
+RDEPEND=">=x11-libs/gtk+-2.11.6
 	>=gnome-base/libgnome-2.10
 	>=gnome-base/libgnomeui-2.10
 	>=gnome-base/gnome-vfs-2.14.2
@@ -25,7 +25,8 @@ RDEPEND=">=x11-libs/gtk+-2.10
 	app-cdr/cdrdao
 	virtual/cdrtools
 	gnome-base/gnome-mount
-	dvd? ( media-libs/libdvdcss )
+	dvd? ( media-libs/libdvdcss
+		app-cdr/dvd+rw-tools )
 	gdl? ( >=dev-libs/gdl-0.6 )
 	totem? ( >=media-video/totem-1.4.2 )
 	beagle? ( >=app-misc/beagle-0.2.5 )
diff --git a/app-cdr/brasero/files/digest-brasero-0.6.1-r1 b/app-cdr/brasero/files/digest-brasero-0.6.1-r1
new file mode 100644
index 000000000000..58ebc87bf563
--- /dev/null
+++ b/app-cdr/brasero/files/digest-brasero-0.6.1-r1
@@ -0,0 +1,3 @@
+MD5 fa3b59f06b93bd831805a73a81f3293f brasero-0.6.1.tar.bz2 1189850
+RMD160 49429be9687af963b438824f681ba0f86323df65 brasero-0.6.1.tar.bz2 1189850
+SHA256 c11f26dd1d409e9a501d4af06a94f8689c739c11bfe831305c91066876253d09 brasero-0.6.1.tar.bz2 1189850
diff --git a/app-cdr/brasero/files/digest-brasero-0.6.90 b/app-cdr/brasero/files/digest-brasero-0.6.90-r1
index 362ce7d8de75..362ce7d8de75 100644
--- a/app-cdr/brasero/files/digest-brasero-0.6.90
+++ b/app-cdr/brasero/files/digest-brasero-0.6.90-r1