add new revision for testing openrc. bug 415895

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

3 files changed, 163 insertions, 26 deletions

diff --git a/sys-apps/baselayout-prefix/ChangeLog b/sys-apps/baselayout-prefix/ChangeLog
index 8ec922bb7bd1..156b4cc6a7a4 100644
--- a/sys-apps/baselayout-prefix/ChangeLog
+++ b/sys-apps/baselayout-prefix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/baselayout-prefix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.18 2012/05/24 04:19:13 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.19 2012/08/07 13:31:03 heroxbd Exp $
+
+*baselayout-prefix-1.12.14-r1 (07 Aug 2012)
+
+  07 Aug 2012; Benda Xu <heroxbd@gentoo.org>
+  +baselayout-prefix-1.12.14-r1.ebuild:
+  add new revision for testing openrc. bug 415895
 
   24 May 2012; Jeremy Olexa <darkside@gentoo.org>
   -baselayout-prefix-1.12.5-r9.ebuild, -baselayout-prefix-1.12.5-r10.ebuild:
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index 26646b5a63ab..513602a4c7ee 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX baselayout-1.12.5-aix.patch 2462 RMD160 63ef5b25f51ac773ae77fb4afc01b53221c144ae SHA1 01c299e2761247675192fe04619b11ebe02ddff3 SHA256 78e193dd8d68e2fc7ca32bca1059a20943231197bff3db07b8ef3ea3659d5f6b
 AUX baselayout-1.12.5-darwin-kvm.patch 431 RMD160 66200390deb12673cb11370b3d8bbf20551eba5e SHA1 679c7d152c3858800bf0e319134bce615d47e6be SHA256 2a6513beeffdb62af9cca8eafd3fa4ca3b2ab892fbe771a79ce0593be64f849f
 AUX baselayout-1.12.5-gnulib.patch 2110 RMD160 87007dc493c8a0489c08c96de9497d36da31fd31 SHA1 7d77ea55d3bb8da7d05a1d7970c38def4b9dfc4e SHA256 377ca60f1439e88de65972b6bed89f65441063c26afecae06d83eaf5de74645b
@@ -18,30 +15,10 @@ AUX baselayout-1.12.5-prefix.patch 14807 RMD160 5be4ca65ee754d1c95bb00c488ddd5a7
 AUX baselayout-1.12.5-solaris.patch 1860 RMD160 92f3ab1b092c0a81b924dfe90312311d3502a2b0 SHA1 4170e03100a24bfb821cf61c0e2fcdaeb77dda0d SHA256 2d2f304af9e975507793dbe6ff1a360317bef1758ac0b601dffbfad69ec2d93b
 AUX baselayout-1.12.5-strsep.patch 778 RMD160 8447c3a7908bfbd3c3385e2b521f6c042d78a8aa SHA1 122611f8badb4432f41dad47b4a5e75e39c7de9b SHA256 81b1dbaeef76e8c394f2c2c61407dd5ede20dc0ab682be206163eda30b743fe9
 AUX baselayout-1.12.5-termios_h.patch 893 RMD160 398140de16da1b2fb874ef00f1caaa6c828372f4 SHA1 b3debc214fe8edbf734611990901018e32ea289b SHA256 60b4251ebce7488b415686178a0eae207adf18240f80523dbc0b4bc70a53ae99
-DIST baselayout-1.12.5-gnulib-2.tar.bz2 118355 RMD160 b8ffd7fb21f709e82e268358cff229cdde81df97 SHA1 23b06d800c0381e9dc124b270b53ace665730288 SHA256 ca279cbca8a0b39aa247e5ce56eadc3e2dba557cf5765be7a1971ffe12953900
-DIST baselayout-1.12.5.tar.bz2 220693 RMD160 85f03fe3b0ff0521ec4226a1b6788575052923b7 SHA1 39ef351ceec1238cbf27d7b9671f244ccf5cca33 SHA256 4ab5512f35c547549b0406221ed92c71a5a86a11044f1d9f0d87f7ec44d39817
 DIST baselayout-prefix-1.12.14.1709.tar.bz2 461562 RMD160 d11ff408a30941a33809537e7dc43810362b77fa SHA1 9a492e3e31efe47799b58a0f78139bb5b07ce82d SHA256 ca1eec028b7ec72f1e3196f71eafd564062d9b677569698fe41ac5f817c9379e
 DIST baselayout-prefix-1.12.5.1701.tar.bz2 412843 RMD160 ccad4b88bfc00f84fe0837c82e5e21d121f1f106 SHA1 99261aeae6a286be1584bec912052d79860aaf98 SHA256 452ee800e37c65d9c44e77130f0ea9f082e05df2f9a673523fe2e03170fa3099
