Remove old.

Package-Manager: portage-2.1.11.10/cvs/Linux x86_64

3 files changed, 14 insertions, 83 deletions

diff --git a/app-misc/jail/ChangeLog b/app-misc/jail/ChangeLog
index 97d183e04384..7079228b638f 100644
--- a/app-misc/jail/ChangeLog
+++ b/app-misc/jail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/jail
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/ChangeLog,v 1.30 2012/07/29 16:54:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/ChangeLog,v 1.31 2012/08/17 17:29:47 kensington Exp $
+
+  17 Aug 2012; Michael Palimaka <kensington@gentoo.org> -jail-1.9-r2.ebuild:
+  Remove old.
 
   29 Jul 2012; Raúl Porcel <armin76@gentoo.org> jail-1.9-r2.ebuild,
   jail-1.9-r3.ebuild:
diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest
index 2446314c2d76..59156d0c42f4 100644
--- a/app-misc/jail/Manifest
+++ b/app-misc/jail/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX jail-1.9-gentoo.patch 3186 SHA256 bf3c42da26870dca1295f1fc5ca1d49eb1073137d7518f88d54b427fdb30ca61 SHA512 70293d18269850c8f0971bb62d20849a903de31982fbe91bfb8dd1adb34a4baf1a10c42ffd73804b214586022cf666b199f091a6cc0f83a08f6e049cc74abf22 WHIRLPOOL 20116cfdc696c05ec0f016d0bb80f65ee9555eeeb3d63a90e9d945a2729d411f3ed9b2a66e268ac8c75bcb31ec6128e68d8dc12c75a5e5eea68b56e60bd78c3a
 AUX jail-1.9-ldflags.patch 328 SHA256 26034a6e25281483ac3add1deb42c49bcfcde00693f958aaf0eda542ba98bd37 SHA512 8b92e834a447f5fb916ff4cfb3fa1ca89d048e954ffc2a8cd8889e21a8037b54ee14d241f1a988d2c686d3ce844205354a5763f0f44cef8b2413e1ba05ff405b WHIRLPOOL 554b15eb9a7d57c53a656ae7c7c9adfeb069aa3c7f1d9e12e96a7c455d4ebf2ea11e80a139e66fc9b4e8ac19c2e847767d54337540f54626d1e0c4b47e2ba67b
 AUX jail-1.9-multiuser-rsa.patch 856 SHA256 e67e3f140f82ba3bdbeb0d650c918d97a7ddedee6c56a620c4273d8a6009b428 SHA512 b6cc3018faf06346c747242b8b721554438dd4db11621411142a50e7ed41ee009af8387fb2742a44c8fe243f5201f58da77d48a54a83d709ed5e8e8172f50541 WHIRLPOOL 853bcf6d1b7822464513bc19dcdc87054a6ad73176e632df366e2cecf9ac47a474123b3dde386554e804f3e1dfa4d0234d27f04d63d564a7610738b5c9486993
 AUX jail-1.9-wrongshell.patch 330 SHA256 d9de983e7c31e09927a87ac56c028ffb4f2f9692825aba765a157a63908eb07f SHA512 ee92dbfb9e147d94d2ebfaaf597ad381d93bd1e5fc65e85a20ee37c9066dbe7560a3385977cd3d30b87f5cdb2d90c19827a7adac69f667ea61a4920ec0b02cbd WHIRLPOOL 0f67fab357c81d354d324fafd44c073fd587a61054203a5d6e7df10e6f28b28d731805dda3107ffea5ef80c6b0f65f02887b14604bc6b4f9055412fca629416a
 DIST jail_1.9.tar.gz 32994 SHA256 1d997739b2dfe84ff975673b1357d3814cd3c2ee0cf3d61031f6f95a3e2080e3 SHA512 f2cec8f4ef38c044e320919a1c172ec18526925e4dcda2785d99d05d9ad939c66c320e4e428e5efd63e4d87bbfb7f89a1c9bc15e13f15a8a4331aa6935f60e30 WHIRLPOOL 9186cba5c74a28a8cc7026a28525ad68ef2181851ffe7f264cbc634134653526c9d06d99d5c6da85152421e05ee2ab8f4f4306dea33c4fbcfabb4bd806e9e755
