gentoo resync : 02.09.2020

4 files changed, 72 insertions, 0 deletions

diff --git a/dev-haskell/wxcore/Manifest b/dev-haskell/wxcore/Manifest
index ffb1ca6f00d1..d5097ece149d 100644
--- a/dev-haskell/wxcore/Manifest
+++ b/dev-haskell/wxcore/Manifest
@@ -1,3 +1,7 @@
+AUX wxcore-0.92.2.0-ghc-8.4.patch 182 BLAKE2B caf297ccf8d04e9f6751dbf47e6ef9a8dab77e50aedd8612640a477f234041815afc499da4194172e3806f721669fe272c0366c085671af2051e266f3b4e33cb SHA512 2989283b7ba0b700bb9be6f0b5648e0332b9900c36900740653da861a7a81328efcfdabb28d5d11000a5eb3d742c77fa3c3e866eba5f8afbb5b1bd8a5e18bee2
+AUX wxcore-0.92.3.0-cabal-3.patch 714 BLAKE2B fa8590e575386ed6e1efce2a5221693d497a1243f715acdbc99986c19272b5d9b6a8e49dbed94761c81a375890b42d4f44dc76ad8bb819ab7944954315dcc0bf SHA512 cb7ed7541dcff3c44cd5476a73cbe1c65d35bf8c2cd8ce9235edd6e04bafccce88183e18ff30d9f4963ae058278aa244431fe14dd528860d99be774d8feaa6e5
 DIST wxcore-0.92.2.0.tar.gz 400116 BLAKE2B c4d87792ad7a7fdf125ef68211f1efe89bff9d3114dc2dacb8f7b96a824fa359addb00c331e3d8fd6325cf90cf3c78448c500431ef18ac7d2989eedee952e17c SHA512 e1339ea30a699e22a9fc2f12b6ddcd773911e4d611f834886952bde4d76205c448e1702bab3148f4c370eec1cabeac06655b4cf3cbbfe24e2ea08a628906880a
+DIST wxcore-0.92.3.0.tar.gz 400300 BLAKE2B ce7ea6e2ec71935001d0b1fd347d5aa57de5d9f7cab9cf9fa87879c8dfd6291e76811899aeaccf8c227d54e6b0499ea5420dabac84014cbbf6373f8dd8a60f0f SHA512 199eb8afa9b568637c8d1fb2ab8b98a73d4ea9f03df088a855a88f17728997ed1044fb7c1c69d732530d7b24ae312e8dfc3f6ffc0396765d583531524d10a442
 EBUILD wxcore-0.92.2.0.ebuild 1005 BLAKE2B b2d127a6425ea425e6023a4ec4ef2fe3517684064ca1ae8036c34d49898aeee568722656f154a9c19a8893eee1807a2c47d85d827e409c70d71cac1117443b3f SHA512 be6543c3dda704e959d8f2bb1ed4820ea49dc1855a3cd991a728dc68b1a0ce6a14e1e1e28fe4c71c4c78c99d69d73efad34066afaea279a899a201633eac9c55
+EBUILD wxcore-0.92.3.0.ebuild 1204 BLAKE2B cf7e5c5516f6ed70a99fa5289f163c554952b82f64a5fffc94770d18a710d37c6994633b36c3b9d6b93a3e37f9ba13df40242a68e228e8612ee163d9832e044f SHA512 a6b3ad3bc03c96d6ceb6aaaf5dc9031c8d90f6be422fd6a855174c81bdd5f608c13fcdd8b6c14d6464b277292b0ff2127bb1ed30b70e6d2100617c2439c03df4
 MISC metadata.xml 552 BLAKE2B ee833f6c1a6469ecb6e1ae439a4b049fbd30af28f7a671f64687da3fbc4ac3ec5c0cba933364fd7f00933940d2462e107a62978f65fe6379dd587dac68f5c2a7 SHA512 2fc1a19d4fece7df270b76dc9aec6003f67f1a2a2adc7beb8999f9938762487fbda660734eddcbed33ae8472f748ba5079108d3806c844283696711ecd288f18
diff --git a/dev-haskell/wxcore/files/wxcore-0.92.2.0-ghc-8.4.patch b/dev-haskell/wxcore/files/wxcore-0.92.2.0-ghc-8.4.patch
new file mode 100644
index 000000000000..6c7c2c7e9ce5
--- /dev/null
+++ b/dev-haskell/wxcore/files/wxcore-0.92.2.0-ghc-8.4.patch
@@ -0,0 +1,5 @@
+--- a/src/haskell/Graphics/UI/WXCore/WxcTypes.hs
++++ b/src/haskell/Graphics/UI/WXCore/WxcTypes.hs
+@@ -125 +125 @@ import Data.Ix
+-import Foreign.C

++import Foreign.C hiding (CBool)

diff --git a/dev-haskell/wxcore/files/wxcore-0.92.3.0-cabal-3.patch b/dev-haskell/wxcore/files/wxcore-0.92.3.0-cabal-3.patch
new file mode 100644
index 000000000000..b93da91f7f43
--- /dev/null
+++ b/dev-haskell/wxcore/files/wxcore-0.92.3.0-cabal-3.patch
@@ -0,0 +1,11 @@
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -7,7 +7,7 @@ import Data.List (foldl', intersperse, intercalate, nub, lookup, isPrefixOf, isI
+ import Data.Maybe (fromJust)

+ import Distribution.PackageDescription hiding (includeDirs)

+ import qualified Distribution.PackageDescription as PD (includeDirs)

+-import Distribution.InstalledPackageInfo(installedPackageId, sourcePackageId, includeDirs)

++import Distribution.InstalledPackageInfo({-installedPackageId,-} sourcePackageId, includeDirs)

+ import Distribution.Simple

+ import Distribution.Simple.LocalBuildInfo (LocalBuildInfo, localPkgDescr, installedPkgs, withPrograms, buildDir)

+ import Distribution.Simple.PackageIndex(SearchResult (..), searchByName, allPackages )

diff --git a/dev-haskell/wxcore/wxcore-0.92.3.0.ebuild b/dev-haskell/wxcore/wxcore-0.92.3.0.ebuild
new file mode 100644
index 000000000000..45fad5cbefe2
--- /dev/null
+++ b/dev-haskell/wxcore/wxcore-0.92.3.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+WX_GTK_VER="3.0"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal wxwidgets
+
+DESCRIPTION="wxHaskell core"
+HOMEPAGE="https://wiki.haskell.org/WxHaskell"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="wxWinLL-3.1"
+SLOT="${WX_GTK_VER}/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="gstreamer"
+
+RDEPEND="dev-haskell/parsec:=[profile?]
+	dev-haskell/stm:=[profile?]
+	>=dev-haskell/wxc-0.92:${WX_GTK_VER}=[profile?,gstreamer?]
+	>=dev-haskell/wxdirect-0.91:${WX_GTK_VER}=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer?,opengl]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.23
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.92.2.0-ghc-8.4.patch
+	"${FILESDIR}"/${PN}-0.92.3.0-cabal-3.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "s@wxdirect@wxdirect-${WX_GTK_VER}@g" \
+		-i "${S}/Setup.hs" \
+		|| die "Could not change Setup.hs for wxdirect slot ${WX_GTK_VER}"
+
+	cabal_chdeps\
+		'containers >= 0.2 && < 0.6' 'containers >=0.2'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=splitbase
+}