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

4 files changed, 87 insertions, 25 deletions

diff --git a/dev-haskell/shelly/Manifest b/dev-haskell/shelly/Manifest
index bac96a38b7e7..6ac42cb18365 100644
--- a/dev-haskell/shelly/Manifest
+++ b/dev-haskell/shelly/Manifest
@@ -1,3 +1,5 @@
+DIST shelly-1.12.1.tar.gz 75543 BLAKE2B db34e1a5e708192458e5d228b4758aa26812a3f547e39981754f8e3bb7af521c3887fde8e1b859a69b82edafc70be9979af30c918232a15e842f4e9894ed54ee SHA512 3917a03a23e61d5618f897f0ee90a4823980239252f260312ca86c7b364459c58749400e50a0f2ab78822c2eb6283891f993d2f31f0048a3cece19d5c565f05f
 DIST shelly-1.9.0.tar.gz 73344 BLAKE2B f12e8835be5dd648427ff92b73bc9a37215a47067e65456c4c3dc8e9c2e5bb610da171648aadf9759e9a91eb075fa74d06241f83977a5380f49bc861643707cc SHA512 7c1eb25439e08095187746d0101fd92ad56ebb5a706820bad7330667cfc806066d4675c677e5d267440d4af7b517f36449e8f5e75332521780b564edc1586254
-EBUILD shelly-1.9.0.ebuild 1307 BLAKE2B 7ab63fc0b5213dbaab0477b860cf252e91a0f7d29e926394112d5b4b14c93a0b7c0da14984c086b08488fca3ed6ca0bfe1a3e26467b1e3c4576f1f76e2ffce9f SHA512 ba764f19adb98dbd31d5316558533561367685e9fffafb5bcbfb25425a1f8236310df9b82aefdee66a2b52b0f96e1c895d4718889409ebcbed3b793074065fdb
-MISC metadata.xml 1069 BLAKE2B b1c5055654299fe81059b266030a5bdb4509b3b985a0ade8f77c3bb997d705b351f9c9a4591194ee4bdb9affdf521119d250edaa75e8b1c6f9e3904e1724f149 SHA512 3ba05d9f87511f61517530cb2183216b6bb4f1fc15e9a331e5b96f55ef30ffbe580d5d75065f1f6202da5269d4fbf9f1b1d1c74609ee660e69f4d4709aa42885
+EBUILD shelly-1.12.1.ebuild 1807 BLAKE2B 8ee1f8681f770794ee09779880b6680f95eb734f4ad729d510a8c9f05a5ab0a7e7dee6e89f98f78953b25cb155d454f258233de4683bfc6d057a78f50d1d78ac SHA512 09f7af05b229d3e2ae90dda3afc85e93bdccf5813ebc458217714e3bd03995c2e84f0517f45a0a2966441616f51a5267c4bf0e3cd34a2c3c329bae166d41b8c4
+EBUILD shelly-1.9.0.ebuild 1307 BLAKE2B 601dc73b93c12547a2821aec4fdfcfd8db62a8d4234da4cc535b3bfeb442e80c8cc78f672703a2e966aa99d5a5020aad54eabbcb9b8b81694bfd0a1a151b62c1 SHA512 8e471a92524d9383bcfa3701e934b36235aa55bc87c978cf8e213a82f00728f6d6874ec9729eb30db1c8c0415cbb96ab95afe984e81a6a8a1dc48fa4c3870e4d
+MISC metadata.xml 460 BLAKE2B ecb76a73f8bfe9d0e779f1073fb6f22a1a6b4d87917fdbcb0afa1b0da2c7695b12dc30ce57ea4fea5249a83ebafa81b738ae35259d3729f5c85ade1a831c8143 SHA512 143dd44d7eaef9e2047f6ab89889392404453b9a0c70e25ce3cdb8aebd8c0c3c243a682b0736ef580b158352a8641511165b752b96f9ac1d1486d07c99579dbb
diff --git a/dev-haskell/shelly/metadata.xml b/dev-haskell/shelly/metadata.xml
index 42a79a9eb443..4894a131f231 100644
--- a/dev-haskell/shelly/metadata.xml
+++ b/dev-haskell/shelly/metadata.xml
@@ -5,29 +5,11 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Shelly provides convenient systems programming in Haskell,
-		similar in spirit to POSIX shells. Shelly:
-		
-		* is aimed at convenience and getting things done rather than
-		being a demonstration of elegance.
-		
-		* has detailed and useful error messages
-		
-		* maintains its own environment, making it thread-safe.
-		
-		* is modern, using Text and system-filepath/system-fileio
-		
-		Shelly is originally forked from the Shellish package.
-		
-		See the shelly-extra package for additional functionality.
-		
-		An overview is available in the README: &lt;https://github.com/yesodweb/Shelly.hs/blob/master/README.md&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">gregwebs/Shelly.hs</remote-id>
-	</upstream>
 	<use>
 		<flag name="lifted">run the tests against Shelly.Lifted</flag>
 	</use>
