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

5 files changed, 173 insertions, 44 deletions

diff --git a/app-portage/hackport/Manifest b/app-portage/hackport/Manifest
index be3246143dd0..0f152c15c083 100644
--- a/app-portage/hackport/Manifest
+++ b/app-portage/hackport/Manifest
@@ -1,4 +1,7 @@
+AUX hackport.bash.completion 338 BLAKE2B 95ae66a0045fb97caba9425457f86eb47f08d77459ae649e372dcfb35938031387b532771a78c48df352b4f5528852d07811ea5f42039295578c3b1cba14e502 SHA512 8081a8292bea5b6d3294c3d3acfd358426cfe56fefe72b222304b572116dea78cf1383c1071a76843e13a39a832ea6b83032ef7a6d63442681b377f70041b289
 DIST hackport-0.7.2.2.tar.gz 2083323 BLAKE2B e14fbd5c5fa88260518869ad72dd59d08e7cb4351cecc35952ebfdd71e34ea335e6c4b56de7577033335e3efdbff8796fd05f1ad3df20ae84ed1bc8ef7b2153f SHA512 ce880ae8a5a4dc1d446654b8bf4108bacf4a974afaad0266c291ff9f2ab6f8af49294452314cbbeec1979c8e5ffab0860d87668f63d7d7731eb11eb3144a4bd0
+DIST hackport-0.8.4.0.tar.gz 2427117 BLAKE2B fac57e56cb09d32bd51abd5cb209920176682578cb198675d8dfca82b5b6851a5ea26758b9d83f3db74b5bc03a3ed9cb33372b56e9c314e3fdbb5fc24953e722 SHA512 4ecdc4e0eef0f27b4a79c4ad20676296d925fd51f113f701718f230ca9af2068bb44ef355cc0fdb22dceec11c2fe7aee14887bf2994d49f43bd5cfc66c9b7a79
 EBUILD hackport-0.7.2.2.ebuild 1598 BLAKE2B 661bc0d00ac79d8ab1725c1a072df621d5e54ba7c34550d7349b300f4fd312b07c0ac267fe447cb6d08e015c5f180025fa5a7443fce2e2fe97f4e74280015a79 SHA512 16e3cd91a6e7d314d90cd8b89c280b114c9236eafd1bb931787ca6c07af9b46da2d5a8b70d9ac15065532303944f9f03c0e9dca7933c86c15800d9559c45fac3