-EBUILD jail-1.9-r2.ebuild 2302 SHA256 2b1c6fd63d65ff434d536cb5b9549a920c4a79e63913aedb992e8e5d24df2646 SHA512 30abfa4e4c7d557a885643e22f15a26389909ae3a309271bf1eaafc4621d53cd4f38c74039823a484124c9b04142550d4bb215d134c403502a5dfb1c9c6b07db WHIRLPOOL 516bcebdfd641e724a258d40fe3b317df72215672483f37fb5c66288b1ee9d2b2c82647af25d2870b1b4500c4e99998ed4b533de9ce973012b891fbd818a0711
 EBUILD jail-1.9-r3.ebuild 2256 SHA256 1e654bd5a2b7e7d18ea78f85aa8dd20459e9f9ed606e0d47f366674225ad9993 SHA512 f5f092630ea59c8fd3cae4ff8d4c2bf2d83e8a3d1c7d5a8d3a5e3dcff65ba219f2f16b4da39bc3bd638ed15c0a60620b7544cbd799798d2b34ca0b3414e93ff5 WHIRLPOOL 58ed99227cf2eba66911c02f384f7428ce5cff7e85acc30801184b48b485333349466072640dc504b23a278aca7a2d3913a5bcd9d840bab5ba5e2f262467d455
-MISC ChangeLog 3570 SHA256 3205ea411fcf95c17b2fec75389e87283d67ef7f86702b5c07a92ee7aeb87703 SHA512 4e5522e5776cc7ad97478601c20e2c540e59c2cd8fed8ff4e8f9b5a94f21fea65519f9274f36758b246cdfcf7a0295e867bda850d10d54fc172c4eec70ce87b0 WHIRLPOOL 7601ff7026941a8ac7a2bc6e516a42ff6d391736bd6ad5ea82be04633094fcec3f149dddec0565dfdd0ec18ffc8112ad42ebd5887ed693d039cea3d6c4c621f8
+MISC ChangeLog 3665 SHA256 85a6723659d0754d11bf8cd7ae093a71761743153eb81e99392f4c4a8c1ef8ec SHA512 b5c71342b1ff64d01b5704d4da89ce93c6af1a56e5b137589bae71b29ffd1ed3dbe552b91c35157b97415ebad8e3d2b080bd539688ce9664f4906007df449e70 WHIRLPOOL 02bd041011cc8b55704b04285b0f86da0fa7d05c40904e92c261785294cc540c5faf863cf441a827d1eed19fb3300eee8d7f79397581984e95e865fc0f0d5b4f
 MISC metadata.xml 732 SHA256 3c834970681eb57c098cdc64aea81fd309609090858ee8d123a3937af89112b5 SHA512 aba6d2e37847bb2641a08d40ba90975fd700943f09d4970cd80e8e50d28077775b6c1650283614f610c164731f93e12a06e10be9538dde7481b7facec9926d49 WHIRLPOOL e5c2418d585cd35058dbdcf0885a2b535c0899a80f6337ca3db78b48865a02e88e950681cb6635f881fa321dcb9e7219f8ebda27df7733f0f0e3043d8c8cf9c9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAVaroACgkQuQc30/atMkDZ3ACfd6jwFrJ5FIBErduIYw3k1W6p
