remove old revisions, add xulrunner USE flag per bug #223497.

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

6 files changed, 33 insertions, 236 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index 95090b891a67..e4f043508819 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.106 2008/07/30 21:59:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.107 2008/07/31 23:10:46 eva Exp $
+
+  31 Jul 2008; Gilles Dartiguelongue <eva@gentoo.org> metadata.xml,
+  -seahorse-2.22.1.ebuild, -seahorse-2.22.2.ebuild, seahorse-2.22.3.ebuild:
+  remove old revisions, add xulrunner USE flag per bug #223497.
 
   30 Jul 2008; Brent Baude <ranger@gentoo.org> seahorse-2.22.3.ebuild:
   Marking seahorse-2.22.3 ppc stable for bug 229709
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 7742b19a92eb..da84e2cfc5af 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,13 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 70-seahorse-agent 241 RMD160 d28490016ed259ef29416cb101ccddd76e195ed5 SHA1 2b40525f543741dc0a453a8241e3b7c83f45da6f SHA256 2e70cbb034fde8ddd5c69baf97570ad706bec2e04bd7dd2c86f462b9a594e3c6
 AUX seahorse-0.9.10-update-mime.patch 545 RMD160 f7531dcd900f46b0208226cd1e3806a7bc75231b SHA1 57f486c216b922d5d52cc24ba5925bd854a15518 SHA256 ffa4324d3ec4c4019839f2663758dacd1bb97396582398fdfc241e24dfff549a
 AUX seahorse-2.22.2-fbsd.patch 305 RMD160 e6d12d63383007b8b2b5064cc317e3b0d491908b SHA1 8440145139ace9b98cf7d16bb329395c5ba5479f SHA256 fd3e7be3c5af9b7e4c831ca6590b68582f671f4033693d1c2253f220dc6c57b2
 DIST seahorse-2.20.3.tar.bz2 2273106 RMD160 e19c4d51b09511b570e90aa37a5b437a95a7404f SHA1 1946c0b6ff6f1dcd2c7d95e446d620592b129d32 SHA256 26aadb8fbd03c2971fdbcbf686dffd93a1f7fe82495510a64f38e53a49ce8442
-DIST seahorse-2.22.1.tar.bz2 2195121 RMD160 be97418841c14ef132af650e81c41032c7b15b52 SHA1 c6a96ac670540522c6ec0d6a3871a6ed711fb082 SHA256 e9791ad2d5ca9013db14310340227f8e5b1a519f2525066d10061c6d1b6f9c47
-DIST seahorse-2.22.2.tar.bz2 2121631 RMD160 3b528f162a911fb11b9f256c8e1fb0f4d7dba31c SHA1 d7b5c8d4176a2f4384fc032312c5b0f01883c7ae SHA256 c0b217462274eb07223c97651e15e633c2fa1087886362848e94cd696158aeba
 DIST seahorse-2.22.3.tar.bz2 2121204 RMD160 63acdec4f689734bcf36bd0ef4a9fbc09fcba12a SHA1 11a5c4a641e3419e022f3c8e733b49a1139a52ed SHA256 245ff3752f72d14615937ef03d5a5e6f1a3abdf12a907af775ce31aa337e95d1
 EBUILD seahorse-2.20.3.ebuild 2617 RMD160 539dec59cd6b9f1eb368e511db8bd0f371c40a28 SHA1 2e55bf2bdb9cd3106141cc7839bad3b7b0b7a0cf SHA256 d791b4a3cec1bc7eddfc90503daad1dd16e431afb1f5798288765b94622d79df
