gentoo auto-resync : 23:10:2023 - 08:35:49

5 files changed, 82 insertions, 8 deletions

diff --git a/dev-haskell/hjsmin/Manifest b/dev-haskell/hjsmin/Manifest
index ddbb628baeac..f791ede4b0ea 100644
--- a/dev-haskell/hjsmin/Manifest
+++ b/dev-haskell/hjsmin/Manifest
@@ -1,3 +1,6 @@
+AUX hjsmin-0.2.0.4-fix-tests.patch 893 BLAKE2B b00642b1f91916c4fd42e1b314285aa83646dfb4322f0c3af397ca1dc64ab796f28a5524f15bbec951cd849fc6fa40676650e595ae522dd017f9070e88b4a741 SHA512 60410616ab873ee3e3f16b31d8738a80a484b870f9f28da7535700c0de4e3171dc7a4eb865f1e0390c74966076ca845cddc5448ca6bcf81e917e4dd989631f79
 DIST hjsmin-0.2.0.4.tar.gz 5233 BLAKE2B 839cc956a7dad0b958a12f9e9ca45dfeb2c64ef35f6e746747a01d1bba771edc229b9822c9274a67c1fa483da64f94e500644b77b9d90283e1feb56975d0badb SHA512 11534fd3f351cb1b73e9f166ee42737eb31c10f8f49b2b8d593f9a5a07d08d6b070f71204ec41257d02f38b0dc1172f48bd95d59b553b9f602b90018a795b07c
-EBUILD hjsmin-0.2.0.4.ebuild 867 BLAKE2B d6d29570ee5d1ccda64e51dfd5f3dc2292c1aad2a013747ff9b7d50abc6ada7a41ae2a2483b3e89cf37930f7b59b9bd8bde3a99983bf8197b0c4beb9211b29bf SHA512 bb766fe4b83921ffca39aa429e22a5d103af3a950dacf61a5bbbf3489bbcf2311968776022432f4f9fa4479ed9518bc249ced565ae16c13b7b223c86ee136226
-MISC metadata.xml 504 BLAKE2B 13d6ca313751303af3521c7143a59fa49a2ff0362e48e369bdf1a8fa7f058a766d2422643586bd6cd2529877f8ab8cda78ee88cb8c2c37b49752666ea757f44a SHA512 0b3424105c0b30033427a4c9d88eedf67ea6130f5099a2b07d493c49223915cd87fec0772bc96cfdd6918c19a2191a3ecafcc2b6448fb82a1e713ae33ee6d4b6
+DIST hjsmin-0.2.1.tar.gz 5197 BLAKE2B 88bca64c36728370f11635499d0ff240db43a495e8c2871bb706096995a0ceeb4c0553dd9a95cffde4b97c22a9f63704fc65a12c52a30dde211b056abdb6ca29 SHA512 ccc7ac765c99986e15e35f7e7ceef96b4551dbcccef2a62ad8625a8e4ab51edd0afe87368d6066062dd3749e827dd84af1a1ba1d272934481a77763f1d4d793e
+EBUILD hjsmin-0.2.0.4.ebuild 867 BLAKE2B e40055194941e1d04ae0c68ba50ac4ec20ef47e62e65e7dc9736f446fb374294915ae717e93b9ac1c03e006bf21ec9e180a3eba3f941ab5c8cbbf729c2048e8f SHA512 db92d9a466ee899d7130b85f49e2721b358ae1a22657f6991c82944d84a3ef0ad8fcb8700c4ba42f944c27337c8a64156a5698338dcc5d8cff424421d76d226c
+EBUILD hjsmin-0.2.1.ebuild 1052 BLAKE2B 36036b8c89940bb64d5dfebd7005394167e177a73875a564b6d124c4dcec2ff3b1aa4d51b4b2b6e3bd5758b74a480f28b10f6665fda7e3c12bc7d529ce027e13 SHA512 368271b61f5426097f68afed948598419f51de08bb44dd7b4f12e48ba4a1f38d368b13c89d5337164da82ba66544eb224c6351e953cb529045dd320102245f30
+MISC metadata.xml 374 BLAKE2B 605e002b6265f431d2d2e9264295a1eb3c78d0d509f45ddde81c6a02a0272021b86a1136041b03759c918b6e76a5bdd21ce66a06ba736d51c57220fd9bbef0fb SHA512 8695617268d9b7f7440c34da6861492a5edd81c4ba6798a1ad1b0c704a7afa115e31f14330112bb6919d184333dba4ce0a49f1c8c90325efbae1822c9991c36d
diff --git a/dev-haskell/hjsmin/files/hjsmin-0.2.0.4-fix-tests.patch b/dev-haskell/hjsmin/files/hjsmin-0.2.0.4-fix-tests.patch
new file mode 100644
index 000000000000..ce994c7588f1
--- /dev/null
+++ b/dev-haskell/hjsmin/files/hjsmin-0.2.0.4-fix-tests.patch
@@ -0,0 +1,29 @@
+From 9605b913e6aed7fa3d40aa9925975b506d3a0eb0 Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@users.noreply.github.com>
+Date: Wed, 1 Mar 2023 14:13:58 -0700
+Subject: [PATCH] Fix tests
+
+Tests assume a 'dist-newstyle' directory (e.g. cabal-v2) when we
+actually have a 'dist' directory.
+
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ test/test-cli.hs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test-cli.hs b/test/test-cli.hs
+index a97e1b7..7691587 100644
+--- a/test/test-cli.hs
++++ b/test/test-cli.hs
+@@ -18,7 +18,7 @@ main = do
+   IO.hSetBuffering IO.stderr LineBuffering
+ 
+   cwd <- getCurrentDirectory
+-  topdir <- canonicalizePath $ cwd </> "dist-newstyle"
++  topdir <- canonicalizePath $ cwd </> "dist"
+ 
+   -- Set an environment variable for all the exectuables we want to test.
+   setExecutableEnvVar "HJSMIN" topdir "hjsmin"
+-- 
+2.39.2
+
diff --git a/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
index 5bfc031e5139..82aa7e1774c9 100644
--- a/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
+++ b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # ebuild generated by hackport 0.6.1
 
