remove old

Package-Manager: portage-2.2.0_alpha76/cvs/Linux x86_64

4 files changed, 19 insertions, 368 deletions

diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog
index 187081d9e95e..cee63c6fdbce 100644
--- a/dev-util/schroot/ChangeLog
+++ b/dev-util/schroot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/schroot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.28 2011/10/23 01:10:22 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.29 2011/11/20 04:16:58 abcd Exp $
+
+  20 Nov 2011; Jonathan Callen <abcd@gentoo.org> -schroot-1.4.17.ebuild,
+  -schroot-1.4.21.ebuild:
+  remove old
 
 *schroot-1.4.23 (23 Oct 2011)
 
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 03d949e7f97d..1008a1ddc95d 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -6,29 +6,25 @@ AUX schroot-1.4.7-tests.patch 2427 RMD160 0e10f31a46d4d828b1a1a52159f88db26afe93
 AUX schroot.confd 371 RMD160 d7efa36975f549304a1e8a942f6389720d1bff88 SHA1 3eaf672a13c6dd4fadd01b7c1c54bc82f71d5b93 SHA256 68efa89cd4b358c6de050ebb5b973c87ee514fe5e5d888f63aa0af85aa4736c8
 AUX schroot.initd 705 RMD160 efdb102d21137a72b20fef8882e2b15ba7dabfc6 SHA1 d585fba4d92dc6d94275e079046e4ce821183b6b SHA256 8f8537c0c6c93d1169c8a333ddd78c4471d95956cfb187e3bd6612a4ad9f78f5
 DIST schroot_1.4.14.orig.tar.gz 1109550 RMD160 b50b71c6642148785ef63c428f412ec98baf323d SHA1 1268cdd0985c67cfe7fd88537fe2fbfe11853290 SHA256 f7e05924f12b10f4bf4d19b08b7eca21411a8b66fa18c9793c18de853525b76c
-DIST schroot_1.4.17.orig.tar.bz2 773664 RMD160 f414762447e388cdd37a76a3211cd40a9c2c1576 SHA1 f52d126d6d284a6a5af3111293b7350a50a08e9b SHA256 d924cadcb0b7b20ca14a5edb0e3f0a841a4386d59e39417824b6fd139d70f167
-DIST schroot_1.4.21.orig.tar.bz2 791504 RMD160 759c4881a8502d9b4b513c2e6cd668d4bd486178 SHA1 a17da5776af1bf96f427185fd80db1b66b94774a SHA256 a9fd91ce60b239368b91817254c8819e8c1f8730853016627967cb29307b8d88
 DIST schroot_1.4.23.orig.tar.bz2 824291 RMD160 61d9a5e74a9fe9ae6260cdedc1edf6929d77cffc SHA1 896ff4c027e30bf22c3fe64fc39398c20c45c200 SHA256 84931c04a789211a87fa31e3b1a6f6d62b9354d3116ae99e2b6bfa0816349d16
 EBUILD schroot-1.4.14.ebuild 4967 RMD160 ead45c839722a754339494cd94d95ce20fd4e534 SHA1 3f864742c09ed1b5d5c718903baebc1daf4b9b95 SHA256 f6c465795381fef1c2a70808e21f8f79d41672e292904655c958be06b80624fe
-EBUILD schroot-1.4.17.ebuild 4917 RMD160 86e866ac32ed6372e7b5ffa2a6916e0a1cb5047c SHA1 6cf38860d81a834ecd77e663d324f4ffa127a2fa SHA256 9aa054539c549c06d500119d17a080614420e05e166665e7d3f46525dc11d6b6
-EBUILD schroot-1.4.21.ebuild 4518 RMD160 8a0644d577df0cc8c17d10149b85107dd8bfb692 SHA1 4736da3a7a9625e28b74a566b75939a86cc2a5b7 SHA256 85486920c43099a262734dba3fdbc86caf2ef839ca801bb02dc9b2926dc661a0
 EBUILD schroot-1.4.23.ebuild 4497 RMD160 030df5d7a4dbeb6ba5534907ea0edf2d0fa4d7e0 SHA1 08673f2611e17d5ee02f37dc7264bfcf78aa8761 SHA256 15efb74a7537350ec038c876517b1d1df942e8db59fde673e3abde5dbb7836a9
