quotes, amd64 stable (bug #214798), remove old

Package-Manager: portage-2.1.5_rc10

4 files changed, 27 insertions, 86 deletions

diff --git a/app-misc/jail/ChangeLog b/app-misc/jail/ChangeLog
index 9c02d8055394..928579505adc 100644
--- a/app-misc/jail/ChangeLog
+++ b/app-misc/jail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/jail
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/ChangeLog,v 1.22 2008/03/26 02:08:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/ChangeLog,v 1.23 2008/05/11 13:49:08 maekke Exp $
+
+  11 May 2008; Markus Meier <maekke@gentoo.org> -jail-1.9-r1.ebuild,
+  jail-1.9-r2.ebuild:
+  quotes, amd64 stable (bug #214798), remove old
 
   26 Mar 2008; Brent Baude <ranger@gentoo.org> jail-1.9-r2.ebuild:
   stable ppc, bug 214798
diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest
index 411c0874b239..8ad854f75806 100644
--- a/app-misc/jail/Manifest
+++ b/app-misc/jail/Manifest
@@ -1,8 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX jail-gentoo.diff 3256 RMD160 bb293364192ebfe74548d824d5bfa67a4d7454a8 SHA1 123fe7fbbdba6b088d931af9ad02b85493f8c9f5 SHA256 dcb78c808f022ba30a0e5bf7a41d7eb5760c79919539f266cbd1e5299516f8a5
 AUX multiuser-rsa.patch 844 RMD160 287d4a4808270f31423eadce88f39fb7a83a1603 SHA1 94467df2aa60325e2ee99ecc6c2d3291baa78526 SHA256 5256b38527ef46e87603f3ead6c99b3ffb4083f1cfc6905b47bf110be2803def
 AUX wrongshell.patch 472 RMD160 7df4768ecd43942854c425b30eb75b525bba87b4 SHA1 bac6414befbf34f609491e8f2195ad40d1ea3695 SHA256 87aa9328738d2ea71867d076d7356252b7ed70694d1d47b48c16857864a4d281
 DIST jail_1.9.tar.gz 32994 RMD160 12a43f7c0aa533ff0ffa91a1b97bf7b59c89cb78 SHA1 c233f81281c00b681d79ab7150e099fe358447ea SHA256 1d997739b2dfe84ff975673b1357d3814cd3c2ee0cf3d61031f6f95a3e2080e3
-EBUILD jail-1.9-r1.ebuild 1988 RMD160 a9bd8accf2324e443b4184bcb35dfbf3e3211c00 SHA1 1f163939a23677237665cc562b5b44ff88b631e3 SHA256 9033102aa0bf9c625ce0653a70e5e6da1f5c44e3e8754194875c3314e84baa3b
-EBUILD jail-1.9-r2.ebuild 2279 RMD160 3ea5bd5f60f019e3a0e76a0639e946c666387de4 SHA1 8bc5c7172affc8608e5c9f92c1fb2733cc37851a SHA256 0eeacd0dc49e0fdcebbf17cfaf0d341e75b68aaccd4a0a0fb7ac12404d584d25
-MISC ChangeLog 2329 RMD160 21b11cef4ab17b21e15ba16613fc59eef1bc17e5 SHA1 d993c475ebfe6ecf1282136086304a65c8e461dc SHA256 e5bfa2e3ce135023d22477a6b465f459183978522fd76b8aaf8360eb84b80232
+EBUILD jail-1.9-r2.ebuild 2294 RMD160 605fe5bd6896c25b1c6eb5697e1f50ffb34239d3 SHA1 292d64c9c1d74ea10334fa780506f427b0a6f880 SHA256 6fbdc4f231c550136b12d0ca42ea41701b0b64b1aedc48ac1d8fafb89f874b61
+MISC ChangeLog 2470 RMD160 d7b309b037adad2a84b9c436717a963dbbdf72a5 SHA1 142b53667cb048d717c0e3f0bd0a0f41074516ea SHA256 219599be015b07a675b061e8f96d2c736cc73e9e9b0c486c2b7cfd2f6e33f1ff
 MISC metadata.xml 754 RMD160 d86f1e1511a4c0a7010364f2060035411e945772 SHA1 e3e30d1fd5a91acc1e47d3b115e0e49cb78f40c9 SHA256 4b2814747d477afa48f0e0a2356bf4a3d6055f5d751db532c3255aea9bb4ddf3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgm+YQACgkQkKaRLQcq0GJTMQCdFNO8iVmh+oX4YoxwRS9Gq1JV
+iEcAoKekqtBzVkRiL3JdT26Fc6Pxrtex
+=PVBp
+-----END PGP SIGNATURE-----
diff --git a/app-misc/jail/jail-1.9-r1.ebuild b/app-misc/jail/jail-1.9-r1.ebuild
deleted file mode 100644
index 4b10168f6014..000000000000
--- a/app-misc/jail/jail-1.9-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/jail-1.9-r1.ebuild,v 1.15 2005/04/21 19:19:04 blubb Exp $
-
-inherit eutils
-
-S="${WORKDIR}/${PN}_1-9_stable"
-DESCRIPTION="Jail Chroot Project is a tool that builds a chrooted environment and automagically configures and builds 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="x86 amd64"
-IUSE=""
-
-DEPEND="virtual/libc"
-RDEPEND="dev-lang/perl
-	dev-util/strace"
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-gentoo.diff
-	epatch ${FILESDIR}/wrongshell.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 "s:usr/local:${D}/usr:g" Makefile
-
-	emake || die "make 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
-}
diff --git a/app-misc/jail/jail-1.9-r2.ebuild b/app-misc/jail/jail-1.9-r2.ebuild
index 989a54f8fb7d..1a1b297b3a79 100644
--- a/app-misc/jail/jail-1.9-r2.ebuild
+++ b/app-misc/jail/jail-1.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.7 2008/03/26 02:08:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/jail-1.9-r2.ebuild,v 1.8 2008/05/11 13:49:08 maekke Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/jail/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc
@@ -21,11 +21,11 @@ RDEPEND="dev-lang/perl
 
 src_unpack() {
 	unpack ${PN}_${PV}.tar.gz
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-gentoo.diff || die "failed to apply patch"
-	epatch ${FILESDIR}/wrongshell.patch || die "failed to apply patch"
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-gentoo.diff || die "failed to apply patch"
+	epatch "${FILESDIR}"/wrongshell.patch || die "failed to apply patch"
 	cd src
-	epatch ${FILESDIR}/multiuser-rsa.patch || die "failed to apply patch"
+	epatch "${FILESDIR}"/multiuser-rsa.patch || die "failed to apply patch"
 }
 
 src_compile() {
@@ -33,7 +33,7 @@ src_compile() {
 	sed -i "s:\$4/etc:\${D}/etc:g" install.sh
 
 	# the destination directory should be /usr not /usr/local
-	cd ${S}/src
+	cd "${S}"/src
 	sed -i -e "s:usr/local:${D}/usr:g" \
 		-e "s:^COPT =.*:COPT = -Wl,-z,no:g" Makefile
 
@@ -43,7 +43,7 @@ src_compile() {
 }
 
 src_install() {
-	cd ${S}/src
+	cd "${S}"/src
 	einstall
 
 	# remove //var/tmp/portage/jail-1.9/image//usr from files
@@ -70,9 +70,9 @@ src_install() {
 		sed -i "s:/${D}/usr:/usr:g" ${f}
 	done
 
-	cd ${D}/usr/lib
+	cd "${D}"/usr/lib
 	sed -i "s:/usr/etc:/etc:" libjail.pm
 
-	cd ${S}/doc
+	cd "${S}"/doc
 	dodoc CHANGELOG INSTALL README SECURITY VERSION
 }