[gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2017-04-13 18:53 Fabian Groffen
  0 siblings, 0 replies; 21+ messages in thread
From: Fabian Groffen @ 2017-04-13 18:53 UTC (permalink / raw
  To: gentoo-commits

commit:     c2aa074d59cbaeecc585db0c14ca9f1f1b203364
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 18:53:37 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 18:53:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2aa074d

sys-apps/baselayout-prefix: remove old (EAPI=3) ebuilds

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-apps/baselayout-prefix/Manifest                |   3 -
 .../baselayout-prefix-1.12.14-r1.ebuild            | 147 -----------------
 .../baselayout-prefix-1.12.14.ebuild               | 181 ---------------------
 .../baselayout-prefix-1.12.5-r11.ebuild            | 179 --------------------
 .../baselayout-prefix-2.2-r3.ebuild                |  95 -----------
 .../baselayout-prefix-2.2-r4.ebuild                |  83 ----------
 6 files changed, 688 deletions(-)

diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index 44b3a225d84..1951dcd2262 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -1,4 +1 @@
 DIST baselayout-2.2.tar.bz2 40744 SHA256 11d4a223b06da545c3e59e07c9195570f334b5b1be05d995df0ebc8ea2203e98 SHA512 a5199c42e835d9f2683cc94f3c4c47ecdc392316c24e0932845736e2e90479b0c5c8ad72ead8e0537f097405b7d7548d00b87b7ff8c9e3651486e3c5c0970b36 WHIRLPOOL 60cc4f7f76c5a45c15303e526decffb3bad2b50ac659b1dd072d2ed4b0eb0b31929a1a733ddb03a31ee5882b889a4efb87206f63ffaa2b11e26d36afd0933a95
-DIST baselayout-prefix-1.12.14.1709.tar.bz2 461562 SHA256 ca1eec028b7ec72f1e3196f71eafd564062d9b677569698fe41ac5f817c9379e SHA512 600cf1a90771deb0f1d2be73dc2b6fbd0708c8b19e4b300a95cb5e5431be05904864cbcf8cd87dd3aefa5827fc8c3324d5249496a37a84ea2f676a25447f5b9e WHIRLPOOL 872f02fa0e4920c1c6fadbfeeee19d52ab1a2ccce32b0eb52e245dc71767cf31110c063946163bc171d6085a50867f74936c397fd6fdf8e9e30b146b06dc8926
-DIST baselayout-prefix-1.12.5.1701.tar.bz2 412843 SHA256 452ee800e37c65d9c44e77130f0ea9f082e05df2f9a673523fe2e03170fa3099 SHA512 87d73943a9210c2ab613a60bed1197fa92fe536bde870f97e28aaa6cbc432d2c94b507f9a78011c2b7e92a09612267c3d23a540bdb5677a836d6dc845af0858b WHIRLPOOL 4a678f1b150a48c85507a09dce57572b98eb7f2c4e22bb57294cc653e7ac896281ed255f39ecc6c45e3a1ddd385ffded1eaec9b3b0412b62320f0e997e8a84ec
-DIST einfo-1.0.6.tar.xz 222368 SHA256 036108a6160c0a5468483e94effc2665d2028b6c64ea22ec607117cbaec564d6 SHA512 d9fabb11621b3ab49aaa0ad318ee6f511ee09d2a4de1cce7da1c3e0b1f8cb9a3b2f5d446f7e6d7b662a21955178ed89cc4c212382aac66d40a774f42f9a53738 WHIRLPOOL ec7bd03ac6f10205f8405fa0c4907af748a95727bb0a3fa20024a5fd215cb19e9eeebabcdba4be4710962d170bd96c47e03258e0f5b03e98449c90a32d0dedf0

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
deleted file mode 100644
index ea24b58f98d..00000000000
--- a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit eutils toolchain-funcs multilib prefix flag-o-matic user
-
-# last part in e.g. 1.12.14.1704
-PVER=1709
-
-DESCRIPTION="Baselayout for Gentoo Prefix installs"
-HOMEPAGE="https://prefix.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.${PVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc-aix ~amd64-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
-
-	# 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
-
-	#
-	# 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
-}

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild
deleted file mode 100644
index e5d3151548c..00000000000
--- a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit eutils toolchain-funcs multilib prefix flag-o-matic user
-
-# last part in e.g. 1.12.14.1704
-PVER=1709
-
-DESCRIPTION="Baselayout for Gentoo Prefix installs"
-HOMEPAGE="https://prefix.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.${PVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc-aix ~amd64-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
-
-	# The consoletype application in this form will only work on Linux
-	[[ ${CHOST} == *-linux-* ]] || epatch "${FILESDIR}"/baselayout-1.12.5-prefix-no-consoletype.patch
-
-	cd "${S}"
-	eprefixify \
-		etc/env.d/00basic \
-		etc/profile \
-		sbin/functions.sh \
-		sbin/runscript.sh \
-		src/runscript.c \
-		sbin/depscan.sh \
-		sbin/rc-daemon.sh \
-		sbin/rc-services.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}")
-
-	# CFLAGS in LD for #370695
-	make -C "${S}"/src \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LIBDIR="${libdir}" || die
-}
-
-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 runscript.sh functions.sh
-
-	# Compat symlinks between /etc/init.d and /sbin
-	# (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	cd "${S}"/sbin
-	into /
-	dosbin depscan.sh
-	insinto ${rcscripts_dir}/awk
-	doins "${S}"/src/awk/functions.awk
-
-	#
-	# Install baselayout utilities
-	#
-	local libdir="lib"
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
-	cd "${S}"/src
-	make DESTDIR="${ED}" LIBDIR="${libdir}" install || die
-
-	insinto ${rcscripts_dir}/sh
-	doins "${S}"/sbin/rc-*
-}
-
-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
-}

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r11.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r11.ebuild
deleted file mode 100644
index ee23226667c..00000000000
--- a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r11.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit eutils toolchain-funcs multilib prefix flag-o-matic user
-
-# baselayout-prefix-1.12.5.1694.tar.bz2
-PVER=1701
-
-DESCRIPTION="Baselayout for Gentoo Prefix installs"
-HOMEPAGE="https://prefix.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.${PVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc-aix ~amd64-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-1.12.5-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
-
-	# The consoletype application in this form will only work on Linux
-	[[ ${CHOST} == *-linux-* ]] || epatch "${FILESDIR}"/${P/-prefix/}-prefix-no-consoletype.patch
-
-	cd "${S}"
-	eprefixify \
-		etc/env.d/00basic \
-		etc/profile \
-		sbin/env-update.sh \
-		sbin/functions.sh \
-		sbin/runscript.sh \
-		src/runscript.c \
-		sbin/depscan.sh \
-		sbin/rc-daemon.sh \
-		sbin/rc-services.sh
-	# add the host OS MANPATH
-	echo 'MANPATH="/usr/share/man"' > etc/env.d/99basic || die "can't make file"
-}
-
-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
-	append-flags -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}")
-
-	make -C "${S}"/src \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC) ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LIBDIR="${libdir}" || die
-}
-
-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 runscript.sh functions.sh
-
-	# Compat symlinks between /etc/init.d and /sbin
-	# (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	cd "${S}"/sbin
-	into /
-	dosbin depscan.sh
-	dosbin env-update.sh
-	insinto ${rcscripts_dir}/awk
-	doins "${S}"/src/awk/functions.awk
-
-	#
-	# Install baselayout utilities
-	#
-	local libdir="lib"
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
-	cd "${S}"/src
-	make DESTDIR="${ED}" LIBDIR="${libdir}" install || die
-
-	insinto ${rcscripts_dir}/sh
-	doins "${S}"/sbin/rc-*
-}
-
-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
-}

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r3.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r3.ebuild
deleted file mode 100644
index 6b363391ba7..00000000000
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit eutils multilib libtool
-
-MY_P=${P/-prefix/}  # just use "upstream" sources
-EINFO=einfo-1.0.6
-DESCRIPTION="Minimal baselayout and e-functions 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
-	https://dev.gentoo.org/~redlizard/distfiles/${EINFO}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~ppc-aix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="build kernel_linux"
-
-S=${WORKDIR}/${EINFO}
-
-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_prepare() {
-	# exotic platforms still aren't fixed in upstream libtool
-	elibtoolize
-}
-
-src_configure() {
-	econf --libexecdir="${EPREFIX}/usr/lib/einfo"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# make functions.sh available in /etc/init.d
-	# 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 ../../usr/lib/einfo/sh/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
-		#!/bin/sh
-
-		echo "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
-}

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r4.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r4.ebuild
deleted file mode 100644
index 063be78ae12..00000000000
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-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 ~ppc-aix ~amd64-linux ~arm-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
-}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2022-04-07 15:31 Jakov Smolić
  0 siblings, 0 replies; 21+ messages in thread
