gentoo resync : 25.08.2020

6 files changed, 84 insertions, 8 deletions

diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest
index 43abccd02a02..8736642b1f8a 100644
--- a/dev-haskell/alex/Manifest
+++ b/dev-haskell/alex/Manifest
@@ -2,8 +2,10 @@ DIST alex-3.1.3.tar.gz 99868 BLAKE2B 9a7d03fed24dfec82584edc5043ee9cac1416490359
 DIST alex-3.1.7.tar.gz 103624 BLAKE2B c7ca36113bf5951621906dffc47481e8e4a2cb2007773de7480b63379d648ca2b2b2c73d835eb981d1f46087a8adeec1887898e6d1c5205c8e1c7308bab7ec90 SHA512 0c4e87011617d8f8ad7cdf32b91e3ecc65ad66ea378c8086de8cbeb7ae3b37df478fb834e3bc453e3448fcae9d03b19ce9844bba35ad66a3cdf6e912790fe0a1
 DIST alex-3.2.1.tar.gz 111167 BLAKE2B efad30da0e26303d08d74b762a83ad3ddc0ec8069942b0e5ae170e480dde6b65771f5cb4fedfd27e9379719c2eebbaef68d33328a87be49dc60a0e7b86861619 SHA512 97e2e1677efcde5ec04a393f8b768f97a291ff63a3411cc0a0aef18b75e6825307d22d9c379eb7775dde519ebf60378e07c9181ea1a8bf9ea2ef631d7071c2e7
 DIST alex-3.2.4.tar.gz 110688 BLAKE2B 182f58317bcca6c72f54f63792e04a9108d9311e7f1dd8b7247f847fe577e0ba1297f442a4f533f5b55ee1f7963167d9818149807b46fb400818d163cc18a939 SHA512 e9e99caef4bc985aa37bd42488121f9b83c4f3026c9745ad12f50b5896e9f7c07f48a753c647c30ff16be804529d2478f8d90fa38e352f1d8861e610651c871a
-EBUILD alex-3.1.3.ebuild 1383 BLAKE2B 980e6bb0012597701cea0e312b0e9f9a9915bd4a43fba13b428710d9cc87e215612ac088ab80ccfa81c9107a4146d0baa6f95c98ee6e2672b6f248842a34eeee SHA512 a0a89c1932e530a1d5a2ffc3fc03fd91befb02f1b4d82348f283dc81282102d6b6d46b71a86e1f937ce21bb4fc8f6fec9c59a7bdb17fb6fa4636c8b6ff450f5e
-EBUILD alex-3.1.7.ebuild 1544 BLAKE2B 378b74cf0862967397e60df57279fc6a389ce7818948298fc47b34f3099adf92aa4286a94ff0c33d2a34bd74c2d691d04945d6bb347e04d70c89e8dbee4a7442 SHA512 680b81d989de9f818166522115225ad003e3577d5ea3ad1eb4f6592f854da34c924e8ed3fac9519a02e4d31aa4b7af03e5be2a38b65e45dfb667995e78da01a7
-EBUILD alex-3.2.1.ebuild 1572 BLAKE2B 4502a884eb42e1d663646f129f09cf2818b092e57b48c1e1aba03b33f3ba70af3c23c030494e5c1b597a1c90488a18e3300168c512650f3a5a981ead9bcca0a9 SHA512 2a640ef1793584f5e67a5f4a7ce0494612b2f2d8408279023993341a16a8b3f8fe2aa6caf1306155fe3e09ad10a7af08b51cf654b2c86e14634af269e71a8b02
-EBUILD alex-3.2.4.ebuild 1445 BLAKE2B 6670d5a7c40aa2026cedfddd1655ccf149ef4e4a7948df83e7cf62a1aaaa582ae0a551f9f13c30a72f9719673283edbcbc9f1bb2e33aea8e69d93758ee187d71 SHA512 0f8d43ba4764c7bc8feaaec5ab63f9d2cff79cfd3f3c464fca72ed4356d961957991de18a1e351aa831b05178b3970a6c61171d000302edb5189766c8170e43d
+DIST alex-3.2.5.tar.gz 108531 BLAKE2B 283f8f619f72e72da0786b1f8975b256d4aa0c075be849d50763e7d57201089e2e8c09a59df27f1ff21d90e9fead94e8466ddd63d61a6055fbfb4bb6e18161fe SHA512 5823fb066c5ec67256108cfc1550703b86881f319337922e7248fb33def374f0010c60605538a49cfaaa880b0f73ace9dba6d088c078f3c455c5d9adce2719c9
+EBUILD alex-3.1.3.ebuild 1371 BLAKE2B 5dd265f2e0c8456e30ef539bba200329ae654192b1ec4b73d2e155b4c6e704d71f93d0ac49e49d94adf00a2457c166111b08942f2df1c32b209959fa186d8270 SHA512 8a7b5d7f2739c47e22b91cfb2ae74031efcf28ea0ffffbd37f647364270887fca4ab975df14b66a046868faa189ff05f32a9a4727d5460ce1afad7f90f79ef93
+EBUILD alex-3.1.7.ebuild 1532 BLAKE2B 927c23034d8190a9a52db4fceaea63c584ec959e5dcd4f8b1deedaa204f60af4dbd2effa5e0f7b788fbb1031c44567b8a03b3dbe4131f53f0048a2d2c2198b59 SHA512 5c8973025255e912eda9609fc5012765de3cf0dcd5dc6a95ab5d72236841046293e1d7fd777ab697f2d1bd95f63e8f2e5f071a524bf712bf8d70799300b5aa57
+EBUILD alex-3.2.1.ebuild 1560 BLAKE2B 350d9b30f3a66d611f029633e6c27eb1d3a4f8a3d1367c8eef9a93565e4d6a01c84018ba4588ec908ea463809e8219bf5145aba98516d66467e4fdfcc087976c SHA512 bfc264bf5c5c20b632152c5061d71f6aeebc8dcf75025bfb84d2a5c4a393e28dfabe328005c5b2b26ce873e0662825aee5eda606d2a5bb244d67485b565e9737
+EBUILD alex-3.2.4.ebuild 1433 BLAKE2B cc5ca9970e76ea1919fbc5239699758c0792e2d9d429915fab5d5f6757af3cc42b1f246adce2995f984932ce2377d6f65733cf2bb1e2f81c71cd1eb24f9651be SHA512 ef14398b35a1af58e0572c895b3a175390924fa1067076511641155c69856c06b81daebb0986add6565d975345cf9ec4737853f7b144d3a70e2e60287d659202
+EBUILD alex-3.2.5.ebuild 1446 BLAKE2B 50605f432bc4b9db5e16a0f1fd667be885877034da5276cf3be6cf761763248d5500c33aace91c58e404742fed7e80207869d5b997269806d0004c34fea89108 SHA512 4246ceca5a642e97f71718055cd27f3f1f87550810ab7f0899e122fa2f8e6632b11feb4923a8641e3557e148db5a537e05ea80c7d0d6fcfd0c3075b55e8125c0
 MISC metadata.xml 349 BLAKE2B 0e0922a706cc99af24707269cbe80a8969df912d02317294a007d43a81263b232a3f2b199b4f981a023143a765427851335493a10235feb627ff8adf85497c62 SHA512 9c41217241498cd036d00fce456cea108f675c71c12bab05305dcfbdbd5d55d5c7db8163e5315eef12f9ca8467276b6fad9038d47da729f448338655691a9ff8
