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

(Portage version: 2.1.5_rc10)

3 files changed, 15 insertions, 83 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/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
 }