From: Jakov Smolić @ 2022-04-07 15:31 UTC (permalink / raw
  To: gentoo-commits

commit:     6220200bfeaaaf53a956ee3a27710fc25b23e60e
Author:     Atharva Amritkar <atharvaamritkar <AT> protonmail <DOT> com>
AuthorDate: Tue Apr  5 14:04:34 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 15:30:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6220200b

sys-apps/baselayout-prefix: Keyword 2.6-r3 for ~riscv

Signed-off-by: Atharva Amritkar <atharvaamritkar <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24904
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild
index 0c5f5bbe14e1..72df7fd7769c 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
-	KEYWORDS="~arm ~arm64 ~ppc64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~arm ~arm64 ~ppc64 ~riscv ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 LICENSE="GPL-2"


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2022-01-04 10:30 David Seifert
  0 siblings, 0 replies; 21+ messages in thread
From: David Seifert @ 2022-01-04 10:30 UTC (permalink / raw
  To: gentoo-commits

commit:     0f39432c102f7d7583c5022066f98273c85e6d9c
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  4 10:29:53 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jan  4 10:29:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f39432c

sys-apps/baselayout-prefix: remove implicit kernel_linux

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild
index a18a74ad4aa5..0c5f5bbe14e1 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="build kernel_linux +split-usr"
+IUSE="build +split-usr"
 
 RDEPEND="!sys-apps/baselayout"  #681760
 


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2022-01-04  3:29 Sam James
  0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2022-01-04  3:29 UTC (permalink / raw
  To: gentoo-commits

commit:     4caf5d3510c6e2ab88ba86c30e7aa7a3a6a5d882
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  3 16:23:00 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan  4 03:28:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4caf5d35

sys-apps/baselayout-prefix: remove kernel_FreeBSD

Signed-off-by: David Seifert <soap <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild
index d7bbee519208..a18a74ad4aa5 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+IUSE="build kernel_linux +split-usr"
 
 RDEPEND="!sys-apps/baselayout"  #681760
 
@@ -227,8 +227,7 @@ src_configure() {
 	# although having a prefix, RAP uses full Linux baselayout
 	OS=$(usex prefix-stack prefix-stack \
 		 $(usex prefix-guest prefix-guest \
-		   $(usex kernel_FreeBSD BSD \
-			 Linux ) ) )
+		   Linux ) )
 	# set up immutable Makefile variables once
 	sed -e "/^EPREFIX\s*?\?=\s*$/s|?\?=.*|= ${EPREFIX}|" \
 		-e   "/^BROOT\s*?\?=\s*$/s|?\?=.*|= ${BROOT}|" \


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2021-02-06 10:14 Fabian Groffen
  0 siblings, 0 replies; 21+ messages in thread
From: Fabian Groffen @ 2021-02-06 10:14 UTC (permalink / raw
  To: gentoo-commits

commit:     f53e3c17a2717ee624b037295b9e73c8b8a42b32
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  6 10:14:17 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb  6 10:14:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f53e3c17

sys-apps/baselayout-prefix: revbump for Darwin MANPATH update

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 ...elayout-prefix-2.6-r2.ebuild => baselayout-prefix-2.6-r3.ebuild} | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild
similarity index 98%
rename from sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
rename to sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild
index 837a4b03356..d7bbee51920 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild
@@ -240,6 +240,12 @@ src_install() {
 	emake ROOT="${ROOT}" DESTDIR="${D}" install
 	dodoc ChangeLog
 
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# add SDK path which contains development manpages
+		echo "MANPATH=${EPREFIX}/MacOSX.sdk/usr/share/man" \
+			> "${ED}"/etc/env.d/98macos-sdk
+	fi
+
 	# need the makefile in pkg_preinst
 	insinto /usr/share/${PN}
 	doins Makefile


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2021-01-18 18:22 Fabian Groffen
  0 siblings, 0 replies; 21+ messages in thread
From: Fabian Groffen @ 2021-01-18 18:22 UTC (permalink / raw
  To: gentoo-commits

commit:     46e8c3d51b5fa54d598bbfbdbb7c55877c444d1f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 18:21:11 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 18:22:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46e8c3d5

sys-apps/baselayout-prefix: add blocker on sys-apps/baselayout

Closes: https://bugs.gentoo.org/681760
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-apps/baselayout-prefix/Manifest                |   1 -
 .../baselayout-prefix-2.2-r5.ebuild                |  86 ------
 .../baselayout-prefix-2.6-r1.ebuild                | 336 ---------------------
 .../baselayout-prefix-2.6-r2.ebuild                |   2 +
 4 files changed, 2 insertions(+), 423 deletions(-)

diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index 8bc5538d2f3..aa09c5824d1 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -1,4 +1,3 @@
-DIST baselayout-2.2.tar.bz2 40744 BLAKE2B 3a1dfdd64b45d5aa8fb3ff9781aa9b1218095874a0bb6d9dd0d2da4c447945272b25258b53b7ea130f3e1067c799fc4c0d14e577f3a3f749f19d72734136e6e9 SHA512 a5199c42e835d9f2683cc94f3c4c47ecdc392316c24e0932845736e2e90479b0c5c8ad72ead8e0537f097405b7d7548d00b87b7ff8c9e3651486e3c5c0970b36
 DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b5f2dbc72e75f027b0c23a5db9a386c53e756e80240f36ad4d63e3fe421bf9510c18321d7a31fda140ad47b2860 SHA512 5cad5faf56871ae951120643e29db0c39fea6dc845b4755382bd469eca32639ec6cd0cd046d3c439a7cc607b18770036f9c256260d35beaffb094e23cb13740b
 DIST baselayout-prefix-395424f90c8ca6969589905cbf86d74fae9d7ea6.patch 1760 BLAKE2B 227ea5a9f70e927ba19de675f408ad01c4d934575cfeb780a525a4e24afd46d9d91d4e4acf773403cb6ac4a493b81da1cad787a5c0e41096056ad4e233b3cfc8 SHA512 77b4c3cad19251497808b6a07a384846f3ebb2282860d55197cee03d373b16622ef3b6c95e411e1cbb79702f10fe2e9c43cfe4175cca1db3ea6c06c6b2331ac9
 DIST baselayout-prefix-5926fe447541607ed137d67ca84080326584b2fc.patch 809 BLAKE2B 237eb610b6935ec5139299f1dccc6260b31a1d47a82390d713fc759ef37de986de8392a82068c70c1f63f382a9212103025fe019614796f5b6a3b4ed0f81f8b2 SHA512 6cd1bf81d8619be27c20fcd703be9a97cc6129d9c13402172e7f16adf6e9b9eb0238edfd311ca8b98b3898876d2bf9686a2a3905510d26608773a3da5233ee95

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
deleted file mode 100644
index 775cc96e953..00000000000
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib libtool
-
-MY_P=${P/-prefix/}  # just use "upstream" sources
-DESCRIPTION="Minimal baselayout for Gentoo Prefix installs"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-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 ~arm64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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" \
-		etc/profile > "${ED}"/etc/profile || die
-	sed \
-		-e "/PATH=.*\/sbin/s|\"$|:/usr/sbin:/sbin\"|" \
-		-e "/PATH=.*\/bin/s|\"$|:/usr/bin:/bin\"|" \
-		-i "${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
-}

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
deleted file mode 100644
index 902bfdcf575..00000000000
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib
-
-# just use "upstream" sources
-MY_P=${P/-prefix/}
-MY_PN=${PN/-prefix/}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
-	KEYWORDS="~arm ~arm64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="build kernel_FreeBSD kernel_linux +split-usr"
-
-my_prefix_commits=(
-	# commits in reverse order as listed by:
-	# git log --decorate=no --oneline --no-abbrev-commit origin/master..
-	a054fcc408ad48f775f7379834385c6a707d7a53 # also create etc/gentoo-release
-	5926fe447541607ed137d67ca84080326584b2fc # create usr/bin during layout-usrmerge
-	395424f90c8ca6969589905cbf86d74fae9d7ea6 # add prefix-stack support
-	95a8e95af948014d024842892be1405d656ab5fc # add prefix-guest support
-	c88ceddbfc6a965dc0153aef21e012e774d9e30c # sync prefix usage for Makefile target 'layout'
-	c9338e89cdb603c1e08998bba28fbc977a62fc51 # add prefix support per Makefile target 'install'
-)
-for my_c in ${my_prefix_commits[*]}
-do
-	SRC_URI+=" https://github.com/haubi/gentoo-baselayout/commit/${my_c}.patch -> ${PN}-${my_c}.patch"
-	PATCHES=( "${DISTDIR}/${PN}-${my_c}.patch" "${PATCHES[@]}" )
-done
-unset my_prefix_commits my_c
-
-pkg_setup() {
-	multilib_layout
-}
-
-# Create our multilib dirs - the Makefile has no knowledge of this
-multilib_layout() {
-	use prefix && return 0
-	local dir def_libdir libdir libdirs
-	local prefix prefix_lst
-	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
-	libdirs=$(get_all_libdirs)
-	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-
-	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
-		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
-		for prefix in ${prefix_lst[@]}; do
-			for libdir in ${libdirs}; do
-				dir="${prefix}${libdir}"
-				if [[ -e "${dir}" ]]; then
-					[[ ! -d "${dir}" ]] &&
-						die "${dir} exists but is not a directory"
-					continue
-				fi
-				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
-					einfo "symlinking ${dir} to usr/${libdir}"
-					ln -s usr/${libdir} ${dir} ||
-						die " Unable to make ${dir} symlink"
-				else
-					einfo "creating directory ${dir}"
-					mkdir -p "${dir}" ||
-						die "Unable to create ${dir} directory"
-				fi
-			done
-		done
-		return 0
-	fi
-
-	[ -z "${def_libdir}" ] &&
-		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
-
-	# figure out which paths should be symlinks and which should be directories
-	local dirs syms exp d
-	for libdir in ${libdirs} ; do
-		if use split-usr ; then
-			exp=( {,usr/,usr/local/}${libdir} )
-		else
-			exp=( {usr/,usr/local/}${libdir} )
-		fi
-		for d in "${exp[@]}" ; do
-			# most things should be dirs
-			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
-				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
-			else
-				[ -h "${d}" ] && syms+=" ${d}"
-			fi
-		done
-	done
-	if [ -n "${syms}${dirs}" ] ; then
-		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
-		ewarn "have these paths configured as follows:"
-		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
-		[ -n "${syms}" ] && ewarn "directories:${syms}"
-		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
-		ewarn "If things fail, you will need to manually create/move the directories."
-		echo
-	fi
-
-	# setup symlinks and dirs where we expect them to be; do not migrate
-	# data ... just fall over in that case.
-	if use split-usr ; then
-		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
-	else
-		prefix_lst=( "${EROOT}"{usr/,usr/local/} )
-	fi
-	for prefix in "${prefix_lst[@]}"; do
-		if [ "${SYMLINK_LIB}" = yes ] ; then
-			# we need to make sure "lib" points to the native libdir
-			if [ -h "${prefix}lib" ] ; then
-				# it's already a symlink!  assume it's pointing to right place ...
-				continue
-			elif [ -d "${prefix}lib" ] ; then
-				# "lib" is a dir, so need to convert to a symlink
-				ewarn "Converting ${prefix}lib from a dir to a symlink"
-				rm -f "${prefix}lib"/.keep
-				if rmdir "${prefix}lib" 2>/dev/null ; then
-					ln -s ${def_libdir} "${prefix}lib" || die
-				else
-					die "non-empty dir found where we needed a symlink: ${prefix}lib"
-				fi
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a symlink"
-				mkdir -p "${prefix}" || die
-				rm -f "${prefix}lib" || die
-				ln -s ${def_libdir} "${prefix}lib" || die
-				mkdir -p "${prefix}${def_libdir}" #423571
-			fi
-		else
-			# we need to make sure "lib" is a dir
-			if [ -h "${prefix}lib" ] ; then
-				# "lib" is a symlink, so need to convert to a dir
-				ewarn "Converting ${prefix}lib from a symlink to a dir"
-				rm -f "${prefix}lib" || die
-				if [ -d "${prefix}lib32" ] ; then
-					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
-					mv "${prefix}lib32" "${prefix}lib" || die
-				else
-					mkdir -p "${prefix}lib" || die
-				fi
-			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
-				# make sure the old "lib" ABI location does not exist; we
-				# only symlinked the lib dir on systems where we moved it
-				# to "lib32" ...
-				case ${CHOST} in
-				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
-				i?86*|x86_64*|powerpc*|sparc*|s390*)
-					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
-						rm -f "${prefix}lib32"/.keep
-						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
-							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
-							die "non-empty dir found where there should be none: ${prefix}lib32"
-						fi
-					fi
-					;;
-				esac
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a dir"
-				mkdir -p "${prefix}lib" || die
-			fi
-		fi
-	done
-	if ! use split-usr ; then
-		for libdir in ${libdirs}; do
-			if [[ ! -e "${EROOT}${libdir}" ]]; then
-				ln -s usr/"${libdir}" "${EROOT}${libdir}"
-			fi
-		done
-	fi
-}
-
-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
-
-	# We need to install directories and maybe some dev nodes when building
-	# stages, but they cannot be in CONTENTS.
-	# Also, we cannot reference $S as binpkg will break so we do this.
-	multilib_layout
-	if use build ; then
-		if use split-usr ; then
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout
-		else
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout-usrmerge
-		fi
-	fi
-	rm -f "${ED}"/usr/share/${PN}/Makefile
-}
-
-src_prepare() {
-	default
-
-	# handle multilib paths.  do it here because we want this behavior
-	# regardless of the C library that you're using.  we do explicitly
-	# list paths which the native ldconfig searches, but this isn't
-	# problematic as it doesn't change the resulting ld.so.cache or
-	# take longer to generate.  similarly, listing both the native
-	# path and the symlinked path doesn't change the resulting cache.
-	local libdir ldpaths
-	for libdir in $(get_all_libdirs) ; do
-		ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}"
-		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
-	done
-	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
-}
-
-src_configure() {
-	local OS
-	# although having a prefix, RAP uses full Linux baselayout
-	OS=$(usex prefix-stack prefix-stack \
-		 $(usex prefix-guest prefix-guest \
-		   $(usex kernel_FreeBSD BSD \
-			 Linux ) ) )
-	# set up immutable Makefile variables once
-	sed -e "/^EPREFIX\s*?\?=\s*$/s|?\?=.*|= ${EPREFIX}|" \
-		-e   "/^BROOT\s*?\?=\s*$/s|?\?=.*|= ${BROOT}|" \
-		-e      "/^OS\s*?\?=\s*$/s|?\?=.*|= ${OS}|" \
-		-i Makefile || die
-}
-
-src_install() {
-	emake ROOT="${ROOT}" DESTDIR="${D}" install
-	dodoc ChangeLog
-
-	# need the makefile in pkg_preinst
-	insinto /usr/share/${PN}
-	doins Makefile
-
-	use prefix-guest || return 0
-
-	# 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() {
-	local x
-
-	# We installed some files to /usr/share/baselayout instead of /etc to stop
-	# (1) overwriting the user's settings
-	# (2) screwing things up when attempting to merge files
-	# (3) accidentally packaging up personal files with quickpkg
-	# If they don't exist then we install them
-	for x in master.passwd passwd shadow group fstab ; do
-		[ -e "${EROOT}/etc/${x}" ] && continue
-		[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
-		cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc
-	done
-
-	# Force shadow permissions to not be world-readable #260993
-	for x in shadow ; do
-		[ -e "${EROOT}/etc/${x}" ] && chmod o-rwx "${EROOT}/etc/${x}"
-	done
-
-	# 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
-
-	# whine about users that lack passwords #193541
-	if [[ -e "${EROOT}"/etc/shadow ]] ; then
-		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
-		if [[ -n ${bad_users} ]] ; then
-			echo
-			ewarn "The following users lack passwords!"
-			ewarn ${bad_users}
-		fi
-	fi
-
-	# whine about users with invalid shells #215698
-	if [[ -e "${EROOT}"/etc/passwd ]] ; then
-		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
-		if [[ -n ${bad_shells} ]] ; then
-			echo
-			ewarn "The following users have non-existent shells!"
-			ewarn "${bad_shells}"
-		fi
-	fi
-
-	# https://bugs.gentoo.org/361349
-	if use kernel_linux; then
-		mkdir -p "${EROOT}"/run
-
-		local found fstype mountpoint
-		while read -r _ mountpoint fstype _; do
-		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
-		done < "${ROOT}"/proc/mounts
-		[[ -z ${found} ]] &&
-			ewarn "You should reboot now to get /run mounted with tmpfs!"
-	fi
-
-	for x in ${REPLACING_VERSIONS}; do
-		if ver_test ${x} -lt 2.4; then
-			ewarn "After updating ${EROOT}/etc/profile, please run"
-			ewarn "env-update && . ${EPREFIX}/etc/profile"
-		fi
-
-		if ver_test ${x} -lt 2.6; then
-			ewarn "Please run env-update then log out and back in to"
-			ewarn "update your path."
-		fi
-		# clean up after 2.5 typos
-		# https://bugs.gentoo.org/show_bug.cgi?id=656380
-		if [[ ${x} == 2.5 ]]; then
-			rm -fr "${EROOT}{,usr"
-		fi
-	done
-
-	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
-		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
-		ewarn "Please migrate your changes."
-	fi
-}

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
index a2a404b6929..837a4b03356 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
@@ -24,6 +24,8 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="build kernel_FreeBSD kernel_linux +split-usr"
 
+RDEPEND="!sys-apps/baselayout"  #681760
+
 my_prefix_commits=(
 	# commits in reverse order as listed by:
 	# git log --decorate=no --oneline --no-abbrev-commit origin/master..


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2021-01-06 15:26 Fabian Groffen
  0 siblings, 0 replies; 21+ messages in thread
From: Fabian Groffen @ 2021-01-06 15:26 UTC (permalink / raw
  To: gentoo-commits

commit:     b3bb6055a8fbb4f63a955ebf2d6cce24a7c36dd1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 15:20:50 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 15:20:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3bb6055

sys-apps/baselayout-prefix: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild | 4 ++--
 sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild | 4 ++--
 sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
index 789cb0accea..775cc96e953 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~arm ~arm64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~arm ~arm64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="sys-apps/gentoo-functions"
 DEPEND="${RDEPEND}"

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
index 1163e18077c..902bfdcf575 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
-	KEYWORDS="~arm ~arm64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~arm ~arm64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 LICENSE="GPL-2"

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
index 5ed070e67db..a2a404b6929 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
-	KEYWORDS="~arm ~arm64 ~ppc64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~arm ~arm64 ~ppc64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 LICENSE="GPL-2"


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2020-12-27 18:13 Fabian Groffen
  0 siblings, 0 replies; 21+ messages in thread
From: Fabian Groffen @ 2020-12-27 18:13 UTC (permalink / raw
  To: gentoo-commits

commit:     ea04b4f8362296f6231951efee4ecf68e3d2a409
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 18:10:24 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 18:13:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea04b4f8

sys-apps/baselayout-prefix: drop ppc-aix m68k-mint

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild | 2 +-
 sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild | 2 +-
 sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
index e0d628e0b93..789cb0accea 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~arm ~arm64 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~arm ~arm64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="sys-apps/gentoo-functions"
 DEPEND="${RDEPEND}"

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
index 80678e5187f..1163e18077c 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
-	KEYWORDS="~arm ~arm64 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~arm ~arm64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 LICENSE="GPL-2"

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
index 32353c78d60..5ed070e67db 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
-	KEYWORDS="~arm ~arm64 ~ppc64 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~arm ~arm64 ~ppc64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 LICENSE="GPL-2"


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2020-12-13  3:01 Benda XU
  0 siblings, 0 replies; 21+ messages in thread
From: Benda XU @ 2020-12-13  3:01 UTC (permalink / raw
  To: gentoo-commits

commit:     adc7a8a24881ce735592c0bb05b2576d6806b531
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 13 02:29:46 2020 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 03:00:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adc7a8a2

sys-apps/baselayout-prefix: keyword ppc64.

This is needed to do Prefix bootstrap on ppc64, to support EESSI.

Suggested-by: Bob Dröge <b.e.droge <AT> rug.nl>
Bug: https://bugs.gentoo.org/755551
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
index 3609b72802b..32353c78d60 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
-	KEYWORDS="~arm ~arm64 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~arm ~arm64 ~ppc64 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 LICENSE="GPL-2"


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2020-02-08 14:18 David Seifert
  0 siblings, 0 replies; 21+ messages in thread
From: David Seifert @ 2020-02-08 14:18 UTC (permalink / raw
  To: gentoo-commits

commit:     37cd66fdf3e5860c732ad052d5afe96212597a12
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  8 14:17:57 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb  8 14:17:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37cd66fd

sys-apps/baselayout-prefix: [QA] Fix BadHomepage

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild | 2 +-
 sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild | 2 +-
 sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
index 5eb365ee62a..4edcdeb30b9 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
@@ -7,7 +7,7 @@ inherit eutils multilib libtool
 
 MY_P=${P/-prefix/}  # just use "upstream" sources
 DESCRIPTION="Minimal baselayout for Gentoo Prefix installs"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
 	https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.bz2"
 

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
index b689642fcbb..c4c13fe0e01 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-prefix/}
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${MY_PN}.git"
 	inherit git-r3

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
index 5d827ac9ef8..1074a131a49 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-prefix/}
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${MY_PN}.git"
 	inherit git-r3


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2019-05-13 15:11 Michael Haubenwallner
  0 siblings, 0 replies; 21+ messages in thread
From: Michael Haubenwallner @ 2019-05-13 15:11 UTC (permalink / raw
  To: gentoo-commits

commit:     7210d0e93e748f4cdfee6b7d42d06dbf3b1215e7
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 15:09:32 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon May 13 15:11:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7210d0e9

sys-apps/baselayout-prefix: prefix-stack: ROOTPATH needs EPREFIX before BROOT

For both EPREFIX and BROOT, portage does add some default PATH before
the env.d ROOTPATH.  Since bug 667662, anything found in env.d ROOTPATH
is not added any more, so env.d ROOTPATH needs to contain BROOT as well,
or we end up with BROOT path before EPREFIX path in ROOTPATH.

Bug: https://bugs.gentoo.org/681760
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 sys-apps/baselayout-prefix/Manifest                |   1 +
 .../baselayout-prefix-2.6-r2.ebuild                | 337 +++++++++++++++++++++
 2 files changed, 338 insertions(+)

diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index f47f264baac..8bc5538d2f3 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -4,5 +4,6 @@ DIST baselayout-prefix-395424f90c8ca6969589905cbf86d74fae9d7ea6.patch 1760 BLAKE
 DIST baselayout-prefix-5926fe447541607ed137d67ca84080326584b2fc.patch 809 BLAKE2B 237eb610b6935ec5139299f1dccc6260b31a1d47a82390d713fc759ef37de986de8392a82068c70c1f63f382a9212103025fe019614796f5b6a3b4ed0f81f8b2 SHA512 6cd1bf81d8619be27c20fcd703be9a97cc6129d9c13402172e7f16adf6e9b9eb0238edfd311ca8b98b3898876d2bf9686a2a3905510d26608773a3da5233ee95
 DIST baselayout-prefix-95a8e95af948014d024842892be1405d656ab5fc.patch 3754 BLAKE2B c64cf440d7dc27bd3c38ad93d242a28e3ae0df6ebef282249996bc2c463aa6c0941ea41fbee236ba77742ba5bff777cd3226054b80abe99a454f39d488f8e1c1 SHA512 8e2d44e9caedfa7159f374e39d416a7ceebd407ea9550d9aa52d0a87a44b7b805b1725f8eefd592eb5fbd9a5f3f851a28c18565f3b0e621530f4c51c109df24e
 DIST baselayout-prefix-a054fcc408ad48f775f7379834385c6a707d7a53.patch 1166 BLAKE2B d9b3135fc77a1941e08c68f0981385bcab412fc4949a70c7b75e11e7f8a6ee1eff6b5be0804d06539ed9f02a6245c0161d3dfd6de9fb0bf68d0d07c724650707 SHA512 822065592f434fcbae42b48d475ac0d188e29773337c3154f162ff830b58dcf44c87e3091933d5a0c0cc7e89e4d0223f60cefc0e525ca29aa3c9a0f9a5e974bf
+DIST baselayout-prefix-bb4c4f5f45b6798f5c9658e0e862077c404c675c.patch 1168 BLAKE2B 241d3dd665a7373563fb413ea9613a0597deb5b1b5213567ed0abf1edb00c495acec9570f5c3b2365c00683cbc32fb9e518666928c73640bebe99d3345fcd764 SHA512 96c4d63b5782e388882760cefd57157927543570a920f66c88cf3c58335c7e05918805510dc6e07f07f06564756482d055987c99b0cca7c31b432936558cadc6
 DIST baselayout-prefix-c88ceddbfc6a965dc0153aef21e012e774d9e30c.patch 2499 BLAKE2B 18f26331aec2b74c119f6064c79540f9a4dd90796841e8db10450b58b0fa7b7e10e6fd6c96e1f1e4b8d47c7cdc31628cf262a55eaca56e0ce23d6505ac73b0e1 SHA512 abd262fcbd3a7df57a9abbe54474517123e8cd8946f377c6e5be848b48b8638636b4e5a424ad76b59d61653c44473ad1423959ff8939ea388ede9514895e1ce2
 DIST baselayout-prefix-c9338e89cdb603c1e08998bba28fbc977a62fc51.patch 9370 BLAKE2B 0e665e08db0ddec93604103d65d6e5a9249afdd55b22106b95e232128b724acd680bc875401cba15bc9aefcc19eddc4cf55b056a83e00a5a3862352470321d04 SHA512 d91c9537f445a8fd4308d5392fc42149e8d08c9ee3282e382995cd32ee531d77d73a94437c9b436b67e8c44aa598147ef63cc79a72ec2e9a83b078c5776ede51

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
new file mode 100644
index 00000000000..5d827ac9ef8
--- /dev/null
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+# just use "upstream" sources
+MY_P=${P/-prefix/}
+MY_PN=${PN/-prefix/}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="https://www.gentoo.org/"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
+	KEYWORDS="~arm ~arm64 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+
+my_prefix_commits=(
+	# commits in reverse order as listed by:
+	# git log --decorate=no --oneline --no-abbrev-commit origin/master..
+	bb4c4f5f45b6798f5c9658e0e862077c404c675c # prefix-stack: ROOTPATH needs EPREFIX before BROOT
+	a054fcc408ad48f775f7379834385c6a707d7a53 # also create etc/gentoo-release
+	5926fe447541607ed137d67ca84080326584b2fc # create usr/bin during layout-usrmerge
+	395424f90c8ca6969589905cbf86d74fae9d7ea6 # add prefix-stack support
+	95a8e95af948014d024842892be1405d656ab5fc # add prefix-guest support
+	c88ceddbfc6a965dc0153aef21e012e774d9e30c # sync prefix usage for Makefile target 'layout'
+	c9338e89cdb603c1e08998bba28fbc977a62fc51 # add prefix support per Makefile target 'install'
+)
+for my_c in ${my_prefix_commits[*]}
+do
+	SRC_URI+=" https://github.com/haubi/gentoo-baselayout/commit/${my_c}.patch -> ${PN}-${my_c}.patch"
+	PATCHES=( "${DISTDIR}/${PN}-${my_c}.patch" "${PATCHES[@]}" )
+done
+unset my_prefix_commits my_c
+
+pkg_setup() {
+	multilib_layout
+}
+
+# Create our multilib dirs - the Makefile has no knowledge of this
+multilib_layout() {
+	use prefix && return 0
+	local dir def_libdir libdir libdirs
+	local prefix prefix_lst
+	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	libdirs=$(get_all_libdirs)
+	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+
+	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
+		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+		for prefix in ${prefix_lst[@]}; do
+			for libdir in ${libdirs}; do
+				dir="${prefix}${libdir}"
+				if [[ -e "${dir}" ]]; then
+					[[ ! -d "${dir}" ]] &&
+						die "${dir} exists but is not a directory"
+					continue
+				fi
+				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
+					einfo "symlinking ${dir} to usr/${libdir}"
+					ln -s usr/${libdir} ${dir} ||
+						die " Unable to make ${dir} symlink"
+				else
+					einfo "creating directory ${dir}"
+					mkdir -p "${dir}" ||
+						die "Unable to create ${dir} directory"
+				fi
+			done
+		done
+		return 0
+	fi
+
+	[ -z "${def_libdir}" ] &&
+		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+
+	# figure out which paths should be symlinks and which should be directories
+	local dirs syms exp d
+	for libdir in ${libdirs} ; do
+		if use split-usr ; then
+			exp=( {,usr/,usr/local/}${libdir} )
+		else
+			exp=( {usr/,usr/local/}${libdir} )
+		fi
+		for d in "${exp[@]}" ; do
+			# most things should be dirs
+			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
+				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
+			else
+				[ -h "${d}" ] && syms+=" ${d}"
+			fi
+		done
+	done
+	if [ -n "${syms}${dirs}" ] ; then
+		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
+		ewarn "have these paths configured as follows:"
+		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
+		[ -n "${syms}" ] && ewarn "directories:${syms}"
+		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
+		ewarn "If things fail, you will need to manually create/move the directories."
+		echo
+	fi
+
+	# setup symlinks and dirs where we expect them to be; do not migrate
+	# data ... just fall over in that case.
+	if use split-usr ; then
+		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+	else
+		prefix_lst=( "${EROOT}"{usr/,usr/local/} )
+	fi
+	for prefix in "${prefix_lst[@]}"; do
+		if [ "${SYMLINK_LIB}" = yes ] ; then
+			# we need to make sure "lib" points to the native libdir
+			if [ -h "${prefix}lib" ] ; then
+				# it's already a symlink!  assume it's pointing to right place ...
+				continue
+			elif [ -d "${prefix}lib" ] ; then
+				# "lib" is a dir, so need to convert to a symlink
+				ewarn "Converting ${prefix}lib from a dir to a symlink"
+				rm -f "${prefix}lib"/.keep
+				if rmdir "${prefix}lib" 2>/dev/null ; then
+					ln -s ${def_libdir} "${prefix}lib" || die
+				else
+					die "non-empty dir found where we needed a symlink: ${prefix}lib"
+				fi
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a symlink"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+				mkdir -p "${prefix}${def_libdir}" #423571
+			fi
+		else
+			# we need to make sure "lib" is a dir
+			if [ -h "${prefix}lib" ] ; then
+				# "lib" is a symlink, so need to convert to a dir
+				ewarn "Converting ${prefix}lib from a symlink to a dir"
+				rm -f "${prefix}lib" || die
+				if [ -d "${prefix}lib32" ] ; then
+					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
+					mv "${prefix}lib32" "${prefix}lib" || die
+				else
+					mkdir -p "${prefix}lib" || die
+				fi
+			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
+				# make sure the old "lib" ABI location does not exist; we
+				# only symlinked the lib dir on systems where we moved it
+				# to "lib32" ...
+				case ${CHOST} in
+				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
+				i?86*|x86_64*|powerpc*|sparc*|s390*)
+					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
+						rm -f "${prefix}lib32"/.keep
+						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
+							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
+							die "non-empty dir found where there should be none: ${prefix}lib32"
+						fi
+					fi
+					;;
+				esac
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a dir"
+				mkdir -p "${prefix}lib" || die
+			fi
+		fi
+	done
+	if ! use split-usr ; then
+		for libdir in ${libdirs}; do
+			if [[ ! -e "${EROOT}${libdir}" ]]; then
+				ln -s usr/"${libdir}" "${EROOT}${libdir}"
+			fi
+		done
+	fi
+}
+
+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
+
+	# We need to install directories and maybe some dev nodes when building
+	# stages, but they cannot be in CONTENTS.
+	# Also, we cannot reference $S as binpkg will break so we do this.
+	multilib_layout
+	if use build ; then
+		if use split-usr ; then
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout
+		else
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout-usrmerge
+		fi
+	fi
+	rm -f "${ED}"/usr/share/${PN}/Makefile
+}
+
+src_prepare() {
+	default
+
+	# handle multilib paths.  do it here because we want this behavior
+	# regardless of the C library that you're using.  we do explicitly
+	# list paths which the native ldconfig searches, but this isn't
+	# problematic as it doesn't change the resulting ld.so.cache or
+	# take longer to generate.  similarly, listing both the native
+	# path and the symlinked path doesn't change the resulting cache.
+	local libdir ldpaths
+	for libdir in $(get_all_libdirs) ; do
+		ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
+	done
+	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
+}
+
+src_configure() {
+	local OS
+	# although having a prefix, RAP uses full Linux baselayout
+	OS=$(usex prefix-stack prefix-stack \
+		 $(usex prefix-guest prefix-guest \
+		   $(usex kernel_FreeBSD BSD \
+			 Linux ) ) )
+	# set up immutable Makefile variables once
+	sed -e "/^EPREFIX\s*?\?=\s*$/s|?\?=.*|= ${EPREFIX}|" \
+		-e   "/^BROOT\s*?\?=\s*$/s|?\?=.*|= ${BROOT}|" \
+		-e      "/^OS\s*?\?=\s*$/s|?\?=.*|= ${OS}|" \
+		-i Makefile || die
+}
+
+src_install() {
+	emake ROOT="${ROOT}" DESTDIR="${D}" install
+	dodoc ChangeLog
+
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile
+
+	use prefix-guest || return 0
+
+	# 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() {
+	local x
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	for x in master.passwd passwd shadow group fstab ; do
+		[ -e "${EROOT}/etc/${x}" ] && continue
+		[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
+		cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc
+	done
+
+	# Force shadow permissions to not be world-readable #260993
+	for x in shadow ; do
+		[ -e "${EROOT}/etc/${x}" ] && chmod o-rwx "${EROOT}/etc/${x}"
+	done
+
+	# 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
+
+	# whine about users that lack passwords #193541
+	if [[ -e "${EROOT}"/etc/shadow ]] ; then
+		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
+		if [[ -n ${bad_users} ]] ; then
+			echo
+			ewarn "The following users lack passwords!"
+			ewarn ${bad_users}
+		fi
+	fi
+
+	# whine about users with invalid shells #215698
+	if [[ -e "${EROOT}"/etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
+		if [[ -n ${bad_shells} ]] ; then
+			echo
+			ewarn "The following users have non-existent shells!"
+			ewarn "${bad_shells}"
+		fi
+	fi
+
+	# https://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${EROOT}"/run
+
+		local found fstype mountpoint
+		while read -r _ mountpoint fstype _; do
+		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
+		done < "${ROOT}"/proc/mounts
+		[[ -z ${found} ]] &&
+			ewarn "You should reboot now to get /run mounted with tmpfs!"
+	fi
+
+	for x in ${REPLACING_VERSIONS}; do
+		if ver_test ${x} -lt 2.4; then
+			ewarn "After updating ${EROOT}/etc/profile, please run"
+			ewarn "env-update && . ${EPREFIX}/etc/profile"
+		fi
+
+		if ver_test ${x} -lt 2.6; then
+			ewarn "Please run env-update then log out and back in to"
+			ewarn "update your path."
+		fi
+		# clean up after 2.5 typos
+		# https://bugs.gentoo.org/show_bug.cgi?id=656380
+		if [[ ${x} == 2.5 ]]; then
+			rm -fr "${EROOT}{,usr"
+		fi
+	done
+
+	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
+		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
+		ewarn "Please migrate your changes."
+	fi
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2019-03-28 12:17 Fabian Groffen
  0 siblings, 0 replies; 21+ messages in thread
From: Fabian Groffen @ 2019-03-28 12:17 UTC (permalink / raw
  To: gentoo-commits

commit:     d16d48b37a492c9eaac8acaceff88621f195eedc
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 12:16:45 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 12:17:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d16d48b3

Revert "sys-apps/baselayout-prefix: add prefix-{stack,guest} to IUSE"

This reverts commit 0edca5cada92e8e5432f2c2a4788a0ac96313f5a.

The system that barfed on this used an make.profile pointing to an older
tree.  Sorry.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild | 2 +-
 sys-apps/baselayout-prefix/metadata.xml                    | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
index 587cfcefeab..b689642fcbb 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="build kernel_FreeBSD kernel_linux +split-usr prefix-stack prefix-guest"
+IUSE="build kernel_FreeBSD kernel_linux +split-usr"
 
 my_prefix_commits=(
 	# commits in reverse order as listed by:

diff --git a/sys-apps/baselayout-prefix/metadata.xml b/sys-apps/baselayout-prefix/metadata.xml
index 3b6382b8924..cbee92f245c 100644
--- a/sys-apps/baselayout-prefix/metadata.xml
+++ b/sys-apps/baselayout-prefix/metadata.xml
@@ -6,7 +6,5 @@
 </maintainer>
 <use>
 	<flag name="split-usr">Enable this if /bin and /usr/bin are separate directories</flag>
-	<flag name="prefix-stack">Add support for stacked Prefix install</flag>
-	<flag name="prefix-guest">Configure for Prefix on top of host OS libc</flag>
 </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2019-03-28 12:04 Fabian Groffen
  0 siblings, 0 replies; 21+ messages in thread
From: Fabian Groffen @ 2019-03-28 12:04 UTC (permalink / raw
  To: gentoo-commits

commit:     0edca5cada92e8e5432f2c2a4788a0ac96313f5a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 12:04:31 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 12:04:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0edca5ca

sys-apps/baselayout-prefix: add prefix-{stack,guest} to IUSE

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild | 2 +-
 sys-apps/baselayout-prefix/metadata.xml                    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
index b689642fcbb..587cfcefeab 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+IUSE="build kernel_FreeBSD kernel_linux +split-usr prefix-stack prefix-guest"
 
 my_prefix_commits=(
 	# commits in reverse order as listed by:

diff --git a/sys-apps/baselayout-prefix/metadata.xml b/sys-apps/baselayout-prefix/metadata.xml
index cbee92f245c..3b6382b8924 100644
--- a/sys-apps/baselayout-prefix/metadata.xml
+++ b/sys-apps/baselayout-prefix/metadata.xml
@@ -6,5 +6,7 @@
 </maintainer>
 <use>
 	<flag name="split-usr">Enable this if /bin and /usr/bin are separate directories</flag>
+	<flag name="prefix-stack">Add support for stacked Prefix install</flag>
+	<flag name="prefix-guest">Configure for Prefix on top of host OS libc</flag>
 </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2019-03-26  8:47 Michael Haubenwallner
  0 siblings, 0 replies; 21+ messages in thread
From: Michael Haubenwallner @ 2019-03-26  8:47 UTC (permalink / raw
  To: gentoo-commits

commit:     1fd5a2cc2b084fccb73942eac90c4a19fa2b5ed7
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 08:46:36 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 08:46:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fd5a2cc

sys-apps/baselayout-prefix: drop non-prefix keywords, old

Closes: https://bugs.gentoo.org/681756
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 .../baselayout-prefix-2.6-r1.ebuild                |   2 +-
 .../baselayout-prefix/baselayout-prefix-2.6.ebuild | 328 ---------------------
 2 files changed, 1 insertion(+), 329 deletions(-)

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
index 8cff70e3e2c..b689642fcbb 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~arm ~arm64 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 LICENSE="GPL-2"

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6.ebuild
deleted file mode 100644
index 630c9a15a85..00000000000
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib
-
-# just use "upstream" sources
-MY_P=${P/-prefix/}
-MY_PN=${PN/-prefix/}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://www.gentoo.org/"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="build kernel_FreeBSD kernel_linux +split-usr"
-
-my_prefix_commits=(
-	# commits in reverse order as listed by:
-	# git log --decorate=no --oneline --no-abbrev-commit origin/master..
-	5926fe447541607ed137d67ca84080326584b2fc # create usr/bin during layout-usrmerge
-	395424f90c8ca6969589905cbf86d74fae9d7ea6 # add prefix-stack support
-	95a8e95af948014d024842892be1405d656ab5fc # add prefix-guest support
-	c88ceddbfc6a965dc0153aef21e012e774d9e30c # sync prefix usage for Makefile target 'layout'
-	c9338e89cdb603c1e08998bba28fbc977a62fc51 # add prefix support per Makefile target 'install'
-)
-for my_c in ${my_prefix_commits[*]}
-do
-	SRC_URI+=" https://github.com/haubi/gentoo-baselayout/commit/${my_c}.patch -> ${PN}-${my_c}.patch"
-	PATCHES=( "${DISTDIR}/${PN}-${my_c}.patch" "${PATCHES[@]}" )
-done
-unset my_prefix_commits my_c
-
-pkg_setup() {
-	multilib_layout
-}
-
-# Create our multilib dirs - the Makefile has no knowledge of this
-multilib_layout() {
-	use prefix && return 0
-	local dir def_libdir libdir libdirs
-	local prefix prefix_lst
-	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
-	libdirs=$(get_all_libdirs)
-	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-
-	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
-		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
-		for prefix in ${prefix_lst[@]}; do
-			for libdir in ${libdirs}; do
-				dir="${prefix}${libdir}"
-				if [[ -e "${dir}" ]]; then
-					[[ ! -d "${dir}" ]] &&
-						die "${dir} exists but is not a directory"
-					continue
-				fi
-				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
-					einfo "symlinking ${dir} to usr/${libdir}"
-					ln -s usr/${libdir} ${dir} ||
-						die " Unable to make ${dir} symlink"
-				else
-					einfo "creating directory ${dir}"
-					mkdir -p "${dir}" ||
-						die "Unable to create ${dir} directory"
-				fi
-			done
-		done
-		return 0
-	fi
-
-	[ -z "${def_libdir}" ] &&
-		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
-
-	# figure out which paths should be symlinks and which should be directories
-	local dirs syms exp d
-	for libdir in ${libdirs} ; do
-		if use split-usr ; then
-			exp=( {,usr/,usr/local/}${libdir} )
-		else
-			exp=( {usr/,usr/local/}${libdir} )
-		fi
-		for d in "${exp[@]}" ; do
-			# most things should be dirs
-			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
-				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
-			else
-				[ -h "${d}" ] && syms+=" ${d}"
-			fi
-		done
-	done
-	if [ -n "${syms}${dirs}" ] ; then
-		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
-		ewarn "have these paths configured as follows:"
-		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
-		[ -n "${syms}" ] && ewarn "directories:${syms}"
-		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
-		ewarn "If things fail, you will need to manually create/move the directories."
-		echo
-	fi
-
-	# setup symlinks and dirs where we expect them to be; do not migrate
-	# data ... just fall over in that case.
-	if use split-usr ; then
-		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
-	else
-		prefix_lst=( "${EROOT}"{usr/,usr/local/} )
-	fi
-	for prefix in "${prefix_lst[@]}"; do
-		if [ "${SYMLINK_LIB}" = yes ] ; then
-			# we need to make sure "lib" points to the native libdir
-			if [ -h "${prefix}lib" ] ; then
-				# it's already a symlink!  assume it's pointing to right place ...
-				continue
-			elif [ -d "${prefix}lib" ] ; then
-				# "lib" is a dir, so need to convert to a symlink
-				ewarn "Converting ${prefix}lib from a dir to a symlink"
-				rm -f "${prefix}lib"/.keep
-				if rmdir "${prefix}lib" 2>/dev/null ; then
-					ln -s ${def_libdir} "${prefix}lib" || die
-				else
-					die "non-empty dir found where we needed a symlink: ${prefix}lib"
-				fi
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a symlink"
-				mkdir -p "${prefix}" || die
-				rm -f "${prefix}lib" || die
-				ln -s ${def_libdir} "${prefix}lib" || die
-				mkdir -p "${prefix}${def_libdir}" #423571
-			fi
-		else
-			# we need to make sure "lib" is a dir
-			if [ -h "${prefix}lib" ] ; then
-				# "lib" is a symlink, so need to convert to a dir
-				ewarn "Converting ${prefix}lib from a symlink to a dir"
-				rm -f "${prefix}lib" || die
-				if [ -d "${prefix}lib32" ] ; then
-					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
-					mv "${prefix}lib32" "${prefix}lib" || die
-				else
-					mkdir -p "${prefix}lib" || die
-				fi
-			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
-				# make sure the old "lib" ABI location does not exist; we
-				# only symlinked the lib dir on systems where we moved it
-				# to "lib32" ...
-				case ${CHOST} in
-				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
-				i?86*|x86_64*|powerpc*|sparc*|s390*)
-					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
-						rm -f "${prefix}lib32"/.keep
-						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
-							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
-							die "non-empty dir found where there should be none: ${prefix}lib32"
-						fi
-					fi
-					;;
-				esac
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a dir"
-				mkdir -p "${prefix}lib" || die
-			fi
-		fi
-	done
-	if ! use split-usr ; then
-		for libdir in ${libdirs}; do
-			if [[ ! -e "${EROOT}${libdir}" ]]; then
-				ln -s usr/"${libdir}" "${EROOT}${libdir}"
-			fi
-		done
-	fi
-}
-
-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
-
-	# We need to install directories and maybe some dev nodes when building
-	# stages, but they cannot be in CONTENTS.
-	# Also, we cannot reference $S as binpkg will break so we do this.
-	multilib_layout
-	if use build ; then
-		if use split-usr ; then
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout
-		else
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout-usrmerge
-		fi
-	fi
-	rm -f "${ED}"/usr/share/${PN}/Makefile
-}
-
-src_prepare() {
-	default
-
-	# handle multilib paths.  do it here because we want this behavior
-	# regardless of the C library that you're using.  we do explicitly
-	# list paths which the native ldconfig searches, but this isn't
-	# problematic as it doesn't change the resulting ld.so.cache or
-	# take longer to generate.  similarly, listing both the native
-	# path and the symlinked path doesn't change the resulting cache.
-	local libdir ldpaths
-	for libdir in $(get_all_libdirs) ; do
-		ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}"
-		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
-	done
-	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System release ${PV}" > etc/gentoo-release
-	use prefix &&
-	echo "Gentoo Prefix Base System release ${PV}" > etc/gentoo-release
-	use prefix-stack &&
-	echo "Gentoo Prefix Stack Base System release ${PV}" > etc/gentoo-release
-}
-
-src_configure() {
-	local OS
-	# although having a prefix, RAP uses full Linux baselayout
-	OS=$(usex prefix-stack prefix-stack \
-		 $(usex prefix-guest prefix-guest \
-		   $(usex kernel_FreeBSD BSD \
-			 Linux ) ) )
-	# set up immutable Makefile variables once
-	sed -e "/^EPREFIX\s*?\?=\s*$/s|?\?=.*|= ${EPREFIX}|" \
-		-e   "/^BROOT\s*?\?=\s*$/s|?\?=.*|= ${BROOT}|" \
-		-e      "/^OS\s*?\?=\s*$/s|?\?=.*|= ${OS}|" \
-		-i Makefile || die
-}
-
-src_install() {
-	emake ROOT="${ROOT}" DESTDIR="${D}" install
-	dodoc ChangeLog
-
-	# need the makefile in pkg_preinst
-	insinto /usr/share/${PN}
-	doins Makefile
-}
-
-pkg_postinst() {
-	local x
-
-	# We installed some files to /usr/share/baselayout instead of /etc to stop
-	# (1) overwriting the user's settings
-	# (2) screwing things up when attempting to merge files
-	# (3) accidentally packaging up personal files with quickpkg
-	# If they don't exist then we install them
-	for x in master.passwd passwd shadow group fstab ; do
-		[ -e "${EROOT}/etc/${x}" ] && continue
-		[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
-		cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc
-	done
-
-	# Force shadow permissions to not be world-readable #260993
-	for x in shadow ; do
-		[ -e "${EROOT}/etc/${x}" ] && chmod o-rwx "${EROOT}/etc/${x}"
-	done
-
-	# 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
-
-	# whine about users that lack passwords #193541
-	if [[ -e "${EROOT}"/etc/shadow ]] ; then
-		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
-		if [[ -n ${bad_users} ]] ; then
-			echo
-			ewarn "The following users lack passwords!"
-			ewarn ${bad_users}
-		fi
-	fi
-
-	# whine about users with invalid shells #215698
-	if [[ -e "${EROOT}"/etc/passwd ]] ; then
-		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
-		if [[ -n ${bad_shells} ]] ; then
-			echo
-			ewarn "The following users have non-existent shells!"
-			ewarn "${bad_shells}"
-		fi
-	fi
-
-	# https://bugs.gentoo.org/361349
-	if use kernel_linux; then
-		mkdir -p "${EROOT}"/run
-
-		local found fstype mountpoint
-		while read -r _ mountpoint fstype _; do
-		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
-		done < "${ROOT}"/proc/mounts
-		[[ -z ${found} ]] &&
-			ewarn "You should reboot now to get /run mounted with tmpfs!"
-	fi
-
-	for x in ${REPLACING_VERSIONS}; do
-		if ver_test ${x} -lt 2.4; then
-			ewarn "After updating ${EROOT}/etc/profile, please run"
-			ewarn "env-update && . ${EPREFIX}/etc/profile"
-		fi
-
-		if ver_test ${x} -lt 2.6; then
-			ewarn "Please run env-update then log out and back in to"
-			ewarn "update your path."
-		fi
-		# clean up after 2.5 typos
-		# https://bugs.gentoo.org/show_bug.cgi?id=656380
-		if [[ ${x} == 2.5 ]]; then
-			rm -fr "${EROOT}{,usr"
-		fi
-	done
-
-	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
-		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
-		ewarn "Please migrate your changes."
-	fi
-}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2019-03-25 15:29 Michael Haubenwallner
  0 siblings, 0 replies; 21+ messages in thread
From: Michael Haubenwallner @ 2019-03-25 15:29 UTC (permalink / raw
  To: gentoo-commits

commit:     f06ef3089531746ce0cb2b4e23d4fb82ce8278cf
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 15:27:12 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 15:29:20 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f06ef308

sys-apps/baselayout-prefix: restore /sbin/runscript

as well as /sbin/openrc-run and /etc/gentoo-release.

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 sys-apps/baselayout-prefix/Manifest                |   1 +
 .../baselayout-prefix-2.6-r1.ebuild                | 336 +++++++++++++++++++++
 2 files changed, 337 insertions(+)

diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index 7f25315cfd8..f47f264baac 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -3,5 +3,6 @@ DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b
 DIST baselayout-prefix-395424f90c8ca6969589905cbf86d74fae9d7ea6.patch 1760 BLAKE2B 227ea5a9f70e927ba19de675f408ad01c4d934575cfeb780a525a4e24afd46d9d91d4e4acf773403cb6ac4a493b81da1cad787a5c0e41096056ad4e233b3cfc8 SHA512 77b4c3cad19251497808b6a07a384846f3ebb2282860d55197cee03d373b16622ef3b6c95e411e1cbb79702f10fe2e9c43cfe4175cca1db3ea6c06c6b2331ac9
 DIST baselayout-prefix-5926fe447541607ed137d67ca84080326584b2fc.patch 809 BLAKE2B 237eb610b6935ec5139299f1dccc6260b31a1d47a82390d713fc759ef37de986de8392a82068c70c1f63f382a9212103025fe019614796f5b6a3b4ed0f81f8b2 SHA512 6cd1bf81d8619be27c20fcd703be9a97cc6129d9c13402172e7f16adf6e9b9eb0238edfd311ca8b98b3898876d2bf9686a2a3905510d26608773a3da5233ee95
 DIST baselayout-prefix-95a8e95af948014d024842892be1405d656ab5fc.patch 3754 BLAKE2B c64cf440d7dc27bd3c38ad93d242a28e3ae0df6ebef282249996bc2c463aa6c0941ea41fbee236ba77742ba5bff777cd3226054b80abe99a454f39d488f8e1c1 SHA512 8e2d44e9caedfa7159f374e39d416a7ceebd407ea9550d9aa52d0a87a44b7b805b1725f8eefd592eb5fbd9a5f3f851a28c18565f3b0e621530f4c51c109df24e
+DIST baselayout-prefix-a054fcc408ad48f775f7379834385c6a707d7a53.patch 1166 BLAKE2B d9b3135fc77a1941e08c68f0981385bcab412fc4949a70c7b75e11e7f8a6ee1eff6b5be0804d06539ed9f02a6245c0161d3dfd6de9fb0bf68d0d07c724650707 SHA512 822065592f434fcbae42b48d475ac0d188e29773337c3154f162ff830b58dcf44c87e3091933d5a0c0cc7e89e4d0223f60cefc0e525ca29aa3c9a0f9a5e974bf
 DIST baselayout-prefix-c88ceddbfc6a965dc0153aef21e012e774d9e30c.patch 2499 BLAKE2B 18f26331aec2b74c119f6064c79540f9a4dd90796841e8db10450b58b0fa7b7e10e6fd6c96e1f1e4b8d47c7cdc31628cf262a55eaca56e0ce23d6505ac73b0e1 SHA512 abd262fcbd3a7df57a9abbe54474517123e8cd8946f377c6e5be848b48b8638636b4e5a424ad76b59d61653c44473ad1423959ff8939ea388ede9514895e1ce2
 DIST baselayout-prefix-c9338e89cdb603c1e08998bba28fbc977a62fc51.patch 9370 BLAKE2B 0e665e08db0ddec93604103d65d6e5a9249afdd55b22106b95e232128b724acd680bc875401cba15bc9aefcc19eddc4cf55b056a83e00a5a3862352470321d04 SHA512 d91c9537f445a8fd4308d5392fc42149e8d08c9ee3282e382995cd32ee531d77d73a94437c9b436b67e8c44aa598147ef63cc79a72ec2e9a83b078c5776ede51

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
new file mode 100644
index 00000000000..8cff70e3e2c
--- /dev/null
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+# just use "upstream" sources
+MY_P=${P/-prefix/}
+MY_PN=${PN/-prefix/}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="https://www.gentoo.org/"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+
+my_prefix_commits=(
+	# commits in reverse order as listed by:
+	# git log --decorate=no --oneline --no-abbrev-commit origin/master..
+	a054fcc408ad48f775f7379834385c6a707d7a53 # also create etc/gentoo-release
+	5926fe447541607ed137d67ca84080326584b2fc # create usr/bin during layout-usrmerge
+	395424f90c8ca6969589905cbf86d74fae9d7ea6 # add prefix-stack support
+	95a8e95af948014d024842892be1405d656ab5fc # add prefix-guest support
+	c88ceddbfc6a965dc0153aef21e012e774d9e30c # sync prefix usage for Makefile target 'layout'
+	c9338e89cdb603c1e08998bba28fbc977a62fc51 # add prefix support per Makefile target 'install'
+)
+for my_c in ${my_prefix_commits[*]}
+do
+	SRC_URI+=" https://github.com/haubi/gentoo-baselayout/commit/${my_c}.patch -> ${PN}-${my_c}.patch"
+	PATCHES=( "${DISTDIR}/${PN}-${my_c}.patch" "${PATCHES[@]}" )
+done
+unset my_prefix_commits my_c
+
+pkg_setup() {
+	multilib_layout
+}
+
+# Create our multilib dirs - the Makefile has no knowledge of this
+multilib_layout() {
+	use prefix && return 0
+	local dir def_libdir libdir libdirs
+	local prefix prefix_lst
+	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	libdirs=$(get_all_libdirs)
+	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+
+	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
+		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+		for prefix in ${prefix_lst[@]}; do
+			for libdir in ${libdirs}; do
+				dir="${prefix}${libdir}"
+				if [[ -e "${dir}" ]]; then
+					[[ ! -d "${dir}" ]] &&
+						die "${dir} exists but is not a directory"
+					continue
+				fi
+				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
+					einfo "symlinking ${dir} to usr/${libdir}"
+					ln -s usr/${libdir} ${dir} ||
+						die " Unable to make ${dir} symlink"
+				else
+					einfo "creating directory ${dir}"
+					mkdir -p "${dir}" ||
+						die "Unable to create ${dir} directory"
+				fi
+			done
+		done
+		return 0
+	fi
+
+	[ -z "${def_libdir}" ] &&
+		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+
+	# figure out which paths should be symlinks and which should be directories
+	local dirs syms exp d
+	for libdir in ${libdirs} ; do
+		if use split-usr ; then
+			exp=( {,usr/,usr/local/}${libdir} )
+		else
+			exp=( {usr/,usr/local/}${libdir} )
+		fi
+		for d in "${exp[@]}" ; do
+			# most things should be dirs
+			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
+				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
+			else
+				[ -h "${d}" ] && syms+=" ${d}"
+			fi
+		done
+	done
+	if [ -n "${syms}${dirs}" ] ; then
+		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
+		ewarn "have these paths configured as follows:"
+		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
+		[ -n "${syms}" ] && ewarn "directories:${syms}"
+		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
+		ewarn "If things fail, you will need to manually create/move the directories."
+		echo
+	fi
+
+	# setup symlinks and dirs where we expect them to be; do not migrate
+	# data ... just fall over in that case.
+	if use split-usr ; then
+		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+	else
+		prefix_lst=( "${EROOT}"{usr/,usr/local/} )
+	fi
+	for prefix in "${prefix_lst[@]}"; do
+		if [ "${SYMLINK_LIB}" = yes ] ; then
+			# we need to make sure "lib" points to the native libdir
+			if [ -h "${prefix}lib" ] ; then
+				# it's already a symlink!  assume it's pointing to right place ...
+				continue
+			elif [ -d "${prefix}lib" ] ; then
+				# "lib" is a dir, so need to convert to a symlink
+				ewarn "Converting ${prefix}lib from a dir to a symlink"
+				rm -f "${prefix}lib"/.keep
+				if rmdir "${prefix}lib" 2>/dev/null ; then
+					ln -s ${def_libdir} "${prefix}lib" || die
+				else
+					die "non-empty dir found where we needed a symlink: ${prefix}lib"
+				fi
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a symlink"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+				mkdir -p "${prefix}${def_libdir}" #423571
+			fi
+		else
+			# we need to make sure "lib" is a dir
+			if [ -h "${prefix}lib" ] ; then
+				# "lib" is a symlink, so need to convert to a dir
+				ewarn "Converting ${prefix}lib from a symlink to a dir"
+				rm -f "${prefix}lib" || die
+				if [ -d "${prefix}lib32" ] ; then
+					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
+					mv "${prefix}lib32" "${prefix}lib" || die
+				else
+					mkdir -p "${prefix}lib" || die
+				fi
+			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
+				# make sure the old "lib" ABI location does not exist; we
+				# only symlinked the lib dir on systems where we moved it
+				# to "lib32" ...
+				case ${CHOST} in
+				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
+				i?86*|x86_64*|powerpc*|sparc*|s390*)
+					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
+						rm -f "${prefix}lib32"/.keep
+						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
+							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
+							die "non-empty dir found where there should be none: ${prefix}lib32"
+						fi
+					fi
+					;;
+				esac
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a dir"
+				mkdir -p "${prefix}lib" || die
+			fi
+		fi
+	done
+	if ! use split-usr ; then
+		for libdir in ${libdirs}; do
+			if [[ ! -e "${EROOT}${libdir}" ]]; then
+				ln -s usr/"${libdir}" "${EROOT}${libdir}"
+			fi
+		done
+	fi
+}
+
+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
+
+	# We need to install directories and maybe some dev nodes when building
+	# stages, but they cannot be in CONTENTS.
+	# Also, we cannot reference $S as binpkg will break so we do this.
+	multilib_layout
+	if use build ; then
+		if use split-usr ; then
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout
+		else
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout-usrmerge
+		fi
+	fi
+	rm -f "${ED}"/usr/share/${PN}/Makefile
+}
+
+src_prepare() {
+	default
+
+	# handle multilib paths.  do it here because we want this behavior
+	# regardless of the C library that you're using.  we do explicitly
+	# list paths which the native ldconfig searches, but this isn't
+	# problematic as it doesn't change the resulting ld.so.cache or
+	# take longer to generate.  similarly, listing both the native
+	# path and the symlinked path doesn't change the resulting cache.
+	local libdir ldpaths
+	for libdir in $(get_all_libdirs) ; do
+		ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
+	done
+	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
+}
+
+src_configure() {
+	local OS
+	# although having a prefix, RAP uses full Linux baselayout
+	OS=$(usex prefix-stack prefix-stack \
+		 $(usex prefix-guest prefix-guest \
+		   $(usex kernel_FreeBSD BSD \
+			 Linux ) ) )
+	# set up immutable Makefile variables once
+	sed -e "/^EPREFIX\s*?\?=\s*$/s|?\?=.*|= ${EPREFIX}|" \
+		-e   "/^BROOT\s*?\?=\s*$/s|?\?=.*|= ${BROOT}|" \
+		-e      "/^OS\s*?\?=\s*$/s|?\?=.*|= ${OS}|" \
+		-i Makefile || die
+}
+
+src_install() {
+	emake ROOT="${ROOT}" DESTDIR="${D}" install
+	dodoc ChangeLog
+
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile
+
+	use prefix-guest || return 0
+
+	# 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() {
+	local x
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	for x in master.passwd passwd shadow group fstab ; do
+		[ -e "${EROOT}/etc/${x}" ] && continue
+		[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
+		cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc
+	done
+
+	# Force shadow permissions to not be world-readable #260993
+	for x in shadow ; do
+		[ -e "${EROOT}/etc/${x}" ] && chmod o-rwx "${EROOT}/etc/${x}"
+	done
+
+	# 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
+
+	# whine about users that lack passwords #193541
+	if [[ -e "${EROOT}"/etc/shadow ]] ; then
+		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
+		if [[ -n ${bad_users} ]] ; then
+			echo
+			ewarn "The following users lack passwords!"
+			ewarn ${bad_users}
+		fi
+	fi
+
+	# whine about users with invalid shells #215698
+	if [[ -e "${EROOT}"/etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
+		if [[ -n ${bad_shells} ]] ; then
+			echo
+			ewarn "The following users have non-existent shells!"
+			ewarn "${bad_shells}"
+		fi
+	fi
+
+	# https://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${EROOT}"/run
+
+		local found fstype mountpoint
+		while read -r _ mountpoint fstype _; do
+		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
+		done < "${ROOT}"/proc/mounts
+		[[ -z ${found} ]] &&
+			ewarn "You should reboot now to get /run mounted with tmpfs!"
+	fi
+
+	for x in ${REPLACING_VERSIONS}; do
+		if ver_test ${x} -lt 2.4; then
+			ewarn "After updating ${EROOT}/etc/profile, please run"
+			ewarn "env-update && . ${EPREFIX}/etc/profile"
+		fi
+
+		if ver_test ${x} -lt 2.6; then
+			ewarn "Please run env-update then log out and back in to"
+			ewarn "update your path."
+		fi
+		# clean up after 2.5 typos
+		# https://bugs.gentoo.org/show_bug.cgi?id=656380
+		if [[ ${x} == 2.5 ]]; then
+			rm -fr "${EROOT}{,usr"
+		fi
+	done
+
+	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
+		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
+		ewarn "Please migrate your changes."
+	fi
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2019-03-25 14:19 Michael Haubenwallner
  0 siblings, 0 replies; 21+ messages in thread
From: Michael Haubenwallner @ 2019-03-25 14:19 UTC (permalink / raw
  To: gentoo-commits

commit:     c7a2936698f22bd710a3e0d9c282cfb8a1139b67
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 13:30:38 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 14:18:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a29366

sys-apps/baselayout-prefix: revbump

Incorporate original baselayout-2.6, add patches to support prefix-guest
and prefix-stack.  The latter triggers the EAPI 7 bump.
Bug: https://bugs.gentoo.org/658572
Package-Manager: Portage-2.3.62-prefix, Repoman-2.3.12

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 sys-apps/baselayout-prefix/Manifest                |   6 +
 .../baselayout-prefix/baselayout-prefix-2.6.ebuild | 328 +++++++++++++++++++++
 sys-apps/baselayout-prefix/metadata.xml            |   9 +-
 3 files changed, 340 insertions(+), 3 deletions(-)

diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index b2281c0a4c4..7f25315cfd8 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -1 +1,7 @@
 DIST baselayout-2.2.tar.bz2 40744 BLAKE2B 3a1dfdd64b45d5aa8fb3ff9781aa9b1218095874a0bb6d9dd0d2da4c447945272b25258b53b7ea130f3e1067c799fc4c0d14e577f3a3f749f19d72734136e6e9 SHA512 a5199c42e835d9f2683cc94f3c4c47ecdc392316c24e0932845736e2e90479b0c5c8ad72ead8e0537f097405b7d7548d00b87b7ff8c9e3651486e3c5c0970b36
+DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b5f2dbc72e75f027b0c23a5db9a386c53e756e80240f36ad4d63e3fe421bf9510c18321d7a31fda140ad47b2860 SHA512 5cad5faf56871ae951120643e29db0c39fea6dc845b4755382bd469eca32639ec6cd0cd046d3c439a7cc607b18770036f9c256260d35beaffb094e23cb13740b
+DIST baselayout-prefix-395424f90c8ca6969589905cbf86d74fae9d7ea6.patch 1760 BLAKE2B 227ea5a9f70e927ba19de675f408ad01c4d934575cfeb780a525a4e24afd46d9d91d4e4acf773403cb6ac4a493b81da1cad787a5c0e41096056ad4e233b3cfc8 SHA512 77b4c3cad19251497808b6a07a384846f3ebb2282860d55197cee03d373b16622ef3b6c95e411e1cbb79702f10fe2e9c43cfe4175cca1db3ea6c06c6b2331ac9
+DIST baselayout-prefix-5926fe447541607ed137d67ca84080326584b2fc.patch 809 BLAKE2B 237eb610b6935ec5139299f1dccc6260b31a1d47a82390d713fc759ef37de986de8392a82068c70c1f63f382a9212103025fe019614796f5b6a3b4ed0f81f8b2 SHA512 6cd1bf81d8619be27c20fcd703be9a97cc6129d9c13402172e7f16adf6e9b9eb0238edfd311ca8b98b3898876d2bf9686a2a3905510d26608773a3da5233ee95
+DIST baselayout-prefix-95a8e95af948014d024842892be1405d656ab5fc.patch 3754 BLAKE2B c64cf440d7dc27bd3c38ad93d242a28e3ae0df6ebef282249996bc2c463aa6c0941ea41fbee236ba77742ba5bff777cd3226054b80abe99a454f39d488f8e1c1 SHA512 8e2d44e9caedfa7159f374e39d416a7ceebd407ea9550d9aa52d0a87a44b7b805b1725f8eefd592eb5fbd9a5f3f851a28c18565f3b0e621530f4c51c109df24e
+DIST baselayout-prefix-c88ceddbfc6a965dc0153aef21e012e774d9e30c.patch 2499 BLAKE2B 18f26331aec2b74c119f6064c79540f9a4dd90796841e8db10450b58b0fa7b7e10e6fd6c96e1f1e4b8d47c7cdc31628cf262a55eaca56e0ce23d6505ac73b0e1 SHA512 abd262fcbd3a7df57a9abbe54474517123e8cd8946f377c6e5be848b48b8638636b4e5a424ad76b59d61653c44473ad1423959ff8939ea388ede9514895e1ce2
+DIST baselayout-prefix-c9338e89cdb603c1e08998bba28fbc977a62fc51.patch 9370 BLAKE2B 0e665e08db0ddec93604103d65d6e5a9249afdd55b22106b95e232128b724acd680bc875401cba15bc9aefcc19eddc4cf55b056a83e00a5a3862352470321d04 SHA512 d91c9537f445a8fd4308d5392fc42149e8d08c9ee3282e382995cd32ee531d77d73a94437c9b436b67e8c44aa598147ef63cc79a72ec2e9a83b078c5776ede51

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6.ebuild
new file mode 100644
index 00000000000..630c9a15a85
--- /dev/null
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+# just use "upstream" sources
+MY_P=${P/-prefix/}
+MY_PN=${PN/-prefix/}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="https://www.gentoo.org/"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+
+my_prefix_commits=(
+	# commits in reverse order as listed by:
+	# git log --decorate=no --oneline --no-abbrev-commit origin/master..
+	5926fe447541607ed137d67ca84080326584b2fc # create usr/bin during layout-usrmerge
+	395424f90c8ca6969589905cbf86d74fae9d7ea6 # add prefix-stack support
+	95a8e95af948014d024842892be1405d656ab5fc # add prefix-guest support
+	c88ceddbfc6a965dc0153aef21e012e774d9e30c # sync prefix usage for Makefile target 'layout'
+	c9338e89cdb603c1e08998bba28fbc977a62fc51 # add prefix support per Makefile target 'install'
+)
+for my_c in ${my_prefix_commits[*]}
+do
+	SRC_URI+=" https://github.com/haubi/gentoo-baselayout/commit/${my_c}.patch -> ${PN}-${my_c}.patch"
+	PATCHES=( "${DISTDIR}/${PN}-${my_c}.patch" "${PATCHES[@]}" )
+done
+unset my_prefix_commits my_c
+
+pkg_setup() {
+	multilib_layout
+}
+
+# Create our multilib dirs - the Makefile has no knowledge of this
+multilib_layout() {
+	use prefix && return 0
+	local dir def_libdir libdir libdirs
+	local prefix prefix_lst
+	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	libdirs=$(get_all_libdirs)
+	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+
+	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
+		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+		for prefix in ${prefix_lst[@]}; do
+			for libdir in ${libdirs}; do
+				dir="${prefix}${libdir}"
+				if [[ -e "${dir}" ]]; then
+					[[ ! -d "${dir}" ]] &&
+						die "${dir} exists but is not a directory"
+					continue
+				fi
+				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
+					einfo "symlinking ${dir} to usr/${libdir}"
+					ln -s usr/${libdir} ${dir} ||
+						die " Unable to make ${dir} symlink"
+				else
+					einfo "creating directory ${dir}"
+					mkdir -p "${dir}" ||
+						die "Unable to create ${dir} directory"
+				fi
+			done
+		done
+		return 0
+	fi
+
+	[ -z "${def_libdir}" ] &&
+		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+
+	# figure out which paths should be symlinks and which should be directories
+	local dirs syms exp d
+	for libdir in ${libdirs} ; do
+		if use split-usr ; then
+			exp=( {,usr/,usr/local/}${libdir} )
+		else
+			exp=( {usr/,usr/local/}${libdir} )
+		fi
+		for d in "${exp[@]}" ; do
+			# most things should be dirs
+			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
+				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
+			else
+				[ -h "${d}" ] && syms+=" ${d}"
+			fi
+		done
+	done
+	if [ -n "${syms}${dirs}" ] ; then
+		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
+		ewarn "have these paths configured as follows:"
+		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
+		[ -n "${syms}" ] && ewarn "directories:${syms}"
+		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
+		ewarn "If things fail, you will need to manually create/move the directories."
+		echo
+	fi
+
+	# setup symlinks and dirs where we expect them to be; do not migrate
+	# data ... just fall over in that case.
+	if use split-usr ; then
+		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+	else
+		prefix_lst=( "${EROOT}"{usr/,usr/local/} )
+	fi
+	for prefix in "${prefix_lst[@]}"; do
+		if [ "${SYMLINK_LIB}" = yes ] ; then
+			# we need to make sure "lib" points to the native libdir
+			if [ -h "${prefix}lib" ] ; then
+				# it's already a symlink!  assume it's pointing to right place ...
+				continue
+			elif [ -d "${prefix}lib" ] ; then
+				# "lib" is a dir, so need to convert to a symlink
+				ewarn "Converting ${prefix}lib from a dir to a symlink"
+				rm -f "${prefix}lib"/.keep
+				if rmdir "${prefix}lib" 2>/dev/null ; then
+					ln -s ${def_libdir} "${prefix}lib" || die
+				else
+					die "non-empty dir found where we needed a symlink: ${prefix}lib"
+				fi
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a symlink"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+				mkdir -p "${prefix}${def_libdir}" #423571
+			fi
+		else
+			# we need to make sure "lib" is a dir
+			if [ -h "${prefix}lib" ] ; then
+				# "lib" is a symlink, so need to convert to a dir
+				ewarn "Converting ${prefix}lib from a symlink to a dir"
+				rm -f "${prefix}lib" || die
+				if [ -d "${prefix}lib32" ] ; then
+					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
+					mv "${prefix}lib32" "${prefix}lib" || die
+				else
+					mkdir -p "${prefix}lib" || die
+				fi
+			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
+				# make sure the old "lib" ABI location does not exist; we
+				# only symlinked the lib dir on systems where we moved it
+				# to "lib32" ...
+				case ${CHOST} in
+				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
+				i?86*|x86_64*|powerpc*|sparc*|s390*)
+					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
+						rm -f "${prefix}lib32"/.keep
+						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
+							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
+							die "non-empty dir found where there should be none: ${prefix}lib32"
+						fi
+					fi
+					;;
+				esac
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a dir"
+				mkdir -p "${prefix}lib" || die
+			fi
+		fi
+	done
+	if ! use split-usr ; then
+		for libdir in ${libdirs}; do
+			if [[ ! -e "${EROOT}${libdir}" ]]; then
+				ln -s usr/"${libdir}" "${EROOT}${libdir}"
+			fi
+		done
+	fi
+}
+
+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
+
+	# We need to install directories and maybe some dev nodes when building
+	# stages, but they cannot be in CONTENTS.
+	# Also, we cannot reference $S as binpkg will break so we do this.
+	multilib_layout
+	if use build ; then
+		if use split-usr ; then
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout
+		else
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout-usrmerge
+		fi
+	fi
+	rm -f "${ED}"/usr/share/${PN}/Makefile
+}
+
+src_prepare() {
+	default
+
+	# handle multilib paths.  do it here because we want this behavior
+	# regardless of the C library that you're using.  we do explicitly
+	# list paths which the native ldconfig searches, but this isn't
+	# problematic as it doesn't change the resulting ld.so.cache or
+	# take longer to generate.  similarly, listing both the native
+	# path and the symlinked path doesn't change the resulting cache.
+	local libdir ldpaths
+	for libdir in $(get_all_libdirs) ; do
+		ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
+	done
+	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
+
+	# rc-scripts version for testing of features that *should* be present
+	echo "Gentoo Base System release ${PV}" > etc/gentoo-release
+	use prefix &&
+	echo "Gentoo Prefix Base System release ${PV}" > etc/gentoo-release
+	use prefix-stack &&
+	echo "Gentoo Prefix Stack Base System release ${PV}" > etc/gentoo-release
+}
+
+src_configure() {
+	local OS
+	# although having a prefix, RAP uses full Linux baselayout
+	OS=$(usex prefix-stack prefix-stack \
+		 $(usex prefix-guest prefix-guest \
+		   $(usex kernel_FreeBSD BSD \
+			 Linux ) ) )
+	# set up immutable Makefile variables once
+	sed -e "/^EPREFIX\s*?\?=\s*$/s|?\?=.*|= ${EPREFIX}|" \
+		-e   "/^BROOT\s*?\?=\s*$/s|?\?=.*|= ${BROOT}|" \
+		-e      "/^OS\s*?\?=\s*$/s|?\?=.*|= ${OS}|" \
+		-i Makefile || die
+}
+
+src_install() {
+	emake ROOT="${ROOT}" DESTDIR="${D}" install
+	dodoc ChangeLog
+
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile
+}
+
+pkg_postinst() {
+	local x
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	for x in master.passwd passwd shadow group fstab ; do
+		[ -e "${EROOT}/etc/${x}" ] && continue
+		[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
+		cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc
+	done
+
+	# Force shadow permissions to not be world-readable #260993
+	for x in shadow ; do
+		[ -e "${EROOT}/etc/${x}" ] && chmod o-rwx "${EROOT}/etc/${x}"
+	done
+
+	# 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
+
+	# whine about users that lack passwords #193541
+	if [[ -e "${EROOT}"/etc/shadow ]] ; then
+		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
+		if [[ -n ${bad_users} ]] ; then
+			echo
+			ewarn "The following users lack passwords!"
+			ewarn ${bad_users}
+		fi
+	fi
+
+	# whine about users with invalid shells #215698
+	if [[ -e "${EROOT}"/etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
+		if [[ -n ${bad_shells} ]] ; then
+			echo
+			ewarn "The following users have non-existent shells!"
+			ewarn "${bad_shells}"
+		fi
+	fi
+
+	# https://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${EROOT}"/run
+
+		local found fstype mountpoint
+		while read -r _ mountpoint fstype _; do
+		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
+		done < "${ROOT}"/proc/mounts
+		[[ -z ${found} ]] &&
+			ewarn "You should reboot now to get /run mounted with tmpfs!"
+	fi
+
+	for x in ${REPLACING_VERSIONS}; do
+		if ver_test ${x} -lt 2.4; then
+			ewarn "After updating ${EROOT}/etc/profile, please run"
+			ewarn "env-update && . ${EPREFIX}/etc/profile"
+		fi
+
+		if ver_test ${x} -lt 2.6; then
+			ewarn "Please run env-update then log out and back in to"
+			ewarn "update your path."
+		fi
+		# clean up after 2.5 typos
+		# https://bugs.gentoo.org/show_bug.cgi?id=656380
+		if [[ ${x} == 2.5 ]]; then
+			rm -fr "${EROOT}{,usr"
+		fi
+	done
+
+	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
+		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
+		ewarn "Please migrate your changes."
+	fi
+}

diff --git a/sys-apps/baselayout-prefix/metadata.xml b/sys-apps/baselayout-prefix/metadata.xml
index 91e2eccbc46..cbee92f245c 100644
--- a/sys-apps/baselayout-prefix/metadata.xml
+++ b/sys-apps/baselayout-prefix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>prefix@gentoo.org</email>
-	</maintainer>
+<maintainer type="project">
+	<email>prefix@gentoo.org</email>
+</maintainer>
+<use>
+	<flag name="split-usr">Enable this if /bin and /usr/bin are separate directories</flag>
+</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2017-12-11  6:06 Benda XU
  0 siblings, 0 replies; 21+ messages in thread
From: Benda XU @ 2017-12-11  6:06 UTC (permalink / raw
  To: gentoo-commits

commit:     0df0d32914d2e29749923eebd2a10755d63528d9
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 11:01:59 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 06:06:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0df0d329

sys-apps/baselayout-prefix: keyword ~arm64

  For bootstrap on 64 bit android phones.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
index 9f59ae36b38..5706fd59a8a 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~arm ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~arm ~arm64 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-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}"


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2017-04-13 19:14 Fabian Groffen
  0 siblings, 0 replies; 21+ messages in thread
From: Fabian Groffen @ 2017-04-13 19:14 UTC (permalink / raw
  To: gentoo-commits

commit:     d7a5a2d8c9d40454dc2de5ee3f04497a73bae4ce
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 19:12:50 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 19:12:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7a5a2d8

sys-apps/baselayout-prefix: update metadata.xml use-flag to reflect change in ebuild made at some point

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-apps/baselayout-prefix/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/baselayout-prefix/metadata.xml b/sys-apps/baselayout-prefix/metadata.xml
index b1e74aba999..8a74eebcee3 100644
--- a/sys-apps/baselayout-prefix/metadata.xml
+++ b/sys-apps/baselayout-prefix/metadata.xml
@@ -5,6 +5,6 @@
 		<email>prefix@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="prefix-chaining">install in a chained Prefix environment</flag>
+		<flag name="prefix-chain">install in a chained Prefix environment</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2017-04-13 19:14 Fabian Groffen
  0 siblings, 0 replies; 21+ messages in thread
From: Fabian Groffen @ 2017-04-13 19:14 UTC (permalink / raw
  To: gentoo-commits

commit:     b5cdd75075e3a21848504b35382f5992a7cd32ef
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 19:13:55 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 19:13:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5cdd750

sys-apps/baselayout-prefix: remove use-flag from metadata.xml, up to haubi to fix it for real

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-apps/baselayout-prefix/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sys-apps/baselayout-prefix/metadata.xml b/sys-apps/baselayout-prefix/metadata.xml
index 8a74eebcee3..91e2eccbc46 100644
--- a/sys-apps/baselayout-prefix/metadata.xml
+++ b/sys-apps/baselayout-prefix/metadata.xml
@@ -4,7 +4,4 @@
 	<maintainer type="project">
 		<email>prefix@gentoo.org</email>
 	</maintainer>
-	<use>
-		<flag name="prefix-chain">install in a chained Prefix environment</flag>
-	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2017-04-11 12:03 Michael Haubenwallner
  0 siblings, 0 replies; 21+ messages in thread
From: Michael Haubenwallner @ 2017-04-11 12:03 UTC (permalink / raw
  To: gentoo-commits

commit:     b97b1f75a83f56c51cecb454e527ccfe2a243378
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 11 11:53:48 2017 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue Apr 11 11:53:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b97b1f75

sys-apps/baselayout-prefix: switch to implicit iuse prefix-chain

Package-Manager: portage-2.3.3

 sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
index 628b47af038..9f59ae36b38 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
@@ -13,7 +13,6 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="prefix-chaining"
 KEYWORDS="~arm ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-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"
@@ -29,7 +28,7 @@ pkg_preinst() {
 }
 
 src_prepare() {
-	if use prefix-chaining; then
+	if use prefix-chain; then
 		epatch "${FILESDIR}"/baselayout-${PV}-prefix-chaining.patch
 
 		# need to set the PKG_CONFIG_PATH globally for this prefix, when
@@ -56,7 +55,7 @@ src_install() {
 		-e "/PATH=/!s:/\(etc\|usr/bin\|bin\):\"${EPREFIX}\"/\1:g" \
 		-e "/PATH=/s|\([:\"]\)/|\1${EPREFIX}/|g" \
 		etc/profile > "${ED}"/etc/profile || die
-	if ! use prefix-chaining; then
+	if ! use prefix-chain; then
 		sed \
 			-e "/PATH=.*\/sbin/s|\"$|:/usr/sbin:/sbin\"|" \
 			-e "/PATH=.*\/bin/s|\"$|:/usr/bin:/bin\"|" \


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/
@ 2016-07-28 12:23 Fabian Groffen
  0 siblings, 0 replies; 21+ messages in thread
From: Fabian Groffen @ 2016-07-28 12:23 UTC (permalink / raw
  To: gentoo-commits

commit:     21bc9e82f4c87af7b98f3c1acc29abad18ed3fe4
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 12:23:08 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> 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
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

end of thread, other threads:[~2022-04-07 15:31 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-13 18:53 [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-prefix/ Fabian Groffen
  -- strict thread matches above, loose matches on Subject: below --
2022-04-07 15:31 Jakov Smolić
2022-01-04 10:30 David Seifert
2022-01-04  3:29 Sam James
2021-02-06 10:14 Fabian Groffen
2021-01-18 18:22 Fabian Groffen
2021-01-06 15:26 Fabian Groffen
2020-12-27 18:13 Fabian Groffen
2020-12-13  3:01 Benda XU
2020-02-08 14:18 David Seifert
2019-05-13 15:11 Michael Haubenwallner
2019-03-28 12:17 Fabian Groffen
2019-03-28 12:04 Fabian Groffen
2019-03-26  8:47 Michael Haubenwallner
2019-03-25 15:29 Michael Haubenwallner
2019-03-25 14:19 Michael Haubenwallner
2017-12-11  6:06 Benda XU
2017-04-13 19:14 Fabian Groffen
2017-04-13 19:14 Fabian Groffen
2017-04-11 12:03 Michael Haubenwallner
2016-07-28 12:23 Fabian Groffen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox