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

Package-Manager: portage-2.1.5_rc3

4 files changed, 18 insertions, 37 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/Manifest b/media-sound/bmpx/Manifest
index e16b9362a020..86018754e22d 100644
--- a/media-sound/bmpx/Manifest
+++ b/media-sound/bmpx/Manifest
@@ -1,5 +1,4 @@
-AUX bmpx-0.40.13-const-gchar.patch 347 RMD160 42a79a59dc4fe94663d5bec8f31e3f3cde44346b SHA1 782a673bb39841731b0749435d7da620bdff6998 SHA256 ba302aedced44f355817c940db67636dc3e50c3a05c63f8c08ba0a5aaa199f99
-DIST bmpx-0.40.13.tar.bz2 1820642 RMD160 6eab5edf1ffce8c7226db59281c79c2165886d05 SHA1 3327baa8f13f8411a15ebafd0112b9ba8623c0ef SHA256 cf44d0fe1d273f6f29c4a73040b5a182f86d7547685161587afe4ea9af9636f4
-EBUILD bmpx-0.40.13.ebuild 2526 RMD160 b8b426961f5b6a8896a0b2d4161b3d4591b9a5f5 SHA1 c6531898a20ec5f81213aa0d5c5af4854fcbf8fa SHA256 2e8718fbc337f599864a3625143018521b9b0d114e1fa2cba4d38f152098c9ba
-MISC ChangeLog 12697 RMD160 ece1bb5064afd77f6741bf4b227f5917925a266a SHA1 f92db016cc0d1772841686fa88955018f232e8a8 SHA256 03dad693d3851850e018a6a8d6fa5154e7022c778eeec580f45c804500feacae
+DIST bmpx-0.40.14.tar.bz2 1776299 RMD160 12a9939d53b58a43ee9deefa43188ac6b33dae72 SHA1 3284843c45cab302f414663a5cb31eb4373d07c7 SHA256 6c991bab6c71228ed44a815dd3bb00cdc70ef89d81590bad8721377a4e8806d9
+EBUILD bmpx-0.40.14.ebuild 2135 RMD160 c6502a69c58353083628a14c4d4fecc6cd9158b4 SHA1 7d46dcf2532128c507e827f17ef571aeca71ceba SHA256 70d7715e22c4716cfb344665f8c6e76139546031cef8b3d0e3518ecdd9247aaf
+MISC ChangeLog 12967 RMD160 f874fb9766b19f14136c35a697d07ea6bf032eea SHA1 1ce58b75473b499150ed1c0c1e0d83390d919d49 SHA256 e145f742e318067c2b9a6e163741ebb878002a8bca994bf64d92bd6b3cc10a88
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
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,