summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2011-08-10 18:14:58 +0000
committerWilliam Hubbs <williamh@gentoo.org>2011-08-10 18:14:58 +0000
commit503246eb548c9ac27ca299c1662abe5143150d7d (patch)
tree09ccb610f656e98a290f82cd37b1080c13c3161f /sys-apps/baselayout
parentRestrict tests as was originally intended since they require a lot of additio... (diff)
downloadgentoo-2-503246eb548c9ac27ca299c1662abe5143150d7d.tar.gz
gentoo-2-503246eb548c9ac27ca299c1662abe5143150d7d.tar.bz2
gentoo-2-503246eb548c9ac27ca299c1662abe5143150d7d.zip
remove old 2.0 versions
(Portage version: 2.2.0_alpha50/cvs/Linux i686)
Diffstat (limited to 'sys-apps/baselayout')
-rw-r--r--sys-apps/baselayout/ChangeLog6
-rw-r--r--sys-apps/baselayout/baselayout-2.0.1-r1.ebuild222
-rw-r--r--sys-apps/baselayout/baselayout-2.0.2.ebuild216
3 files changed, 5 insertions, 439 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 3a475ad46e5f..0b5b70257f2e 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,14 @@
# ChangeLog for sys-apps/baselayout
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.508 2011/07/24 21:21:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.509 2011/08/10 18:14:58 williamh Exp $
# See the rc-scripts ChangeLog in subversion for release info:
# http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
+ 10 Aug 2011; William Hubbs <williamh@gentoo.org> -baselayout-2.0.1-r1.ebuild,
+ -baselayout-2.0.2.ebuild:
+ remove old 2.0 versions
+
24 Jul 2011; Markos Chandras <hwoarang@gentoo.org> baselayout-2.0.3.ebuild:
Stable on amd64 wrt bug #375771
diff --git a/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild b/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild
deleted file mode 100644
index 9924d28430bb..000000000000
--- a/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild,v 1.3 2011/07/08 10:11:58 ssuominen Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
- http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="build"
-
-PDEPEND="sys-apps/openrc"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-proc_touch.patch #232823
-}
-
-pkg_preinst() {
- # Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of
- # the baselayout-1.x ebuild copies all the real configs from the user's
- # /etc/conf.d into ${D}, it makes them all appear to be the default
- # versions. In order to protect them from being unmerged after this
- # upgrade, modify their timestamps.
- touch "${ROOT}"/etc/conf.d/* 2>/dev/null
-
- # 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 "${ROOT}"/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.
- if use build ; then
- local libdirs="$(get_all_libdirs)" dir=
- # Create our multilib dirs - the Makefile has no knowledge of this
- : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass...
- for dir in ${libdirs}; do
- mkdir -p "${ROOT}${dir}"
- touch "${ROOT}${dir}"/.keep
- mkdir -p "${ROOT}usr/${dir}"
- touch "${ROOT}usr/${dir}"/.keep
- mkdir -p "${ROOT}usr/local/${dir}"
- touch "${ROOT}usr/local/${dir}"/.keep
- done
-
- # Create symlinks for /lib, /usr/lib, and /usr/local/lib and
- # merge contents of duplicate directories if necessary.
- # Only do this when $ROOT != / since it should only be necessary
- # when merging to an empty $ROOT, and it's not very safe to perform
- # this operation when $ROOT = /.
- if [ "${SYMLINK_LIB}" = yes ] && [ "$ROOT" != / ] ; then
- local prefix libabi=$(get_abi_LIBDIR $DEFAULT_ABI)
- for prefix in "$ROOT"{,usr/,usr/local/} ; do
-
- [ ! -d "${prefix}lib" ] && rm -f "${prefix}lib" && \
- mkdir -p "${prefix}lib"
-
- [ ! -d "$prefix$libabi" ] && ln -sf "${prefix}lib"
-
- [ -h "$prefix$libabi" ] && [ -d "${prefix}lib" ] && \
- [ "$prefix$libabi" -ef "${prefix}lib" ] && continue
-
- local destdir=$prefix$libabi/ srcdir=${prefix}lib/
-
- [ -d "$destdir" ] || die "unable to create '$destdir'"
- [ -d "$srcdir" ] || die "unable to create $srcdir"
-
- mv -f "$srcdir".keep "$destdir".keep 2>/dev/null
- if ! rmdir "$srcdir" 2>/dev/null ; then
- ewarn "merging contents of '$srcdir' into '$destdir':"
-
- # Move directories if the dest doesn't exist.
- find "$srcdir" -type d -print0 | \
- while read -d $'\0' src ; do
-
- # If a parent directory of $src has already
- # been merged then it will no longer exist.
- [ -d "$src" ] || continue
-
- dest=$destdir${src#${srcdir}}
- if [ ! -d "$dest" ] ; then
- if [ -e "$dest" ] ; then
- ewarn " not overwriting file '$dest'" \
- "with directory '$src'"
- continue
- fi
- mv -f "$src" "$dest" && \
- ewarn " /${src#${ROOT}} merged" || \
- ewarn " /${src#${ROOT}} not merged"
- fi
- done
-
- # Move non-directories.
- find "$srcdir" ! -type d -print0 | \
- while read -d $'\0' src ; do
- dest=$destdir${src#${srcdir}}
- if [ -e "$dest" ] ; then
- if [ -d "$dest" ] ; then
- ewarn " not overwriting directory '$dest'" \
- "with file '$src'"
- else
- if [ -f "$src" -a ! -s "$src" ] && \
- [ -f "$dest" -a ! -s "$dest" ] ; then
- # Ignore empty files such as '.keep'.
- true
- else
- ewarn " not overwriting file '$dest'" \
- "with file '$src'"
- fi
- fi
- continue
- fi
-
- mv -f "$src" "$dest" && \
- ewarn " /${src#${ROOT}} merged" || \
- ewarn " /${src#${ROOT}} not merged"
- done
- fi
-
- rm -rf "${prefix}lib" || \
- die "unable to remove '${prefix}lib'"
-
- ln -s "$libabi" "${prefix}lib" || \
- die "unable to create '${prefix}lib' symlink"
- done
- fi
-
- emake -C "${D}/usr/share/${PN}" DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
- fi
- rm -f "${D}"/usr/share/${PN}/Makefile
-}
-
-src_install() {
- local libdir="lib"
- [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
- emake \
- OS=$(use kernel_FreeBSD && echo BSD || echo Linux) \
- LIB=${libdir} \
- DESTDIR="${D}" \
- install || die
- dodoc ChangeLog
-
- # need the makefile in pkg_preinst
- insinto /usr/share/${PN}
- doins Makefile || die
-
- # Should this belong in another ebuild? Like say binutils?
- # List all the multilib libdirs in /etc/env/04multilib (only if they're
- # actually different from the normal
- if has_multilib_profile || [ $(get_libdir) != "lib" -o -n "${CONF_MULTILIBDIR}" ]; then
- local libdirs="$(get_all_libdirs)" libdirs_env= dir=
- : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass...
- for dir in ${libdirs}; do
- libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
- done
-
- # Special-case uglyness... For people updating from lib32 -> lib amd64
- # profiles, keep lib32 in the search path while it's around
- if has_multilib_profile && [ -d "${ROOT}"lib32 -o -d "${ROOT}"lib32 ] && ! has lib32 ${libdirs}; then
- libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
- fi
- echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib
- doenvd "${T}"/04multilib
- fi
-
- # rc-scripts version for testing of features that *should* be present
- echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release
-}
-
-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 "${ROOT}etc/${x}" ] && continue
- [ -e "${ROOT}usr/share/baselayout/${x}" ] || continue
- cp -p "${ROOT}usr/share/baselayout/${x}" "${ROOT}"etc
- done
-
- # Force shadow permissions to not be world-readable #260993
- for x in shadow ; do
- [ -e "${ROOT}etc/${x}" ] && chmod o-rwx "${ROOT}etc/${x}"
- done
-
- # Take care of the etc-update for the user
- if [ -e "${ROOT}"/etc/._cfg0000_gentoo-release ] ; then
- mv "${ROOT}"/etc/._cfg0000_gentoo-release "${ROOT}"/etc/gentoo-release
- fi
-
- # whine about users that lack passwords #193541
- if [[ -e ${ROOT}/etc/shadow ]] ; then
- local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${ROOT}"/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 ${ROOT}/etc/passwd ]] ; then
- local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' /etc/passwd | sort)
- if [[ -n ${bad_shells} ]] ; then
- echo
- ewarn "The following users have non-existent shells!"
- ewarn "${bad_shells}"
- fi
- fi
-}
diff --git a/sys-apps/baselayout/baselayout-2.0.2.ebuild b/sys-apps/baselayout/baselayout-2.0.2.ebuild
deleted file mode 100644
index fc388e2d2f43..000000000000
--- a/sys-apps/baselayout/baselayout-2.0.2.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.2.ebuild,v 1.8 2011/07/08 10:11:58 ssuominen Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
- http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="build"
-
-PDEPEND="sys-apps/openrc"
-
-pkg_preinst() {
- # Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of
- # the baselayout-1.x ebuild copies all the real configs from the user's
- # /etc/conf.d into ${D}, it makes them all appear to be the default
- # versions. In order to protect them from being unmerged after this
- # upgrade, modify their timestamps.
- touch "${ROOT}"/etc/conf.d/* 2>/dev/null
-
- # 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 "${ROOT}"/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.
- if use build ; then
- local libdirs="$(get_all_libdirs)" dir=
- # Create our multilib dirs - the Makefile has no knowledge of this
- : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass...
- for dir in ${libdirs}; do
- mkdir -p "${ROOT}${dir}"
- touch "${ROOT}${dir}"/.keep
- mkdir -p "${ROOT}usr/${dir}"
- touch "${ROOT}usr/${dir}"/.keep
- mkdir -p "${ROOT}usr/local/${dir}"
- touch "${ROOT}usr/local/${dir}"/.keep
- done
-
- # Create symlinks for /lib, /usr/lib, and /usr/local/lib and
- # merge contents of duplicate directories if necessary.
- # Only do this when $ROOT != / since it should only be necessary
- # when merging to an empty $ROOT, and it's not very safe to perform
- # this operation when $ROOT = /.
- if [ "${SYMLINK_LIB}" = yes ] && [ "$ROOT" != / ] ; then
- local prefix libabi=$(get_abi_LIBDIR $DEFAULT_ABI)
- for prefix in "$ROOT"{,usr/,usr/local/} ; do
-
- [ ! -d "${prefix}lib" ] && rm -f "${prefix}lib" && \
- mkdir -p "${prefix}lib"
-
- [ ! -d "$prefix$libabi" ] && ln -sf "${prefix}lib"
-
- [ -h "$prefix$libabi" ] && [ -d "${prefix}lib" ] && \
- [ "$prefix$libabi" -ef "${prefix}lib" ] && continue
-
- local destdir=$prefix$libabi/ srcdir=${prefix}lib/
-
- [ -d "$destdir" ] || die "unable to create '$destdir'"
- [ -d "$srcdir" ] || die "unable to create $srcdir"
-
- mv -f "$srcdir".keep "$destdir".keep 2>/dev/null
- if ! rmdir "$srcdir" 2>/dev/null ; then
- ewarn "merging contents of '$srcdir' into '$destdir':"
-
- # Move directories if the dest doesn't exist.
- find "$srcdir" -type d -print0 | \
- while read -d $'\0' src ; do
-
- # If a parent directory of $src has already
- # been merged then it will no longer exist.
- [ -d "$src" ] || continue
-
- dest=$destdir${src#${srcdir}}
- if [ ! -d "$dest" ] ; then
- if [ -e "$dest" ] ; then
- ewarn " not overwriting file '$dest'" \
- "with directory '$src'"
- continue
- fi
- mv -f "$src" "$dest" && \
- ewarn " /${src#${ROOT}} merged" || \
- ewarn " /${src#${ROOT}} not merged"
- fi
- done
-
- # Move non-directories.
- find "$srcdir" ! -type d -print0 | \
- while read -d $'\0' src ; do
- dest=$destdir${src#${srcdir}}
- if [ -e "$dest" ] ; then
- if [ -d "$dest" ] ; then
- ewarn " not overwriting directory '$dest'" \
- "with file '$src'"
- else
- if [ -f "$src" -a ! -s "$src" ] && \
- [ -f "$dest" -a ! -s "$dest" ] ; then
- # Ignore empty files such as '.keep'.
- true
- else
- ewarn " not overwriting file '$dest'" \
- "with file '$src'"
- fi
- fi
- continue
- fi
-
- mv -f "$src" "$dest" && \
- ewarn " /${src#${ROOT}} merged" || \
- ewarn " /${src#${ROOT}} not merged"
- done
- fi
-
- rm -rf "${prefix}lib" || \
- die "unable to remove '${prefix}lib'"
-
- ln -s "$libabi" "${prefix}lib" || \
- die "unable to create '${prefix}lib' symlink"
- done
- fi
-
- emake -C "${D}/usr/share/${PN}" DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
- fi
- rm -f "${D}"/usr/share/${PN}/Makefile
-}
-
-src_install() {
- local libdir="lib"
- [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
- emake \
- OS=$(use kernel_FreeBSD && echo BSD || echo Linux) \
- LIB=${libdir} \
- DESTDIR="${D}" \
- install || die
- dodoc ChangeLog.svn
-
- # need the makefile in pkg_preinst
- insinto /usr/share/${PN}
- doins Makefile || die
-
- # Should this belong in another ebuild? Like say binutils?
- # List all the multilib libdirs in /etc/env/04multilib (only if they're
- # actually different from the normal
- if has_multilib_profile || [ $(get_libdir) != "lib" -o -n "${CONF_MULTILIBDIR}" ]; then
- local libdirs="$(get_all_libdirs)" libdirs_env= dir=
- : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass...
- for dir in ${libdirs}; do
- libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
- done
-
- # Special-case uglyness... For people updating from lib32 -> lib amd64
- # profiles, keep lib32 in the search path while it's around
- if has_multilib_profile && [ -d "${ROOT}"lib32 -o -d "${ROOT}"lib32 ] && ! has lib32 ${libdirs}; then
- libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
- fi
- echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib
- doenvd "${T}"/04multilib
- fi
-
- # rc-scripts version for testing of features that *should* be present
- echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release
-}
-
-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 "${ROOT}etc/${x}" ] && continue
- [ -e "${ROOT}usr/share/baselayout/${x}" ] || continue
- cp -p "${ROOT}usr/share/baselayout/${x}" "${ROOT}"etc
- done
-
- # Force shadow permissions to not be world-readable #260993
- for x in shadow ; do
- [ -e "${ROOT}etc/${x}" ] && chmod o-rwx "${ROOT}etc/${x}"
- done
-
- # Take care of the etc-update for the user
- if [ -e "${ROOT}"/etc/._cfg0000_gentoo-release ] ; then
- mv "${ROOT}"/etc/._cfg0000_gentoo-release "${ROOT}"/etc/gentoo-release
- fi
-
- # whine about users that lack passwords #193541
- if [[ -e ${ROOT}/etc/shadow ]] ; then
- local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${ROOT}"/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 ${ROOT}/etc/passwd ]] ; then
- local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' /etc/passwd | sort)
- if [[ -n ${bad_shells} ]] ; then
- echo
- ewarn "The following users have non-existent shells!"
- ewarn "${bad_shells}"
- fi
- fi
-}