gentoo resync : 28.04.2021

6 files changed, 28 insertions, 23 deletions

diff --git a/app-text/enscript/Manifest b/app-text/enscript/Manifest
index 295734c81630..08ed38e04bff 100644
--- a/app-text/enscript/Manifest
+++ b/app-text/enscript/Manifest
@@ -1,9 +1,9 @@
 AUX ebuild.st 6047 BLAKE2B 661a427601920a448b829bbbeb8472199f4ba17cccf698eb206e0651247eb9a115afd50553116f542b31d7ce6436f4bfce3ceef3a894b40087ae7a7c5c6080cc SHA512 1c01943ec901dc4ea314715232fac279fa051b441b39e8cc5bca759b67dda87c4982eba23a37f3b60b041815c347ea85faf774e5574471232e4e941eb186caf5
-AUX enscript-1.6.2-ruby.patch 661 BLAKE2B 119c3b301f0a9811b65a509ced694b049796600e65b10fd29a200fabee37fa73e7ba6e78705329979f619c7515d14294003fd33b364cad62e058357f1d48a7bf SHA512 6ca804c1f9e1bc19eb896c88c4e710b5212e570d5e0d84b5b40100d4645bdb483c55ad902ae5db9a617268387d6b1d6db54f69e9ba3479f0f669dc1b2314d65c
-AUX enscript-1.6.4-ebuild.st.patch 332 BLAKE2B 88feff57f5dabfb09dce2c11c65e64005f667b6a98107fc4a608ccb4e0d7a16a3fbc1b15bdb64f8538b417387a0d82f4f3df87ef2564eb384498d3f1606617c6 SHA512 8e86a7b2966810852703a7f3636b0c92e940d3fba21a46be46086830799cfecd2870cd38679f009cb9d984bf3c475e843df67970619cf43ebf272c209b204fd9
-AUX enscript-1.6.4-fsf-gcc-darwin.patch 832 BLAKE2B c16294bf4a42827bf7af1b4df233305ad1dec4abb9f4c9b01c23299c914e7c07e71759f00ebed8a8429b499acfe839fd5e093f43e17e107611b19f111632b9cb SHA512 d14f707cce8609555efa72d9c3a9ce1662fe8153c00e26eca5c08540d2b5fa0e024426f574601311f946012728c15240569ebe47586519fdf82b0ab117eebed6
-AUX enscript-1.6.5.2-php.st.patch 410 BLAKE2B 84e35ea8441b60bc5da3085b969f1b20334ed4f9632681b12cd50fbd95d144e40fcd1874aed99a08986432885efdeb70653b0ffed7e5a5b83d5bf1edbff60cbd SHA512 71bf65c91d6d362bbb700ef26b72137e524a969da0971b7f0c30ac409a7f002103769cc25c02222d0ccb1bf69919a419481af9ea479828e3df18ec7a2e1d29b0
+AUX enscript-1.6.2-ruby.patch 588 BLAKE2B 24b450e360861f8c747979cf84d06921252aff6bcb5faec1187bf9ab5b0135a41e01c40079e5da5620b6ccc43a5c889157c349a4cd112eac60a42243d154a60e SHA512 76bd21efc3f252fb2b6488af25d1f5721e4a05975b4f0f3b6b4062726e505a2a583517400f39bedcdcb1bb4f92da4a10cf747c98e97c7e8e8c0edf147d6c4ec9
+AUX enscript-1.6.4-ebuild.st.patch 292 BLAKE2B db5048eac6d3ebfe1b5a3bdd50148f4975b95e19e64523a461f1db5244d5e3b40ac2962890802c24199d6d6aa1f4d51264bad6173743642ba553fdf561e9cd81 SHA512 c033340f988731717f8e0bba7e94e5625089af7184e2bf28e99cfa758c1c794174a1948f0bf7d83580f677452a30f82cf32813f7b39c98982297a00c52064aa6
+AUX enscript-1.6.4-fsf-gcc-darwin.patch 836 BLAKE2B 88248e38e4963dc7d5d00cab8739c0f955d59c67ed725836c7444b239ccfcc9483861757de5d3adfe71a2a4a5e64e9eca77473554a30083b16d85ded5c077365 SHA512 282b87be1e71df04d3f8161386f41d29f808de33e2709f2ef143a678a4cf752c0394921f51ea9f51a90b6949fe60757b26e7d2f24fd13ca7f0522f6e460d1324
+AUX enscript-1.6.5.2-php.st.patch 210 BLAKE2B 85f6531797d84e8b6ad3933785e5a019c9ef0b36e716ba1714892408cbb370b2cbe11dc7badbe6a8ee5dea1654cd214e7c65fcfcc03fcd1fc9d1e07c1fb6f294 SHA512 8440c2bcf761b4e2151b1c6caa31aa4019b329253b7cc8ce1a0181c310908e1cae471b1ea0f1d2bb0bd24c206688b76b1d235a7fddea6afc5d00c7b61fe8a505
 AUX ruby.st 3904 BLAKE2B 854c86166a43715e85e91802f2d82eae71773d9caabf604bd5edc0e53046ed0fa9944ec61c5ff7516e22740cc90ac73dc1d8edbdc0e9722ec876be3a129d2183 SHA512 43af0998ebe95530129aec126b9f91878bbbf7dd52530cb162b25f5779f9eb5b870f41727665e66dd5cf42a6d5e790899bf03c38c1a914adf2b0eecac83154e2
 DIST enscript-1.6.6.tar.gz 1330493 BLAKE2B 02e333271ac6716e049402d5904b0ad6926b31d4533c813a9e5bcf76045d4100def2476426b97c52585e8f5c0a741159fb3e78de79c817e75de81ebd464c0d61 SHA512 bf1c2b9ea7723518a1ef312145ddcd6ffdef0c6e8b5795ea84cb55d76fccc02f441d0c2dc6897e970368186e6a829ab74a090716624e0f7a8f575653fa495ebc