-MISC ChangeLog 5117 RMD160 df6b6b622b1359b49f3837666278bf44bc7e328e SHA1 14964a05ebce9463e737e8b77e07bea7af16a7a8 SHA256 abac4a7b22a93dce4f4a62d1aa1d808b21b231fe8bd101453529dc32347f11b4
+MISC ChangeLog 5230 RMD160 975f05d44b46b1580e09b817c07b1e89f8dd6584 SHA1 178d489f9abc6faed8ef25c045e504ca8423b101 SHA256 9e6b8723a0b8014bf6d22307e42b640d0be786893ae87ce1297a528cd01660fc
 MISC metadata.xml 515 RMD160 503109571ab38b803facd58ffb77de4c99abee8b SHA1 e6be1d578aae7a1cc418ba886a12598d89510599 SHA256 f2da069d2bb008f7a2187b5a2c2770657eae391a08d987d9a9bf5174266193a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOo2mOAAoJELHSF2kinlg4FmAQAKIlqp1XB5dsoVe+RhFUfdPA
-yEtuteqZ1zw3/c4on6GYMEgsiNTwaAiOsGmOt1GsU4FPTnItJzXEcc3Ms/JBGvvG
-WNPguZThDm+8t/fJG9xmJNVq1xp8ewJsx6kv/BATYf+8R0+NeNLjILeaaNEkSB2b
-rx8T+QCn9uPZnoDj+T5BxTtdbDezTWLxuaX+iq/bf4GOOTzAcZesgehcRGQXjx6w
-pUUGcQgtTAS8bZLQ8D8EB0/m/NIXUUSfU3NDC6a6yvgNWpTnuw+noBDWCD9ow/XE
-hzr9BPcBj0WYQBwHHgjYV2VJhYniP7xrsz3FRKLcw2Y18RCWEsG5kz/gH/78/Byq
-hQ9Jegp0tUyrTKWbLVRWVnG75Ubhfs0lmyS4x+vLs5fTQAzJeRaqLEjOydgW7jXZ
-cpY3vUQS4ktwO5XHfcyWTBtlPrM2/L2iIiDwG1bwQUB8CX1hKrn/DLVm7fPGjDzt
-q0b2rD+KObP3dMcxmXp9hR18Ezoljn1xmMS8/6GZbPyUpyUmNrp/YW7r/E0hhd7D
-MlTLSwcEAJ8C8zPlPHKgphIo0YKKM3p4jUZ996Bg+mqNJSFYcs2RcH5QUKR4YObJ
-R0kAoPAXm9RFO23CZGQHPAHmw1jD7soUjMT7TxZBA2iXHkjh6R5O3T1ILyJukjx/
-FQ+loRegNrR1M3IpJu2W
-=Iz3X
+iQIcBAEBCgAGBQJOyH9GAAoJELHSF2kinlg4WJ0P/RV/RHQSUQHaGH0r1a2uC2dn
+zQ2109a0dGQfzja/6B/SWGDR6q8c0pnlV7JgVLdtY/mO+7KTK3+jPh93QxKspmVz
+AU+xTWMGCorEGOwqJNhP4wdphQGgeHQhHjpsJPqu9ogRWYK43P+NIobBZUBiPM5V
+ScnSovb7DnJgAQ3YwtnDLe4r+Csg5zRoFohERC0ethg4Cb2xxUojS7sT4iR0AMgw
+2WZHpppWiH4C/mLAVuCAPn/dRIOBsoeVC/w7VfbjxZ7u7OZXdbSjFe88PytZUT2h
+jJHDoRaGPaI80gXlwDae+Mh6qAdx+bNllmvZvwQZ9QtCyi1xfxSCuglpEG6EJ4sh
+dtQvpuLNQVneeXTxs3fJTmVuv21XJwK5n84EZiYSwaHWvSJoLaXqKNi5RPXXQT56
+aKslrZdF90c83Uq7wqgZe/Ta0zS5igZC6L3gQ+DSe6vlKKJGVnYijtbi85NciIHV
+y88HvHXx8DxMATUXEQd5so1/WKYvD8lXPq16wgYf/f/fOrr8Ad0QXych09pqJfqf
+ZxmC3pXgDgN/5QedgdiQ7XjgJJ4QsjXNbrhGUzeMDKeQFRkPwlRe77YMnay2/PRt
+9sxfKYaPVOt2IpWLABuLGdN0zVgNihQukSVXx5Hq5soHA9Q0YJJFThWFhOMnNi5C
+MaPZ3TzBsW78GzYsPY3z
+=xpPi
 -----END PGP SIGNATURE-----
