From 12272d6b15e0413ff2cbedc0fbafd79bdb429f97 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Thu, 13 Nov 2014 10:48:03 +0000 Subject: [PATCH] Drop old (#508854) Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- app-crypt/seahorse/ChangeLog | 8 +- app-crypt/seahorse/Manifest | 26 +----- .../files/seahorse-2.32.0-libnotify-0.7.patch | 26 ------ ...0.2-include-correct-headers-for-vala.patch | 35 -------- app-crypt/seahorse/seahorse-2.32.0.ebuild | 85 ------------------- app-crypt/seahorse/seahorse-3.10.2-r1.ebuild | 80 ----------------- app-crypt/seahorse/seahorse-3.12.0.ebuild | 67 --------------- 7 files changed, 11 insertions(+), 316 deletions(-) delete mode 100644 app-crypt/seahorse/files/seahorse-2.32.0-libnotify-0.7.patch delete mode 100644 app-crypt/seahorse/files/seahorse-3.10.2-include-correct-headers-for-vala.patch delete mode 100644 app-crypt/seahorse/seahorse-2.32.0.ebuild delete mode 100644 app-crypt/seahorse/seahorse-3.10.2-r1.ebuild delete mode 100644 app-crypt/seahorse/seahorse-3.12.0.ebuild 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 + -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 seahorse-3.12.2.ebuild: Stable for x86, wrt bug #512012 diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest index 4a4bdbcc5ec7..e912de97139d 100644 --- a/app-crypt/seahorse/Manifest +++ b/app-crypt/seahorse/Manifest @@ -1,32 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX seahorse-2.32.0-libnotify-0.7.patch 729 SHA256 8f7b2fc0ad1cb572de3c31ed694e5131e8ec6373e9f3e202d98858a12902c467 SHA512 a8752d88779969923b8866e5f627e469cb2e3da06e00e8a4fc9cc39f2e5de9c93f17d81fda7ba143e523105a3d1909cfc3b72e460dd3d6fb48bae7970b5cdcea WHIRLPOOL 33ca07d06d5623c6924ebbab5d28a0a4ae3c0d3b226d8083769c308b425535d70b41c9776547335a9efb30f6875fa2e772c9155a99ab824e04ecfd0c108f6ceb -AUX seahorse-3.10.2-include-correct-headers-for-vala.patch 943 SHA256 3070918a99ac4ff1de4f67a4db82e867578259ae3454c30660f368cbb6d62f52 SHA512 02f8cf69b74e7f34a85b24557518782e25701ee7b5c622f1e5de46563d07970a28527017fba5426899455d03cb59d803a403dda3c1042a572c6762e76f4127fc WHIRLPOOL ae4194912805bb52b0f2fca7468c5ad94de8af5ded27186ee836eb76aaa3b7aad25d8d788a095bb688e8513e219ccec09654f2846ad865d9f3e0e73e6cb115f3 -DIST seahorse-2.32.0.tar.bz2 2491230 SHA256 f55468237246a485317d59e2fbc1b1ef5f5bd4c5a7b9ff6f40c3d921af0ed52d SHA512 b75d94dbce8a00ecec4c230975104b0868f5b51bbcaf18a3b0a2520156c1b1336ad60a978775657fdca0bdabd0ebcd52a5e086a25ed8be1cbae9354245705879 WHIRLPOOL ce686c02f8f3935e963ef2fcf4b334372cb8698eb67353891276c79e3f587e50d3b9cb8bd5291eaff21e1e7bc48a82ddc8fa87a24cdf39e1c1732846d71d1e5d -DIST seahorse-3.10.2.tar.xz 2109592 SHA256 89cabf19f77a55f220bc61a3b97e4db845a0980f0f1d9c66147cc9a4ced8cd16 SHA512 7257f96c4e77902c018cfcff9e2096ab216fd4bfde729c08d7305f20e58664675381ad60e394d0536e392345cc6bcfb2de59af1a2a4e3e5ae56856aa8fc0d80c WHIRLPOOL 9c940ac1168b12c19884aff2b8ffbad48b1e0f1aaebca182489722e2c542f54fedafcc17c912b21afff547e4c6b1253c2d8c2a2f2195978b21edef3b055151b8 -DIST seahorse-3.12.0.tar.xz 1396460 SHA256 f78800b1d25b285ddc8928e925f9ee24f27640abba3fc9ab1cd9554c83380d0b SHA512 dad48e51695502b8763aef7918f9b03ccd7d9c3eb335ca44c5c67c3be7be6668559cff7e12ca335e851436a0ca77c62ab2a6fba0873e9fe692d23c460f9dc33c WHIRLPOOL c25af28ce8269d469db82027c1130af2f102b65a6e7393ae6f55fe7c5088a4084b190c7c91f760835a1fdfbab8b7541f7f226cb4742ba0da949866dc49e6bc14 DIST seahorse-3.12.2.tar.xz 1398292 SHA256 5e6fb25373fd4490e181e2fa0f5cacf99b78b2f6caa5d91c9c605900fb5f3839 SHA512 016c87f1a356d3d0ac57931e139c20c67b4e36832d9a8947ff39bfc040d970ea25bfd8573624dbb3ebcec05db0803667d42afb2cb15a09d0ec8199dcc5543796 WHIRLPOOL 7cd023d0d90b23c3a39a776a872dc2ba218dbcf73670561ff94f397a97ec5dd97baece8e956d810dfb6613acf82d20b93f398ca7e5af54af1a78b67e6901d6f4 -EBUILD seahorse-2.32.0.ebuild 2162 SHA256 badf51a1c01e93ba577a0458f68d3724a2b313a44bba565b6b1696a20b11dfe5 SHA512 484f27fda351e6adb8732da527f091fe2299a56bc909a5a9fc2edc4b00fef795111bd07090c97bf73e8f7feca6b5863ca7bf41c991e64adabbb6bddd1d2607ef WHIRLPOOL 8a565ff071f14a638622473909ae2214192f7a49233e44709151f1807258c2bfbd3135d18087144f532d56f140acfc76e3a5ce9c4010a4ecddda59bd6041a04b -EBUILD seahorse-3.10.2-r1.ebuild 1987 SHA256 c04a92833a3210f06e65ff0620a744b7499d181cdc1fd98233759d1b04048f3e SHA512 5b9941c1fd711166bb54811e81c0937ebdcbbe9e6397c9d95a5abbb01b93b975b18037c3a7e29aa8ee0cd5ce2b3d9911fe3d30982441dff83113940e563c1b5f WHIRLPOOL c3dd69376a0b147c378405b6b3614463fff1e540fd5047462a4fab4d5369a1185bb57337846d5f8a6efa054a4ab673c118b67b610017fdef58d1483510b4eaf8 -EBUILD seahorse-3.12.0.ebuild 1604 SHA256 d9c2a413b1aadc420762094b17294d56a90d921fd7fe58ebdd60a323281bfcfe SHA512 bff7cd21cfc23dbd04e1a7bfd9ef5622f89355e5361e431042f800a29faaad4362b1efeb8d419f7d25774d30bc13f0cfef99bc37a87282d7ef166619c9b3d637 WHIRLPOOL acb4f01ea7844952a09e040cec615771a1f07298a57ae7e1cb6ba1bdb8dca21d309369a74b88fe0f0a239f82700dea3ec48241a768a4f40449a8b27e6ee71ed0 EBUILD seahorse-3.12.2.ebuild 1602 SHA256 fec5cd5c52641f7bc6941f689b35efa2930763dc9046c8ceec760eddf74d5764 SHA512 cc2d1b360bb23766358e75f24e269a80677ecc9157ec3ff5a3acb44ff1a14fc18cdfef3d72cdc2b39210fdf17d733c507b5a31570232edf3e606e2476168714c WHIRLPOOL 95a6106edb10f5054f3c016e4c29379f9f2f5283861f20c3a133747793df931493fa9baea0b700da2954582dd53b9e5b43e5d8a02011ac7c48b85063c76a09ae -MISC ChangeLog 26539 SHA256 34de345668c1c8490f5f84a6f6991d349f2f038e3479cd8a0747817749cdf4ea SHA512 83dce2a0d9179e5d58bdec4a3565dca33d9b37041b5de3aae4fd2e869b5ac18359a939dc25f7f1e6a6aa2a703ecdc5ae222a69b01167a27cf29067e48da4f9db WHIRLPOOL c7bc9e91a8cb7ca19a864507d566dba1395ddfb8559d161321e59867efbf72aa5401f8b8dbcd8a33dfd02b3581e01609e12de3a2ca754f4c79bb292f4f53068b +MISC ChangeLog 26800 SHA256 871c1a829ce4d94b2fb435ad8568fe4862326e1b15bd0763320cd0fa8a7e8d99 SHA512 80311a66a21b729250a9844caf3278481663fd98da0de7d4a20d7f2cb06813eda41fa47928b1f4cd1e509209194252c069669a89f48ba4686791feefe6437c8c WHIRLPOOL 464729ac69ca65f08cd047418f9c3db027c02b230638b1d8df6c5fdc1b51d2b7d8c79ac4237c6c4f7a74a4a76f109799d99dfc76f1c3fd7e38c2bb633a5415dd MISC metadata.xml 780 SHA256 a451d0176823370754ceaaa2bd6d5e372523008eaf29410541378392241d20d6 SHA512 3e5c6a4edd1ab1ce4353145afbb96a353b126c19295536e1207766fe7348050842e871e93013d63d067078ffe3c017d366e4677390992de2a7d1d9a5775960c1 WHIRLPOOL 39481ab218ed04e835f5447ed74df6d4d26102c8e0f0e48b4f85aea41afa0284b529d28ad937e9d02fef17d52e564c3c765ee8117d8ce3fbc3b08d780dcfcaea -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJTz9EGAAoJELp701BxlEWfUe0P/ROY12yRUt71Ef9IXg9iLaGy -2ddCZi89SLzRC8nAgPQdFYAoHO3UPOqFU4tjrU7YQtQuXsXIW2FgCCehKGqOHGDR -MNzmgW3UnNHyHBHJFMA/C5ktaPH8cIGOOSJt3KvVkWduyayDIuB3Iu95tQMHjKCd -SFLt/gSRUGxAxJXLJUuNJl40mg1ow8HxxXaPOXaDTBbQY1stCJWEcAeVXjCDkQUo -vqHII8Mv/Qr4F7Alx2jVxw7/AIPWGRqXp/IkdmQVwOSQV1uNOyKtWm8Z89kDYD71 -l6OeH0bJc+hHOSly3Pj7SNsRgz+rtZkKoKdDwYOMc0GYBuY0JC6QSMK9pvyFA3mf -xJ18v/KF/DTfP0IHWIRShogh3Uql213Dpi1WRU4S0D/joSyxt3woIHhZA8xqYRJ0 -JO8iGDC3Nm6B7CPY6E29HtmI7+Igl1jclWDSJLStNi46RJ3Hd1wvDp30mg3d8yEx -AnsodGmL4jJJhhu9sOXOU6aM3UPB5gqm53P60STZvhJhhPqo8SehFet+jvDLGGLA -fp4S6vz4BQ7g4C5zl8PLB+YGtCtqeBb4AUudF/zpaPN7TqQI8RqgIIsbcESt6dF0 -8HVYfKvjoJkK6SAxgvzb6vAkeHsxmGDjCU10JpigrQzNfDq8YjZz8R8IYFsBaV5R -03+5bGWTkvetf8luQRzI -=4qkh +iEYEAREIAAYFAlRkjGMACgkQCaWpQKGI+9TxmQCffnEjzrhuEebG9LtgTwLYZFzY +o9gAnAipvFUUwqyN9INSjEqSkkBXvPad +=+Vpr -----END PGP SIGNATURE----- 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 -+#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 -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} - ! 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} - !