Set ABI dependent vars at the beginning of each src_* function needing them, fixes bug #289314

Package-Manager: portage-2.2_rc46-r1/cvs/Linux x86_64

4 files changed, 33 insertions, 22 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index d1133f19ed1d..66e185bd31ae 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.84 2009/10/16 07:21:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.85 2009/10/18 18:13:08 tommy Exp $
+
+  18 Oct 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  openrc-0.5.1-r1.ebuild, openrc-9999.ebuild:
+  Set ABI dependent vars at the beginning of each src_* function needing
+  them, fixes bug #289314
 
   16 Oct 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.5.1-r1.ebuild,
   openrc-9999.ebuild:
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index b7fb9400bc9d..0aebf55486f7 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -30,15 +30,19 @@ EBUILD openrc-0.4.3-r1.ebuild 10401 RMD160 441494782af660a954102d347411d0905d9f2
 EBUILD openrc-0.4.3-r2.ebuild 10556 RMD160 2335ae861e4dc0c24c7a4948cc468545b93e8591 SHA1 56eb224e8b1c87f29ec19ef71554497191314308 SHA256 034a3b67c861b1b75f2cff8b58f7e220ae3f30158962bf0d1cae1cca64f263b2
 EBUILD openrc-0.4.3-r3.ebuild 11091 RMD160 17312849980c51bd48814dca356356f828db5e46 SHA1 edd7bb544ca510e9494e29b4dd9376c6bf0e7c28 SHA256 19828a957f6436924faddc91a3bac76555d01f2a047cd07c19bdfd6cac6eca8e
 EBUILD openrc-0.4.3-r4.ebuild 11196 RMD160 534248be8b72b188c2183b84f7658d93e3b43a0f SHA1 ea7174eccc245368139f6315fd675c04c90b14ac SHA256 f67aa1cdd9638fbf86dd3b85c96b2fb71cc60d0905dfc42916707457d09c2347
-EBUILD openrc-0.5.1-r1.ebuild 12041 RMD160 b5cd75441e08dff701be10391080fc389c9204c7 SHA1 87fc0c30860ac6d5082dac6099b162b7478009b7 SHA256 aea97f2ec257b25b118c47f2278d68f3c4a2c7b7349e7d3fec0e3a9cf652dd1b
+EBUILD openrc-0.5.1-r1.ebuild 11936 RMD160 ec7f6ff11cbe51e73b3888a8b7182a0381ce19b5 SHA1 75c0ad117f8cb42b4f8c6e2f522b949e3609f41f SHA256 866bbd8d6ab86cea07ca44cc1a61ce8c7fabf4131b46656724f30c05fe475544
 EBUILD openrc-0.5.1.ebuild 12190 RMD160 f45059ea7e02099b381640549dd6d8a0213a88ff SHA1 66ef5742ffb6aec9a850acb593e669a613d968c6 SHA256 a17a730003177620429469d6e928f71dfac338feabcbd59bc5d148c1f960b4a6
-EBUILD openrc-9999.ebuild 12038 RMD160 59a6549c334ad53ae7bc8406037fcd8f36c5698f SHA1 3c19ddb1ab355746b4d542bb5fb8fbdbef0a5581 SHA256 c9fa81f1581a746b635d9c2ec2b794cd05922e3b988ed0534280a3f432e92135
-MISC ChangeLog 17038 RMD160 9dc3ce99900b0687861e891f1b596388b6c4e30b SHA1 72991a91dafe0eb405f4b51ef7e13214bb65c937 SHA256 b60266700084bcfd020b10add93d51584b8324836085693b2acfe6aa5f80157e
+EBUILD openrc-9999.ebuild 11933 RMD160 e1cbcbac7bf3adaedf1f0d00c284948f0b359bdb SHA1 65f57dac14aeb8de4f923fb967aeef2059a6543f SHA256 4f60a88091231c559890271fff896f2f6237f3b83c00d9fea61d5e73f129b971
+MISC ChangeLog 17242 RMD160 3c4eeb5cb597e56c50041287a45d0db8c46eda82 SHA1 3e942414244d27c7c8ef8250095f1b5c48fd0ee0 SHA256 0dca4c8c1bcc2277a4827bb0eb0eba3df6c7b8591019c193bf95bc09ef652611
 MISC metadata.xml 444 RMD160 068acedd094c2c5d58ecea4302edac0aa557432d SHA1 1aa8416c0503ead5131df53ed806537d7d0a83fc SHA256 c451116d52c9d88299956b4227cb24ec2353b2e1dd2eba1c9c532a4d3df91778
