Select one libsigc++ slot wrt #228483. Fix building with GCC 4.2 (and thus also 4.3).

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc3 x86_64

4 files changed, 48 insertions, 5 deletions

diff --git a/media-sound/gnomoradio/ChangeLog b/media-sound/gnomoradio/ChangeLog
index c03a700a0641..c28923503e9c 100644
--- a/media-sound/gnomoradio/ChangeLog
+++ b/media-sound/gnomoradio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/gnomoradio
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomoradio/ChangeLog,v 1.18 2008/01/13 16:51:36 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomoradio/ChangeLog,v 1.19 2008/06/29 11:55:15 drac Exp $
+
+  29 Jun 2008; Samuli Suominen <drac@gentoo.org>
+  +files/gnomoradio-0.15.1-gcc42.patch, gnomoradio-0.15.1.ebuild:
+  Select one libsigc++ slot wrt #228483. Fix building with GCC 4.2 (and thus
+  also 4.3).
 
   13 Jan 2008; Samuli Suominen <drac@gentoo.org> gnomoradio-0.15.1.ebuild:
   depend on dev-util/pkgconfig wrt #205653
diff --git a/media-sound/gnomoradio/Manifest b/media-sound/gnomoradio/Manifest
index 3ac45083ab40..bfb93a3530fd 100644
--- a/media-sound/gnomoradio/Manifest
+++ b/media-sound/gnomoradio/Manifest
@@ -1,4 +1,5 @@
+AUX gnomoradio-0.15.1-gcc42.patch 777 RMD160 52e83efd1531dabf108994ef2373e7f12301133f SHA1 975b798d9ec1da148f0c91f63eccd2b6ebd50b35 SHA256 84fabb25196c505dba9d9f17024445d580b356372053d1848df6d612ea02e5da
 DIST gnomoradio-0.15.1.tar.bz2 351723 RMD160 c2258e1c18b5298396949de49c199d44f090a231 SHA1 ff65e32eb08bf2f8e5fbaecec0cb9942e587b38d SHA256 02b6c256fe6877da3831c5e67c1564b16cc9d5ff33ca410baf5dbdb41922e40a
-EBUILD gnomoradio-0.15.1.ebuild 808 RMD160 f8c2ef0cc7bddedf283c3dfb96e8aa6fb8c1fd3d SHA1 2a7b0ba4050b1ac27f1b323986cd65fcb7e81245 SHA256 c8e394b60a2fc2074e6eade5f6cb739cf4816cbf33edcdda7816694900370660
-MISC ChangeLog 2271 RMD160 d6d57dcc92ca281f90f82d94e833586f0d88c54c SHA1 c7c39869f68304d351d677078da0011965b75ed9 SHA256 e0ebe3ec297b310e4969fd41890e2c01fe41397806f256bf4928fa7b4afc32a4
+EBUILD gnomoradio-0.15.1.ebuild 1018 RMD160 958b1b5d101be6c270872ef0e21d591c411ebc64 SHA1 a493321a4a068795c6de503aa133fd7daa6b5a08 SHA256 6632ab8a67f7ae6d48f6af28a681c9f2dd8e9778a53e19b98379cb8a973ac06c
+MISC ChangeLog 2477 RMD160 5859df3c8ab4215ff4364d70409a9cfe695db86b SHA1 b125a864f8185ffb15cef85b78f3b7a68d3001ec SHA256 374fb1e3d12800df6a05b476f00c0b254b9527c87c12976ff7987e1e4ea96892
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc42.patch b/media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc42.patch
new file mode 100644
index 000000000000..0efc60fb868f
--- /dev/null
+++ b/media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc42.patch
@@ -0,0 +1,22 @@
+diff -ur gnomoradio-0.15.1.orig/roboradio/audio/prober.h gnomoradio-0.15.1/roboradio/audio/prober.h
+--- gnomoradio-0.15.1.orig/roboradio/audio/prober.h	2004-10-17 04:40:36.000000000 +0300
++++ gnomoradio-0.15.1/roboradio/audio/prober.h	2008-06-29 14:48:13.000000000 +0300
+@@ -27,6 +27,7 @@
+ {
+ 	namespace Audio
+ 	{
++		gboolean probe (gpointer s);
+ 		class Prober : public Audio
+ 		{
+ 		public:
+diff -ur gnomoradio-0.15.1.orig/roboradio/state.cc gnomoradio-0.15.1/roboradio/state.cc
+--- gnomoradio-0.15.1.orig/roboradio/state.cc	2004-10-24 03:24:34.000000000 +0300
++++ gnomoradio-0.15.1/roboradio/state.cc	2008-06-29 14:48:13.000000000 +0300
+@@ -28,6 +28,7 @@
+ #include <sys/stat.h>
+ #include <dirent.h>
+ #include <iostream>
++#include <cstring>
+ 
+ #include <map>
+ #include <set>
diff --git a/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild b/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild
index 5e0429ff34f9..31125579d139 100644
--- a/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild
+++ b/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild,v 1.8 2008/01/13 16:51:36 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild,v 1.9 2008/06/29 11:55:15 drac Exp $
+
+EAPI=1
+
+inherit eutils
 
 DESCRIPTION="Finds, fetches, shares, and plays freely licensed music."
 HOMEPAGE="http://gnomoradio.org"
@@ -15,12 +19,23 @@ RDEPEND=">=dev-cpp/gtkmm-2.4
 	>=dev-cpp/glibmm-2.4
 	>=dev-cpp/gconfmm-2.6
 	>=dev-cpp/libxmlpp-2.6
-	>=dev-libs/libsigc++-2
+	dev-libs/libsigc++:2
 	media-libs/libao
 	vorbis? ( media-libs/libvorbis )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc42.patch
+}
+
+src_compile() {
+	econf --disable-dependency-tracking $(use_enable vorbis)
+	emake || die "emake failed."
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed."
 	dodoc AUTHORS ChangeLog NEWS README TODO