+	<upstream>
+		<remote-id type="hackage">shelly</remote-id>
+		<remote-id type="github">gregwebs/Shelly.hs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/shelly/shelly-1.12.1.ebuild b/dev-haskell/shelly/shelly-1.12.1.ebuild
new file mode 100644
index 000000000000..b1b5c5236491
--- /dev/null
+++ b/dev-haskell/shelly/shelly-1.12.1.ebuild
@@ -0,0 +1,78 @@
+# 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: build-examples:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="shell-like (systems) programming in Haskell"
+HOMEPAGE="https://github.com/gregwebs/Shelly.hs"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples lifted"
+
+RDEPEND="
+	>=dev-haskell/async-2.2.3:=[profile?]
+	>=dev-haskell/enclosed-exceptions-1.0.1:=[profile?]
+	>=dev-haskell/lifted-async-0.10.2:=[profile?]
+	>=dev-haskell/lifted-base-0.2.3.2:=[profile?]
+	>=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	>=dev-haskell/text-1.2.3.1:=[profile?]
+	>=dev-haskell/transformers-base-0.4.5:=[profile?]
+	>=dev-haskell/unix-compat-0.4.1.1:=[profile?] <dev-haskell/unix-compat-0.8:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? (
+		>=dev-haskell/hspec-2.2.2
+		dev-haskell/hspec-contrib
+		>=dev-haskell/hunit-1.2.5.2
+	)
+"
+
+example_exes=(
+	"drain"
+	"run-handles"
+	"Color"
+)
+
+src_prepare() {
+	for e in "${example_exes[@]}"; do
+		export CABAL_CHDEPS=(
+			"${CABAL_CHDEPS[@]}"
+			"Executable ${e}"
+			"executable ${PN}-examples-${e}"
+		)
+	done
+
+	haskell-cabal_src_prepare
+}
+
+src_configure() {
+	config_flags=(
+		$(cabal_flag examples build-examples)
+		$(cabal_flag lifted lifted)
+	)
+
+	haskell-cabal_src_configure "${config_flags[@]}"
+}
+
+pkg_postinst() {
+	ghc-package_pkg_postinst
+
+	elog "The following example executables installed with this package have been"
+	elog "renamed to help prevent name collisions:"
+	elog ""
+
+	for e in "${example_exes[@]}"; do
+		elog "${e} -> ${PN}-examples-${e}"
+	done
+}
diff --git a/dev-haskell/shelly/shelly-1.9.0.ebuild b/dev-haskell/shelly/shelly-1.9.0.ebuild
index 5b0950201489..03d0f05b45c7 100644
--- a/dev-haskell/shelly/shelly-1.9.0.ebuild
+++ b/dev-haskell/shelly/shelly-1.9.0.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.9999
 #hackport: flags: build-examples:examples