-ZlMAn0vQu50HPc1f7sSZwheCV4YPwANq
-=PbqN
+iQEcBAEBCAAGBQJQLn9uAAoJEMbwO6tnXQ0sB1wIAJQwtQLklJkJwAb2slS+o7Q4
+5XSs9RpW7BDQU/S2O9Xru2oIPU6Q0TdvoNM+alv0rr/7NeRoDGRjggzHoLt6rqsv
+Mnu2Yz0XAc65nQTlJTPLQmuWXv2jaUM+4AIHhj7j+0eSG9Z1V6I3nu6nMigco98b
+ccpjkfZ462nCz4p/FlLEWf+aAExhhNvgYCnU60KswjS2UPoqVpambmVxnRlh2Few
+paZG2X/rIB/1UDpRUIXsRoitQZAA3ILfpGCm956DDZSKw5bfDjbIOs2KIZF7NMKy
+nlU2Ht1ENHbt7iri8ohtU3wxxRGTMYNrqMUSKxdbL99LNzPBmeL5fLkJUQYdUIQ=
+=3AKA
 -----END PGP SIGNATURE-----
diff --git a/app-misc/jail/jail-1.9-r2.ebuild b/app-misc/jail/jail-1.9-r2.ebuild
deleted file mode 100644
index 883fbcf84d09..000000000000
--- a/app-misc/jail/jail-1.9-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/jail-1.9-r2.ebuild,v 1.15 2012/07/29 16:54:12 armin76 Exp $
-
-inherit eutils flag-o-matic
-
-S="${WORKDIR}/${PN}_1-9_stable"
-DESCRIPTION="a tool that builds a chroot and configures all the required files, directories and libraries"
-HOMEPAGE="http://www.jmcresearch.com/projects/jail/"
-SRC_URI="mirror://sourceforge/jail/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=">=sys-apps/sed-4"
-RDEPEND="dev-lang/perl
-	dev-util/strace"
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch || die "failed to apply patch"
-	epatch "${FILESDIR}"/${P}-wrongshell.patch || die "failed to apply patch"
-	epatch "${FILESDIR}"/${P}-multiuser-rsa.patch || die "failed to apply patch"
-}
-
-src_compile() {
-	# configuration files should be installed in /etc not /usr/etc
-	sed -i "s:\$4/etc:\${D}/etc:g" install.sh
-
-	# the destination directory should be /usr not /usr/local
-	cd "${S}"/src
-	sed -i -e "s:usr/local:${D}/usr:g" \
-		-e "s:^COPT =.*:COPT = -Wl,-z,no:g" Makefile
-
-	# Below didn't work. Don't know why
-	#append-ldflags -Wl,-z,now
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	cd "${S}"/src
-	einstall
-
-	# remove //var/tmp/portage/jail-1.9/image//usr from files
-	FILES=( "${D}/usr/bin/mkjailenv"
-		"${D}/usr/bin/addjailsw"
-		"${D}/usr/bin/addjailuser"
-		"${D}/etc/jail.conf"
-		"${D}/usr/lib/libjail.pm"
-		"${D}/usr/lib/arch/generic/definitions"
-		"${D}/usr/lib/arch/generic/functions"
-		"${D}/usr/lib/arch/linux/definitions"
-		"${D}/usr/lib/arch/linux/functions"
-		"${D}/usr/lib/arch/freebsd/definitions"
-		"${D}/usr/lib/arch/freebsd/functions"
-		"${D}/usr/lib/arch/irix/definitions"
-		"${D}/usr/lib/arch/irix/functions"
-		"${D}/usr/lib/arch/solaris/definitions"
-		"${D}/usr/lib/arch/solaris/functions" )
-
-	for f in "${FILES[@]}"; do
-		# documentation says funtion 'dosed' is supposed to do this, but didn't know how to make it work :'(
-		# dosed ${file} || die "error in dosed"
-		sed -i "s:/${D}/usr:/usr:g" ${f}
-	done
-
-	cd "${D}"/usr/lib
-	sed -i "s:/usr/etc:/etc:" libjail.pm
-
-	cd "${S}"/doc
-	dodoc CHANGELOG INSTALL README SECURITY VERSION
-}