Fix tests for udev-149 and udev-151-r1, thanks to Myckel Habets for looking into it, Bug #295958. Restrict test for the other ebuilds.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

13 files changed, 61 insertions, 18 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index b44dff8eea20..04a4efaaae43 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.529 2010/03/07 22:49:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.530 2010/03/15 21:43:05 zzam Exp $
+
+  15 Mar 2010; Matthias Schwarzott <zzam@gentoo.org> udev-145.ebuild,
+  udev-145-r1.ebuild, udev-145-r2.ebuild, udev-145-r3.ebuild,
+  udev-146.ebuild, udev-146-r1.ebuild, udev-146-r2.ebuild,
+  udev-147-r1.ebuild, udev-149.ebuild, udev-150-r1.ebuild,
+  udev-151-r1.ebuild, udev-9999.ebuild:
+  Fix tests for udev-149 and udev-151-r1, thanks to Myckel Habets for
+  looking into it, Bug #295958. Restrict test for the other ebuilds.
 
   07 Mar 2010; Markus Meier <maekke@gentoo.org> udev-149.ebuild:
   amd64/arm stable, bug #303031
diff --git a/sys-fs/udev/udev-145-r1.ebuild b/sys-fs/udev/udev-145-r1.ebuild
index ad4806700fe7..5a07867d88b5 100644
--- a/sys-fs/udev/udev-145-r1.ebuild
+++ b/sys-fs/udev/udev-145-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145-r1.ebuild,v 1.9 2010/02/07 20:32:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145-r1.ebuild,v 1.10 2010/03/15 21:43:05 zzam Exp $
 
 EAPI="1"
 
@@ -21,6 +21,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="selinux +devfs-compat -extras"
 
