3 files changed, 11 insertions, 27 deletions
diff --git a/dev-util/txt2regex/ChangeLog b/dev-util/txt2regex/ChangeLog
index 39b9c81fada7..07d2e1273603 100644
--- a/dev-util/txt2regex/ChangeLog
+++ b/dev-util/txt2regex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/txt2regex
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/txt2regex/ChangeLog,v 1.19 2007/02/22 02:29:22 peper Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/txt2regex/ChangeLog,v 1.20 2008/03/24 14:25:44 coldwind Exp $
+
+  24 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> -txt2regex-0.8.ebuild,
+  txt2regex-0.8-r1.ebuild:
+  amd64 stable, fix quoting, remove old.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-util/txt2regex/txt2regex-0.8-r1.ebuild b/dev-util/txt2regex/txt2regex-0.8-r1.ebuild
index 63d5eb97967c..f438cedcf684 100644
--- a/dev-util/txt2regex/txt2regex-0.8-r1.ebuild
+++ b/dev-util/txt2regex/txt2regex-0.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/txt2regex/txt2regex-0.8-r1.ebuild,v 1.5 2005/09/11 02:11:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/txt2regex/txt2regex-0.8-r1.ebuild,v 1.6 2008/03/24 14:25:44 coldwind Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://txt2regex.sourceforge.net/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 hppa ~mips ~ppc sparc x86"
+KEYWORDS="alpha amd64 hppa ~mips ~ppc sparc x86"
 IUSE="nls cjk"
 
 DEPEND="nls? ( sys-devel/gettext )"
@@ -21,11 +21,11 @@ src_unpack() {
 	cd "${S}"
 	# See bug 93568
 	useq nls || epatch "${FILESDIR}"/${P}-disable-nls.patch
-	use cjk && sed -i -e 's/\xa4/:+:/g' ${S}/${P}.sh
+	use cjk && sed -i -e 's/\xa4/:+:/g' "${S}"/${P}.sh
 }
 
 src_install() {
-	einstall DESTDIR=${D} MANDIR=${D}/usr/share/man/man1 || die
+	einstall DESTDIR="${D}" MANDIR="${D}"/usr/share/man/man1 || die
 	dodoc Changelog NEWS README README.japanese TODO
 	newman txt2regex.man txt2regex.6
 }
diff --git a/dev-util/txt2regex/txt2regex-0.8.ebuild b/dev-util/txt2regex/txt2regex-0.8.ebuild
deleted file mode 100644
index 652bff077efb..000000000000
--- a/dev-util/txt2regex/txt2regex-0.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/txt2regex/txt2regex-0.8.ebuild,v 1.5 2005/05/25 08:30:54 ferdy Exp $
-
-DESCRIPTION="A Regular Expression wizard that converts human sentences to regexs"
-HOMEPAGE="http://txt2regex.sourceforge.net/"
-SRC_URI="http://txt2regex.sourceforge.net/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 hppa mips ~ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=app-shells/bash-2.04"
-
-src_install() {
-	einstall DESTDIR=${D} MANDIR=${D}/usr/share/man/man1 || die
-	dodoc Changelog NEWS README README.japanese TODO
-	newman txt2regex.man txt2regex.6
-}