migrate live ebuild to eapi 4.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux i686

3 files changed, 84 insertions, 71 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index c9d5fec50d08..9629e1aae37a 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.580 2011/06/05 21:09:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.581 2011/06/07 05:54:01 williamh Exp $
+
+  07 Jun 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  migrate live ebuild to eapi 4.
 
   05 Jun 2011; Robin H. Johnson <robbat2@gentoo.org> udev-146-r1.ebuild,
   udev-149.ebuild, udev-151-r4.ebuild, udev-162.ebuild, udev-163.ebuild,
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 0c3c860eaa35..3c85439bc97d 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 136/shell-compat-KV.sh 1012 RMD160 5bc85047b4237d502f7b0ccc7181f9974c2b0898 SHA1 bbc58d6181f3fc8d623de1537eddcc1ede919202 SHA256 2393918bc65c69e1c19d7712292c945a4adfe45ce02b88ae7663167b8745cf8b
 AUX 136/shell-compat-addon.sh 930 RMD160 c96a77a2085698e4ca3636994d1b6d07326e4b5f SHA1 d696a1ff942d31b493d385cff27bc9cbacd3fa47 SHA256 94b1fe1f5ba892c82798cec6f15b5c5c76e1902ef2d13701ddfbb54f19079af9
 AUX 136/udev-dev-tarball.initd 2579 RMD160 b7feb34f854a3eb08d1203f1faabf9cecee3101c SHA1 10ecda997314851d86a175db8cbfcc6a343e9bb2 SHA256 a829fa3efb9d6aadb137cb8879b8bc2660ef6500b2dbb8d55db8edf52f332d60
@@ -138,6 +141,13 @@ EBUILD udev-168-r1.ebuild 14838 RMD160 4169cfadee63cc52c6331c7ff8d953b1ca80d0a6
 EBUILD udev-168-r2.ebuild 14742 RMD160 09b7eca6e071c5bd42fd00ddff9255243c79cf35 SHA1 2b4b46b2f9020aba5c2e49ff747b69450da4c20a SHA256 2a64f36a30acd8e0eebb9621a2858f072c50d0c4ecc0976d987a7c2685cc58f5
 EBUILD udev-168.ebuild 14722 RMD160 8a5c99759a07874699e16cab7cffb81d8e4028ea SHA1 ed70d00a842aae6dfd5d7f9e9c1386b879f2636f SHA256 3d814ce1bf3c975f92a87fda21f8f0daa372ec12ee0c7f8d7ac454e1b35fb4c5
 EBUILD udev-171.ebuild 15371 RMD160 fc4d634ed60479296ae73c66da991b2387e53d84 SHA1 76f746ba73a89bbc461248d58e2f993abe330d09 SHA256 90970aebbe2e1bcf310b326990973bd027350d5b49cf6ea0b79acfeb70180018
-EBUILD udev-9999.ebuild 15297 RMD160 ce886fe2e65bf75061703755594d4b3c8129b8d2 SHA1 6abc92152c2c97b2855c9d1afcff622753bfe2be SHA256 f2cb1ac8be5c093f152f8ff26ae8d82fc6ce92368b17943b0a95405cbd947640
-MISC ChangeLog 120269 RMD160 bde46b96f6582c4b99e13dd06dc679139b12e543 SHA1 2afb005464bbbbff7ee3803856d0738cff43c6a1 SHA256 9fe8531ab0e58c7fba4657c8a178e529ae236f40681b31f0fdc093cd4af3d3f4
+EBUILD udev-9999.ebuild 14620 RMD160 4cbb113486f9dbbdc5107e2406bacaff4fe28889 SHA1 6f979bdb5c6fea464a92804f9bfb0ca44c7c773d SHA256 7276296ad181948ff4e12509fc6c78452c9313bcf0175d1013cf591891822719
+MISC ChangeLog 120373 RMD160 127c543321b40cbb0d34c5a9a6a3fc0b31da9753 SHA1 bacce5f0e75d28a21807201e50315b15691a42af SHA256 cc3764cd1bfc164f79ffdf75081c8649a45d6d5661b704a89a62c9e2c5f669b9
 MISC metadata.xml 1261 RMD160 7af6ef904f506127cf67ac9b5eb4d2c9260843bf SHA1 484ff932a3a6885bd694347099417e51ce8f30a4 SHA256 d20b2751c0e01cce6d071565e57594157ec63a7ae33ef7ef401903fad78311c3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3tvQ0ACgkQblQW9DDEZTh+UQCeM6huc9wd3B6nQ+LGOhFEDQah
+9QcAnjLEys+Z4MsXJ/268WSfMZr6pXi+
+=FtDv
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 3a298aa84f92..a874a9410149 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,33 +1,42 @@
 # Copyright 1999-2011 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.40 2011/06/05 21:09:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.41 2011/06/07 05:54:01 williamh Exp $
 
