diff options
Diffstat (limited to 'dev-haskell/wxc')
-rw-r--r-- | dev-haskell/wxc/Manifest | 6 | ||||
-rw-r--r-- | dev-haskell/wxc/files/wxc-0.92.3.0-cabal-2.2.patch | 32 | ||||
-rw-r--r-- | dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch | 27 | ||||
-rw-r--r-- | dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.patch | 12 | ||||
-rw-r--r-- | dev-haskell/wxc/metadata.xml | 18 | ||||
-rw-r--r-- | dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild | 68 |
6 files changed, 0 insertions, 163 deletions
diff --git a/dev-haskell/wxc/Manifest b/dev-haskell/wxc/Manifest deleted file mode 100644 index 7ad72aa4ed17..000000000000 --- a/dev-haskell/wxc/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -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-r1.ebuild 1889 BLAKE2B fc69f48aac388ab3d814a337cbe0893629fd7f95ec3e9b4457566be45fd4b61f4f1e49b9ecc985f2ac3cf6638dc903a300e1e83f7e67e8ea1a996d02f9a266be SHA512 b95bee39390202b0b9d72518892b2747a37852258294cc0c140b42568a0c14b8920345c59ed4e1c3d404dc76cbdaa1c8b7ac8bc7a77d9bf35701d37a4b6b92b6 -MISC metadata.xml 797 BLAKE2B 79cfe54e40d843399e399468ce939bb3788304158c9ca4eea7bff3908dee14c80e5921eca87bcdd38b72d5458efe984ee0fd2e55641a65edca67dd44045acec5 SHA512 5ddbe8bd2a78c7a59c489cb82a0614806ed133cca840e83681d5f0089f9c340aff4916355b11d6cb0afd0963be7fe60cc5870182edc4be7aba6cedceb59b12d9 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 deleted file mode 100644 index 86d523b362f1..000000000000 --- a/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-2.2.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- 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.2.patch b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch deleted file mode 100644 index 096e971de4b7..000000000000 --- a/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- 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/files/wxc-0.92.3.0-cabal-3.patch b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.patch deleted file mode 100644 index 5d474098987d..000000000000 --- a/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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/metadata.xml b/dev-haskell/wxc/metadata.xml deleted file mode 100644 index d1c7487009d9..000000000000 --- a/dev-haskell/wxc/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>haskell@gentoo.org</email> - <name>Gentoo Haskell</name> - </maintainer> - <longdescription> - wxHaskell is a portable and native GUI library for Haskell. It is - built on top of wxWidgets, a comprehensive C++ library that is - portable across all major GUI platforms, including GTK, Windows, - X11, and MacOS X. This version works with wxWidgets 2.9 only. - Distributed under the WXWINDOWS LIBRARY LICENSE. Please see - LICENSE file, but note that this is essentially LGPL with an - exception allowing binary distribution of proprietary software. - This is the same license as wxWidgets itself uses. - </longdescription> -</pkgmetadata> diff --git a/dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild b/dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild deleted file mode 100644 index d9c666dfccae..000000000000 --- a/dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# 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 -} |