diff options
| author |   Sam James <sam@gentoo.org> | 2021-04-19 12:37:43 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-04-19 20:11:36 +0100 |
| commit | 6c7ecc9b1b3354a99968e9411023c4ef07355539 (patch) | |
| tree | 9b4918b8d24cadb8fee4a36611f73140ed0b0d6a /dev-util/txt2regex | |
| parent | net-proxy/nutcracker: port to EAPI 7 (diff) | |
| download | gentoo-6c7ecc9b1b3354a99968e9411023c4ef07355539.tar.gz gentoo-6c7ecc9b1b3354a99968e9411023c4ef07355539.tar.bz2 gentoo-6c7ecc9b1b3354a99968e9411023c4ef07355539.zip | |
dev-util/txt2regex: port to EAPI 7
Signed-off-by: Sam James <sam@gentoo.org>
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/txt2regex-0.8-r3.ebuild | 22 |
3 files changed, 18 insertions, 12 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/txt2regex-0.8-r3.ebuild b/dev-util/txt2regex/txt2regex-0.8-r3.ebuild index 3fa0fdd53335..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-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit epatch +EAPI=7 DESCRIPTION="A Regular Expression wizard that converts human sentences to regexs" HOMEPAGE="http://txt2regex.sourceforge.net/" @@ -17,18 +15,26 @@ 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 } |