-EBUILD hackport-9999.ebuild 1718 BLAKE2B 99684be2ed61ab6834636d48703c81aba22b7f68b0400a234c9776e7000b3459cfcabfc8d79cb942656a3100f5fafd1768d360f95b6d0f994ebe8f5b282c7233 SHA512 b7d00faa4c69baf8540ed90c0e9e4598e03508f01bf8589a611257f5720eac18d55d50269b7ec40c57bfbe41732beed44c364b5a395adbb37ed254240eabd880
-MISC metadata.xml 498 BLAKE2B 5f1d18a5ff924a473042c0ab45ed13067fd2f132b44d95abf98fd1292a1d6314fe3e73c16d48c6ec02d19f45c7aa3830ccf0bce2877a09be586743a6137a7e75 SHA512 3db755e386796ea3d76da89bc08ed993ffca82de39cf27a9cac02377356d7e67884aed43d35897ca161800e8354364dfb9f3c2a7d15a63763d45cd5cc9fa0442
+EBUILD hackport-0.8.4.0.ebuild 2490 BLAKE2B 131920e74455ebc1bf97ec467bee991b76bb64f1b77fbd460743d78f845c4005dc27898bd901f8e6beb3d89d1bfcd20195d83a90eb4523cf32ff84e5d6341008 SHA512 1709f52f1d3918843688628004f7f9402875bd040407091344f3f5972fdd2e37dc470211cc3d75a2d2e74ab99221b80f79a5162363370a3ed8884c1fdd171c07
+EBUILD hackport-9999.ebuild 2770 BLAKE2B 0fe7fa13025ce3345888427cc894ba2be107c1b510eddc2f0b019d582cb6473fc58334bb60229ece7a673ca10355aabc5bba44c5a203dfdc88ec11adf4328b09 SHA512 90a6aaaab2519f71e46ea970d05b4dc8a26fb0684079ff76849544a9ae48db1a96c078b1b8ea60608b2c9e3ab6d441939fbfa1e7a3e2b3ea2b0897ea6525749b
+MISC metadata.xml 455 BLAKE2B dfe8379baf5b7b66aa68c303af1b7ded001d48675eb1535b55a9fef8f37fe680f87360a8255e7997a8fc9a473940ba4f829d722b4ce129b6a9ebb3376c423aa2 SHA512 c40e31bf9d841ccc06d6127626f353685af171ff43c7953bd77108205d98de34bdb975ff3a173d6146d55cf2c21af0f1db2050f5a216d0b48a3945fc88d83fcf
diff --git a/app-portage/hackport/files/hackport.bash.completion b/app-portage/hackport/files/hackport.bash.completion
new file mode 100644
index 000000000000..687c2046c4c2
--- /dev/null
+++ b/app-portage/hackport/files/hackport.bash.completion
@@ -0,0 +1,14 @@
+_hackport()
+{
+    local CMDLINE
+    local IFS=$'\n'
+    CMDLINE=(+RTS -I0 -A8M -N1 -qg -RTS --bash-completion-index $COMP_CWORD)
+
+    for arg in ${COMP_WORDS[@]}; do
+        CMDLINE=(${CMDLINE[@]} --bash-completion-word $arg)
+    done
+
+    COMPREPLY=( $(/usr/bin/hackport "${CMDLINE[@]}") )
+}
+
+complete -o filenames -F _hackport hackport
diff --git a/app-portage/hackport/hackport-0.8.4.0.ebuild b/app-portage/hackport/hackport-0.8.4.0.ebuild
new file mode 100644
index 000000000000..d43064a77d5a
--- /dev/null
+++ b/app-portage/hackport/hackport-0.8.4.0.ebuild
@@ -0,0 +1,87 @@
+# 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
+#hackport: flags: +cabal-v1,+gentoo-tests,+pedantic
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal bash-completion-r1
+DESCRIPTION="Hackage and Portage integration tool"
+HOMEPAGE="https://github.com/gentoo-haskell/hackport#readme"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="profile"
+
+RDEPEND="
+	>=dev-haskell/async-2.0:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1.1:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0:=[profile?]
+	>=dev-haskell/cryptohash-sha256-0.11:=[profile?]
+	dev-haskell/dlist:=[profile?]
+	>=dev-haskell/echo-0.1.3:=[profile?]
+	>=dev-haskell/ed25519-0.0:=[profile?]
+	>=dev-haskell/edit-distance-0.2.2:=[profile?]
+	dev-haskell/extensible-exceptions:=[profile?]
+	>=dev-haskell/hashable-1.0:=[profile?]
+	>=dev-haskell/http-4000.1.5:=[profile?]
+	dev-haskell/lifted-base:=[profile?]
+	>=dev-haskell/lukko-0.1:=[profile?]
+	dev-haskell/monad-control:=[profile?]
+	>=dev-haskell/network-3.0:=[profile?]
+	>=dev-haskell/network-uri-2.6.0.2:=[profile?]
+	dev-haskell/optparse-applicative:=[profile?]
+	>=dev-haskell/parallel-3.2.1.0:=[profile?]
+	>=dev-haskell/parsec-3.1.13.0:=[profile?]
+	dev-haskell/parser-combinators:=[profile?]
+	dev-haskell/prettyprinter:=[profile?]
+	dev-haskell/quickcheck:2=
+	>=dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/regex-base-0.94.0.0:=[profile?]
+	>=dev-haskell/regex-posix-0.96.0.0:=[profile?]
+	>=dev-haskell/resolv-0.1.1:=[profile?]
+	>=dev-haskell/safe-exceptions-0.1.7.0:=[profile?]
+	dev-haskell/split:=[profile?]
+	>=dev-haskell/tar-0.5.0.3:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?]
+	dev-haskell/xml:=[profile?]
+	>=dev-haskell/zlib-0.5.3:=[profile?]
+	>=dev-lang/ghc-8.10.6:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? (
+		dev-haskell/base-compat
+		>=dev-haskell/cabal-doctest-1.0
+		>=dev-haskell/doctest-0.8
+		dev-haskell/glob
+		>=dev-haskell/hspec-2.0
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.0
+	)
+"
+
+src_configure() {
+	if use test; then
+		export GHC_BOOTSTRAP_PACKAGES=(
+			cabal-doctest
+		)
+	fi
+
+	haskell-cabal_src_configure \
+		--flag=cabal-v1 \
+		--flag=gentoo-tests \
+		--flag=pedantic \
+		$(cabal_flag profile profile)
+}
+
+src_install() {
+	haskell-cabal_src_install
+	doman man/hackport.1
+
+	# We only install bash completion scripts currently
+	newbashcomp "${FILESDIR}/${PN}.bash.completion" "${PN}"
+}
diff --git a/app-portage/hackport/hackport-9999.ebuild b/app-portage/hackport/hackport-9999.ebuild
index 7cc74ec9ca0f..dfd8f33c2cf4 100644
--- a/app-portage/hackport/hackport-9999.ebuild
+++ b/app-portage/hackport/hackport-9999.ebuild
@@ -1,72 +1,97 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-# ebuild generated by hackport 0.7.1.1.9999
-#hackport: flags: +cabal-v1
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +cabal-v1,+gentoo-tests,+pedantic
 
 CABAL_FEATURES="test-suite"
 EGIT_REPO_URI="https://github.com/gentoo-haskell/hackport.git"
 
