From: Tomas Chvatal Date: Sat, 17 Sep 2011 04:23:40 +0000 (+0000) Subject: Remove, use split modules instead. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f6d95010521d6b0283fed477659f05d35d88dfaf;p=gentoo.git Remove, use split modules instead. --- diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog deleted file mode 100644 index 44e55f056495..000000000000 --- a/dev-haskell/gtk2hs/ChangeLog +++ /dev/null @@ -1,237 +0,0 @@ -# ChangeLog for dev-haskell/gtk2hs -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.57 2011/03/21 22:53:32 nirbheek Exp $ - - 21 Mar 2011; Nirbheek Chauhan - gtk2hs-0.9.12.1.ebuild, gtk2hs-0.10.1.ebuild: - Fix slot-deps on gnome libs - - 13 Jul 2010; Sergei Trofimovich gtk2hs-0.10.1.ebuild: - Fixed build failure against ghc-6.12.2+ (bug #327903). Thanks to Renato - Gallo and Diego E. 'Flameeyes' Pettenò - for the report. Thanks to Ivan Lazar Miljenovic - for the fix. - - 28 Jun 2010; Samuli Suominen - gtk2hs-0.9.12.1.ebuild, gtk2hs-0.10.1.ebuild: - Remove support for vulnerable seamonkey (#305789) and xulrunner (#324953). - - 27 Mar 2010; Lennart Kolmodin gtk2hs-0.10.1.ebuild, - +files/gtk2hs-0.10.1-ghc-6.12-c2hs.patch, - +files/gtk2hs-0.10.1-ghc-6.12-packages.patch: - Fix compilation issues when using GHC 6.12.1, patch from upstream. - Remove the seamonkey USE flag, see bug #300422. - If gtk2hs is emerged with doc flag, then mtl need it too. - Add ~ppc64 keyword, tested by Sergei Trofimovich. - Work done by Sergei Trofimovich . - -*gtk2hs-0.10.1 (30 Aug 2009) - - 30 Aug 2009; Lennart Kolmodin +gtk2hs-0.10.1.ebuild: - Version bump. Supports ghc 6.10. - - 07 Apr 2009; Christian Faulhammer gtk2hs-0.9.11.ebuild, - gtk2hs-0.9.12.ebuild, gtk2hs-0.9.12.1.ebuild: - disable Firefox support the hard way and make seamonkey not depend on - USE=xulrunner - - 03 Apr 2009; Christian Faulhammer gtk2hs-0.9.11.ebuild, - gtk2hs-0.9.12.ebuild, gtk2hs-0.9.12.1.ebuild: - completely drop support for Firefox as it depends on version 2 - - 10 Feb 2009; Lennart Kolmodin - +files/gtk2hs-0.9.12.1-librsvg-2.22.3.patch, gtk2hs-0.9.12.1.ebuild: - Support >=gnome-base/librsvg-2.22.3 with its slightly changed API. - Patch from upstream, unconditionally patching, see bug #240704. - Reported by Paulo Jorge de Oliveira Cantante de Matos , - handled by Sebastian Magrí . - - 05 Aug 2008; Ulrich Mueller metadata.xml: - Add USE flag description to metadata wrt GLEP 56. - - 16 Jul 2008; Raúl Porcel gtk2hs-0.9.11.ebuild, - gtk2hs-0.9.12.ebuild, gtk2hs-0.9.12.1.ebuild: - Fix mozilla deps again, bug #230670 - - 28 May 2008; Christian Heim metadata.xml: - Removing Duncan Coutts (dcoutts) from metadata.xml (as per #85695). - - 04 May 2008; Lennart Kolmodin - -files/gtk2hs-0.9.10-cflags.patch, -files/gtk2hs-0.9.10-ghc622.patch, - -files/gtk2hs-0.9.10-store.patch, gtk2hs-0.9.12.ebuild: - Remove unused patches, and fix a ebuild.minorsyn. - - 04 May 2008; Lennart Kolmodin - gtk2hs-0.9.12.1.ebuild: - Add Duncan Coutts' fix when using haddock 0.9. - This should close bug #220185. - - 17 Mar 2008; Raúl Porcel gtk2hs-0.9.11.ebuild, - gtk2hs-0.9.12.ebuild, gtk2hs-0.9.12.1.ebuild: - Fix deps for net-libs/xulrunner and www-client/mozilla-firefox - - 26 Jan 2008; Duncan Coutts -gtk2hs-0.9.10-r1.ebuild, - gtk2hs-0.9.12.1.ebuild: - Remove old version fixing bug #207435. Also add dev-util/pkgconfig dep, - fixing bug #206023. - - 20 Jan 2008; Christoph Mende gtk2hs-0.9.12.1.ebuild: - Stable on amd64 wrt bug #205272 - - 12 Jan 2008; Markus Meier gtk2hs-0.9.12.1.ebuild: - x86 stable, bug #205357 - - 12 Dec 2007; Duncan Coutts gtk2hs-0.9.11.ebuild, - gtk2hs-0.9.12.ebuild, gtk2hs-0.9.12.1.ebuild: - Does not work with gtksourceview 2.x. Fixes bug #201210. - -*gtk2hs-0.9.12.1 (10 Nov 2007) - - 10 Nov 2007; Luis F. Araujo +gtk2hs-0.9.12.1.ebuild: - Adding new version - - 09 Nov 2007; Luis F. Araujo gtk2hs-0.9.12.ebuild: - Adding missing backslash to fix package registration - - 31 Oct 2007; Duncan Coutts gtk2hs-0.9.10-r1.ebuild: - Drop virtual/ghc in favour of dev-lang/ghc - - 29 Oct 2007; Luis F. Araujo gtk2hs-0.9.12.ebuild: - Fix for recent glib that changes the type of the gtype typedef - - 12 Oct 2007; Rémi Cardona gtk2hs-0.9.10-r1.ebuild, - gtk2hs-0.9.11.ebuild, gtk2hs-0.9.12.ebuild: - update gtksourceview deps (see bug #195366) - -*gtk2hs-0.9.12 (27 Jul 2007) - - 27 Jul 2007; Duncan Coutts gtk2hs-0.9.11.ebuild, - +gtk2hs-0.9.12.ebuild: - New version. Hopefully this fixes bug #144028. - Also allow building with xulrunner. - - 03 Jun 2007; Duncan Coutts gtk2hs-0.9.11.ebuild: - Fix seamonkey build, should fix bug #180682. - - 30 Apr 2007; Duncan Coutts gtk2hs-0.9.11.ebuild: - Add missing dep on dev-haskell/mtl - - 29 Apr 2007; Duncan Coutts -gtk2hs-0.9.9.ebuild, - -gtk2hs-0.9.10.ebuild, gtk2hs-0.9.10-r1.ebuild: - Remove old versions and fix deps for 0.9.10-r1 - -*gtk2hs-0.9.11 (29 Apr 2007) - - 29 Apr 2007; Duncan Coutts +gtk2hs-0.9.11.ebuild: - Added new version - - 06 Jan 2007; Duncan Coutts gtk2hs-0.9.9.ebuild, - gtk2hs-0.9.10.ebuild, gtk2hs-0.9.10-r1.ebuild: - Removed mozilla USE flag, fixing bug #159635. The firefox USE flag remains. - Also block on ghc-6.6, we need a new upstream release for ghc-6.6 compat. - -*gtk2hs-0.9.10-r1 (07 Apr 2006) - - 07 Apr 2006; Luis F. Araujo - +files/gtk2hs-0.9.10-store.patch, +gtk2hs-0.9.10-r1.ebuild: - New revision with patch for the treestore. - - 01 Mar 2006; Markus Rothe gtk2hs-0.9.10.ebuild: - Added ~ppc64; bug #124469 - - 23 Feb 2006; Luis F. Araujo gtk2hs-0.9.10.ebuild: - Fixed firefox useflag - - 20 Feb 2006; -gtk2hs-0.9.7.ebuild: - Remove old 0.9.7 version. - - 20 Feb 2006; +files/gtk2hs-0.9.10-ghc622.patch, - gtk2hs-0.9.10.ebuild: - Fix building with ghc-6.2.2. Fixes bug #115657. - - 14 Feb 2006; +files/gtk2hs-0.9.10-cflags.patch, - gtk2hs-0.9.10.ebuild: - Added a patch to fix the use of CFLAGS which was causing problems on sparc. - Marked ~sparc. - - 10 Feb 2006; -gtk2hs-0.9.6-r1.ebuild, - -gtk2hs-0.9.8.ebuild: - Remove old versions. - - 28 Jan 2006; Simon Stelling - -files/gtk2hs-0.9.7-ghc64.patch.gz, gtk2hs-0.9.7.ebuild: - move compressed patches to the mirros - - 14 Dec 2005; gtk2hs-0.9.10.ebuild: - Make the DEPEND include the RDEPEND. - - 12 Nov 2005; gtk2hs-0.9.10.ebuild: - Fix failure when USE="glade -gnome" (bug #112227) - - 06 Nov 2005; gtk2hs-0.9.10.ebuild: - Fix generation of cairo GHCi lib. - -*gtk2hs-0.9.10 (02 Nov 2005) - - 02 Nov 2005; +gtk2hs-0.9.10.ebuild: - Added new version. - -*gtk2hs-0.9.9 (31 Aug 2005) - - 31 Aug 2005; +gtk2hs-0.9.9.ebuild: - Added new version. - - 31 Aug 2005; gtk2hs-0.9.7.ebuild, gtk2hs-0.9.8.ebuild: - Make gtk2hs-0.9.7 and gtk2hs-0.9.8 use only haddock-0.6 since they will not - work with haddock-0.7. - - 30 Jun 2005; David Holm gtk2hs-0.9.8.ebuild: - Added to ~ppc. - -*gtk2hs-0.9.8 (24 Jun 2005) - - 24 Jun 2005; gtk2hs-0.9.7.ebuild, - +gtk2hs-0.9.8.ebuild: - New version. - - 20 May 2005; gtk2hs-0.9.7.ebuild: - Added ~sparc to KEYWORDS. - - 08 May 2005; Duncan Coutts - +files/gtk2hs-0.9.7-ghc64.patch, gtk2hs-0.9.7.ebuild: - Add a patch for ghc-6.4 compatability. - - 23 Mar 2005; Seemant Kulleen gtk2hs-0.9.7.ebuild: - change dep from net-www/mozilla to www-client/mozilla - -*gtk2hs-0.9.7 (26 Jan 2005) - - 26 Jan 2005; Andres Loeh +gtk2hs-0.9.7.ebuild: - New version (bug #79352). - - 19 Jan 2005; Andres Loeh gtk2hs-0.9.6-r1.ebuild: - Added a check of the memory requirements (see bug #62790, comment 37) - - 11 Nov 2004; Michael Sterrett gtk2hs-0.9.6-r1.ebuild, - gtk2hs-0.9.6.ebuild: - dep fix; fix use invocation - - 06 Nov 2004; Andres Loeh gtk2hs-0.9.6-r1.ebuild: - Allow Haskell optimizations during build. - -*gtk2hs-0.9.6-r1 (04 Nov 2004) - - 04 Nov 2004; Andres Loeh +gtk2hs-0.9.6-r1.ebuild: - Make use of new ghc-package eclass. - -*gtk2hs-0.9.6 (26 Oct 2004) - - 26 Oct 2004; Andres Loeh gtk2hs-0.9.6.ebuild: - Version bump. - -*gtk2hs-0.9.5 (17 May 2004) - - 17 May 2004; Andres Loeh gtk2hs-0.9.5.ebuild, - metadata.xml: - Initial import (bug #50998). - diff --git a/dev-haskell/gtk2hs/Manifest b/dev-haskell/gtk2hs/Manifest deleted file mode 100644 index 9e89326acc09..000000000000 --- a/dev-haskell/gtk2hs/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX gtk2hs-0.10.1-ghc-6.12-c2hs.patch 4125 RMD160 20ef31e325275a3de466331a0d21ff3282279709 SHA1 7bdd1ed729646df68f458d39ffe12f3f3d1fb13d SHA256 199f512d4ebac11fe04a23a3877cbe41d340f85703fbea431ba23532cf6346b1 -AUX gtk2hs-0.10.1-ghc-6.12-packages.patch 15076 RMD160 0c9931317c06f86a4d145e56978cfe80dd6000a0 SHA1 ed070955dadd133315024c59012507a3ba28bacc SHA256 b95e129836400c9363a1d7d98bf9c4ce30c108d35b6c727bfb80e857ee541046 -AUX gtk2hs-0.9.12.1-librsvg-2.22.3.patch 335 RMD160 cf96ef312fda9388a3d4cf28058ffa004ebd2b77 SHA1 2908e21aa9bc8e28d61d410f8b8570ad30a59f7f SHA256 e8e4adb06d915a0c1300a3b4bf597930bd20ba5fd7bd7f9121fc999ccf855577 -DIST gtk2hs-0.10.1.tar.gz 1451125 RMD160 c72acd0e2c5471c7757532cfb44c841be8e83f1d SHA1 808d8c80026b82dc2b1347055efba82f8847c424 SHA256 07cc98520ce6c9e0d2549fd8fd23fc5118148b7509843b0163340713a762d0c0 -DIST gtk2hs-0.9.12.1.tar.gz 1004661 RMD160 cd658027ed91b9550915e686d546e36b1b371c10 SHA1 a85f8568aa072e0c55da5889b2aabff92b8da3ae SHA256 4278078b786202fc64f86881c2b2517bdd589d5248bff2e9b7e6c1ffd2361f84 -EBUILD gtk2hs-0.10.1.ebuild 2869 RMD160 57b69995130144fc5cd5dfe04b1f650cf15ecfb1 SHA1 97a71e189ae7fcb24201b2756664b2a5c9396750 SHA256 ed828f37e4cdd77b8247f606387aed796d5aaeffec884951df87023dfa0b62c7 -EBUILD gtk2hs-0.9.12.1.ebuild 3066 RMD160 e98848b41b8e93b9b2215d7b4058d6883ec4643c SHA1 34aa551a243ea965745c056502f377a0fa143ede SHA256 921dfcf6e6caab91e8f1cc9802a923ce4f095935b81ddb68e7fb4451b26a49ea -MISC ChangeLog 8834 RMD160 a87b413ee03b6c0af25a8096575fd38ce5965188 SHA1 73efae2581fa0b26b4de053f48a75932a6c518ea SHA256 a79b66084e079e2b3fcb509e4347d3b6d9af5f93e04be3c31dd39dc1a40b5ed3 -MISC metadata.xml 264 RMD160 d289d41d1d04ed1c3e574a29f53999457dbdc52c SHA1 475c909ed389f5e0508b5cd8e1373db2b96ce75b SHA256 743889dc0a1fac66b79afe2bbc2e61338d1d467aabc7b29977885d61c94a2a82 diff --git a/dev-haskell/gtk2hs/files/gtk2hs-0.10.1-ghc-6.12-c2hs.patch b/dev-haskell/gtk2hs/files/gtk2hs-0.10.1-ghc-6.12-c2hs.patch deleted file mode 100644 index 2580a09e0a4c..000000000000 --- a/dev-haskell/gtk2hs/files/gtk2hs-0.10.1-ghc-6.12-c2hs.patch +++ /dev/null @@ -1,106 +0,0 @@ -Taken from gtk2hs upstream as: -Thu Dec 10 20:12:37 EET 2009 Duncan Coutts - * Remove leading space in FFI import names - ghc-6.12 complains about this. - -Thu Dec 10 20:11:44 EET 2009 Duncan Coutts - * Disable c2hs support for C long double - The CLDouble type is missing in ghc-6.12, though it may return. - The Gtk+ headers do not use long double, so it's ok. - -Thu Dec 10 20:10:07 EET 2009 Duncan Coutts - * Make c2hs read text files in latin1 encoding - The c2hs lexer cannot cope with code points over 255. - Fixes the ghc-6.12 build problem where it consumes all memory. -diff --git a/tools/c2hs/base/state/CIO.hs b/tools/c2hs/base/state/CIO.hs -index e4497cc..ce37f22 100644 ---- a/tools/c2hs/base/state/CIO.hs -+++ b/tools/c2hs/base/state/CIO.hs -@@ -1,3 +1,5 @@ -+{-# LANGUAGE CPP #-} -+{-# OPTIONS_GHC -cpp #-} - -- Compiler Toolkit: Compiler I/O - -- - -- Author : Manuel M T Chakravarty -@@ -73,6 +75,9 @@ where - import IO - import Directory - import System -+#if __GLASGOW_HASKELL__ >= 612 -+import System.IO (hSetEncoding, latin1) -+#endif - - import FileOps (fileFindIn, mktemp) - import StateBase (PreCST, liftIO) -@@ -82,7 +87,12 @@ import StateBase (PreCST, liftIO) - -- ------------- - - openFileCIO :: FilePath -> IOMode -> PreCST e s Handle --openFileCIO p m = liftIO (openFile p m) -+openFileCIO p m = liftIO $ do -+ hnd <- openFile p m -+#if __GLASGOW_HASKELL__ >= 612 -+ hSetEncoding hnd latin1 -+#endif -+ return hnd - - hCloseCIO :: Handle -> PreCST e s () - hCloseCIO h = liftIO (hClose h) -@@ -103,10 +113,15 @@ hPutStrLnCIO :: Handle -> String -> PreCST e s () - hPutStrLnCIO h s = liftIO (hPutStrLn h s) - - writeFileCIO :: FilePath -> String -> PreCST e s () --writeFileCIO fname contents = liftIO (writeFile fname contents) -+writeFileCIO fname contents = do -+ hnd <- openFileCIO fname WriteMode -+ hPutStrCIO hnd contents -+ hCloseCIO hnd - - readFileCIO :: FilePath -> PreCST e s String --readFileCIO fname = liftIO (readFile fname) -+readFileCIO fname = do -+ hnd <- openFileCIO fname ReadMode -+ liftIO (hGetContents hnd) - - printCIO :: Show a => a -> PreCST e s () - printCIO a = liftIO (print a) -diff --git a/tools/c2hs/gen/CInfo.hs b/tools/c2hs/gen/CInfo.hs -index 36c8c50..e11401c 100644 ---- a/tools/c2hs/gen/CInfo.hs -+++ b/tools/c2hs/gen/CInfo.hs -@@ -120,7 +120,7 @@ size CULongPT = Storable.sizeOf (undefined :: CULong) - size CULLongPT = Storable.sizeOf (undefined :: CLLong) - size CFloatPT = Storable.sizeOf (undefined :: CFloat) - size CDoublePT = Storable.sizeOf (undefined :: CDouble) --size CLDoublePT = Storable.sizeOf (undefined :: CLDouble) -+--size CLDoublePT = Storable.sizeOf (undefined :: CLDouble) - size (CSFieldPT bs) = -bs - size (CUFieldPT bs) = -bs - -@@ -145,7 +145,7 @@ alignment CULongPT = Storable.alignment (undefined :: CULong) - alignment CULLongPT = Storable.alignment (undefined :: CULLong) - alignment CFloatPT = Storable.alignment (undefined :: CFloat) - alignment CDoublePT = Storable.alignment (undefined :: CDouble) --alignment CLDoublePT = Storable.alignment (undefined :: CLDouble) -+--alignment CLDoublePT = Storable.alignment (undefined :: CLDouble) - alignment (CSFieldPT bs) = fieldAlignment bs - alignment (CUFieldPT bs) = fieldAlignment bs - -diff --git a/tools/c2hs/gen/GenBind.hs b/tools/c2hs/gen/GenBind.hs -index fb37e43..11c63b7 100644 ---- a/tools/c2hs/gen/GenBind.hs -+++ b/tools/c2hs/gen/GenBind.hs -@@ -725,10 +725,12 @@ callImport hook isPure isUns ideLexeme hsLexeme cdecl pos = - -- - foreignImport :: String -> String -> String -> Bool -> ExtType -> String - foreignImport header ident hsIdent isUnsafe ty = -- "foreign import ccall " ++ safety ++ " \"" ++ header ++ " " ++ ident ++ -+ "foreign import ccall " ++ safety ++ " \"" ++ entity ++ - "\"\n " ++ hsIdent ++ " :: " ++ showExtType ty ++ "\n" - where - safety = if isUnsafe then "unsafe" else "safe" -+ entity | null header = ident -+ | otherwise = header ++ " " ++ ident - - -- produce a Haskell function definition for a fun hook - -- diff --git a/dev-haskell/gtk2hs/files/gtk2hs-0.10.1-ghc-6.12-packages.patch b/dev-haskell/gtk2hs/files/gtk2hs-0.10.1-ghc-6.12-packages.patch deleted file mode 100644 index d3a71632e888..000000000000 --- a/dev-haskell/gtk2hs/files/gtk2hs-0.10.1-ghc-6.12-packages.patch +++ /dev/null @@ -1,378 +0,0 @@ -Taken (and slightly modified) from gtk2hs upstream as: -Thu Dec 10 19:29:42 EET 2009 Duncan Coutts - * Handle installed package ids for ghc-6.12 -Fri Feb 12 10:23:26 EET 2010 Axel.Simon@in.tum.de - * Avoid using rec because of -XDoRec notation -diff --git a/acinclude.m4 b/acinclude.m4 -index a109713..d2d576d 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -98,8 +98,14 @@ if test "$USERPKGCONF" = "yes"; then - fi - if echo "${C}" | ${GREP} $1 > /dev/null 2> /dev/null - then -- $2=$(for pkg in ${C} ; do echo "${pkg}" | sed -e 's/^[[A-Za-z0-9-]]*-\([[0-9.]]*\)$/\1/' ; done | sort -r -n | head -n1) -- AC_MSG_RESULT([yes, version $$2]) -+ VER=$(for pkg in ${C} ; do echo "${pkg}" | sed -e 's/^[[A-Za-z0-9-]]*-\([[0-9.]]*\)$/\1/' ; done | sort -r -n | head -n1) -+ $2=${VER} -+ if test "${GHC_VERSION_612}" = "yes"; then -+ $3=$(${GHCPKG} field $1-${VER} id | cut -d' ' -f2) -+ else -+ $3=$1-${VER} -+ fi -+ AC_MSG_RESULT([yes, version ${VER}]) - else - AC_MSG_ERROR([ - Missing GHC package "$1". Install "$1" and re-run ./configure -diff --git a/cairo/cairo.package.conf.in b/cairo/cairo.package.conf.in -index 8195597..5651b8d 100644 ---- a/cairo/cairo.package.conf.in -+++ b/cairo/cairo.package.conf.in -@@ -1,5 +1,6 @@ - name: cairo - version: @PACKAGE_VERSION@ -+id: cairo-@PACKAGE_VERSION@ - license: BSD3 - license-file: cairo/COPYRIGHT - copyright: (c) Paolo Martini 2005, (c) Abraham Egnor 2003, 2004, (c) Aetion Technologies LLC 2004 -@@ -15,5 +16,5 @@ hs-libraries: HScairo - extra-libraries: @CAIRO_LIBS_CQ@ - include-dirs: @CAIRO_CFLAGS_CQ@ - includes: @CAIRO_HEADERS@ --depends: base-@PKG_BASE_VERSION@ mtl-@PKG_MTL_VERSION@ glib-@PACKAGE_VERSION@ @CAIRO_SPLITBASE_DEPENDS@ -+depends: @PKG_BASE_ID@ @PKG_MTL_ID@ glib-@PACKAGE_VERSION@ @CAIRO_SPLITBASE_DEPENDS@ - ld-options: @CAIRO_LIBEXTRA_CQ@ -diff --git a/configure.ac b/configure.ac -index 185044f..eaa5eb7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -121,6 +121,9 @@ GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -ge, 6.10, - GHC_VERSION_610=yes, GHC_VERSION_610=no) - AM_CONDITIONAL(GHC_VERSION_610, test "$GHC_VERSION_610" = "yes") - -+GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -ge, 6.12, -+ GHC_VERSION_612=yes, GHC_VERSION_612=no) -+ - dnl Calculate a version number with 3 digits (i.e. 502 for 5.2) - GHC_VERSION_NUMBER=`echo $GHC_VERSION | $SED "s/[[0-9]*\.\([0-9]]*\).*/0\1/"` - GHC_VERSION_NUMBER=`echo $GHC_VERSION_NUMBER | $SED "s/[[0-9]*\([0-9][0-9]]\)/\1/"` -@@ -234,39 +237,53 @@ AC_ARG_WITH(pkgconf, - [AS_HELP_STRING([--with-pkgconf=FILE], [GHC package file to install packages])], - [PKGCONF=$withval;],[PKGCONF=;]) - -+m4_pattern_allow([^PKG_]) - - dnl Check for various GHC packages: --GHC_PKG_CHECK(base,PKG_BASE_VERSION) --GTKHS_PROG_CHECK_VERSION($PKG_BASE_VERSION, -ge, 4.0, --AC_DEFINE(HAVE_NEW_CONTROL_EXCEPTION,[1],[Define if you have the new Control.Exception module (from GHC 6.10)])) --GHC_PKG_CHECK(haskell98,PKG_HASKELL98_VERSION) --GHC_PKG_CHECK(mtl,PKG_MTL_VERSION) -+GHC_PKG_CHECK(base, [PKG_BASE_VERSION], [PKG_BASE_ID]) -+GHC_PKG_CHECK(haskell98, [PKG_HASKELL98_VERSION], [PKG_HASKELL98_ID]) -+GHC_PKG_CHECK(mtl, [PKG_MTL_VERSION], [PKG_MTL_ID]) -+if test "$HAVE_SPLIT_BASE" = "yes"; then -+ GHC_PKG_CHECK(bytestring, [PKG_BYTESTRING_VERSION], [PKG_BYTESTRING_ID]) -+ GHC_PKG_CHECK(containers, [PKG_CONTAINERS_VERSION], [PKG_CONTAINERS_ID]) -+ GHC_PKG_CHECK(array, [PKG_ARRAY_VERSION], [PKG_ARRAY_ID]) -+ GHC_PKG_CHECK(old-time, [PKG_OLDTIME_VERSION], [PKG_OLDTIME_ID]) -+ GHC_PKG_CHECK(pretty, [PKG_PRETTY_VERSION], [HSPKG_PRETTY_ID]) -+ -+ CAIRO_SPLITBASE_DEPENDS="${PKG_BYTESTRING_ID} ${PKG_ARRAY_ID}" -+ GTK_SPLITBASE_DEPENDS="${PKG_CONTAINERS_ID} ${PKG_ARRAY_ID}" -+ SOEGTK_SPLITBASE_DEPENDS="${PKG_OLDTIME_ID}" -+ GNOMEVFS_SPLITBASE_DEPENDS="${PKG_BYTESTRING_ID}" -+ GSTREAMER_SPLITBASE_DEPENDS="${PKG_BYTESTRING_ID}" -+fi - AC_SUBST(PKG_BASE_VERSION) - AC_SUBST(PKG_HASKELL98_VERSION) - AC_SUBST(PKG_MTL_VERSION) --if test "$HAVE_SPLIT_BASE" = "yes"; then -- GHC_PKG_CHECK(bytestring,PKG_BYTESTRING_VERSION) -- CAIRO_SPLITBASE_DEPENDS="bytestring-${PKG_BYTESTRING_VERSION}" -- GHC_PKG_CHECK(containers, [PKG_CONTAINERS_VERSION]) -- GHC_PKG_CHECK(array, [PKG_ARRAY_VERSION]) -- GHC_PKG_CHECK(old-time, [PKG_OLDTIME_VERSION]) -- GHC_PKG_CHECK(pretty, [PKG_PRETTY_VERSION]) -- GTK_SPLITBASE_DEPENDS="containers-${PKG_CONTAINERS_VERSION} array-${PKG_ARRAY_VERSION}" -- SOEGTK_SPLITBASE_DEPENDS="old-time-${PKG_OLDTIME_VERSION}" -- GNOMEVFS_SPLITBASE_DEPENDS="bytestring-${PKG_BYTESTRING_VERSION}" -- GSTREAMER_SPLITBASE_DEPENDS="bytestring-${PKG_BYTESTRING_VERSION}" --fi - AC_SUBST(PKG_BYTESTRING_VERSION) - AC_SUBST(PKG_CONTAINERS_VERSION) - AC_SUBST(PKG_ARRAY_VERSION) - AC_SUBST(PKG_OLDTIME_VERSION) - AC_SUBST(PKG_PRETTY_VERSION) -+ -+AC_SUBST(PKG_BASE_ID) -+AC_SUBST(PKG_HASKELL98_ID) -+AC_SUBST(PKG_MTL_ID) -+AC_SUBST(PKG_BYTESTRING_ID) -+AC_SUBST(PKG_CONTAINERS_ID) -+AC_SUBST(PKG_ARRAY_ID) -+AC_SUBST(PKG_OLDTIME_ID) -+AC_SUBST(PKG_PRETTY_ID) -+ - AC_SUBST(CAIRO_SPLITBASE_DEPENDS) - AC_SUBST(GTK_SPLITBASE_DEPENDS) - AC_SUBST(SOEGTK_SPLITBASE_DEPENDS) - AC_SUBST(GNOMEVFS_SPLITBASE_DEPENDS) - AC_SUBST(GSTREAMER_SPLITBASE_DEPENDS) - -+GTKHS_PROG_CHECK_VERSION($PKG_BASE_VERSION, -ge, 4.0, -+AC_DEFINE(HAVE_NEW_CONTROL_EXCEPTION,[1], -+ [Define if you have the new Control.Exception module (from GHC 6.10)])) -+ - dnl Check for the GTK&Co libraries. Use the special PKG_CHECK_MODULES - dnl macro from the pkg-config program. - PKG_CHECK_MODULES(GLIB,[glib-2.0 >= 2.0.0 gobject-2.0 >= 2.0.0], [], AC_MSG_ERROR([ -diff --git a/gconf/gconf.package.conf.in b/gconf/gconf.package.conf.in -index b87b18f..7a3fd25 100644 ---- a/gconf/gconf.package.conf.in -+++ b/gconf/gconf.package.conf.in -@@ -1,5 +1,6 @@ - name: gconf - version: @PACKAGE_VERSION@ -+id: gconf-@PACKAGE_VERSION@ - license: LGPL - license-file: COPYING.LIB - maintainer: gtk2hs-users@lists.sourceforge.net -@@ -13,5 +14,5 @@ hs-libraries: HSgconf - extra-libraries: @GCONF_LIBS_CQ@ - include-dirs: @GCONF_CFLAGS_CQ@ - includes: gconf/gconf-client.h --depends: base-@PKG_BASE_VERSION@ glib-@PACKAGE_VERSION@ -+depends: @PKG_BASE_ID@ glib-@PACKAGE_VERSION@ - ld-options: @GCONF_LIBEXTRA_CQ@ -diff --git a/gio/gio.package.conf.in b/gio/gio.package.conf.in -index d026012..4bc25f0 100644 ---- a/gio/gio.package.conf.in -+++ b/gio/gio.package.conf.in -@@ -1,5 +1,6 @@ - name: gio - version: @PACKAGE_VERSION@ -+id: gio-@PACKAGE_VERSION@ - license: LGPL - license-file: COPYING.LIB - maintainer: gtk2hs-users@lists.sourceforge.net -@@ -13,5 +14,5 @@ hs-libraries: HSgio - extra-libraries: @GIO_LIBS_CQ@ - include-dirs: @GIO_CFLAGS_CQ@, "${pkglibdir}/include" - includes: gio/gio.h --depends: base-@PKG_BASE_VERSION@ glib-@PACKAGE_VERSION@ -+depends: @PKG_BASE_ID@ glib-@PACKAGE_VERSION@ - ld-options: @GIO_LIBEXTRA_CQ@ -diff --git a/glade/glade.package.conf.in b/glade/glade.package.conf.in -index c975736..73020f8 100644 ---- a/glade/glade.package.conf.in -+++ b/glade/glade.package.conf.in -@@ -1,5 +1,6 @@ - name: glade - version: @PACKAGE_VERSION@ -+id: glade-@PACKAGE_VERSION@ - license: LGPL - license-file: COPYING.LIB - maintainer: gtk2hs-users@lists.sourceforge.net -@@ -13,5 +14,5 @@ hs-libraries: HSglade - extra-libraries: @LIBGLADE_LIBS_CQ@ - include-dirs: @LIBGLADE_CFLAGS_CQ@ - includes: glade/glade.h --depends: base-@PKG_BASE_VERSION@ gtk-@PACKAGE_VERSION@ -+depends: @PKG_BASE_ID@ gtk-@PACKAGE_VERSION@ - ld-options: @LIBGLADE_LIBEXTRA_CQ@ -diff --git a/glib/glib.package.conf.in b/glib/glib.package.conf.in -index 29393aa..72845f1 100644 ---- a/glib/glib.package.conf.in -+++ b/glib/glib.package.conf.in -@@ -1,5 +1,6 @@ - name: glib - version: @PACKAGE_VERSION@ -+id: glib-@PACKAGE_VERSION@ - license: LGPL - license-file: COPYING.LIB - maintainer: gtk2hs-users@lists.sourceforge.net -@@ -13,5 +14,5 @@ hs-libraries: HSglib - extra-libraries: @GLIB_LIBS_CQ@ - include-dirs: @GLIB_CFLAGS_CQ@, "${pkglibdir}/include" - includes: glib.h, glib-object.h --depends: base-@PKG_BASE_VERSION@ -+depends: @PKG_BASE_ID@ - ld-options: @GLIB_LIBEXTRA_CQ@ -diff --git a/gnomevfs/gnomevfs.package.conf.in b/gnomevfs/gnomevfs.package.conf.in -index 6ab0ce8..809f275 100644 ---- a/gnomevfs/gnomevfs.package.conf.in -+++ b/gnomevfs/gnomevfs.package.conf.in -@@ -1,5 +1,6 @@ - name: gnomevfs - version: @PACKAGE_VERSION@ -+id: gnomevfs-@PACKAGE_VERSION@ - license: LGPL - license-file: COPYING.LGPLv3 - maintainer: gtk2hs-users@lists.sourceforge.net -@@ -13,5 +14,5 @@ hs-libraries: HSgnomevfs - extra-libraries: @GNOMEVFS_LIBS_CQ@ - include-dirs: @GNOMEVFS_CFLAGS_CQ@ - includes: libgnomevfs/gnome-vfs.h libgnomevfs/gnome-vfs-mime.h --depends: glib-@PACKAGE_VERSION@ mtl-@PKG_MTL_VERSION@ @GNOMEVFS_SPLITBASE_DEPENDS@ -+depends: glib-@PACKAGE_VERSION@ @PKG_MTL_ID@ @GNOMEVFS_SPLITBASE_DEPENDS@ - ld-options: @GNOMEVFS_LIBEXTRA_CQ@ -diff --git a/gstreamer/gstreamer.package.conf.in b/gstreamer/gstreamer.package.conf.in -index 62d2d0c..9020bb1 100644 ---- a/gstreamer/gstreamer.package.conf.in -+++ b/gstreamer/gstreamer.package.conf.in -@@ -1,5 +1,6 @@ - name: gstreamer - version: @PACKAGE_VERSION@ -+id: gstreamer-@PACKAGE_VERSION@ - license: LGPL - license-file: COPYING.LIB - maintainer: gtk2hs-users@lists.sourceforge.net -@@ -13,5 +14,5 @@ hs-libraries: HSgstreamer - extra-libraries: @GSTREAMER_LIBS_CQ@ - include-dirs: @GSTREAMER_CFLAGS_CQ@ - includes: gst/gst.h --depends: glib-@PACKAGE_VERSION@ mtl-@PKG_MTL_VERSION@ @GSTREAMER_SPLITBASE_DEPENDS@ -+depends: glib-@PACKAGE_VERSION@ @PKG_MTL_ID@ @GSTREAMER_SPLITBASE_DEPENDS@ - ld-options: @GSTREAMER_LIBEXTRA_CQ@ -diff --git a/gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp b/gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp -index d5f8f00..05eb5e4 100644 ---- a/gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp -+++ b/gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp -@@ -448,9 +448,9 @@ statusIconGetGeometry self = - (toStatusIcon self) nullPtr (castPtr recPtr) orPtr) >>= \b -> - if b - then do -- rec <- peek recPtr -+ rec_ <- peek recPtr - or <- peek orPtr -- return $ Just (rec,toEnum $ fromIntegral or) -+ return $ Just (rec_,toEnum $ fromIntegral or) - else return Nothing - - -diff --git a/gtk/gtk.package.conf.in b/gtk/gtk.package.conf.in -index ace6cdc..ed6c9ac 100644 ---- a/gtk/gtk.package.conf.in -+++ b/gtk/gtk.package.conf.in -@@ -1,5 +1,6 @@ - name: gtk - version: @PACKAGE_VERSION@ -+id: gtk-@PACKAGE_VERSION@ - license: LGPL - license-file: COPYING.LIB - maintainer: gtk2hs-users@lists.sourceforge.net -@@ -13,5 +14,5 @@ hs-libraries: HSgtk - extra-libraries: @GTK_LIBS_CQ@ - include-dirs: @GTK_CFLAGS_CQ@ - includes: gtk/gtk.h --depends: base-@PKG_BASE_VERSION@ mtl-@PKG_MTL_VERSION@ glib-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@ @GTK_SPLITBASE_DEPENDS@ -+depends: @PKG_BASE_ID@ @PKG_MTL_ID@ glib-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@ @GTK_SPLITBASE_DEPENDS@ - ld-options: @GTK_LIBEXTRA_CQ@ -diff --git a/gtkglext/gtkglext.package.conf.in b/gtkglext/gtkglext.package.conf.in -index bb0d5e3..447036d 100644 ---- a/gtkglext/gtkglext.package.conf.in -+++ b/gtkglext/gtkglext.package.conf.in -@@ -1,5 +1,6 @@ - name: gtkglext - version: @PACKAGE_VERSION@ -+id: gtkglext-@PACKAGE_VERSION@ - license: LGPL - license-file: COPYING.LIB - maintainer: gtk2hs-users@lists.sourceforge.net -@@ -13,5 +14,5 @@ hs-libraries: HSgtkglext - extra-libraries: @GTKGLEXT_LIBS_CQ@ - include-dirs: @GTKGLEXT_CFLAGS_CQ@ - includes: gtk/gtkgl.h --depends: base-@PKG_BASE_VERSION@ gtk-@PACKAGE_VERSION@ -+depends: @PKG_BASE_ID@ gtk-@PACKAGE_VERSION@ - ld-options: @GTKGLEXT_LIBEXTRA_CQ@ -diff --git a/gtksourceview2/gtksourceview2.package.conf.in b/gtksourceview2/gtksourceview2.package.conf.in -index 34f0bfd..ba9f69d 100644 ---- a/gtksourceview2/gtksourceview2.package.conf.in -+++ b/gtksourceview2/gtksourceview2.package.conf.in -@@ -1,5 +1,6 @@ - name: gtksourceview2 - version: @PACKAGE_VERSION@ -+id: gtksourceview2-@PACKAGE_VERSION@ - license: LGPL - license-file: COPYING.LIB - maintainer: gtk2hs-users@lists.sourceforge.net -@@ -22,5 +23,5 @@ includes: gtksourceview/gtksourcebuffer.h, - gtksourceview/gtksourcestyleschememanager.h, - gtksourceview/gtksourceview.h, - gtksourceview/gtksourceview-typebuiltins.h --depends: base-@PKG_BASE_VERSION@ gtk-@PACKAGE_VERSION@ -+depends: @PKG_BASE_ID@ gtk-@PACKAGE_VERSION@ - ld-options: @GTKSOURCEVIEW2_LIBEXTRA_CQ@ -diff --git a/mozembed/mozembed.package.conf.in b/mozembed/mozembed.package.conf.in -index 0bea05f..ef1872e 100644 ---- a/mozembed/mozembed.package.conf.in -+++ b/mozembed/mozembed.package.conf.in -@@ -1,5 +1,6 @@ - name: mozembed - version: @PACKAGE_VERSION@ -+id: mozembed-@PACKAGE_VERSION@ - license: LGPL - license-file: COPYING.LIB - maintainer: gtk2hs-users@lists.sourceforge.net -@@ -13,5 +14,5 @@ hs-libraries: HSmozembed - extra-libraries: @MOZEMBED_LIBS_CQ@ - include-dirs: @MOZEMBED_CFLAGS_CQ@ - includes: gtkmozembed.h --depends: base-@PKG_BASE_VERSION@ gtk-@PACKAGE_VERSION@ -+depends: @PKG_BASE_ID@ gtk-@PACKAGE_VERSION@ - ld-options: @MOZEMBED_LIBEXTRA_CQ@ -diff --git a/soegtk/soegtk.package.conf.in b/soegtk/soegtk.package.conf.in -index 61f1232..5208a6f 100644 ---- a/soegtk/soegtk.package.conf.in -+++ b/soegtk/soegtk.package.conf.in -@@ -1,5 +1,6 @@ - name: soegtk - version: @PACKAGE_VERSION@ -+id: soegtk-@PACKAGE_VERSION@ - license: LGPL - license-file: COPYING.LIB - maintainer: gtk2hs-users@lists.sourceforge.net -@@ -10,4 +11,4 @@ exposed-modules: Graphics.SOE.Gtk - import-dirs: "${pkglibdir}/imports/soegtk" - library-dirs: @GTK_LIBDIR_CQ@ - hs-libraries: HSsoegtk --depends: base-@PKG_BASE_VERSION@ mtl-@PKG_MTL_VERSION@ gtk-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@ @SOEGTK_SPLITBASE_DEPENDS@ -+depends: @PKG_BASE_ID@ @PKG_MTL_ID@ gtk-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@ @SOEGTK_SPLITBASE_DEPENDS@ -diff --git a/sourceview/sourceview.package.conf.in b/sourceview/sourceview.package.conf.in -index d3af320..5ef518f 100644 ---- a/sourceview/sourceview.package.conf.in -+++ b/sourceview/sourceview.package.conf.in -@@ -1,5 +1,6 @@ - name: sourceview - version: @PACKAGE_VERSION@ -+id: sourceview-@PACKAGE_VERSION@ - license: LGPL - license-file: COPYING.LIB - maintainer: gtk2hs-users@lists.sourceforge.net -@@ -16,5 +17,5 @@ includes: gtksourceview/gtksourcelanguagesmanager.h, - gtksourceview/gtksourcetag.h, - gtksourceview/gtksourceiter.h, - gtksourceview/gtksourceview.h --depends: base-@PKG_BASE_VERSION@ gtk-@PACKAGE_VERSION@ -+depends: @PKG_BASE_ID@ gtk-@PACKAGE_VERSION@ - ld-options: @SOURCEVIEW_LIBEXTRA_CQ@ -diff --git a/svgcairo/svgcairo.package.conf.in b/svgcairo/svgcairo.package.conf.in -index 3867d53..9b32287 100644 ---- a/svgcairo/svgcairo.package.conf.in -+++ b/svgcairo/svgcairo.package.conf.in -@@ -1,5 +1,6 @@ - name: svgcairo - version: @PACKAGE_VERSION@ -+id: svgcairo-@PACKAGE_VERSION@ - license: BSD3 - license-file: cairo/COPYRIGHT - copyright: (c) Duncan Coutts 2005, (c) Paolo Martini 2005 -@@ -15,5 +16,5 @@ hs-libraries: HSsvgcairo - extra-libraries: @SVGCAIRO_LIBS_CQ@ - include-dirs: @SVGCAIRO_CFLAGS_CQ@ - includes: librsvg/rsvg-cairo.h, librsvg/rsvg.h --depends: base-@PKG_BASE_VERSION@ mtl-@PKG_MTL_VERSION@ glib-@PACKAGE_VERSION@ cairo-@PACKAGE_VERSION@ -+depends: @PKG_BASE_ID@ @PKG_MTL_ID@ glib-@PACKAGE_VERSION@ cairo-@PACKAGE_VERSION@ - ld-options: @SVGCAIRO_LIBEXTRA_CQ@ diff --git a/dev-haskell/gtk2hs/files/gtk2hs-0.9.12.1-librsvg-2.22.3.patch b/dev-haskell/gtk2hs/files/gtk2hs-0.9.12.1-librsvg-2.22.3.patch deleted file mode 100644 index da7d531c97ec..000000000000 --- a/dev-haskell/gtk2hs/files/gtk2hs-0.9.12.1-librsvg-2.22.3.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- svgcairo/Graphics/Rendering/Cairo/SVG.chs 2008-10-01 00:11:02.000000000 -0430 -+++ svgcairo/Graphics/Rendering/Cairo/SVG.chs 2008-10-09 08:37:50.000000000 -0430 -@@ -200,6 +200,7 @@ - svgRender svg = do - cr <- ask - liftIO $ {# call unsafe render_cairo #} svg cr -+ return () - - -- | Get the width and height of the SVG image. - -- diff --git a/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild deleted file mode 100644 index 4221da2305cb..000000000000 --- a/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild,v 1.5 2011/03/21 22:53:32 nirbheek Exp $ - -EAPI="2" - -inherit base eutils autotools ghc-package multilib toolchain-funcs versionator - -DESCRIPTION="A GUI Library for Haskell based on Gtk+" -HOMEPAGE="http://haskell.org/gtk2hs/" - -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" - -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" - -IUSE="doc profile glade gnome opengl svg" - -RDEPEND=">=dev-lang/ghc-6.6 - dev-haskell/mtl[doc?] - x11-libs/gtk+:2 - glade? ( gnome-base/libglade:2.0 ) - gnome? ( gnome-base/libglade:2.0 - >=x11-libs/gtksourceview-2.2:2.0 - gnome-base/gconf:2 ) - svg? ( gnome-base/librsvg:2 ) - opengl? ( x11-libs/gtkglext )" - -DEPEND="${RDEPEND} - doc? ( >=dev-haskell/haddock-2.4.1 ) - dev-util/pkgconfig" - -MY_P="${P/%_rc*}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch "${FILESDIR}/gtk2hs-0.10.1-ghc-6.12-packages.patch" - epatch "${FILESDIR}/gtk2hs-0.10.1-ghc-6.12-c2hs.patch" - cd "${S}" - - # In GHC 6.12.2, qualified imports is now an error - sed -i -e "s/Map.findWithDefault, empty/findWithDefault, empty/" \ - tools/c2hs/base/syms/Attributes.hs \ - || die "Can't remove qualified import" - - eautoreconf -} - -src_configure() { - econf \ - --enable-gtk \ - --enable-packager-mode \ - $(version_is_at_least "4.2" "$(gcc-version)" && \ - echo --disable-split-objs) \ - $(has_version '>=x11-libs/gtk+-2.8' && echo --enable-cairo) \ - $(use glade || use gnome && echo --enable-libglade) \ - $(use_enable gnome gconf) \ - $(use_enable gnome gtksourceview2) \ - $(use_enable svg svg) \ - $(use_enable opengl opengl) \ - --disable-seamonkey \ - --disable-firefox \ - --disable-xulrunner \ - $(use_enable doc docs) \ - $(use_enable profile profiling) \ - || die "Configure failed" -} - -src_compile() { - emake -j1 || die "emake failed" -} - -src_install() { - - make install \ - DESTDIR="${D}" \ - htmldir="/usr/share/doc/${PF}/html" \ - haddockifacedir="/usr/share/doc/${PF}" \ - || die "Make install failed" - - # arrange for the packages to be registered - ghc-setup-pkg \ - "${D}/usr/$(get_libdir)/gtk2hs/glib.package.conf" \ - $(has_version '>=x11-libs/gtk+-2.8' && echo \ - "${D}/usr/$(get_libdir)/gtk2hs/cairo.package.conf") \ - "${D}/usr/$(get_libdir)/gtk2hs/gtk.package.conf" \ - "${D}/usr/$(get_libdir)/gtk2hs/soegtk.package.conf" \ - $(use glade || use gnome && echo \ - "${D}/usr/$(get_libdir)/gtk2hs/glade.package.conf") \ - $(use gnome && echo \ - "${D}/usr/$(get_libdir)/gtk2hs/gconf.package.conf" \ - "${D}/usr/$(get_libdir)/gtk2hs/gtksourceview2.package.conf" ) \ - $(use svg && echo \ - "${D}/usr/$(get_libdir)/gtk2hs/svgcairo.package.conf") \ - $(use opengl && echo \ - "${D}/usr/$(get_libdir)/gtk2hs/gtkglext.package.conf") - ghc-install-pkg -} diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild deleted file mode 100644 index d6d1f2673365..000000000000 --- a/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild,v 1.14 2011/03/21 22:53:32 nirbheek Exp $ - -EAPI="1" - -inherit base eutils ghc-package multilib toolchain-funcs versionator - -DESCRIPTION="A GUI Library for Haskell based on Gtk+" -HOMEPAGE="http://haskell.org/gtk2hs/" -SRC_URI="mirror://sourceforge/gtk2hs/${P}.tar.gz" -LICENSE="LGPL-2.1" -SLOT="0" - -KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86" - -IUSE="doc glade gnome opengl svg profile" - -RDEPEND=">=dev-lang/ghc-6.4 - dev-haskell/mtl - >=x11-libs/gtk+-2:2 - glade? ( >=gnome-base/libglade-2:2.0 ) - gnome? ( >=gnome-base/libglade-2:2.0 - x11-libs/gtksourceview:1.0 - gnome-base/gconf:2 ) - svg? ( >=gnome-base/librsvg-2.16:2 ) - opengl? ( x11-libs/gtkglext )" - -DEPEND="${RDEPEND} - doc? ( >=dev-haskell/haddock-0.8 ) - dev-util/pkgconfig" - -src_unpack() { - unpack ${A} - - sed -i -e '\|docs/reference/haddock.js|d' \ - -e '/$(foreach LETTER,/,+1 d' \ - -e '\|\tdocs/reference/gtk2hs.haddock| s/\\//' \ - "${S}/Makefile.in" - - cd "${S}" - epatch "${FILESDIR}/${P}-librsvg-2.22.3.patch" -} - -src_compile() { - econf \ - --enable-packager-mode \ - $(version_is_at_least "4.2" "$(gcc-version)" && \ - echo --disable-split-objs) \ - $(has_version '>=x11-libs/gtk+-2.8' && echo --enable-cairo) \ - $(use glade || use gnome && echo --enable-libglade) \ - $(use_enable gnome gconf) \ - $(use_enable gnome sourceview) \ - $(use_enable svg svg) \ - $(use_enable opengl opengl) \ - --disable-firefox \ - --disable-seamonkey \ - --disable-xulrunner \ - $(use_enable doc docs) \ - $(use_enable profile profiling) \ - || die "Configure failed" - - # parallel build doesn't work, so specify -j1 - emake -j1 || die "Make failed" -} - -src_install() { - - make install \ - DESTDIR="${D}" \ - htmldir="/usr/share/doc/${PF}/html" \ - haddockifacedir="/usr/share/doc/${PF}" \ - || die "Make install failed" - - # for some reason it creates the doc dir even if it is configured - # to not generate docs, so lets remove the empty dirs in that case - # (and lets be cautious and only remove them if they're empty) - if ! use doc; then - rmdir "${D}/usr/share/doc/${PF}/html" - rmdir "${D}/usr/share/doc/${PF}" - rmdir "${D}/usr/share/doc" - rmdir "${D}/usr/share" - fi - - # arrange for the packages to be registered - ghc-setup-pkg \ - "${D}/usr/$(get_libdir)/gtk2hs/glib.package.conf" \ - $(has_version '>=x11-libs/gtk+-2.8' && echo \ - "${D}/usr/$(get_libdir)/gtk2hs/cairo.package.conf") \ - "${D}/usr/$(get_libdir)/gtk2hs/gtk.package.conf" \ - "${D}/usr/$(get_libdir)/gtk2hs/soegtk.package.conf" \ - $(use glade || use gnome && echo \ - "${D}/usr/$(get_libdir)/gtk2hs/glade.package.conf") \ - $(use gnome && echo \ - "${D}/usr/$(get_libdir)/gtk2hs/gconf.package.conf" \ - "${D}/usr/$(get_libdir)/gtk2hs/sourceview.package.conf" ) \ - $(use svg && echo \ - "${D}/usr/$(get_libdir)/gtk2hs/svgcairo.package.conf") \ - $(use opengl && echo \ - "${D}/usr/$(get_libdir)/gtk2hs/gtkglext.package.conf") - ghc-install-pkg -} diff --git a/dev-haskell/gtk2hs/metadata.xml b/dev-haskell/gtk2hs/metadata.xml deleted file mode 100644 index e70ae6a344d9..000000000000 --- a/dev-haskell/gtk2hs/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - -haskell - - Enable gnome-base/libglade bindings - compilation - -