Move away from einfo (bug #504284) to solve bugs #538374 and #513070

Package-Manager: portage-2.2.14-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

3 files changed, 98 insertions, 17 deletions

diff --git a/sys-apps/baselayout-prefix/ChangeLog b/sys-apps/baselayout-prefix/ChangeLog
index 2f1a491ac4b4..9d146b749919 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.37 2014/02/12 19:57:23 redlizard Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.38 2015/02/28 14:07:30 grobian Exp $
+
+*baselayout-prefix-2.2-r4 (28 Feb 2015)
+
+  28 Feb 2015; Fabian Groffen <grobian@gentoo.org>
+  +baselayout-prefix-2.2-r4.ebuild:
+  Move away from einfo (bug #504284) to solve bugs #538374 and #513070
 
   12 Feb 2014; redlizard <redlizard@gentoo.org> baselayout-prefix-2.2-r3.ebuild:
   Bump einfo version for fixes for platforms without visibility(hidden) support.
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index a59d52bbf62b..09c3a8989c59 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -27,22 +27,13 @@ EBUILD baselayout-prefix-1.12.14-r1.ebuild 4409 SHA256 203165f570642665971db9426
 EBUILD baselayout-prefix-1.12.14.ebuild 5389 SHA256 083974adb065d0205f588ebcab5013bf379cecce17b31a86a198edd7d8177658 SHA512 aea398e212550284dca9a06a4d78e0c72b77910c29fcb3582129635624c3dae2bad87f4ab8a5cd8c93ffa16d39e11fe0d7841b0570777f5569ae5442a4b514b3 WHIRLPOOL 679c3d017891a85cd0ad8fa1c5540355cbb2b0fe3f86ea47dca86f225c4073ca510c44c4b1117c2926d09102b97eaef86d7cd714aec2c8941888e3a5a4411014
 EBUILD baselayout-prefix-1.12.5-r11.ebuild 5261 SHA256 0c646a03af85f78ed81fee96050621e1f5b09e3e2155c69bb883fcf6b9d8346d SHA512 ebbfc991734ffbf98ce46c985acda7f8fe0b52218ef35f8e03bbbcfc5f5cb9089badf40c8ecee93dda115956b18965a26729382185a813e138c79d269deae174 WHIRLPOOL 77b94032b729005983296f12bb1e7013db898c9f7e46d6fb89da1aa49b5faa64dbd5adfc71c882650983cc28889d62e34aa992b94612f721a48aebbcf0f06d83
 EBUILD baselayout-prefix-2.2-r3.ebuild 3245 SHA256 970753807c8278fe61bec0e59baae3244dcb5c6b4c13e0a48f201bafb9e2a340 SHA512 987064d2752406d7ef49d1a2f796234243202bfb5b924e321c58de9b958cce421933c7a4cc1c91b80768a855784525ab4a79a24cfecd9fe59e00ad57619bb6bf WHIRLPOOL 86751f0e30ca38868a7db7dc8e97bcd257f973246668c05587ace224f1a39774be559e6bfc9aa8ddb6da4f95a4388909c076b3e087ac44b5ec15496358058c0e
-MISC ChangeLog 11614 SHA256 8a07944ffd432210d2f065bd40f829f2ec2c0306ee6be1b67193a391940854c8 SHA512 72fe6d0e17ef99648fc01f2c8194f8ece456225b7a79d2b539d68c7b32d32ae69ffd613045488c8079a868db2a2c7fa35e767da61b32a6b809a3ebc25eb0fe57 WHIRLPOOL b166714707f95f3cb797894c955ee717449a75f763afcf5f7a33a935a49cce6fb12708706094b985ec5911c9fd2a097edfcdd79440aa089a2141c746a4bfd817
+EBUILD baselayout-prefix-2.2-r4.ebuild 3034 SHA256 fb25f9f220b614c9c5550a981386bd7e4eb3c91e21605efa900e1cc9fcb47655 SHA512 e88c17944846d409427a584e7d4435157dcbee23ed73ec0232484d94ef08d4ef0b7854c965ae089322b6028777c4852f252cf36deaef1ae102059198cd9c9570 WHIRLPOOL a1a9b289f5ca14ba87c747f921592d0cd9a6ea1e3aef78de7f61bbb3db01a589bad480001ef48af046098d752c45f1f3fc55e6986f33e3bf02ed64bf32ecd8b4
+MISC ChangeLog 11812 SHA256 5de6c002b02ad2ee0eeef423408f0a471e212b7a71afb36ae1d066dea783d944 SHA512 16e6a769e3358607354f76b8784c615935feb99bf0c1421070879b67b7a31def196a51685fe2ba4e9ae853787a45ace6a5016607d1b0bf21427089eb4801c303 WHIRLPOOL 4fcf8b04eccead2cdff3a36cdb88f04feef83f35cd9844a31d092a2012d1413bae2dacf8f3a03f5e1cd06cc503293ded0cf995d0323e5117412bf7ffaf4df77f
 MISC metadata.xml 296 SHA256 99687144efc36586c7f5aa897107c38c9efff985ac77e6e555d9f5f9ff0490ff SHA512 f81ae448ab1a0c422d6ca54a6611c63742387e13174b8b37ff8a114ad715c75d57fc6d490c9f73a8513f5a810436048d4188ad1def72f686a04c0b277a9d9c61 WHIRLPOOL 4e79826481a9e21662b853a587b3020a8ef9f1fe3a30f25ba83c1983f52b919288eb3f705232e4eeead76f6f1f631b0bc281093a01ba3f97465c098c6c7e97cb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJS+9IlAAoJEMcu9QQQ+wFrSUgQAJ9gqwB/6VcBn7khqbdj+i50
-t5EY0pKnF3HlALg74NXdUEOl1gRMAgj2vEHk19JWqlhuN1Qha33q57m7orK6SW7e
-wCCn0Gi1ko6QO8xLvll+3vd94tpwNKbVXpmr+kvODb7pvkMbG+Y7DDkJ2KSQjivw
-zyNi+BbRSVxmMBKvK72mvyaaZYyYuYBCBU49XoiA8IPDOn1J37u5LbVXqCXvT6LU
-VUdvxqzNpKJl476M8+blmq1zXsdgdfnyIoIiaIRB1/H0B+As0l4QnHdtTijwt38a
-zfjatr5LFAcILYH0oI5IM+L2yjJ21pekdxMaI0nHuUJbU6xQbEoVGKlATlor8C8+
-bXvUG/38R33suF53oET+X5EmQFdJFANXWxjrImch6n2pJK7uXYOMRj9nCROUWzby
-GKtPJeP4MbWY7/4F14vJSpqkOvrhcHWfVjOHELufugvPgePGB3Zd8Yd9yQ4jVM1H
-dbFozjp32iCACfgu2nNYj7HLc7cNdtFbx7aJsRdpZqv0Gc10kH0wyIRkFT3omner
-1CRkLaHYNDhzUN6DR6XmP8HVN5zKYI9AUBxTdGf/NzvtSK3GBWX22IfnS3gG9S8a
-cyQ2EiqhutYAGAWLKflEqV1r9ToIALqbQEo7e8LgQDyDSq97qhU4t2a/SaBV9rMs
-LULzMunCvCglLSVgb7Xp
-=Z/Lx
+iEYEAREIAAYFAlTxy6MACgkQX3X2B8XHTony4wCgpWNWVLt9LLHe1r/5fa0PenBt
+/V8AoIk/dRyQyPVnj7d4tIxZ/fCKWrDs
+=ltvB
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r4.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r4.ebuild
new file mode 100644
index 000000000000..f6c95b719d8b
--- /dev/null
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r4.ebuild,v 1.1 2015/02/28 14:07:30 grobian Exp $
+
+EAPI=3
+
+inherit eutils multilib libtool
+
+MY_P=${P/-prefix/}  # just use "upstream" sources
+DESCRIPTION="Minimal baselayout for Gentoo Prefix installs"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~vapier/dist/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm ~arm-linux ~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"
+
+RDEPEND="sys-apps/gentoo-functions"
+DEPEND="${RDEPEND}"
+
+pkg_preinst() {
+	# This is written in src_install (so it's in CONTENTS), but punt all
+	# pending updates to avoid user having to do etc-update (and make the
+	# pkg_postinst logic simpler).
+	rm -f "${EROOT}"/etc/._cfg????_gentoo-release
+}
+
+src_install() {
+	# make functions.sh available in /etc/init.d (from gentoo-functions)
+	# Note: we cannot replace the symlink with a file here, or Portage will
+	# config-protect it, and etc-update can't handle symlink to file updates
+	dodir etc/init.d
+	dosym ../../lib/gentoo/functions.sh /etc/init.d/functions.sh
+
+	pushd "${WORKDIR}"/${MY_P} > /dev/null || die
+	dodir etc
+	sed \
+		-e "/PATH=/!s:/\(etc\|usr/bin\|bin\):\"${EPREFIX}\"/\1:g" \
+		-e "/PATH=/s|\([:\"]\)/|\1${EPREFIX}/|g" \
+		-e "/PATH=.*\/sbin/s|\"$|:/usr/sbin:/sbin\"|" \
+		-e "/PATH=.*\/bin/s|\"$|:/usr/bin:/bin\"|" \
+		etc/profile > "${ED}"/etc/profile || die
+	dodir etc/env.d
+	sed \
+		-e "s:/\(etc/env.d\|opt\|usr\):${EPREFIX}/\1:g" \
+		-e "/^PATH=/s|\"$|:${EPREFIX}/usr/sbin:${EPREFIX}/sbin\"|" \
+		etc/env.d/00basic > "${ED}"/etc/env.d/00basic || die
+	dodoc ChangeLog.svn
+	popd > /dev/null
+
+	# add the host OS MANPATH
+	if [[ -d "${ROOT}"/usr/share/man ]] ; then
+		echo 'MANPATH="/usr/share/man"' > "${ED}"/etc/env.d/99basic || die
+	fi
+
+	# rc-scripts version for testing of features that *should* be present
+	echo "Gentoo Prefix Base System release ${PV}" > "${ED}"/etc/gentoo-release
+
+	# FHS compatibility symlinks stuff
+	dosym /var/tmp /usr/tmp
+
+	# add a dummy to avoid Portage shebang errors
+	dodir sbin
+	cat > "${ED}"/sbin/runscript <<- EOF
+		#!/usr/bin/env sh
+		source "${EPREFIX}/lib/gentoo/functions.sh"
+
+		eerror "runscript not supported by Gentoo Prefix Base System release ${PV}" 1>&2
+		exit 1
+	EOF
+	chmod 755 "${ED}"/sbin/runscript || die
+}
+
+pkg_postinst() {
+	# Take care of the etc-update for the user
+	if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
+		mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release
+	fi
+
+	# baselayout leaves behind a lot of .keep files, so let's clean them up
+	find "${EROOT}"/lib/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null
+	find "${EROOT}"/lib/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null
+}