Add support for 2.6.18+ via utsversion.h #147567 by Tobias Klausmann.

Package-Manager: portage-2.1.2_pre1

4 files changed, 38 insertions, 13 deletions

diff --git a/sys-apps/rlocate/ChangeLog b/sys-apps/rlocate/ChangeLog
index d031e452d6c5..74a261c01055 100644
--- a/sys-apps/rlocate/ChangeLog
+++ b/sys-apps/rlocate/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/rlocate
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rlocate/ChangeLog,v 1.17 2006/09/16 22:21:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rlocate/ChangeLog,v 1.18 2006/09/23 11:03:19 vapier Exp $
+
+  23 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/rlocate-0.5.2-utsversion.patch, rlocate-0.5.2.ebuild:
+  Add support for 2.6.18+ via utsversion.h #147567 by Tobias Klausmann.
 
   16 Sep 2006; Mike Frysinger <vapier@gentoo.org>
   +files/rlocate-0.5.2-no-devfs.patch, rlocate-0.5.2.ebuild:
diff --git a/sys-apps/rlocate/Manifest b/sys-apps/rlocate/Manifest
index 3f14e4dfea0b..4f66a4391d23 100644
--- a/sys-apps/rlocate/Manifest
+++ b/sys-apps/rlocate/Manifest
@@ -13,6 +13,10 @@ AUX rlocate-0.5.2-no-devfs.patch 795 RMD160 58e9285c6e11e33ebe04a2f0c0c3552306c4
 MD5 e8dd8ee22c3a27a82f8456d73b8a9ae2 files/rlocate-0.5.2-no-devfs.patch 795
 RMD160 58e9285c6e11e33ebe04a2f0c0c3552306c46e8c files/rlocate-0.5.2-no-devfs.patch 795
 SHA256 e6227def39789adc29f1bce456fb9421314f52e540e64031e252bb949628b3f8 files/rlocate-0.5.2-no-devfs.patch 795
+AUX rlocate-0.5.2-utsversion.patch 273 RMD160 5d6ea65cbce752c776882f873dca65f10d4d5d7e SHA1 351847bf708c4c77a2e7ef4a8e4763b29eb62217 SHA256 96b1a54252158744eef9f7d9652d6df95932a68b079e925abbd4ef0448ad6e73
+MD5 1d809e086572f961ffe863740fe3fcb6 files/rlocate-0.5.2-utsversion.patch 273
+RMD160 5d6ea65cbce752c776882f873dca65f10d4d5d7e files/rlocate-0.5.2-utsversion.patch 273
+SHA256 96b1a54252158744eef9f7d9652d6df95932a68b079e925abbd4ef0448ad6e73 files/rlocate-0.5.2-utsversion.patch 273
 AUX rlocated.rc 637 RMD160 a25cb6288920b48f9ed44e248d0fec1355f92f1b SHA1 99ca412694c4d2193d4fe4ffd523fa1187fad581 SHA256 a8e0055c83c60b4997949ea171c0dd4837673ed4c1b24d3d031c951b24b104a1
 MD5 0ae00f05e8f65deeb6c646f082ff87b2 files/rlocated.rc 637
 RMD160 a25cb6288920b48f9ed44e248d0fec1355f92f1b files/rlocated.rc 637
@@ -23,14 +27,14 @@ EBUILD rlocate-0.5.1.ebuild 1165 RMD160 73ed4fbcca493136330e8e8026ecb6a86ec7dd91
 MD5 910da643a17a26436f2a0ba8cdd52b57 rlocate-0.5.1.ebuild 1165
 RMD160 73ed4fbcca493136330e8e8026ecb6a86ec7dd91 rlocate-0.5.1.ebuild 1165
 SHA256 bf265763ce66aa76059f09c15ed0cfea97f4137a737a15fa680e28be28036dc6 rlocate-0.5.1.ebuild 1165
