gentoo auto-resync : 24:07:2022 - 02:51:59

4 files changed, 53 insertions, 78 deletions

diff --git a/dev-haskell/lukko/Manifest b/dev-haskell/lukko/Manifest
index 2dcb2460232b..3c9141db9828 100644
--- a/dev-haskell/lukko/Manifest
+++ b/dev-haskell/lukko/Manifest
@@ -1,3 +1,4 @@
-DIST lukko-0.1.1.2.tar.gz 28366 BLAKE2B 8e7a0257c187ed76f2399a2ca381210ad44d683faff74ca583658eab13545e6809fe6ea57b4c4c22c16560272c0d53736183437e4f5ad64919d98dbac239a864 SHA512 fe3a6687b741491ebaeace29c8d4d01307fad43f0e649c087fef24ec227eb231541fa1500e1685c814eb2a1ea472546033e837ce84fa64df79f00b19f8abebb6
-EBUILD lukko-0.1.1.2.ebuild 1084 BLAKE2B 01d56641070b69a1263c841558daced98987b7b5a7291075c5b364426f1a5489cb846c9c5883978d826917ceede47bdb7f25b4c613899540bcd2bb230ac35686 SHA512 7c73a0bc57e44cf2a32d9566af68ec5e2773fca8bc51a4d0f71e1cf3f0964f123abdf74a451d39bd5521f3f5f6314259f03cb534fa317986e48e0bbc93dcb6f0
-MISC metadata.xml 1656 BLAKE2B e7943d7f8fb508087b54e379d61cdc27ee8da98546bc7820350b6b045decd46cc7d665c187c56040f3d7ab586269543ebacd409174d6210ef5fcab2aef314713 SHA512 04bf0ef62dc75cfcfd9621e8ca29e31369d57b5409bf81b889ab4c7f04f6b0dd7552aacf7cb4f24251d7cd1c3e65b1f7e69c0efc6b16433953f172a908d41b68
+DIST lukko-0.1.1.3.cabal 4556 BLAKE2B 61ae605ec201a1870aba505e4434ace0b6f153b10eb740e2a28cb44cdf948086eb58485c976c0ab895e26521175f9e97c0c4b1ef296831a671c8c0ae64f719b2 SHA512 ac85483d44211bac42bb5bba64a790a2c328db3e3afb9f2837a50a792a13b6efcaf9298705051c6f54f151786c8a41c79f4929f8d5ef3934cc918dfe8091c12b
+DIST lukko-0.1.1.3.tar.gz 28575 BLAKE2B 9f0006d05ba1db03de6fda88265e8949797201124f71ca6690113431f398eb59f19ec67363eb6b2834cac136e985b84882d45dfeb71c67e1147dd000c06cd243 SHA512 8bed8b88a101883f642bb9d9d41512436f5c80db5ea1ad0cddb069c6d09257d21b56a60e0f70b57453e91126065fbfdeeb721064763e64de1975dcb51b1a484a
+EBUILD lukko-0.1.1.3.ebuild 1398 BLAKE2B 94a475448f14a56a0a9fc237a4ab07b17e6fc5bcce7247955105332d6c5170a1b7f8052bf17df506b5077b3fe6d4c6ab4e11c9e250e118551a8b9ea6a7b1f2a6 SHA512 d70543c9a05e568afb325c7ec4e94993775de2fcd96205e5f1a7b9c6879383edd2de9146e2966863551e5c0e2478826e7c1f91bb24e3646e695356149e59b988
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/lukko/lukko-0.1.1.2.ebuild b/dev-haskell/lukko/lukko-0.1.1.2.ebuild
deleted file mode 100644
index 6dcaf99f3e07..000000000000
--- a/dev-haskell/lukko/lukko-0.1.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="File locking"
-HOMEPAGE="https://hackage.haskell.org/package/lukko"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ofd-locking"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2
-	test? ( >=dev-haskell/async-2.2.2 <dev-haskell/async-2.3
-		>=dev-haskell/singleton-bool-0.1.5 <dev-haskell/singleton-bool-0.2
-		>=dev-haskell/tagged-0.8.5 <dev-haskell/tagged-0.9
-		>=dev-haskell/tasty-1.2.3 <dev-haskell/tasty-1.3
-		>=dev-haskell/tasty-expected-failure-0.11.1.2 <dev-haskell/tasty-expected-failure-0.12
-		>=dev-haskell/tasty-hunit-0.10.0.2 <dev-haskell/tasty-hunit-0.11
-		>=dev-haskell/temporary-1.3 <dev-haskell/temporary-1.4 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag ofd-locking ofd-locking)
-}
diff --git a/dev-haskell/lukko/lukko-0.1.1.3.ebuild b/dev-haskell/lukko/lukko-0.1.1.3.ebuild
new file mode 100644
index 000000000000..6c5b7eb3841f
--- /dev/null
+++ b/dev-haskell/lukko/lukko-0.1.1.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+#hackport: flags: +ofd-locking
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="File locking"
+HOMEPAGE="https://hackage.haskell.org/package/lukko"
+HACKAGE_REV="2"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${HACKAGE_REV}.cabal -> ${PF}.cabal"
+
+LICENSE="GPL-2 BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/async-2.2.2 <dev-haskell/async-2.3
+		>=dev-haskell/singleton-bool-0.1.5 <dev-haskell/singleton-bool-0.2
+		>=dev-haskell/tasty-1.4.0.1 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-hunit-0.10.0.2 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/temporary-1.3 <dev-haskell/temporary-1.4
+		>=dev-haskell/tasty-expected-failure-0.11.1.2 <dev-haskell/tasty-expected-failure-0.13 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+	# Convert to unix line endings
+	dos2unix "${S}/${PN}.cabal" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=ofd-locking
+}
diff --git a/dev-haskell/lukko/metadata.xml b/dev-haskell/lukko/metadata.xml
index 813bd62764bc..937381521944 100644
--- a/dev-haskell/lukko/metadata.xml
+++ b/dev-haskell/lukko/metadata.xml
@@ -5,43 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="ofd-locking">Enable open file descriptor locking. Available on Linux (kernel 3.15, released Jun 8, 2014).</flag>
-	</use>
-	<longdescription>
-		This package provides access to platform dependent file locking APIs:
-		
-		* Open file descriptor locking on Linux ("Lukko.OFD")
-		* @flock@ locking on unix platforms ("Lukko.FLock")
-		* Windows locking @LockFileEx@ ("Lukko.Windows")
-		* No-op locking, which throws exceptions ("Lukko.NoOp")
-		* "Lukko" module exports the best option for the target platform with uniform API.
-		
-		There are alternative file locking packages:
-		
-		* "GHC.IO.Handle.Lock" in @base &gt;= 4.10@ is good enough for most use cases.
-		However, uses only 'Handle's so these locks cannot be used for intra-process locking.
-		(You should use e.g. 'MVar' in addition).
-		
-		* &lt;https://hackage.haskell.org/package/filelock filelock&gt; doesn't support OFD locking.
-		
-		/Lukko/ means lock in Finnish.
-		
-		Submodules "Lukko.OFD", "Lukko.Windows" etc are available based on following conditions.
-		
-		@
-		if os(windows)
-		\  cpp-options: -DHAS_WINDOWS_LOCK
-		
-		elif (os(linux) &amp;&amp; flag(ofd-locking))
-		\  cpp-options: -DHAS_OFD_LOCKING
-		\  cpp-options: -DHAS_FLOCK
-		
-		elif !(os(solaris) || os(aix))
-		\  cpp-options: -DHAS_FLOCK
-		@
-		
-		"Lukko.FLock" is available on not (Windows or Solaris or AIX).
-		"Lukko.NoOp" is always available.
-	</longdescription>
 </pkgmetadata>