dep fix; fix use invocation

diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index cfa28fbba8957d83e76d6d9eb83420b30925c74b..8da6dc9e5f4372630743405140882e5b47a36a47 100644 (file)
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/gtk2hs
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.5 2004/11/06 11:41:16 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.6 2004/11/11 11:22:58 mr_bones_ Exp $
+
+  11 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> gtk2hs-0.9.6-r1.ebuild,
+  gtk2hs-0.9.6.ebuild:
+  dep fix; fix use invocation
 
   06 Nov 2004; Andres Loeh <kosmikus@gentoo.org> gtk2hs-0.9.6-r1.ebuild:
   Allow Haskell optimizations during build.

diff --git a/dev-haskell/gtk2hs/Manifest b/dev-haskell/gtk2hs/Manifest
index eeb97d7343d21237608e653ff710af8634efa2f5..05f691a94262226eace1413e6e191b6ae6c45f21 100644 (file)
--- a/dev-haskell/gtk2hs/Manifest
+++ b/dev-haskell/gtk2hs/Manifest
@@ -1,8 +1,8 @@
-MD5 f630df0130ccd8086ffd95bdb353346d gtk2hs-0.9.6.ebuild 3932
+MD5 fd2ac178af70c69dba19fcdf22984db2 ChangeLog 871
 MD5 8e023ae1e205ac205cc17807eb74bbd5 gtk2hs-0.9.5.ebuild 2586
-MD5 b54983694e9870ac3171a2bae1608b13 ChangeLog 737
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
-MD5 7d6b3d40d1a50d39f120e076a94357fd gtk2hs-0.9.6-r1.ebuild 2593
+MD5 8f69d083221632e95b5bba2cf59117b4 gtk2hs-0.9.6.ebuild 3856
+MD5 a7277ef91146dbfec0b9df9f3d1ac621 gtk2hs-0.9.6-r1.ebuild 2573
 MD5 2785816eabb8f055db732986a48f65fd files/digest-gtk2hs-0.9.5 64
 MD5 96674cbaf4f6bddf1517166b6e6f13a5 files/digest-gtk2hs-0.9.6 64
 MD5 96674cbaf4f6bddf1517166b6e6f13a5 files/digest-gtk2hs-0.9.6-r1 64

diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.6-r1.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.6-r1.ebuild
index a1a72bc8ed9f5a8c64cd1570708cba87f69e2f1e..d258e54e14d8e51241bc696449232c2f254c4b0e 100644 (file)
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.6-r1.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.6-r1.ebuild,v 1.2 2004/11/06 11:41:16 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.6-r1.ebuild,v 1.3 2004/11/11 11:22:58 mr_bones_ Exp $
 
 inherit base ghc-package
 
@@ -14,13 +14,11 @@ KEYWORDS="~x86"
 
 IUSE="doc gnome"
 
-RDEPEND=">=virtual/ghc-5.04
+DEPEND=">=virtual/ghc-5.04
                >=x11-libs/gtk+-2
                gnome? ( >=gnome-base/libglade-2
                                 >=x11-libs/gtksourceview-0.6
-                                >=gnome-base/gconf-2)"
-
-DEPEND="${RDEPEND}"
+                                >=gnome-base/gconf-2 )"
 
 src_compile() {
        econf \

diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.6.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.6.ebuild
index 7922a7c6df6986990ac69331be463b9762f20899..aa0c2d17c9c5217b73b2609d924a0cedab74e70a 100644 (file)
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.6.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.6.ebuild,v 1.1 2004/10/26 14:36:42 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.6.ebuild,v 1.2 2004/11/11 11:22:58 mr_bones_ Exp $
 
 DESCRIPTION="GTK+-2.x bindings for Haskell"
 HOMEPAGE="http://gtk2hs.sourceforge.net/"
@@ -12,13 +12,11 @@ KEYWORDS="~x86"
 
 IUSE="gnome"
 
-RDEPEND=">=virtual/ghc-5.04
+DEPEND=">=virtual/ghc-5.04
                >=x11-libs/gtk+-2
                gnome? ( >=gnome-base/libglade-2
                         >=x11-libs/gtksourceview-0.6
-                                >=gnome-base/gconf-2)"
-
-DEPEND="${RDEPEND}"
+                                >=gnome-base/gconf-2 )"
 
 # the variable ghc_version is used to store the ghc version
 # we are building against
@@ -62,12 +60,14 @@ src_install() {
                --whole-archive ${D}/${ghclibdir}/gtk2hs/gtk2/libgtk2hs.a
        ld -r -x -o  ${D}/${ghclibdir}/gtk2hs/mogul/mogul.o \
                --whole-archive ${D}/${ghclibdir}/gtk2hs/mogul/libmogul.a
-       [ `use gnome` ] && ld -r -x -o ${D}/${ghclibdir}/gtk2hs/sourceview/sourceview.o \
-               --whole-archive ${D}/${ghclibdir}/gtk2hs/sourceview/libsourceview.a
-       [ `use gnome` ] && ld -r -x -o ${D}/${ghclibdir}/gtk2hs/glade/glade2hs.o \
-               --whole-archive ${D}/${ghclibdir}/gtk2hs/glade/libglade2hs.a
-       [ `use gnome` ] && ld -r -x -o ${D}/${ghclibdir}/gtk2hs/gconf/gconf.o \
-               --whole-archive ${D}/${ghclibdir}/gtk2hs/gconf/libgconf.a
+       if use gnome ; then
+               ld -r -x -o ${D}/${ghclibdir}/gtk2hs/sourceview/sourceview.o \
+                       --whole-archive ${D}/${ghclibdir}/gtk2hs/sourceview/libsourceview.a
+               ld -r -x -o ${D}/${ghclibdir}/gtk2hs/glade/glade2hs.o \
+                       --whole-archive ${D}/${ghclibdir}/gtk2hs/glade/libglade2hs.a
+               ld -r -x -o ${D}/${ghclibdir}/gtk2hs/gconf/gconf.o \
+                       --whole-archive ${D}/${ghclibdir}/gtk2hs/gconf/libgconf.a
+       fi
 
        # fix dynamic linking with pthread bug for glade & sourview
        sed -i 's:"pthread",::' ${D}/${ghclibdir}/gtk2hs/sourceview/sourceview.conf
@@ -93,9 +93,11 @@ register_ghc_packages() {
        einfo "Registering gtk2hs packages"
        ghc-pkg -u -i ${ghclibdir}/gtk2hs/gtk2/gtk2.conf
        ghc-pkg -u -i ${ghclibdir}/gtk2hs/mogul/mogul.conf
-       [ `use gnome` ] && ghc-pkg -u -i ${ghclibdir}/gtk2hs/sourceview/sourceview.conf
-       [ `use gnome` ] && ghc-pkg -u -i ${ghclibdir}/gtk2hs/glade/glade.conf
-       [ `use gnome` ] && ghc-pkg -u -i ${ghclibdir}/gtk2hs/gconf/gconf.conf
+       if use gnome ; then
+               ghc-pkg -u -i ${ghclibdir}/gtk2hs/sourceview/sourceview.conf
+               ghc-pkg -u -i ${ghclibdir}/gtk2hs/glade/glade.conf
+               ghc-pkg -u -i ${ghclibdir}/gtk2hs/gconf/gconf.conf
+       fi
 }
 
 pkg_prerm() {
@@ -113,4 +115,3 @@ unregister_ghc_packages() {
        ghc-pkg -r sourceview
        ghc-pkg -r gconf
 }
-