diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-util/txt2regex | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'dev-util/txt2regex')
| -rw-r--r-- | dev-util/txt2regex/Manifest | 6 | ||||
| -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 | 24 |
4 files changed, 22 insertions, 16 deletions
diff --git a/dev-util/txt2regex/Manifest b/dev-util/txt2regex/Manifest index d8eb91b93c27..f637a140da39 100644 --- a/dev-util/txt2regex/Manifest +++ b/dev-util/txt2regex/Manifest @@ -1,5 +1,5 @@ -AUX txt2regex-0.8-disable-nls.patch 696 BLAKE2B fc29bbb2320f81cece70e9425d21a49abe03e9395c881e70bd23509388535fd56bcb38e8bc2a401a231a6dfd2902a70e0aa3714108164186f30d159d785d6753 SHA512 8b3fb8e37695d44078325687e8b7d4ac929578a03a46693f2854445a798f1ecfeae60d2da5212c395d00dae53eca63043865c8ea4a04d26a620d20c3a4aa1c7a -AUX txt2regex-0.8-textdomaindir.patch 729 BLAKE2B 41971294ef8a693c72f00db26bf27ac85acbf9f1fb44869176107f29dffce9070a0e4662b2d1366e5806a247b7c61c86cd22db4dd8a8b6d52ca0e4d34f5b17ce SHA512 85178d5cb8cdf9b8faf11c4b66247c8c5102b8035825cb08a4aaf0d8a5148965260e4df85bf1ab5e3aeaa20dad9bbb5d6fa5a6ddc1576c9949eb48bcb6844aa0 +AUX txt2regex-0.8-disable-nls.patch 623 BLAKE2B 4a639d62b9535955638248ced1aa043788013ada053f35c47d48217363b634b88203e1d30a4cb8f8a08dd43692e16ece9d5a23fe370b159a40d5401a963930e5 SHA512 522132c89e9b4e88da1c77e189d4807f7612346a4980f77e31878835bb1d940216067515878908222960d6127953a11c6b60393d5534e7dbc9eeec0a2abb703f +AUX txt2regex-0.8-textdomaindir.patch 656 BLAKE2B f5c1ad923105896c3743f7d7a1c8deb831f9a61eae4071a0beba40d002646ff47db6bff3f763d598dcfe9306d81fffc47c74db1639188cd561912871a667c6f2 SHA512 ddb9fe094b39639df0597f58b8431916f877e7ec2e8873c31b6c3e7e9065a48828a90292aa1e4efb180253be15d709003e4cfe51f2ca25ec9d518660840dd0b3 DIST txt2regex-0.8.tgz 40514 BLAKE2B 938f8ec41ec1319d96928ed38985626d906788a8c2959661c2338104527a0ade3a72e4d7e13f17b2f6f9abc2589ff2aaf88dc99077bf2fd6a82a82d186efc580 SHA512 69d2a682471e3e35fbd0b2ad6f6ffab040803a17bda8082f3dd67baf3a03e7011cb20047940fb9403e180895a1258f720ca4d538187878c5989a1ec51168435f -EBUILD txt2regex-0.8-r3.ebuild 858 BLAKE2B 96c591bd2a4978ec4d679077a4e56a514e6cbab2ea0c9de0224b8016694fede16fd5f9305bca372c350918a8df7487acbea688b100483005d907f03219dcee57 SHA512 2c1e6fc22d5fe7db0c2eaafd4d144ab84e12986ce37fe848a8741d32011a41f4a3ca66ea114cdd2500d5a53f7a7f77c4f11cf46d08e3d36959060655652c47d7 +EBUILD txt2regex-0.8-r3.ebuild 889 BLAKE2B ee43a0b4c18c3e012ec530632c543267f28ce6a903ba2bef42b65568ad246abf3ec12e5d2b63bfd6a346109b6cd518649d8d3db69d2a597dd4c4e8837445f2bf SHA512 29d6f7c8a33dc786f6a15eb6a841c529ff083ed6964fbddcc5470416da6be466721b3d16f67a9d2a3432490543b5dc0914da4537fd3aeb3fa4e3fcd14a651380 MISC metadata.xml 344 BLAKE2B 651b9be422dadc59659b2e27801d6413b181095d3921b086638765a965e0ca956cedf71e004dc63dd7d665f6e34fa2f627d69fc2bde658443ce6eaacc5750878 SHA512 b16ae2357ca3ea0aaa63733fc657cf348df2ff8dca5f4471c8a828c63b535f6c4b0b658935081e14c8e5f40affeea743e3c6028f8d673e1f037ab61e93278731 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 dfd304b2d980..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/" @@ -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 } |