NLS and CJK updates, thanks to rener in bug #93568

(Portage version: 2.0.51.22-r1 screaming llama edition)

6 files changed, 48 insertions, 9 deletions

diff --git a/dev-util/txt2regex/ChangeLog b/dev-util/txt2regex/ChangeLog
index 73ed9e25d894..99e6676bdd7b 100644
--- a/dev-util/txt2regex/ChangeLog
+++ b/dev-util/txt2regex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/txt2regex
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/txt2regex/ChangeLog,v 1.11 2005/05/10 19:12:51 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/txt2regex/ChangeLog,v 1.12 2005/05/23 08:34:23 ciaranm Exp $
+
+*txt2regex-0.8-r1 (23 May 2005)
+
+  23 May 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  +files/txt2regex-0.8-disable-nls.patch, -txt2regex-0.7.ebuild,
+  +txt2regex-0.8-r1.ebuild:
+  NLS and CJK updates, thanks to rener in bug #93568
 
   10 May 2005; Rene Nussbaumer <killerfox@gentoo.org> txt2regex-0.8.ebuild:
   stable on hppa
diff --git a/dev-util/txt2regex/Manifest b/dev-util/txt2regex/Manifest
index 80096149c7b7..f880e0635b02 100644
--- a/dev-util/txt2regex/Manifest
+++ b/dev-util/txt2regex/Manifest
@@ -1,6 +1,7 @@
-MD5 0f454d691dff172efc04b7e94b6e14db txt2regex-0.7.ebuild 679
-MD5 951297dc3495b373222a974b475d0623 txt2regex-0.8.ebuild 686
 MD5 3d63f7b3645263d6dc08a3d365cb657c ChangeLog 1308
 MD5 ef0e29771a3844176418bb404a586ab8 metadata.xml 342
-MD5 2cc94657bf698dd945d15e00de781e3a files/digest-txt2regex-0.7 61
+MD5 951297dc3495b373222a974b475d0623 txt2regex-0.8.ebuild 686
+MD5 3d0ca88a42804dc0b712c61d2fff3ca7 txt2regex-0.8-r1.ebuild 915
 MD5 0f685a5f25b9ba83b6846810257763cd files/digest-txt2regex-0.8 61
+MD5 0f685a5f25b9ba83b6846810257763cd files/digest-txt2regex-0.8-r1 61
+MD5 c9bba856a23efb9636dd2f7c4d0e3008 files/txt2regex-0.8-disable-nls.patch 764
diff --git a/dev-util/txt2regex/files/digest-txt2regex-0.7 b/dev-util/txt2regex/files/digest-txt2regex-0.7
deleted file mode 100644
index 378161db3e88..000000000000
--- a/dev-util/txt2regex/files/digest-txt2regex-0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5cc7366bd762c8f05fea431d8db1eba9 txt2regex-0.7.tgz 39287
diff --git a/dev-util/txt2regex/files/digest-txt2regex-0.8-r1 b/dev-util/txt2regex/files/digest-txt2regex-0.8-r1
new file mode 100644
index 000000000000..e6561fce2150
--- /dev/null
+++ b/dev-util/txt2regex/files/digest-txt2regex-0.8-r1
@@ -0,0 +1 @@
+MD5 83bc1f95b36fe51ade8d130fab390103 txt2regex-0.8.tgz 40514
diff --git a/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch b/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch
new file mode 100644
index 000000000000..107b1b823753
--- /dev/null
+++ b/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch
@@ -0,0 +1,20 @@
+diff -ur txt2regex-0.8/Makefile txt2regex-0.8.nonls/Makefile
+--- txt2regex-0.8/Makefile	2004-09-28 16:04:55 -0500
++++ txt2regex-0.8.nonls/Makefile	2005-05-14 15:28:38 -0500
+@@ -80,15 +80,8 @@
+ 	rm -rf $(DISTDIR)
+ 
+ #TODO install man page and README
+-install: mo
+-	@[ -d $(LOCALEDIR) ] || mkdir -p $(LOCALEDIR); \
++install:
+ 	[ -d $(BINDIR) ] || mkdir -p $(BINDIR); \
+-	for pot in `cd $(PODIR) && ls *.mo`; do \
+-		poti=`echo $$pot | sed 's/\.mo$$//'`; \
+-		modir=$(LOCALEDIR)/$$poti/LC_MESSAGES; \
+-		[ -d $$modir ] || mkdir -p $$modir; \
+-		install -m644 $(PODIR)/$$pot $$modir/$(NAME).mo; \
+-	done; \
+ 	sed -e '/^TEXTDOMAINDIR=/s,=.*,=$(LOCALEDIR),' \
+ 	    -e '/^VERSION=/s/=.*/=$(VERSION)/' $(SHSKEL) > $(BINDIR)/$(NAME) && \
+ 	chmod +x $(BINDIR)/$(NAME) && \
diff --git a/dev-util/txt2regex/txt2regex-0.7.ebuild b/dev-util/txt2regex/txt2regex-0.8-r1.ebuild
index be9b794dd82c..a078fd5282d7 100644
--- a/dev-util/txt2regex/txt2regex-0.7.ebuild
+++ b/dev-util/txt2regex/txt2regex-0.8-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.7.ebuild,v 1.9 2004/09/18 20:21:15 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/txt2regex/txt2regex-0.8-r1.ebuild,v 1.1 2005/05/23 08:34:23 ciaranm Exp $
+
+inherit eutils
 
 DESCRIPTION="A Regular Expression wizard that converts human sentences to regexs"
 HOMEPAGE="http://txt2regex.sourceforge.net/"
@@ -8,11 +10,20 @@ SRC_URI="http://txt2regex.sourceforge.net/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc mips ~alpha hppa ~amd64"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="nls cjk"
 
+DEPEND="nls? ( sys-devel/gettext )"
 RDEPEND=">=app-shells/bash-2.04"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# See bug 93568
+	useq nls || epatch "${FILESDIR}"/${P}-disable-nls.patch
+	use cjk && sed -i -e 's/\xa4/:+:/g' ${S}/${P}.sh
+}
+
 src_install() {
 	einstall DESTDIR=${D} MANDIR=${D}/usr/share/man/man1 || die
 	dodoc Changelog NEWS README README.japanese TODO