gentoo resync : 02.09.2020

5 files changed, 40 insertions, 75 deletions

diff --git a/dev-haskell/lhs2tex/Manifest b/dev-haskell/lhs2tex/Manifest
index 909088f19f0b..f4987f757231 100644
--- a/dev-haskell/lhs2tex/Manifest
+++ b/dev-haskell/lhs2tex/Manifest
@@ -1,6 +1,4 @@
-AUX lhs2tex-1.18.1-mandir.patch 790 BLAKE2B b0de9a0630e6801c48484a172555cc29c9db2cd7df86a10c2cbf6479beeab338685428ecb4050029125d212d5406f4918e6ef901deb658aa8f7e2441f1cc3396 SHA512 2d97ce0015e9844f1b8954ae658807116293ebea07e12d3a8553c48c515e02625b6390c6640ae17e68394a00d908a821783fa5a063a7e6ad10a80f436f73c4ae
-DIST lhs2tex-1.18.1.tar.gz 661053 BLAKE2B 64dbefde30d3a6a00c47d5b3397b6f7b4cb44bdf272768ed84f66db1d3e99e95df99f16e537d3959ef0566424151a44fdd70e975ac156abd2a5907bed8044520 SHA512 c44b4c5972b833ae41921d86e13c71ea60ac876a9996fb9a4e8d69ba25d000bbddb85f82d223b8a73381e3a4453c2757154a866fbbb48473f121dd88efb917d7
-DIST lhs2tex-1.19.tar.gz 658353 BLAKE2B 2a6d0ca1bc23fce29579d1f020ad9db178801177d1b0c171771d24470bf604359b85f5afab6aacc6a566fecca1d0edd26ddb01d97d8e9bc3c8bc98e042d47690 SHA512 63d4cb626c14dccc6e0989b358299078427d0c22ab726fd3d933bfef3b0d072a35113d132c87b61b7b8ac2c259c856e192d04e04d3eb744b958fc0df54c80abf
-EBUILD lhs2tex-1.18.1-r1.ebuild 965 BLAKE2B 2c1bf0a12918bd3107b7e28266faa195207e2b09305abf6c1e76e19002a348681d82036f69262cee2e548a5b29a6f98bc64b8c1ea72816ea2866e928aba5677a SHA512 c461305eb6d99a708fdbeb24044f3c11cfdd8e60a312a9bebd460a7e72da692d18657e6ce5015b0e060da7b649176149b80a090b3ceb9310331aa6907c530186
-EBUILD lhs2tex-1.19-r1.ebuild 965 BLAKE2B 2c1bf0a12918bd3107b7e28266faa195207e2b09305abf6c1e76e19002a348681d82036f69262cee2e548a5b29a6f98bc64b8c1ea72816ea2866e928aba5677a SHA512 c461305eb6d99a708fdbeb24044f3c11cfdd8e60a312a9bebd460a7e72da692d18657e6ce5015b0e060da7b649176149b80a090b3ceb9310331aa6907c530186
+AUX lhs2tex-1.18.1-mandir.patch 794 BLAKE2B 4296361754535520be00275308063234411eb4fce97642c785c77b4e0f9174e21a4070c907bb14b1c885cd7641bba1538bed0a3ae344140f54f370f7132d93f0 SHA512 2b45245b2be8f3ac07e7a2f4650d2ba24272109e1cbb2f819c43f5a6016e73c254526ddd55ddec205823bf7715672e36410e033c16684408bafaec1534575748
+DIST lhs2tex-1.24.tar.gz 775885 BLAKE2B 106d2677655f4e36412083b98051eb33d1912039e0db91556b12b442d95dc7e8d4b1167d45606a8ac69b0b32a4457d86a871b0a5032d8e758fefa3536af28b0d SHA512 1491368ba8d34c42d32ad4f77b6a803e8a3b885d336e4bd718f2398aaebc59fa2692e667a6c6a99b6e8839e4f627892c128f1feaf8557313ed144619f21c1876
+EBUILD lhs2tex-1.24.ebuild 907 BLAKE2B 69551d11a7eade13e7a52b956925a5fcecf09a2870831a9baa73e03c65d87f369350fee0679dbc1e7abf62b39c45605347c0ba5cd22097dcb4c24e8cef9f4707 SHA512 452a9b475c30e4259ca38b4cbd74a59cbdd6ebbac1794d26d1756e22bbaf2a9d3fda6840a6633057eaf72614236c55662a6215853f643534a98477aa3d0e2354
 MISC metadata.xml 358 BLAKE2B 3f5e83a9b333d6c597ffa57ca34c74186b48789ca4fbfb10087d31740e53ec215052d9a10b659d5f7006641a34fb47d83179f93b1eba92fa19514a238a38ae88 SHA512 dbc254e5e7925c09f99e64a91fba2f8f63d4b7a12c41a5c13bf315352885f24058cec0becc6e25e98153d2a82f49772f4bc61d1cb21ae5e9ad061b58771fb7fb