diff --git a/dev-util/schroot/schroot-1.4.17.ebuild b/dev-util/schroot/schroot-1.4.17.ebuild
deleted file mode 100644
index c82f331770c7..000000000000
--- a/dev-util/schroot/schroot-1.4.17.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.17.ebuild,v 1.2 2011/01/23 20:18:17 abcd Exp $
-
-EAPI="3"
-WANT_AUTOMAKE="1.11"
-
-inherit autotools base pam
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="http://packages.debian.org/source/sid/schroot"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="btrfs +dchroot debug doc lvm nls pam test"
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.42.0
-	dev-libs/lockdev
-	>=sys-apps/util-linux-2.16
-	btrfs? ( sys-fs/btrfs-progs )
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.10.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/debianutils
-	dchroot? ( !sys-apps/dchroot )
-	nls? ( virtual/libintl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.7-tests.patch"
-	"${FILESDIR}/${PN}-1.4.14-debug.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-
-	# Don't depend on cppunit unless we are testing
-	use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac
-
-	eautoreconf
-}
-
-src_configure() {
-	root_tests=no
-	use test && (( EUID == 0 )) && root_tests=yes
-	econf \
-		$(use_enable btrfs btrfs-snapshot) \
-		$(use_enable doc doxygen) \
-		$(use_enable dchroot) \
-		$(use_enable dchroot dchroot-dsa) \
-		$(use_enable debug) \
-		$(use_enable lvm lvm-snapshot) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		--enable-block-device \
-		--enable-loopback \
-		--enable-uuid \
-		--enable-root-tests=$root_tests \
-		--enable-shared \
-		--disable-static \
-		--localstatedir="${EPREFIX}"/var \
-		--with-bash-completion-dir="${EPREFIX}"/usr/share/bash-completion
-}
-
-src_compile() {
-	emake all $(usev doc) || die "emake failed"
-}
-
-src_test() {
-	if [[ $root_tests == yes && $EUID -ne 0 ]]; then
-		ewarn "Disabling tests because you are no longer root"
-		return 0
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	insinto /usr/share/doc/${PF}/contrib/setup.d
-	doins contrib/setup.d/09fsck contrib/setup.d/10mount-ssh || die "installation of contrib scripts failed"
-
-	newinitd "${FILESDIR}"/schroot.initd schroot || die "installation of init.d script failed"
-	newconfd "${FILESDIR}"/schroot.confd schroot || die "installation of conf.d file failed"
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "installation of docs failed"
-
-	if use doc; then
-		docinto html/sbuild
-		dohtml doc/sbuild/html/* || die "installation of html docs failed"
-		docinto html/schroot
-		dohtml doc/schroot/html/* || die "installation of html docs failed"
-	fi
-
-	if use pam; then
-		rm -f "${ED}"etc/pam.d/schroot
-		pamd_mimic_system schroot auth account session
-	fi
-
-	# Remove *.la files
-	find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed"
-}
-
-pkg_preinst() {
-	export had_older_1_4_1=false
-	has_version "<dev-util/schroot-1.4.1" && had_older_1_4_1=true
-	if ${had_older_1_4_1}; then
-		einfo "Moving config files to new location..."
-		mkdir "${EROOT}etc/schroot/default"
-		mv_conffile etc/schroot/script-defaults etc/schroot/default/config
-		mv_conffile etc/schroot/mount-defaults etc/schroot/default/fstab
-		mv_conffile etc/schroot/copyfiles-defaults etc/schroot/default/copyfiles
-		mv_conffile etc/schroot/nssdatabases-defaults etc/schroot/default/nssdatabases
-	fi
-}
-
-mv_conffile() {
-	local OLDFILE=${EROOT}$1
-	local NEWFILE=${EROOT}$2
-
-	# if the old file doesn't exist, or is a symlink, stop
-	[[ -f ${OLDFILE} ]] || return 0
-	[[ -L ${OLDFILE} ]] && return 0
-
-	# if the new file already exists, then we have a problem...
-	if [[ -e ${NEWFILE} ]]; then
-		# but if they are the same, then don't worry about it
-		if cmp -s "${OLDFILE}" "${NEWFILE}"; then
-			rm -f "${OLDFILE}"
-		else
-			ewarn "${NEWFILE} already exists, not moving ${OLDFILE}"
-		fi
-	else
-		mv "${OLDFILE}" "${NEWFILE}"
-	fi
-
-	local x y
-	# now move all the unmerged config files as well
-	for x in "${OLDFILE%/*}"/._cfg????_"${OLDFILE##*/}"; do
-		[[ -f ${x} ]] || continue
-		# /etc/schroot/._cfg0000_script-defaults -> /etc/schroot/default/._cfg0000_config
-		y=${x##*/}
-		y=${NEWFILE%*/}${y%${OLDFILE##*/}}${NEWFILE##*/}
-		mv "${x}" "${y}"
-	done
-}
-
-pkg_postinst() {
-	local x
-	if ${had_older_1_4_1}; then
-		for x in script:config mount:fstab copyfiles nssdatabases; do
-			if [[ ! -e ${EROOT}etc/schroot/${x%:*}-defaults && -f ${EROOT}etc/schroot/default/${x#*:} ]]; then
-				einfo "Creating compatibility symlink for ${x%:*}-defaults"
-				ln -sf "default/${x#*:}" "${ROOT}etc/schroot/${x%:*}-defaults"
-			fi
-		done
-
-		ewarn "Your config files have been moved to the new location in"
-		ewarn "/etc/schroot/default. Compatibility symlinks have been installed in"
-		ewarn "/etc/schroot, and may be removed if no running chroot refers to them."
-	fi
-}
diff --git a/dev-util/schroot/schroot-1.4.21.ebuild b/dev-util/schroot/schroot-1.4.21.ebuild
deleted file mode 100644
index 8ceaae46ba97..000000000000
--- a/dev-util/schroot/schroot-1.4.21.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.21.ebuild,v 1.1 2011/03/22 06:56:01 abcd Exp $
-
-EAPI="4"
-WANT_AUTOMAKE="1.11"
-
-inherit autotools base pam versionator
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="http://packages.debian.org/source/sid/schroot"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="btrfs +dchroot debug doc lvm nls pam test"
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.42.0
-	dev-libs/lockdev
-	>=sys-apps/util-linux-2.16
-	btrfs? ( sys-fs/btrfs-progs )
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.10.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/debianutils
-	dchroot? ( !sys-apps/dchroot )
-	nls? ( virtual/libintl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.7-tests.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-
-	# Don't depend on cppunit unless we are testing
-	use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac
-
-	eautoreconf
-}
-
-src_configure() {
-	root_tests=no
-	use test && (( EUID == 0 )) && root_tests=yes
-	econf \
-		$(use_enable btrfs btrfs-snapshot) \
-		$(use_enable doc doxygen) \
-		$(use_enable dchroot) \
-		$(use_enable dchroot dchroot-dsa) \
-		$(use_enable debug) \
-		$(use_enable lvm lvm-snapshot) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		--enable-block-device \
-		--enable-loopback \
-		--enable-uuid \
-		--enable-root-tests=$root_tests \
-		--enable-shared \
-		--disable-static \
-		--localstatedir="${EPREFIX}"/var \
-		--with-bash-completion-dir="${EPREFIX}"/usr/share/bash-completion
-}
-
-src_compile() {
-	emake all $(usev doc)
-}
-
-src_test() {
-	if [[ $root_tests == yes && $EUID -ne 0 ]]; then
-		ewarn "Disabling tests because you are no longer root"
-		return 0
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/doc/${PF}/contrib/setup.d
-	doins contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
-
-	newinitd "${FILESDIR}"/schroot.initd schroot
-	newconfd "${FILESDIR}"/schroot.confd schroot
-
-	if use doc; then
-		docinto html/sbuild
-		dohtml doc/sbuild/html/*
-		docinto html/schroot
-		dohtml doc/schroot/html/*
-	fi
-
-	if use pam; then
-		rm -f "${ED}"etc/pam.d/schroot
-		pamd_mimic_system schroot auth account session
-	fi
-
-	# Remove *.la files
-	find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed"
-}
-
-pkg_preinst() {
-	if [[ ${REPLACING_VERSIONS} == 1.2* || ${REPLACING_VERSIONS} == 1.4.0* ]]; then
-		einfo "Moving config files to new location..."
-		mkdir "${EROOT}etc/schroot/default"
-		mv_conffile etc/schroot/script-defaults etc/schroot/default/config
-		mv_conffile etc/schroot/mount-defaults etc/schroot/default/fstab
-		mv_conffile etc/schroot/copyfiles-defaults etc/schroot/default/copyfiles
-		mv_conffile etc/schroot/nssdatabases-defaults etc/schroot/default/nssdatabases
-	fi
-}
-
-mv_conffile() {
-	local OLDFILE=${EROOT}$1
-	local NEWFILE=${EROOT}$2
-
-	# if the old file doesn't exist, or is a symlink, stop
-	[[ -f ${OLDFILE} ]] || return 0
-	[[ -L ${OLDFILE} ]] && return 0
-
-	# if the new file already exists, then we have a problem...
-	if [[ -e ${NEWFILE} ]]; then
-		# but if they are the same, then don't worry about it
-		if cmp -s "${OLDFILE}" "${NEWFILE}"; then
-			rm -f "${OLDFILE}"
-		else
-			ewarn "${NEWFILE} already exists, not moving ${OLDFILE}"
-		fi
-	else
-		mv "${OLDFILE}" "${NEWFILE}"
-	fi
-
-	local x y
-	# now move all the unmerged config files as well
-	for x in "${OLDFILE%/*}"/._cfg????_"${OLDFILE##*/}"; do
-		[[ -f ${x} ]] || continue
-		# /etc/schroot/._cfg0000_script-defaults -> /etc/schroot/default/._cfg0000_config
-		y=${x##*/}
-		y=${NEWFILE%*/}${y%${OLDFILE##*/}}${NEWFILE##*/}
-		mv "${x}" "${y}"
-	done
-}
-
-pkg_postinst() {
-	local x
-	if [[ ${REPLACING_VERSIONS} == 1.2* || ${REPLACING_VERSIONS} == 1.4.0* ]]; then
-		for x in script:config mount:fstab copyfiles nssdatabases; do
-			if [[ ! -e ${EROOT}etc/schroot/${x%:*}-defaults && -f ${EROOT}etc/schroot/default/${x#*:} ]]; then
-				einfo "Creating compatibility symlink for ${x%:*}-defaults"
-				ln -sf "default/${x#*:}" "${ROOT}etc/schroot/${x%:*}-defaults"
-			fi
-		done
-
-		ewarn "Your config files have been moved to the new location in"
-		ewarn "/etc/schroot/default. Compatibility symlinks have been installed in"
-		ewarn "/etc/schroot, and may be removed if no running chroot refers to them."
-	fi
-}