Fix building with newer kernel. Bug #206438

Package-Manager: portage-2.1.3.19

8 files changed, 106 insertions, 50 deletions

diff --git a/games-util/showeq/ChangeLog b/games-util/showeq/ChangeLog
index dd851848ff74..ab1e2f32bea8 100644
--- a/games-util/showeq/ChangeLog
+++ b/games-util/showeq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-util/showeq
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/ChangeLog,v 1.20 2006/12/06 21:16:13 wolf31o2 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/ChangeLog,v 1.21 2008/01/17 23:28:56 tupone Exp $
+
+  17 Jan 2008; Tupone Alfredo <tupone@gentoo.org>
+  +files/showeq-5.0.0.18-UTS.patch, -files/showeq-5.2.4.0-gcc4.patch,
+  -files/showeq-5.3.0.0-gcc4.patch, +files/showeq-5.6.0.0-UTS.patch,
+  showeq-5.0.0.18.ebuild, showeq-5.6.0.0.ebuild:
+  Fix building with newer kernel. Bug #206438 by Evil Compile Person
 
   06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   showeq-5.0.0.18.ebuild, showeq-5.2.4.0.ebuild, showeq-5.3.0.0.ebuild:
diff --git a/games-util/showeq/Manifest b/games-util/showeq/Manifest
index 0dadb6dcaed6..e7e66e139854 100644
--- a/games-util/showeq/Manifest
+++ b/games-util/showeq/Manifest
@@ -1,29 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX showeq-5.0.0.18-UTS.patch 931 RMD160 9cd1e6bf2666ce10dcf6b52d874872a2515c7ab6 SHA1 46e62eeb51fa5121815996baa20b62dd91d2d1c5 SHA256 630805a341bfaf965c1cd7bd5ebed89643458ad30f81f89510c56e9b6a7e0f17
+MD5 1639a93da071a243f2f5027abc9b5c24 files/showeq-5.0.0.18-UTS.patch 931
+RMD160 9cd1e6bf2666ce10dcf6b52d874872a2515c7ab6 files/showeq-5.0.0.18-UTS.patch 931
+SHA256 630805a341bfaf965c1cd7bd5ebed89643458ad30f81f89510c56e9b6a7e0f17 files/showeq-5.0.0.18-UTS.patch 931
 AUX showeq-5.0.0.18-gcc4.patch 1705 RMD160 09f0df0945e1f743b712d7a757ae0dc0b10fcdaa SHA1 1a14589a8369c220e5904747ac231af7b127423d SHA256 9662a8943bfe82be9813d7bab0c1ffa6367f357c8f1d473b2dbe27b1c8a72d2e
 MD5 da4a82a816ff11e0595a98dac6e71d73 files/showeq-5.0.0.18-gcc4.patch 1705
 RMD160 09f0df0945e1f743b712d7a757ae0dc0b10fcdaa files/showeq-5.0.0.18-gcc4.patch 1705
 SHA256 9662a8943bfe82be9813d7bab0c1ffa6367f357c8f1d473b2dbe27b1c8a72d2e files/showeq-5.0.0.18-gcc4.patch 1705
-AUX showeq-5.2.4.0-gcc4.patch 409 RMD160 d0d2fca4b668a46b367085eb91f2964fb06c8dc2 SHA1 c71f6fa551a804c075900ac9fff8d704fdc3d440 SHA256 33a69485fa05f4bd95b87a56a7a597fcf67c3330891b8d7d107e0fb4206d9bfa
-MD5 e6c4477e2d4f268ac84dcb4c3228e772 files/showeq-5.2.4.0-gcc4.patch 409
-RMD160 d0d2fca4b668a46b367085eb91f2964fb06c8dc2 files/showeq-5.2.4.0-gcc4.patch 409
-SHA256 33a69485fa05f4bd95b87a56a7a597fcf67c3330891b8d7d107e0fb4206d9bfa files/showeq-5.2.4.0-gcc4.patch 409
-AUX showeq-5.3.0.0-gcc4.patch 409 RMD160 d0d2fca4b668a46b367085eb91f2964fb06c8dc2 SHA1 c71f6fa551a804c075900ac9fff8d704fdc3d440 SHA256 33a69485fa05f4bd95b87a56a7a597fcf67c3330891b8d7d107e0fb4206d9bfa
-MD5 e6c4477e2d4f268ac84dcb4c3228e772 files/showeq-5.3.0.0-gcc4.patch 409
-RMD160 d0d2fca4b668a46b367085eb91f2964fb06c8dc2 files/showeq-5.3.0.0-gcc4.patch 409
-SHA256 33a69485fa05f4bd95b87a56a7a597fcf67c3330891b8d7d107e0fb4206d9bfa files/showeq-5.3.0.0-gcc4.patch 409
+AUX showeq-5.6.0.0-UTS.patch 931 RMD160 b4fa88a3510066fb2a62fa4cf66589db41a533df SHA1 a998da793a0b27859d5251a9b31c12f489788193 SHA256 d2fed819639b86b95cfa9323113907623f7cee6711c1e8bef8eb9e42498df53c
+MD5 7136161d303a74d78b7115dfa7883e29 files/showeq-5.6.0.0-UTS.patch 931
+RMD160 b4fa88a3510066fb2a62fa4cf66589db41a533df files/showeq-5.6.0.0-UTS.patch 931
+SHA256 d2fed819639b86b95cfa9323113907623f7cee6711c1e8bef8eb9e42498df53c files/showeq-5.6.0.0-UTS.patch 931
 DIST showeq-5.0.0.18.tar.bz2 741051 RMD160 9da5bec7ff034c7d914ff43bf3c3768b32fe3c1e SHA1 3b2c0b244d064d42ee45957cfffcf778d15c9c7e SHA256 39af82a08f1fa0a398fd380a0577733a943045eadf87f8de362e43943541d9d3
 DIST showeq-5.6.0.0.tar.bz2 824785 RMD160 a83a18c1e35add8c4bc0fb9c308d368150506e80 SHA1 263ff585985bdd288a0ec172927b429a4fce113f SHA256 8fef6eaaac0f871a446fed550ff829f865d176948098067c75cd04b6b11f4d94