+MISC openrc-0.5.1-r1.ebuild.orig 12041 RMD160 b5cd75441e08dff701be10391080fc389c9204c7 SHA1 87fc0c30860ac6d5082dac6099b162b7478009b7 SHA256 aea97f2ec257b25b118c47f2278d68f3c4a2c7b7349e7d3fec0e3a9cf652dd1b
+MISC openrc-9999.ebuild.orig 12038 RMD160 59a6549c334ad53ae7bc8406037fcd8f36c5698f SHA1 3c19ddb1ab355746b4d542bb5fb8fbdbef0a5581 SHA256 c9fa81f1581a746b635d9c2ec2b794cd05922e3b988ed0534280a3f432e92135
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkrYHxUACgkQlPl3HsVfCDoySgCff5tc4Be5L/EB20FXbfqNlfFb
-MOgAnA+vCx8eqCF5xV3k2YfLxz/uwRGv
-=w5WJ
+iJwEAQECAAYFAkrbWsEACgkQG7kqcTWJkGdEAQQAsOYOk46N+fL0z1lo+TQadsTg
+R8VGERtoGhv/t0ZAiVI3LgV3p+YbyOc6iwSkiFviRL7Qzuh+Spxvzw3DQxF9jzIs
+UUT1XSUyunjvTALHki7WlMZz58ZVAlVLtHQQC2fl3OFMJ0sihExktVJSr7HlnbIZ
+/GnFC1BcR993egfACg4=
+=bNZA
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-0.5.1-r1.ebuild b/sys-apps/openrc/openrc-0.5.1-r1.ebuild
index faa68c57744c..803fbc240df3 100644
--- a/sys-apps/openrc/openrc-0.5.1-r1.ebuild
+++ b/sys-apps/openrc/openrc-0.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.5.1-r1.ebuild,v 1.4 2009/10/16 07:21:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.5.1-r1.ebuild,v 1.5 2009/10/18 18:13:08 tommy Exp $
 
 EAPI="1"
 
@@ -37,7 +37,7 @@ RDEPEND="virtual/init
 DEPEND="${RDEPEND}
 	virtual/os-headers"
 
-pkg_setup() {
+make_args() {
 	unset LIBDIR #266688
 
 	MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=/$(get_libdir)/rc"
@@ -52,7 +52,9 @@ pkg_setup() {
 		brand="FreeBSD"
 	fi
 	export BRANDING="Gentoo ${brand}"
+}
 
+pkg_setup() {
 	export DEBUG=$(usev debug)
 	export MKPAM=$(usev pam)
 	export MKTERMCAP=$(usev ncurses)
@@ -74,10 +76,7 @@ src_unpack() {
 }
 
 src_compile() {
-	# catch people running `ebuild` w/out setup
-	if [[ -z ${MAKE_ARGS} ]] ; then
-		die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?"
-	fi
+	make_args
 
 	if [[ ${PV} == "9999" ]] ; then
 		local ver="git-$(echo ${EGIT_VERSION} | cut -c1-8)"
@@ -101,6 +100,7 @@ set_config_yes_no() {
 }
 
 src_install() {
+	make_args
 	emake ${MAKE_ARGS} DESTDIR="${D}" install || die
 
 	# move the shared libs back to /usr so ldscript can install
@@ -115,7 +115,8 @@ src_install() {
 
 	# Backup our default runlevels
 	dodir /usr/share/"${PN}"
-	mv "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die
+	cp -PR "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die
+	rm -rf "${D}"/etc/runlevels
 
 	# Stick with "old" net as the default for now
 	doconfd conf.d/net || die
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 64d3a4d22639..283478306c62 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.58 2009/10/16 07:21:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.59 2009/10/18 18:13:08 tommy Exp $
 
 EAPI="1"
 
@@ -37,7 +37,7 @@ RDEPEND="virtual/init
 DEPEND="${RDEPEND}
 	virtual/os-headers"
 
-pkg_setup() {
+make_args() {
 	unset LIBDIR #266688
 
 	MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=/$(get_libdir)/rc"
@@ -52,7 +52,9 @@ pkg_setup() {
 		brand="FreeBSD"
 	fi
 	export BRANDING="Gentoo ${brand}"
+}
 
+pkg_setup() {
 	export DEBUG=$(usev debug)
 	export MKPAM=$(usev pam)
 	export MKTERMCAP=$(usev ncurses)
@@ -74,10 +76,7 @@ src_unpack() {
 }
 
 src_compile() {
-	# catch people running `ebuild` w/out setup
-	if [[ -z ${MAKE_ARGS} ]] ; then
-		die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?"
-	fi
+	make_args
 
 	if [[ ${PV} == "9999" ]] ; then
 		local ver="git-$(echo ${EGIT_VERSION} | cut -c1-8)"
@@ -101,6 +100,7 @@ set_config_yes_no() {
 }
 
 src_install() {
+	make_args
 	emake ${MAKE_ARGS} DESTDIR="${D}" install || die
 
 	# move the shared libs back to /usr so ldscript can install
@@ -115,7 +115,8 @@ src_install() {
 
 	# Backup our default runlevels
 	dodir /usr/share/"${PN}"
-	mv "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die
+	cp -PR "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die
+	rm -rf "${D}"/etc/runlevels
 
 	# Stick with "old" net as the default for now
 	doconfd conf.d/net || die