Not compatible with gnupg-2.1 (#547456), drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 12 insertions, 141 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index 13a447915309..bbe530ce8329 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.191 2015/03/15 13:14:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.192 2015/05/13 16:54:49 pacho Exp $
+
+  13 May 2015; Pacho Ramos <pacho@gentoo.org> -seahorse-3.12.2.ebuild,
+  -seahorse-3.14.0.ebuild, seahorse-3.14.1.ebuild:
+  Not compatible with gnupg-2.1 (#547456), drop old
 
   15 Mar 2015; Pacho Ramos <pacho@gentoo.org> seahorse-3.14.1.ebuild:
   x86 stable, bug 534012
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 80cd590121a2..dce7210ac407 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST seahorse-3.12.2.tar.xz 1398292 SHA256 5e6fb25373fd4490e181e2fa0f5cacf99b78b2f6caa5d91c9c605900fb5f3839 SHA512 016c87f1a356d3d0ac57931e139c20c67b4e36832d9a8947ff39bfc040d970ea25bfd8573624dbb3ebcec05db0803667d42afb2cb15a09d0ec8199dcc5543796 WHIRLPOOL 7cd023d0d90b23c3a39a776a872dc2ba218dbcf73670561ff94f397a97ec5dd97baece8e956d810dfb6613acf82d20b93f398ca7e5af54af1a78b67e6901d6f4
-DIST seahorse-3.14.0.tar.xz 1450280 SHA256 2ea22830f5af1a11fadbdd8da6b34513410f2c371d9ec75fbf9b9b2d9177fc8a SHA512 2d40f9f2a60bcebf23c1b573f9585251af64e8bec64898e25f6dec8cd7dbd6c559bc51c47b9a7ef2e4a83ffa1328c9721ccb0e7863b03707b35725e5baabc3b5 WHIRLPOOL 700c2311a94f9ade51a2581cdf9829a177bb100fedafb321fa3b9febc6988340bb4c56f62fee8637b572d7955e6d270f44d43986df52d632eecca175f36f3b1e
 DIST seahorse-3.14.1.tar.xz 1504128 SHA256 092a890982fa594da8a384f156b961392f69ce5d9518a9801035e6deb1f05e93 SHA512 1147ea601c1cb17dd1606d02f86261b0381dfdab14329fee7d68bd635420fec98174b2509b09c68216918bd9ca31f22ea538fa34cae1a8e0f4c44714b9693c0f WHIRLPOOL 208c841a28b8c7c0916c02e1a68eaa7c74681c5a3b8e0be30f65a4da953cefd9bb94d57373640513b68de9b204e9d1fc65429bf5dca0344336390068fe4a47e1
-EBUILD seahorse-3.12.2.ebuild 1571 SHA256 48ab5d4320ac44fc6e773fd6e0105368979517fd9d3a9b31d8f805a31fbd19b9 SHA512 11f2196055f8cc7ad3f830f7ae280de8b0f09fb1947c8839064e7d18b2fd65018aa4881fe1035fb0aba001d752acf6edb8a872c054e75a460bcc1771c3f4984d WHIRLPOOL f4b81eb32d0973d1510874c2ae03e87843522dd380520a461d3f901c02249bef219a413d780239627352071be1330d7d111e02f4a643de9b67d550f40ca230c6
-EBUILD seahorse-3.14.0.ebuild 1573 SHA256 ddb67979fbcc5eec693368fd1bf75acfe5feb8fe2662945ea00f353625c39282 SHA512 85c435c3797092f830476de8724f7a1999b100ba8ecff1c6990ca3f38ed3a5652fd0777ba9caa5e60bf0e598bdb474ecc46d65f6618cda006401ad5abd65e420 WHIRLPOOL d98145e6cd7080bb1c3ecc2cf20d46a41636d7072efda162d168bdf0742d8b6c73ff89ffa2cdbfd9f78edcb392d0e2e39bf8f5ed05a6b6e50cb5ca5adea7584e
-EBUILD seahorse-3.14.1.ebuild 1572 SHA256 cf9921b5551ac4f4e283ba80aac2b4716031999ecc10a86947a6af0b11bb81a8 SHA512 3b8e1f49df503c3b7533a2050c3ed7bad183b46a8815bef275bfeec508a75ebc77409b4e47b9df9076882c68935ec7a71172c89a3888711e07d14ece6d05e8fa WHIRLPOOL 17d1b0c2cef0cd67a3018bb8bcf41b0196d390d2510146fcef3c263ca61d43fa9e119e5457e70248e097b2c69b6aeb740830cfc5953b75d6cba77014837ae24b
-MISC ChangeLog 27474 SHA256 aa83181c8ab3ddc5f785cd58f13a386728fbf18345c944016e66231e456b5a19 SHA512 ad0481457e82fab184166de55eb1375c32574ca2d5a0436b14da75688df2397cb51cbe091e0bb84f4a9063656cfbaa5f4bd35d8cd9fa048989881c4da1cb4e99 WHIRLPOOL 7e2219f78348d3aaa40f76f2b528603e71a7fc94773401c9a6a598b0f27d69c9d2eb79b13b51fe8c1653bf3c7a04f215746ea5072a64bb9a81c80e1604e32edc
+EBUILD seahorse-3.14.1.ebuild 1594 SHA256 0967859b5bd07e814d6b548306396b1efb788407f81a09a130ba5a43d1d3a7d0 SHA512 5f3fac53ca6ef8257abd3e4e88a410b4ee4ea933d4f3632b270d3285232b7863072959861b4319baef1aed66f82b15fd8b901e4042ba5e471ae5e108e1b3f63f WHIRLPOOL bba79318701c64290aa1fb95b55fa3002e35a4587a1fdbee176b9167bccccde3c6d2feb15020d0966c759a0599b0db20567c7822d39f9a717e2b546754de8c04
+MISC ChangeLog 27649 SHA256 d5855b16c116967dcc7b25ae422260613e63876d165430b9e6ee7fb4337f2763 SHA512 3e5e5d81afd6e1ad46cc8e8f7e47a23815022a00289acda2cf1c7292a682a205b2a16535bb3e9e26d88ca8a8cd456612e72cafdd511165aaa3fda321581a28cd WHIRLPOOL da06a69fd03f8226dd7412f53f2840b9c75c438907077cfdac54312b360a3f9139e3d9876de2a1db32a73a7b6a02e39c4cb1816b778906404ef74fb263f920d8
 MISC metadata.xml 780 SHA256 a451d0176823370754ceaaa2bd6d5e372523008eaf29410541378392241d20d6 SHA512 3e5c6a4edd1ab1ce4353145afbb96a353b126c19295536e1207766fe7348050842e871e93013d63d067078ffe3c017d366e4677390992de2a7d1d9a5775960c1 WHIRLPOOL 39481ab218ed04e835f5447ed74df6d4d26102c8e0f0e48b4f85aea41afa0284b529d28ad937e9d02fef17d52e564c3c765ee8117d8ce3fbc3b08d780dcfcaea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUFhaEACgkQCaWpQKGI+9RYAACfaCP7iIOkFu0i6ptsWBh2VYjL
-5lAAnRQvC2JkmDB4b2Uk2RQw/CJ9L3+u
-=Tu46
+iEYEAREIAAYFAlVTgdoACgkQCaWpQKGI+9QyDACfcXHffko+qPzB04LZJkfKlN03
+28wAnjExGwcOsZdDb4oHC+lhhrDDHHYI
+=W7br
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse/seahorse-3.12.2.ebuild b/app-crypt/seahorse/seahorse-3.12.2.ebuild
deleted file mode 100644
index 9119a719485e..000000000000
--- a/app-crypt/seahorse/seahorse-3.12.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.12.2.ebuild,v 1.4 2014/12/30 11:41:23 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="A GNOME application for managing encryption keys"
-HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE="avahi debug ldap"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.11.91:=
-	>=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-3.4:3
-	>=app-crypt/libsecret-0.16
-	>=net-libs/libsoup-2.33.92:2.4
-	x11-misc/shared-mime-info
-
-	net-misc/openssh
-	>=app-crypt/gpgme-1
-	>=app-crypt/gnupg-1.4
-
-	avahi? ( >=net-dns/avahi-0.6:= )
-	ldap? ( net-nds/openldap:= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# Need seahorse-plugins git snapshot
-RDEPEND="${COMMON_DEPEND}
-	!<app-crypt/seahorse-plugins-2.91.0_pre20110114
-"
-
-src_prepare() {
-	# FIXME: Do not mess with CFLAGS with USE="debug"
-	sed -e '/CFLAGS="$CFLAGS -g/d' \
-		-e '/CFLAGS="$CFLAGS -O0/d' \
-		-i configure.ac configure || die "sed 1 failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# bindir is needed due to bad macro expansion in desktop file, bug #508610
-	gnome2_src_configure \
-		--bindir=/usr/bin \
-		--enable-pgp \
-		--enable-ssh \
-		--enable-pkcs11 \
-		--enable-hkp \
-		$(use_enable avahi sharing) \
-		$(use_enable debug) \
-		$(use_enable ldap) \
-		ITSTOOL=$(type -P true) \
-		VALAC=$(type -P true)
-}
diff --git a/app-crypt/seahorse/seahorse-3.14.0.ebuild b/app-crypt/seahorse/seahorse-3.14.0.ebuild
deleted file mode 100644
index d9a9b50c12a7..000000000000
--- a/app-crypt/seahorse/seahorse-3.14.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.14.0.ebuild,v 1.2 2014/12/30 11:41:23 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="A GNOME application for managing encryption keys"
-HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE="avahi debug ldap"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.11.91:=
-	>=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-3.4:3
-	>=app-crypt/libsecret-0.16
-	>=net-libs/libsoup-2.33.92:2.4
-	x11-misc/shared-mime-info
-
-	net-misc/openssh
-	>=app-crypt/gpgme-1
-	>=app-crypt/gnupg-1.4
-
-	avahi? ( >=net-dns/avahi-0.6:= )
-	ldap? ( net-nds/openldap:= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# Need seahorse-plugins git snapshot
-RDEPEND="${COMMON_DEPEND}
-	!<app-crypt/seahorse-plugins-2.91.0_pre20110114
-"
-
-src_prepare() {
-	# FIXME: Do not mess with CFLAGS with USE="debug"
-	sed -e '/CFLAGS="$CFLAGS -g/d' \
-		-e '/CFLAGS="$CFLAGS -O0/d' \
-		-i configure.ac configure || die "sed 1 failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# bindir is needed due to bad macro expansion in desktop file, bug #508610
-	gnome2_src_configure \
-		--bindir=/usr/bin \
-		--enable-pgp \
-		--enable-ssh \
-		--enable-pkcs11 \
-		--enable-hkp \
-		$(use_enable avahi sharing) \
-		$(use_enable debug) \
-		$(use_enable ldap) \
-		ITSTOOL=$(type -P true) \
-		VALAC=$(type -P true)
-}
diff --git a/app-crypt/seahorse/seahorse-3.14.1.ebuild b/app-crypt/seahorse/seahorse-3.14.1.ebuild
index 7cd2bc365021..26968a4931f9 100644
--- a/app-crypt/seahorse/seahorse-3.14.1.ebuild
+++ b/app-crypt/seahorse/seahorse-3.14.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.14.1.ebuild,v 1.3 2015/03/15 13:14:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.14.1.ebuild,v 1.4 2015/05/13 16:54:49 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -26,6 +26,7 @@ COMMON_DEPEND="
 	net-misc/openssh
 	>=app-crypt/gpgme-1
 	>=app-crypt/gnupg-1.4
+	<app-crypt/gnupg-2.1
 
 	ldap? ( net-nds/openldap:= )
 	zeroconf? ( >=net-dns/avahi-0.6:= )