Let it compile against glib-2.32

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 73 insertions, 22 deletions

diff --git a/media-sound/gnomoradio/ChangeLog b/media-sound/gnomoradio/ChangeLog
index 4a3dcdd84c87..60ff057d82e5 100644
--- a/media-sound/gnomoradio/ChangeLog
+++ b/media-sound/gnomoradio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/gnomoradio
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomoradio/ChangeLog,v 1.23 2012/05/05 09:02:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomoradio/ChangeLog,v 1.24 2012/07/21 14:43:47 pacho Exp $
+
+  21 Jul 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/gnomoradio-0.15.1-glib-single-include.patch, gnomoradio-0.15.1.ebuild:
+  Let it compile against glib-2.32
 
   05 May 2012; Michał Górny <mgorny@gentoo.org> gnomoradio-0.15.1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
@@ -89,4 +93,3 @@
   +gnomoradio-0.11.2.ebuild:
   Initial Import. Closes #37527.
   Thanks to mattgerg@users.sourceforge.net for the initial ebuild.
-
diff --git a/media-sound/gnomoradio/Manifest b/media-sound/gnomoradio/Manifest
index 64f3568a7503..4207ce4d8e97 100644
--- a/media-sound/gnomoradio/Manifest
+++ b/media-sound/gnomoradio/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gnomoradio-0.15.1-gcc42.patch 777 RMD160 52e83efd1531dabf108994ef2373e7f12301133f SHA1 975b798d9ec1da148f0c91f63eccd2b6ebd50b35 SHA256 84fabb25196c505dba9d9f17024445d580b356372053d1848df6d612ea02e5da
-AUX gnomoradio-0.15.1-gcc43.patch 3237 RMD160 b940282c60e17281b8db033273827da91b61067e SHA1 cfe07c2317b54c1e5cb05c6b0cdeb47586522382 SHA256 98c23c27cee966d11e34c08064744e0e3134acf9facb61322b8da5e8f3eb983e
-AUX gnomoradio-0.15.1-lm.patch 487 RMD160 cc4a71b80e07ab518daae2b8ad033cbc84f1f3f7 SHA1 6646f4e3828fbae67c1f97644a0aa9a9939ce39b SHA256 abcdcbe0cee2cfac581a708570771f3eb5af9a09e931f2aa92af382acbac4b94
-DIST gnomoradio-0.15.1.tar.bz2 351723 RMD160 c2258e1c18b5298396949de49c199d44f090a231 SHA1 ff65e32eb08bf2f8e5fbaecec0cb9942e587b38d SHA256 02b6c256fe6877da3831c5e67c1564b16cc9d5ff33ca410baf5dbdb41922e40a
-EBUILD gnomoradio-0.15.1.ebuild 1057 RMD160 8034d93ea76c0394c2f39b9737d59650d160150e SHA1 12b014fdcb1b044ee3efc32bbb7426250dccc997 SHA256 ff71e67d7399487e7a4bcbc707c0abb8378098eaed49a216f410257c92a31a97
-MISC ChangeLog 3026 RMD160 3f761cd080406e3ebe1c3375df6297a57a75195e SHA1 96d3399fa626c74fd6b223aa253ec1b4d7c7e81a SHA256 56917c5141dee280f8246fc9d5edfd41a691202118702e77faecf09ccec13701
-MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+AUX gnomoradio-0.15.1-gcc42.patch 777 SHA256 84fabb25196c505dba9d9f17024445d580b356372053d1848df6d612ea02e5da SHA512 96cc0296fb6fae7a733bdb650497389516e092a9d64e22493e75fa8e3881b1512d32fea19fb575206efb4388e143a414760b58afae4572918d9fa88301e93c5a WHIRLPOOL 373f458c694876f0dd512f88ec3faf64ad2bedbe699aa5e3118a8f367088dec99a8ea5124927986c5be31fad78de223264ed42c94e3da4ca5e0de84fd57aec2b
+AUX gnomoradio-0.15.1-gcc43.patch 3237 SHA256 98c23c27cee966d11e34c08064744e0e3134acf9facb61322b8da5e8f3eb983e SHA512 6057b8c310ab91b062a5d0d7ffd55ee687f6e8f7f068bae3cadfb817b0adf67c72499322be012d1bc92323864b8cd161a5719efd3cf37a91d45e81f2507be3e7 WHIRLPOOL 00b264204df020ccba4d92ba115c481eadeefd26b659414a6edaf5ac778dedff24d8f8f24d9becb7ea2be2eb9e18787c30d5e23234bcca0fa68db21124f2862c
+AUX gnomoradio-0.15.1-glib-single-include.patch 1476 SHA256 a99dcc2d6b5c70efd00a49828bd25b169edd634b66f4198eb0bcc60dd1696854 SHA512 22fa0290deed72ba7e7d25f41157420ce0cd9cbc181f8a38b96fdd1a2d5b685f58d0b9036ce5d186fbe5a6aa6775a2537ebf5b2a4a0a6c53ed5db39eed0e5924 WHIRLPOOL 9cac9b4360abe6e5ad13b682802f3b9e6733a1f126504515e7a5d528555295a71be67ad1aeacd01963c43ef03773b3d97cc90029940a81aa708eae4156894459
+AUX gnomoradio-0.15.1-lm.patch 487 SHA256 abcdcbe0cee2cfac581a708570771f3eb5af9a09e931f2aa92af382acbac4b94 SHA512 7da91419d083d2bd3b0563aa6c7d5fff4bef232e3dfabdee8decc43c3f727d06400cf6b87e0f50ae7c1216da83f6a4b2cabfee8094bf4c1d860bdf8387826227 WHIRLPOOL 5881163835245114f9dc7099052806ab20861f20c1326456cdc3667089d5eac25563db6e51b3b801ac03675df91007ab045fe36a619c46e3df3305212f23b283
+DIST gnomoradio-0.15.1.tar.bz2 351723 SHA256 02b6c256fe6877da3831c5e67c1564b16cc9d5ff33ca410baf5dbdb41922e40a SHA512 7e9fc70054e3966e1bd6af9451c4c6eb0cd1018e422f767589ca2e86b08e2f74c520b9a9a4bd09a12ce76f4d7b7e545ac61601472ffa1818209182b026f9f882 WHIRLPOOL 7d070ee0ceac35a0432f4b690353ab5d91da37b3202e203fea7f37e55e1ae383a4c4c3415f00633677121d7974cfaf11bdbfbdaa5c7b740c608103313510c73b
+EBUILD gnomoradio-0.15.1.ebuild 984 SHA256 da3285d475e03964576210d78672ecddc1553d7a76edde18cd44dbd14e974cb8 SHA512 3574d3b0ff81476bc92835e47c694b41933303b243ec20c1861376fbd710c57816419a6613a8c70ffab31e6b728584e4838f7673bdc39f6d0ee0b1db84935cc3 WHIRLPOOL b521087030f0fd7847996de83b5c048e3dab57bc27cf224ab7e12c9aa0744525030b9a31a7a595bbea2c0df9fab9c41f2c5bbcb768961876dd3cf315e7a91849
+MISC ChangeLog 3186 SHA256 b0b0f9564934355d673c02887691ccc3302a718b25b5456021ae9a450fc0579c SHA512 5a503ba7586eeb92479d57c72a7af1194364dd1a5e84871c982ca0fcda516443807230b80b719457128e8e96b32095e52ed369fa3fe1aa431563fb38bea5bed3 WHIRLPOOL 45712af0270f84647c6a17c9b60f158e418a535266eb638c50c346e50301530d40e8a2609e3ca14ee987d0ec6383abf87361e24b9c610a61273a258b4183443d
+MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk+k7MsACgkQfXuS5UK5QB2/hAP/ew1PwFLqxHH59edusOY6LuQy
-JEC/twb5SdK74CMXMcbHvXROWJk4TVreJD5/L9nXj+/1G1tVVXp5lsrgBVcLXkBI
-NctEiAVeVMwBOSKpEpEra9LxIzJ01Nbfbf3wnskQ4JlPM5E7r9fes8k4S0wKbQKB
-YreLaRG0z6e6uNHgh3M=
-=x7K/
+iEYEAREIAAYFAlAKwCgACgkQCaWpQKGI+9TZ5wCfV7+kGORFZWYwKdknSU5zvkX9
+uBkAn1m9r/BT/HUzlaJGZEPb60cFTAVl
+=uMdf
 -----END PGP SIGNATURE-----
