From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- dev-haskell/wxc/Manifest | 3 +- dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch | 27 +++++++++ dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild | 68 ++++++++++++++++++++++ dev-haskell/wxc/wxc-0.92.3.0.ebuild | 66 --------------------- 4 files changed, 97 insertions(+), 67 deletions(-) create mode 100644 dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch create mode 100644 dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild delete mode 100644 dev-haskell/wxc/wxc-0.92.3.0.ebuild (limited to 'dev-haskell/wxc') diff --git a/dev-haskell/wxc/Manifest b/dev-haskell/wxc/Manifest index 856b48c84c26..962451dec997 100644 --- a/dev-haskell/wxc/Manifest +++ b/dev-haskell/wxc/Manifest @@ -1,5 +1,6 @@ AUX wxc-0.92.3.0-cabal-2.2.patch 1645 BLAKE2B 37ac4733ff8d98b02974561e6ac9ab2e6de618ea351ff8da345c6d4fe75024124f5018439b0b572ecefdbdade4ae7949c4ce272cbabd4b96b378db68dd913d10 SHA512 8c339132c304473393624c918147e048b25bdc1705aeb19b1d55d4fc3879d08827f80e600fa327795e993b47b37e2c74554028ee7f39f3936eef9103a403425f +AUX wxc-0.92.3.0-cabal-3.2.patch 1410 BLAKE2B 46c4b3a44a762cfbf8e3b975ff82fea3c5bb0d4d6d38b9374d8bfd6f2027b8a1854a081b74864034049c5ef55a85a6c27de53fbbfcb404546eaa17f4769fc5cd SHA512 ba3f2d2c9017ac36435145c20e54fa6b357d734127123512291ce0829dcabcbbf812109cb697629c460318fa20bc5b7efef153a4152b144189eb70177f01e8de AUX wxc-0.92.3.0-cabal-3.patch 698 BLAKE2B d7a7aaa83842e1f18919281bad58f36936bc93dc6c7c3a4eeb660c14a9225b6186c65b14af147a01e8a013a09a213415a3d839b633056f1c429243cd22354d70 SHA512 a77e6e8bc655e2143bd73a534427d2df5bcd2bd0cad4982774ecaae2d4d939cafae55acdae9bc31a03b63c3706314ab78c53e81f13bc6d9894ad06a51c82aeb4 DIST wxc-0.92.3.0.tar.gz 203597 BLAKE2B e73745fe17747c1abb79cdb2e7ecadee1f286abd34d1ccfbc2bb53d729fbab4dc60ab054af07f75cae9aa67e83ae794ea23f3f00decd39f69b93a5a56726d9d2 SHA512 60f34e316a4dfa4951e18d99d24508d36806f8a9d0bf05485904b03622ebda138b7a93a7477a2a107007d40e8cadbe51200322507054f65bd0b720545b414b37 -EBUILD wxc-0.92.3.0.ebuild 1827 BLAKE2B f1bee4fae91786f64b21cfe9cb82ac54542103d88e7e436a38fdf44b38671318eaa6a776eb2abc84587c8f130a2da677dc874c46da7daf1c71293c677044115f SHA512 040787fcd5cbc26ed021c0c4e6e45ecde7dae4f39dd020820684a29ed0cdbf7fa47c5deff3c328110a90f3d5013dd0203f682f55f3978b3a4a9c771fe69cee90 +EBUILD wxc-0.92.3.0-r1.ebuild 1889 BLAKE2B fc69f48aac388ab3d814a337cbe0893629fd7f95ec3e9b4457566be45fd4b61f4f1e49b9ecc985f2ac3cf6638dc903a300e1e83f7e67e8ea1a996d02f9a266be SHA512 b95bee39390202b0b9d72518892b2747a37852258294cc0c140b42568a0c14b8920345c59ed4e1c3d404dc76cbdaa1c8b7ac8bc7a77d9bf35701d37a4b6b92b6 MISC metadata.xml 796 BLAKE2B 3cb8acb5020436e15b3310fb974d1707af624d9a01aa64d66550bd64d17906870aadd01ecaa90bfe04b02564db169688c2774bd62df48501544467461cb333b3 SHA512 47ffc15e1167354eebbbeecfe9557d01dc832a67c2b7d213528f8be73846dab272351670f5b45be9098713c4ec3106753d8fa1cffdbb2844d0a9d8cd3146cd94 diff --git a/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch new file mode 100644 index 000000000000..096e971de4b7 --- /dev/null +++ b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch @@ -0,0 +1,27 @@ +--- a/Setup.hs ++++ b/Setup.hs +@@ -81,7 +81,12 @@ rawShellSystemStdInOut :: Verbosity -- Verbosity level + -> FilePath -- Path to command + -> [String] -- Command arguments + -> IO (String, String, ExitCode) -- (Command result, Errors, Command exit status) +-#if MIN_VERSION_Cabal(2,2,0) ++ ++#if MIN_VERSION_Cabal(3,2,0) ++rawShellSystemStdInOut v f as = do ++ (so, se, c) <- rawSystemStdInOut v "sh" (f:as) Nothing Nothing Nothing DSU.IODataModeText ++ return (so, se, c) ++#elif 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) +@@ -444,7 +449,9 @@ deMsysPaths bi = do + if b + then do + let cor ph = do +-#if MIN_VERSION_Cabal(2,2,0) ++#if MIN_VERSION_Cabal(3,2,0) ++ (r, e, c) <- rawSystemStdInOut normal "sh" ["-c", "cd " ++ ph ++ "; pwd -W"] Nothing Nothing Nothing DSU.IODataModeText ++#elif 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 diff --git a/dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild b/dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild new file mode 100644 index 000000000000..d9c666dfccae --- /dev/null +++ b/dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.5.3.9999 + +WX_GTK_VER="3.0-gtk3" + +CABAL_FEATURES="lib profile" # ho docs as it has no haskell files +inherit haskell-cabal multilib 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:= + !!dev-haskell/wxc:3.0 +" +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 + "${FILESDIR}"/${PN}-0.92.3.0-cabal-3.2.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 +} diff --git a/dev-haskell/wxc/wxc-0.92.3.0.ebuild b/dev-haskell/wxc/wxc-0.92.3.0.ebuild deleted file mode 100644 index a704fc0cd19e..000000000000 --- a/dev-haskell/wxc/wxc-0.92.3.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# 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 -} -- cgit v1.2.3