diff options
| -rw-r--r-- | app-crypt/seahorse/ChangeLog | 6 | ||||
| -rw-r--r-- | app-crypt/seahorse/metadata.xml | 2 | ||||
| -rw-r--r-- | app-crypt/seahorse/seahorse-2.22.1.ebuild | 112 | ||||
| -rw-r--r-- | app-crypt/seahorse/seahorse-2.22.2.ebuild | 113 | ||||
| -rw-r--r-- | app-crypt/seahorse/seahorse-2.22.3.ebuild | 16 |
5 files changed, 20 insertions, 229 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/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" |