Add sanity to pkg_setup.. also fixes usage with portage-HEAD

Package-Manager: portage-1.586-cvs

4 files changed, 26 insertions, 26 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index df0250354c1f..14f93eb6c109 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.34 2005/04/17 19:02:48 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.35 2005/04/24 10:27:20 dsd Exp $
+
+  24 Apr 2005; Daniel Drake <dsd@gentoo.org> hal-0.4.5-r2.ebuild,
+  hal-0.4.7-r2.ebuild:
+  Add sanity to pkg_setup.. also fixes usage with portage-HEAD
 
 *hal-0.4.7-r2 (17 Apr 2005)
 
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 3f961a778c7c..3119a20a822b 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,12 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 68b02e534da4448b4c5a5ea56c5fa192 hal-0.4.2-r1.ebuild 2728
 MD5 3421ea82543d71c44ee06c3f9605d775 hal-0.4.5-r1.ebuild 2592
 MD5 f6c71019d8f7b2dab5ef13de1abd9244 hal-0.4.1-r1.ebuild 2567
-MD5 50823e9ebfd0bcd18659743dbc9183eb hal-0.4.7-r2.ebuild 3487
+MD5 511a11ec0e4c4d11f90fbe15d195b60a hal-0.4.7-r2.ebuild 3378
 MD5 8a56df2be3b94b0e0e958c48e6c14df5 hal-0.2.98-r1.ebuild 2102
 MD5 4de36bde0054e10e722225fe4ffd6c6b hal-0.4.4-r1.ebuild 2758
 MD5 df44cfbd597367a6ac40680750d2b3bd hal-0.4.7-r1.ebuild 3150
-MD5 3b9d6ecf1a10560bad449e55b5d34f90 hal-0.4.5-r2.ebuild 3235
-MD5 ba44aec8889423b4e1e83334ef73ece1 ChangeLog 4959
+MD5 1f6fbf3e8ebc6d7c3479548d64421936 hal-0.4.5-r2.ebuild 3124
+MD5 ba5abd3e71950e632095cd78b4cd7e15 ChangeLog 5110
 MD5 2a96836a252f05c62f1df2bc078d6804 hal-0.4.7.ebuild 2986
 MD5 731695e9263a5a2e1eeba290b36078d5 metadata.xml 219
 MD5 192112dfb678a9795a93d3cdcc50bb95 files/hald 543
@@ -34,3 +37,10 @@ MD5 f3ba6ada28cf947f8a7b7ec8fdd708ba files/hal-0.4.5-net_lockup.patch 2429
 MD5 eeb1838cdb78726ab674194f0d268270 files/hal-0.4.2-fstab_sync_crash.patch 468
 MD5 58ed07e2de5e898a1e4eeedf595ddb06 files/hal-0.4.7-sys_floppy_detection.patch 568
 MD5 a0ce1c268e0b7d0967ec7b8e0d0d26d2 files/hal-0.4.1-old_storage_policy.patch 1216
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCa3SwiJcSIUGNthERAlbpAJwMf4M1YvHk00HFTgKwmXKRBzXRqQCcCy4y
+ibISMZMKGQO87MSwl4kz5EI=
+=BKzX
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/hal/hal-0.4.5-r2.ebuild b/sys-apps/hal/hal-0.4.5-r2.ebuild
index 82ddd55b63e8..f74ad4ed9f76 100644
--- a/sys-apps/hal/hal-0.4.5-r2.ebuild
+++ b/sys-apps/hal/hal-0.4.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.5-r2.ebuild,v 1.8 2005/04/09 12:59:48 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.5-r2.ebuild,v 1.9 2005/04/24 10:27:20 dsd Exp $
 
 inherit eutils python linux-info versionator flag-o-matic
 
@@ -34,16 +34,9 @@ DEPEND="${RDEPEND}
 # way to ensure that to some extent
 pkg_setup() {
 
-	if get_version; then
-		kernel_is ge 2 6 10 && break
-	else
-		RKV=$(uname -r)
-		RKV=${RKV//-*}
-		if version_is_at_least "2.6.10" ${RKV}; then
-			break
-		fi
-	fi
-	die "You need a 2.6.10 or newer kernel to build this pack"
+	linux-info_pkg_setup
+	kernel_is ge 2 6 10 \
+		|| die "You need a 2.6.10 or newer kernel to build this package"
 
 }
 
diff --git a/sys-apps/hal/hal-0.4.7-r2.ebuild b/sys-apps/hal/hal-0.4.7-r2.ebuild
index 71ca57a2cb7d..b1e761064474 100644
--- a/sys-apps/hal/hal-0.4.7-r2.ebuild
+++ b/sys-apps/hal/hal-0.4.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.7-r2.ebuild,v 1.1 2005/04/17 19:02:48 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.7-r2.ebuild,v 1.2 2005/04/24 10:27:20 dsd Exp $
 
 inherit eutils python linux-info versionator flag-o-matic
 
@@ -34,16 +34,9 @@ DEPEND="${RDEPEND}
 # way to ensure that to some extent
 pkg_setup() {
 
-	if get_version; then
-		kernel_is ge 2 6 10 && break
-	else
-		RKV=$(uname -r)
-		RKV=${RKV//-*}
-		if version_is_at_least "2.6.10" ${RKV}; then
-			break
-		fi
-	fi
-	die "You need a 2.6.10 or newer kernel to build this pack"
+	linux-info_pkg_setup
+	kernel_is ge 2 6 10 \
+		|| die "You need a 2.6.10 or newer kernel to build this package"
 
 }