-inherit git-r3 haskell-cabal
+inherit git-r3 haskell-cabal bash-completion-r1
 
 DESCRIPTION="Hackage and Portage integration tool"
-HOMEPAGE="https://github.com/gentoo-haskell/hackport"
+HOMEPAGE="https://github.com/gentoo-haskell/hackport#readme"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS=""
+IUSE="profile +threads"
+REQUIRED_USE="profile? ( threads ) test? ( threads )"
 
-RDEPEND=">=dev-haskell/async-2.0:=
-	>=dev-haskell/base16-bytestring-0.1.1:=
-	>=dev-haskell/base64-bytestring-1.0:=
-	>=dev-haskell/cryptohash-sha256-0.11:=
-	>=dev-haskell/echo-0.1.3:=
-	>=dev-haskell/ed25519-0.0:=
-	>=dev-haskell/edit-distance-0.2.2:=
-	dev-haskell/extensible-exceptions:=
-	>=dev-haskell/hashable-1.0:=
-	>=dev-haskell/http-4000.1.5:=
-	>=dev-haskell/network-3.0:=
-	>=dev-haskell/network-uri-2.6.0.2:=
-	>=dev-haskell/parallel-3.2.1.0:=
+RDEPEND="
+	>=dev-haskell/async-2.0:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1.1:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0:=[profile?]
+	>=dev-haskell/cryptohash-sha256-0.11:=[profile?]
+	dev-haskell/dlist:=[profile?]
+	>=dev-haskell/echo-0.1.3:=[profile?]
+	>=dev-haskell/ed25519-0.0:=[profile?]
+	>=dev-haskell/edit-distance-0.2.2:=[profile?]
+	dev-haskell/extensible-exceptions:=[profile?]
+	>=dev-haskell/hashable-1.0:=[profile?]
+	>=dev-haskell/http-4000.1.5:=[profile?]
+	dev-haskell/lifted-base:=[profile?]
+	>=dev-haskell/lukko-0.1:=[profile?]
+	dev-haskell/monad-control:=[profile?]
+	>=dev-haskell/network-3.0:=[profile?]
+	>=dev-haskell/network-uri-2.6.0.2:=[profile?]
+	dev-haskell/optparse-applicative:=[profile?]
+	>=dev-haskell/parallel-3.2.1.0:=[profile?]
+	>=dev-haskell/parsec-3.1.13.0:=[profile?]
+	dev-haskell/parser-combinators:=[profile?]
+	dev-haskell/prettyprinter:=[profile?]
 	dev-haskell/quickcheck:2=
