gentoo resync : 15.12.2019

4 files changed, 77 insertions, 4 deletions

diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest
index 8ec8d7dcfe71..c7da888dac5a 100644
--- a/dev-haskell/alex/Manifest
+++ b/dev-haskell/alex/Manifest
@@ -1,7 +1,9 @@
 DIST alex-3.1.3.tar.gz 99868 BLAKE2B 9a7d03fed24dfec82584edc5043ee9cac141649035910f7fa075c41e67d6d57dcde99363fc0f4ff83a6f535bbc462fdf4cfad6e92785a480351e38e079ec9aeb SHA512 f09f720627b9f2cae5d9d3a99488c2249e82c9310f0a436bccbd5238bd3215fae287706ee6f7530533c801348bdbfebc9fd54cafc15a75d528462b2ee987eb3c
 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 1395 BLAKE2B 7faa32e02de14d493ea000a393f3c5e657b703c78385560810b4ea5bb1c0d4c1bd540f9fd70367962ae3ebd9ba9e9192799b2e65d45a895e7042aad56ed93039 SHA512 3911d252dbe638f92fa1d0bf39dd9fdc17b21b75b51ec6c2bf024c574ff40eccd210704d96a9a15b867b78cff848a987db5cefa0524186a897b97aec39b2c00e
-EBUILD alex-3.1.7.ebuild 1568 BLAKE2B 68507181cbf21628a116513860b10b673971a43f62b698bb68ede4839bc62ab7840030eb98d22ed17687ca03093a1c7f113be420546eb58550ae7b151db3cc9c SHA512 4cdb51d64bb7636e18079fcf1444862fa35515db403ed208abc7a6dd4d8211c048f20d29298329c4e1889910d765e1f4ac086cd8d3d2ffe5d0d0c7c41e6450da
-EBUILD alex-3.2.1.ebuild 1598 BLAKE2B 9237101b1bfd634920eaa11aa99b8cb222d5e0598a0946ac94813935c0a073a096ee6d84851ee793971d354e679f4fab8e02ddb9c62b0f0cf9621a5ba558fdb3 SHA512 daa800f62a36ddecad2df713d63460903534519a11ef11c0225a3f168aa80781ad2a4b122f36d4356f7c1119f7ede81ef7b75f6e3e47983cdf904e17768f6516
+EBUILD alex-3.1.7.ebuild 1561 BLAKE2B 0d7ee7d66d44610856dc86744b0aae9bff83fa4c277e486d0f88c6a56c616a43f773211e6de3bed22aace4507c1a2b3ed9fda2c1012b5406dd6973f3b02d1758 SHA512 e23c059f452a34df7effb43c9077100c054091b64132cc6401131f0b4a2debf3dc01bc05ab1b2ce098881259279f334d5a0ccaf9ad36dde17ada6a6f7a853a6a
+EBUILD alex-3.2.1.ebuild 1591 BLAKE2B a047ea6f07bb005082575fe065e92e83972946a0cf13e7283abba7ec23f0eed592bafeb29bd752f22bd2224d765143bb8ae302b8801fd1cafae3da5589bef8b9 SHA512 0da96d5d3bd2256967d99ef6c551631ac01d87c1feeefabf9a69cd26c374421e222eb28651efa6973f7e73b63cb9618c3ce59f09927479df28332f0682a353b8
+EBUILD alex-3.2.4.ebuild 1327 BLAKE2B ef970ae84c0a0b43fc9244053cb54eab7ac18f0fc072ad1a5a02efa225ff74b07a3a9492d409b0a8825ba32ee7c890614965c1790dd79a482b5df81c98857555 SHA512 fc07c8b3b2602c61c0bdaa8f5f777cc25539353d73f1917ddffe71de30c59021dc3587419e5172b8baf8b66674f98286599da0107356b673c9ffb3221a1ddbe9
 MISC metadata.xml 349 BLAKE2B 0e0922a706cc99af24707269cbe80a8969df912d02317294a007d43a81263b232a3f2b199b4f981a023143a765427851335493a10235feb627ff8adf85497c62 SHA512 9c41217241498cd036d00fce456cea108f675c71c12bab05305dcfbdbd5d55d5c7db8163e5315eef12f9ca8467276b6fad9038d47da729f448338655691a9ff8
diff --git a/dev-haskell/alex/alex-3.1.7.ebuild b/dev-haskell/alex/alex-3.1.7.ebuild
index 2ded8cc77471..8d4d94c9bf9e 100644
--- a/dev-haskell/alex/alex-3.1.7.ebuild
+++ b/dev-haskell/alex/alex-3.1.7.ebuild
@@ -66,7 +66,7 @@ src_compile() {
 
 src_test() {
 	# workaround https://github.com/haskell/cabal/issues/2398
-	emake -k -C tests all || die
+	emake -k -C tests all
 }
 
 src_install() {
diff --git a/dev-haskell/alex/alex-3.2.1.ebuild b/dev-haskell/alex/alex-3.2.1.ebuild
index e56cee1d07ba..1460cbdca36f 100644
--- a/dev-haskell/alex/alex-3.2.1.ebuild
+++ b/dev-haskell/alex/alex-3.2.1.ebuild
@@ -70,7 +70,7 @@ src_compile() {
 
 src_test() {
 	# workaround https://github.com/haskell/cabal/issues/2398
-	emake -k -C tests all || die
+	emake -k -C tests all
 }
 
 src_install() {
diff --git a/dev-haskell/alex/alex-3.2.4.ebuild b/dev-haskell/alex/alex-3.2.4.ebuild
new file mode 100644
index 000000000000..0adfe9957174
--- /dev/null
+++ b/dev-haskell/alex/alex-3.2.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.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="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~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() {
+	# workaround https://github.com/haskell/cabal/issues/2398
+	emake -k -C tests all
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	if use doc; then
+		doman "${S}/doc/alex.1"
+		dohtml -r "${S}/doc/alex/"
+	fi
+}