quote more and make sure gentoo-release is created with version number in it #99623

Package-Manager: portage-2.0.51.22-r2

3 files changed, 84 insertions, 79 deletions

diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 0fce6101cdc1..525ac3882a6b 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,37 +1,47 @@
-MD5 b29ee10252c38491f413f36a51c014f3 ChangeLog 58930
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8dce7a6ae8a745fa05f622dfb0c35446 baselayout-1.11.13.ebuild 18490
 MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
-MD5 d977b6d1fea2e0503d1acf41a2463bd8 baselayout-1.12.0_pre1-r1.ebuild 18441
+MD5 63063133efc82df82db512614030ba19 baselayout-1.9.4-r6.ebuild 16993
 MD5 451f8ce496238c2fd0fa9fa2852ad16c baselayout-1.9.4-r7.ebuild 17999
-MD5 7d6f28f70034d87817939d447d40d39e baselayout-1.11.11-r3.ebuild 18759
 MD5 4e7b0fb1a5daa54e4f8de4637b447fcd baselayout-1.11.12-r4.ebuild 19260
-MD5 63063133efc82df82db512614030ba19 baselayout-1.9.4-r6.ebuild 16993
-MD5 7230e9672096bfcbbb9b9f0211b22071 baselayout-1.11.13.ebuild 18454
-MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
-MD5 08ade596f939beaf9f7b3657c5811593 files/rc-scripts-1.6.9-checkfs-lvm.patch 579
+MD5 a9d08802ee1297ac4244bf47ed3def75 baselayout-1.12.0_pre1-r1.ebuild 18477
+MD5 b29ee10252c38491f413f36a51c014f3 ChangeLog 58930
+MD5 7d6f28f70034d87817939d447d40d39e baselayout-1.11.11-r3.ebuild 18759
+MD5 8dae78310577f3fb14c58704d529feb3 files/digest-baselayout-1.11.13 70
+MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
+MD5 f971d810119eb7f33deba5e540cab2e1 files/baselayout-1.11.12-is-net-fs.patch 903
+MD5 c530e98487e43a7bbbb779450f8dd94e files/baselayout-1.11.12-quote-EDITOR.patch 374
+MD5 ee24c3f2b233c4b4bb286e3fa8c833ed files/baselayout-1.11.12-exec-dev.patch 545
+MD5 333c983dc00cb352f4725cacc0378fea files/baselayout-1.11.10-bridge.patch 3547
+MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134
 MD5 6d37e93641eee6754b93dde3324ae23b files/baselayout-1.11.11-wpa_supplicant.patch 1223
+MD5 126200ae85bdf0ef43de75411f71aaa8 files/rc-scripts-1.6.9-domainname.patch 380
+MD5 df9f21385df40467a0bff0b3d1e5285f files/baselayout-1.11.10-selinux-udev.patch 413
+MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r7 134
+MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
 MD5 2d89f41d8e2a27bb9c413ce38c5c95fb files/baselayout-1.11.12-profile.patch 1847
-MD5 ba767b33145b4614cf9b760516c51895 files/digest-baselayout-1.11.12-r4 70
+MD5 6ec416bfd1097d350c09e78949a736b8 files/rc-scripts-1.6.9-ifconfig.patch 266
 MD5 9dea6001a08f1b04bb1b4be1dd78fb98 files/baselayout-1.12.0_pre1-r1.patch 18327
-MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r7 134
-MD5 f96ffe6b44684809b8ec0e4450093f59 files/baselayout-1.11.10-iwconfig-2.patch 925
-MD5 333c983dc00cb352f4725cacc0378fea files/baselayout-1.11.10-bridge.patch 3547
-MD5 87842ac605d85289eba63ac1c2e16142 files/baselayout-1.11.10-wireless.patch 3215
-MD5 8dae78310577f3fb14c58704d529feb3 files/digest-baselayout-1.11.13 70
+MD5 6eb2326be0c7239278d3812bd8c941eb files/digest-baselayout-1.12.0_pre1-r1 75
 MD5 a08355653536117877945359de784f6b files/baselayout-1.11.10-iwconfig.patch 724
-MD5 c530e98487e43a7bbbb779450f8dd94e files/baselayout-1.11.12-quote-EDITOR.patch 374
-MD5 e76b5eb42575a2c72397f4691f8e7826 files/baselayout-1.11.12-volume-order-etc-update.patch 628
-MD5 f971d810119eb7f33deba5e540cab2e1 files/baselayout-1.11.12-is-net-fs.patch 903
 MD5 cac88e2e2f73778a4a4e79447d857c64 files/baselayout-1.11.12-swapon-quiet.patch 899
