x86 stable

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

4 files changed, 10 insertions, 65 deletions

diff --git a/media-sound/gnomad/ChangeLog b/media-sound/gnomad/ChangeLog
index d082fcec4bd0..8bc36faf049d 100644
--- a/media-sound/gnomad/ChangeLog
+++ b/media-sound/gnomad/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/gnomad
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/ChangeLog,v 1.41 2011/03/24 19:43:51 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/ChangeLog,v 1.42 2011/03/27 13:17:18 ssuominen Exp $
+
+  27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> gnomad-2.9.4-r2.ebuild:
+  x86 stable wrt #356705
 
   24 Mar 2011; Christoph Mende <angelos@gentoo.org> gnomad-2.9.4-r2.ebuild:
   Stable on amd64 wrt bug #356705
diff --git a/media-sound/gnomad/Manifest b/media-sound/gnomad/Manifest
index 101e662cc939..cb8bf1eab3ee 100644
--- a/media-sound/gnomad/Manifest
+++ b/media-sound/gnomad/Manifest
@@ -1,16 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gnomad-2.9.4-fix-gtk-widget-destroy.diff 681 RMD160 f2cbdef78404aaf5433817c70847628e3266b7af SHA1 1ee1d5d8ac63e8400363b5fd62ddab4949a49829 SHA256 7349f56888a1f4369a8a400b510c2c015ba53db63aa1fcd6fc8fa5fdad0f7803
 DIST gnomad2-2.9.4.tar.gz 347481 RMD160 ff884acb2425f84541b8a7ee2e86403d2509149a SHA1 51d8d89c2960a36084fc6dd007fe652224b57ce5 SHA256 7dc696b50b9bb5fcbddf67988096a989212a4f6c6a728a5b491f06c64569e380
-EBUILD gnomad-2.9.4-r1.ebuild 1064 RMD160 16e1606744d66b09f8dd83fea9b1da120b553935 SHA1 a9b03cccc99ce09c00809b74782d4f4689a8ea3d SHA256 cee2bed5259d9df3f419b0bbdd541e3c7e72c215a006f1fd4484c24bf0179430
-EBUILD gnomad-2.9.4-r2.ebuild 1142 RMD160 7ae63995f4f419f2068b07becdf5498ee8516eb4 SHA1 11cd52533abfbba42696cf85103c87d76c3869b5 SHA256 e8970daaa91ef5d55404c536beb6add6e20a62ddd31605cbba16347b3f364e39
-MISC ChangeLog 5673 RMD160 f6f5be87f3dd6ac224f9ac0dd64b07a6668dd06f SHA1 34dfff13292f5a2534e826f826aeddf338e63059 SHA256 114cbb0dccf04a5d9987a1a75c35ec320c1c342d90058e221b28ee3a89c01dde
+EBUILD gnomad-2.9.4-r2.ebuild 1129 RMD160 13a6dc132ad5b84e233cc8e158728f1055195543 SHA1 6248dcab38a1d2f27ff5accee8511a9393d587a5 SHA256 30fcb2183cae437741b9d62614ae1f3f7a9e908aa52277722a2719024c816761
+MISC ChangeLog 5779 RMD160 6790c1b18c2cb34dae9e0b258638e55c511f32ce SHA1 a985932e3661d3e1669c8fab0c90dd4a2e9425fd SHA256 c51e772835023dfe869bbcbd9033f43ea89f83baff28a0dc0e3bb6327381b495
 MISC metadata.xml 250 RMD160 b54dd8011b3d6177a89d21f6fbdb751aa9d69934 SHA1 c5de7e2c409a5f0f76a59acbd3164752c7d54819 SHA256 9843e2780d4541b36788a00dc8ac35ddb86fab1116002a1f34c97e6d97c61dbd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk2Lnt0ACgkQmWq1bYTyC0PPZgD/Z5tkVFfBUym/Udb5ZzXeps/i
-WbSstTBW3MKLarPkPJYA/2t1rrz+0BQPFcUa5XsLOGP4sK2SsEroUa/w+1xLdH10
-=P/QO
------END PGP SIGNATURE-----
diff --git a/media-sound/gnomad/gnomad-2.9.4-r1.ebuild b/media-sound/gnomad/gnomad-2.9.4-r1.ebuild
deleted file mode 100644
index ac33ddcc2a96..000000000000
--- a/media-sound/gnomad/gnomad-2.9.4-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/gnomad-2.9.4-r1.ebuild,v 1.3 2011/03/21 08:29:42 tomka Exp $
-
-EAPI=2
-GCONF_DEBUG=no
-inherit flag-o-matic gnome2
-
-MY_P=${PN}2-${PV}
-
-DESCRIPTION="A GNOME2 frontend for Creative Players (Zen, JukeBox, etc ...)"
-HOMEPAGE="http://gnomad2.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}2/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="nls"
-
-RDEPEND="sys-apps/hal
-	dev-libs/dbus-glib
-	>=x11-libs/gtk+-2.6:2
-	>=media-libs/libnjb-2.2.4
-	>=media-libs/libmtp-0.3
-	>=media-libs/taglib-1.5
-	>=media-libs/libid3tag-0.15.1b"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext
-		dev-util/intltool )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-gtk-widget-destroy.diff
-}
-
-pkg_setup() {
-	G2CONF+=" $(use_enable nls)"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
-
-src_configure() {
-	strip-flags
-	replace-flags -O3 -O2
-	gnome2_src_configure
-}
diff --git a/media-sound/gnomad/gnomad-2.9.4-r2.ebuild b/media-sound/gnomad/gnomad-2.9.4-r2.ebuild
index 751b918f686f..2c5f4fbb0ee6 100644
--- a/media-sound/gnomad/gnomad-2.9.4-r2.ebuild
+++ b/media-sound/gnomad/gnomad-2.9.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/gnomad-2.9.4-r2.ebuild,v 1.2 2011/03/24 19:43:51 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/gnomad-2.9.4-r2.ebuild,v 1.3 2011/03/27 13:17:18 ssuominen Exp $
 
 EAPI=2
 GCONF_DEBUG=no
@@ -14,13 +14,13 @@ SRC_URI="mirror://sourceforge/${PN}2/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="nls"
 
 RDEPEND=">=dev-libs/dbus-glib-0.88
 	>=x11-libs/gtk+-2.6:2
-	>=media-libs/libnjb-2.2.4
-	>=media-libs/libmtp-0.3
+	media-libs/libnjb
+	media-libs/libmtp
 	>=media-libs/taglib-1.5
 	>=media-libs/libid3tag-0.15.1b"
 DEPEND="${RDEPEND}