New version for GNOME 2.28. Clean up old revision.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 46 insertions, 25 deletions

diff --git a/app-crypt/seahorse-plugins/ChangeLog b/app-crypt/seahorse-plugins/ChangeLog
index 559b299275b7..8e954cd018f2 100644
--- a/app-crypt/seahorse-plugins/ChangeLog
+++ b/app-crypt/seahorse-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/seahorse-plugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-plugins/ChangeLog,v 1.10 2009/10/24 16:58:15 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-plugins/ChangeLog,v 1.11 2009/10/29 21:05:29 eva Exp $
+
+*seahorse-plugins-2.28.1 (29 Oct 2009)
+
+  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -seahorse-plugins-2.24.1.ebuild, seahorse-plugins-2.26.2-r1.ebuild,
+  +seahorse-plugins-2.28.1.ebuild:
+  New version for GNOME 2.28. Clean up old revision.
 
   24 Oct 2009; nixnut <nixnut@gentoo.org> seahorse-plugins-2.26.2.ebuild:
   ppc stable #281427
diff --git a/app-crypt/seahorse-plugins/seahorse-plugins-2.26.2-r1.ebuild b/app-crypt/seahorse-plugins/seahorse-plugins-2.26.2-r1.ebuild
index dec11a81f285..ae4dd845d161 100644
--- a/app-crypt/seahorse-plugins/seahorse-plugins-2.26.2-r1.ebuild
+++ b/app-crypt/seahorse-plugins/seahorse-plugins-2.26.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.26.2-r1.ebuild,v 1.1 2009/10/17 20:30:51 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-plugins/seahorse-plugins-2.26.2-r1.ebuild,v 1.2 2009/10/29 21:05:29 eva Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="applet debug epiphany gedit libnotify nautilus test"
 
 RDEPEND="
diff --git a/app-crypt/seahorse-plugins/seahorse-plugins-2.24.1.ebuild b/app-crypt/seahorse-plugins/seahorse-plugins-2.28.1.ebuild
index 24ad61bd935e..50abd4755b11 100644
--- a/app-crypt/seahorse-plugins/seahorse-plugins-2.24.1.ebuild
+++ b/app-crypt/seahorse-plugins/seahorse-plugins-2.28.1.ebuild
@@ -1,58 +1,63 @@
 # Copyright 1999-2009 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.24.1.ebuild,v 1.1 2009/03/17 09:41:58 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-plugins/seahorse-plugins-2.28.1.ebuild,v 1.1 2009/10/29 21:05:29 eva Exp $
 
-inherit gnome2
+EAPI="2"
+
+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="~amd64 ~x86"
-IUSE="applet debug epiphany gedit libnotify nautilus test xulrunner"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="applet debug epiphany gedit libnotify nautilus test"
 
 RDEPEND="
 	>=gnome-base/libglade-2.0
 	>=gnome-base/gconf-2.0
 	>=x11-libs/gtk+-2.10
 	>=dev-libs/glib-2.16
+	>=dev-libs/dbus-glib-0.72
+	>=app-crypt/gpgme-1.0.0
+	>=app-crypt/seahorse-2.25
+	>=gnome-base/gnome-keyring-2.25
+	>=gnome-extra/evolution-data-server-1.8
+
 	|| (
 		=app-crypt/gnupg-1.4*
 		=app-crypt/gnupg-2.0* )
-	>=app-crypt/gpgme-1.0.0
+
 	nautilus? ( >=gnome-base/nautilus-2.12 )
-	>=gnome-base/gnome-keyring-2.23.6
-	>=dev-libs/dbus-glib-0.72
 	epiphany? (
-		>=www-client/epiphany-2.22
-		xulrunner? ( =net-libs/xulrunner-1.8* )
-		!xulrunner? ( =www-client/mozilla-firefox-2* )
+		>=www-client/epiphany-2.24
 		>=dev-libs/libxml2-2.6.0 )
 	gedit? ( >=app-editors/gedit-2.16 )
 	applet? ( >=gnome-base/gnome-panel-2.10 )
-	>=app-crypt/seahorse-2.23.92
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	>=gnome-extra/evolution-data-server-1.8"
+	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"
+	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"
 
 pkg_setup() {
 	if use epiphany ; then
-		if use xulrunner ; then
-			G2CONF="${G2CONF} --with-gecko=xulrunner"
+		if has_version '>=www-client/epiphany-2.24.3-r10'; then
+			G2CONF="${G2CONF} --with-gecko=libxul-unstable"
 		else
-			G2CONF="${G2CONF} --with-gecko=firefox"
+			# 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
 		$(use_enable applet)
 		$(use_enable debug)
 		$(use_enable epiphany)
@@ -62,9 +67,18 @@ pkg_setup() {
 		$(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
 
+	find "${D}" name "*.la" -delete || die "remove of la files failed"
+
 	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/70-seahorse-agent" || die "doexe failed"
+	doexe "${FILESDIR}/70-seahorse-agent" || die "doexe failed"
 }