-EAPI="1"
+EAPI=4
 
-inherit eutils flag-o-matic multilib toolchain-funcs linux-info systemd
-
-PATCHSET=${P}-gentoo-patchset-v1
+KV_min=2.6.32
+KV_reliable=2.6.32
+#PATCHSET=${P}-gentoo-patchset-v1
 scriptversion=v3
 scriptname=udev-gentoo-scripts-${scriptversion}
 
-if [[ ${PV} == "9999" ]]; then
-	SRC_URI="mirror://gentoo/${scriptname}.tar.bz2"
+if [[ ${PV} == "9999" ]]
+then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
 	EGIT_BRANCH="master"
-	inherit git autotools
-else
+	vcs="git-2 autotools"
+fi
+
+inherit ${VCS} eutils flag-o-matic multilib toolchain-funcs linux-info systemd
+
+if [[ ${PV} != "9999" ]]
+then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 	# 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 )
-			 mirror://gentoo/${scriptname}.tar.bz2"
-	[[ -n "${PATCHSET}" ]] && SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2"
+			 test? ( mirror://gentoo/${PN}-151-testsys.tar.bz2 )"
+	if [[ -n "${PATCHSET}" ]]
+	then
+		SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2"
+	fi
 fi
+SRC_URI="${SRC_URI} mirror://gentoo/${scriptname}.tar.bz2"
+
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="selinux test debug +rule_generator +hwdb +udev_acl +gudev introspection +keymap floppy edd action_modeswitch"
 
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
@@ -46,17 +55,14 @@ DEPEND="${COMMON_DEPEND}
 	test? ( app-text/tree )"
 
 RDEPEND="${COMMON_DEPEND}
-	hwdb?
-	(
-		>=sys-apps/usbutils-0.82
-		sys-apps/pciutils
-	)
+	hwdb? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils )
 	!sys-apps/coldplug
 	!<sys-fs/lvm2-2.02.45
 	!sys-fs/device-mapper
 	>=sys-apps/baselayout-1.12.5"
 
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == "9999" ]]
+then
 	# for documentation processing with xsltproc
 	DEPEND="${DEPEND}
 		app-text/docbook-xsl-stylesheets
@@ -74,13 +80,12 @@ CONFIG_CHECK="~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
 # 0 - too old
 udev_check_KV() {
 	local ok=0
-	if [[ ${KV_MAJOR} == 2 && ${KV_MINOR} == 6 ]] || [[ ${KV_MAJOR} == 3 ]]
+	if kernel_is -ge ${KV_reliable//./ }
 	then
-		if kernel_is -ge 2 6 ${KV_PATCH_reliable} ; then
-			ok=2
-		elif kernel_is -ge 2 6 ${KV_PATCH_min} ; then
-			ok=1
-		fi
+		ok=2
+	elif kernel_is -ge ${KV_min//./ }
+	then
+		ok=1
 	fi
 	return $ok
 }
@@ -88,67 +93,56 @@ udev_check_KV() {
 pkg_setup() {
 	linux-info_pkg_setup
 
-	# udev requires signalfd introduced in kernel 2.6.25,
-	# but a glibc compiled against >=linux-headers-2.6.27 uses the
-	# new signalfd syscall introduced in kernel 2.6.27 without falling back
-	# to the old one. So we just depend on 2.6.27 here, see Bug #281312.
-	KV_PATCH_min=32
-	KV_PATCH_reliable=32
-	KV_min=2.6.${KV_PATCH_min}
-	KV_reliable=2.6.${KV_PATCH_reliable}
-
 	# always print kernel version requirements
 	ewarn
 	ewarn "${P} does not support Linux kernel before version ${KV_min}!"
-	if [[ ${KV_PATCH_min} != ${KV_PATCH_reliable} ]]; then
+	if [[ ${KV_min} != ${KV_reliable} ]]
+	then
 		ewarn "For a reliable udev, use at least kernel ${KV_reliable}"
 	fi
 
-	echo
-	# We don't care about the secondary revision of the kernel.
-	# 2.6.30.4 -> 2.6.30 is all we check
 	udev_check_KV
 	case "$?" in
 		2)	einfo "Your kernel version (${KV_FULL}) is new enough to run ${P} reliably." ;;
 		1)	ewarn "Your kernel version (${KV_FULL}) is new enough to run ${P},"
 			ewarn "but it may be unreliable in some cases."
-			ebeep ;;
+			;;
 		0)	eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
-			ebeep ;;
+			;;
 	esac
-	echo
 
 	KV_FULL_SRC=${KV_FULL}
 	get_running_version
 	udev_check_KV
-	if [[ "$?" = "0" ]]; then
+	if [[ "$?" = "0" ]]
+	then
 		eerror
 		eerror "udev cannot be restarted after emerging,"
 		eerror "as your running kernel version (${KV_FULL}) is too old."
 		eerror "You really need to use a newer kernel after a reboot!"
 		NO_RESTART=1
-		ebeep
 	fi
 }
 
 src_unpack() {
 	unpack ${A}
-	if [[ ${PV} == "9999" ]] ; then
+	if [[ ${PV} == "9999" ]]
+	then
 		git_src_unpack
-	else
-		if use test; then
-			mv "${WORKDIR}"/test/sys "${S}"/test/
-		fi
 	fi
+}
 
