Fix building with dev-libs/glib >= 2.31 wrt #412473 by "Andrey"

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 54 insertions, 13 deletions

diff --git a/media-sound/volumeicon/ChangeLog b/media-sound/volumeicon/ChangeLog
index c3c22786e86c..6d96913f7ff9 100644
--- a/media-sound/volumeicon/ChangeLog
+++ b/media-sound/volumeicon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/volumeicon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/volumeicon/ChangeLog,v 1.2 2012/01/20 18:30:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/volumeicon/ChangeLog,v 1.3 2012/04/18 08:10:34 ssuominen Exp $
+
+  18 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> volumeicon-0.4.6.ebuild,
+  +files/volumeicon-0.4.6-glib-2.31.patch:
+  Fix building with dev-libs/glib >= 2.31 wrt #412473 by "Andrey"
 
 *volumeicon-0.4.6 (20 Jan 2012)
 
diff --git a/media-sound/volumeicon/Manifest b/media-sound/volumeicon/Manifest
index c12e0e8d6fbc..424810bb256c 100644
--- a/media-sound/volumeicon/Manifest
+++ b/media-sound/volumeicon/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX volumeicon-0.4.6-glib-2.31.patch 649 RMD160 363a1b7d8fb687a7b487c2ff954c56576828835b SHA1 c5660b049ee33910e348c5ca2a35f7d1a0011e15 SHA256 158ebd665cc841cda4e44f4031a700c7923a0909e06f3e69b61f1ca540b1574a
 DIST volumeicon-0.4.5.tar.gz 135671 RMD160 0ad0e1c148d4d984b9c0ac6b1ca1eb1bac301462 SHA1 18225f4a2d8ada2900619469b3976dbf1a38e797 SHA256 96d6b915564e22ebf194260e4370504a73ecbdee98eb8d8a7a87e62b61a960a9
 DIST volumeicon-0.4.6.tar.gz 136769 RMD160 db53b7b307c0ed93ec2371ae53649f79126c607d SHA1 e9f02e80903e0cd0e99aca0f508a150c0f1f501f SHA256 32f94adc5f346404ae564405dd483ae4bd04212df08e46f18d369b4ba2cb6590
 EBUILD volumeicon-0.4.5.ebuild 789 RMD160 0fb1182ccf231991781d0f1c8bf50c0286854cea SHA1 9bcc26ce2d80ecfbef6da4e2821824ef85935d1e SHA256 f3f6b24855150d2f02388d93bd13428fa14b7e238e35aa3c4e91022cd75efa2d
-EBUILD volumeicon-0.4.6.ebuild 787 RMD160 db871553e13b5114106a48266ab06f3986a61ccb SHA1 9b46493cf12336a70ce6e18dc024c0e1655258d4 SHA256 7ebdfe1c1b4a06bfe988bbc7090f71d5f4f8f3b6abeafbaf7ddffb8ff5150d75
-MISC ChangeLog 560 RMD160 da87b34052669c5623e735cbe2c476fca137d3a2 SHA1 e47f313cdbeb86237e3f4debec614ee06a61cb7c SHA256 da5dcf2373bdf0db23070531be1d9196fc7c5f3be11a4671601963f7755b9c05
+EBUILD volumeicon-0.4.6.ebuild 883 RMD160 774eec7761a806676aa7389407f0793738758173 SHA1 ea4d2fff30037783b6ccbc4e691c2c47323eb207 SHA256 8254597c9c05ca1506874f3311bce7018b17934f1776887f74e4363123475e55
+MISC ChangeLog 749 RMD160 eecbbebb7635df8dd2cc200958a2dd04a943d7f8 SHA1 271e82c2d1d6a2190553883aefd1d3869a18597b SHA256 67912b71235fe3ab86ca49744029342a291d97e34263491df1e3359a04949d8b
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPGbI7AAoJEEdUh39IaPFNR1QIAIzHXPq6w0+EAllBQVELXMyM
-AcmVirMQyus4+UExVulK9iPyeJ4jEpNlTWRveCAWzdaIrPxqL+P1tmiHGaGndQpV
-+NJVI2nIUKX0fNDseDPWnv0GDoj5vOVJm7PTfFcMRzYUr/e/Zt9Lzf4mAO8654f7
-FMNiyIML34KhlyNBhY2SjsSFQkEB+Ey5tr+pkHFp2iQ/Lu3bo/DUGTD7bDfN4gYt
-SfZpc3w4fc+KugST9MV4OxCMcws1wL39/hp5LEw8G+D4i7Q59JSBJyA1BgrwVET8
-jyXeoTmE6E2NBbP3CHzFnsKV60pR1Dje7AQdHsgF4iIAXGmPH89ohelICsS8thg=
-=zCU1
+iQEcBAEBAgAGBQJPjnanAAoJEEdUh39IaPFNB/oH/04QibgHuAzgrb9YgeDL42iD
+ywB8aT1ZgkjjnpYptL82UGoZQYbWEzJB0+PPamxSYe0N1AZv5T6lOVgv+Se1tAUe
+IiBoqbbNJ7YvmgQNuH3LJzGXSyl+cDG1L849vhizz2ZPFZh67/X1dmq8j5jhWhmK
+dssGTWcIFS+zul39aO4OW5Gd55u0tD6WAML9MLpnwjTTLV39Bmu00dspkqze/Qbx
+jeduAytJngJfzx5PCE+ODK7lZHX4mpCieF4PUPQ0gBqPY8ExuJ/Q9YP7loInmHkN
+TpQUltOuUC6ouVPRyOXyIjOTJphnEnTAijp7EUP7XZVHfFNd12OpjRhVwABtqgE=
+=d/rv
 -----END PGP SIGNATURE-----
