From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 58AE713832E for ; Thu, 28 Jul 2016 12:23:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2CA5AE0B07; Thu, 28 Jul 2016 12:23:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9F33DE0B07 for ; Thu, 28 Jul 2016 12:23:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CB30F340D91 for ; Thu, 28 Jul 2016 12:23:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA2647D7 for ; Thu, 28 Jul 2016 12:23:19 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1469708588.21bc9e82f4c87af7b98f3c1acc29abad18ed3fe4.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild X-VCS-Directories: sys-apps/baselayout-prefix/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 21bc9e82f4c87af7b98f3c1acc29abad18ed3fe4 X-VCS-Branch: master Date: Thu, 28 Jul 2016 12:23:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b92e8418-ba41-40b3-aa17-8c83a5dbee08 X-Archives-Hash: 6c07c25410a6deb75485f84c9411a272 commit: 21bc9e82f4c87af7b98f3c1acc29abad18ed3fe4 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jul 28 12:23:08 2016 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Jul 28 12:23:08 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21bc9e82 sys-apps/baselayout-prefix: bump to provide dummy openrc-run, bug #584054 Package-Manager: portage-2.2.28 .../baselayout-prefix-2.2-r5.ebuild | 85 ++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild new file mode 100644 index 0000000..e4ea357 --- /dev/null +++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils multilib libtool + +MY_P=${P/-prefix/} # just use "upstream" sources +DESCRIPTION="Minimal baselayout for Gentoo Prefix installs" +HOMEPAGE="https://www.gentoo.org/" +SRC_URI="mirror://gentoo/${MY_P}.tar.bz2 + https://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}" + +S=${WORKDIR}/${MY_P} + +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 + + 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 + + # 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/openrc-run not supported by Gentoo Prefix Base System release ${PV}" 1>&2 + exit 1 + EOF + chmod 755 "${ED}"/sbin/runscript || die + cp "${ED}"/sbin/{runscript,openrc-run} || 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 +}