Build with glib-2.32. Bug #423641

Package-Manager: portage-2.1.11.2/cvs/Linux i686

5 files changed, 27 insertions, 23 deletions

diff --git a/games-arcade/performous/ChangeLog b/games-arcade/performous/ChangeLog
index 396ed7169966..65a07a96179f 100644
--- a/games-arcade/performous/ChangeLog
+++ b/games-arcade/performous/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-arcade/performous
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/ChangeLog,v 1.8 2012/05/16 12:02:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/ChangeLog,v 1.9 2012/06/28 06:29:33 tupone Exp $
+
+  28 Jun 2012; Tupone Alfredo <tupone@gentoo.org> performous-0.6.1.ebuild,
+  +files/performous-0.6.1-glib232.patch, metadata.xml:
+  Build with glib-2.32. Bug #423641 by flameeyes@gentoo.org
+  Replacing me as maintainer with the games herd 
 
   16 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
   +files/performous-0.6.1-libav.patch, performous-0.6.1.ebuild:
diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest
index 1cf31dcf7bff..be3ad4c444a4 100644
--- a/games-arcade/performous/Manifest
+++ b/games-arcade/performous/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX performous-0.6.1-ffmpeg.patch 795 RMD160 3ee572e484d960632c954e461e8131c0b69a703a SHA1 b78c3cbcd16b83581f75e86740e2d3cef8dd9599 SHA256 5d3eb46478096b15f982af3ed12bb6d00cb46011a5eb6435a333da4d2bb29399
 AUX performous-0.6.1-gentoo.patch 1445 RMD160 02b13db8ea0581d8d499e2f6e1a6b65fee6a914f SHA1 5bbc0fd310a7d0c42ae52ccb73ae4495b30e0ddd SHA256 82d8bfcf56a0c495e51130817dbe3d327a2fc86ca3d1a5887ee890dcf543897f
+AUX performous-0.6.1-glib232.patch 268 RMD160 c5caa8629de99848deb61e2b33de19fb2290dc23 SHA1 25b4198ee7c55706ced4b216cb08882c80f943d6 SHA256 265da520ab6d02bd23bf7dba35ff75a6fbc9d3e7a76b719da0c4399b443ddca7
 AUX performous-0.6.1-libav.patch 2038 RMD160 1d01fb1758af188d939dca3b04daf012db8c5dea SHA1 08d549a388d705fafc489848a70393d2556fda07 SHA256 f0aa4df47ddd2e7f0725f06cc345a84787b6b1b0ee9c607bd3e80c71f04bdad1
 AUX performous-0.6.1-libpng.patch 678 RMD160 190b21b91c1875f140c02aa6be47b13909578d7e SHA1 bfecb26b58a600d8e8ad3abc0547456cc8b6abce SHA256 0c60e3d3ce1b05d5a64642f697dc81489f9f22eb7f55c15fe509d61d0d155d22
 AUX performous-0.6.1-linguas.patch 833 RMD160 f1ad8751081ab6874c6c40f53789ac4d8358bfab SHA1 9d9da6d0d1e5dcb8fa9e4ab5dc84916e9f3c919a SHA256 52efe542b46c6b6f436d97d7ae567c8f6012586dc20d9ea5840e37561fa3811d
@@ -11,23 +12,13 @@ DIST ultrastar-songs-jc-1.zip 242698201 RMD160 b541ad7df65a9280d1f5eb8b9891083ff
 DIST ultrastar-songs-libre-3.zip 5289866 RMD160 98e9c4ab2364c1c26cb0f51e61c4026f43199868 SHA1 10add8daf1767671eb8b7d10927e93ea5ab73d5f SHA256 739d1c678bb7c786499f5216faee420b9b56633142928aff60a7282dae755489
 DIST ultrastar-songs-restricted-3.zip 10242651 RMD160 7eb59b4db7968097db8f850f475e32a9ecbab889 SHA1 fd4e373104df543e44e273d294c39bd7baf6923b SHA256 e05d81333f85e2c6c271a67f90beac453d64eac78cd95eec7214721182257a82
 DIST ultrastar-songs-shearer-1.zip 50411551 RMD160 20ea920aa05c489903988bf31edff467012d4921 SHA1 49d64f914cfd77cc39dcaa14b00a5b4c5df3f112 SHA256 967c3dfae2da2915a66fd9dfee14da7191e13bb95e8b0820049d109c21f25628