-MD5 ee24c3f2b233c4b4bb286e3fa8c833ed files/baselayout-1.11.12-exec-dev.patch 545
-MD5 126200ae85bdf0ef43de75411f71aaa8 files/rc-scripts-1.6.9-domainname.patch 380
-MD5 50ccc6f432f5e941daec74f31f2d2a53 files/digest-baselayout-1.11.11-r3 70
 MD5 8ab5b01cfcad4c79d822ff31296000be files/baselayout-1.11.12-ifconfig-cidr.patch 1740
-MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
-MD5 6ec416bfd1097d350c09e78949a736b8 files/rc-scripts-1.6.9-ifconfig.patch 266
-MD5 67882892030fed7383fe01d89f9539bd files/baselayout-1.11.12-runscript-boot.patch 670
 MD5 7b2f5e48c4d9056df539620299c20641 files/rc-scripts-1.4.16-splash.patch 11251
-MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
+MD5 50ccc6f432f5e941daec74f31f2d2a53 files/digest-baselayout-1.11.11-r3 70
+MD5 87842ac605d85289eba63ac1c2e16142 files/baselayout-1.11.10-wireless.patch 3215
 MD5 50816019be7cc03120fa58d075eb07f7 files/sysvinit-2.84-selinux1.patch 3612
-MD5 6eb2326be0c7239278d3812bd8c941eb files/digest-baselayout-1.12.0_pre1-r1 75
-MD5 df9f21385df40467a0bff0b3d1e5285f files/baselayout-1.11.10-selinux-udev.patch 413
-MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134
+MD5 67882892030fed7383fe01d89f9539bd files/baselayout-1.11.12-runscript-boot.patch 670
+MD5 e76b5eb42575a2c72397f4691f8e7826 files/baselayout-1.11.12-volume-order-etc-update.patch 628
+MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
+MD5 08ade596f939beaf9f7b3657c5811593 files/rc-scripts-1.6.9-checkfs-lvm.patch 579
+MD5 ba767b33145b4614cf9b760516c51895 files/digest-baselayout-1.11.12-r4 70
+MD5 f96ffe6b44684809b8ec0e4450093f59 files/baselayout-1.11.10-iwconfig-2.patch 925
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC3vNzgIKl8Uu19MoRAtbUAJwJQJV7/Ws7XbxlJZqLXkDL9J2AKgCdFP6J
+q5Gr6cC591/YXZ91jSR2dPw=
+=4cPD
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout/baselayout-1.11.13.ebuild b/sys-apps/baselayout/baselayout-1.11.13.ebuild
index 7ccdd79abd7d..c7ab99b86d18 100644
--- a/sys-apps/baselayout/baselayout-1.11.13.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.13.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/baselayout/baselayout-1.11.13.ebuild,v 1.2 2005/07/19 18:31:59 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.13.ebuild,v 1.3 2005/07/21 00:59:17 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -28,7 +28,8 @@ RDEPEND=">=sys-apps/sysvinit-2.84
 		>=app-shells/bash-3.0-r10
 		>=sys-apps/coreutils-5.2.1
 	) )"
