Patches for new cmake and linux-headers versions, bug #160649

Package-Manager: portage-2.1.2-r9

5 files changed, 61 insertions, 16 deletions

diff --git a/games-strategy/boson/ChangeLog b/games-strategy/boson/ChangeLog
index 1637479da528..7fea616cfddd 100644
--- a/games-strategy/boson/ChangeLog
+++ b/games-strategy/boson/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/boson
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/boson/ChangeLog,v 1.27 2006/12/06 20:26:37 wolf31o2 Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/boson/ChangeLog,v 1.28 2007/02/16 00:10:42 nyhm Exp $
+
+  16 Feb 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/boson-0.13-cmake.patch, +files/boson-0.13-linux-headers.patch,
+  boson-0.13.ebuild:
+  Patches for new cmake and linux-headers versions, bug #160649
 
   06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> boson-0.11-r1.ebuild:
   Removing specific version of openal since the older CVS snapshot versions
diff --git a/games-strategy/boson/Manifest b/games-strategy/boson/Manifest
index c9f987e91f85..2c86f19b7748 100644
--- a/games-strategy/boson/Manifest
+++ b/games-strategy/boson/Manifest
@@ -13,20 +13,28 @@ AUX boson-0.11-openal.patch 416 RMD160 cdd92f0717d54cf241ea29f719513a34eb9ab594
 MD5 38bcc44aae92550840dce3e1cbb0645e files/boson-0.11-openal.patch 416
 RMD160 cdd92f0717d54cf241ea29f719513a34eb9ab594 files/boson-0.11-openal.patch 416
 SHA256 884147149cc629343f2b590c7452b3750e980b71c6b147f38e34c788cecdcfc0 files/boson-0.11-openal.patch 416
+AUX boson-0.13-cmake.patch 385 RMD160 3ecdd573bf66d13001593bc3d16afe0e05ac61ea SHA1 34267b3573fd274e7fe9a621405228d8e3096378 SHA256 79da18bfe72053691ae83bc24f92bc07dbe383446c18ce68c289af08d3d4e792
+MD5 bc2fd9af88159a81fb92364615e899d3 files/boson-0.13-cmake.patch 385
+RMD160 3ecdd573bf66d13001593bc3d16afe0e05ac61ea files/boson-0.13-cmake.patch 385
+SHA256 79da18bfe72053691ae83bc24f92bc07dbe383446c18ce68c289af08d3d4e792 files/boson-0.13-cmake.patch 385
+AUX boson-0.13-linux-headers.patch 441 RMD160 ec2f2f002fade87cb0a3ceb7dde73bf55e934e2f SHA1 03d20a0af6e4d6f16527378177ec4d4a840689f2 SHA256 2c22b638d4ab577d02109c1fd8b3b96e2ebb0b2595bf6cad7518e4979866f0f0
+MD5 f0de54d169ceb71d2df4f0d4ebf998e5 files/boson-0.13-linux-headers.patch 441
+RMD160 ec2f2f002fade87cb0a3ceb7dde73bf55e934e2f files/boson-0.13-linux-headers.patch 441
+SHA256 2c22b638d4ab577d02109c1fd8b3b96e2ebb0b2595bf6cad7518e4979866f0f0 files/boson-0.13-linux-headers.patch 441
 DIST boson-all-0.11.tar.bz2 34512377 RMD160 4b5e857287778bf62187083d2ba3c545844dda0f SHA1 bf0977ed82febb227cba1a36d7887463fe99194c SHA256 e8c0ac944bb1fd3cb74b1a66f47e73c3ca26ccb91a5f055256aa6d9e9d9d88ae
 DIST boson-all-0.13.tar.bz2 37044878 RMD160 ea5cb6faa7cb057292535743e78e6b214926626d SHA1 d6cf208722553fb9feec4fe4e853a51534953fda SHA256 d58fc2b4be93abb29300bcf68e26e383be0734269ecc16a425cca9e55809b8d1
 EBUILD boson-0.11-r1.ebuild 881 RMD160 7cc4c66fc7adb929359aa156e9f4074291e4cad6 SHA1 840f85ecec2e81a3e782b8a09f819fd98e2509f7 SHA256 2b5aad2d7bcf8dee0d601f15d00e18247bf033ae8a88b086ddd424cca997b6eb
 MD5 ce51c8bd62766507156fe72d4fd28b0d boson-0.11-r1.ebuild 881
 RMD160 7cc4c66fc7adb929359aa156e9f4074291e4cad6 boson-0.11-r1.ebuild 881
 SHA256 2b5aad2d7bcf8dee0d601f15d00e18247bf033ae8a88b086ddd424cca997b6eb boson-0.11-r1.ebuild 881
