Clean up 0.12.9 since it's now keyworded on all the arches it works on (see bug #111975 for alpha and sparc).

(Portage version: 2.1_rc4-r4)
 (Unsigned Manifest commit)

7 files changed, 4 insertions, 296 deletions

diff --git a/media-sound/bmpx/Manifest b/media-sound/bmpx/Manifest
index 356afd1d5720..d6ff244b807d 100644
--- a/media-sound/bmpx/Manifest
+++ b/media-sound/bmpx/Manifest
@@ -1,51 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX bmpx-0.12.9-dbus-fix.patch 453 RMD160 bb150fab5f4b9d3671290d887db4e867e3eef6ec SHA1 981cb3a5054fe0d346d1044230f071ccaff96324 SHA256 d224184cc58ed1de2db30f24e10557279f8d8a6bcb1223d37ba637c8b593bc63
-MD5 7514f80714813b7e16f4d8c053b25080 files/bmpx-0.12.9-dbus-fix.patch 453
-RMD160 bb150fab5f4b9d3671290d887db4e867e3eef6ec files/bmpx-0.12.9-dbus-fix.patch 453
-SHA256 d224184cc58ed1de2db30f24e10557279f8d8a6bcb1223d37ba637c8b593bc63 files/bmpx-0.12.9-dbus-fix.patch 453
-AUX bmpx-0.12.9-libtoolize-static-libs.patch 1753 RMD160 353c3621c173bc9430c8fad1ba49652f04e35295 SHA1 435f0e5883b2bb0180e4d394f8f389dfed35c09c SHA256 86e3a78dccef23e6aeee7fafd43ee583dcb5686788db775d5e9d383668da9bf2
-MD5 00c0df8ecca35f227152aef1b0d7ccb5 files/bmpx-0.12.9-libtoolize-static-libs.patch 1753
-RMD160 353c3621c173bc9430c8fad1ba49652f04e35295 files/bmpx-0.12.9-libtoolize-static-libs.patch 1753
-SHA256 86e3a78dccef23e6aeee7fafd43ee583dcb5686788db775d5e9d383668da9bf2 files/bmpx-0.12.9-libtoolize-static-libs.patch 1753
-AUX bmpx-0.12.9-no-config.patch 299 RMD160 ecb6d2909c218f327c1224ffd6c71f0e19def488 SHA1 ce5fad267015bd721912d6fc7e955922cbde156f SHA256 b57ec459f29d93d55784a9c48cbcb31117955cd456535dede561b87d518073e7
-MD5 dc568e7c4ffcaf55d085e79c3cf0ca52 files/bmpx-0.12.9-no-config.patch 299
-RMD160 ecb6d2909c218f327c1224ffd6c71f0e19def488 files/bmpx-0.12.9-no-config.patch 299
-SHA256 b57ec459f29d93d55784a9c48cbcb31117955cd456535dede561b87d518073e7 files/bmpx-0.12.9-no-config.patch 299
-AUX bmpx-0.12.9-old-config-crash.patch 1589 RMD160 cae122359a5675ee98a4b8c93e8cb633ad5016f7 SHA1 435625df28cc2911ce524aec505485d791b69549 SHA256 bc13afc432d6c7b6cc312d02b2abbe13a5e5d2248954ac35c79470ad0987bfb1
-MD5 5503a1102cf2fdda814f40ffc04fa960 files/bmpx-0.12.9-old-config-crash.patch 1589
-RMD160 cae122359a5675ee98a4b8c93e8cb633ad5016f7 files/bmpx-0.12.9-old-config-crash.patch 1589
-SHA256 bc13afc432d6c7b6cc312d02b2abbe13a5e5d2248954ac35c79470ad0987bfb1 files/bmpx-0.12.9-old-config-crash.patch 1589
-DIST bmpx-0.12.9.tar.bz2 1619487 RMD160 574d8dda8d98cfd25c2fdd4470b60766bba0fea3 SHA1 fb4e4e1dde0194bd437fbd4d4d1c75c695b52658 SHA256 12bd7377e1744cb95839e3fac38e119db6d9901ec465c4e0b2d794b0bbb47bb2
 DIST bmpx-0.14.4.tar.bz2 1960833 RMD160 016d790ada78899b131bf8ed16886504a8f36cac SHA1 2ceb4d3c6f935d94a16584bba3ee560ae7653c1e SHA256 8fa68c0059c769b565c00fb7c7a637129f1d3dfbeaad35e0c418730728399551
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 SHA1 e97ebbf204e0d1b150265f9e67f0ed54d779e110 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1
-EBUILD bmpx-0.12.9-r2.ebuild 2769 RMD160 d9f784279f4f4fc81ab77cce189842a29de30822 SHA1 200d5ce73a01c4ec9239312b8964c89b61b785ed SHA256 396f025d6c94843270eb037119f8acb9cf89b5b8a81268a04733d90993cb17f9
-MD5 4a21f54bc20c6f342655c5d7e80d8699 bmpx-0.12.9-r2.ebuild 2769
-RMD160 d9f784279f4f4fc81ab77cce189842a29de30822 bmpx-0.12.9-r2.ebuild 2769
-SHA256 396f025d6c94843270eb037119f8acb9cf89b5b8a81268a04733d90993cb17f9 bmpx-0.12.9-r2.ebuild 2769
 EBUILD bmpx-0.14.4.ebuild 2144 RMD160 a75c79f221d3b71af58ef4982338427238ef864c SHA1 fb5cdc10477bf933e18710088c17565ee2a4f217 SHA256 9c5dec564d0935b6f2fe98c56d1e40a024f61dcd4da4dc25858d6e77a361703d
 MD5 5aec3a2525fc227db7b4e227f27c6563 bmpx-0.14.4.ebuild 2144
 RMD160 a75c79f221d3b71af58ef4982338427238ef864c bmpx-0.14.4.ebuild 2144
 SHA256 9c5dec564d0935b6f2fe98c56d1e40a024f61dcd4da4dc25858d6e77a361703d bmpx-0.14.4.ebuild 2144