+RESTRICT="test"
+
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	extras? (
 		sys-apps/acl
diff --git a/sys-fs/udev/udev-145-r2.ebuild b/sys-fs/udev/udev-145-r2.ebuild
index e435a06ec419..aea7ddba9dcb 100644
--- a/sys-fs/udev/udev-145-r2.ebuild
+++ b/sys-fs/udev/udev-145-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145-r2.ebuild,v 1.4 2010/02/07 20:32:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145-r2.ebuild,v 1.5 2010/03/15 21:43:05 zzam Exp $
 
 EAPI="1"
 
@@ -24,6 +24,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="selinux +devfs-compat -extras"
 
+RESTRICT="test"
+
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	extras? (
 		sys-apps/acl
diff --git a/sys-fs/udev/udev-145-r3.ebuild b/sys-fs/udev/udev-145-r3.ebuild
index e9acf4640752..0e1f06aa92cb 100644
--- a/sys-fs/udev/udev-145-r3.ebuild
+++ b/sys-fs/udev/udev-145-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145-r3.ebuild,v 1.3 2010/02/07 20:32:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145-r3.ebuild,v 1.4 2010/03/15 21:43:05 zzam Exp $
 
 EAPI="1"
 
@@ -24,6 +24,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="selinux +devfs-compat -extras"
 
+RESTRICT="test"
+
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	extras? (
 		sys-apps/acl
diff --git a/sys-fs/udev/udev-145.ebuild b/sys-fs/udev/udev-145.ebuild
index 2681f510f1ed..e5d982b0a9e6 100644
--- a/sys-fs/udev/udev-145.ebuild
+++ b/sys-fs/udev/udev-145.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145.ebuild,v 1.6 2010/02/07 20:32:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145.ebuild,v 1.7 2010/03/15 21:43:05 zzam Exp $
 
 EAPI="1"
 
@@ -21,6 +21,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="selinux +devfs-compat -extras"
 
+RESTRICT="test"
+
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	extras? (
 		sys-apps/acl
diff --git a/sys-fs/udev/udev-146-r1.ebuild b/sys-fs/udev/udev-146-r1.ebuild
index dc5ae29de9b2..e1ad6efdb81e 100644
--- a/sys-fs/udev/udev-146-r1.ebuild
+++ b/sys-fs/udev/udev-146-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-146-r1.ebuild,v 1.11 2010/02/07 20:32:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-146-r1.ebuild,v 1.12 2010/03/15 21:43:05 zzam Exp $
 
 EAPI="1"
 
@@ -24,6 +24,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="selinux +devfs-compat -extras"
 
+RESTRICT="test"
+
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	extras? (
 		sys-apps/acl
diff --git a/sys-fs/udev/udev-146-r2.ebuild b/sys-fs/udev/udev-146-r2.ebuild
index cdecdf76af09..aba4fb131bb6 100644
--- a/sys-fs/udev/udev-146-r2.ebuild
+++ b/sys-fs/udev/udev-146-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-146-r2.ebuild,v 1.2 2010/02/07 20:32:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-146-r2.ebuild,v 1.3 2010/03/15 21:43:05 zzam Exp $
 
 EAPI="1"
 
@@ -24,6 +24,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="selinux +devfs-compat -extras"
 
+RESTRICT="test"
+
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	extras? (
 		sys-apps/acl
diff --git a/sys-fs/udev/udev-146.ebuild b/sys-fs/udev/udev-146.ebuild
index db56f4efc621..2e4bce7eff83 100644
--- a/sys-fs/udev/udev-146.ebuild
+++ b/sys-fs/udev/udev-146.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-146.ebuild,v 1.5 2010/02/07 20:32:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-146.ebuild,v 1.6 2010/03/15 21:43:05 zzam Exp $
 
 EAPI="1"
 
@@ -21,6 +21,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="selinux +devfs-compat -extras"
 
+RESTRICT="test"
+
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	extras? (
 		sys-apps/acl
diff --git a/sys-fs/udev/udev-147-r1.ebuild b/sys-fs/udev/udev-147-r1.ebuild
index bcc0d44a4e06..35a72f8e9318 100644
--- a/sys-fs/udev/udev-147-r1.ebuild
+++ b/sys-fs/udev/udev-147-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-147-r1.ebuild,v 1.4 2010/02/07 20:32:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-147-r1.ebuild,v 1.5 2010/03/15 21:43:05 zzam Exp $
 
 EAPI="1"
 
@@ -22,7 +22,9 @@ HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 -sh ~sparc ~x86"
-IUSE="selinux +devfs-compat -extras test"
+IUSE="selinux +devfs-compat -extras"
+
+RESTRICT="test"
 
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	extras? (
@@ -37,8 +39,7 @@ COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 
 DEPEND="${COMMON_DEPEND}
 	extras? ( dev-util/gperf )
-	>=sys-kernel/linux-headers-2.6.29
-	test? ( app-text/tree )"
+	>=sys-kernel/linux-headers-2.6.29"
 
 RDEPEND="${COMMON_DEPEND}
 	!sys-apps/coldplug
diff --git a/sys-fs/udev/udev-149.ebuild b/sys-fs/udev/udev-149.ebuild
index f696df6bbfab..7acaa01628d8 100644
--- a/sys-fs/udev/udev-149.ebuild
+++ b/sys-fs/udev/udev-149.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-149.ebuild,v 1.7 2010/03/07 22:49:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-149.ebuild,v 1.8 2010/03/15 21:43:05 zzam Exp $
 
 EAPI="1"
 
@@ -13,7 +13,9 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_BRANCH="master"
 	inherit git autotools
 else
+	# please update testsys-tarball whenever udev-xxx/test/sys/ is changed
 	SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2
+			test? ( mirror://gentoo/${PN}-149-testsys.tar.bz2 )
 			mirror://gentoo/${PATCHSET}.tar.bz2"
 fi
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -130,6 +132,10 @@ src_unpack() {
 		git_src_unpack
 	else
 		unpack ${A}
+
+		if use test; then
+			mv "${WORKDIR}"/test/sys "${S}"/test/
+		fi
 	fi
 
 	cd "${S}"
diff --git a/sys-fs/udev/udev-150-r1.ebuild b/sys-fs/udev/udev-150-r1.ebuild
index 0c782a9f5933..219a4007c284 100644
--- a/sys-fs/udev/udev-150-r1.ebuild
+++ b/sys-fs/udev/udev-150-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-150-r1.ebuild,v 1.2 2010/02/07 20:32:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-150-r1.ebuild,v 1.3 2010/03/15 21:43:05 zzam Exp $
 
 EAPI="1"
 
@@ -24,6 +24,8 @@ SLOT="0"
 KEYWORDS="-alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 -sh ~sparc ~x86"
 IUSE="selinux +devfs-compat -extras test"
 
+RESTRICT="test"
+
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	extras? (
 		sys-apps/acl
diff --git a/sys-fs/udev/udev-151-r1.ebuild b/sys-fs/udev/udev-151-r1.ebuild
index 395565dc6007..5782c5375470 100644
--- a/sys-fs/udev/udev-151-r1.ebuild
+++ b/sys-fs/udev/udev-151-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-151-r1.ebuild,v 1.2 2010/02/07 20:32:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-151-r1.ebuild,v 1.3 2010/03/15 21:43:05 zzam Exp $
 
 EAPI="1"
 
@@ -13,7 +13,9 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_BRANCH="master"
 	inherit git autotools
 else
-	SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
+	# please update testsys-tarball whenever udev-xxx/test/sys/ is changed
+	SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2
+			 test? ( mirror://gentoo/${PN}-151-testsys.tar.bz2 )"
 	[[ -n "${PATCHSET}" ]] && SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2"
 fi
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -131,6 +133,10 @@ src_unpack() {
 		git_src_unpack
 	else
 		unpack ${A}
+
+		if use test; then
+			mv "${WORKDIR}"/test/sys "${S}"/test/
+		fi
 	fi
 
 	cd "${S}"
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 55c7000aa79e..aa7a93a58bb4 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.25 2010/02/07 20:32:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.26 2010/03/15 21:43:05 zzam Exp $
 
 EAPI="1"
 
@@ -13,7 +13,9 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_BRANCH="master"
 	inherit git autotools
 else
-	SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
+	# please update testsys-tarball whenever udev-xxx/test/sys/ is changed
+	SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2
+			test? ( mirror://gentoo/udev-151-testsys.tar.bz2 )"
 	[[ -n "${PATCHSET}" ]] && SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2"
 fi
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -131,6 +133,10 @@ src_unpack() {
 		git_src_unpack
 	else
 		unpack ${A}
+
+		if use test; then
+			mv "${WORKDIR}"/test/sys "${S}"/test/
+		fi
 	fi
 
 	cd "${S}"