-EBUILD boson-0.13.ebuild 1323 RMD160 f2af4420db9218f9653eec0f0539228803a40250 SHA1 c1a16eb45bdd8f2638886ab4acd5737e85b407fc SHA256 72e19eccd76fb8e87849a4e987c2785dcce3ed10c02cb812d9ce854c2f48c213
-MD5 cc2fc3a254b6bb843485c9f2b584ffa6 boson-0.13.ebuild 1323
-RMD160 f2af4420db9218f9653eec0f0539228803a40250 boson-0.13.ebuild 1323
-SHA256 72e19eccd76fb8e87849a4e987c2785dcce3ed10c02cb812d9ce854c2f48c213 boson-0.13.ebuild 1323
-MISC ChangeLog 4525 RMD160 e37da7162c7dd585c1d669a5b6be271f32115713 SHA1 8b11954681636de850bf831b60c17909417dce0f SHA256 9bf997ac633b8f343b45ce7d5a8e4603514c28892d60067b7ad999193fbb1c09
-MD5 2c7783f2f97caf980dcea14822c24a60 ChangeLog 4525
-RMD160 e37da7162c7dd585c1d669a5b6be271f32115713 ChangeLog 4525
-SHA256 9bf997ac633b8f343b45ce7d5a8e4603514c28892d60067b7ad999193fbb1c09 ChangeLog 4525
+EBUILD boson-0.13.ebuild 1372 RMD160 6976b8adbe81690b77c871017fa8baa599460b89 SHA1 4f007a0d38157931cfb74be65a167af469ecf5d9 SHA256 ae764abfc1880253f8e8216f7588a3214dc4c8c751a27d8901120583dd0d71a6
+MD5 295265bb577d02ba6a2fd88ac61cf949 boson-0.13.ebuild 1372
+RMD160 6976b8adbe81690b77c871017fa8baa599460b89 boson-0.13.ebuild 1372
+SHA256 ae764abfc1880253f8e8216f7588a3214dc4c8c751a27d8901120583dd0d71a6 boson-0.13.ebuild 1372
+MISC ChangeLog 4727 RMD160 cb5ad87f07580ba5269e9d9d3179743723a195b8 SHA1 6546cc321a70bb6245b2a888df78dfc700e5b027 SHA256 16c5b38b942782b39436704aaeaed2c1a3adaa3e9d2d80e02ecd42ee639cb133
+MD5 0b9dfe75f43021c1164b2c1c1fb7f893 ChangeLog 4727
+RMD160 cb5ad87f07580ba5269e9d9d3179743723a195b8 ChangeLog 4727
+SHA256 16c5b38b942782b39436704aaeaed2c1a3adaa3e9d2d80e02ecd42ee639cb133 ChangeLog 4727
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -38,9 +46,9 @@ MD5 984e24bd31a06d3e3e5949a991bd2b3e files/digest-boson-0.13 253
 RMD160 367b8d00f7ad7aae00e9c1646e0703a2b76066e2 files/digest-boson-0.13 253
 SHA256 34badc4b3e11421e417c0d1c1f53d888ec3781571e6cd4d7fca4991a9b8d9134 files/digest-boson-0.13 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFdyeEkT4lNIS36YERAqHmAJ98mM097N7+Db4HRxEGRIAN762nEgCfZZmA
-Xe9xauv3mf2BMas+W9CoBc4=
-=v9SQ
+iD8DBQFF1PaNdz7hIScOURERAvbFAKDKin6jEq7NlQTZHNumCG5A7Fxk/wCgjMFn
+BuEo4Hoy3CF4CkioBTxpfiM=
+=/IZt
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/boson/boson-0.13.ebuild b/games-strategy/boson/boson-0.13.ebuild
index ce6c0f9836cf..2037bad3175e 100644
--- a/games-strategy/boson/boson-0.13.ebuild
+++ b/games-strategy/boson/boson-0.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation and Thomas Capricelli <orzel@kde.org>
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/boson/boson-0.13.ebuild,v 1.1 2006/10/03 09:03:57 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/boson/boson-0.13.ebuild,v 1.2 2007/02/16 00:10:42 nyhm Exp $
 
 inherit eutils kde-functions toolchain-funcs
 
@@ -28,6 +28,10 @@ src_unpack() {
 	cd ${MY_P}
 	mkdir build
 
+	epatch \
+		"${FILESDIR}"/${P}-linux-headers.patch \
+		"${FILESDIR}"/${P}-cmake.patch
+
 	# Sandbox fix
 	sed -i '/^kde3_install_icons/d' \
 		code/boson/data/CMakeLists.txt \
diff --git a/games-strategy/boson/files/boson-0.13-cmake.patch b/games-strategy/boson/files/boson-0.13-cmake.patch
new file mode 100644
index 000000000000..5ce0290d3afb
--- /dev/null
+++ b/games-strategy/boson/files/boson-0.13-cmake.patch
@@ -0,0 +1,10 @@
+--- cmake/modules/boson/FindBosonPythonLibs.cmake
++++ cmake/modules/boson/FindBosonPythonLibs.cmake
+@@ -72,6 +72,6 @@
+ 
+ 	# PYTHON_LIBRARY is used for the cache entry only
+ 	# PYTHON_LIBRARIES is meant to be public
+-	set(PYTHON_LIBRARIES "${PYTHON_LIBRARY} ${_python_dependency_libs}")
++	set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${_python_dependency_libs})
+ ENDIF (NOT PYTHON_LIBRARY)
+ 
diff --git a/games-strategy/boson/files/boson-0.13-linux-headers.patch b/games-strategy/boson/files/boson-0.13-linux-headers.patch
new file mode 100644
index 000000000000..4b66068d37a8
--- /dev/null
+++ b/games-strategy/boson/files/boson-0.13-linux-headers.patch
@@ -0,0 +1,18 @@
+--- code/boson/info/boinfo_linux.cpp
++++ code/boson/info/boinfo_linux.cpp
+@@ -27,7 +27,6 @@
+ #include <qregexp.h>
+ #include <qstringlist.h>
+ 
+-#include <linux/version.h>
+ 
+ QString readFile(const char* fileName)
+ {
+@@ -72,7 +71,6 @@
+ 	insert(OSVersionString, kernelVersion);
+  }
+ 
+- kernelVersion = UTS_RELEASE;
+  insert(BoInfo::OSVersionString + BoInfo::CompileOffset, kernelVersion);
+ 
+  QString kernelModules = readFile("/proc/modules");