migrate to eapi 5 and remove old baselayout-1 migration code

Package-Manager: portage-2.2.0_alpha173/cvs/Linux i686
Manifest-Sign-Key: 0x30C46538

3 files changed, 24 insertions, 205 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index c513d01edf6e..f2906cbfeac5 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.266 2013/03/03 03:46:42 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.267 2013/04/24 05:33:11 williamh Exp $
+
+  24 Apr 2013; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+  migrate to eapi 5 and remove old baselayout-1 migration code
 
   03 Mar 2013; William Hubbs <williamh@gentoo.org> openrc-0.11.8.ebuild:
   Per Mike Frysinger, on bug #459782, we should not rdepend on ncurses[-tinfo].
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index b510ff5090ca..a43fd11081c5 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -9,13 +9,13 @@ AUX openrc.logrotate 71 SHA256 0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7
 AUX start-stop-daemon.pam 63 SHA256 2681da17e4a122656b5303b7c7eca82b8fb182641290b153fdbe96b63638086d SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb WHIRLPOOL 4abc9f051155a62d3033258a06003a4ca3909d8104deca84d5c1605bc1c7e56167fd82b2b4b72fe7b707070de98a7628730de1ad3f14b924b5b1480fba5ef854
 DIST openrc-0.11.8.tar.bz2 174860 SHA256 e1f7c5ed98a63178c20f3d023a7d35fe416e8e7db2f0cf78ff346a6d2f7949a9 SHA512 aaea9f1e1d08c367beb6d35bcc1d258eb9d7b71a659c05088f9027b0558aae068b2ad7c221cf8ff8b8950f5a4a5c187ee7b986ce2d475a9e3cccda74d040f780 WHIRLPOOL 69217f13dd05e9a443d906281ada167d6892615eb5db7c372ba535a3d4a21ac3111fad9d54ef06650c3b488b848180bbfe5257dbc83f62f5ecf60724dec2900c
 EBUILD openrc-0.11.8.ebuild 16192 SHA256 386df0c86ebecdf5b66b0c8e4b66ed047b0421e8de5a3fc002d204686b543e2c SHA512 2ab3c67c214d870143513c17cdf9a67ad01b1173bad79782e58f6e26f32f6a86da1a7011b10c0fd68bbed103dd22a7615d07f9ae5680945fe2b08c500815ac9c WHIRLPOOL 66cd99638b2d915be0655c4d23be7a1722564bd0708f1ff356da446ae4fff4bd5b6a834d064fede4cded724c2b08794c41a4c39b749f8d6f103bfa45b59c8524
-EBUILD openrc-9999.ebuild 16346 SHA256 f170e176322645ca294051b8e5c11a0b5cecbcb3eef8327313058db38cc848a7 SHA512 c2c4064a0788517f0a3d11fd2c2409dfdd439e43ba9d49659fb3642b66b74b9efcb617bffa85aceba608e806ce740c8af3a007a69c0bf7d08ffba55fa88fd92f WHIRLPOOL a7a1bf920f802fb51d61777c1216ff914d3a779657ceba099e4f525f8f5636acc2bc470e5ab8a0cba31076b3b78b1025427181b00b97c41144eb4edb690c6e7b
-MISC ChangeLog 45069 SHA256 f9ee7018cb4afe94c34ac3a41c32f770eb1941e3d1ac3efa13a7ce186421d8f3 SHA512 1f3e06f2e382a507dc94d12c9262aa4b32a2094401c10ffbddc7baece662e4abb58c4cbdf43a55e3f3ac372fe4c71436e88e0f9a3baf3fcffe15037018c8dea6 WHIRLPOOL 0ba7e85191c2cdc379e621af60bf2a3e2fbdbd9aad3d512bf34e2d55498763b80e1426248e9ffbd05ea9c69fa3ecf25845af0d044928ee7f3770d96edf258591
+EBUILD openrc-9999.ebuild 9890 SHA256 f0407fa4f439cdd8c257510c81a30dc912cbc0a18887e0001aba1f8e253dde57 SHA512 1a9cc2113f13c31d0b07decf5f468ad9f760801a240a7f669d5580aacf0e214c1ba604bfe1131d343f264fe73ec1b93d2a2fb4c73da6e956bdab82dddb141da8 WHIRLPOOL 45cbe6840d9629eaed695e9ccc3cc980e21d040c4199e76f258401ed0f4df797b5db37fbb256120d76756d9b3e7bb9c67b7633ef4d25bd483adb16c2ab7196db
+MISC ChangeLog 45204 SHA256 5d6e4dfb1bfaf3c5d91e66ae3f598fb20c4645ea1c692c9580e16600daed8666 SHA512 86d493e6b7b5eb82147d5eae2e2cf45f23716817b8aa96252bb3bfc73aade655a1f96455c13ebe022794310689701a1fa998bcf3e92c6f1df2fb55a03f8b9a45 WHIRLPOOL 82752c2b7256127cb3c5348e277ff79de29b3a7fdf569a3e722b53d9320657c3a9707af41e14eefb50322fdcaeadb1c8ef5a91e5479e6f7cd7f2086122a2fb94
 MISC metadata.xml 297 SHA256 85cd033d330fb2c67dbe209ef1bd6728ee39e434c3ebdb0453de361163af72ea SHA512 eb5abc5aab84528c2e4e5a4d2e7f5db1a026b8f4acaaec81cb65b3897f4f610e32af87b4f833fb7111c9d6856c5b0bf6dd5c0f8b1f2a96c88bd8625bbd2fa9eb WHIRLPOOL d086011ded5e7af75e900e96da92a7eca60635a64831aad5024eacf0b33000735eeaaf59e32e88e45f1c908ebeeba43307cf21b00add39e28700128c10a6fa73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlE89AUACgkQblQW9DDEZThmawCggv/hZBrBUSaE7pHg/RFd/CJX
