From: Gilles Dartiguelongue Date: Mon, 31 May 2010 21:14:08 +0000 (+0000) Subject: Clean up old revisions. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=94e5d79750485a7d36b2b2819e342356dde1dc0a;p=gentoo.git Clean up old revisions. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog index 0a38eed59207..bc672c39cb8e 100644 --- a/app-crypt/seahorse/ChangeLog +++ b/app-crypt/seahorse/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-crypt/seahorse # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.126 2010/05/04 16:21:12 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.127 2010/05/31 21:14:08 eva Exp $ + + 31 May 2010; Gilles Dartiguelongue + -files/seahorse-0.9.10-update-mime.patch, + -files/seahorse-2.22.2-fbsd.patch, -seahorse-2.22.3.ebuild: + Clean up old revisions. 03 May 2010; Olivier Crête seahorse-2.28.1.ebuild: amd64 stable, bug #314899 diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest index db9d38be4c1c..a76366f63b89 100644 --- a/app-crypt/seahorse/Manifest +++ b/app-crypt/seahorse/Manifest @@ -2,22 +2,18 @@ Hash: SHA1 AUX 70-seahorse-agent 241 RMD160 d28490016ed259ef29416cb101ccddd76e195ed5 SHA1 2b40525f543741dc0a453a8241e3b7c83f45da6f SHA256 2e70cbb034fde8ddd5c69baf97570ad706bec2e04bd7dd2c86f462b9a594e3c6 -AUX seahorse-0.9.10-update-mime.patch 545 RMD160 f7531dcd900f46b0208226cd1e3806a7bc75231b SHA1 57f486c216b922d5d52cc24ba5925bd854a15518 SHA256 ffa4324d3ec4c4019839f2663758dacd1bb97396582398fdfc241e24dfff549a -AUX seahorse-2.22.2-fbsd.patch 305 RMD160 e6d12d63383007b8b2b5064cc317e3b0d491908b SHA1 8440145139ace9b98cf7d16bb329395c5ba5479f SHA256 fd3e7be3c5af9b7e4c831ca6590b68582f671f4033693d1c2253f220dc6c57b2 AUX seahorse-2.26.2-gpgme-lfs.patch 1210 RMD160 7aaa3cae7c31154331cd9eb92a6643d7bd6a00a9 SHA1 8ffe6667fe7d33f440a3e154a1cbd320963b5beb SHA256 a0cd874dc4e2a79559eb4a4a65349c88e4c9925871493041d662e33b6a53a57d AUX seahorse-2.28.0-as-needed.patch 381 RMD160 2756cc4440f36b2a206b07710f5bc9b60037a564 SHA1 390204f347f89b3c0dcebbe8cb1f154090b22aa4 SHA256 243d49dd613a19d569e8fa5560d4f4d1618c9c067b00588cd61ccf6dc7516d3c -DIST seahorse-2.22.3.tar.bz2 2121204 RMD160 63acdec4f689734bcf36bd0ef4a9fbc09fcba12a SHA1 11a5c4a641e3419e022f3c8e733b49a1139a52ed SHA256 245ff3752f72d14615937ef03d5a5e6f1a3abdf12a907af775ce31aa337e95d1 DIST seahorse-2.26.2.tar.bz2 2196810 RMD160 9193e5c14244f1a1463c6479bf31bb7d20a1a1bb SHA1 04484352e92fc2faa6f06ee6f4eb21828931f173 SHA256 ab73a7c918afd9f111b6078750328d0a4b82f2f6644e3fa04582f58d81238dce DIST seahorse-2.28.1.tar.bz2 2397687 RMD160 40e33550233f81a7adf152d8ba72a095c3a822bd SHA1 8d849f9e95241be3eefb54f3b64a18017c7bb8fc SHA256 67a1ae5eaceca6306a6a740c8753c5a6c4b511cfbf8a8031a78ae61297ced0a0 -EBUILD seahorse-2.22.3.ebuild 3208 RMD160 6c72f9c5d1b2664082cd940f005369efd6c922fd SHA1 f478d1294da78ebb4cfe75b3d3527f29038783a7 SHA256 6d80aaa09e1703ffabfdcf953848917f477b93d0bcb30ad3dc5c4a5f30a7c016 EBUILD seahorse-2.26.2.ebuild 1892 RMD160 fed75b57714dfa2af87ebe4ed2e9f9c172347da3 SHA1 0eddd566161868bcc61811b1e8bbdad54fce6637 SHA256 175aec6c04f1ccebc216ad6cb4b646231209a88adf12c879a7c1882743610ae9 EBUILD seahorse-2.28.1.ebuild 2070 RMD160 d5d030527f5edb60417cf3b7c1616b3eb3e95948 SHA1 f2be6c4d20d32212d84eae3891eb74f3a85f5a27 SHA256 f4594db4370b30c563a24ec44b8713478f00231fbcbc1a0d3407351ae70afb57 -MISC ChangeLog 18329 RMD160 a9bfa174affe7162793a16c1631f7a7aa51cf540 SHA1 bf7fd2850407c730e381b70ba6ae0ea35431d22f SHA256 65496501fc59a25b28457d45c50ddfc03b4bdcae73122df4a3360580a6a01449 +MISC ChangeLog 18513 RMD160 b997b0c89c5dbe54a81496f6bfb98abc222421e2 SHA1 61bb332f432a7076681485b1ff0eb77b0b198c42 SHA256 e73aab41310971df359af014a2712cf1a9c4a833dd4fe790adbb8035ad65ef3f MISC metadata.xml 1350 RMD160 e23a60042c52e9e0003640c72792ec1db5d18d69 SHA1 13acdf926fb2fe87157d5ea1e5d5db124f14ad05 SHA256 b51ea5d45e0689c5c8670a5949f58b412adf02f70d814073c6ea942b87903e0e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkvgSYIACgkQmOfEJZHYOKesNQCeNYta2XhPe1eSlkHRpQCxcu+S -1m8AoOXK6eTVX5OCavNtOFPk19PNBGhI -=Z9eN +iEYEARECAAYFAkwEQscACgkQ1fmVwcYIWAa3PQCeMdRnbXxvDv/93lIfQaRxiy7r +n6IAoOD6WMTFTWJxtnm2N3q7Ow5oebgd +=dM7N -----END PGP SIGNATURE----- diff --git a/app-crypt/seahorse/files/seahorse-0.9.10-update-mime.patch b/app-crypt/seahorse/files/seahorse-0.9.10-update-mime.patch deleted file mode 100644 index 5b6300ffd8cc..000000000000 --- a/app-crypt/seahorse/files/seahorse-0.9.10-update-mime.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- plugins/nautilus/Makefile.in.orig 2007-01-24 20:37:53.000000000 -0600 -+++ plugins/nautilus/Makefile.in 2007-01-24 20:38:06.000000000 -0600 -@@ -786,11 +786,9 @@ - - - @UPDATE_MIME_DATABASE_TRUE@install-data-local: --@UPDATE_MIME_DATABASE_TRUE@ mkdir -p $(mimedir) --@UPDATE_MIME_DATABASE_TRUE@ update-mime-database $(datadir)/mime/ - - @UPDATE_MIME_DATABASE_TRUE@uninstall-local: --@UPDATE_MIME_DATABASE_TRUE@ update-mime-database $(datadir)/mime/ -+ - @UPDATE_MIME_DATABASE_FALSE@install-data-local: - - @UPDATE_MIME_DATABASE_FALSE@uninstall-local: diff --git a/app-crypt/seahorse/files/seahorse-2.22.2-fbsd.patch b/app-crypt/seahorse/files/seahorse-2.22.2-fbsd.patch deleted file mode 100644 index 060678287269..000000000000 --- a/app-crypt/seahorse/files/seahorse-2.22.2-fbsd.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- seahorse-2.22.2/libseahorse/seahorse-ssh-operation.c.old 2008-06-02 11:08:44 +0000 -+++ seahorse-2.22.2/libseahorse/seahorse-ssh-operation.c 2008-06-02 11:08:57 +0000 -@@ -20,6 +20,7 @@ - */ - - #include "config.h" -+#include - #include - #include - #include diff --git a/app-crypt/seahorse/seahorse-2.22.3.ebuild b/app-crypt/seahorse/seahorse-2.22.3.ebuild deleted file mode 100644 index fba3cc69bab0..000000000000 --- a/app-crypt/seahorse/seahorse-2.22.3.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.22.3.ebuild,v 1.10 2008/11/13 19:30:50 ranger 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="applet avahi dbus debug epiphany gedit gnome-keyring ldap libnotify nautilus xulrunner" - -RDEPEND=">=gnome-base/libgnome-2.14 - >=gnome-base/libgnomeui-2.10 - >=gnome-base/gnome-vfs-2.0 - >=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 - >=dev-libs/libxml2-2.6.0 - || ( - =app-crypt/gnupg-1.4* - =app-crypt/gnupg-2.0* - ) - >=app-crypt/gpgme-1.0.0 - net-misc/openssh - x11-misc/shared-mime-info - avahi? ( >=net-dns/avahi-0.6 ) - dbus? ( - >=dev-libs/dbus-glib-0.72 - applet? ( >=gnome-base/gnome-panel-2.10 ) - epiphany? ( - >=www-client/epiphany-2.14 - xulrunner? ( =net-libs/xulrunner-1.8* ) - !xulrunner? ( =www-client/mozilla-firefox-2* ) - ) - gedit? ( >=app-editors/gedit-2.16 ) - ) - gnome-keyring? ( >=gnome-base/gnome-keyring-2.21.3.2 ) - ldap? ( net-nds/openldap ) - libnotify? ( >=x11-libs/libnotify-0.3.2 ) - nautilus? ( >=gnome-base/nautilus-2.12 )" -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() { - if ! use dbus ; then - if use applet ; then - elog - elog "The panel applet requires that you build seahorse with DBUS support." - elog - fi - - if use gedit ; then - elog - elog "The GEdit plugin requires that you build seahorse with DBUS support." - elog - fi - - if use epiphany ; then - elog - elog "The epiphany plugin requires that you build seahorse with DBUS support." - elog - fi - - eerror "Please add dbus to your USE flags and re-emerge seahorse" - eerror "plugins require dbus support" - fi - - if use epiphany ; then - if use xulrunner ; then - G2CONF="${G2CONF} --with-gecko=xulrunner" - else - G2CONF="${G2CONF} --with-gecko=firefox" - fi - fi - - G2CONF="${G2CONF} - --enable-ssh - --disable-scrollkeeper - --disable-update-mime-database - --enable-hkp --with-keyserver --enable-agent - $(use_enable applet) - $(use_enable avahi sharing) - $(use_enable dbus) - $(use_enable debug) - $(use_enable epiphany) - $(use_enable gedit) - $(use_enable gnome-keyring) - $(use_enable ldap) - $(use_enable libnotify) - $(use_enable nautilus)" -} - -src_unpack() { - gnome2_src_unpack - epatch "${FILESDIR}/${PN}-0.9.10-update-mime.patch" - - # Fix building on fbsd - epatch "${FILESDIR}/${PN}-2.22.2-fbsd.patch" -} - -src_install() { - gnome2_src_install - - # remove conflicts with x11-misc/shared-mime-info - rm -rf "${D}/usr/share/mime/"{application,magic,globs,XMLnamespaces} - - chmod -s "${D}/usr/bin/seahorse-agent" - chmod -s "${D}/usr/bin/seahorse-daemon" - - exeinto /etc/X11/xinit/xinitrc.d/ - doexe "${FILESDIR}/70-seahorse-agent" -}