public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/txt2regex/, dev-util/txt2regex/files/
@ 2015-10-13 20:39 Patrice Clement
  0 siblings, 0 replies; 2+ messages in thread
From: Patrice Clement @ 2015-10-13 20:39 UTC (permalink / raw
  To: gentoo-commits

commit:     9ede820eaec81dd81d767a90d8793052daa70696
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 20:34:45 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 20:38:13 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ede820e

dev-util/txt2regex: Add patch to actually install txt2regex script courtesy of René Rhéaume <rene.rheaume <AT> gmail.com>. Fixes bug 562856.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../files/txt2regex-0.8-disable-nls.patch          | 13 ++++----
 .../files/txt2regex-0.8-textdomaindir.patch        | 21 +++++++++++++
 dev-util/txt2regex/txt2regex-0.8-r3.ebuild         | 35 ++++++++++++++++++++++
 3 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch b/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch
index 107b1b8..878b84a 100644
--- a/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch
+++ b/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch
@@ -1,13 +1,12 @@
-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 @@
+--- Makefile.orig	2015-10-13 20:09:55.612486000 +0000
++++ Makefile	2015-10-13 20:11:19.166486000 +0000
+@@ -81,15 +81,9 @@
  	rm -rf $(DISTDIR)
  
  #TODO install man page and README
 -install: mo
--	@[ -d $(LOCALEDIR) ] || mkdir -p $(LOCALEDIR); \
-+install:
++install: 
+ 	@[ -d $(LOCALEDIR) ] || mkdir -p $(LOCALEDIR); \
  	[ -d $(BINDIR) ] || mkdir -p $(BINDIR); \
 -	for pot in `cd $(PODIR) && ls *.mo`; do \
 -		poti=`echo $$pot | sed 's/\.mo$$//'`; \
@@ -15,6 +14,6 @@ diff -ur txt2regex-0.8/Makefile txt2regex-0.8.nonls/Makefile
 -		[ -d $$modir ] || mkdir -p $$modir; \
 -		install -m644 $(PODIR)/$$pot $$modir/$(NAME).mo; \
 -	done; \
- 	sed -e '/^TEXTDOMAINDIR=/s,=.*,=$(LOCALEDIR),' \
+ 	sed -e '/^TEXTDOMAINDIR=/s,=.*,=$(BLOCALEDIR),' \
  	    -e '/^VERSION=/s/=.*/=$(VERSION)/' $(SHSKEL) > $(BINDIR)/$(NAME) && \
  	chmod +x $(BINDIR)/$(NAME) && \

diff --git a/dev-util/txt2regex/files/txt2regex-0.8-textdomaindir.patch b/dev-util/txt2regex/files/txt2regex-0.8-textdomaindir.patch
new file mode 100644
index 0000000..524f2af
--- /dev/null
+++ b/dev-util/txt2regex/files/txt2regex-0.8-textdomaindir.patch
@@ -0,0 +1,21 @@
+--- Makefile.orig	2015-10-13 19:24:21.799486000 +0000
++++ Makefile	2015-10-13 19:26:05.187486000 +0000
+@@ -11,7 +11,8 @@
+ 
+ DESTDIR = 
+ BINDIR	= $(DESTDIR)/usr/bin
+-LOCALEDIR = $(DESTDIR)/usr/share/locale
++BLOCALEDIR = /usr/share/locale
++LOCALEDIR = $(DESTDIR)$(BLOCALEDIR)
+ MANDIR = $(DESTDIR)/usr/share/man/man1
+ 
+ TARGET=all
+@@ -89,7 +90,7 @@
+ 		[ -d $$modir ] || mkdir -p $$modir; \
+ 		install -m644 $(PODIR)/$$pot $$modir/$(NAME).mo; \
+ 	done; \
+-	sed -e '/^TEXTDOMAINDIR=/s,=.*,=$(LOCALEDIR),' \
++	sed -e '/^TEXTDOMAINDIR=/s,=.*,=$(BLOCALEDIR),' \
+ 	    -e '/^VERSION=/s/=.*/=$(VERSION)/' $(SHSKEL) > $(BINDIR)/$(NAME) && \
+ 	chmod +x $(BINDIR)/$(NAME) && \
+ 	echo "program '$(NAME)' installed. just run $(BINDIR)/$(NAME)"

diff --git a/dev-util/txt2regex/txt2regex-0.8-r3.ebuild b/dev-util/txt2regex/txt2regex-0.8-r3.ebuild
new file mode 100644
index 0000000..072f94d
--- /dev/null
+++ b/dev-util/txt2regex/txt2regex-0.8-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+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 ~ppc64 ~sparc ~x86"
+IUSE="nls cjk"
+
+DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND=">=app-shells/bash-2.04"
+
+src_prepare() {
+	# bug #562856
+	epatch "${FILESDIR}"/"${P}-textdomaindir.patch"
+
+	# bug #93568
+	use nls || epatch "${FILESDIR}"/"${P}-disable-nls.patch"
+
+	use cjk && sed -i -e 's/\xa4/:+:/g' "${S}"/${P}.sh
+}
+
+src_install() {
+	emake install DESTDIR="${D}" MANDIR="${D}"/usr/share/man/man1 install
+	dodoc Changelog NEWS README README.japanese TODO
+	newman txt2regex.man txt2regex.6
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/txt2regex/, dev-util/txt2regex/files/
@ 2024-10-18 19:21 Arthur Zamarin
  0 siblings, 0 replies; 2+ messages in thread
From: Arthur Zamarin @ 2024-10-18 19:21 UTC (permalink / raw
  To: gentoo-commits

commit:     2313dc28f90a76ea855f7a5eb2d881069c9e8864
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Sun Sep  3 18:38:30 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 18 19:21:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2313dc28

dev-util/txt2regex: add 0.9

Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/32589
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-util/txt2regex/Manifest                        |  1 +
 .../files/txt2regex-0.9-disable-nls.patch          | 13 +++++++
 dev-util/txt2regex/txt2regex-0.9.ebuild            | 41 ++++++++++++++++++++++
 3 files changed, 55 insertions(+)

diff --git a/dev-util/txt2regex/Manifest b/dev-util/txt2regex/Manifest
index dfb4d4d74272..6d90146d9312 100644
--- a/dev-util/txt2regex/Manifest
+++ b/dev-util/txt2regex/Manifest
@@ -1 +1,2 @@
 DIST txt2regex-0.8.tgz 40514 BLAKE2B 938f8ec41ec1319d96928ed38985626d906788a8c2959661c2338104527a0ade3a72e4d7e13f17b2f6f9abc2589ff2aaf88dc99077bf2fd6a82a82d186efc580 SHA512 69d2a682471e3e35fbd0b2ad6f6ffab040803a17bda8082f3dd67baf3a03e7011cb20047940fb9403e180895a1258f720ca4d538187878c5989a1ec51168435f
+DIST txt2regex-0.9.tar.gz 67212 BLAKE2B 054a0a3f37bdbfb9a071b93d87b6c410c6daf3f330cbb2355f3a05b70e0665ec229b04ab2d6fc41940f44e680221638c74a937bce83825b311d78df0bc03d2b8 SHA512 1ef9173c7f4309ed30e254869b29e9919a573379191d3d8e6e78bd75f1ba776c8741c1a248e3cb65c6cb7f5402f4c30768c93c4b453888b91c9377de62af5e96

diff --git a/dev-util/txt2regex/files/txt2regex-0.9-disable-nls.patch b/dev-util/txt2regex/files/txt2regex-0.9-disable-nls.patch
new file mode 100644
index 000000000000..fc0ae57fac94
--- /dev/null
+++ b/dev-util/txt2regex/files/txt2regex-0.9-disable-nls.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 89c1f85..6283b1f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -128,7 +128,7 @@ check-po:
+ #-----------------------------------------------------------------------
+ # Release
+ 
+-install: install-mo install-bin
++install: install-bin
+ 
+ install-mo: mo
+ 	test -d $(LOCALEDIR) || mkdir -p $(LOCALEDIR); \

diff --git a/dev-util/txt2regex/txt2regex-0.9.ebuild b/dev-util/txt2regex/txt2regex-0.9.ebuild
new file mode 100644
index 000000000000..9d0c4a0d52f4
--- /dev/null
+++ b/dev-util/txt2regex/txt2regex-0.9.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A Regular Expression wizard that converts human sentences to regexs"
+HOMEPAGE="https://aurelio.net/projects/txt2regex/"
+SRC_URI="https://github.com/aureliojargas/txt2regex/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls cjk"
+
+DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND=">=app-shells/bash-2.04"
+RESTRICT="test" # tests need to run in a docker container it seems
+
+src_prepare() {
+	default
+
+	# bug #93568
+	if ! use nls ; then
+		eapply "${FILESDIR}"/${P}-disable-nls.patch
+	fi
+
+	if use cjk ; then
+		sed -i -e 's/\xa4/:+:/g' "${S}"/${PN}.sh || die
+	fi
+}
+
+src_compile() {
+	# a call to emake without target will execute the tests
+	true
+}
+
+src_install() {
+	emake DESTDIR="${ED}" MANDIR="${D}"/usr/share/man/man1 install
+	dodoc CHANGELOG.md README.md TODO
+	newman man/txt2regex.man txt2regex.6
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-10-18 19:21 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-18 19:21 [gentoo-commits] repo/gentoo:master commit in: dev-util/txt2regex/, dev-util/txt2regex/files/ Arthur Zamarin
  -- strict thread matches above, loose matches on Subject: below --
2015-10-13 20:39 Patrice Clement

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox