Version bump for bug 217932, fixing building with GCC 4.3. Thanks to Peter Alfredsen for reporting.

(Portage version: 2.1.5_rc3)

3 files changed, 15 insertions, 33 deletions

diff --git a/media-sound/bmpx/ChangeLog b/media-sound/bmpx/ChangeLog
index 295510f08de0..3b028ae810f6 100644
--- a/media-sound/bmpx/ChangeLog
+++ b/media-sound/bmpx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/bmpx
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/ChangeLog,v 1.75 2008/02/15 15:42:44 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/ChangeLog,v 1.76 2008/04/16 13:42:34 drac Exp $
+
+*bmpx-0.40.14 (16 Apr 2008)
+
+  16 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  -files/bmpx-0.40.13-const-gchar.patch, -bmpx-0.40.13.ebuild,
+  +bmpx-0.40.14.ebuild:
+  Version bump for bug 217932, fixing building with GCC 4.3. Thanks to Peter
+  Alfredsen for reporting.
 
   15 Feb 2008; Samuli Suominen <drac@gentoo.org> metadata.xml:
   Reassign to sound herd.
diff --git a/media-sound/bmpx/bmpx-0.40.13.ebuild b/media-sound/bmpx/bmpx-0.40.14.ebuild
index 3eea8c72afcc..2f66e14115b9 100644
--- a/media-sound/bmpx/bmpx-0.40.13.ebuild
+++ b/media-sound/bmpx/bmpx-0.40.14.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/bmpx-0.40.13.ebuild,v 1.4 2008/01/29 20:35:10 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/bmpx-0.40.14.ebuild,v 1.1 2008/04/16 13:42:34 drac Exp $
 
 EAPI=1
 
 inherit eutils fdo-mime gnome2-utils versionator
 
-MY_PR="$(get_version_component_range 1-2 ${PV})"
+MY_PR=$(get_version_component_range 1-2)
 
 DESCRIPTION="Next generation Beep Media Player"
 HOMEPAGE="http://bmpx.backtrace.info/site/BMPx_Homepage"
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug doc hal modplug networkmanager sid startup-notification"
 
 RDEPEND="net-libs/libsoup:2.2
-	>=dev-db/sqlite-3.3.11
+	>=dev-db/sqlite-3.4
 	>=dev-libs/glib-2.10
 	>=dev-cpp/glibmm-2.12
 	>=dev-libs/libsigc++-2
@@ -32,7 +32,7 @@ RDEPEND="net-libs/libsoup:2.2
 	>=media-libs/gst-plugins-base-0.10.14
 	>=dev-libs/dbus-glib-0.61
 	>=media-libs/taglib-1.4
-	media-sound/cdparanoia
+	dev-libs/libcdio
 	app-arch/zip
 	media-libs/alsa-lib
 	>=dev-libs/boost-1.33.1
@@ -42,7 +42,7 @@ RDEPEND="net-libs/libsoup:2.2
 	modplug? ( >=media-libs/libmodplug-0.8 )
 	startup-notification? ( x11-libs/startup-notification )
 	networkmanager? ( >=net-misc/networkmanager-0.6 )
-	|| ( media-plugins/gst-plugins-alsa media-plugins/gst-plugins-oss )"
+	media-plugins/gst-plugins-meta"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/gettext
@@ -50,12 +50,6 @@ DEPEND="${RDEPEND}
 	>=x11-proto/xproto-7.0.10
 	doc? ( app-text/docbook-xsl-stylesheets	dev-libs/libxslt )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-const-gchar.patch
-}
-
 src_compile() {
 	econf --with-tr1 --enable-ld-workaround \
 		$(use_enable modplug) \
@@ -65,8 +59,7 @@ src_compile() {
 		$(use_enable debug) \
 		$(use_with networkmanager nm) \
 		$(use_enable doc)
-
-	emake -j1 || die "emake failed."
+	emake || die "emake failed."
 }
 
 src_install() {
@@ -75,13 +68,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo
-	elog "Install gst-plugins -mad, -flac, -ogg, -vorbis, -ffmpeg and"
-	elog "others you want to use for playing yourself as we don't add"
-	elog "USE flags for optional runtime depends because of long"
-	elog "compile time BMPx has."
-	einfo
-
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
diff --git a/media-sound/bmpx/files/bmpx-0.40.13-const-gchar.patch b/media-sound/bmpx/files/bmpx-0.40.13-const-gchar.patch
deleted file mode 100644
index 548bf545304f..000000000000
--- a/media-sound/bmpx/files/bmpx-0.40.13-const-gchar.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur bmpx-0.40.13.orig/src/sanity.cc bmpx-0.40.13/src/sanity.cc
---- bmpx-0.40.13.orig/src/sanity.cc	2007-10-18 20:17:08.000000000 +0300
-+++ bmpx-0.40.13/src/sanity.cc	2008-01-20 16:07:27.000000000 +0200
-@@ -69,7 +69,7 @@
- }
- 
- C_FUNCTION
--gchar *
-+const gchar *
- sanity_check_gtk (void)
- {
-   return gtk_check_version (GTK_REQUIRED_MAJOR_VER,