diff --git a/dev-haskell/hjsmin/hjsmin-0.2.1.ebuild b/dev-haskell/hjsmin/hjsmin-0.2.1.ebuild
new file mode 100644
index 000000000000..63c56bcf4700
--- /dev/null
+++ b/dev-haskell/hjsmin/hjsmin-0.2.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell implementation of a javascript minifier"
+HOMEPAGE="https://github.com/erikd/hjsmin"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.0.4-fix-tests.patch"
+)
+
+CABAL_CHDEPS=(
+	'text                    >= 2' 'text                    >= 1.2.5.0'
+)
+
+RDEPEND=">=dev-haskell/language-javascript-0.6:=[profile?] <dev-haskell/language-javascript-0.8:=[profile?]
+	>=dev-haskell/optparse-applicative-0.7:=[profile?]
+	>=dev-haskell/text-1.2.5.0:=[profile?]
+	>=dev-lang/ghc-9.2.4:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.6.3.0
+	test? ( dev-haskell/extra )
+"
+
+src_prepare() {
+	# Tests need exec permissions on these files
+	local files=(
+		"test/cli/minimal-input/run"
+		"test/cli/empty-input/run"
+	)
+	chmod -v +x "${files[@]}"
+
+	haskell-cabal_src_prepare
+}
diff --git a/dev-haskell/hjsmin/metadata.xml b/dev-haskell/hjsmin/metadata.xml
index f9a7be27c0e1..3ae810a2ce4b 100644
--- a/dev-haskell/hjsmin/metadata.xml
+++ b/dev-haskell/hjsmin/metadata.xml
@@ -5,11 +5,8 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Reduces size of javascript files by stripping out extraneous whitespace and
-		other syntactic elements, without changing the semantics.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">alanz/hjsmin</remote-id>
+		<remote-id type="hackage">hjsmin</remote-id>
+		<remote-id type="github">erikd/hjsmin</remote-id>
 	</upstream>
 </pkgmetadata>