-EBUILD rlocate-0.5.2.ebuild 1214 RMD160 4b0c53892ac9e6d99257ab782106b91274c2e82a SHA1 4803ff22e5d0c9ab0f37bb2008e818fb81802436 SHA256 f455b0f38fad4e6f05305fd206cc4a2301e0a89a1cb1258636f8dee0597327ff
-MD5 037083a93de7615ba4f5e851e4fd9bba rlocate-0.5.2.ebuild 1214
-RMD160 4b0c53892ac9e6d99257ab782106b91274c2e82a rlocate-0.5.2.ebuild 1214
-SHA256 f455b0f38fad4e6f05305fd206cc4a2301e0a89a1cb1258636f8dee0597327ff rlocate-0.5.2.ebuild 1214
-MISC ChangeLog 2776 RMD160 46ce8917b2e403004d8866cb61d9504a3f5f5191 SHA1 165bf49c421c4f2cba9da412b5417bfe6b1c839e SHA256 9a48b9e71d7fe9915b83d9f227e33ef993156456d16c44880547f21fcaa083de
-MD5 4a66080795ea91d1ec0e53f1f264cb40 ChangeLog 2776
-RMD160 46ce8917b2e403004d8866cb61d9504a3f5f5191 ChangeLog 2776
-SHA256 9a48b9e71d7fe9915b83d9f227e33ef993156456d16c44880547f21fcaa083de ChangeLog 2776
+EBUILD rlocate-0.5.2.ebuild 1265 RMD160 3971e495e49129a8cc79c8478928117ff6995ab3 SHA1 802f7241d6f7aa5b547fa2d170da1404e3425781 SHA256 8dca162717f0c53abf744cd982b14ab53b316dc196ff8d4d6183f969911dc9d3
+MD5 9792c88dbd4ea00e9bca3569bc284b16 rlocate-0.5.2.ebuild 1265
+RMD160 3971e495e49129a8cc79c8478928117ff6995ab3 rlocate-0.5.2.ebuild 1265
+SHA256 8dca162717f0c53abf744cd982b14ab53b316dc196ff8d4d6183f969911dc9d3 rlocate-0.5.2.ebuild 1265
+MISC ChangeLog 2962 RMD160 c1253d41dbf1a40b6971de3b4d8ed587a8551624 SHA1 9cf5ebe1605c7ef7774957541aa5a3042f9bdb68 SHA256 e7170445a79d5b3a727143b106407cd7d036353ff016c272f4539ab3ee19a4a8
+MD5 e33cb19e183dada29a3d18573a04eafc ChangeLog 2962
+RMD160 c1253d41dbf1a40b6971de3b4d8ed587a8551624 ChangeLog 2962
+SHA256 e7170445a79d5b3a727143b106407cd7d036353ff016c272f4539ab3ee19a4a8 ChangeLog 2962
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
@@ -44,7 +48,7 @@ SHA256 f68185f57e866348e9f9b4aa9654cc6f6a964cbdeefa40bee56a2ecfdb4fae3c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFDHkYamhnQswr0vIRAjPtAKCFvLtXp99b+y2xGtN7kNZbFCpiMQCfX/q+
-6ilbLm/NV+pEysMr9LwIerI=
-=lc02
+iD8DBQFFFRR/amhnQswr0vIRAu3eAJ9Ge5u75QWzWULnMiKtkHJ94C47sACfT3Ts
+DDkVSRNfGWdpV7KLOjONw9M=
+=L53z
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/rlocate/files/rlocate-0.5.2-utsversion.patch b/sys-apps/rlocate/files/rlocate-0.5.2-utsversion.patch
new file mode 100644
index 000000000000..9bfdd1755aa8
--- /dev/null
+++ b/sys-apps/rlocate/files/rlocate-0.5.2-utsversion.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/147567
+
+--- configure
++++ configure
+@@ -3721,6 +3721,11 @@
+   #endif
+ 
+   #include "$kerneldir/include/linux/version.h"
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++# include "$kerneldir/include/linux/utsversion.h"
++#endif
++
+ int
+ main ()
+ {
diff --git a/sys-apps/rlocate/rlocate-0.5.2.ebuild b/sys-apps/rlocate/rlocate-0.5.2.ebuild
index 25033778088b..30038007dbd6 100644
--- a/sys-apps/rlocate/rlocate-0.5.2.ebuild
+++ b/sys-apps/rlocate/rlocate-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rlocate/rlocate-0.5.2.ebuild,v 1.2 2006/09/16 22:21:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rlocate/rlocate-0.5.2.ebuild,v 1.3 2006/09/23 11:03:19 vapier Exp $
 
 inherit eutils linux-mod
 
@@ -30,6 +30,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-0.5.2-build.patch
 	epatch "${FILESDIR}"/${PN}-0.5.2-no-devfs.patch
+	epatch "${FILESDIR}"/${PN}-0.5.2-utsversion.patch
 }
 
 src_compile() {