public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/parser-combinators/
@ 2018-06-08 14:57 Manuel Rüger
  0 siblings, 0 replies; 5+ messages in thread
From: Manuel Rüger @ 2018-06-08 14:57 UTC (permalink / raw
  To: gentoo-commits

commit:     4d2d99cc637355f1114c8fed2facb831bc42424a
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  8 14:56:35 2018 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Jun  8 14:57:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d2d99cc

dev-haskell/parser-combinators: Initial version

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-haskell/parser-combinators/Manifest            |  2 ++
 dev-haskell/parser-combinators/metadata.xml        | 11 ++++++++
 .../parser-combinators-0.4.0.ebuild                | 31 ++++++++++++++++++++++
 .../parser-combinators-1.0.0.ebuild                | 31 ++++++++++++++++++++++
 4 files changed, 75 insertions(+)

diff --git a/dev-haskell/parser-combinators/Manifest b/dev-haskell/parser-combinators/Manifest
new file mode 100644
index 00000000000..8c1defa448f
--- /dev/null
+++ b/dev-haskell/parser-combinators/Manifest
@@ -0,0 +1,2 @@
+DIST parser-combinators-0.4.0.tar.gz 9130 BLAKE2B 368482bd968a4476366ac04162efe1d8ac502dbb964b21e4090bf48ee9f3e81879bce69a0cb8e72d3b51b4f278be23c3c6bb4f4fd434938682c680214b0a95dd SHA512 9748a8a23bef1cb386970722e148a4cc4e36e8f4100ac34794e2a2223b4bfe0f1e6e0f58d82b500e535cc42a0066be0c5bb5676892e4b607d8d6eac4c4f93a28
+DIST parser-combinators-1.0.0.tar.gz 10349 BLAKE2B c8b21ab8c1afd8fdc931f60258245596a70adb404366f5926743b61b6c7b802558436e7869d012dabaaa8d36097028269cec3c99f647958d0b15d14402c05c6b SHA512 308b38faca865801c2356b9eb0128824956f00a31d98de075166018b34d53a04bad0dc7f1afabafa9946b307ef3fb77df303db78ac7bd6ff476c9b96a3020e9c

diff --git a/dev-haskell/parser-combinators/metadata.xml b/dev-haskell/parser-combinators/metadata.xml
new file mode 100644
index 00000000000..b54bf609fcd
--- /dev/null
+++ b/dev-haskell/parser-combinators/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<longdescription>
+		Lightweight package providing commonly useful parser combinators.
+	</longdescription>
+</pkgmetadata>

diff --git a/dev-haskell/parser-combinators/parser-combinators-0.4.0.ebuild b/dev-haskell/parser-combinators/parser-combinators-0.4.0.ebuild
new file mode 100644
index 00000000000..3f37e434112
--- /dev/null
+++ b/dev-haskell/parser-combinators/parser-combinators-0.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Lightweight package providing commonly useful parser combinators"
+HOMEPAGE="https://github.com/mrkkrp/parser-combinators"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev
+}

diff --git a/dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild b/dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild
new file mode 100644
index 00000000000..34b5f48f142
--- /dev/null
+++ b/dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Lightweight package providing commonly useful parser combinators"
+HOMEPAGE="https://github.com/mrkkrp/parser-combinators"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/parser-combinators/
@ 2018-07-05 11:39 Manuel Rüger
  0 siblings, 0 replies; 5+ messages in thread
