minor fixes

Package-Manager: portage-2.1.2.6

4 files changed, 32 insertions, 27 deletions

diff --git a/net-fs/shfs/ChangeLog b/net-fs/shfs/ChangeLog
index f67054871f77..c8e4d8f8dfc2 100644
--- a/net-fs/shfs/ChangeLog
+++ b/net-fs/shfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/shfs
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/ChangeLog,v 1.40 2007/01/04 05:28:14 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/ChangeLog,v 1.41 2007/05/06 15:48:02 compnerd Exp $
+
+  06 May 2007; Saleem Abdulrasool <compnerd@gentoo.org> shfs-0.35-r3.ebuild,
+  shfs-0.35-r4.ebuild:
+  Update deps, add a check for the kernel version instead of a dependency
+  string which does not guarantee the sources
 
 *shfs-0.35-r4 (04 Jan 2007)
 
diff --git a/net-fs/shfs/Manifest b/net-fs/shfs/Manifest
index 6e0104e5a976..c5e8550234dc 100644
--- a/net-fs/shfs/Manifest
+++ b/net-fs/shfs/Manifest
@@ -43,18 +43,18 @@ MD5 bdf9a4a620ff5bcd7828251c144ec02b files/shfs.mount 1346
 RMD160 8ff7a10528136c6b3820a898a6bb69739d1b2561 files/shfs.mount 1346
 SHA256 c3885bc209d6533ea5396d0f6cea22753e8115b64c1c0df9261a4e4be8b79910 files/shfs.mount 1346
 DIST shfs-0.35.tar.gz 128656 RMD160 84bc1c1d6bf5bd722fe1e4b3a4055843b11eda7a SHA1 c34bed491d144cc91dbf0c6df73e854271b6d365 SHA256 0d48ffe4d801180c15466f20aaa5802adb9d22067e8941e051dc3c64717ec3c2
-EBUILD shfs-0.35-r3.ebuild 2980 RMD160 d82568c38f109a4649d25925899133fb464dbcd1 SHA1 dad8da3cac39edd4790734f589c502ac91632437 SHA256 df3233ba0aeba64098b8212c66c40d8732b8295d4fcb89c9374c5b76151a5ef6
-MD5 77ad145c5356c5dd76c5680560b5d5d0 shfs-0.35-r3.ebuild 2980
-RMD160 d82568c38f109a4649d25925899133fb464dbcd1 shfs-0.35-r3.ebuild 2980
-SHA256 df3233ba0aeba64098b8212c66c40d8732b8295d4fcb89c9374c5b76151a5ef6 shfs-0.35-r3.ebuild 2980
-EBUILD shfs-0.35-r4.ebuild 2978 RMD160 3a4aeae2c781cf09d2255f371fed39510e553a9c SHA1 28ff6e6e2a78d716f43280e7c94632a48d125522 SHA256 8da31293270fba7fed91a4e3d444fd2344e5b2f0e0b3df560e8021d61a9896b5
-MD5 41b6c6c309153a352c9115cc56dff566 shfs-0.35-r4.ebuild 2978
-RMD160 3a4aeae2c781cf09d2255f371fed39510e553a9c shfs-0.35-r4.ebuild 2978
-SHA256 8da31293270fba7fed91a4e3d444fd2344e5b2f0e0b3df560e8021d61a9896b5 shfs-0.35-r4.ebuild 2978
-MISC ChangeLog 6200 RMD160 960de60041ff35bcb028737ca539e217f1ae748a SHA1 af09e218fbb01a3c8b0b6a39f33d757d3149c2ff SHA256 e38cd65f8f6c806c7964c9abeff42eb7718305e31ffa0ae81925b8a838a160e1
-MD5 27158308f8dc6a149a9f5ad84ccdd340 ChangeLog 6200
-RMD160 960de60041ff35bcb028737ca539e217f1ae748a ChangeLog 6200
-SHA256 e38cd65f8f6c806c7964c9abeff42eb7718305e31ffa0ae81925b8a838a160e1 ChangeLog 6200
+EBUILD shfs-0.35-r3.ebuild 3058 RMD160 00e687a0f69e4defd7037f4642b99998d311eeb9 SHA1 ecd096af7dc76a65a99df14bb86d39491e44aecd SHA256 3b426db54fd55dcd9b847eebf6af89131b29316e089f04f7fc7aed8c41c80437
+MD5 0c4a7c0507500fa97dd41c0635c10c8c shfs-0.35-r3.ebuild 3058
+RMD160 00e687a0f69e4defd7037f4642b99998d311eeb9 shfs-0.35-r3.ebuild 3058
+SHA256 3b426db54fd55dcd9b847eebf6af89131b29316e089f04f7fc7aed8c41c80437 shfs-0.35-r3.ebuild 3058
+EBUILD shfs-0.35-r4.ebuild 2921 RMD160 1b3b7e93510bb0e07fbaddd6be355f2ca9ed98e9 SHA1 3891115c1ce4232e03a6fb4107e20135c033d9de SHA256 a942e166409d55d60c28cb22546b9457255bac2a071adb23827100ab30f16520
+MD5 bc7b6cb929366f4724444b41b01e1750 shfs-0.35-r4.ebuild 2921
+RMD160 1b3b7e93510bb0e07fbaddd6be355f2ca9ed98e9 shfs-0.35-r4.ebuild 2921
+SHA256 a942e166409d55d60c28cb22546b9457255bac2a071adb23827100ab30f16520 shfs-0.35-r4.ebuild 2921
+MISC ChangeLog 6421 RMD160 86e5b1ee58a7f8a89f1373ec88820ce7fd898112 SHA1 8dfff823c201a91e96825b89fc8cc23ba5c0ad52 SHA256 f569563ea29c43afe8ba50e43f3e98098ed5be26977e9ce1d60984690471ccb2
+MD5 4c5abb6d810b89599120e47a10a3ece8 ChangeLog 6421
+RMD160 86e5b1ee58a7f8a89f1373ec88820ce7fd898112 ChangeLog 6421
+SHA256 f569563ea29c43afe8ba50e43f3e98098ed5be26977e9ce1d60984690471ccb2 ChangeLog 6421
 MISC metadata.xml 316 RMD160 30fe60772d122936494f213695185bb0813573cd SHA1 61bd32ae3070498a6de3293057e635857ebd02d9 SHA256 b35b4409d798f1bbed76ec77c74cd92f7a039d9ce6a46a354d923dadaacbf5f2
 MD5 b66027267bc1b372e656d834984ad137 metadata.xml 316
 RMD160 30fe60772d122936494f213695185bb0813573cd metadata.xml 316
