Re-add mistakenly dropped gstreamer slots. Move G2CONF to src_prepare, it needs not to be defined for binpkg. Drop old revision.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 25 insertions, 71 deletions

diff --git a/app-cdr/gnomebaker/ChangeLog b/app-cdr/gnomebaker/ChangeLog
index c1a98bb72538..41f64f2adc06 100644
--- a/app-cdr/gnomebaker/ChangeLog
+++ b/app-cdr/gnomebaker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/gnomebaker
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/ChangeLog,v 1.64 2012/05/03 07:51:48 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/ChangeLog,v 1.65 2012/10/25 18:28:40 eva Exp $
+
+  25 Oct 2012; Gilles Dartiguelongue <eva@gentoo.org> -gnomebaker-0.6.4.ebuild,
+  gnomebaker-0.6.4-r1.ebuild:
+  Re-add mistakenly dropped gstreamer slots. Move G2CONF to src_prepare, it
+  needs not to be defined for binpkg. Drop old revision.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> gnomebaker-0.6.4.ebuild,
   gnomebaker-0.6.4-r1.ebuild:
diff --git a/app-cdr/gnomebaker/Manifest b/app-cdr/gnomebaker/Manifest
index 482d7b7ba328..ff4767807e89 100644
--- a/app-cdr/gnomebaker/Manifest
+++ b/app-cdr/gnomebaker/Manifest
@@ -1,10 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gnomebaker-0.6.4-implicits.patch 724 SHA256 781c0de02940d595854dfd2a383c4d366da4abfd8a328e71ff1136407b2e340f SHA512 1df40fcbad9e4b3665f5eedc22e9a684119b7d554c2129ada132a1b7e0e6b9ccce2ea66a1abd2e8e94555d50f43b7e6cdbe139da173ff8eb5761fc64aa39ad1b WHIRLPOOL 3c228aa5bb1539a35ed8d104cabc99625e8da6900ac26d34f88caefcbd2d76941c4e8999d285a48b7539ec8ef25b9a640897bc206f12ba67aab272eada12f050
 AUX gnomebaker-0.6.4-ldadd.patch 279 SHA256 c81ac7d443844cbb7d94c9cb3399766e1efccfba0cd6f0b5628ca146a2f794fc SHA512 98af7ae0508430aed4e6017e71b277506dc5abd2c71ce4c8a7f4183317ce493b7b6281fe23a4a6f55668e54100c0ea6118785625abb65e73850fd141e9af4953 WHIRLPOOL f223ad96e4ab0d65ace54a8e999659196d6f3726f4de3c1985af519cb214e8d279bcc0d3c738fd79cc2a50dda7d470dcddd6d659792eae722b37cc5baa6613a8
 AUX gnomebaker-0.6.4-libnotify-0.7.patch 682 SHA256 81d400bdaf7f6992c88842fecfb71cf1fc1b7e12ec0c69275f879442181c16e2 SHA512 58fc5d79bc0f2857a06dfe42c28e50d707b6028da8ecf8c6093824afb471207d2046dc8e87f561ebed839b3d0962716b6941996eb272873c4080f40135efc6c0 WHIRLPOOL b469594544f4ce158267c4c6139c6569e5811c749c66d789c640eda4c961e1c81c5be6ad267e0d7ac622ca0573884b7e0a822a7be40fcf9f750c2b64349ef961
 AUX gnomebaker-0.6.4-mimetype.patch 346 SHA256 df2de7770bb8fe00ad2ed6c347004a988b07f100207cc24c7fda68b39eb514fa SHA512 eedef30898d113adb69cc0ff39f3f6b48ccd1476d6e2d2102b99c8db711282122ac27aa7935644cf6c40b3fda0e4b9420cb6deaa7cb636b4fc661e831f830d7c WHIRLPOOL 26b4cb17f9cbc3cfac8d2995b14104b978bfb60109964037c70bfe07d1e41ce26f851c426ba3abc7cdcaea059400d17ae699ba78636f8b77ae86927f8a61f4a5
 AUX gnomebaker-0.6.4-seldata.patch 1472 SHA256 67ad4851d01017d510accf87bd4af79d920c845f6aa84dff7636b803cbb31b5a SHA512 2cf1801d4136f2559740eeebc5e4db75c0376e87455e2cfd304c4c5370ae3b598b9e64b924f14d56e558efe33bc235454841d0fbd2fcc6e6e574850cd7b84096 WHIRLPOOL 0024a45b785a2284c7ad912aefd78ecac9421a302e5a30e9fedf0b8f19ce97bb6b2580f76ce8cefb95569ef77e4bf8f00df7afcab32f7a985c7505da193f9210
 DIST gnomebaker-0.6.4.tar.gz 1276117 SHA256 6e1ef94cafca7536fc3211a7abd4732f6dc5adc3c7c1b73184f5a87738117fb7 SHA512 954a05724d8d036580edbd5ded11bfd4389965b831ccf2d5a10dbd542c54db4f0519aa3277c6ebc139f55a2475987c48b557cc002e86d9cccca473f187666e34 WHIRLPOOL f951cc19ebd3d107e0d2386c2e58cc678521a31c1fd40e77769dc6758fefa86d375d92bd7bad3770c5e54e6e2de41357a5c66efbdab0276b09f41516049d1d47
