Version bump. Add a patch from upstream to fix build with GCC 4.7, wrt bug #423337.

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

4 files changed, 89 insertions, 19 deletions

diff --git a/media-libs/gluon/ChangeLog b/media-libs/gluon/ChangeLog
index 3457068b1c30..52ea17535857 100644
--- a/media-libs/gluon/ChangeLog
+++ b/media-libs/gluon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/gluon
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gluon/ChangeLog,v 1.3 2011/10/28 23:53:45 abcd Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gluon/ChangeLog,v 1.4 2012/06/24 17:13:48 kensington Exp $
+
+*gluon-0.71.0 (24 Jun 2012)
+
+  24 Jun 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/gluon-0.71.0-gcc-4.7.patch, +gluon-0.71.0.ebuild:
+  Version bump. Add a patch from upstream to fix build with GCC 4.7, wrt bug
+  #423337.
 
   28 Oct 2011; Jonathan Callen <abcd@gentoo.org> gluon-0.70.0.ebuild:
   Bump to EAPI=4
@@ -13,4 +20,3 @@
   06 Jun 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   +gluon-0.70.0.ebuild, +metadata.xml:
   [media-libs/gluon] Initial import to the tree of the first alpha release.
-
diff --git a/media-libs/gluon/Manifest b/media-libs/gluon/Manifest
index f7757475ded1..9651d5531fb2 100644
--- a/media-libs/gluon/Manifest
+++ b/media-libs/gluon/Manifest
@@ -1,24 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX gluon-0.71.0-gcc-4.7.patch 780 RMD160 1647b4c5449f9f33ff9db4acea31b6f766a94747 SHA1 a5170b1e5c3fba3c8575872b8782e4beca977db6 SHA256 a7b1b29bba06a7a341c1b90fc5e27b46b2bfbd6265eb8e004a87a787dd81ae02
 DIST gluon-0.70.0.tar.gz 8234641 RMD160 9988dcc7a4ac55a54fb1d71db2e579264e4b8866 SHA1 41fbfcb6118b7e7839e35f9fda44bbf9524aeaf9 SHA256 952a0012de51086075560930305a2897b8bb889aa4bb925ac637c12abd1ce84a
+DIST gluon-0.71.0.tar.gz 14739398 RMD160 324bff3c19eebd05d2e50facd9a20820ae96b097 SHA1 e6cb829bff998b38d8c97ccc810342adcf5e667a SHA256 76d1c43eac52563541e0502d50450ddb5c2d1841b882f5f652202ff0ebd21ab3
 EBUILD gluon-0.70.0.ebuild 961 RMD160 7339baa036409f8874cb0313f0feb4f2661e397a SHA1 5201199f8105369a21135ae19ff0159508f41e8a SHA256 77021efe49242bbb69e1f904f7551c300c8f5b376ac317402b40d0d862675f58
