Drop old (#508854)

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

6 files changed, 7 insertions, 294 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index e243707621b3..0fd736f56c72 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.185 2014/07/23 15:13:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.186 2014/11/13 10:48:02 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/seahorse-2.32.0-libnotify-0.7.patch,
+  -files/seahorse-3.10.2-include-correct-headers-for-vala.patch,
+  -seahorse-2.32.0.ebuild, -seahorse-3.10.2-r1.ebuild, -seahorse-3.12.0.ebuild:
+  Drop old (#508854)
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> seahorse-3.12.2.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/app-crypt/seahorse/files/seahorse-2.32.0-libnotify-0.7.patch b/app-crypt/seahorse/files/seahorse-2.32.0-libnotify-0.7.patch
deleted file mode 100644
index 1a6b478acf0f..000000000000
--- a/app-crypt/seahorse/files/seahorse-2.32.0-libnotify-0.7.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- libseahorse/seahorse-notification.c
-+++ libseahorse/seahorse-notification.c
-@@ -37,6 +37,9 @@
- 
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif
- 
- /* -----------------------------------------------------------------------------
-@@ -231,7 +234,12 @@
-     heading = format_key_text (snotif->heading);
-     message = format_key_text (snotif->message);
-     
--    notif = notify_notification_new (heading, message, snotif->icon, attachto);
-+    notif = notify_notification_new (heading, message, snotif->icon
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+    );
-+#else
-+    , attachto);
-+#endif
-     
-     g_free (heading);
-     g_free (message);
diff --git a/app-crypt/seahorse/files/seahorse-3.10.2-include-correct-headers-for-vala.patch b/app-crypt/seahorse/files/seahorse-3.10.2-include-correct-headers-for-vala.patch
deleted file mode 100644
index 8e67c5a40a6a..000000000000
--- a/app-crypt/seahorse/files/seahorse-3.10.2-include-correct-headers-for-vala.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 577c4ba0fc84d904338280c0ead77177c9d94ea3 Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@gnome.org>
-Date: Thu, 20 Feb 2014 08:41:54 +0000
-Subject: common: Include correct headers for vala calling C code
-
-These caused crashes due to pointers being casted to int.
-
-Due to the way vala code is generated, this fix may require
-you to:
-
-$ rm common/*.c
-$ make clean all
-
-https://bugzilla.gnome.org/show_bug.cgi?id=708996
----
-diff --git a/common/config.vapi b/common/config.vapi
-index b814388..056021f 100644
---- a/common/config.vapi
-+++ b/common/config.vapi
-@@ -16,11 +16,13 @@ namespace Config
-  */
- namespace Seahorse {
- 
-+[CCode (cheader_filename = "libseahorse/seahorse-prefs.h")]
- namespace Prefs {
- 	public void show(Gtk.Window window, string? tabid);
- 	public bool available();
- }
- 
-+[CCode (cheader_filename = "libseahorse/seahorse-application.h")]
- namespace Application {
- 	public unowned Gtk.Application @get();
- }
---
-cgit v0.9.2
diff --git a/app-crypt/seahorse/seahorse-2.32.0.ebuild b/app-crypt/seahorse/seahorse-2.32.0.ebuild
deleted file mode 100644
index 91cc67ad3f12..000000000000
--- a/app-crypt/seahorse/seahorse-2.32.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.32.0.ebuild,v 1.9 2012/05/03 18:16:39 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-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 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="avahi debug doc +introspection ldap libnotify test"
-
-RDEPEND="
-	>=gnome-base/gconf-2:2
-	>=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-2.18:2[introspection?]
-	>=dev-libs/dbus-glib-0.72
-	>=gnome-base/gnome-keyring-2.29.4
-	net-libs/libsoup:2.4
-	x11-misc/shared-mime-info
-
-	net-misc/openssh
-	>=app-crypt/gpgme-1
-	|| (
-		=app-crypt/gnupg-2.0*
-		=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.3.2 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=app-text/gnome-doc-utils-0.3.2
-	>=app-text/scrollkeeper-0.3
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-pgp
-		--enable-ssh
-		--enable-pkcs11
-		--disable-static
-		--disable-scrollkeeper
-		--disable-update-mime-database
-		--enable-hkp
-		$(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"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-
-	# Do not mess with CFLAGS with USE="debug"
-	sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
-		-e 's/-Werror//' \
-		-i configure.in configure || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if ! has app-crypt/seahorse-plugins; then
-		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"
-	fi
-}
diff --git a/app-crypt/seahorse/seahorse-3.10.2-r1.ebuild b/app-crypt/seahorse/seahorse-3.10.2-r1.ebuild
deleted file mode 100644
index a5869e1de887..000000000000
--- a/app-crypt/seahorse/seahorse-3.10.2-r1.ebuild
+++ /dev/null
@@ -1,80 +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.10.2-r1.ebuild,v 1.3 2014/03/16 00:01:32 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-VALA_MIN_API_VERSION="0.18"
-# All vala usage can be dropped when patch from bug #504582 is included
-
-inherit eutils gnome2 vala
-
-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.9.1:=
-	>=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-2.0*
-		=app-crypt/gnupg-1.4* )
-
-	avahi? ( >=net-dns/avahi-0.6:= )
-	ldap? ( net-nds/openldap:= )
-"
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	app-crypt/gcr[vala]
-	>=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"
-
-	# Regenerate the pre-generated C sources, bug #504582
-	rm -f common/*.c
-	epatch "${FILESDIR}"/${PN}-3.10.2-include-correct-headers-for-vala.patch
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-pgp \
-		--enable-ssh \
-		--enable-pkcs11 \
-		--disable-static \
-		--enable-hkp \
-		$(use_enable avahi sharing) \
-		$(use_enable debug) \
-		$(use_enable ldap) \
-		ITSTOOL=$(type -P true)
-		#VALAC=$(type -P true) -> readd when we don't need patch for bug #504582
-}
-
-src_compile() {
-	emake -j1 -C common # Needed due patch for bug #504582
-	gnome2_src_compile
-}
diff --git a/app-crypt/seahorse/seahorse-3.12.0.ebuild b/app-crypt/seahorse/seahorse-3.12.0.ebuild
deleted file mode 100644
index 9bc7a1f6f28e..000000000000
--- a/app-crypt/seahorse/seahorse-3.12.0.ebuild
+++ /dev/null
@@ -1,67 +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.0.ebuild,v 1.2 2014/04/27 22:15:32 eva 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-2.0*
-		=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)
-}