diff --git a/net-fs/shfs/shfs-0.35-r3.ebuild b/net-fs/shfs/shfs-0.35-r3.ebuild
index 960853747724..1539337ca619 100644
--- a/net-fs/shfs/shfs-0.35-r3.ebuild
+++ b/net-fs/shfs/shfs-0.35-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.35-r3.ebuild,v 1.8 2007/01/04 05:14:18 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.35-r3.ebuild,v 1.9 2007/05/06 15:48:02 compnerd Exp $
 
 inherit linux-mod eutils
 
@@ -13,12 +13,9 @@ SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE="X amd doc"
 
-RDEPEND="virtual/modutils
-		net-misc/openssh
-		amd? ( net-fs/am-utils )"
-DEPEND="<virtual/linux-sources-2.6.19
-		sys-apps/sed
-		${RDEPEND}"
+RDEPEND="net-misc/openssh
+		 amd? ( net-fs/am-utils )"
+DEPEND="${RDEPEND}"
 PDEPEND="X? ( net-misc/x11-ssh-askpass )"
 
 CONFIG_CHECK="@SH_FS:shfs"
@@ -27,6 +24,12 @@ SH_FS_ERROR="SHFS is built into the kernel.  Only userland utilities will be pro
 pkg_setup() {
 	linux-mod_pkg_setup
 
+	if kernel_is 2 6 ; then
+		if [[ ${KV_PATCH} -gt 19 ]] ; then
+			die "This package will not build against kernels newer than 2.6.19"
+		fi
+	fi
+
 	# Setup the Kernel module build
 	BUILD_PARAMS="-j1 KERNEL_SOURCES=${KV_DIR}"
 
diff --git a/net-fs/shfs/shfs-0.35-r4.ebuild b/net-fs/shfs/shfs-0.35-r4.ebuild
index 2d031004eb53..ab985c31f4b9 100644
--- a/net-fs/shfs/shfs-0.35-r4.ebuild
+++ b/net-fs/shfs/shfs-0.35-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.35-r4.ebuild,v 1.1 2007/01/04 05:28:14 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.35-r4.ebuild,v 1.2 2007/05/06 15:48:02 compnerd Exp $
 
 inherit linux-mod eutils
 
@@ -13,12 +13,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="X amd doc"
 
-RDEPEND="virtual/modutils
-		net-misc/openssh
-		amd? ( net-fs/am-utils )"
-DEPEND="virtual/linux-sources
-		sys-apps/sed
-		${RDEPEND}"
+RDEPEND="net-misc/openssh
+		 amd? ( net-fs/am-utils )"
+DEPEND="${RDEPEND}"
 PDEPEND="X? ( net-misc/x11-ssh-askpass )"
 
 CONFIG_CHECK="@SH_FS:shfs"