From 1dbcabe7f29840d82e490c76f9860fe91b9459fb Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Mon, 17 Sep 2018 22:07:23 +0100
Subject: dev-haskell/hsql-mysql: move off virtual/mysql, bug #665868

Move off virtual/mysql to dev-db/mysql-connector-c
as a library provider (with proper subslot).

Reported-by: Brian Evans
Closes: https://bugs.gentoo.org/665868
Package-Manager: Portage-2.3.49, Repoman-2.3.10
---
 dev-haskell/hsql-mysql/hsql-mysql-1.8.2-r1.ebuild | 26 +++++++++++++++++++++++
 dev-haskell/hsql-mysql/hsql-mysql-1.8.2.ebuild    | 25 ----------------------
 dev-haskell/hsql-mysql/hsql-mysql-1.8.3.ebuild    | 13 ++++++------
 3 files changed, 33 insertions(+), 31 deletions(-)
 create mode 100644 dev-haskell/hsql-mysql/hsql-mysql-1.8.2-r1.ebuild
 delete mode 100644 dev-haskell/hsql-mysql/hsql-mysql-1.8.2.ebuild

(limited to 'dev-haskell')

diff --git a/dev-haskell/hsql-mysql/hsql-mysql-1.8.2-r1.ebuild b/dev-haskell/hsql-mysql/hsql-mysql-1.8.2-r1.ebuild
new file mode 100644
index 000000000000..38e04f8ebedf
--- /dev/null
+++ b/dev-haskell/hsql-mysql/hsql-mysql-1.8.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# ebuild generated by hackport 0.2.13
+
+EAPI=6
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="MySQL driver for HSQL"
+HOMEPAGE="http://hackage.haskell.org/package/hsql-mysql"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/cabal[profile?]
+	>=dev-haskell/hsql-1.8.2[profile?]
+	>=dev-lang/ghc-6.10.1
+	dev-db/mysql-connector-c:0=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/hsql-mysql/hsql-mysql-1.8.2.ebuild b/dev-haskell/hsql-mysql/hsql-mysql-1.8.2.ebuild
deleted file mode 100644
index b4c83d8ab963..000000000000
--- a/dev-haskell/hsql-mysql/hsql-mysql-1.8.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="MySQL driver for HSQL"
-HOMEPAGE="http://hackage.haskell.org/package/hsql-mysql"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/cabal[profile?]
-		>=dev-haskell/hsql-1.8.2[profile?]
-		>=dev-lang/ghc-6.10.1
-		>=virtual/mysql-4.0"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/hsql-mysql/hsql-mysql-1.8.3.ebuild b/dev-haskell/hsql-mysql/hsql-mysql-1.8.3.ebuild
index e1edbce91285..21ea8d3bb7f8 100644
--- a/dev-haskell/hsql-mysql/hsql-mysql-1.8.3.ebuild
+++ b/dev-haskell/hsql-mysql/hsql-mysql-1.8.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # ebuild generated by hackport 0.2.13
 
-EAPI=4
+EAPI=6
 
 CABAL_FEATURES="lib profile haddock hscolour hoogle"
 inherit haskell-cabal
@@ -18,8 +18,9 @@ KEYWORDS="" # buggy, has no headers
 IUSE=""
 
 RDEPEND="dev-haskell/cabal[profile?]
-		>=dev-haskell/hsql-1.8.2[profile?]
-		>=dev-lang/ghc-6.10.1
-		>=virtual/mysql-4.0"
+	>=dev-haskell/hsql-1.8.2[profile?]
+	>=dev-lang/ghc-6.10.1
+	dev-db/mysql-connector-c:0=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
+	>=dev-haskell/cabal-1.10"
-- 
cgit v1.2.3-18-g5258