-EBUILD seahorse-2.22.1.ebuild 2891 RMD160 3360d57e30204fb450fcc360305c299cd6666075 SHA1 895f3ef41c137dfd5a272a153061a554ce7c12f8 SHA256 efa5db2118271d2ff6514cc117f7a762b6629fe0366d028fd06e9637a4f6e64e
-EBUILD seahorse-2.22.2.ebuild 2927 RMD160 a31c175a6d84ec3f5c7378906c7cefb872c2262c SHA1 748383a03975873879e3ab28b4928790b5331219 SHA256 701b2d467b58e9f285a7c04f7ee382ddb03d2e56499cb3954d7b58e8af6ca9d4
-EBUILD seahorse-2.22.3.ebuild 2946 RMD160 b6d352ed56f323912c11e67b453bcd2957ef6858 SHA1 3a8f2621936df8e781e943e31c4b4326f015fdf4 SHA256 61dad71da995e06cb479d72d7c470337f6b7b7b1f173fa2d8d51d60cbac73535
-MISC ChangeLog 15478 RMD160 5c448af4ba14bfd8840fadf0ca2f0b34793a1d96 SHA1 401aab95927ec39b74f345c9534e649d21dcbbf9 SHA256 9f0db957bffdc39437aba585e56bf6695f44028bc4e1cd38b1c8e14762c59490
-MISC metadata.xml 1321 RMD160 4c3a01dc58f4ace98ff1b0a075ae37a490a94062 SHA1 69e3fd2ce09b312f92bf67db9092b97bf765878b SHA256 39d9c9dfa7ce9e175fc349876b992b8600d43b4bd3bf1edf014c0975459ade5d
+EBUILD seahorse-2.22.3.ebuild 3186 RMD160 3a66cbc9b3d61578a0f87ff34c8c54b3739add51 SHA1 72105e8a4c3f0a252a3ff50a76c33629339379f9 SHA256 b7c06886582f82aa73456a24468cf92489ec4cedb0e41629bca95513094ef946
+MISC ChangeLog 15684 RMD160 e5db3115cda51cbbc498025dea6d1735cdbb72a2 SHA1 9e125b2c27c4926093eaba607a9fa07476352414 SHA256 3a4f69bed242dd5af50c2ef8cd3dc365c5067f3b4d42598bb32ddf4fb5f6b6e2
+MISC metadata.xml 1446 RMD160 9829e11c04a8a652b110f565626836847439f7f4 SHA1 6e62626aa0eab5a467ba993bfcb5a5f541938036 SHA256 fdb8310b65d81a6d1bd75c9cc52a2081a2bb0f31fcf212e1eb685a6a5cd8b9ea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiSRn0ACgkQ1fmVwcYIWAa5nwCg1jheIvU8JnHyyzD72sVu/n7d
+XQEAoMaEMrRDWj5FboPbW2X7SyB1E9MZ
+=KIN6
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse/metadata.xml b/app-crypt/seahorse/metadata.xml
index 819c7bc5b7aa..522485530708 100644
--- a/app-crypt/seahorse/metadata.xml
+++ b/app-crypt/seahorse/metadata.xml
@@ -16,6 +16,8 @@
 	<flag name="ldap">Enable seahorse to manipulate GPG keys on a LDAP server.</flag>
 	<flag name="nautilus">Enable file encryption plugin to integrate into
 	<pkg>gnome-base/nautilus</pkg> context menu.</flag>
+	<flag name="xulrunner">Selects which gecko engine against which to build the
+	<pkg>www-client/epiphany</pkg> plugin.</flag>
 </use>
 <longdescription>Seahorse is a Gnome interface for GnuPG.  It's main purpose is to be a PGP/GPG Key Manager, though 
 it has other components including a text editor and file manager.