-EBUILD gnomebaker-0.6.4-r1.ebuild 1616 SHA256 7f1ce122e7b4a24f53caedd19a53e63d791eae7ca2b0af9162c7b83b7ff6edaa SHA512 39c725b40908dba26e18efe310c27ed900c096eb2cda724d612d7e3cb674ed99726459de6b75d5620b91961c831869e94343c57ebb339416ca5b453dad923732 WHIRLPOOL 0bfe033077c85d8bb48b92f5ee95edbbce8446169c1fc31335a4769e69cc8d0ba23e2a728c4f19c41c2dd8e36e9828cea605f3a4dfa1961b6ed74b324666e02d
-EBUILD gnomebaker-0.6.4.ebuild 1604 SHA256 993a273fd6207f939db920e092fe168aecddc4b34f7da7df240ed204273f64b5 SHA512 ba55fea2da2a678d2580614aa5f34872c44d9f95f9ee4d5df60f8677157b0e29f3532f73a3541b4bb309a39d9a113cdc5111a3d71be9f0d6ba1c6cb43a60ebba WHIRLPOOL 9402c57f94ee45a318d3ccf922616a7882cbd901cb0d7cf8ad0076d89bb21420587d39b02b7a624f43e042185d5970594413cc07e0ffc33774e21bd40dccf411
-MISC ChangeLog 9516 SHA256 9a08a5e699f6fe600fd8557c32c1e21191f071f96ef7e87ee6ce52a856e9251f SHA512 2c3c3d045121f3cd2f7a4162ea22b8f348f18ffaf8f82e176b19e720877828c4f8a8dae5b60afae612f4d775b06798bb5e4515bd7127ebefbdc79132ec7731ed WHIRLPOOL bb647846f5d22d19ad124a3ca146fc94b3395da5078dd0f9db3961d09b15d7293d171c63185b90df6d8e6a950bade89613e62007fe6fbcd6e51e6037572ae4f1
+EBUILD gnomebaker-0.6.4-r1.ebuild 1622 SHA256 51dc83ebe9b1eae851530f98b488d21d026bd5b101f793be1e582cc5efd652b6 SHA512 3fcfe37afbfd6f5fb79fa3eb848ac495aac9da9f6576cd1a997bc34ecb4776c0627f8d5c46f5cf543b3b391b2418ba556b4360a47e20c9f415067d9f48805783 WHIRLPOOL 24276d730940f472d8769780de0733aa5b4d3eee224b7ebce7d2bf3ab18c66e05f582fa031cc090f0dc40583223577c9dc49b02064aff1e632b863eaf19976eb
+MISC ChangeLog 9757 SHA256 2cf227106fb127884658ae08f2e888a5000164f278178e14cafe53783f7cbe58 SHA512 70a070683a0927fe9b2b44cc5e567259ae985b719bfdc92f75b2320e9623bf8737611d74269acbc0be68a8a9bce41bbcc558d2a38654647271c46f5f72efae54 WHIRLPOOL f3a925d0f4d84d46827b203965f62b460d7516c005af01e39a72d18034cac9e46567529086ecc397d6378f3f677be270a9b11ea496855ccb9c35633045e6a6eb
 MISC metadata.xml 168 SHA256 78253ccb8cd8df7179b1776b7e98a02f8df32368476727fef07ad0c9d164e180 SHA512 847984ab8d8795fa675c23f65677dfc6373d2e2d0edfc415f361b2ecc3bd8f3b359c80fba23ddbc799a755d07e8d68241d7dc8050de4e3ef7df066e58bde5c9d WHIRLPOOL 1b379ed5d4b670c881f3c8bbed454bf2479a7d6dbdb7c3522040292ab23cf7fb791dba978eccd1dd06c758baf7b1f21e403bdc055b9f8f0c1e2dd70a035b946d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlCJhNgACgkQ1fmVwcYIWAYzDQCg5t3pWWpOB8N1ULGScCVLvxXy
