New version for GNOME 2.28. Clean up old revisions.

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

4 files changed, 41 insertions, 68 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index 3c2406cd08b1..9557a62b9b30 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.120 2009/10/24 16:50:30 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.121 2009/10/29 21:04:49 eva Exp $
+
+*seahorse-2.28.1 (29 Oct 2009)
+
+  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -seahorse-2.24.1.ebuild, -seahorse-2.26.1.ebuild,
+  +files/seahorse-2.28.0-as-needed.patch, +seahorse-2.28.1.ebuild:
+  New version for GNOME 2.28. Clean up old revisions.
 
   24 Oct 2009; nixnut <nixnut@gentoo.org> seahorse-2.26.2.ebuild:
   ppc stable #281427
diff --git a/app-crypt/seahorse/files/seahorse-2.28.0-as-needed.patch b/app-crypt/seahorse/files/seahorse-2.28.0-as-needed.patch
new file mode 100644
index 000000000000..1ffef5275c4b
--- /dev/null
+++ b/app-crypt/seahorse/files/seahorse-2.28.0-as-needed.patch
@@ -0,0 +1,16 @@
+Fix linking libgcryptui.so with -Wl,--as-needed in LDFLAGS. Missing DBUS_CFLAGS
+in INCLUDES.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=596691
+
+---
+--- libcryptui/Makefile.am
++++ libcryptui/Makefile.am
+@@ -70,6 +70,7 @@
+ 
+ INCLUDES = -I$(top_builddir) \
+ 	-I$(top_srcdir) \
++	$(DBUS_CFLAGS) \
+ 	$(LIBCRYPTUI_CFLAGS) \
+ 	-DLIBCRYPTUI_BUILD=1 \
+ 	-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE
diff --git a/app-crypt/seahorse/seahorse-2.24.1.ebuild b/app-crypt/seahorse/seahorse-2.24.1.ebuild
deleted file mode 100644
index 4e696a38b083..000000000000
--- a/app-crypt/seahorse/seahorse-2.24.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.24.1.ebuild,v 1.1 2009/03/17 08:57:17 nirbheek 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 ~x86-fbsd"
-IUSE="avahi debug ldap libnotify"
-
-RDEPEND=">=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
-	|| (
-		=app-crypt/gnupg-1.4*
-		=app-crypt/gnupg-2.0* )
-	>=app-crypt/gpgme-1.0.0
-	  net-misc/openssh
-	avahi? ( >=net-dns/avahi-0.6 )
-	>=dev-libs/dbus-glib-0.72
-	>=gnome-base/gnome-keyring-2.23.6
-	ldap? ( net-nds/openldap )
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	  x11-misc/shared-mime-info"
-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() {
-	G2CONF="${G2CONF}
-		--enable-pgp
-		--enable-ssh
-		--enable-pkcs11
-		--disable-scrollkeeper
-		--disable-update-mime-database
-		--enable-hkp
-		$(use_enable avahi sharing)
-		$(use_enable debug)
-		$(use_enable ldap)
-		$(use_enable libnotify)"
-}
-
-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"
-}
diff --git a/app-crypt/seahorse/seahorse-2.26.1.ebuild b/app-crypt/seahorse/seahorse-2.28.1.ebuild
index ff8827feee74..d5fcd2524f31 100644
--- a/app-crypt/seahorse/seahorse-2.26.1.ebuild
+++ b/app-crypt/seahorse/seahorse-2.28.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.26.1.ebuild,v 1.1 2009/05/14 08:53:16 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.28.1.ebuild,v 1.1 2009/10/29 21:04:49 eva Exp $
 
-EAPI="1"
+EAPI="2"
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="A GNOME application for managing encryption keys"
 HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="avahi debug doc ldap libnotify test"
 
-RDEPEND=">=gnome-base/libglade-2.0
+RDEPEND="
 	>=gnome-base/gconf-2.0
 	>=dev-libs/glib-2.10
 	>=x11-libs/gtk+-2.10
@@ -47,6 +47,7 @@ pkg_setup() {
 		--enable-pgp
 		--enable-ssh
 		--enable-pkcs11
+		--disable-static
 		--disable-scrollkeeper
 		--disable-update-mime-database
 		--enable-hkp
@@ -57,14 +58,22 @@ pkg_setup() {
 		$(use_enable test tests)"
 }
 
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
+	gnome2_src_prepare
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=596691
+	epatch "${FILESDIR}/${PN}-2.28.0-as-needed.patch"
 
 	# Make it libtool-1 compatible
 	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
 
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed 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() {