diff options
| author |   Daniel Drake <dsd@gentoo.org> | 2005-04-24 10:27:20 +0000 |
|---|---|---|
| committer | Daniel Drake <dsd@gentoo.org> | 2005-04-24 10:27:20 +0000 |
| commit | 97c41aae718289a05fd174d3f5e2fb7aae5f91ac (patch) | |
| tree | c8ec8e22422880198a29649bb8616d70917bd11b /sys-apps/hal | |
| parent | fix bug (diff) | |
| download | gentoo-2-97c41aae718289a05fd174d3f5e2fb7aae5f91ac.tar.gz gentoo-2-97c41aae718289a05fd174d3f5e2fb7aae5f91ac.tar.bz2 gentoo-2-97c41aae718289a05fd174d3f5e2fb7aae5f91ac.zip | |
Add sanity to pkg_setup.. also fixes usage with portage-HEAD
(Portage version: 1.586-cvs)
Diffstat (limited to 'sys-apps/hal')
| -rw-r--r-- | sys-apps/hal/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/hal/hal-0.4.5-r2.ebuild | 15 | ||||
| -rw-r--r-- | sys-apps/hal/hal-0.4.7-r2.ebuild | 15 |
3 files changed, 13 insertions, 23 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/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" } |