diff --git a/dev-haskell/alex/alex-3.1.3.ebuild b/dev-haskell/alex/alex-3.1.3.ebuild
index 3296a078c191..f7ade6c53c42 100644
--- a/dev-haskell/alex/alex-3.1.3.ebuild
+++ b/dev-haskell/alex/alex-3.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-haskell/alex/alex-3.1.7.ebuild b/dev-haskell/alex/alex-3.1.7.ebuild
index 12fdba2a446f..47cfe0e5d3c2 100644
--- a/dev-haskell/alex/alex-3.1.7.ebuild
+++ b/dev-haskell/alex/alex-3.1.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND=">=dev-haskell/quickcheck-2:2=
diff --git a/dev-haskell/alex/alex-3.2.1.ebuild b/dev-haskell/alex/alex-3.2.1.ebuild
index 803907738a69..4301b5a3c4ff 100644
--- a/dev-haskell/alex/alex-3.2.1.ebuild
+++ b/dev-haskell/alex/alex-3.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND=">=dev-haskell/quickcheck-2:2=
diff --git a/dev-haskell/alex/alex-3.2.4.ebuild b/dev-haskell/alex/alex-3.2.4.ebuild
index 1c61b23c5aa1..8fb18f3a96ac 100644
--- a/dev-haskell/alex/alex-3.2.4.ebuild
+++ b/dev-haskell/alex/alex-3.2.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:="
diff --git a/dev-haskell/alex/alex-3.2.5.ebuild b/dev-haskell/alex/alex-3.2.5.ebuild
new file mode 100644
index 000000000000..504ef0e79fb0
--- /dev/null
+++ b/dev-haskell/alex/alex-3.2.5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: +small_base
+
+CABAL_FEATURES="test-suite"
+inherit autotools haskell-cabal
+
+DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
+HOMEPAGE="http://www.haskell.org/alex/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:="
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	doc? ( ~app-text/docbook-xml-dtd-4.2
+		app-text/docbook-xsl-stylesheets
+		>=dev-libs/libxslt-1.1.2 )
+"
+
+src_prepare() {
+	default
+
+	if use doc; then
+		cd "${S}/doc/"
+		eautoreconf
+	fi
+}
+src_configure() {
+	# make sure we don't accidentally use those
+	# installed in system
+	haskell-cabal_src_configure \
+		--with-alex=false \
+		--with-happy=false \
+		--flag=small_base
+
+	if use doc; then
+		cd "${S}/doc/"
+		econf
+	fi
+}
+
+src_compile() {
+	haskell-cabal_src_compile
+
+	if use doc; then
+		emake -C "${S}/doc/" -j1
+	fi
+}
+
+src_test() {
+	# 1. workaround Setup.hs deadlock: https://github.com/haskell/cabal/issues/2398
+	# 2. use freshly built ALEX= binary and datadir path
+	alex_datadir="${S}"/data \
+	emake -k -C tests all ALEX="${S}"/dist/build/alex/alex
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	if use doc; then
+		doman "${S}/doc/alex.1"
+		docinto html
+		dodoc -r "${S}/doc/alex/"
+	fi
+}