-MISC ChangeLog 604 RMD160 d5e0afbf9347790f63730a4b4899d36b31c302dd SHA1 7f6d2f7cea29e6bbc22061d9e26140ea780743b7 SHA256 226bb976ecafe259274eb0eee3b98bfab0dda9088895a748af426f390426b8e8
+EBUILD gluon-0.71.0.ebuild 889 RMD160 eaeef8264b6cce98dc5f59ede46055cb5ace0116 SHA1 257a9287ed4db19eebceb3f8901102067144469a SHA256 6fb46627cf3744a7aa9625e176d40262cf57ed041edae36262b745a10961caf7
+MISC ChangeLog 842 RMD160 f32301c7ad6e71951d083eac611b1b79456e0033 SHA1 137dc6dff4910403f0d4faaa8b2d9e54c15b5985 SHA256 b81505169f959c4e175ecf6921472b05185b2c8f6a3cf8cbc91e369810ef196b
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOq0CPAAoJELHSF2kinlg4nHoP/ilUycWMwJZUfKWbhVWsTRpw
-MizDvNtBVaUEgOSriDVdSqrVO0Y9g0ojf6Mi6d98tHFvDpy1L2ZHdgErWNcrODNw
-NjWnwbREzYltzH5bnd+OuDkcL2MnU0LbD27S4hsKb+6VJt4k/WjJYqQi+w9x0h+G
-82vJWllo2j2Ib7UqDXQZbxop2VN4oqJ2BiLKZqSAPfvKPPGy4PLuYKtI5SGAsuC3
-C69//unvjK6UESwfBhx5JQQJADMdq+6tNhFu1NV8RxNho9NwOE5Mzg8j4TYxWWjJ
-EyQG8OyHS8qRdoHFF/VtzmyMe3EPzwR9hnZmmV+dOCVsm5f8b8V6sR1dRQSmH2s0
-ag5PFjQg8OeQTads7BqV7NputHq+uGv3oNHNxT6nxrXlW6npcrW5ASU4eFV4YXN9
-by/sqz6inwNMOD/few4UPE1Zujl6tKfW+W0PtUw5cc3BQZs+B5ABdIVMWYnf/rrl
-zX7lJKQkJCiXfimQNos/i912a2WBat5GSGtJ1T73sb+M1cTonqoYm6/BYa2qkQv7
-PcadFpHsXRC/tVG3ADip1O9UrFyaB5YLvOf0Ga8lbEwcmlcqQWfYi64BMEeY0MTw
-LqzU7nbrqV0rnWXASJ4QpbRb+mnPk5+qyCO8fP/SCMi3QXleqtEAEzM7e50k87tN
-xd9JCGqf9Ae20FFs4NM1
-=2pLV
+iQEcBAEBAgAGBQJP50rVAAoJEMbwO6tnXQ0so5cH/R4af+h6JuIyoCpn47LMfX2R
+by+uK/n1B0tqUWuk9qvWOtKAo5a6vulePTH9Bhq7S9QL6zo+CkwGWJ5adwz9Mj5X
+9W0COPr/v7K3ECFsMjJ2DgZxD3DnsZgjsdcfTdhCz2cKTicfMlKfqT6v02FKVxGd
+EU0v9Bf/UK6Y7YGo5n53bY/0QRNtq0PR8vl6eomDLn4EEi7D95EFOdy7bdiuQFjx
+r4Og/zUxKuwx6Gvcuj3E8+p5zqZedVEySel7lRg/gYs9CBR+y82OoOmYxejCGVWm
+bdzUNcQmwxE6dagtk1kBvmigR3eopK0GJHv051R6nQpHANz7v6e9cSubao2pSNo=
+=xksI
 -----END PGP SIGNATURE-----
diff --git a/media-libs/gluon/files/gluon-0.71.0-gcc-4.7.patch b/media-libs/gluon/files/gluon-0.71.0-gcc-4.7.patch
new file mode 100644
index 000000000000..5f54687f3527
--- /dev/null
+++ b/media-libs/gluon/files/gluon-0.71.0-gcc-4.7.patch
@@ -0,0 +1,30 @@
+commit bccbda88a6bc53ac20091bb6aefd2f1b501ba31a
+Author: Christoph Feck <christoph@maxiom.de>
+Date:   Fri Mar 23 23:35:09 2012 +0100
+
+    Fix includes
+
+diff --git a/input/linux/detectlinux.cpp b/input/linux/detectlinux.cpp
+index 632249a..6ae85a4 100644
+--- a/input/linux/detectlinux.cpp
++++ b/input/linux/detectlinux.cpp
+@@ -26,6 +26,7 @@
+ 
+ #include <QtCore/QDir>
+ 
++#include <unistd.h>
+ // #include <libudev.h>
+ 
+ using namespace GluonInput;
+diff --git a/input/linux/inputthread.cpp b/input/linux/inputthread.cpp
+index f92b104..202745e 100644
+--- a/input/linux/inputthread.cpp
++++ b/input/linux/inputthread.cpp
+@@ -30,6 +30,7 @@
+ // #include <QtCore/QStringList>
+ 
+ #include <fcntl.h>
++#include <unistd.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <linux/input.h>
diff --git a/media-libs/gluon/gluon-0.71.0.ebuild b/media-libs/gluon/gluon-0.71.0.ebuild
new file mode 100644
index 000000000000..a706dc4b27de
--- /dev/null
+++ b/media-libs/gluon/gluon-0.71.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gluon/gluon-0.71.0.ebuild,v 1.1 2012/06/24 17:13:48 kensington Exp $
+
+EAPI=4
+
+OPENGL_REQUIRED="always"
+inherit kde4-base versionator
+
+DESCRIPTION="Gluon is a Free and Open Source framework for creating and distributing games."
+HOMEPAGE="http://gluon.tuxfamily.org/"
+SRC_URI="mirror://kde/unstable/${PN}/$(get_version_component_range 1-2)/src/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64"
+SLOT="4"
+IUSE="debug examples"
+
+DEPEND="
+	media-libs/alure
+	media-libs/libsndfile
+	media-libs/openal
+	virtual/glu
+	virtual/opengl
+	x11-libs/qt-declarative:4
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-gcc-4.7.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use examples INSTALL_EXAMPLES)
+	)
+
+	kde4-base_src_configure
+}