+EBUILD baselayout-prefix-1.12.14-r1.ebuild 4591 RMD160 9df431fd2be9d0b69d794c903d677cddbbbb9215 SHA1 6de0823d60dd0564df38e02c163f35a66d8f7cdc SHA256 b783448e4d1565ca45855447ae690235ca58e05464323aae0f4ab3c12a1026a5
 EBUILD baselayout-prefix-1.12.14.ebuild 5389 RMD160 f470ee0b9b0d493941591ca3b1a780971c934809 SHA1 a23f809a6de1e02facdf709a879ff6afcadcfc5b SHA256 083974adb065d0205f588ebcab5013bf379cecce17b31a86a198edd7d8177658
-EBUILD baselayout-prefix-1.12.5-r10.ebuild 6795 RMD160 0a497abd9b0423728c1d41364a9946d13a579846 SHA1 62c4bc0667c8a8fdc4fc6edd4b5c492b71371a23 SHA256 049410dceb49865913129388f7a0a10cddad9522a6f26fde74f3588081d8e247
 EBUILD baselayout-prefix-1.12.5-r11.ebuild 5261 RMD160 2d499256ee5d6d2fdec12938f1164d18166de107 SHA1 e590eeec647916a57362a0407d563f67dbc90dc7 SHA256 0c646a03af85f78ed81fee96050621e1f5b09e3e2155c69bb883fcf6b9d8346d
