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

[Fabian Groffen]

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
-}