gentoo resync : 25.08.2020

5 files changed, 116 insertions, 2 deletions

diff --git a/dev-haskell/wxc/Manifest b/dev-haskell/wxc/Manifest
index 7185d0590ebd..0ad0029f9422 100644
--- a/dev-haskell/wxc/Manifest
+++ b/dev-haskell/wxc/Manifest
@@ -1,3 +1,7 @@
+AUX wxc-0.92.3.0-cabal-2.2.patch 1645 BLAKE2B 37ac4733ff8d98b02974561e6ac9ab2e6de618ea351ff8da345c6d4fe75024124f5018439b0b572ecefdbdade4ae7949c4ce272cbabd4b96b378db68dd913d10 SHA512 8c339132c304473393624c918147e048b25bdc1705aeb19b1d55d4fc3879d08827f80e600fa327795e993b47b37e2c74554028ee7f39f3936eef9103a403425f
+AUX wxc-0.92.3.0-cabal-3.patch 698 BLAKE2B d7a7aaa83842e1f18919281bad58f36936bc93dc6c7c3a4eeb660c14a9225b6186c65b14af147a01e8a013a09a213415a3d839b633056f1c429243cd22354d70 SHA512 a77e6e8bc655e2143bd73a534427d2df5bcd2bd0cad4982774ecaae2d4d939cafae55acdae9bc31a03b63c3706314ab78c53e81f13bc6d9894ad06a51c82aeb4
 DIST wxc-0.92.2.0.tar.gz 203065 BLAKE2B 3f873b3bbc50e5fa7690f2f05a25ab360260d90523dd0b9c016f5dfeea99e9a59fe4848de520d642d2cea52dbadfd69aa31671f521243240488d643d4554e880 SHA512 e6fba1be94978603965b8902fad9326772b5483d5df621d5245f1fae97d85bcb1aff4565f1e8396de23c854050151c5e009e34a1ea29c3037057599ac0412bcd
-EBUILD wxc-0.92.2.0.ebuild 1656 BLAKE2B e916682735e62ff4c97a748e3371fb37b493f9063d822818511de4e6f67f2ed8efb42d27ed7c11db720bda26acf91e9bc6bd5061591c8d2a247c67d98beff0c6 SHA512 c7aee8d1b3193e417bd2763e35f966f1dc56c269b5da625219b8e09028f2a51880cbeb0b61033bf4228fef2bddbee2f075f9ed114abfabedbd3f796d12c35364
+DIST wxc-0.92.3.0.tar.gz 203597 BLAKE2B e73745fe17747c1abb79cdb2e7ecadee1f286abd34d1ccfbc2bb53d729fbab4dc60ab054af07f75cae9aa67e83ae794ea23f3f00decd39f69b93a5a56726d9d2 SHA512 60f34e316a4dfa4951e18d99d24508d36806f8a9d0bf05485904b03622ebda138b7a93a7477a2a107007d40e8cadbe51200322507054f65bd0b720545b414b37
+EBUILD wxc-0.92.2.0.ebuild 1651 BLAKE2B 1aca20b46ae96e3010aece8e7e1801b7eae86b88565c52577560b7a8436aceaaf2e49d61cb19e7f5a80e15fc35c42c8d6cfa10a6c4c16640bff589402ee582ba SHA512 6af5d06b8730d63a323728fff3a0d5203df9fd9e31eb289b441ef075a121267978d121d12f8252e2ef438afd8948c8cf3aec7969a119afdf2a7e8c67e6d05bff
+EBUILD wxc-0.92.3.0.ebuild 1827 BLAKE2B f1bee4fae91786f64b21cfe9cb82ac54542103d88e7e436a38fdf44b38671318eaa6a776eb2abc84587c8f130a2da677dc874c46da7daf1c71293c677044115f SHA512 040787fcd5cbc26ed021c0c4e6e45ecde7dae4f39dd020820684a29ed0cdbf7fa47c5deff3c328110a90f3d5013dd0203f682f55f3978b3a4a9c771fe69cee90
 MISC metadata.xml 796 BLAKE2B 3cb8acb5020436e15b3310fb974d1707af624d9a01aa64d66550bd64d17906870aadd01ecaa90bfe04b02564db169688c2774bd62df48501544467461cb333b3 SHA512 47ffc15e1167354eebbbeecfe9557d01dc832a67c2b7d213528f8be73846dab272351670f5b45be9098713c4ec3106753d8fa1cffdbb2844d0a9d8cd3146cd94