+gIcAnA7lNvGGqbpEkvNdSJV4q6KItoTI
+=L2wm
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild b/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild
index 510aa16ce646..b20124bf783f 100644
--- a/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild
+++ b/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild,v 1.6 2012/05/03 07:51:48 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild,v 1.7 2012/10/25 18:28:40 eva Exp $
 
 EAPI=4
 GCONF_DEBUG=no
@@ -19,28 +19,26 @@ COMMON_DEPEND="app-cdr/cdrdao
 	dev-libs/libxml2
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnomeui-2
-	=media-libs/gstreamer-0.10*
+	>=media-libs/gstreamer-0.10:0.10
 	virtual/cdrtools
 	x11-libs/cairo
 	x11-libs/gtk+:2
 	dvdr? ( app-cdr/dvd+rw-tools )
 	libnotify? ( x11-libs/libnotify )"
 RDEPEND="${COMMON_DEPEND}
-	=media-libs/gst-plugins-good-0.10*
-	flac? ( =media-plugins/gst-plugins-flac-0.10* )
-	mp3? ( =media-plugins/gst-plugins-mad-0.10* )
-	vorbis? ( =media-plugins/gst-plugins-vorbis-0.10* )"
+	>=media-libs/gst-plugins-good-0.10:0.10
+	flac? ( >=media-plugins/gst-plugins-flac-0.10:0.10 )
+	mp3? ( >=media-plugins/gst-plugins-mad-0.10:0.10 )
+	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10:0.10 )"
 DEPEND="${COMMON_DEPEND}
 	app-text/rarian
 	dev-util/intltool
 	virtual/pkgconfig
 	sys-devel/gettext"
 
-pkg_setup() {
+src_prepare() {
 	G2CONF="$(use_enable libnotify)"
-}
 
-src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-libnotify-0.7.patch \
 		"${FILESDIR}"/${P}-ldadd.patch \
diff --git a/app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild b/app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild
deleted file mode 100644
index f831c6727e63..000000000000
--- a/app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild,v 1.9 2012/05/03 07:51:48 jdhore Exp $
-
-EAPI=3
-GCONF_DEBUG=no
-inherit eutils gnome2
-
-DESCRIPTION="GnomeBaker is a GTK2/Gnome cd burning application."
-HOMEPAGE="http://sourceforge.net/projects/gnomebaker"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
-IUSE="dvdr flac libnotify mp3 vorbis"
-
-RDEPEND=">=x11-libs/gtk+-2.8:2
-	>=gnome-base/libgnomeui-2.8.1
-	>=dev-libs/libxml2-2.4:2
-	>=gnome-base/libglade-2.4.2:2.0
-	>=media-libs/gstreamer-0.10:0.10
-	x11-libs/cairo
-	app-cdr/cdrdao
-	virtual/cdrtools
-	dvdr? ( app-cdr/dvd+rw-tools )
-	flac? ( >=media-plugins/gst-plugins-flac-0.10:0.10
-		media-libs/gst-plugins-good:0.10 )
-	libnotify? ( x11-libs/libnotify )
-	mp3? ( >=media-plugins/gst-plugins-mad-0.10:0.10
-		media-libs/gst-plugins-good:0.10 )
-	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10:0.10
-		>=media-libs/libogg-1.1.2
-		media-libs/gst-plugins-good:0.10 )"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-dependency-tracking
-		$(use_enable libnotify)"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install \
-		gnomebakerdocdir=/usr/share/doc/${P} \
-		docdir=/usr/share/gnome/help/${PN}/C \
-		gnomemenudir=/usr/share/applications
-	rm -rf "${D}"/usr/share/doc/${P}/*.make "${D}"/var
-}