diff --git a/app-crypt/seahorse/seahorse-2.22.1.ebuild b/app-crypt/seahorse/seahorse-2.22.1.ebuild
deleted file mode 100644
index c071ee1dd200..000000000000
--- a/app-crypt/seahorse/seahorse-2.22.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.22.1.ebuild,v 1.5 2008/06/15 12:24:26 eva Exp $
-
-EAPI="1"
-
-inherit eutils gnome2
-
-GNOME_TARBALL_SUFFIX="gz"
-
-DESCRIPTION="A GNOME application for managing encryption keys"
-HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="applet avahi dbus debug epiphany gedit gnome-keyring ldap libnotify nautilus"
-
-RDEPEND=">=gnome-base/libgnome-2.14
-		 >=gnome-base/libgnomeui-2.10
-		 >=gnome-base/gnome-vfs-2.0
-		 >=gnome-base/libglade-2.0
-		 >=gnome-base/gconf-2.0
-		 >=dev-libs/glib-2.10
-		 >=x11-libs/gtk+-2.10
-		 net-libs/libsoup:2.4
-		 >=dev-libs/libxml2-2.6.0
-		 || (
-				=app-crypt/gnupg-1.4*
-				=app-crypt/gnupg-2.0*
-			)
-		 >=app-crypt/gpgme-1.0.0
-		   net-misc/openssh
-		   x11-misc/shared-mime-info
-		 avahi? ( >=net-dns/avahi-0.6 )
-		 dbus?	(
-			>=dev-libs/dbus-glib-0.72
-			applet? ( >=gnome-base/gnome-panel-2.10 )
-			epiphany? ( >=www-client/epiphany-2.14 )
-			gedit? ( >=app-editors/gedit-2.16 )
-		 )
-		 gnome-keyring? ( >=gnome-base/gnome-keyring-2.21.3.2 )
-		 ldap? ( net-nds/openldap )
-		 libnotify? ( >=x11-libs/libnotify-0.3.2 )
-		 nautilus? ( >=gnome-base/nautilus-2.12 )"
-DEPEND="${RDEPEND}
-		sys-devel/gettext
-		>=app-text/gnome-doc-utils-0.3.2
-		>=app-text/scrollkeeper-0.3
-		>=dev-util/pkgconfig-0.20
-		>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
-
-pkg_setup() {
-	if ! use dbus ; then
-		if use applet ; then
-			elog
-			elog "The panel applet requires that you build seahorse with DBUS support."
-			elog
-		fi
-
-		if use gedit ; then
-			elog
-			elog "The GEdit plugin requires that you build seahorse with DBUS support."
-			elog
-		fi
-
-		if use epiphany ; then
-			elog
-			elog "The epiphany plugin requires that you build seahorse with DBUS support."
-			elog
-		fi
-
-		eerror "Please add dbus to your USE flags and re-emerge seahorse"
-		eerror "plugins require dbus support"
-	fi
-
-	G2CONF="${G2CONF}
-		--enable-ssh
-		--disable-scrollkeeper
-		--disable-update-mime-database
-		--enable-hkp --with-keyserver --enable-agent
-		$(use_enable applet)
-		$(use_enable avahi sharing)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable epiphany)
-		$(use_enable gedit)
-		$(use_enable gnome-keyring)
-		$(use_enable ldap)
-		$(use_enable libnotify)
-		$(use_enable nautilus)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	epatch "${FILESDIR}/${PN}-0.9.10-update-mime.patch"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# remove conflicts with x11-misc/shared-mime-info
-	rm -rf "${D}/usr/share/mime/"{application,magic,globs,XMLnamespaces}
-
-	chmod -s "${D}/usr/bin/seahorse-agent"
-	chmod -s "${D}/usr/bin/seahorse-daemon"
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/70-seahorse-agent"
-}
diff --git a/app-crypt/seahorse/seahorse-2.22.2.ebuild b/app-crypt/seahorse/seahorse-2.22.2.ebuild
deleted file mode 100644
index 66d99f33321c..000000000000
--- a/app-crypt/seahorse/seahorse-2.22.2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.22.2.ebuild,v 1.3 2008/06/15 12:34:40 eva Exp $
-
-EAPI="1"
-
-inherit eutils gnome2
-
-DESCRIPTION="A GNOME application for managing encryption keys"
-HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="applet avahi dbus debug epiphany gedit gnome-keyring ldap libnotify nautilus"
-
-RDEPEND=">=gnome-base/libgnome-2.14
-		 >=gnome-base/libgnomeui-2.10
-		 >=gnome-base/gnome-vfs-2.0
-		 >=gnome-base/libglade-2.0
-		 >=gnome-base/gconf-2.0
-		 >=dev-libs/glib-2.10
-		 >=x11-libs/gtk+-2.10
-		 net-libs/libsoup:2.4
-		 >=dev-libs/libxml2-2.6.0
-		 || (
-				=app-crypt/gnupg-1.4*
-				=app-crypt/gnupg-2.0*
-			)
-		 >=app-crypt/gpgme-1.0.0
-		   net-misc/openssh
-		   x11-misc/shared-mime-info
-		 avahi? ( >=net-dns/avahi-0.6 )
-		 dbus?	(
-			>=dev-libs/dbus-glib-0.72
-			applet? ( >=gnome-base/gnome-panel-2.10 )
-			epiphany? ( >=www-client/epiphany-2.14 )
-			gedit? ( >=app-editors/gedit-2.16 )
-		 )
-		 gnome-keyring? ( >=gnome-base/gnome-keyring-2.21.3.2 )
-		 ldap? ( net-nds/openldap )
-		 libnotify? ( >=x11-libs/libnotify-0.3.2 )
-		 nautilus? ( >=gnome-base/nautilus-2.12 )"
-DEPEND="${RDEPEND}
-		sys-devel/gettext
-		>=app-text/gnome-doc-utils-0.3.2
-		>=app-text/scrollkeeper-0.3
-		>=dev-util/pkgconfig-0.20
-		>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
-
-pkg_setup() {
-	if ! use dbus ; then
-		if use applet ; then
-			elog
-			elog "The panel applet requires that you build seahorse with DBUS support."
-			elog
-		fi
-
-		if use gedit ; then
-			elog
-			elog "The GEdit plugin requires that you build seahorse with DBUS support."
-			elog
-		fi
-
-		if use epiphany ; then
-			elog
-			elog "The epiphany plugin requires that you build seahorse with DBUS support."
-			elog
-		fi
-
-		eerror "Please add dbus to your USE flags and re-emerge seahorse"
-		eerror "plugins require dbus support"
-	fi
-
-	G2CONF="${G2CONF}
-		--enable-ssh
-		--disable-scrollkeeper
-		--disable-update-mime-database
-		--enable-hkp --with-keyserver --enable-agent
-		$(use_enable applet)
-		$(use_enable avahi sharing)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable epiphany)
-		$(use_enable gedit)
-		$(use_enable gnome-keyring)
-		$(use_enable ldap)
-		$(use_enable libnotify)
-		$(use_enable nautilus)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	epatch "${FILESDIR}/${PN}-0.9.10-update-mime.patch"
-
-	# Fix building on fbsd
-	epatch "${FILESDIR}/${P}-fbsd.patch"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# remove conflicts with x11-misc/shared-mime-info
-	rm -rf "${D}/usr/share/mime/"{application,magic,globs,XMLnamespaces}
-
-	chmod -s "${D}/usr/bin/seahorse-agent"
-	chmod -s "${D}/usr/bin/seahorse-daemon"
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/70-seahorse-agent"
-}
diff --git a/app-crypt/seahorse/seahorse-2.22.3.ebuild b/app-crypt/seahorse/seahorse-2.22.3.ebuild
index a7281a60f388..4b46cbfc1ff1 100644
--- a/app-crypt/seahorse/seahorse-2.22.3.ebuild
+++ b/app-crypt/seahorse/seahorse-2.22.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.22.3.ebuild,v 1.4 2008/07/30 21:59:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.22.3.ebuild,v 1.5 2008/07/31 23:10:46 eva Exp $
 
 EAPI="1"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="applet avahi dbus debug epiphany gedit gnome-keyring ldap libnotify nautilus"