-EBUILD enscript-1.6.6.ebuild 1249 BLAKE2B c42f8f6142e1fbd3c7f704e6c9ff11c562818473f424ffb87a0c736f4acd036766d59ad8e7de4d669a8ae86f77a9d0c5273edc972f0d1d43b2e0b48f35e8aedc SHA512 4b16d2ca248f020bd4bfdb699e2a71a7fc1e3466941d2a3290daceab3ed5015f4175f94d894ce256808dd46f24f33d20205828b0289827c6e05677a866850cd2
+EBUILD enscript-1.6.6.ebuild 1248 BLAKE2B 74c2fb68de023bde9b491da0271cbfdd89fbee2b8b2ced2649d93863d6efdf4f3b3bc69127bd7eb03ad346d18fdbb88724756d6a4037dd2a5851403f6a8f7f55 SHA512 f1b8557d1e0d46cc18ff1033916f35be598f2f66e49103df7f63342ccb58009fb631974c1cbcf5e752bf44718da4df1dbb5011ddb827a47e37a899ce4271d774
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/enscript/enscript-1.6.6.ebuild b/app-text/enscript/enscript-1.6.6.ebuild
index b613378cc142..bb889e8b0db3 100644
--- a/app-text/enscript/enscript-1.6.6.ebuild
+++ b/app-text/enscript/enscript-1.6.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Powerful text-to-postscript converter"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
@@ -14,20 +14,26 @@ SLOT="0"
 LICENSE="GPL-3"
 IUSE="nls ruby"
 
-DEPEND="
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/flex
 	sys-devel/bison
 	nls? ( sys-devel/gettext )
 "
-RDEPEND="nls? ( virtual/libintl )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.4-ebuild.st.patch
+	"${FILESDIR}"/${PN}-1.6.5.2-php.st.patch
+	"${FILESDIR}"/${PN}-1.6.4-fsf-gcc-darwin.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch
-	epatch "${FILESDIR}"/enscript-1.6.5.2-php.st.patch
-	epatch "${FILESDIR}"/enscript-1.6.4-fsf-gcc-darwin.patch
-	use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch
-	sed -i src/tests/passthrough.test -e 's|tail +2|tail -n +2|g' || die
 	default
