Bump, drop old. Notable changes: gpg key loading improvements.

(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)

2 files changed, 14 insertions, 27 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index 9b440fbcaf11..fc7fb49f14ac 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.151 2011/10/30 07:39:19 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.152 2011/11/17 06:11:08 tetromino Exp $
+
+*seahorse-3.2.2 (17 Nov 2011)
+
+  17 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -seahorse-3.0.2.ebuild, +seahorse-3.2.2.ebuild:
+  Bump, drop old. Notable changes: gpg key loading improvements.
 
 *seahorse-3.2.1 (30 Oct 2011)
 
diff --git a/app-crypt/seahorse/seahorse-3.0.2.ebuild b/app-crypt/seahorse/seahorse-3.2.2.ebuild
index b45284d2c619..27d5d6b0a05e 100644
--- a/app-crypt/seahorse/seahorse-3.0.2.ebuild
+++ b/app-crypt/seahorse/seahorse-3.2.2.ebuild
@@ -1,35 +1,25 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.0.2.ebuild,v 1.1 2011/08/16 23:22:14 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.2.2.ebuild,v 1.1 2011/11/17 06:11:08 tetromino Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="A GNOME application for managing encryption keys"
 HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avahi debug doc +introspection ldap libnotify test"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
+IUSE="avahi debug doc ldap test"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 
-# Pull in libnotify-0.7 because it's controlled via an automagic ifdef
 COMMON_DEPEND="
-	>=gnome-base/gconf-2:2
 	>=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-2.90.0:3[introspection?]
-	>=dev-libs/dbus-glib-0.72
-	>=gnome-base/gnome-keyring-2.91.2
+	>=x11-libs/gtk+-2.90.0:3
+	>=gnome-base/gnome-keyring-3.1.5
 	net-libs/libsoup:2.4
 	x11-misc/shared-mime-info
 
@@ -40,9 +30,7 @@ COMMON_DEPEND="
 		=app-crypt/gnupg-1.4* )
 
 	avahi? ( >=net-dns/avahi-0.6 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
 	ldap? ( net-nds/openldap )
-	libnotify? ( >=x11-libs/libnotify-0.7.0 )
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
@@ -66,12 +54,9 @@ pkg_setup() {
 		--disable-scrollkeeper
 		--disable-update-mime-database
 		--enable-hkp
-		--with-gtk=3.0
 		$(use_enable avahi sharing)
 		$(use_enable debug)
-		$(use_enable introspection)
 		$(use_enable ldap)
-		$(use_enable libnotify)
 		$(use_enable test tests)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
 }
@@ -80,11 +65,7 @@ src_prepare() {
 	# FIXME: Do not mess with CFLAGS with USE="debug"
 	sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
 		-e 's/-Werror//' \
-		-i configure.in configure || die "sed 1 failed"
-
-	# FIXME: Disable test not ported to gtk:3
-	sed -e 's/^SUBDIRS = .*/SUBDIRS = /' \
-		-i libcryptui/Makefile.am libcryptui/Makefile.in || die "sed 2 failed"
+		-i configure.ac configure || die "sed 1 failed"
 
 	gnome2_src_prepare
 }