diff --git a/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch b/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch
index 1a3c922723e1..285fbd7d23fe 100644
--- a/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch
+++ b/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch
@@ -1,5 +1,5 @@
---- Setup.hs.orig	2014-11-03 00:57:44.033467328 +0530
-+++ Setup.hs	2014-11-03 00:58:05.775218672 +0530
+--- a/Setup.hs.orig	2014-11-03 00:57:44.033467328 +0530
++++ b/Setup.hs	2014-11-03 00:58:05.775218672 +0530
 @@ -205,7 +205,7 @@
                         else docdir (absoluteInstallDirs pd lbi cd) `joinFileName` "doc"
          let manDir = if isWindows
diff --git a/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild b/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild
deleted file mode 100644
index 81391c36b1b2..000000000000
--- a/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="bin"
-inherit base haskell-cabal
-
-DESCRIPTION="Preprocessor for typesetting Haskell sources with LaTeX"
-HOMEPAGE="http://www.andres-loeh.de/lhs2tex/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# dev-texlive/texlive-mathscience contains 'stmaryrd' font used
-# for guide generation
-# dev-texlive/texlive-latexextra for polytable
-RDEPEND="dev-texlive/texlive-latexextra
-	dev-texlive/texlive-mathscience"
-
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10
-		dev-haskell/mtl
-		dev-haskell/regex-compat
-		>=dev-lang/ghc-6.12.1"
-
-# Setup.hs uses 'Text.Regex' available in both 'r-c' and 'r-c-tdfa'
-HCFLAGS+=" -ignore-package=regex-compat-tdfa"
-
-# datadir is /usr/share/${PN}/${GHC_VER} so mandir is ${DATADIR}/../../man
-PATCHES=("${FILESDIR}/${PN}-1.18.1-mandir.patch")
diff --git a/dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild b/dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild
deleted file mode 100644
index 81391c36b1b2..000000000000
--- a/dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="bin"
-inherit base haskell-cabal
-
-DESCRIPTION="Preprocessor for typesetting Haskell sources with LaTeX"
-HOMEPAGE="http://www.andres-loeh.de/lhs2tex/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# dev-texlive/texlive-mathscience contains 'stmaryrd' font used
-# for guide generation
-# dev-texlive/texlive-latexextra for polytable
-RDEPEND="dev-texlive/texlive-latexextra
-	dev-texlive/texlive-mathscience"
-
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10
-		dev-haskell/mtl
-		dev-haskell/regex-compat
-		>=dev-lang/ghc-6.12.1"
-
-# Setup.hs uses 'Text.Regex' available in both 'r-c' and 'r-c-tdfa'
-HCFLAGS+=" -ignore-package=regex-compat-tdfa"
-
-# datadir is /usr/share/${PN}/${GHC_VER} so mandir is ${DATADIR}/../../man
-PATCHES=("${FILESDIR}/${PN}-1.18.1-mandir.patch")
diff --git a/dev-haskell/lhs2tex/lhs2tex-1.24.ebuild b/dev-haskell/lhs2tex/lhs2tex-1.24.ebuild
new file mode 100644
index 000000000000..969c65b57289
--- /dev/null
+++ b/dev-haskell/lhs2tex/lhs2tex-1.24.ebuild
@@ -0,0 +1,35 @@
+# 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
+
+CABAL_FEATURES=""
+inherit haskell-cabal
+
+DESCRIPTION="Preprocessor for typesetting Haskell sources with LaTeX"
+HOMEPAGE="https://github.com/kosmikus/lhs2tex"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# dev-texlive/texlive-mathscience contains 'stmaryrd' font used
+# for guide generation. dev-texlive/texlive-latexextra provides polytable
+RDEPEND=">=dev-haskell/mtl-2.2.1:=
+	dev-haskell/regex-compat:=
+	>=dev-lang/ghc-7.4.1:=
+	dev-texlive/texlive-mathscience:=
+	dev-texlive/texlive-latexextra:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+# datadir is /usr/share/${PN}/${GHC_VER} so mandir is ${DATADIR}/../../man
+PATCHES=(
+	"${FILESDIR}/${PN}-1.18.1-mandir.patch"
+)