summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-06-28 14:28:37 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-06-28 14:28:37 +0000
commit2a52314394c600a4fc8b9f86350bb9e42e6f2711 (patch)
treed65b0fcfe0acd0ec7935838941577c4edfca1463 /dev-haskell
parentDrop old. (diff)
downloadgentoo-2-2a52314394c600a4fc8b9f86350bb9e42e6f2711.tar.gz
gentoo-2-2a52314394c600a4fc8b9f86350bb9e42e6f2711.tar.bz2
gentoo-2-2a52314394c600a4fc8b9f86350bb9e42e6f2711.zip
Remove support for vulnerable seamonkey (#305789) and xulrunner (#324953).
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-haskell')
-rw-r--r--dev-haskell/gtk2hs/ChangeLog8
-rw-r--r--dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild14
-rw-r--r--dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild13
3 files changed, 15 insertions, 20 deletions
diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index ebd9f6eb4e70..bb3ebd5e898c 100644
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,10 +1,10 @@
# ChangeLog for dev-haskell/gtk2hs
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.54 2010/06/19 20:16:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.55 2010/06/28 14:28:37 ssuominen Exp $
- 19 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
- gtk2hs-0.9.12.1.ebuild:
- Remove obsolete seamonkey 1.x support.
+ 28 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+ 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 <kolmodin@gentoo.org> gtk2hs-0.10.1.ebuild,
+files/gtk2hs-0.10.1-ghc-6.12-c2hs.patch,
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild
index 4e24be4019ca..551cf720f475 100644
--- a/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.2 2010/03/27 09:01:56 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild,v 1.3 2010/06/28 14:28:37 ssuominen Exp $
EAPI="2"
@@ -16,7 +16,7 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc profile glade gnome opengl svg xulrunner"
+IUSE="doc profile glade gnome opengl svg"
RDEPEND=">=dev-lang/ghc-6.6
dev-haskell/mtl[doc?]
@@ -26,8 +26,7 @@ RDEPEND=">=dev-lang/ghc-6.6
>=x11-libs/gtksourceview-2.2
gnome-base/gconf )
svg? ( gnome-base/librsvg )
- opengl? ( x11-libs/gtkglext )
- xulrunner? ( =net-libs/xulrunner-1.8* )"
+ opengl? ( x11-libs/gtkglext )"
DEPEND="${RDEPEND}
doc? ( >=dev-haskell/haddock-2.4.1 )
@@ -56,8 +55,9 @@ src_configure() {
$(use_enable gnome gtksourceview2) \
$(use_enable svg svg) \
$(use_enable opengl opengl) \
+ --disable-seamonkey \
--disable-firefox \
- $(use_enable xulrunner xulrunner) \
+ --disable-xulrunner \
$(use_enable doc docs) \
$(use_enable profile profiling) \
|| die "Configure failed"
@@ -90,8 +90,6 @@ src_install() {
$(use svg && echo \
"${D}/usr/$(get_libdir)/gtk2hs/svgcairo.package.conf") \
$(use opengl && echo \
- "${D}/usr/$(get_libdir)/gtk2hs/gtkglext.package.conf") \
- $(use xulrunner && echo \
- "${D}/usr/$(get_libdir)/gtk2hs/mozembed.package.conf")
+ "${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
index 05814c93074c..39d71d006856 100644
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.12 2010/06/19 20:16:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild,v 1.13 2010/06/28 14:28:37 ssuominen Exp $
inherit base eutils ghc-package multilib toolchain-funcs versionator
@@ -12,7 +12,7 @@ SLOT="0"
KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE="doc glade gnome opengl svg profile xulrunner"
+IUSE="doc glade gnome opengl svg profile"
RDEPEND=">=dev-lang/ghc-6.4
dev-haskell/mtl
@@ -22,8 +22,7 @@ RDEPEND=">=dev-lang/ghc-6.4
<x11-libs/gtksourceview-2.0
>=gnome-base/gconf-2 )
svg? ( >=gnome-base/librsvg-2.16 )
- opengl? ( x11-libs/gtkglext )
- xulrunner? ( =net-libs/xulrunner-1.8* )"
+ opengl? ( x11-libs/gtkglext )"
DEPEND="${RDEPEND}
doc? ( >=dev-haskell/haddock-0.8 )
@@ -54,7 +53,7 @@ src_compile() {
$(use_enable opengl opengl) \
--disable-firefox \
--disable-seamonkey \
- $(use_enable xulrunner xulrunner) \
+ --disable-xulrunner \
$(use_enable doc docs) \
$(use_enable profile profiling) \
|| die "Configure failed"
@@ -96,8 +95,6 @@ src_install() {
$(use svg && echo \
"${D}/usr/$(get_libdir)/gtk2hs/svgcairo.package.conf") \
$(use opengl && echo \
- "${D}/usr/$(get_libdir)/gtk2hs/gtkglext.package.conf") \
- $(use xulrunner && echo \
- "${D}/usr/$(get_libdir)/gtk2hs/mozembed.package.conf")
+ "${D}/usr/$(get_libdir)/gtk2hs/gtkglext.package.conf")
ghc-install-pkg
}