diff options
Diffstat (limited to 'dev-util/txt2regex')
| -rw-r--r-- | dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch | 4 | ||||
| -rw-r--r-- | dev-util/txt2regex/files/txt2regex-0.8-textdomaindir.patch | 4 | ||||
| -rw-r--r-- | dev-util/txt2regex/metadata.xml | 3 | ||||
| -rw-r--r-- | dev-util/txt2regex/txt2regex-0.8-r3.ebuild | 26 |
4 files changed, 22 insertions, 15 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 878b84a7e3ea..bf24e5006fdc 100644 --- a/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch +++ b/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2015-10-13 20:09:55.612486000 +0000 -+++ Makefile 2015-10-13 20:11:19.166486000 +0000 +--- a/Makefile ++++ b/Makefile @@ -81,15 +81,9 @@ rm -rf $(DISTDIR) diff --git a/dev-util/txt2regex/files/txt2regex-0.8-textdomaindir.patch b/dev-util/txt2regex/files/txt2regex-0.8-textdomaindir.patch index 524f2af8b02e..67284233bb1e 100644 --- a/dev-util/txt2regex/files/txt2regex-0.8-textdomaindir.patch +++ b/dev-util/txt2regex/files/txt2regex-0.8-textdomaindir.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2015-10-13 19:24:21.799486000 +0000 -+++ Makefile 2015-10-13 19:26:05.187486000 +0000 +--- a/Makefile ++++ b/Makefile @@ -11,7 +11,8 @@ DESTDIR = diff --git a/dev-util/txt2regex/metadata.xml b/dev-util/txt2regex/metadata.xml index 5228121b668a..f76598f90395 100644 --- a/dev-util/txt2regex/metadata.xml +++ b/dev-util/txt2regex/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>shell-tools@gentoo.org</email> <name>Gentoo Shell Tools Project</name> </maintainer> <upstream> + <remote-id type="github">aureliojargas/txt2regex</remote-id> <remote-id type="sourceforge">txt2regex</remote-id> </upstream> </pkgmetadata> diff --git a/dev-util/txt2regex/txt2regex-0.8-r3.ebuild b/dev-util/txt2regex/txt2regex-0.8-r3.ebuild index 8a9b6231b029..bc3411624f22 100644 --- a/dev-util/txt2regex/txt2regex-0.8-r3.ebuild +++ b/dev-util/txt2regex/txt2regex-0.8-r3.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit eutils +EAPI=7 DESCRIPTION="A Regular Expression wizard that converts human sentences to regexs" HOMEPAGE="http://txt2regex.sourceforge.net/" @@ -11,24 +9,32 @@ SRC_URI="http://txt2regex.sourceforge.net/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 sparc x86" +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() { +PATCHES=( # bug #562856 - epatch "${FILESDIR}"/"${P}-textdomaindir.patch" + "${FILESDIR}"/${P}-textdomaindir.patch +) + +src_prepare() { + default # bug #93568 - use nls || epatch "${FILESDIR}"/"${P}-disable-nls.patch" + if ! use nls ; then + eapply "${FILESDIR}"/${P}-disable-nls.patch + fi - use cjk && sed -i -e 's/\xa4/:+:/g' "${S}"/${P}.sh + if use cjk ; then + sed -i -e 's/\xa4/:+:/g' "${S}"/${P}.sh || die + fi } src_install() { - emake install DESTDIR="${D}" MANDIR="${D}"/usr/share/man/man1 install + emake install DESTDIR="${ED}" MANDIR="${D}"/usr/share/man/man1 install dodoc Changelog NEWS README README.japanese TODO newman txt2regex.man txt2regex.6 } |