+IUSE="applet avahi dbus debug epiphany gedit gnome-keyring ldap libnotify nautilus xulrunner"
 
 RDEPEND=">=gnome-base/libgnome-2.14
 		 >=gnome-base/libgnomeui-2.10
@@ -34,7 +34,11 @@ RDEPEND=">=gnome-base/libgnome-2.14
 		 dbus?	(
 			>=dev-libs/dbus-glib-0.72
 			applet? ( >=gnome-base/gnome-panel-2.10 )
-			epiphany? ( >=www-client/epiphany-2.14 )
+			epiphany? (
+				>=www-client/epiphany-2.14
+				xulrunner? ( =net-libs/xulrunner-1.8* )
+				!xulrunner? ( =www-client/mozilla-firefox-2* )
+			)
 			gedit? ( >=app-editors/gedit-2.16 )
 		 )
 		 gnome-keyring? ( >=gnome-base/gnome-keyring-2.21.3.2 )
@@ -68,6 +72,12 @@ pkg_setup() {
 			elog
 			elog "The epiphany plugin requires that you build seahorse with DBUS support."
 			elog
+
+			if use xulrunner; then
+				G2CONF="${G2CONF} --with-gecko=xulrunner"
+			else
+				G2CONF="${G2CONF} --with-gecko=firefox"
+			fi
 		fi
 
 		eerror "Please add dbus to your USE flags and re-emerge seahorse"