gentoo resync : 14.07.2018

5 files changed, 133 insertions, 0 deletions

diff --git a/dev-haskell/persistent-sqlite/Manifest b/dev-haskell/persistent-sqlite/Manifest
new file mode 100644
index 000000000000..59324b814dca
--- /dev/null
+++ b/dev-haskell/persistent-sqlite/Manifest
@@ -0,0 +1,6 @@
+AUX persistent-sqlite-2.1.4.2-exe.patch 709 BLAKE2B 41fbf74d91c0cf98a7417754ac3533eac51dbf35258f9fd2f6be286271ecb0699ac461a6d9898fd211c06e288da572080f14d6c19263b8199d49d394de0fdfaa SHA512 96772879c46426fba0e79d23c5b11d2ae3e2e30a272bb11bc3f739eb20a7c5b182e952163b974b440f39c947180675e384dce5d7f7ea693e7835055248e18ced
+DIST persistent-sqlite-2.1.4.2.tar.gz 1460596 BLAKE2B b5bb2a869888fd276fc4a515000253408f878964b5b4b0740406a7655f2488a8b5c9354be108bc4f24b31caafa4916a9973ed2204a4be7ca53745dbc7217893f SHA512 9c959164135120f02464daee6d9012872d12212bcb94128010f05784cd11cd04d2fd2dcca5dafd9036d0bd4154a5262b26816b27d7a335f0404634471e3944c7
+DIST persistent-sqlite-2.6.tar.gz 3565770 BLAKE2B e92865929494d37ea5363dcb5110821e5ae5de099aca3fefa59311d2586b9c450f648fd4077ac7310efe72d5c7267b8f5c943610e65db7731608d8e86c62fdfe SHA512 c0be576429ee0051eeeffff6c6d7168a7993deeca47acd27bf2d0075afad2702855f2c14d8b389697d5053aa097d81fe119e4eb215a1c56f782e2ac95a5f8ff8
+EBUILD persistent-sqlite-2.1.4.2.ebuild 1310 BLAKE2B ef739909ef6a18a13e894861bb674273576fa621265d98083ab2bcc4b5777ee25fb08e8e6c2876f22731abe3dcd3d1c1b6aa1e8222c698d3d6ef3b6f9f636727 SHA512 07adbd493c90b7aef511f0838ab28333864789e7d3ba2990c274374a2f68ada1a25ebb0da41a41dab4340a830ce06c7fdcd6069ed46fd4d30cad913e2562eb0d
+EBUILD persistent-sqlite-2.6.ebuild 1267 BLAKE2B 8138bfba69ae0b2fdb526406c11d2d1bf4bee1f450d6067ed8cf7faff20ca1e5be29afa946b14d44eec3474a695165d59c6c856102feb56fbcea470d31a4fdc8 SHA512 111962f326b915f1b8528987e04016689f6f45f25ccba5467282f2654d9baeef1dd29bacff4449b8d1ab4b2bfa09a0f70b4d993f5e84a761e1f72b972f74796f
+MISC metadata.xml 533 BLAKE2B c34bf1644536c848850e9e5c8049a4f55588c9aca1f430fde30360a3f56d5457a55796e17d430d9622ea6d9beb804fff4fdd12e3120b7b2db322f8c2e319d0fb SHA512 d8224799947db36e76c7e77dd7303f77961f1c0ddeed6b795f3b5c047db6af57148c6a31f3838a9c35900d6859a333bf85965caa68263e23d0533c17ce2ad3d7
diff --git a/dev-haskell/persistent-sqlite/files/persistent-sqlite-2.1.4.2-exe.patch b/dev-haskell/persistent-sqlite/files/persistent-sqlite-2.1.4.2-exe.patch
new file mode 100644
index 000000000000..2bd856f5f786
--- /dev/null
+++ b/dev-haskell/persistent-sqlite/files/persistent-sqlite-2.1.4.2-exe.patch
@@ -0,0 +1,20 @@
+diff --git a/persistent-sqlite.cabal b/persistent-sqlite.cabal
+index 39971e7..c0edfe3 100644
+--- a/persistent-sqlite.cabal
++++ b/persistent-sqlite.cabal
+@@ -76,2 +76,2 @@ executable sanity
+     hs-source-dirs: test
+-    build-depends: base, persistent-sqlite
++    build-depends: base, persistent-sqlite, monad-logger
+diff --git a/test/sanity.hs b/test/sanity.hs
+index aed09a3..ce61fed 100644
+--- a/test/sanity.hs
++++ b/test/sanity.hs
+@@ -3,2 +3,3 @@
+ import Database.Persist.Sqlite
++import Control.Monad.Logger
+ 
+@@ -7,2 +8,2 @@ $(return []) -- just force TH to run
+ main :: IO ()
+-main = withSqliteConn ":memory:" $ const $ return ()
++main = runStderrLoggingT $ withSqliteConn ":memory:" $ const $ return ()
diff --git a/dev-haskell/persistent-sqlite/metadata.xml b/dev-haskell/persistent-sqlite/metadata.xml
new file mode 100644
index 000000000000..8db950fedcee
--- /dev/null
+++ b/dev-haskell/persistent-sqlite/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This package includes a thin sqlite3 wrapper based on the direct-sqlite package, as well as the entire C library, so there are no system dependencies.
+	</longdescription>
+	<use>
+		<flag name="build-sanity-exe">Build a sanity check test executable.</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.4.2.ebuild b/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.4.2.ebuild
new file mode 100644
index 000000000000..a0f11f40ecb6
--- /dev/null
+++ b/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.4.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+#hackport: flags: +systemlib
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backend for the persistent library using sqlite3"
+HOMEPAGE="https://www.yesodweb.com/book/persistent"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="build-sanity-exe"
+
+RDEPEND=">=dev-db/sqlite-3.0
+	>=dev-haskell/aeson-0.6.2:=[profile?]
+	>=dev-haskell/conduit-0.5.3:=[profile?]
+	>=dev-haskell/monad-control-0.2:=[profile?]
+	>=dev-haskell/monad-logger-0.2.4:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-3:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	>=dev-haskell/transformers-0.2.1:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+	virtual/libc
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( dev-haskell/hspec
+		dev-haskell/persistent-template )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-exe.patch
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag build-sanity-exe build-sanity-exe) \
+		--flag=systemlib
+}
diff --git a/dev-haskell/persistent-sqlite/persistent-sqlite-2.6.ebuild b/dev-haskell/persistent-sqlite/persistent-sqlite-2.6.ebuild
new file mode 100644
index 000000000000..0145c6fbe2db
--- /dev/null
+++ b/dev-haskell/persistent-sqlite/persistent-sqlite-2.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+#hackport: flags: +systemlib
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backend for the persistent library using sqlite3"
+HOMEPAGE="https://www.yesodweb.com/book/persistent"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="build-sanity-exe"
+
+RDEPEND=">=dev-db/sqlite-3.0
+	>=dev-haskell/aeson-0.6.2:=[profile?]
+	>=dev-haskell/conduit-0.5.3:=[profile?]
+	>=dev-haskell/monad-control-0.2:=[profile?]
+	>=dev-haskell/monad-logger-0.2.4:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	>=dev-haskell/persistent-2.6:=[profile?] <dev-haskell/persistent-3:=[profile?]
+	dev-haskell/resource-pool:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	virtual/libc
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hspec
+		dev-haskell/persistent-template
+		dev-haskell/temporary )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag build-sanity-exe build-sanity-exe) \
+		--flag=systemlib
+}