-EBUILD showeq-5.0.0.18.ebuild 843 RMD160 ccc510c7cb548983c0238adde5cf76628b605166 SHA1 c62ee86a52bd99942f798ca3ba5c7b5d24e07b2c SHA256 af373b835d51b46ef777eed5163a1de57947d0785b9735c38f1b188b9227c4a6
-MD5 32cf0f0aee05e94a1bce847efa7ea5c5 showeq-5.0.0.18.ebuild 843
-RMD160 ccc510c7cb548983c0238adde5cf76628b605166 showeq-5.0.0.18.ebuild 843
-SHA256 af373b835d51b46ef777eed5163a1de57947d0785b9735c38f1b188b9227c4a6 showeq-5.0.0.18.ebuild 843
-EBUILD showeq-5.6.0.0.ebuild 1493 RMD160 5e15c185044010581e2cee06ae3c197764eaed68 SHA1 920fa250c54ca0c5e177eeb02f9e6f52092bc04d SHA256 25386b5a95ffe9079fc299355d1b73696abca5b8efe1e6ee84d8dd8b21217340
-MD5 bf6eab264eae9bb79bb64e32a2e18b15 showeq-5.6.0.0.ebuild 1493
-RMD160 5e15c185044010581e2cee06ae3c197764eaed68 showeq-5.6.0.0.ebuild 1493
-SHA256 25386b5a95ffe9079fc299355d1b73696abca5b8efe1e6ee84d8dd8b21217340 showeq-5.6.0.0.ebuild 1493
-MISC ChangeLog 2969 RMD160 5ef4aff80461bfb270f6e961586325c589856057 SHA1 43061c01427bc79b32ab6fdb8be44b89167fde4a SHA256 312355469bf35bbe5ad8fc813cd882860664a4375076545530b944021a0c5196
-MD5 3f96261ba7f55117ce0de47757ec5274 ChangeLog 2969
-RMD160 5ef4aff80461bfb270f6e961586325c589856057 ChangeLog 2969
-SHA256 312355469bf35bbe5ad8fc813cd882860664a4375076545530b944021a0c5196 ChangeLog 2969
+EBUILD showeq-5.0.0.18.ebuild 916 RMD160 c899643924bd88200bdbd701db17b3ff2ae5935e SHA1 5fee83ac7afde1359e302803daa4c4a88e652596 SHA256 df589ebfd5b59744fc7d22f193913e181361d01ef6f58a7c4d1a526e2b05ef53
+MD5 065493e6ef7fe6a9bb30b2d25c1aa100 showeq-5.0.0.18.ebuild 916
+RMD160 c899643924bd88200bdbd701db17b3ff2ae5935e showeq-5.0.0.18.ebuild 916
+SHA256 df589ebfd5b59744fc7d22f193913e181361d01ef6f58a7c4d1a526e2b05ef53 showeq-5.0.0.18.ebuild 916
+EBUILD showeq-5.6.0.0.ebuild 1581 RMD160 0a625eb55a454f02ca0efc71884b5b5515ee42cc SHA1 5349ddf464a81fcd8885cb89cb59aeedb69b94c7 SHA256 86f16024f1c0950901fbe18c8c1d247f1c16c610131dd7ba2d4bdba456e5005b
+MD5 cd204edf746211765ba57d24bc6c810b showeq-5.6.0.0.ebuild 1581
+RMD160 0a625eb55a454f02ca0efc71884b5b5515ee42cc showeq-5.6.0.0.ebuild 1581
+SHA256 86f16024f1c0950901fbe18c8c1d247f1c16c610131dd7ba2d4bdba456e5005b showeq-5.6.0.0.ebuild 1581
+MISC ChangeLog 3275 RMD160 6b569037ad7913a713f885db9563b9556653bec6 SHA1 340fa825dc59705a07b6604cc9fb5bf2f03523b7 SHA256 591d5594a7a79837ac55ad2125e6fbd8b3a434a31b1b4cd30c1f8db972d5398b
+MD5 5fdeae889d1b41db55abf18d4fb41ecc ChangeLog 3275
+RMD160 6b569037ad7913a713f885db9563b9556653bec6 ChangeLog 3275
+SHA256 591d5594a7a79837ac55ad2125e6fbd8b3a434a31b1b4cd30c1f8db972d5398b ChangeLog 3275
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -34,3 +37,10 @@ SHA256 b214b9134e690c444952b1b8a90a3d05d740d8710678781bf603d8457e1ba4a0 files/di
 MD5 e94dbfa25ca726e017c3e5f0651498a8 files/digest-showeq-5.6.0.0 247
 RMD160 d56fe022fc776f243520697e4faa2441ec8862c2 files/digest-showeq-5.6.0.0 247
 SHA256 26cf633ba30e68ac47b2e15e69c7f558e9c8ce700ff12f987a625dc3dd2ddc21 files/digest-showeq-5.6.0.0 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHj+TD8qKy9+b2Hl0RAlkaAJ9rIrnWIis9U2Px9Q/goMsZtI86QACfXw/8
