From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-haskell/glade/Manifest | 8 + dev-haskell/glade/files/Setup.hs | 8 + .../glade/files/glade-0.12.5.0-ghc-7.10.patch | 182 +++++++++++++++++++++ dev-haskell/glade/glade-0.12.5.0-r100.ebuild | 42 +++++ dev-haskell/glade/glade-0.12.5.0-r2.ebuild | 37 +++++ dev-haskell/glade/metadata.xml | 17 ++ 6 files changed, 294 insertions(+) create mode 100644 dev-haskell/glade/Manifest create mode 100644 dev-haskell/glade/files/Setup.hs create mode 100644 dev-haskell/glade/files/glade-0.12.5.0-ghc-7.10.patch create mode 100644 dev-haskell/glade/glade-0.12.5.0-r100.ebuild create mode 100644 dev-haskell/glade/glade-0.12.5.0-r2.ebuild create mode 100644 dev-haskell/glade/metadata.xml (limited to 'dev-haskell/glade') diff --git a/dev-haskell/glade/Manifest b/dev-haskell/glade/Manifest new file mode 100644 index 000000000000..c00b0c64650b --- /dev/null +++ b/dev-haskell/glade/Manifest @@ -0,0 +1,8 @@ +AUX Setup.hs 259 SHA256 dd3c14b6ebed555bb14b655beb029ec77ff30e7602a41e88798662b18d9dc880 SHA512 62ad31d073a26c0465f82fdf521151aa622fc4eb0539f765536b4bccbbfbd30166b019fa9012412b025ee2ea1d9244614e4ad8d6941bfe63f4354cf333269993 WHIRLPOOL 94160200a3f7a525e52284466455c858406c002cd0ee492e549d5852062492ea1829f5f58e3caeca42f3878522668ac0bbd8ab9f698f9747bd61848b40e6666f +AUX glade-0.12.5.0-ghc-7.10.patch 8817 SHA256 5de0a5f1832aea1467a295f948e23bbe6070fb2c9ba8f28602e0ce97e98c5382 SHA512 dfc6ab3e97b2ec281c66454bac20ab64ac96c567c9bdeac849471b03b9b1fd18940389023ad19f2bdc0c2e1d78af1de0eecdea0aa006167c94890c407a5f8e1f WHIRLPOOL 5696d0c931e3bbaa2a684ced9ef912dc9a8bfe39caeb7139e27a642be203b2f0487b70a6464c1f3777805169a0653cb3306290122f2b29e92cc2e91e27a6463f +DIST glade-0.12.5.0.tar.gz 152942 SHA256 79eea09019429ba552b49ae11cf287577937234bd54713aa82ecf3968b3f7435 SHA512 5ea6ac03e919b881b53649c340d23eacc4c7e7055d9425b581c38bbc08192ad65e009b9bf03e9f224cee69ee2301354b2e42f4c7c845349b2b34fcdf8994c865 WHIRLPOOL 0d3e313d7a9f9c079e3a47fb2995dc70163a31fe6ae26d99e9c637e5b9e6512c49d0e27ebd26492117f01cddf3b22b89cea9f837028171da050c1766a1a279da +EBUILD glade-0.12.5.0-r100.ebuild 1034 SHA256 943404e4d9fff142014f175a13a9f106ec169027b793ac7c45731c5710d04ba7 SHA512 2136b0a40af4d8b6e94b33e630a3c517305332b73bf68c8f8bd0b902a3259ff1bcb3db386e9f0cd1577c188c5d298ba1ad68797a5d7750ba172ca70edb84fb3a WHIRLPOOL 39a6bbd897f72fe7b44c48b45114323c0cfbb832d3e48e354e3c971e04cd159c1dd4ed04e737205279518a3452c0bc2b1a4b951a4994990cec778fe69fd0130f +EBUILD glade-0.12.5.0-r2.ebuild 1052 SHA256 f2bccc05a84fdca63f1d4caeb818275ec6af4a9ad612ff4b52cee7e704bb6593 SHA512 e73dfebfe2a43c600fdc1265f81ef521eacbed2115c656917840521e592141f983d09c9db1b02ed202696e05383c03c62c46625a373a53b7f1102c9287224826 WHIRLPOOL 13bd308dce0ff8bb6bbea0827f06bafd54dbd3323dde2feb8782070e5ea2a21eaadf93bf1735b3837120f7b28b6cad654663155faa5a3fd401bd7365ac1bca87 +MISC ChangeLog 3205 SHA256 ff7aacd9e8cac2c5043288891a1091e0f7fe00ad68d80c591b66e353a6c67f1b SHA512 f736c73eb070baf256013211f59730d36650721763f0f849d2c5020525d27453851d34f9e29ffe299a6086ebf2f235ed1218ade979d3adab2d5d156d2d65c235 WHIRLPOOL 00c8cedd44091c9876a9c22052e8e7361f2ef040d2d41b76b127b82b6d905e2a535ff926b77be00ab07ea9a5b738a5d5157968226fcc86cfcff90c4a7edd6db8 +MISC ChangeLog-2015 2570 SHA256 1758fef818c67b7c0ebddd2ae60db3ae1a39e54f7134c8b2f204945f5924cabc SHA512 ffc65113cda1a6af6adbd2032e6dba9cd36895acace403296e9bd929ddd3d77ca2ffe1bd96f1134eec2b1e3fc44b4c67516b93633dbe4eb39762cde5d7f513d1 WHIRLPOOL a2706b52e9b4096b8a4e3c35e2cf874fb195043f22acc74d461cb117eaf74a97662c9aeb395e5e05af0eb8ff29b700b1bdcd1f173911a05beb78d8d5072ef222 +MISC metadata.xml 597 SHA256 6d45566721dad7223e61c6b08a35c9c5e11ac645499a6aee09d1bc6ee3812878 SHA512 949a3f88b0af3944a268f389e7cfb202f4bb7ccb725c52c28bd127814b853f34cc201c1a9859d97804cf1eb911a5aaa70f7a0415680476343bf0bcb5fa12e63c WHIRLPOOL ac3a6d367ac5b2b8e5d794e434fa66cf70745c7b69d7fa3039c7ce49ab5ad608c76aa8cb30a2a9679192828d72702eaf45aa92ebdb62baa053f6eacd2a1e169a diff --git a/dev-haskell/glade/files/Setup.hs b/dev-haskell/glade/files/Setup.hs new file mode 100644 index 000000000000..5fbe833309e9 --- /dev/null +++ b/dev-haskell/glade/files/Setup.hs @@ -0,0 +1,8 @@ +-- Adjustments specific to this package, +-- all Gtk2Hs-specific boilerplate is kept in +-- gtk2hs-buildtools:Gtk2HsSetup +-- +import Gtk2HsSetup ( gtk2hsUserHooks ) +import Distribution.Simple ( defaultMainWithHooks ) + +main = defaultMainWithHooks gtk2hsUserHooks diff --git a/dev-haskell/glade/files/glade-0.12.5.0-ghc-7.10.patch b/dev-haskell/glade/files/glade-0.12.5.0-ghc-7.10.patch new file mode 100644 index 000000000000..3e5d673661d3 --- /dev/null +++ b/dev-haskell/glade/files/glade-0.12.5.0-ghc-7.10.patch @@ -0,0 +1,182 @@ +diff --git a/Gtk2HsSetup.hs b/Gtk2HsSetup.hs +index 371090a..8c60eec 100644 +--- a/Gtk2HsSetup.hs ++++ b/Gtk2HsSetup.hs +@@ -8,5 +8,5 @@ + -- +-module Gtk2HsSetup ( +- gtk2hsUserHooks, +- getPkgConfigPackages, ++module Gtk2HsSetup ( ++ gtk2hsUserHooks, ++ getPkgConfigPackages, + checkGtk2hsBuildtools, +@@ -57,4 +57,5 @@ import Distribution.Verbosity + import Control.Monad (when, unless, filterM, liftM, forM, forM_) +-import Data.Maybe ( isJust, isNothing, fromMaybe, maybeToList ) +-import Data.List (isPrefixOf, isSuffixOf, stripPrefix, nub) ++import Data.Maybe ( isJust, isNothing, fromMaybe, maybeToList, catMaybes ) ++import Data.List (isPrefixOf, isSuffixOf, nub, minimumBy, stripPrefix, tails ) ++import Data.Ord as Ord (comparing) + import Data.Char (isAlpha, isNumber) +@@ -115,5 +116,12 @@ fixLibs dlls = concatMap $ \ lib -> + case filter (isLib lib) dlls of +- dll:_ -> [dropExtension dll] +- _ -> if lib == "z" then [] else [lib] ++ dlls@(_:_) -> [dropExtension (pickDll dlls)] ++ _ -> if lib == "z" then [] else [lib] + where ++ -- If there are several .dll files matching the one we're after then we ++ -- just have to guess. For example for recent Windows cairo builds we get ++ -- libcairo-2.dll libcairo-gobject-2.dll libcairo-script-interpreter-2.dll ++ -- Our heuristic is to pick the one with the shortest name. ++ -- Yes this is a hack but the proper solution is hard: we would need to ++ -- parse the .a file and see which .dll file(s) it needed to link to. ++ pickDll = minimumBy (Ord.comparing length) + isLib lib dll = +@@ -123,3 +131,3 @@ fixLibs dlls = concatMap $ \ lib -> + _ -> False +- ++ + -- The following code is a big copy-and-paste job from the sources of +@@ -156,8 +164,12 @@ register :: PackageDescription -> LocalBuildInfo + -> IO () +-register pkg@(library -> Just lib ) +- lbi@(libraryConfig -> Just clbi) regFlags ++register pkg@PackageDescription { library = Just lib } lbi regFlags + = do ++ let clbi = LBI.getComponentLocalBuildInfo lbi LBI.CLibName + + installedPkgInfoRaw <- generateRegistrationInfo ++#if CABAL_VERSION_CHECK(1,22,0) ++ verbosity pkg lib lbi clbi inplace False distPref packageDb ++#else + verbosity pkg lib lbi clbi inplace distPref ++#endif + +@@ -170,3 +182,3 @@ register pkg@(library -> Just lib ) + case () of +- _ | modeGenerateRegFile -> die "Generate Reg File not supported" ++ _ | modeGenerateRegFile -> writeRegistrationFile installedPkgInfo + | modeGenerateRegScript -> die "Generate Reg Script not supported" +@@ -182,2 +194,4 @@ register pkg@(library -> Just lib ) + modeGenerateRegFile = isJust (flagToMaybe (regGenPkgConf regFlags)) ++ regFile = fromMaybe (display (packageId pkg) <.> "conf") ++ (fromFlag (regGenPkgConf regFlags)) + modeGenerateRegScript = fromFlag (regGenScript regFlags) +@@ -190,2 +204,6 @@ register pkg@(library -> Just lib ) + ++ writeRegistrationFile installedPkgInfo = do ++ notice verbosity ("Creating package registration file: " ++ regFile) ++ writeUTF8File regFile (showInstalledPackageInfo installedPkgInfo) ++ + register _ _ regFlags = notice verbosity "No package to register" +@@ -249,3 +267,3 @@ getCppOptions bi lbi + ++ [opt | opt@('-':c:_) <- PD.cppOptions bi ++ PD.ccOptions bi, c `elem` "DIU"] +- ++ ["-D__GLASGOW_HASKELL__="++show (ghcDefine . versionBranch . compilerVersion $ LBI.compiler lbi)] ++ ++ ["-D__GLASGOW_HASKELL__="++show (ghcDefine . ghcVersion . compilerId $ LBI.compiler lbi)] + where +@@ -254,2 +272,15 @@ getCppOptions bi lbi + ++ ghcVersion :: CompilerId -> [Int] ++-- This version is nicer, but we need to know the Cabal version that includes the new CompilerId ++-- #if CABAL_VERSION_CHECK(1,19,2) ++-- ghcVersion (CompilerId GHC v _) = versionBranch v ++-- ghcVersion (CompilerId _ _ (Just c)) = ghcVersion c ++-- #else ++-- ghcVersion (CompilerId GHC v) = versionBranch v ++-- #endif ++-- ghcVersion _ = [] ++-- This version should work fine for now ++ ghcVersion = concat . take 1 . map (read . (++"]") . takeWhile (/=']')) . catMaybes ++ . map (stripPrefix "CompilerId GHC (Version {versionBranch = ") . tails . show ++ + installCHI :: PackageDescription -- ^information from the .cabal file +@@ -264,3 +295,3 @@ installCHI pkg@PD.PackageDescription { library = Just lib } lbi verbosity copyde + (PD.libModules lib) +- ++ + let files = [ f | Just f <- mFiles ] +@@ -268,3 +299,3 @@ installCHI pkg@PD.PackageDescription { library = Just lib } lbi verbosity copyde + +- ++ + installCHI _ _ _ _ = return () +@@ -294,3 +325,2 @@ genSynthezisedFiles :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO ( + genSynthezisedFiles verb pd lbi = do +- + cPkgs <- getPkgConfigPackages verb lbi pd +@@ -300,3 +330,3 @@ genSynthezisedFiles verb pd lbi = do + typeOpts :: String -> [ProgArg] +- typeOpts tag = concat [ map (\val -> '-':'-':drop (length tag) field++'=':val) (words content) ++ typeOpts tag = concat [ map (\val -> '-':'-':drop (length tag) field ++ '=':val) (words content) + | (field,content) <- xList, +@@ -308,4 +338,5 @@ genSynthezisedFiles verb pd lbi = do + , tag <- name' +- : [ name' ++ "-" ++ show major ++ "." ++ show digit +- | digit <- [0,2..minor] ] ++ :[ name' ++ "-" ++ show maj ++ "." ++ show d2 ++ | (maj, d2) <- [(maj, d2) | maj <- [0..(major-1)], d2 <- [0,2..20]] ++ ++ [(major, d2) | d2 <- [0,2..minor]] ] + ] +@@ -400,11 +431,6 @@ fixDeps pd@PD.PackageDescription { + modDeps <- mapM extractDeps modDeps +- let (expMods, othMods) = span mdExposed $ sortTopological modDeps +- badOther = map (fromMaybe "" . mdLocation) $ +- filter (not . mdExposed) expMods +- unless (null badOther) $ +- die ("internal chs modules "++intercalate "," badOther++ +- " depend on exposed chs modules; cabal needs to build internal modules first") ++ let (othMods, expMods) = span (not . mdExposed) $ reverse $ sortTopological modDeps + return pd { PD.library = Just lib { +- PD.exposedModules = map mdOriginal expMods, +- PD.libBuildInfo = bi { PD.otherModules = map mdOriginal othMods } ++ PD.exposedModules = map mdOriginal (reverse expMods), ++ PD.libBuildInfo = bi { PD.otherModules = map mdOriginal (reverse othMods) } + }} +@@ -428,3 +454,3 @@ instance Ord ModDep where + -- ignores CPP conditionals. We just require everything which means that the +--- existance of a .chs module may not depend on some CPP condition. ++-- existance of a .chs module may not depend on some CPP condition. + extractDeps :: ModDep -> IO ModDep +@@ -435,3 +461,3 @@ extractDeps md@ModDep { mdLocation = Just f } = withUTF8FileContents f $ \con -> + case simpleParse (takeWhile ('#' /=) ys) of +- Just m -> findImports (m:acc) xxs ++ Just m -> findImports (m:acc) xxs + Nothing -> die ("cannot parse chs import in "++f++":\n"++ +@@ -469,3 +495,3 @@ checkGtk2hsBuildtools programs = do + let printError name = do +- putStrLn $ "Cannot find " ++ name ++ "\n" ++ putStrLn $ "Cannot find " ++ name ++ "\n" + ++ "Please install `gtk2hs-buildtools` first and check that the install directory is in your PATH (e.g. HOME/.cabal/bin)." +@@ -473,2 +499,2 @@ checkGtk2hsBuildtools programs = do + forM_ programInfos $ \ (name, location) -> +- when (isNothing location) (printError name) ++ when (isNothing location) (printError name) +diff --git a/SetupMain.hs b/SetupMain.hs +index 201ee8f..2d1a782 100644 +--- a/SetupMain.hs ++++ b/SetupMain.hs +@@ -12,2 +12,2 @@ main = do + defaultMainWithHooks gtk2hsUserHooks +- ++ +diff --git a/SetupWrapper.hs b/SetupWrapper.hs +index aa825ec..44a20f8 100644 +--- a/SetupWrapper.hs ++++ b/SetupWrapper.hs +@@ -11,3 +11,3 @@ import Distribution.Simple.Compiler + import Distribution.Simple.BuildPaths (exeExtension) +-import Distribution.Simple.Configure (configCompiler) ++import Distribution.Simple.Configure (configCompilerEx) + import Distribution.Simple.GHC (getInstalledPackages) +@@ -20,3 +20,3 @@ import System.Environment + import System.Process +-import System.Exit ++import System.Exit (ExitCode(..), exitWith) + import System.FilePath +@@ -117,3 +117,3 @@ setupWrapper setupHsFile = do + +- (comp, conf) <- configCompiler (Just GHC) Nothing Nothing ++ (comp, _, conf) <- configCompilerEx (Just GHC) Nothing Nothing + defaultProgramConfiguration verbosity diff --git a/dev-haskell/glade/glade-0.12.5.0-r100.ebuild b/dev-haskell/glade/glade-0.12.5.0-r100.ebuild new file mode 100644 index 000000000000..9ce6673eca8e --- /dev/null +++ b/dev-haskell/glade/glade-0.12.5.0-r100.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +# ebuild generated by hackport 0.3.5.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +inherit haskell-cabal + +DESCRIPTION="Binding to the glade library" +HOMEPAGE="http://projects.haskell.org/gtk2hs/" +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="2/${PV}" +KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86" +IUSE="" + +RDEPEND=">=dev-haskell/glib-0.12.5.0:0=[profile?] + >=dev-haskell/gtk-0.12.5.0:2=[profile?] + >=dev-lang/ghc-6.10.4:= + gnome-base/libglade:2.0 +" +DEPEND="${RDEPEND} + >=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0= + >=dev-haskell/cabal-1.24 + virtual/pkgconfig +" + +src_prepare() { + epatch "${FILESDIR}"/${P}-ghc-7.10.patch + + # update to latest gtk2hs-buildtools + rm Setup.hs || die + rm Gtk2HsSetup.hs || die + cp "${FILESDIR}"/Setup.hs ./ || die + + cabal_chdeps \ + 'glib >= 0.12.5.0 && < 0.13' 'glib >= 0.12.5.0' \ + 'gtk >= 0.12.5.0 && < 0.13' 'gtk >= 0.12.5.0' +} diff --git a/dev-haskell/glade/glade-0.12.5.0-r2.ebuild b/dev-haskell/glade/glade-0.12.5.0-r2.ebuild new file mode 100644 index 000000000000..c82ce4d22572 --- /dev/null +++ b/dev-haskell/glade/glade-0.12.5.0-r2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +# ebuild generated by hackport 0.3.5.9999 + +#nocabaldep is for the fancy cabal-detection feature at build-time +CABAL_FEATURES="lib profile haddock hoogle hscolour nocabaldep" +inherit haskell-cabal + +DESCRIPTION="Binding to the glade library" +HOMEPAGE="http://projects.haskell.org/gtk2hs/" +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="2/${PV}" +KEYWORDS="amd64 ppc ppc64 sparc x86" +IUSE="" + +RDEPEND=">=dev-haskell/glib-0.12.5.0:0=[profile?] =dev-haskell/gtk-0.12.5.0:2=[profile?] =dev-lang/ghc-6.10.4:= + gnome-base/libglade:2.0 +" +DEPEND="${RDEPEND} + >=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0= + virtual/pkgconfig +" + +src_prepare() { + epatch "${FILESDIR}"/${P}-ghc-7.10.patch + + cabal_chdeps \ + 'glib >= 0.12.5.0 && < 0.13' 'glib >= 0.12.5.0 && < 0.14' \ + 'gtk >= 0.12.5.0 && < 0.13' 'gtk >= 0.12.5.0 && < 0.14' +} diff --git a/dev-haskell/glade/metadata.xml b/dev-haskell/glade/metadata.xml new file mode 100644 index 000000000000..2ba679a49549 --- /dev/null +++ b/dev-haskell/glade/metadata.xml @@ -0,0 +1,17 @@ + + + + + haskell@gentoo.org + Gentoo Haskell + + + This library allows to load externally stored user interfaces into + programs. This allows alteration of the interface without recompilation + of the program. + + Note that this functionality is now provided in gtk directly + (as of version 2.12 of the gtk+ C lib) by the + Graphics.UI.Gtk.Builder module. + + -- cgit v1.2.3