From: Manuel Rüger @ 2018-07-05 11:39 UTC (permalink / raw
  To: gentoo-commits

commit:     d742b54d5a1856f4528f9035c13841e0134af080
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  5 11:38:31 2018 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Thu Jul  5 11:38:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d742b54d

dev-haskell/parser-combinators: Unmaintain

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 dev-haskell/parser-combinators/metadata.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dev-haskell/parser-combinators/metadata.xml b/dev-haskell/parser-combinators/metadata.xml
index b54bf609fcd..8f34fbbfb77 100644
--- a/dev-haskell/parser-combinators/metadata.xml
+++ b/dev-haskell/parser-combinators/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Lightweight package providing commonly useful parser combinators.
 	</longdescription>


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/parser-combinators/
@ 2019-01-27 11:05 Pacho Ramos
  0 siblings, 0 replies; 5+ messages in thread
From: Pacho Ramos @ 2019-01-27 11:05 UTC (permalink / raw
  To: gentoo-commits

commit:     c662848801f0b9a9dc4788ff6e528e8e6fd60a80
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 10:40:44 2019 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 11:05:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6628488

dev-haskell/parser-combinators: Drop old

Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 dev-haskell/parser-combinators/Manifest            |  1 -
 .../parser-combinators-0.4.0.ebuild                | 31 ----------------------
 2 files changed, 32 deletions(-)

diff --git a/dev-haskell/parser-combinators/Manifest b/dev-haskell/parser-combinators/Manifest
index 8c1defa448f..519cbe1cc8c 100644
--- a/dev-haskell/parser-combinators/Manifest
+++ b/dev-haskell/parser-combinators/Manifest
@@ -1,2 +1 @@
-DIST parser-combinators-0.4.0.tar.gz 9130 BLAKE2B 368482bd968a4476366ac04162efe1d8ac502dbb964b21e4090bf48ee9f3e81879bce69a0cb8e72d3b51b4f278be23c3c6bb4f4fd434938682c680214b0a95dd SHA512 9748a8a23bef1cb386970722e148a4cc4e36e8f4100ac34794e2a2223b4bfe0f1e6e0f58d82b500e535cc42a0066be0c5bb5676892e4b607d8d6eac4c4f93a28
 DIST parser-combinators-1.0.0.tar.gz 10349 BLAKE2B c8b21ab8c1afd8fdc931f60258245596a70adb404366f5926743b61b6c7b802558436e7869d012dabaaa8d36097028269cec3c99f647958d0b15d14402c05c6b SHA512 308b38faca865801c2356b9eb0128824956f00a31d98de075166018b34d53a04bad0dc7f1afabafa9946b307ef3fb77df303db78ac7bd6ff476c9b96a3020e9c

diff --git a/dev-haskell/parser-combinators/parser-combinators-0.4.0.ebuild b/dev-haskell/parser-combinators/parser-combinators-0.4.0.ebuild
deleted file mode 100644
index 3f37e434112..00000000000
--- a/dev-haskell/parser-combinators/parser-combinators-0.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lightweight package providing commonly useful parser combinators"
-HOMEPAGE="https://github.com/mrkkrp/parser-combinators"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/parser-combinators/
@ 2021-07-26 22:39 Sergei Trofimovich
  0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2021-07-26 22:39 UTC (permalink / raw
  To: gentoo-commits

commit:     5578a48e551e024f94e66c6ce24e9b732cf25b61
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 26 22:39:13 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jul 26 22:39:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5578a48e

dev-haskell/parser-combinators: adopt an orphan by haskell@

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-haskell/parser-combinators/metadata.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-haskell/parser-combinators/metadata.xml b/dev-haskell/parser-combinators/metadata.xml
index 7a38bb90096..b7878815d80 100644
--- a/dev-haskell/parser-combinators/metadata.xml
+++ b/dev-haskell/parser-combinators/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/parser-combinators/
@ 2022-08-21  2:22 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-08-21  2:22 UTC (permalink / raw
  To: gentoo-commits

commit:     d8791e9c56f660b15ca89f04dba85add4d5c15d3
Author:     hololeap <hololeap <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Fri Aug 12 03:47:58 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 21 02:21:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8791e9c

dev-haskell/parser-combinators: Fix tests

Make creation of temporary GHC package DB conditional

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../parser-combinators-1.3.0.ebuild                | 27 +++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild b/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild
index fc3e4a9d5cb2..7c57fcc85c7d 100644
--- a/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild
+++ b/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild
@@ -9,18 +9,16 @@ EAPI=8
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
-TESTS_PN="${PN}-tests"
-TESTS_P="${TESTS_PN}-${PV}"
+TESTS_PN="${CABAL_PN}-tests"
+TESTS_P="${TESTS_PN}-${CABAL_PV}"
 
 DESCRIPTION="Lightweight package providing commonly useful parser combinators"
 HOMEPAGE="https://github.com/mrkkrp/parser-combinators"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
-	https://hackage.haskell.org/package/${TESTS_P}/${TESTS_P}.tar.gz"
+SRC_URI+=" https://hackage.haskell.org/package/${TESTS_P}/${TESTS_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-RESTRICT="test" # tests only work if not already installed
 
 RDEPEND=">=dev-lang/ghc-8.6.3:=
 "
@@ -41,18 +39,21 @@ src_configure() {
 
 src_test() {
 	if use test; then
-		./setup register --inplace --gen-pkg-config || die
-		ghc-pkg init pkgdb || die
-		ghc-pkg -f pkgdb register "${P}.conf"
+		local -a configure_flags=( "--flag=-dev" )
 
-		old_S="${S}"
+		# Runs the block if the main package is not installed currently
+		if ! ghc-pkg describe "${CABAL_PN}" &>/dev/null; then
+			./setup register --inplace --gen-pkg-config || die
+			ghc-pkg init pkgdb || die
+			ghc-pkg -f pkgdb register "${CABAL_P}.conf" || die
+			configure_flags+=( "--package-db=${S}/pkgdb" )
+		fi
+
+		local old_S="${S}"
 		export S="${WORKDIR}/${TESTS_P}"
 		pushd "${S}" > /dev/null || die
 
-		haskell-cabal_src_configure \
-			--package-db="${old_S}/pkgdb" \
-			--flag=-dev
-
+		haskell-cabal_src_configure "${configure_flags[@]}"
 		haskell-cabal_src_compile
 		haskell-cabal_src_test
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-08-21  2:22 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-05 11:39 [gentoo-commits] repo/gentoo:master commit in: dev-haskell/parser-combinators/ Manuel Rüger
  -- strict thread matches above, loose matches on Subject: below --
2022-08-21  2:22 Sam James
2021-07-26 22:39 Sergei Trofimovich
2019-01-27 11:05 Pacho Ramos
2018-06-08 14:57 Manuel Rüger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox