replacing broken gettext check with blocker, bug #127729

(Portage version: 2.1_pre10-r2)

6 files changed, 38 insertions, 29 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index 3256d4199a94..70b4dc62d391 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/xmms
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.192 2006/04/06 15:28:41 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.193 2006/05/05 11:28:43 genone Exp $
+
+  05 May 2006; Marius Mauch <genone@gentoo.org> xmms-1.2.10-r14.ebuild,
+  xmms-1.2.10-r15.ebuild, xmms-1.2.10-r16.ebuild:
+  replacing broken gettext check with blocker, bug #127729
 
 *xmms-1.2.10-r16 (06 Apr 2006)
 
diff --git a/media-sound/xmms/files/digest-xmms-1.2.10-r14 b/media-sound/xmms/files/digest-xmms-1.2.10-r14
index f88f4ab1841a..017cc4382496 100644
--- a/media-sound/xmms/files/digest-xmms-1.2.10-r14
+++ b/media-sound/xmms/files/digest-xmms-1.2.10-r14
@@ -1,5 +1,15 @@
-MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265
 MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
+RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 gentoo_ice-xmms-0.2.tar.bz2 51839
+SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 gentoo_ice-xmms-0.2.tar.bz2 51839
+MD5 fe54f2ec779bc995176e63e3e77cca11 gnomexmms.xpm 7979
+RMD160 4b5eab1734333ec4031a37c9ef740ba35f8fb84e gnomexmms.xpm 7979
+SHA256 6cb7f07ffe47d51bf4483a57812b7c8cb7e35ca5be9d8f0c33512646097f1a71 gnomexmms.xpm 7979
 MD5 28314147dec40dbeaf4665bf1a9854b9 xmms-1.2.10-gentoo-m4-1.1.tar.bz2 26978
+RMD160 63ce094969f33205420f9823a970eb3faabf2e3e xmms-1.2.10-gentoo-m4-1.1.tar.bz2 26978
+SHA256 e253fb2a515d3c7881617172f14fccad6a42cea660b8eaaeef9657114288e46f xmms-1.2.10-gentoo-m4-1.1.tar.bz2 26978
 MD5 f56d7aec6ba74329215f0cc02feadc02 xmms-1.2.10-gentoo-patches-2.2.5.tar.bz2 546248
-MD5 fe54f2ec779bc995176e63e3e77cca11 gnomexmms.xpm 7979
+RMD160 033ce509a29f3ab6311ffabc71a41427ddeb34ba xmms-1.2.10-gentoo-patches-2.2.5.tar.bz2 546248
+SHA256 e99c875e6b2683df25d680ce8686bb5c020faaad4e8b310b3afff4621b401ad2 xmms-1.2.10-gentoo-patches-2.2.5.tar.bz2 546248
+MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265
+RMD160 0360cbb8c326b3325bd8ebb3343c69a9788d7084 xmms-1.2.10.tar.bz2 2418265
+SHA256 ff9eabae2074043294a19ec7beaf0959bd076f6cd60558264faeec08f4a0eb6a xmms-1.2.10.tar.bz2 2418265
diff --git a/media-sound/xmms/files/digest-xmms-1.2.10-r15 b/media-sound/xmms/files/digest-xmms-1.2.10-r15
index b8b5380d6670..f8a11830f18b 100644
--- a/media-sound/xmms/files/digest-xmms-1.2.10-r15
+++ b/media-sound/xmms/files/digest-xmms-1.2.10-r15
@@ -1,5 +1,15 @@
-MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265
 MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
+RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 gentoo_ice-xmms-0.2.tar.bz2 51839
+SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 gentoo_ice-xmms-0.2.tar.bz2 51839
+MD5 fe54f2ec779bc995176e63e3e77cca11 gnomexmms.xpm 7979
+RMD160 4b5eab1734333ec4031a37c9ef740ba35f8fb84e gnomexmms.xpm 7979
+SHA256 6cb7f07ffe47d51bf4483a57812b7c8cb7e35ca5be9d8f0c33512646097f1a71 gnomexmms.xpm 7979
 MD5 28314147dec40dbeaf4665bf1a9854b9 xmms-1.2.10-gentoo-m4-1.1.tar.bz2 26978
+RMD160 63ce094969f33205420f9823a970eb3faabf2e3e xmms-1.2.10-gentoo-m4-1.1.tar.bz2 26978
+SHA256 e253fb2a515d3c7881617172f14fccad6a42cea660b8eaaeef9657114288e46f xmms-1.2.10-gentoo-m4-1.1.tar.bz2 26978
 MD5 0ecda9da0e9a8b28f7a5fe71bf7334f1 xmms-1.2.10-gentoo-patches-2.3.0.tar.bz2 573370