-YFwAnjHy7ZfiJzMbCpcxHYKz3czktd5s
-=IqOF
+iEYEAREIAAYFAlF3bqAACgkQblQW9DDEZTghwgCfd1bW1h+kYwXR6hKACVsBi8+/
+l/cAoI74QmiapyzvT55ARtJHAzJ0ej7D
+=oUWQ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 3a6ce878bcf7..8549973e7283 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.119 2013/03/10 20:58:26 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.120 2013/04/24 05:33:11 williamh Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils flag-o-matic multilib pam toolchain-funcs
 
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE="debug elibc_glibc ncurses pam newnet prefix selinux static-libs tools
 	unicode kernel_linux kernel_FreeBSD"
 
-RDEPEND="virtual/init
+COMMON_DEPEND="virtual/init
 	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
 	elibc_glibc? ( >=sys-libs/glibc-2.5 )
 	ncurses? ( sys-libs/ncurses )
@@ -35,8 +35,10 @@ RDEPEND="virtual/init
 	selinux? ( sec-policy/selinux-openrc )
 	!<sys-fs/udev-init-scripts-17
 	!<sys-fs/udev-133"
-DEPEND="${RDEPEND}
-	virtual/os-headers"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}"
 
 src_prepare() {
 	sed -i 's:0444:0644:' mk/sys.mk || die
@@ -56,7 +58,10 @@ src_compile() {
 
 	MAKE_ARGS="${MAKE_ARGS}
 		LIBNAME=$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc"
+		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+		MKSELINUX=$(usex selinux)
+		MKSTATICLIBS=$(usex static-libs)
+	MKTOOLS=$(usex tools)"
 
 	local brand="Unknown"
 	if use kernel_linux ; then
@@ -66,16 +71,9 @@ src_compile() {
 		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
 		brand="FreeBSD"
 	fi
-	if use selinux; then
-			MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes"
-	fi
 	export BRANDING="Gentoo ${brand}"
-	if ! use static-libs; then
-			MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no"
-	fi
 	use newnet || MAKE_ARGS="${MAKE_ARGS} MKNET=oldnet"
 	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-	use tools && MAKE_ARGS="${MAKE_ARGS} MKTOOLS=yes"
 	export DEBUG=$(usev debug)
 	export MKPAM=$(usev pam)
 	export MKTERMCAP=$(usev ncurses)
@@ -189,52 +187,8 @@ pkg_preinst() {
 		)
 	fi
 
-	# upgrade timezone file ... do it before moving clock
-	if [[ -e ${EROOT}etc/conf.d/clock && ! -e ${EROOT}/etc/timezone ]] ; then
-		(
-		unset TIMEZONE
-		source "${EROOT}"etc/conf.d/clock
-		[[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${EROOT}"etc/timezone
-		)
-	fi
-
-	# /etc/conf.d/clock moved to /etc/conf.d/hwclock
-	local clock
-	use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock"
-	if [[ -e "${EROOT}"etc/conf.d/clock ]] ; then
-		mv "${EROOT}"etc/conf.d/clock "${EROOT}"etc/conf.d/${clock}
-	fi
-	if [[ -e "${EROOT}"etc/init.d/clock ]] ; then
-		rm -f "${EROOT}"etc/init.d/clock
-	fi
-	if [[ -L "${EROOT}"etc/runlevels/boot/clock ]] ; then
-		rm -f "${EROOT}"etc/runlevels/boot/clock
-		ln -snf /etc/init.d/${clock} "${EROOT}"etc/runlevels/boot/${clock}
-	fi
-	if [[ -L "${EROOT}"${LIBDIR}/rc/init.d/started/clock ]] ; then
-		rm -f "${EROOT}"${LIBDIR}/rc/init.d/started/clock
-		ln -snf /etc/init.d/${clok} "${EROOT}"${LIBDIR}/rc/init.d/started/${clock}
-	fi
-
-	# /etc/conf.d/rc is no longer used for configuration
-	if [[ -e "${EROOT}"etc/conf.d/rc ]] ; then
-		elog "/etc/conf.d/rc is no longer used for configuration."
-		elog "Please migrate your settings to /etc/rc.conf as applicable"
-		elog "and delete /etc/conf.d/rc"
-	fi
-
-	# force net init.d scripts into symlinks
-	for f in "${EROOT}"etc/init.d/net.* ; do
-		[[ -e ${f} ]] || continue # catch net.* not matching anything
-		[[ ${f} == */net.lo ]] && continue # real file now
-		[[ ${f} == *.openrc.bak ]] && continue
-		if [[ ! -L ${f} ]] ; then
-			elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink."
-			elog "You should delete '${f##*/}.openrc.bak' if you don't need it."
-			mv "${f}" "${f}.openrc.bak"
-			ln -snf net.lo "${f}"
-		fi
-	done
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
 
 	# termencoding was added in 0.2.1 and needed in boot
 	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
@@ -246,36 +200,13 @@ pkg_preinst() {
 		add_boot_init sysfs sysinit
 	fi
 
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-	has_version sys-apps/openrc || migrate_from_baselayout_1
-	has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script
 	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
 		migrate_udev_mount_script
 		add_boot_init tmpfiles.setup boot
 	fi
-}
 
-# >=openrc-0.4.0 no longer loads the udev addon
-migrate_udev_init_script() {
-	# make sure udev is in sysinit if it was enabled before
-	local enable_udev=false
-	local rc_devices=$(
-		[[ -f /etc/rc.conf ]] && source /etc/rc.conf
-		[[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc
-		echo "${rc_devices:-${RC_DEVICES:-auto}}"
-	)
-	case ${rc_devices} in
-		udev|auto)
-			enable_udev=true
-			;;
-	esac
-
-	if $enable_udev; then
-		add_boot_init udev sysinit
-		add_boot_init udev-postmount default
-	fi
+	# loopback was added in 0.12 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.12" || add_boot_init loopback
 }
 
 # >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
@@ -287,89 +218,9 @@ migrate_udev_mount_script() {
 	return 0
 }
 
-migrate_from_baselayout_1() {
-	# baselayout boot init scripts have been split out
-	for f in $(cd "${ED}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
-		# baselayout-1 is always "old" net, so ignore "new" net
-		[[ ${f} == "network" ]] && continue
-
-		add_boot_init ${f}
-	done
-
-	# Try to auto-add some addons when possible
-	add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt
-	add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt
-	add_boot_init_mit_config /etc/mdadm.conf mdraid
-	add_boot_init_mit_config /etc/evms.conf evms
-	[[ -e "${EROOT}"sbin/dmsetup ]] && add_boot_init device-mapper
-	[[ -e "${EROOT}"sbin/vgscan ]] && add_boot_init lvm
-	elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone"
-	elog "init.d scripts.  If you use such a thing, make sure you have the"
-	elog "required init.d scripts added to your boot runlevel."
-
-	# Upgrade our state for baselayout-1 users
-	if [[ ! -e "${EROOT}"${LIBDIR}/rc/init.d/started ]] ; then
-		(
-		[[ -e "${EROOT}"etc/conf.d/rc ]] && source "${EROOT}"/etc/conf.d/rc
-		svcdir=${svcdir:-/var/lib/init.d}
-		if [[ ! -d "${EROOT}"${svcdir}/started ]] ; then
-			ewarn "No state found, and no state exists"
-			elog "You should reboot this host"
-		else
-			mkdir -p "${EROOT}"${LIBDIR}/rc/init.d
-			einfo "Moving state from ${EROOT}${svcdir} to ${EROOT}${LIBDIR}/rc/init.d"
-			mv "${EROOT}${svcdir}"/* "${EROOT}${LIBDIR}"/rc/init.d
-			rm -rf "${EROOT}${LIBDIR}"/rc/init.d/daemons \
-				"${EROOT}${LIBDIR}"/rc/init.d/console
-			umount "${EROOT}${svcdir}" 2>/dev/null
-			rm -rf "${EROOT}${svcdir}"
-		fi
-		)
-	fi
-
-	# Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition
-	if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then
-		elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules"
-		rm -f "${EROOT}"etc/modules.autoload.d/.keep*
-		rmdir "${EROOT}"etc/modules.autoload.d 2>/dev/null
-		if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then
-			local f v
-			for f in "${EROOT}"etc/modules.autoload.d/* ; do
-				v=${f##*/}
-				v=${v#kernel-}
-				v=${v//[^[:alnum:]]/_}
-				gawk -v v="${v}" -v f="${f##*/}" '
-				BEGIN { print "\n### START: Auto-converted from " f "\n" }
-				{
-					if ($0 ~ /^[^#]/) {
-						print "modules_" v "=\"${modules_" v "} " $1 "\""
-						gsub(/[^[:alnum:]]/, "_", $1)
-						printf "module_" $1 "_args_" v "=\""
-						for (i = 2; i <= NF; ++i) {
-							if (i > 2)
-								printf " "
-							printf $i
-						}
-						print "\"\n"
-					} else
-						print
-				}
-				END { print "\n### END: Auto-converted from " f "\n" }
-				' "${f}" >> "${ED}"/etc/conf.d/modules
-			done
-				rm -f "${f}"
-			rmdir "${EROOT}"etc/modules.autoload.d 2>/dev/null
-		fi
-	fi
-}
-
 pkg_postinst() {
 	local LIBDIR=$(get_libdir)
 
-	# Remove old baselayout links
-	rm -f "${EROOT}"etc/runlevels/boot/{check{fs,root},rmnologin}
-	rm -f "${EROOT}"etc/init.d/{depscan,runscript}.sh
-
 	# Make our runlevels if they don't exist
 	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
 		einfo "Copying across default runlevels"
@@ -388,41 +239,6 @@ pkg_postinst() {
 		fi
 	fi
 
-	# /etc/conf.d/net.example is no longer valid
-	local NET_EXAMPLE="${EROOT}etc/conf.d/net.example"
-	local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210'
-	if [[ -e "${NET_EXAMPLE}" ]] ; then
-		if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then
-			rm -f "${NET_EXAMPLE}"
-			elog "${NET_EXAMPLE} has been removed."
-		else
-			sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}"
-			elog "${NET_EXAMPLE} should be removed."
-		fi
-		elog "The new file is ${EROOT}usr/share/doc/${PF}/net.example"
-	fi
-
-	# /etc/conf.d/wireless.example is no longer valid
-	local WIRELESS_EXAMPLE="${EROOT}etc/conf.d/wireless.example"
-	local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3'
-	if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then
-		if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then
-			rm -f "${WIRELESS_EXAMPLE}"
-			elog "${WIRELESS_EXAMPLE} is deprecated and has been removed."
-		else
-			sed -i '1i# This file is obsolete.\n' "${WIRELESS_EXAMPLE}"
-			elog "${WIRELESS_EXAMPLE} is deprecated and should be removed."
-		fi
-		elog "If you are using the old style network scripts,"
-		elog "Configure wireless settings in ${EROOT}etc/conf.d/net"
-		elog "after reviewing ${EROOT}usr/share/doc/${PF}/net.example"
-	fi
-
-	if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then
-		ewarn "/etc/modules.autoload.d is no longer used.  Please convert"
-		ewarn "your files to /etc/conf.d/modules and delete the directory."
-	fi
-
 	if use hppa; then
 		elog "Setting the console font does not work on all HPPA consoles."
 		elog "You can still enable it by running:"