+
+	use ruby && eapply "${FILESDIR}"/enscript-1.6.2-ruby.patch
+
+	sed -i src/tests/passthrough.test -e 's|tail +2|tail -n +2|g' || die
 }
 
 src_configure() {
diff --git a/app-text/enscript/files/enscript-1.6.2-ruby.patch b/app-text/enscript/files/enscript-1.6.2-ruby.patch
index b492ca4f44f7..1404daa823d5 100644
--- a/app-text/enscript/files/enscript-1.6.2-ruby.patch
+++ b/app-text/enscript/files/enscript-1.6.2-ruby.patch
@@ -1,5 +1,5 @@
---- states/hl/enscript.st.orig	2006-12-17 02:10:37.000000000 +0100
-+++ states/hl/enscript.st	2006-12-17 02:10:13.000000000 +0100
+--- a/states/hl/enscript.st
++++ b/states/hl/enscript.st
 @@ -489,6 +489,7 @@
    /\.idl$/					idl;
    /\.(hs|lhs|gs|lgs)$/				haskell;
diff --git a/app-text/enscript/files/enscript-1.6.4-ebuild.st.patch b/app-text/enscript/files/enscript-1.6.4-ebuild.st.patch
index 0741576226af..413039729675 100644
--- a/app-text/enscript/files/enscript-1.6.4-ebuild.st.patch
+++ b/app-text/enscript/files/enscript-1.6.4-ebuild.st.patch
@@ -1,5 +1,5 @@
---- states/hl/enscript.st	2006/01/31 05:37:23	1.1
-+++ states/hl/enscript.st	2006/01/31 06:48:32
+--- a/states/hl/enscript.st
++++ b/states/hl/enscript.st
 @@ -509,6 +509,7 @@ namerules
    /\b(rfc.*\.txt|draft-.*\.txt)$/		rfc;
    /\.inf$/i					inf;
diff --git a/app-text/enscript/files/enscript-1.6.4-fsf-gcc-darwin.patch b/app-text/enscript/files/enscript-1.6.4-fsf-gcc-darwin.patch
index 3ea4bf97efd0..23196ca0c3c4 100644
--- a/app-text/enscript/files/enscript-1.6.4-fsf-gcc-darwin.patch
+++ b/app-text/enscript/files/enscript-1.6.4-fsf-gcc-darwin.patch
@@ -3,8 +3,8 @@ darwin: __private_extern__ is an Apple-ism, we really don't want
 In particular FSF GCC barfs about this, which is much preferred over
 ancient gcc-apple (4.2.1).
 
---- compat/regex.c
-+++ compat/regex.c
+--- a/compat/regex.c
++++ b/compat/regex.c
 @@ -5539,9 +5539,6 @@
     It returns 0 if it succeeds, nonzero if it doesn't.  (See regex.h for
     the return codes and their meanings.)  */
diff --git a/app-text/enscript/files/enscript-1.6.5.2-php.st.patch b/app-text/enscript/files/enscript-1.6.5.2-php.st.patch
index b146d998ee41..9b3930103ab4 100644
--- a/app-text/enscript/files/enscript-1.6.5.2-php.st.patch
+++ b/app-text/enscript/files/enscript-1.6.5.2-php.st.patch
@@ -1,6 +1,5 @@
-diff -ruN enscript-1.6.5.2.orig/states/hl/enscript.st enscript-1.6.5.2/states/hl/enscript.st
---- enscript-1.6.5.2.orig/states/hl/enscript.st	2010-06-02 00:17:49.000000000 +0200
-+++ enscript-1.6.5.2/states/hl/enscript.st	2011-06-02 12:43:13.869855504 +0200
+--- a/states/hl/enscript.st
++++ b/states/hl/enscript.st
 @@ -510,6 +510,7 @@
    /\.tex$/					tex;
    /\.wmlscript$/				wmlscript;