-EBUILD performous-0.6.1.ebuild 2614 RMD160 c301dc5ba3415a222fcd90c3ad32dfc7e1d097da SHA1 c86abe0327f8eedc249a651a433a3d3fd5e0e13a SHA256 41637cf6ad03086e2f51eebde11e818f6aae52e1781ef12b2a55a6316a7c5b58
-MISC ChangeLog 1498 RMD160 9d7f944d3d77f19f21cc5360ce7b118b3568db71 SHA1 29e8c0b5bf26a69db3e8ca52e420e09639e7afd5 SHA256 bb4f734bdccb072a4789119eebeac9ec5fece5869ef82bc876e7f622ddc75db8
-MISC metadata.xml 536 RMD160 bcab16517c7f86266852d25efc7c79d527d54a48 SHA1 67ea3ae7852fca041a3ac5c9504224eb6a08d74a SHA256 316340057c29f5114bca4fef85389999055165713cd5ee32c957f5804d65e063
+EBUILD performous-0.6.1.ebuild 2645 RMD160 6d03103df3fd26535f6615952c7b83297ca009f8 SHA1 36cb0b0cc39350ab353167414dce21fd31387e7b SHA256 b5b942b4e9ad187d36474664172c924248b148e77f9ae505b8e940d8185ef42a
+MISC ChangeLog 1736 RMD160 e4dc81d492002cb086aa56d1d1277d1c5b602422 SHA1 2bcaa1c5264608ef6cfb7764e323dd2f3e34666c SHA256 21a1e71ff763fe4e150b58871ca4f864b88c178ed3aa6b8f885b75d9fff65bfc
+MISC metadata.xml 462 RMD160 94479ef051c86faac980c406eaa1f71d436e64ad SHA1 82d50c2e20dfc32b36383916a9758a7863f22135 SHA256 58703292296a89760bd19edb9d2e020dd6a1428fa555111372b446f0fdd1691f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPs5eDAAoJEOSiRoyO7jvoH6oP/1H6ukSYIDLn0rfjWXrxSp56
-2GW+rMaZZ4GKpAy1OHaZZiHRoTwo7OwCoLZCg7XwPBa8ae3zeLgkpD9VtTivzcJK
-YH38ToiUT4dzWZIZtmgjOkd5MbjTwWsdoOui/Ia7x6VboLGBiqbePCR5cirNTuLl
-YVt/1XF8Jc9lYUoerIn6VGd9AxZ769GEAsDNuo7DgIBMznqnobTiRYlXFbL4rOvO
-6XmKQYnTX/HEU72crMJlBwDY/sry09rP7o4Jp2FIOGjfcgZQ0l0eByWA6Ld5fzr2
-ZSAJC/c7NoOPZH/xxfjt6ASFcrfWSGw78Jv2iAG1sdiU0yvdcyDqb5J+2WoyoKYh
-nCmBdnrksc2u4TeVyTm0TSs6i466kWEcwQ3KwE9au9XKo0CVZ2mEo5rfq2mqwvPV
-8PILHHjsCB24AHVJCyUNxmGLvlGZjhjNXzlP+e4T5IcLkLX+67fovEFgd8Dkk4+L
-odsi60oLwnsgKw/WPaVQej3y9sd8rqV+wR4IwEKa9TRbpwMoQXDjY0kBJ2xMDhux
-mLLL6nbSswNi8I6CMRn4XFR7hJtBbSACuQluYfl+yVfxLfxSt25xueAie1VBrrBF
-uhUlaaX+L9vDd7/ItmECvuCwwwasdjWPOzLVE1ubcVTKRNy2Ws9VnxjThMZYynVm
-6pLVK3FDk5ljucb6m81K
-=7+oV
+iEYEARECAAYFAk/r+dkACgkQIY77eQFFFC21/ACg17fkwMJESep75s/pS+UPjw+g
+jOoAoKZ/+0q2FKsHhrKJVSRNM4BT5Pao
+=hS+Z
 -----END PGP SIGNATURE-----
diff --git a/games-arcade/performous/files/performous-0.6.1-glib232.patch b/games-arcade/performous/files/performous-0.6.1-glib232.patch
new file mode 100644
index 000000000000..f69d52253fe4
--- /dev/null
+++ b/games-arcade/performous/files/performous-0.6.1-glib232.patch
@@ -0,0 +1,10 @@
+--- game/unicode.cc.old	2012-06-27 13:34:43.485706157 +0200
++++ game/unicode.cc	2012-06-27 13:34:56.825769500 +0200
+@@ -2,7 +2,6 @@
+ 
+ #include <boost/scoped_ptr.hpp>
+ #include <glibmm/ustring.h>
+-#include <glib/gconvert.h>
+ #include <sstream>
+ #include <stdexcept>
+ 
diff --git a/games-arcade/performous/metadata.xml b/games-arcade/performous/metadata.xml
index 7b9492fcc181..06363fb36f77 100644
--- a/games-arcade/performous/metadata.xml
+++ b/games-arcade/performous/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>tupone@gentoo.org</email>
-		<name>Tupone Alfredo</name>
-	</maintainer>
+	<herd>games</herd>
 	<longdescription lang="en">
 		Performous is an open-source rhythm/performance platform that contains singing, guitar/bass playing, drumming and dancing all in one game.
 	</longdescription>
diff --git a/games-arcade/performous/performous-0.6.1.ebuild b/games-arcade/performous/performous-0.6.1.ebuild
index c4c24225677f..eb73007dd087 100644
--- a/games-arcade/performous/performous-0.6.1.ebuild
+++ b/games-arcade/performous/performous-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/performous-0.6.1.ebuild,v 1.8 2012/05/16 12:02:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/performous-0.6.1.ebuild,v 1.9 2012/06/28 06:29:33 tupone Exp $
 
 EAPI="3"
 
@@ -59,6 +59,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-libpng.patch
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-linguas.patch
+	"${FILESDIR}"/${P}-glib232.patch
 )
 
 src_prepare() {