gentoo new year resync : 01.01.2021

3 files changed, 41 insertions, 2 deletions

diff --git a/app-text/enscript/Manifest b/app-text/enscript/Manifest
index 8d56f49640db..84d57db2120c 100644
--- a/app-text/enscript/Manifest
+++ b/app-text/enscript/Manifest
@@ -1,8 +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 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 1116 BLAKE2B 48fdf41dc6c83d9016d93930a1f4c96eaa37249e2ab49d7abf0cf4e392548cef4f0b4a8534d651d7dcace41aec2c69cd10f9b2307932dee86d35bd3eefa26659 SHA512 5b2135bd7488af0b67f746e79ae9db05059304fc3b3068c5788a1074957ccc9ed3a88ca29eeed4495af98418266b310d4213e2f406b6195ff1ffc605101cfa1e
+EBUILD enscript-1.6.6.ebuild 1260 BLAKE2B 2dde173704d326fbca73dea97bc412d98db5f2c3b906e99ab5cada051018396b0fbd0595fc3ba8a27f30a74598dc2a5d8a45f28472f2afbd4dc802c9e83211bf SHA512 ae6e7ee1ee581730057f7805b20757e57fb80d4c4aa0428cda0b741fa4acd8c34b1d92d9317ca16562433acae1b23fceca9de64dce9c123e08c8f28d39bb64ca
 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 7c4cc7ab16e2..40d647506bc5 100644
--- a/app-text/enscript/enscript-1.6.6.ebuild
+++ b/app-text/enscript/enscript-1.6.6.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Powerful text-to-postscript converter"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 HOMEPAGE="https://www.gnu.org/software/enscript/enscript.html"
 
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 SLOT="0"
 LICENSE="GPL-3"
 IUSE="nls ruby"
@@ -24,6 +24,7 @@ RDEPEND="nls? ( virtual/libintl )"
 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
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
new file mode 100644
index 000000000000..3ea4bf97efd0
--- /dev/null
+++ b/app-text/enscript/files/enscript-1.6.4-fsf-gcc-darwin.patch
@@ -0,0 +1,37 @@
+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
+@@ -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.)  */
+ 
+-#ifdef __APPLE__
+-__private_extern__
+-#endif
+ int
+ regcomp (preg, pattern, cflags)
+     regex_t *preg;
+@@ -5620,9 +5617,6 @@
+ 
+    We return 0 if we find a match and REG_NOMATCH if not.  */
+ 
+-#ifdef __APPLE__
+-__private_extern__
+-#endif
+ int
+ regexec (preg, string, nmatch, pmatch, eflags)
+     const regex_t *preg;
+@@ -5728,9 +5722,6 @@
+ 
+ /* Free dynamically allocated space used by PREG.  */
+ 
+-#ifdef __APPLE__
+-__private_extern__
+-#endif
+ void
+ regfree (preg)
+     regex_t *preg;