4 files changed, 168 insertions, 12 deletions
diff --git a/media-sound/neutrino/ChangeLog b/media-sound/neutrino/ChangeLog
index de6029f43ab2..4198e20f6679 100644
--- a/media-sound/neutrino/ChangeLog
+++ b/media-sound/neutrino/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/neutrino
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/neutrino/ChangeLog,v 1.5 2012/05/05 08:44:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/neutrino/ChangeLog,v 1.6 2012/07/21 14:30:22 pacho Exp $
+
+  21 Jul 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/neutrino-0.8.4-glib-single-include.patch, neutrino-0.8.4.ebuild:
+  Let it compile against glib-2.32
 
   05 May 2012; Michał Górny <mgorny@gentoo.org> neutrino-0.8.4.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
@@ -22,4 +26,3 @@
   30 Jul 2005; Tony Vroon <chainsaw@gentoo.org> +metadata.xml,
   +neutrino-0.8.3.ebuild:
   Initial commit, closes bug #65162.
-
diff --git a/media-sound/neutrino/Manifest b/media-sound/neutrino/Manifest
index a5fb4f6123b7..021d4f1886c3 100644
--- a/media-sound/neutrino/Manifest
+++ b/media-sound/neutrino/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST neutrino-0.8.4.tar.gz 497660 RMD160 ef747adb1bf6bdc83ced41af91d015920ba07d08 SHA1 9ca669797765517a55a3b4f380ebbcb79973bcc1 SHA256 8a5bb9634ff0fa618a13b6160a0527a86c68cc71dac751c8401190f55bcbdfff
-EBUILD neutrino-0.8.4.ebuild 811 RMD160 e7e4d3e4f8c63712b6567be86e003f4b917a3d56 SHA1 67fba3aefc804f994cfffa80305031b59f2565cc SHA256 f3327959b931ad91ad0e454972cd600773f2d40d275428fbbbdcd76faea8f2c0
-MISC ChangeLog 908 RMD160 e6af7df43f28607efa708ff6b6a0b30d22f186df SHA1 56227327aacd30cba4658e57474c3c94f0b7e854 SHA256 52b7027fa2ec6fe6e0eecdfce98c17c82572fc5b29365af46c1c927bdd0b0eff
-MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6
+AUX neutrino-0.8.4-glib-single-include.patch 3846 SHA256 fe459b9f80a5934fd085c45c98aaf2316c9148bdfaae1d27de6de34248500d02 SHA512 ea51b856120c06b70f81779fb82aaf0c53867fc2654e46815b8cc08fa7d7deaef54a5ea51231dc1053febe97aaab92783c11cddc0a55faf013c86a344f161d5f WHIRLPOOL 6da6d7521e5444de24776352b58c4aed05b496fc5fd1e9e58a066661534a4975e4e19b948214d641be57d54c6b5edb27e4b54492d97c7b24087e679a7dae46e8
+DIST neutrino-0.8.4.tar.gz 497660 SHA256 8a5bb9634ff0fa618a13b6160a0527a86c68cc71dac751c8401190f55bcbdfff SHA512 f36cc682e59565f0d3e64068a20d51396d824db8f65654d3ff0727d7e107f71a0f9590f78b220716caa8e67edb91aa234894f4b656a3dce60aab5cd950cff0c8 WHIRLPOOL dbd14a650e60f9172bd041b8fdb9459e50941749b6fa8fb999c1101119407c25a7aa9667359e74bf93f295ed8c4676192853fd737b9f559aaca5aed143f48a19
+EBUILD neutrino-0.8.4.ebuild 916 SHA256 dcff79b2a46706beeac96d017f225fe357616e6416ee25e6e732e5ebd3abde94 SHA512 9c02b479ed0721f6ddc2d12313b6187ed36a81a2cf75d7818ce860a74c7d46d3c3ad12bbdd33af356aae5c678dff9bdea0320620af940b6859a6446291c22b5a WHIRLPOOL 4af73dfd1fdc6f224877d7574c800d2ac58c49acc791eab66eae2bf7583e8782296e31aab5e61161ed2bf966ae184f7a882e3e2201240228ee7e44eb8e209160
+MISC ChangeLog 1062 SHA256 714cfeda81af310c4e531a028d8088a8e017a63684db1cd7e312b6ba58831e93 SHA512 fb38310db94a6d59c5dbd26965b309808cb24e1a677f69b1427b1b3086f48b52a1cb5c9d94edbb57bb68e147c852bd0f3ae7d19f0f51c9fdaab8628c4a619a1f WHIRLPOOL e3c7831e1e06f735a0c28e100b475c0821734bcea072b611f6efde0dae86e96fe989fe5947309557d41c21b9117b6eb2a67ea06e4465e07be237ef6fe5eed713
+MISC metadata.xml 248 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6 SHA512 5e97862d30cdb28f6d60e66d270cb4d55a4086651645209ceb0de63d4882730a651832dae8867230cf3e185c91eafe1183435e8e32bcc0be9f4c0f3aba006f3d WHIRLPOOL e15bcbb8cb8943e2e3d27fbe1d6fa5e3f136bc363ae8fc75889c9bdb3c17c5c57f0db90c5691716cea862b25203fbad09d7f4267c980524a2ed4076654d75ecc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk+k6IEACgkQfXuS5UK5QB3CbwQApJ0ebqOlkftbrrTUy01T+sTJ
-/dkox7xy1oXCXKXN8Zj6su8Vu+XuEfhojTb6Nzb0xxMujqGPSb6YDonFIO2t2LYs
-PRrZTr5MOYKpVQxyw72oeV2Od7DPH3FVC+IIpYeyrMjhVQ7Pfs6M0ShQBA9LOD9L
-sxKrn55Y5tBgVXaj2uU=
-=QbgR
+iEYEAREIAAYFAlAKvQMACgkQCaWpQKGI+9TS6wCdHfwktGxD2Mluws4x2Tgs9MtY
+eCwAn0y/5FeqXDVtQYno74jRgb8CZELv
+=TUC6
 -----END PGP SIGNATURE-----