diff --git a/media-sound/gnomoradio/files/gnomoradio-0.15.1-glib-single-include.patch b/media-sound/gnomoradio/files/gnomoradio-0.15.1-glib-single-include.patch
new file mode 100644
index 000000000000..168872e57cae
--- /dev/null
+++ b/media-sound/gnomoradio/files/gnomoradio-0.15.1-glib-single-include.patch
@@ -0,0 +1,53 @@
+Index: gnomoradio-0.15.1/roboradio/mp3/common.c
+===================================================================
+--- gnomoradio-0.15.1.orig/roboradio/mp3/common.c
++++ gnomoradio-0.15.1/roboradio/mp3/common.c
+@@ -19,7 +19,7 @@
+ #include "id3.h"
+ #include "id3_header.h"
+ 
+-#include <glib/gmem.h>
++#include <glib.h>
+ 
+ /* max = 1728 */
+ #define MAXFRAMESIZE 1792
+Index: gnomoradio-0.15.1/roboradio/mp3/esd-audio.c
+===================================================================
+--- gnomoradio-0.15.1.orig/roboradio/mp3/esd-audio.c
++++ gnomoradio-0.15.1/roboradio/mp3/esd-audio.c
+@@ -2,8 +2,7 @@
+ #include <config.h>
+ #include "esd-audio.h"
+ 
+-#include <glib/gmem.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <pthread.h>
+ #include <stdlib.h>
+ #include <string.h>
+Index: gnomoradio-0.15.1/roboradio/mp3/esd-audio.h
+===================================================================
+--- gnomoradio-0.15.1.orig/roboradio/mp3/esd-audio.h
++++ gnomoradio-0.15.1/roboradio/mp3/esd-audio.h
+@@ -1,7 +1,7 @@
+ #ifndef ESD_AUDIO_H
+ #define ESD_AUDIO_H
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #define N_(string) string
+ 
+Index: gnomoradio-0.15.1/roboradio/mp3/id3.h
+===================================================================
+--- gnomoradio-0.15.1.orig/roboradio/mp3/id3.h
++++ gnomoradio-0.15.1/roboradio/mp3/id3.h
+@@ -28,7 +28,7 @@
+ #ifndef ID3_H
+ #define ID3_H
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ /*
+  * Option flags to id3_open_*().
diff --git a/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild b/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild
index 26a507bf315b..173611191499 100644
--- a/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild
+++ b/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 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.13 2012/05/05 09:02:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild,v 1.14 2012/07/21 14:43:47 pacho Exp $
 
-EAPI=2
+EAPI=4
 inherit autotools eutils
 
 DESCRIPTION="Finds, fetches, shares, and plays freely licensed music."
@@ -27,7 +27,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc42.patch \
 		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-lm.patch
+		"${FILESDIR}"/${P}-lm.patch \
+		"${FILESDIR}"/${P}-glib-single-include.patch
 	eautoreconf
 }
 
@@ -36,8 +37,3 @@ src_configure() {
 		--disable-dependency-tracking \
 		$(use_enable vorbis)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}