diff --git a/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-2.2.patch b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-2.2.patch
new file mode 100644
index 000000000000..86d523b362f1
--- /dev/null
+++ b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-2.2.patch
@@ -0,0 +1,32 @@
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -22,2 +22,3 @@ import Distribution.Simple.Setup ( BuildFlags, ConfigFlags
+ import Distribution.Simple.Utils (installOrdinaryFile, rawSystemExitWithEnv, rawSystemStdInOut, die)

++import qualified Distribution.Simple.Utils as DSU

+ import Distribution.System (OS (..), Arch (..), buildOS, buildArch)

+@@ -81,3 +82,9 @@ rawShellSystemStdInOut :: Verbosity                     -- Verbosity level
+                        -> IO (String, String, ExitCode) -- (Command result, Errors, Command exit status)

++#if MIN_VERSION_Cabal(2,2,0)

++rawShellSystemStdInOut v f as = do
++  (~(DSU.IODataText so), se, c) <- rawSystemStdInOut v "sh" (f:as) Nothing Nothing Nothing DSU.IODataModeText

++  return (so, se, c)

++#else

+ rawShellSystemStdInOut v f as = rawSystemStdInOut v "sh" (f:as) Nothing Nothing Nothing False

++#endif

+ 

+@@ -438,3 +445,7 @@ deMsysPaths bi = do
+         let cor ph = do

++#if MIN_VERSION_Cabal(2,2,0)

++            (~(DSU.IODataText r), e, c) <- rawSystemStdInOut normal "sh" ["-c", "cd " ++ ph ++ "; pwd -W"] Nothing Nothing Nothing DSU.IODataModeText

++#else

+             (r, e, c ) <- rawSystemStdInOut normal "sh" ["-c", "cd " ++ ph ++ "; pwd -W"] Nothing Nothing Nothing False

++#endif

+             unless (c == ExitSuccess) (putStrLn ("Error: failed to convert MSYS path to native path \n" ++ e) >> exitFailure)

+@@ -504,3 +515,7 @@ sharedLibName ver basename =
+         where

++#if MIN_VERSION_Cabal(2,2,0)

++          full_ver = (concat . intersperse "." . map show . versionNumbers) ver

++#else

+           full_ver = (concat . intersperse "." . map show . versionBranch) ver

++#endif

+ 

diff --git a/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.patch b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.patch
new file mode 100644
index 000000000000..5d474098987d
--- /dev/null
+++ b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.patch
@@ -0,0 +1,12 @@
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -19,7 +19,8 @@ import Distribution.Simple.Setup ( BuildFlags, ConfigFlags
+                                  , InstallFlags, installVerbosity

+                                  , fromFlag, fromFlagOrDefault, copyDest

+                                  )

+-import Distribution.Simple.Utils (installOrdinaryFile, rawSystemExitWithEnv, rawSystemStdInOut, die)

++import Distribution.Simple.Utils (installOrdinaryFile, rawSystemExitWithEnv, rawSystemStdInOut)

++import System.Exit (die)

+ import qualified Distribution.Simple.Utils as DSU

+ import Distribution.System (OS (..), Arch (..), buildOS, buildArch)

+ import Distribution.Verbosity (Verbosity, normal, verbose)

diff --git a/dev-haskell/wxc/wxc-0.92.2.0.ebuild b/dev-haskell/wxc/wxc-0.92.2.0.ebuild
index 1c87241a3e7e..0e5e4f13e994 100644
--- a/dev-haskell/wxc/wxc-0.92.2.0.ebuild
+++ b/dev-haskell/wxc/wxc-0.92.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="wxWinLL-3.1"
 SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">dev-haskell/split-0:=[profile?]
diff --git a/dev-haskell/wxc/wxc-0.92.3.0.ebuild b/dev-haskell/wxc/wxc-0.92.3.0.ebuild
new file mode 100644
index 000000000000..a704fc0cd19e
--- /dev/null
+++ b/dev-haskell/wxc/wxc-0.92.3.0.ebuild
@@ -0,0 +1,66 @@
+# 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" # ho docs as it has no haskell files
+inherit haskell-cabal multilib versionator wxwidgets
+
+DESCRIPTION="wxHaskell C++ wrapper"
+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/split-0:=[profile?]
+	>=dev-haskell/wxdirect-0.90.1.1:${WX_GTK_VER}=[profile?]
+	x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer?,opengl]
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.23
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.92.3.0-cabal-2.2.patch
+	"${FILESDIR}"/${PN}-0.92.3.0-cabal-3.patch
+)
+
+src_prepare() {
+	default
+
+	setup-wxwidgets
+
+	sed -e "s@\"wx-config\"@\"${WX_CONFIG}\"@g" \
+		-i "${S}/Setup.hs" || die "Could not specify wx-config in Setup.hs"
+}
+
+src_configure() {
+	local cgcc=()
+	for i in ${CXXFLAGS}
+	do
+		cgcc+=( --gcc-option="${i}" )
+	done
+	# Trying to specify the LDFLAGS in --ld-option does not work, as ld does
+	# not understand ld options prefixed with -Wl,
+	# The linker that is used to link the libwxc.so shared library is hard coded
+	# in Setup.hs.  So the --with-ld would not change the linker used when
+	# linking libwxc.so.  --with-ld="gcc" does not help, as then cabal passes
+	# ld options like -x to gcc which then returns a non-zero exit status, then
+	# cabal ignores all the --ld-option parameters.
+	# So I place all the LDFLAGS in --gcc-option parameters. They are ignored
+	# when building .o files.
+	local cld=()
+	for i in ${LDFLAGS}
+	do
+		cld+=( --gcc-option="${i}" )
+	done
+	cabal_src_configure ${cgcc[*]} ${cld[*]} --verbose=3
+}