-MISC ChangeLog 4931 RMD160 0a9430e1b46377132607e85128ccd5765717e215 SHA1 759357772f06a1dd2299f9365097ddb6a56ed9f4 SHA256 b86d88e4b8f55964f4529f6ce7db2a0aeb1569c6a490aa09dc3a28ca6b43cc94
-MD5 ea0314930e06dfe8a87f8b93a4b9829d ChangeLog 4931
-RMD160 0a9430e1b46377132607e85128ccd5765717e215 ChangeLog 4931
-SHA256 b86d88e4b8f55964f4529f6ce7db2a0aeb1569c6a490aa09dc3a28ca6b43cc94 ChangeLog 4931
+MISC ChangeLog 5293 RMD160 f11d4782e7348110c1fea8eaae9535cf384e2425 SHA1 0538c39c5a7a0e367c357f71066938dc01827e47 SHA256 769e8b923ceede1eef0e32f1103ec5f3b3e135e8cfdc4726a34acb9db545ba99
+MD5 9b48f8dc8df54af5db9bb494b8ecd35a ChangeLog 5293
+RMD160 f11d4782e7348110c1fea8eaae9535cf384e2425 ChangeLog 5293
+SHA256 769e8b923ceede1eef0e32f1103ec5f3b3e135e8cfdc4726a34acb9db545ba99 ChangeLog 5293
 MISC metadata.xml 256 RMD160 490bbea4751daa854e980c0b893961554e00f4c2 SHA1 b61dde99da5a1bd8e1df9547598a5f81f59c2c49 SHA256 63d4743ef1b39d533fc8f2c45f50f76179afabd00a0a58e0ba9d8f3a17c55c59
 MD5 c809357984e7e234e30c1a6ea7d10f8a metadata.xml 256
 RMD160 490bbea4751daa854e980c0b893961554e00f4c2 metadata.xml 256
 SHA256 63d4743ef1b39d533fc8f2c45f50f76179afabd00a0a58e0ba9d8f3a17c55c59 metadata.xml 256
