Remove support for vulnerable seamonkey (#305789) and xulrunner (#324953).

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index ebd9f6eb4e70542e20ac36b42b3704437c3e3f0c..bb3ebd5e898c46ffd3ba0bdfa692d759589ca3f2 100644 (file)
--- 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/Manifest b/dev-haskell/gtk2hs/Manifest
index b4e9774c0d9e260b872e68be673418c7e3caa51d..fd04c239535729afc8477babc7c5f6a79190e7c5 100644 (file)
--- a/dev-haskell/gtk2hs/Manifest
+++ b/dev-haskell/gtk2hs/Manifest
@@ -3,7 +3,7 @@ AUX gtk2hs-0.10.1-ghc-6.12-packages.patch 15076 RMD160 0c9931317c06f86a4d145e569
 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 2781 RMD160 951941d5f70a33454754863c3d125fb218a26142 SHA1 35f45effbb492fe7249eac2b054696bfde8ebe44 SHA256 74cfade69f9d95ea00f2e7c361b01521e633ff3cc46a297871884e0b8f3f032d
-EBUILD gtk2hs-0.9.12.1.ebuild 3202 RMD160 7233ed71ccfb1e206c94e07a99a22701a9e73be2 SHA1 c1bd1b821621283e42b92fc74f6452f531e2b354 SHA256 60253e99366c489dbabcb7d98811b77509212e873766c93b084ce579081a884f
-MISC ChangeLog 8304 RMD160 f5180089cbb9e578b1e15e30ff1b939f3c5d1465 SHA1 c2ec875cc38a291e0963dca0fcbd51f5c2dbddc9 SHA256 6d13832d2ac1ebdbb5d05a57afe4e69c153dcef13a6013fe376f126034b3361e
+EBUILD gtk2hs-0.10.1.ebuild 2652 RMD160 b07b5eb168031ddc34aa99a1882b424c3155c287 SHA1 4f943c942b6d493235bcd28f546c5783d533600b SHA256 a5d9695ba132a1aee4c08102a0dee262133831970364c0623a94367cbd21e0b1
+EBUILD gtk2hs-0.9.12.1.ebuild 3048 RMD160 11710382e632810b6fae74c7d0e4374b799dd528 SHA1 804baff1955127305f88455b02c54542d7b061fc SHA256 e5b9c2adecae399316ae38bd6e33c976aab64b0d06b5ee95963dcde048c0bc47
+MISC ChangeLog 8362 RMD160 1de2426ae571e5922120a1402473b00dc04ff72d SHA1 e56855f12c2f208d4b921f97cef8d73755418441 SHA256 6df6abbc8b93baa99f13b9f3fece93058e4162514b6beb44d079947d2844476a
 MISC metadata.xml 264 RMD160 d289d41d1d04ed1c3e574a29f53999457dbdc52c SHA1 475c909ed389f5e0508b5cd8e1373db2b96ce75b SHA256 743889dc0a1fac66b79afe2bbc2e61338d1d467aabc7b29977885d61c94a2a82

diff --git a/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild
index 4e24be4019ca0edf89955eb89345260941fedb40..551cf720f47525f31749d2e706c512ca3f08f03c 100644 (file)
--- 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 05814c93074c6d6de54af855c266a5d767c32077..39d71d0068566df5a55f9106ccbd2e7c472a86b9 100644 (file)
--- 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
 }