-	#cd "${WORKDIR}/${scriptname}"
-
-	cd "${S}"
+src_prepare() {
+	if use test
+	then
+		mv "${WORKDIR}"/test/sys "${S}"/test/
+	fi
 
 	# patches go here...
 
 	# backport some patches
-	if [[ -n "${PATCHSET}" ]]; then
+	if [[ -n "${PATCHSET}" ]]
+	then
 		EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \
 			  EPATCH_FORCE="yes" epatch
 	fi
@@ -158,29 +152,28 @@ src_unpack() {
 		-i rules/{rules.d,arch}/*.rules \
 	|| die "failed to change group dialout to uucp"
 
-	if [[ ${PV} != 9999 ]]; then
+	if [[ ${PV} != 9999 ]]
+	then
 		# Make sure there is no sudden changes to upstream rules file
 		# (more for my own needs than anything else ...)
 		MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules")
 		MD5=${MD5/  -/}
 		if [[ ${MD5} != a9954d57e97aa0ad2e0ed53899d9559a ]]
 		then
-			echo
 			eerror "50-udev-default.rules has been updated, please validate!"
 			eerror "md5sum: ${MD5}"
 			die "50-udev-default.rules has been updated, please validate!"
 		fi
 	fi
 
-	if [[ ${PV} == 9999 ]]; then
+	if [[ ${PV} == 9999 ]]
+	then
 		gtkdocize --copy || die "gtkdocize failed"
 		eautoreconf
 	fi
 }
 
-src_compile() {
-	filter-flags -fprefetch-loop-arrays
-
+src_configure() {
 	econf \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -204,18 +197,22 @@ src_compile() {
 		$(use_enable edd) \
 		$(use_enable action_modeswitch) \
 		$(systemd_with_unitdir)
+}
+
+src_compile() {
+	filter-flags -fprefetch-loop-arrays
 
-	emake || die "compiling udev failed"
+	emake
 }
 
 src_install() {
 	emake -C "${WORKDIR}/${scriptname}" \
 		DESTDIR="${D}" LIBDIR="$(get_libdir)" \
 		KV_min="${KV_min}" KV_reliable="${KV_reliable}" \
-		install || die "make install failed"
+		install
 
 	into /
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install
 
 	exeinto /lib/udev
 	keepdir /lib/udev/state
@@ -251,12 +248,13 @@ src_install() {
 	newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf
 
 	# documentation
-	dodoc ChangeLog README TODO || die "failed installing docs"
+	dodoc ChangeLog README TODO
 
 	# keep doc in just one directory, Bug #281137
 	rm -rf "${D}/usr/share/doc/${PN}"
-	if use keymap; then
-		dodoc extras/keymap/README.keymap.txt || die "failed installing docs"
+	if use keymap
+	then
+		dodoc extras/keymap/README.keymap.txt
 	fi
 }
 
@@ -333,7 +331,8 @@ fix_old_persistent_net_rules() {
 
 # See Bug #129204 for a discussion about restarting udevd
 restart_udevd() {
-	if [[ ${NO_RESTART} = "1" ]]; then
+	if [[ ${NO_RESTART} = "1" ]]
+	then
 		ewarn "Not restarting udevd, as your kernel is too old!"
 		return
 	fi
@@ -359,13 +358,13 @@ restart_udevd() {
 
 	/sbin/udevd --daemon
 	sleep 3
-	if [[ ! -n $(pidof udevd) ]]; then
+	if [[ ! -n $(pidof udevd) ]]
+	then
 		eerror "FATAL: udev died, please check your kernel is"
 		eerror "new enough and configured correctly for ${P}."
 		eerror
 		eerror "Please have a look at this before rebooting."
 		eerror "If in doubt, please downgrade udev back to your old version"
-		ebeep
 	fi
 }
 
@@ -432,7 +431,8 @@ pkg_postinst() {
 	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
 	# So try to remove it here (will only work if empty).
 	rmdir "${ROOT}"/dev/loop 2>/dev/null
-	if [[ -d "${ROOT}"/dev/loop ]]; then
+	if [[ -d "${ROOT}"/dev/loop ]]
+	then
 		ewarn "Please make sure your remove /dev/loop,"
 		ewarn "else losetup may be confused when looking for unused devices."
 	fi