-MD5 fe54f2ec779bc995176e63e3e77cca11 gnomexmms.xpm 7979
+RMD160 ebd96f741603b925758e3f3d7ee8b7c2fbf7fedc xmms-1.2.10-gentoo-patches-2.3.0.tar.bz2 573370
+SHA256 691da646232e6768575598295ca719b4efc0b625e36956f008df5f861ec441ab xmms-1.2.10-gentoo-patches-2.3.0.tar.bz2 573370
+MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265
+RMD160 0360cbb8c326b3325bd8ebb3343c69a9788d7084 xmms-1.2.10.tar.bz2 2418265
+SHA256 ff9eabae2074043294a19ec7beaf0959bd076f6cd60558264faeec08f4a0eb6a xmms-1.2.10.tar.bz2 2418265
diff --git a/media-sound/xmms/xmms-1.2.10-r14.ebuild b/media-sound/xmms/xmms-1.2.10-r14.ebuild
index f06dd2f98271..97c2f3cad5d5 100644
--- a/media-sound/xmms/xmms-1.2.10-r14.ebuild
+++ b/media-sound/xmms/xmms-1.2.10-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r14.ebuild,v 1.13 2006/04/06 15:14:15 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r14.ebuild,v 1.14 2006/05/05 11:28:43 genone Exp $
 
 inherit flag-o-matic eutils libtool gnuconfig
 
@@ -35,7 +35,8 @@ DEPEND="${DEPEND}
 	sys-devel/libtool
 	nls? ( dev-util/intltool
 	       dev-lang/perl
-	       sys-devel/gettext )"
+	       sys-devel/gettext )
+	!nls? ( !<sys-devel/gettext-0.14.1 )"
 
 # USE flags pull in xmms plugins
 PDEPEND="lirc? ( media-plugins/xmms-lirc )
@@ -54,12 +55,6 @@ PDEPEND="lirc? ( media-plugins/xmms-lirc )
 	 oss? ( media-plugins/xmms-oss )"
 
 src_unpack() {
-	if ! has_version '>=sys-devel/gettext-0.14.1'; then
-		eerror "Sorry, you seem to have USE=-nls with an old version of gettext"
-		eerror "on your system.  Unfortunately, that will cause xmms to fail emerging."
-		eerror "Please either remove gettext or upgrade to version 0.14.1."
-	fi
-
 	unpack ${A}
 	cd ${S}
 
diff --git a/media-sound/xmms/xmms-1.2.10-r15.ebuild b/media-sound/xmms/xmms-1.2.10-r15.ebuild
index 69e6b40d6d0b..1a665eb6305b 100644
--- a/media-sound/xmms/xmms-1.2.10-r15.ebuild
+++ b/media-sound/xmms/xmms-1.2.10-r15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r15.ebuild,v 1.13 2006/04/06 15:14:15 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r15.ebuild,v 1.14 2006/05/05 11:28:43 genone Exp $
 
 inherit flag-o-matic eutils libtool gnuconfig
 
@@ -35,7 +35,8 @@ DEPEND="${DEPEND}
 	sys-devel/libtool
 	nls? ( dev-util/intltool
 	       dev-lang/perl
-	       sys-devel/gettext )"
+	       sys-devel/gettext )
+	!nls? ( !<sys-devel/gettext-0.14.1 )"
 
 # USE flags pull in xmms plugins
 PDEPEND="lirc? ( media-plugins/xmms-lirc )
@@ -54,12 +55,6 @@ PDEPEND="lirc? ( media-plugins/xmms-lirc )
 	 oss? ( media-plugins/xmms-oss )"
 
 src_unpack() {
-	if ! has_version '>=sys-devel/gettext-0.14.1'; then
-		eerror "Sorry, you seem to have USE=-nls with an old version of gettext"
-		eerror "on your system.  Unfortunately, that will cause xmms to fail emerging."
-		eerror "Please either remove gettext or upgrade to version 0.14.1."
-	fi
-
 	unpack ${A}
 	cd ${S}
 
diff --git a/media-sound/xmms/xmms-1.2.10-r16.ebuild b/media-sound/xmms/xmms-1.2.10-r16.ebuild
index 121235546224..ea8b10aad9db 100644
--- a/media-sound/xmms/xmms-1.2.10-r16.ebuild
+++ b/media-sound/xmms/xmms-1.2.10-r16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r16.ebuild,v 1.1 2006/04/06 15:28:41 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r16.ebuild,v 1.2 2006/05/05 11:28:43 genone Exp $
 
 inherit flag-o-matic eutils libtool gnuconfig
 
@@ -35,7 +35,8 @@ DEPEND="${DEPEND}
 	sys-devel/libtool
 	nls? ( dev-util/intltool
 	       dev-lang/perl
-	       sys-devel/gettext )"
+	       sys-devel/gettext )
+	!nls? ( !<sys-devel/gettext-0.14.1 )"
 
 # USE flags pull in xmms plugins
 PDEPEND="lirc? ( media-plugins/xmms-lirc )
@@ -54,12 +55,6 @@ PDEPEND="lirc? ( media-plugins/xmms-lirc )
 	 oss? ( media-plugins/xmms-oss )"
 
 src_unpack() {
-	if ! has_version '>=sys-devel/gettext-0.14.1'; then
-		eerror "Sorry, you seem to have USE=-nls with an old version of gettext"
-		eerror "on your system.  Unfortunately, that will cause xmms to fail emerging."
-		eerror "Please either remove gettext or upgrade to version 0.14.1."
-	fi
-
 	unpack ${A}
 	cd ${S}