New release, bug #114109.

(Portage version: 2.0.53)

6 files changed, 236 insertions, 11 deletions

diff --git a/media-sound/bmpx/ChangeLog b/media-sound/bmpx/ChangeLog
index cf4e88e5a59f..7f97be0a82f5 100644
--- a/media-sound/bmpx/ChangeLog
+++ b/media-sound/bmpx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/bmpx
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/ChangeLog,v 1.20 2005/11/20 02:16:13 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/ChangeLog,v 1.21 2005/12/02 11:46:56 azarah Exp $
+
+*bmpx-0.12.9 (02 Dec 2005)
+
+  02 Dec 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/bmpx-0.12.9-libtoolize-static-libs.patch,
+  +files/bmpx-0.12.9-old-config-crash.patch, +bmpx-0.12.9.ebuild:
+  New release, bug #114109.
 
   20 Nov 2005; Joseph Jezak <josejx@gentoo.org> bmpx-0.12.6.1.ebuild:
   Marked ~ppc for bug #112622.
diff --git a/media-sound/bmpx/Manifest b/media-sound/bmpx/Manifest
index 18c207b69e8c..6bce4ae98431 100644
--- a/media-sound/bmpx/Manifest
+++ b/media-sound/bmpx/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ff1f3419b16fbf170ecde234c5d70ccd ChangeLog 2980
 MD5 94b783350318bde8ad524625dc572691 bmpx-0.12.6.1.ebuild 2451
+MD5 94b783350318bde8ad524625dc572691 bmpx-0.12.9.ebuild 2451
 MD5 0a184bb0709b591642e5fb7040cf2919 files/digest-bmpx-0.12.6.1 138
+MD5 585ea243a2962670181b03c827204cbb files/digest-bmpx-0.12.9 136
 MD5 b612d343db3c54560665171eb7db245c metadata.xml 223
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDf9x+csIHjyDViGQRAm6uAJ47oCzpiVni9azJwQcsqUWuoWtq5gCffJQL
-0ccqUxv0SjUK8jWKjP6myQk=
-=E1e5
------END PGP SIGNATURE-----
diff --git a/media-sound/bmpx/bmpx-0.12.9.ebuild b/media-sound/bmpx/bmpx-0.12.9.ebuild
new file mode 100644
index 000000000000..732ebe2b54b2
--- /dev/null
+++ b/media-sound/bmpx/bmpx-0.12.9.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2005 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.ebuild,v 1.1 2005/12/02 11:46:57 azarah 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="~amd64 ~ppc ~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.35 )
+	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 )
+	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
+	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-libtoolize-static-libs.patch b/media-sound/bmpx/files/bmpx-0.12.9-libtoolize-static-libs.patch
new file mode 100644
index 000000000000..d1196aa60718
--- /dev/null
+++ b/media-sound/bmpx/files/bmpx-0.12.9-libtoolize-static-libs.patch
@@ -0,0 +1,66 @@
+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-old-config-crash.patch b/media-sound/bmpx/files/bmpx-0.12.9-old-config-crash.patch
new file mode 100644
index 000000000000..c63091a2bddf
--- /dev/null
+++ b/media-sound/bmpx/files/bmpx-0.12.9-old-config-crash.patch
@@ -0,0 +1,62 @@
+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 b/media-sound/bmpx/files/digest-bmpx-0.12.9
new file mode 100644
index 000000000000..52d9678e7377
--- /dev/null
+++ b/media-sound/bmpx/files/digest-bmpx-0.12.9
@@ -0,0 +1,2 @@
+MD5 4449eb429dc7bfb9c2ec3feb9e8c7e56 bmpx-0.12.9.tar.bz2 1619487
+MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839