-EBUILD baselayout-prefix-1.12.5-r9.ebuild 6096 RMD160 c25f8d64a01d4eb17f0f268546964573702e8b24 SHA1 d96b0b3e2e30df246f6a6b8ea17ceef09b9f97c4 SHA256 01bccfcd741212f1c2f93170f76b6c15fd6af8e9f65860eca36007e70249e2d9
-MISC ChangeLog 8237 RMD160 3813da1dd5b5c3902e42daf1ffcf35400d029d1b SHA1 b02d3583092205010d0cb95a8f214836e36005d5 SHA256 7c08fe6fc8165748537119814da2220db443c7b6cd567447d405349496078ad3
+MISC ChangeLog 8569 RMD160 f955f0542110af6ff7139fb308e220ae272eca5c SHA1 51a7edd3d59087d4a7315ce2eaefd2458d581a77 SHA256 06110bd775e3fff5dd89f8d4becb141578c8c83f6fec45be2cecb342d6fdf990
 MISC metadata.xml 296 RMD160 ddaf5bd02a55ac77bbaa810f7a02c000b3f69339 SHA1 c7bc61d05afd2ca9b23c42adb6a3fda56d81f79b SHA256 99687144efc36586c7f5aa897107c38c9efff985ac77e6e555d9f5f9ff0490ff
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPvbYCAAoJELEHsLL7fEFWUicQAMfzQMibp0l5NBHJ7VjbuVfP
-X4J4pOhJlRRorjYNR7jO6OLAK8Q2sZc1ifkRRO2zcJ3FNjTttBakaOaI7ZF2f9Xd
-ZJErLQ3uBW4UC0944wQzokY9F3hcJSFwRrMPTm/ziaDKC/ScrKF+7AfaAzTqpUse
-7P0FNGWq+FMS/jvJzwZCUrOJHpZ6ggwFwzTG5/C9WlNLrx0Z88kO5cIcb3AfeVwQ
-9sbJkguZ1uRKRUSWcjm2oSckYxN8ahKw98NjzkQ6ihPQizsTRNSEiQPd7/gGyfnF
-7K5neIQY+qkmdWIAgsz2rtvkgq9rZlLSVmKg9TDQW57Vw989pQtz8CM4+9uiIIm+
-4r/lyhz7/LwU7hGlVFk1KM02VjcAPCQXVqrYN9Blw5Ys7VNc3A562RuLy9LmjQhh
-mgrLF2A7J4cY9p6CISeSLrsoGA2dfu5QVXmaHgJhbu32zThf392J80dUCs4wt5xA
-5yeRK0V7B0a1r0FIcft2fAoDC5p9e3Op0U3aWdJan3UCYjAF51eO7TSrJTCbTawS
-u+vUZS9EttoLROX6JFArA65Jg8DvAo4popzeq3gq6hOESLzSNY+UpNPW5Y5ec1Pv
-YoN8DETyGLz6w4o+yml2CQfA9d5TWqgAkMeMm8KAcqADAvFFVF2ZjPqd1li6/2X8
-UEvDkffFUyNiehYssaym
-=SOeo
------END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14-r1.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14-r1.ebuild
new file mode 100644
index 000000000000..1b0dc738018a
--- /dev/null
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14-r1.ebuild,v 1.1 2012/08/07 13:31:03 heroxbd Exp $
+
+EAPI=3
+
+inherit eutils toolchain-funcs multilib prefix flag-o-matic
+
+# last part in e.g. 1.12.14.1704
+PVER=1709
+
+DESCRIPTION="Baselayout for Gentoo Prefix installs"
+HOMEPAGE="http://prefix.gentoo.org/"
+SRC_URI="http://dev.gentoo.org/~grobian/distfiles/${P}.${PVER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="prefix-chaining"
+DEPEND=">=sys-apps/portage-2.2.01"
+RDEPEND=">=sys-libs/readline-5.0-r1
+	>=app-shells/bash-3.1_p7
+	>=sys-apps/coreutils-5.2.1
+	kernel_Darwin? ( sys-process/pidof-bsd )
+	kernel_FreeBSD? ( sys-process/pidof-bsd )"
+
+S=${WORKDIR}/${P}.${PVER}
+
+src_prepare() {
+	if use prefix-chaining; then
+		epatch "${S}"/baselayout-${PV}-prefix-chaining.patch
+
+		# need to set the PKG_CONFIG_PATH globally for this prefix, when
+		# chaining is enabled, since pkg-config may not be installed locally,
+		# but still .pc files should be found for all RDEPENDable prefixes in
+		# the chain.
+		echo "PKG_CONFIG_PATH=\"${EPREFIX}/usr/lib/pkgconfig:${EPREFIX}/usr/share/pkgconfig\"" >> "${S}"/etc/env.d/00basic
+	fi
+
+	cd "${S}"
+	eprefixify \
+		etc/env.d/00basic \
+		etc/profile \
+		sbin/functions.sh
+
+	# add the host OS MANPATH
+	echo 'MANPATH="/usr/share/man"' > etc/env.d/99basic || die "can't make file"
+
+	# avoid a re-automake run
+	touch -r gnulib/configure.ac gnulib/Makefile.in gnulib/aclocal.m4 || die
+}
+
+src_configure() {
+	cd gnulib || die
+	default
+}
+
+src_compile() {
+	# build gnulib first
+	pushd gnulib > /dev/null || die
+	emake || die "Cannot build gnulib"
+	popd > /dev/null
+
+	# use gnulib (buildsystem doesn't respect cppflags)
+	append-cflags -I../gnulib -I../gnulib/gllib
+	append-ldflags -L../gnulib/gllib
+	append-libs gnu
+
+	local libdir="lib"
+
+	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
+}
+
+src_install() {
+	local dir libdirs libdirs_env rcscripts_dir
+
+	dodir /etc
+	dodir /etc/env.d
+	dodir /etc/init.d			# .keep file might mess up init.d stuff
+
+	libdirs=$(get_all_libdirs)
+	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+
+	rcscripts_dir="/lib/rcscripts"
+
+	for dir in ${libdirs}; do
+		libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
+		[[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue
+		dodir /"${dir}"
+		dodir /usr/"${dir}"
+		dodir /usr/local/"${dir}"
+	done
+
+	# Ugly compatibility with stupid ebuilds and old profiles symlinks
+	if [[ ${SYMLINK_LIB} == "yes" ]] ; then
+		rm -r "${ED}"/{lib,usr/lib,usr/local/lib} &> /dev/null
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
+	fi
+
+	# FHS compatibility symlinks stuff
+	dosym /var/tmp /usr/tmp
+
+	# rc-scripts version for testing of features that *should* be present
+	echo "Gentoo Prefix Base System version ${PV}" > ${ED}/etc/gentoo-release
+
+	# get the basic stuff in there
+	doenvd "${S}"/etc/env.d/* || die "doenvd"
+
+	# copy the profile
+	cp "${S}"/etc/profile "${ED}"/etc/profile
+
+	# Setup files in /sbin
+	#
+	cd "${S}"/sbin
+	into /
+	# These moved from /etc/init.d/ to /sbin to help newb systems
+	# from breaking
+	dosbin functions.sh
+
+	# Compat symlinks between /etc/init.d and /sbin
+	# (some stuff have hardcoded paths)
+	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
+
+	#
+	# Install baselayout utilities
+	#
+	local libdir="lib"
+	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
+}
+
+pkg_postinst() {
+	if [[ ${EUID} == 0 ]] ; then
+		# setup portage user, such that things that require root privs
+		# don't fail, bug #321623
+		enewgroup portage 250
+		enewuser portage 250 -1 "${EPREFIX}"/var/tmp/portage portage
+	fi
+
+	# This is also written in src_install (so it's in CONTENTS), but
+	# write it here so that the new version is immediately in the file
+	# (without waiting for the user to do etc-update)
+	rm -f "${EROOT}"/etc/._cfg????_gentoo-release
+	echo "Gentoo Prefix Base System version ${PV}" > "${EROOT}"/etc/gentoo-release
+
+	echo
+	einfo "Please be sure to update all pending '._cfg*' files in /etc,"
+	einfo "else things might break!  You can use 'etc-update'"
+	einfo "to accomplish this:"
+	einfo
+	einfo "  # etc-update"
+	echo
+}