diff --git a/media-sound/volumeicon/files/volumeicon-0.4.6-glib-2.31.patch b/media-sound/volumeicon/files/volumeicon-0.4.6-glib-2.31.patch
new file mode 100644
index 000000000000..6eeda5135f34
--- /dev/null
+++ b/media-sound/volumeicon/files/volumeicon-0.4.6-glib-2.31.patch
@@ -0,0 +1,30 @@
+http://bugs.gentoo.org/412473
+
+--- src/alsa_backend.c
++++ src/alsa_backend.c
+@@ -22,10 +22,8 @@
+ //##############################################################################
+ 
+ #include <alsa/asoundlib.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ #include <glib/gstdio.h>
+-#include <glib/glist.h>
+-#include <glib/giochannel.h>
+ 
+ #include "alsa_backend.h"
+ 
+--- src/oss_backend.c
++++ src/oss_backend.c
+@@ -26,10 +26,8 @@
+ #include <fcntl.h>
+ #include <assert.h>
+ #include <stdlib.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ #include <glib/gstdio.h>
+-#include <glib/glist.h>
+-#include <glib/giochannel.h>
+ 
+ #include "oss_backend.h"
+ 
diff --git a/media-sound/volumeicon/volumeicon-0.4.6.ebuild b/media-sound/volumeicon/volumeicon-0.4.6.ebuild
index f306a2183c31..a9eeb789fba2 100644
--- a/media-sound/volumeicon/volumeicon-0.4.6.ebuild
+++ b/media-sound/volumeicon/volumeicon-0.4.6.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/volumeicon/volumeicon-0.4.6.ebuild,v 1.1 2012/01/20 18:30:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/volumeicon/volumeicon-0.4.6.ebuild,v 1.2 2012/04/18 08:10:34 ssuominen Exp $
 
 EAPI=4
+inherit eutils
 
 DESCRIPTION="A lightweight volume control that sits in your systray"
 HOMEPAGE="http://softwarebakery.com/maato/volumeicon.html"
@@ -13,7 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="alsa libnotify"
 
-RDEPEND=">=x11-libs/gtk+-2.16:2
+RDEPEND=">=dev-libs/glib-2
+	>=x11-libs/gtk+-2.16:2
 	x11-libs/libX11
 	alsa? ( media-libs/alsa-lib )
 	libnotify? ( >=x11-libs/libnotify-0.7 )"
@@ -22,6 +24,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog )
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glib-2.31.patch
+}
+
 src_configure() {
 	econf \
 		$(use_enable !alsa oss) \