+Ud4/etePOJY+IvJSxnZ9uzw=
+=S5fr
+-----END PGP SIGNATURE-----
diff --git a/games-util/showeq/files/showeq-5.0.0.18-UTS.patch b/games-util/showeq/files/showeq-5.0.0.18-UTS.patch
new file mode 100644
index 000000000000..a72539e52fbc
--- /dev/null
+++ b/games-util/showeq/files/showeq-5.0.0.18-UTS.patch
@@ -0,0 +1,26 @@
+--- src/main.cpp.old	2008-01-17 23:18:47.000000000 +0100
++++ src/main.cpp	2008-01-17 23:19:00.000000000 +0100
+@@ -740,10 +740,6 @@
+ #ifdef QT_VERSION_STR
+   printf ("\t\tUsing Qt version: %s\n", QT_VERSION_STR);
+ #endif
+-#ifdef __linux__
+-  printf ("\t\tUsing headers from linux version: %s\n",
+-	  UTS_RELEASE);
+-#endif
+   printf ("\t\tUsing EQItemDB: %s\n", EQItemDB::Version());
+   printf ("\tUsing GDBM: %s\n", GDBMConvenience::Version());
+ #ifdef USE_DB3
+--- src/itemdbtool.cpp.old	2008-01-17 23:28:55.000000000 +0100
++++ src/itemdbtool.cpp	2008-01-17 23:29:09.000000000 +0100
+@@ -444,10 +444,6 @@
+ #ifdef QT_VERSION_STR
+   printf ("\t\tUsing Qt version: %s\n", QT_VERSION_STR);
+ #endif
+-#ifdef __linux__
+-  printf ("\t\tUsing headers from linux version: %s\n",
+-	  UTS_RELEASE);
+-#endif
+   printf ("\tUsing GDBM: %s\n", GDBMConvenience::Version());
+ #ifdef USE_DB3
+   printf ("\tUsing DB3: %s\n", DB3Convenience::Version());
diff --git a/games-util/showeq/files/showeq-5.2.4.0-gcc4.patch b/games-util/showeq/files/showeq-5.2.4.0-gcc4.patch
deleted file mode 100644
index 7ea5824930f3..000000000000
--- a/games-util/showeq/files/showeq-5.2.4.0-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/spawnmonitor.h.old	2006-01-27 23:52:51.000000000 -0700
-+++ src/spawnmonitor.h	2006-01-27 23:53:20.000000000 -0700
-@@ -98,7 +98,7 @@
- {
- Q_OBJECT
- public:
--  SpawnMonitor::SpawnMonitor(const DataLocationMgr* dataLocMgr, 
-+  SpawnMonitor(const DataLocationMgr* dataLocMgr, 
- 			     ZoneMgr* zoneMgr, SpawnShell* spawnShell, 
- 			     QObject* parent = 0, 
- 			     const char* name = "spawnmonitor" );
diff --git a/games-util/showeq/files/showeq-5.3.0.0-gcc4.patch b/games-util/showeq/files/showeq-5.3.0.0-gcc4.patch
deleted file mode 100644
index 7ea5824930f3..000000000000
--- a/games-util/showeq/files/showeq-5.3.0.0-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/spawnmonitor.h.old	2006-01-27 23:52:51.000000000 -0700
-+++ src/spawnmonitor.h	2006-01-27 23:53:20.000000000 -0700
-@@ -98,7 +98,7 @@
- {
- Q_OBJECT
- public:
--  SpawnMonitor::SpawnMonitor(const DataLocationMgr* dataLocMgr, 
-+  SpawnMonitor(const DataLocationMgr* dataLocMgr, 
- 			     ZoneMgr* zoneMgr, SpawnShell* spawnShell, 
- 			     QObject* parent = 0, 
- 			     const char* name = "spawnmonitor" );
diff --git a/games-util/showeq/files/showeq-5.6.0.0-UTS.patch b/games-util/showeq/files/showeq-5.6.0.0-UTS.patch
new file mode 100644
index 000000000000..b8ccc97265bb
--- /dev/null
+++ b/games-util/showeq/files/showeq-5.6.0.0-UTS.patch
@@ -0,0 +1,26 @@
+--- src/main.cpp.old	2008-01-18 00:03:18.000000000 +0100
++++ src/main.cpp	2008-01-18 00:03:31.000000000 +0100
+@@ -763,10 +763,6 @@
+ #ifdef QT_VERSION_STR
+   printf ("\t\tUsing Qt version: %s\n", QT_VERSION_STR);
+ #endif
+-#ifdef __linux__
+-  printf ("\t\tUsing headers from linux version: %s\n",
+-	  UTS_RELEASE);
+-#endif
+   printf ("\t\tUsing EQItemDB: %s\n", EQItemDB::Version());
+   printf ("\tUsing GDBM: %s\n", GDBMConvenience::Version());
+ #ifdef USE_DB3
+--- src/itemdbtool.cpp.old	2008-01-18 00:09:30.000000000 +0100
++++ src/itemdbtool.cpp	2008-01-18 00:09:53.000000000 +0100
+@@ -444,10 +444,6 @@
+ #ifdef QT_VERSION_STR
+   printf ("\t\tUsing Qt version: %s\n", QT_VERSION_STR);
+ #endif
+-#ifdef __linux__
+-  printf ("\t\tUsing headers from linux version: %s\n",
+-	  UTS_RELEASE);
+-#endif
+   printf ("\tUsing GDBM: %s\n", GDBMConvenience::Version());
+ #ifdef USE_DB3
+   printf ("\tUsing DB3: %s\n", DB3Convenience::Version());
diff --git a/games-util/showeq/showeq-5.0.0.18.ebuild b/games-util/showeq/showeq-5.0.0.18.ebuild
index 0b1660a038e0..e8bc0f590555 100644
--- a/games-util/showeq/showeq-5.0.0.18.ebuild
+++ b/games-util/showeq/showeq-5.0.0.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/showeq-5.0.0.18.ebuild,v 1.8 2006/12/06 21:16:13 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/showeq-5.0.0.18.ebuild,v 1.9 2008/01/17 23:28:56 tupone Exp $
 
 inherit kde games
 
@@ -19,7 +19,11 @@ DEPEND="x11-libs/libXt
 	$(qt_min_version 3.1)
 	>=sys-libs/gdbm-1.8.0"
 
-PATCHES="${FILESDIR}/${P}"-gcc4.patch
+src_unpack() {
+	mkdir "${WORKDIR}"/patches
+	cp "${FILESDIR}"/${P}-*.patch "${WORKDIR}"/patches
+	kde_src_unpack
+}
 
 src_compile() {
 	kde_src_compile nothing
diff --git a/games-util/showeq/showeq-5.6.0.0.ebuild b/games-util/showeq/showeq-5.6.0.0.ebuild
index f8aa31324f3b..7c2c3fbdc6d8 100644
--- a/games-util/showeq/showeq-5.6.0.0.ebuild
+++ b/games-util/showeq/showeq-5.6.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/showeq-5.6.0.0.ebuild,v 1.1 2006/10/15 22:49:35 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/showeq-5.6.0.0.ebuild,v 1.2 2008/01/17 23:28:56 tupone Exp $
 
-inherit qt3 games
+inherit eutils qt3 games
 
 DESCRIPTION="An Everquest monitoring program"
 HOMEPAGE="http://www.showeq.net/"
@@ -17,6 +17,12 @@ DEPEND="virtual/libpcap
 	$(qt_min_version 3.3)
 	>=sys-libs/gdbm-1.8.0"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-UTS.patch
+}
+
 src_compile() {
 	egamesconf \
 		--disable-dependency-tracking \