-	>=dev-haskell/random-1:=
-	>=dev-haskell/regex-base-0.94.0.0:=
-	>=dev-haskell/regex-posix-0.96.0.0:=
-	>=dev-haskell/resolv-0.1.1:=
-	dev-haskell/split:=
-	>=dev-haskell/stm-2.0:=
-	>=dev-haskell/tar-0.5.0.3:=
-	dev-haskell/xml:=
-	>=dev-haskell/zlib-0.5.3:=
-	>=dev-lang/ghc-8.4.3:=
+	>=dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/regex-base-0.94.0.0:=[profile?]
+	>=dev-haskell/regex-posix-0.96.0.0:=[profile?]
+	>=dev-haskell/resolv-0.1.1:=[profile?]
+	>=dev-haskell/safe-exceptions-0.1.7.0:=[profile?]
+	dev-haskell/split:=[profile?]
+	>=dev-haskell/tar-0.5.0.3:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?]
+	dev-haskell/xml:=[profile?]
+	>=dev-haskell/zlib-0.5.3:=[profile?]
+	>=dev-lang/ghc-8.10.6:=[profile?]
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-	test? ( dev-haskell/base-compat
-		dev-haskell/cabal-doctest
+	>=dev-haskell/cabal-3.2.1.0
+	test? (
+		dev-haskell/base-compat
+		>=dev-haskell/cabal-doctest-1.0
 		>=dev-haskell/doctest-0.8
 		dev-haskell/glob
 		>=dev-haskell/hspec-2.0
-		>=dev-haskell/quickcheck-2.0 )
-"
-RDEPEND+="
-	dev-util/pkgcheck
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.0
+	)
 "
 
 src_prepare() {
-	default
-	sed -e 's/^Version:.*/&.9999/' -i ${PN}.cabal || die # just to distinguish from release install
+	haskell-cabal_src_prepare
+	sed -e 's/^version:.*/&.9999/' -i ${PN}.cabal || die # just to distinguish from release install
 }
 
 src_configure() {
+	if use test; then
+		export GHC_BOOTSTRAP_PACKAGES=(
+			cabal-doctest
+		)
+	fi
+
 	haskell-cabal_src_configure \
-		--flag=cabal-v1
+		--flag=cabal-v1 \
+		--flag=gentoo-tests \
+		--flag=pedantic \
+		$(cabal_flag profile profile) \
+		$(cabal-flag threads threads)
 }
 
 src_install() {
 	haskell-cabal_src_install
 	doman man/hackport.1
+
+	# We only install bash completion scripts currently
+	newbashcomp "${FILESDIR}/${PN}.bash.completion" "${PN}"
 }
diff --git a/app-portage/hackport/metadata.xml b/app-portage/hackport/metadata.xml
index bedf907374d9..168e097f4c4c 100644
--- a/app-portage/hackport/metadata.xml
+++ b/app-portage/hackport/metadata.xml
@@ -5,11 +5,11 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A command line tool to manage an overlay of Gentoo ebuilds
-		that are generated from a hackage repo of Cabal packages.
-	</longdescription>
+	<use>
+		<flag name="profile">Enable profiling flags</flag>
+	</use>
 	<upstream>
+		<remote-id type="hackage">hackport</remote-id>
 		<remote-id type="github">gentoo-haskell/hackport</remote-id>
 	</upstream>
 </pkgmetadata>