Add new version for Gnome 2.30

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 97 insertions, 26 deletions

diff --git a/app-crypt/seahorse-plugins/ChangeLog b/app-crypt/seahorse-plugins/ChangeLog
index ec4b6a8f5a75..61871c70d23b 100644
--- a/app-crypt/seahorse-plugins/ChangeLog
+++ b/app-crypt/seahorse-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/seahorse-plugins
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-plugins/ChangeLog,v 1.21 2010/06/04 20:44:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-plugins/ChangeLog,v 1.22 2010/06/13 19:30:05 pacho Exp $
+
+*seahorse-plugins-2.30.1 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org>
+  -seahorse-plugins-2.28.1.ebuild, +seahorse-plugins-2.30.1.ebuild:
+  Add new version for Gnome 2.30.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org>
   seahorse-plugins-2.28.1-r1.ebuild:
diff --git a/app-crypt/seahorse-plugins/seahorse-plugins-2.28.1.ebuild b/app-crypt/seahorse-plugins/seahorse-plugins-2.30.1.ebuild
index 7085c638b190..2ca5e2b7eb32 100644
--- a/app-crypt/seahorse-plugins/seahorse-plugins-2.28.1.ebuild
+++ b/app-crypt/seahorse-plugins/seahorse-plugins-2.30.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/app-crypt/seahorse-plugins/seahorse-plugins-2.28.1.ebuild,v 1.4 2010/02/10 03:31:05 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-plugins/seahorse-plugins-2.30.1.ebuild,v 1.1 2010/06/13 19:30:05 pacho Exp $
 
 EAPI="2"
 
@@ -12,12 +12,12 @@ HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="applet debug epiphany gedit libnotify nautilus test"
+IUSE="applet debug gedit libnotify nautilus test"
 
 RDEPEND="
 	>=gnome-base/libglade-2.0
 	>=gnome-base/gconf-2.0
-	>=x11-libs/gtk+-2.10
+	>=x11-libs/gtk+-2.18
 	>=dev-libs/glib-2.16
 	>=dev-libs/dbus-glib-0.72
 	>=app-crypt/gpgme-1.0.0
@@ -30,9 +30,6 @@ RDEPEND="
 		=app-crypt/gnupg-2.0* )
 
 	nautilus? ( >=gnome-base/nautilus-2.12 )
-	epiphany? (
-		>=www-client/epiphany-2.24
-		>=dev-libs/libxml2-2.6.0 )
 	gedit? ( >=app-editors/gedit-2.16 )
 	applet? ( >=gnome-base/gnome-panel-2.10 )
 	libnotify? ( >=x11-libs/libnotify-0.3.2 )"
@@ -44,36 +41,19 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35"
 
 pkg_setup() {
-	if use epiphany ; then
-		if has_version '>=www-client/epiphany-2.24.3-r10'; then
-			G2CONF="${G2CONF} --with-gecko=libxul-unstable"
-		else
-			# Now, epiphany could be using xul-1.8, xul-1.9 or ff-2
-			# Let it auto-detect.
-			:
-		fi
-	fi
-
 	G2CONF="${G2CONF}
 		--enable-agent
 		--disable-update-mime-database
 		--disable-static
+		--disable-epiphany
 		$(use_enable applet)
 		$(use_enable debug)
-		$(use_enable epiphany)
 		$(use_enable gedit)
 		$(use_enable libnotify)
 		$(use_enable nautilus)
 		$(use_enable test tests)"
 }
 
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-}
-
 src_install() {
 	gnome2_src_install
 
diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index 88ce02cf595c..6369e07f32c0 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.128 2010/06/04 20:32:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.129 2010/06/13 19:27:15 pacho Exp $
+
+*seahorse-2.30.1 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org> +seahorse-2.30.1.ebuild:
+  Add new version for Gnome 2.30.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org> seahorse-2.28.1.ebuild:
   x86 stable, bug #314899
diff --git a/app-crypt/seahorse/seahorse-2.30.1.ebuild b/app-crypt/seahorse/seahorse-2.30.1.ebuild
new file mode 100644
index 000000000000..524fff2169c5
--- /dev/null
+++ b/app-crypt/seahorse/seahorse-2.30.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.30.1.ebuild,v 1.1 2010/06/13 19:27:15 pacho Exp $
+
+EAPI="2"
+
+inherit autotools 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 ~x86-fbsd"
+IUSE="avahi debug doc ldap libnotify test"
+
+RDEPEND="
+	>=gnome-base/gconf-2.0
+	>=dev-libs/glib-2.10
+	>=x11-libs/gtk+-2.18
+	>=dev-libs/dbus-glib-0.72
+	>=gnome-base/gnome-keyring-2.25.5
+	net-libs/libsoup:2.4
+	x11-misc/shared-mime-info
+
+	net-misc/openssh
+	>=app-crypt/gpgme-1.0.0
+	|| (
+		=app-crypt/gnupg-1.4*
+		=app-crypt/gnupg-2.0* )
+
+	avahi? ( >=net-dns/avahi-0.6 )
+	ldap? ( net-nds/openldap )
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )"
+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
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--enable-pgp
+		--enable-ssh
+		--enable-pkcs11
+		--disable-static
+		--disable-scrollkeeper
+		--disable-update-mime-database
+		--enable-hkp
+		--disable-introspection
+		$(use_enable avahi sharing)
+		$(use_enable debug)
+		$(use_enable ldap)
+		$(use_enable libnotify)
+		$(use_enable test tests)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Make it libtool-1 compatible
+	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+}
+
+pkg_postinst() {
+	einfo "The seahorse-agent tool has been moved to app-crypt/seahorse-plugins"
+	einfo "Use that if you want seahorse to manage your terminal SSH keys"
+}