-MD5 1848cd8b9fff1b75c2ebe233201507e9 files/digest-bmpx-0.12.9-r2 500
-RMD160 285da606d16fadb11e6d2ee672522d86dcd08401 files/digest-bmpx-0.12.9-r2 500
-SHA256 727c735d412e434d5e5b7105fd199bcb5ab277f21910977706e53f13ef0a950e files/digest-bmpx-0.12.9-r2 500
 MD5 e19050594fe41200d83926db0926199e files/digest-bmpx-0.14.4 500
 RMD160 6374fa7233d07d61c7672a4c0ac8aff6400c6940 files/digest-bmpx-0.14.4 500
 SHA256 6ed64a4ac86d135bb2ee70de797a36274da36e02d9e64fab9e7c204723786df8 files/digest-bmpx-0.14.4 500
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEgIW0Wt/XSf2CZdkRAu3wAJ9RO0lU/MOKo22URgP4y1+y5VcH9QCeInkE
-n9zeGvSz+5xDN69RWFudYNY=
-=fHVO
------END PGP SIGNATURE-----
diff --git a/media-sound/bmpx/bmpx-0.12.9-r2.ebuild b/media-sound/bmpx/bmpx-0.12.9-r2.ebuild
deleted file mode 100644
index 31618accf789..000000000000
--- a/media-sound/bmpx/bmpx-0.12.9-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/bmpx-0.12.9-r2.ebuild,v 1.5 2006/06/02 18:28:05 chutzpah Exp $
-
-inherit gnome2 autotools eutils
-
-MY_P=${P/_p/-}
-MY_P=${MY_P/_rc/_RC}
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Next generation Beep Media Player"
-HOMEPAGE="http://www.beep-media-player.org/"
-SRC_URI="mirror://sourceforge/beepmp/${MY_P}.tar.bz2
-	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="a52 dbus debug flac irssi mad ogg perl python theora vorbis xchat xine"
-
-RDEPEND=">=dev-libs/glib-2.8.0
-	>=x11-libs/gtk+-2.8.0
-	>=gnome-base/libglade-2.5.1
-	>=x11-libs/pango-1.10.0
-	>=dev-libs/libxml2-2.6.18
-	>=x11-libs/cairo-1.0.0
-	>=x11-libs/startup-notification-0.8
-	>=media-libs/taglib-1.4
-	dbus? ( >=sys-apps/dbus-0.60 )
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python >=dev-python/pygtk-2.8 )
-	irssi? ( >=net-irc/irssi-0.8.9 )
-	xchat? ( || ( >=net-irc/xchat-2.4.1 >=net-irc/xchat-gnome-0.6 ) )
-	virtual/fam
-	net-misc/curl
-	>=media-libs/xine-lib-1.0.1"
-# gstreamer support is on hold until gstreamer 0.9
-#	xine? ( >=media-libs/xine-lib-1.0.1 )
-#	!xine? ( >=media-libs/gstreamer-0.8.9-r3
-#		>=media-libs/gst-plugins-0.8.8
-#		>=media-plugins/gst-plugins-pango-0.8.8
-#		mad? ( >=media-plugins/gst-plugins-mad-0.8.8 )
-#		ogg? ( >=media-plugins/gst-plugins-ogg-0.8.8 )
-#		vorbis? ( >=media-plugins/gst-plugins-ogg-0.8.8
-#			>=media-plugins/gst-plugins-vorbis-0.8.8 )
-#		a52? ( >=media-plugins/gst-plugins-a52dec-0.8.8 )
-#		flac? ( >=media-plugins/gst-plugins-flac-0.8.8 )
-#		theora? ( >=media-plugins/gst-plugins-ogg-0.8.8
-#		        >=media-plugins/gst-plugins-theora-0.8.8 )
-#		)"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS COPYING ChangeLog NEWS README"
-
-# gstreamer is default backend
-G2CONF="${G2CONF} \
-	$(use_enable dbus) \
-	$(use_enable perl) \
-	$(use_enable python) \
-	$(use_enable irssi) \
-	$(use_enable xchat)"
-#useq xine || G2CONF="${G2CONF} --enable-gst"
-
-USE_DESTDIR="1"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-libtoolize-static-libs.patch
-	epatch ${FILESDIR}/${P}-old-config-crash.patch
-	epatch ${FILESDIR}/${P}-no-config.patch
-	epatch ${FILESDIR}/${P}-dbus-fix.patch
-
-	AT_M4DIR="-I m4" \
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	insinto /usr/share/bmpx/skins/gentoo_ice
-	doins ${WORKDIR}/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc ${WORKDIR}/README
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if useq irssi || useq xchat ; then
-		ewarn "To use the Perl Irssi/XChat scripts, please do:"
-		echo
-		ewarn "  # emerge app-portage/g-cpan"
-		ewarn "  # g-cpan -i Net::DBus"
-		echo
-		ebeep
-	fi
-}
diff --git a/media-sound/bmpx/files/bmpx-0.12.9-dbus-fix.patch b/media-sound/bmpx/files/bmpx-0.12.9-dbus-fix.patch
deleted file mode 100644
index 1b25d7fd6535..000000000000
--- a/media-sound/bmpx/files/bmpx-0.12.9-dbus-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/system_control.c~	2005-11-22 23:40:59.000000000 +0100
-+++ src/system_control.c	2006-01-03 19:47:50.000000000 +0100
-@@ -1756,7 +1756,7 @@
- 
-     if (!dbus_g_proxy_call (bus_proxy, "RequestName", &error,
- 			    G_TYPE_STRING, BMP_DBUS_INTERFACE,
--			    G_TYPE_UINT, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
-+			    G_TYPE_UINT, DBUS_NAME_FLAG_DO_NOT_QUEUE,
- 			    G_TYPE_INVALID,
- 			    G_TYPE_UINT, &request_name_result,
- 			    G_TYPE_INVALID))
diff --git a/media-sound/bmpx/files/bmpx-0.12.9-libtoolize-static-libs.patch b/media-sound/bmpx/files/bmpx-0.12.9-libtoolize-static-libs.patch
deleted file mode 100644
index d1196aa60718..000000000000
--- a/media-sound/bmpx/files/bmpx-0.12.9-libtoolize-static-libs.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -urN bmpx-0.12.9/configure.ac bmpx-0.12.9.az/configure.ac
---- bmpx-0.12.9/configure.ac	2005-11-23 00:41:07.000000000 +0200
-+++ bmpx-0.12.9.az/configure.ac	2005-12-02 13:13:26.000000000 +0200
-@@ -404,13 +404,13 @@
- 
- dnl XCS
- XCS_CFLAGS='-I$(top_builddir)/xcs'
--XCS_LIBS='$(top_builddir)/xcs/libxcs.a'
-+XCS_LIBS='$(top_builddir)/xcs/libxcs.la'
- AC_SUBST([XCS_CFLAGS])
- AC_SUBST([XCS_LIBS])
- 
- dnl GOA
- GOA_CFLAGS='-I$(top_builddir)/goa'
--GOA_LIBS='$(top_builddir)/goa/libgoa.a'
-+GOA_LIBS='$(top_builddir)/goa/libgoa.la'
- AC_SUBST([GOA_CFLAGS])
- AC_SUBST([GOA_LIBS])
- 
-diff -urN bmpx-0.12.9/goa/Makefile.am bmpx-0.12.9.az/goa/Makefile.am
---- bmpx-0.12.9/goa/Makefile.am	2005-11-23 00:41:20.000000000 +0200
-+++ bmpx-0.12.9.az/goa/Makefile.am	2005-12-02 13:12:01.000000000 +0200
-@@ -1,16 +1,15 @@
--lib_LIBRARIES = libgoa.a
-+lib_LTLIBRARIES = libgoa.la
- 
- INCLUDES = \
- 	$(GLIB_CFLAGS)
- 
--AM_LDFLAGS = -all-static
--LIBADD = $(GLIB_LIBS)
-+libgoa_la_LIBADD = $(GLIB_LIBS)
- 
- BUILT_SOURCES = \
-         libgoa.c \
-         libgoa.h
- 
--nodist_libgoa_a_SOURCES = \
-+nodist_libgoa_la_SOURCES = \
- 	libgoa.c \
- 	libgoa.h
- 
-diff -urN bmpx-0.12.9/xcs/Makefile.am bmpx-0.12.9.az/xcs/Makefile.am
---- bmpx-0.12.9/xcs/Makefile.am	2005-11-23 00:41:22.000000000 +0200
-+++ bmpx-0.12.9.az/xcs/Makefile.am	2005-12-02 13:12:01.000000000 +0200
-@@ -1,16 +1,15 @@
--lib_LIBRARIES = libxcs.a
-+noinst_LTLIBRARIES = libxcs.la
- 
- INCLUDES = \
- 	$(GLIB_CFLAGS) $(XML_CFLAGS) $(GTK_CFLAGS) $(XCS_DEFINES)
- 
--AM_LDFLAGS = -all-static
--LIBADD = $(GLIB_LIBS) $(XML_LIBS)
-+libxcs_la_LIBADD = $(GLIB_LIBS) $(XML_LIBS)
- 
- if HAVE_GUI
--LIBADD += $(GTK_LIBS)
-+libxcs_la_LIBADD += $(GTK_LIBS)
- endif
- 
--libxcs_a_SOURCES = \
-+libxcs_la_SOURCES = \
-         xcs.c \
-         xcs.h \
- 	xml.c \
diff --git a/media-sound/bmpx/files/bmpx-0.12.9-no-config.patch b/media-sound/bmpx/files/bmpx-0.12.9-no-config.patch
deleted file mode 100644
index 6e6678fb37a5..000000000000
--- a/media-sound/bmpx/files/bmpx-0.12.9-no-config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xcs.c
-===================================================================
---- 1/xcs/xcs.c	(revision 78)
-+++ 2/xcs/xcs.c	(revision 79)
-@@ -54,7 +54,7 @@
-     xmlDocPtr xmlconfig;
- };
- 
--static gboolean new_configuration = FALSE;
-+static gboolean new_configuration = TRUE;
- 
- #ifdef HAVE_GUI
- 
diff --git a/media-sound/bmpx/files/bmpx-0.12.9-old-config-crash.patch b/media-sound/bmpx/files/bmpx-0.12.9-old-config-crash.patch
deleted file mode 100644
index c63091a2bddf..000000000000
--- a/media-sound/bmpx/files/bmpx-0.12.9-old-config-crash.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: xcs.c
-===================================================================
---- 1/xcs/xcs.c	(revision 76)
-+++ 2/xcs/xcs.c	(revision 78)
-@@ -230,12 +230,30 @@
-     filename = g_build_filename (g_get_home_dir(), XCS_RCPATH, "config.xml", NULL);
- 
-     if (g_file_test (filename, G_FILE_TEST_EXISTS))
--    {
--         configuration->private->xmlconfig =
--         xmlParseFile (filename);
--    }
--    else
--    {
-+      {
-+	xmlXPathObjectPtr xpathobj;
-+	xmlDocPtr xmldoc;
-+
-+	xmldoc = xmlParseFile (filename);
-+	new_configuration = FALSE;
-+
-+	xpathobj = xml_execute_xpath_expression (xmldoc, "/" XCS_ROOT_NODE_NAME, NULL); 
-+	
-+	if ((!xpathobj) || (!xpathobj->nodesetval) || (!xpathobj->nodesetval->nodeNr))
-+	  {
-+	    new_configuration = TRUE;
-+	    xmlFreeDoc (xmldoc);
-+	  }
-+	else
-+	  {
-+	      configuration->private->xmlconfig = xmldoc;
-+	  }
-+
-+	xmlXPathFreeObject (xpathobj);
-+      }
-+
-+    if (new_configuration)
-+      {
-          configuration->private->xmlconfig = xmlNewDoc ((unsigned char*)"1.0");
- 
-          node = xmlNewNode (NULL, (unsigned char*)XCS_ROOT_NODE_NAME);
-@@ -245,10 +263,8 @@
- 
-          xmlDocSetRootElement (configuration->private->
-                                xmlconfig, node);
-+      }
- 
--	 new_configuration = TRUE;
--    }
--
-     g_free (filename);
- 
-     g_message("running: %s", G_OBJECT_TYPE_NAME(configuration));
-@@ -256,7 +272,7 @@
- 
- static xmlXPathObjectPtr
- xcs_get_from_xpath (Xcs *configuration,
--                                  const gchar * xpath_expr)
-+		    const gchar * xpath_expr)
- {
-     xmlXPathObjectPtr xpathObj = NULL;
- 
diff --git a/media-sound/bmpx/files/digest-bmpx-0.12.9-r2 b/media-sound/bmpx/files/digest-bmpx-0.12.9-r2
deleted file mode 100644
index facf644645c1..000000000000
--- a/media-sound/bmpx/files/digest-bmpx-0.12.9-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 4449eb429dc7bfb9c2ec3feb9e8c7e56 bmpx-0.12.9.tar.bz2 1619487
-RMD160 574d8dda8d98cfd25c2fdd4470b60766bba0fea3 bmpx-0.12.9.tar.bz2 1619487
-SHA256 12bd7377e1744cb95839e3fac38e119db6d9901ec465c4e0b2d794b0bbb47bb2 bmpx-0.12.9.tar.bz2 1619487
-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