-DEPEND="virtual/os-headers"
+DEPEND="virtual/os-headers
+	>=sys-apps/portage-2.0.51"
 PROVIDE="virtual/baselayout"
 
 src_unpack() {
@@ -53,14 +54,14 @@ src_unpack() {
 src_compile() {
 	use static && append-ldflags -static
 
-	make -C ${S}/src CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" \
+	make -C "${S}"/src CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" \
 		CFLAGS="${CFLAGS}" || die
 }
 
 # ${PATH} should include where to get MAKEDEV when calling this
 # function
 create_dev_nodes() {
-	case ${ARCH} in
+	case $(tc-arch) in
 		# amd64 must use generic-i386 because amd64/x86_64 does not have
 		# a generic option at this time, and the default 'generic' ends
 		# up erroring out, because MAKEDEV internally doesn't know what
@@ -78,7 +79,7 @@ create_dev_nodes() {
 		x86)	suffix=-i386 ;;
 	esac
 
-	einfo "Using generic${suffix} to make ${ARCH} device nodes..."
+	einfo "Using generic${suffix} to make $(tc-arch) device nodes..."
 	MAKEDEV generic${suffix}
 	MAKEDEV sg scd rtc hde hdf hdg hdh input audio video
 }
@@ -247,18 +248,15 @@ src_install() {
 	# attempting to merge files, (3) accidentally packaging up personal files
 	# with quickpkg
 	fperms 0600 /etc/shadow
-	mv ${D}/etc/{passwd,shadow,group,fstab,hosts,issue.devfix} ${D}/usr/share/baselayout
-
-	cp -P ${S}/init.d/* ${D}/etc/init.d
-	chmod a+x ${D}/etc/init.d/*
-	insinto /etc/conf.d
-	doins ${S}/etc/conf.d/*
-	insinto /etc/env.d
-	doins ${S}/etc/env.d/*
+	mv "${D}"/etc/{passwd,shadow,group,fstab,hosts,issue.devfix} "${D}"/usr/share/baselayout
+
+	doinitd "${S}"/init.d/* || die "doinitd"
+	doconfd "${S}"/etc/conf.d/* || die "doconfd"
+	doenvd "${S}"/etc/env.d/* || die "doenvd"
 	insinto /etc/modules.autoload.d
-	doins ${S}/etc/modules.autoload.d/*
+	doins "${S}"/etc/modules.autoload.d/*
 	insinto /etc/modules.d
-	doins ${S}/etc/modules.d/*
+	doins "${S}"/etc/modules.d/*
 
 	# Special-case uglyness... For people updating from lib32 -> lib amd64
 	# profiles, keep lib32 in the search path while it's around
@@ -286,20 +284,20 @@ src_install() {
 	# Setup files related to /dev
 	#
 	into /
-	dosbin ${S}/sbin/MAKEDEV
+	dosbin "${S}"/sbin/MAKEDEV
 	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
 	dosym ../sbin/MAKEDEV /dev/MAKEDEV
 
 	#
 	# Setup files in /bin
 	#
-	cd ${S}/bin
+	cd "${S}"/bin
 	dobin rc-status
 
 	#
 	# Setup files in /sbin
 	#
-	cd ${S}/sbin
+	cd "${S}"/sbin
 	into /
 	dosbin rc rc-update
 	# Need this in /sbin, as it could be run before
@@ -323,7 +321,7 @@ src_install() {
 	# These are support files for other things in baselayout that needn't be
 	# under CONFIG_PROTECTed /etc
 	#
-	cd ${S}/sbin
+	cd "${S}"/sbin
 	exeinto ${rcscripts_dir}/sh
 	doexe rc-services.sh rc-daemon.sh rc-help.sh
 
@@ -334,34 +332,34 @@ src_install() {
 	if ! use build; then
 		# This is for new depscan.sh and env-update.sh
 		# written in awk
-		cd ${S}/sbin
+		cd "${S}"/sbin
 		into /
 		dosbin depscan.sh
 		dosbin env-update.sh
 		insinto ${rcscripts_dir}/awk
-		doins ${S}/src/awk/*.awk
+		doins "${S}"/src/awk/*.awk
 	fi
 
 	# Original design had these in /etc/net.modules.d but that is too
 	# problematic with CONFIG_PROTECT
 	dodir ${rcscripts_dir}
-	cp -a ${S}/lib/rcscripts/net.modules.d ${D}${rcscripts_dir}
+	cp -a "${S}"/lib/rcscripts/net.modules.d ${D}${rcscripts_dir}
 	chown -R root:root ${D}${rcscripts_dir}
 
 	#
 	# Install baselayout documentation
 	#
 	if ! use build ; then
-		doman ${S}/man/*.*
+		doman "${S}"/man/*.*
 		docinto /
 		dodoc ${FILESDIR}/copyright
-		dodoc ${S}/ChangeLog
+		dodoc "${S}"/ChangeLog
 	fi
 
 	#
 	# Install baselayout utilities
 	#
-	cd ${S}/src
+	cd "${S}"/src
 	make DESTDIR="${D}" install || die
 
 	# Hack to fix bug 9849, continued in pkg_postinst
diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre1-r1.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre1-r1.ebuild
index dd21b39df97b..2c41d6e5ab82 100644
--- a/sys-apps/baselayout/baselayout-1.12.0_pre1-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.0_pre1-r1.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/baselayout/baselayout-1.12.0_pre1-r1.ebuild,v 1.2 2005/07/19 21:40:07 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre1-r1.ebuild,v 1.3 2005/07/21 00:59:17 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -12,8 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
-~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="bootstrap build static unicode"
 
 # This version of baselayout needs gawk in /bin, but as we do not have
@@ -25,7 +24,8 @@ RDEPEND=">=sys-apps/sysvinit-2.84
 		>=app-shells/bash-3.0-r10
 		>=sys-apps/coreutils-5.2.1
 	) )"
-DEPEND="virtual/os-headers"
+DEPEND="virtual/os-headers
+	>=sys-apps/portage-2.0.51"
 PROVIDE="virtual/baselayout"
 
 src_unpack() {
@@ -53,14 +53,14 @@ src_unpack() {
 src_compile() {
 	use static && append-ldflags -static
 
-	make -C ${S}/src CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" \
+	make -C "${S}"/src CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" \
 		CFLAGS="${CFLAGS}" || die
 }
 
 # ${PATH} should include where to get MAKEDEV when calling this
 # function
 create_dev_nodes() {
-	case ${ARCH} in
+	case $(tc-arch) in
 		# amd64 must use generic-i386 because amd64/x86_64 does not have
 		# a generic option at this time, and the default 'generic' ends
 		# up erroring out, because MAKEDEV internally doesn't know what
@@ -78,7 +78,7 @@ create_dev_nodes() {
 		x86)	suffix=-i386 ;;
 	esac
 
-	einfo "Using generic${suffix} to make ${ARCH} device nodes..."
+	einfo "Using generic${suffix} to make $(tc-arch) device nodes..."
 	MAKEDEV generic${suffix}
 	MAKEDEV sg scd rtc hde hdf hdg hdh input audio video
 }
@@ -247,18 +247,15 @@ src_install() {
 	# attempting to merge files, (3) accidentally packaging up personal files
 	# with quickpkg
 	fperms 0600 /etc/shadow
-	mv ${D}/etc/{passwd,shadow,group,fstab,hosts,issue.devfix} ${D}/usr/share/baselayout
-
-	cp -P ${S}/init.d/* ${D}/etc/init.d
-	chmod a+x ${D}/etc/init.d/*
-	insinto /etc/conf.d
-	doins ${S}/etc/conf.d/*
-	insinto /etc/env.d
-	doins ${S}/etc/env.d/*
+	mv "${D}"/etc/{passwd,shadow,group,fstab,hosts,issue.devfix} "${D}"/usr/share/baselayout
+
+	doinitd "${S}"/init.d/* || die "doinitd"
+	doconfd "${S}"/etc/conf.d/* || die "doconfd"
+	doenvd "${S}"/etc/env.d/* || die "doenvd"
 	insinto /etc/modules.autoload.d
-	doins ${S}/etc/modules.autoload.d/*
+	doins "${S}"/etc/modules.autoload.d/*
 	insinto /etc/modules.d
-	doins ${S}/etc/modules.d/*
+	doins "${S}"/etc/modules.d/*
 
 	# Special-case uglyness... For people updating from lib32 -> lib amd64
 	# profiles, keep lib32 in the search path while it's around
@@ -286,20 +283,20 @@ src_install() {
 	# Setup files related to /dev
 	#
 	into /
-	dosbin ${S}/sbin/MAKEDEV
+	dosbin "${S}"/sbin/MAKEDEV
 	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
 	dosym ../sbin/MAKEDEV /dev/MAKEDEV
 
 	#
 	# Setup files in /bin
 	#
-	cd ${S}/bin
+	cd "${S}"/bin
 	dobin rc-status
 
 	#
 	# Setup files in /sbin
 	#
-	cd ${S}/sbin
+	cd "${S}"/sbin
 	into /
 	dosbin rc rc-update
 	# Need this in /sbin, as it could be run before
@@ -323,7 +320,7 @@ src_install() {
 	# These are support files for other things in baselayout that needn't be
 	# under CONFIG_PROTECTed /etc
 	#
-	cd ${S}/sbin
+	cd "${S}"/sbin
 	exeinto ${rcscripts_dir}/sh
 	doexe rc-services.sh rc-daemon.sh rc-help.sh
 
@@ -334,34 +331,34 @@ src_install() {
 	if ! use build; then
 		# This is for new depscan.sh and env-update.sh
 		# written in awk
-		cd ${S}/sbin
+		cd "${S}"/sbin
 		into /
 		dosbin depscan.sh
 		dosbin env-update.sh
 		insinto ${rcscripts_dir}/awk
-		doins ${S}/src/awk/*.awk
+		doins "${S}"/src/awk/*.awk
 	fi
 
 	# Original design had these in /etc/net.modules.d but that is too
 	# problematic with CONFIG_PROTECT
 	dodir ${rcscripts_dir}
-	cp -a ${S}/lib/rcscripts/net.modules.d ${D}${rcscripts_dir}
+	cp -a "${S}"/lib/rcscripts/net.modules.d ${D}${rcscripts_dir}
 	chown -R root:root ${D}${rcscripts_dir}
 
 	#
 	# Install baselayout documentation
 	#
 	if ! use build ; then
-		doman ${S}/man/*.*
+		doman "${S}"/man/*.*
 		docinto /
 		dodoc ${FILESDIR}/copyright
-		dodoc ${S}/ChangeLog
+		dodoc "${S}"/ChangeLog
 	fi
 
 	#
 	# Install baselayout utilities
 	#
-	cd ${S}/src
+	cd "${S}"/src
 	make DESTDIR="${D}" install || die
 
 	# Hack to fix bug 9849, continued in pkg_postinst
@@ -540,7 +537,7 @@ pkg_postinst() {
 	# write it here so that the new version is immediately in the file
 	# (without waiting for the user to do etc-update)
 	rm -f ${ROOT}/etc/._cfg????_gentoo-release
-	echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release
+	echo "Gentoo Base System version ${PV}" > ${ROOT}/etc/gentoo-release
 
 	echo
 	einfo "Please be sure to update all pending '._cfg*' files in /etc,"