Sync changes from 0.4.3 back and merge the live/release versions.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 23 insertions, 15 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 58e0c9f7b214..98cf2632964c 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,9 @@
 # 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.70 2009/05/29 22:57:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.71 2009/06/08 11:45:39 vapier Exp $
+
+  08 Jun 2009; Mike Frysinger <vapier@gentoo.org> openrc-9999.ebuild:
+  Sync changes from 0.4.3 back and merge the live/release versions.
 
   29 May 2009; Mike Frysinger <vapier@gentoo.org> openrc-9999.ebuild:
   Update repos to point to git #269705 by William Keaney.
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 0092dd8d373c..3f606b352acc 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -22,13 +22,13 @@ EBUILD openrc-0.4.1-r1.ebuild 10257 RMD160 09b1f0ef469dadb4db344e87f5695cbf40a48
 EBUILD openrc-0.4.2.ebuild 10228 RMD160 769c35cd085c3b45d722321c1d13d35b8c4c7283 SHA1 111aa2392d965846dc9ddf1c535010eec1524ed0 SHA256 b17d081ec30ae557bf5d2664b25e51f1b0425f08d4d8eba932c5a33672555681
 EBUILD openrc-0.4.3-r1.ebuild 10401 RMD160 441494782af660a954102d347411d0905d9f2520 SHA1 7826444c7fafd4a20f0feca79449e1fc5dc7f8ed SHA256 8bb06d5f79a3010b2060a75ef7770cd95baf71c6be9c59cda7e7288531c5fa06
 EBUILD openrc-0.4.3-r2.ebuild 10506 RMD160 c40c436722dea4f7440b9e472b7682359302dce3 SHA1 81d262d3dbcdc9dfbeb2979b73f98fa7136eb5f3 SHA256 d3faed5dd4ad8fdf3222733cef1be7b4391c7980f05478bbff4cf6e11835a574
-EBUILD openrc-9999.ebuild 10060 RMD160 ed502199ea5d09de41a7b57966f4f0aa1286fc7f SHA1 d4df46898e2d972ff3f1f7378da55107b9715fef SHA256 37c3cf05b052815c0293d5604f5614a053f210fc835e53eb92947111bfbf5e81
-MISC ChangeLog 14546 RMD160 66a96a138723e7cefd4baa3dbad925a02029329f SHA1 1de17dac0fe6c510aeefe6a87d8c048c488e5d59 SHA256 6746fd8f9008befa788b48097f3c26e0811ce929119bc625ae19bd776ff8ea46
+EBUILD openrc-9999.ebuild 10310 RMD160 d733185644f3e0b9be1a4eb4150cef41cb8294d1 SHA1 93546b1e79346744f6b71fd0850ea37640e88403 SHA256 3613ad6d751d81685289bd1d894d354006fad3506255c0f98e56400e4515946c
+MISC ChangeLog 14685 RMD160 a6d2709ad626ac43e3752ed16195787b925a49a6 SHA1 e855e36745aae8864bb983a12668accf24b969a9 SHA256 8ca7fa1ee1d109b3554a42d5602bf82837f903a474e602eeab88d99fed6229eb
 MISC metadata.xml 314 RMD160 ff92ab9cd3f1f3caf25d0be59cf658343d44991c SHA1 d9febb1ce1499c949a2478defda945a3ce716f73 SHA256 4eb82a61b3697027b5ccb1a328a763308c7e090aa23f69fe87b7b7966165fb33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkogaHUACgkQn/5bYzqsSmEZsgCfZV54ML1klT0eLZS7z5ky9bzn
-D18An0j1zqvz+ppbsX4VlI5Jlu4/xyIj
-=uaKY
+iEYEARECAAYFAkos+ekACgkQn/5bYzqsSmGFggCdHv4WFAc4pAhSBDlJsxo2NlW9
+qGsAnR7PvZDhC434sDjErejPsdWdYBRF
+=bfqz
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 64857fa4c7d2..3e75dcec9cdf 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,17 +1,19 @@
 # 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.46 2009/05/29 22:57:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.47 2009/06/08 11:45:39 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://roy.marples.name/openrc.git"
 	inherit git
+	KEYWORDS=""
 else
 	SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2
 		mirror://gentoo/${P}.tar.bz2
 		http://dev.gentoo.org/~cardoe/files/${P}.tar.bz2
 		http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 fi
 
 DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
@@ -19,7 +21,6 @@ HOMEPAGE="http://roy.marples.name/openrc"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="debug elibc_glibc ncurses pam unicode kernel_linux kernel_FreeBSD"
 
 RDEPEND="virtual/init
@@ -35,10 +36,9 @@ DEPEND="${RDEPEND}
 	virtual/os-headers"
 
 pkg_setup() {
-	LIBDIR="lib"
-	[ "${SYMLINK_LIB}" = "yes" ] && LIBDIR=$(get_abi_LIBDIR "${DEFAULT_ABI}")
+	unset LIBDIR #266688
 
-	MAKE_ARGS="${MAKE_ARGS} LIBNAME=${LIBDIR}"
+	MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir)"
 
 	local brand="Unknown"
 	if use kernel_linux ; then
@@ -62,6 +62,7 @@ src_unpack() {
 		unpack ${A}
 	fi
 	cd "${S}"
+	sed -i 's:0444:0644:' mk/sys.mk
 	epatch "${FILESDIR}"/9999/*.patch
 }
 
@@ -77,17 +78,21 @@ src_compile() {
 	fi
 
 	tc-export CC AR RANLIB
-	echo emake ${MAKE_ARGS}
 	emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed"
 }
 
 src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install || die "make install failed"
+	emake ${MAKE_ARGS} DESTDIR="${D}" install || die
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${D}"/$(get_libdir)/lib{einfo,rc}* "${D}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
 	gen_usr_ldscript libeinfo.so
 	gen_usr_ldscript librc.so
 
-	keepdir /"${LIBDIR}"/rc/init.d
-	keepdir /"${LIBDIR}"/rc/tmp
+	keepdir /$(get_libdir)/rc/{init.d,tmp}
 
 	# Backup our default runlevels
 	dodir /usr/share/"${PN}"