diff --git a/media-sound/neutrino/files/neutrino-0.8.4-glib-single-include.patch b/media-sound/neutrino/files/neutrino-0.8.4-glib-single-include.patch
new file mode 100644
index 000000000000..1d2558dc9313
--- /dev/null
+++ b/media-sound/neutrino/files/neutrino-0.8.4-glib-single-include.patch
@@ -0,0 +1,148 @@
+Index: neutrino-0.8.4/id3/nomad-id3-util.c
+===================================================================
+--- neutrino-0.8.4.orig/id3/nomad-id3-util.c
++++ neutrino-0.8.4/id3/nomad-id3-util.c
+@@ -26,15 +26,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-#include <glib/gconvert.h>
+-#include <glib/gunicode.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ 
+ #ifndef HAVE_GNOME_VFS
+ 
+-#include <glib/gfileutils.h>
+-#include <glib/gdir.h>
+ 
+ #include <sys/stat.h>
+ #include <sys/types.h>
+Index: neutrino-0.8.4/id3/nomad-id3.c
+===================================================================
+--- neutrino-0.8.4.orig/id3/nomad-id3.c
++++ neutrino-0.8.4/id3/nomad-id3.c
+@@ -30,10 +30,8 @@
+ #include <libgnomevfs/gnome-vfs-file-info.h>
+ #endif
+ 
+-#include <glib/gconvert.h>
+-#include <glib/gunicode.h>
++#include <glib.h>
+ 
+-#include <glib/gtypes.h>
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+Index: neutrino-0.8.4/libnomad/nomad-jukebox.c
+===================================================================
+--- neutrino-0.8.4.orig/libnomad/nomad-jukebox.c
++++ neutrino-0.8.4/libnomad/nomad-jukebox.c
+@@ -27,8 +27,7 @@
+ 
+ #include <string.h>
+ 
+-#include <glib/gqueue.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ 
+ #include <semaphore.h>
+ 
+Index: neutrino-0.8.4/libnomad/nomad-util.c
+===================================================================
+--- neutrino-0.8.4.orig/libnomad/nomad-util.c
++++ neutrino-0.8.4/libnomad/nomad-util.c
+@@ -31,15 +31,10 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
+-#include <glib/gconvert.h>
+-#include <glib/gunicode.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ 
+ #ifndef HAVE_GNOME_VFS
+ 
+-#include <glib/gfileutils.h>
+-#include <glib/gdir.h>
+ 
+ #include <sys/stat.h>
+ #include <sys/types.h>
+Index: neutrino-0.8.4/src/neutrino-file-browser.c
+===================================================================
+--- neutrino-0.8.4.orig/src/neutrino-file-browser.c
++++ neutrino-0.8.4/src/neutrino-file-browser.c
+@@ -25,9 +25,7 @@
+ 
+ #include <config.h>
+ 
+-#include <glib/gutils.h>
+-#include <glib/ghash.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ 
+ #include <libgnomevfs/gnome-vfs-mime-handlers.h>
+ #include <libgnomevfs/gnome-vfs-mime-utils.h>
+Index: neutrino-0.8.4/src/neutrino-jukebox-view.c
+===================================================================
+--- neutrino-0.8.4.orig/src/neutrino-jukebox-view.c
++++ neutrino-0.8.4/src/neutrino-jukebox-view.c
+@@ -27,7 +27,7 @@
+ 
+ #include <gdk/gdk.h>
+ 
+-#include <glib/gmarkup.h>
++#include <glib.h>
+ 
+ #include <string.h>
+ 
+Index: neutrino-0.8.4/src/neutrino-util.c
+===================================================================
+--- neutrino-0.8.4.orig/src/neutrino-util.c
++++ neutrino-0.8.4/src/neutrino-util.c
+@@ -26,16 +26,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-#include <glib/gconvert.h>
+-#include <glib/gunicode.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ #include <gtk/gtkwidget.h>
+ 
+ #ifndef HAVE_GNOME_VFS
+ 
+-#include <glib/gfileutils.h>
+-#include <glib/gdir.h>
+ 
+ #include <sys/stat.h>
+ #include <sys/types.h>
+Index: neutrino-0.8.4/src/neutrino-wav.c
+===================================================================
+--- neutrino-0.8.4.orig/src/neutrino-wav.c
++++ neutrino-0.8.4/src/neutrino-wav.c
+@@ -28,7 +28,7 @@
+ #include <libgnomevfs/gnome-vfs-ops.h>
+ #endif
+ 
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ 
+ #include <libnjb.h>
+ 
+Index: neutrino-0.8.4/src/neutrino-window.c
+===================================================================
+--- neutrino-0.8.4.orig/src/neutrino-window.c
++++ neutrino-0.8.4/src/neutrino-window.c
+@@ -34,7 +34,7 @@
+ #include <libgnomevfs/gnome-vfs-mime-handlers.h>
+ #include <libgnomevfs/gnome-vfs-utils.h>
+ 
+-#include <glib/grand.h>
++#include <glib.h>
+ 
+ #include <gtk/gtk.h>
+ 
diff --git a/media-sound/neutrino/neutrino-0.8.4.ebuild b/media-sound/neutrino/neutrino-0.8.4.ebuild
index d5fbdbcfd9aa..660edb9280ab 100644
--- a/media-sound/neutrino/neutrino-0.8.4.ebuild
+++ b/media-sound/neutrino/neutrino-0.8.4.ebuild
@@ -1,7 +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/neutrino/neutrino-0.8.4.ebuild,v 1.2 2012/05/05 08:44:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/neutrino/neutrino-0.8.4.ebuild,v 1.3 2012/07/21 14:30:22 pacho Exp $
 
+EAPI=4
 inherit gnome2
 
 DESCRIPTION="A GNOME application to manage Creative music players using the PDE protocol"
@@ -27,3 +28,8 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog README TODO"
 MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.8.4-glib-single-include.patch"
+	gnome2_src_prepare
+}