Version bump, bug#523832, cleanup

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

4 files changed, 14 insertions, 83 deletions

diff --git a/app-crypt/gpa/ChangeLog b/app-crypt/gpa/ChangeLog
index 6ed7ecd46079..fd4cd44eedbd 100644
--- a/app-crypt/gpa/ChangeLog
+++ b/app-crypt/gpa/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/gpa
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpa/ChangeLog,v 1.94 2013/06/29 16:30:25 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpa/ChangeLog,v 1.95 2014/09/26 21:51:32 alonbl Exp $
+
+*gpa-0.9.5 (26 Sep 2014)
+
+  26 Sep 2014; Alon Bar-Lev <alonbl@gentoo.org> +gpa-0.9.5.ebuild,
+  -files/gpa-desktop-file-validate.patch, -gpa-0.9.1_pre20100416.ebuild,
+  -gpa-0.9.3.ebuild:
+  Version bump, bug#523832, cleanup
 
   29 Jun 2013; Agostino Sarubbo <ago@gentoo.org> gpa-0.9.4.ebuild:
   Stable for sparc, wrt bug #474136
diff --git a/app-crypt/gpa/files/gpa-desktop-file-validate.patch b/app-crypt/gpa/files/gpa-desktop-file-validate.patch
deleted file mode 100644
index d33763c641fc..000000000000
--- a/app-crypt/gpa/files/gpa-desktop-file-validate.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Validate .desktop entry with desktop-file-utils 0.17.
-
---- gpa.desktop
-+++ gpa.desktop
-@@ -6,8 +6,7 @@
- GenericName[sv]=GNU Integritets-hjälpreda
- GenericName[en_US.ISO8859-1]=GNU Privacy Assistant
- Exec=gpa
--Icon=gpa.png
-+Icon=gpa
- Terminal=false
--Encoding=UTF-8
- Type=Application
--Categories=GTK;Application;Security;Utility;
-+Categories=GTK;Utility;System;Security;
diff --git a/app-crypt/gpa/gpa-0.9.1_pre20100416.ebuild b/app-crypt/gpa/gpa-0.9.1_pre20100416.ebuild
deleted file mode 100644
index 361470535f0c..000000000000
--- a/app-crypt/gpa/gpa-0.9.1_pre20100416.ebuild
+++ /dev/null
@@ -1,59 +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/gpa/gpa-0.9.1_pre20100416.ebuild,v 1.9 2012/05/03 18:16:38 jdhore Exp $
-
-EAPI="3"
-
-inherit autotools eutils multilib
-
-DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG"
-HOMEPAGE="http://gpa.wald.intevation.org"
-#STUPID_NUM="603"
-#SRC_URI="http://wald.intevation.org/frs/download.php/${STUPID_NUM}/${P}.tar.bz2"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="nls"
-
-RDEPEND=">=x11-libs/gtk+-2.10.0:2
-	>=dev-libs/libgpg-error-1.4
-	>=dev-libs/libassuan-1.1.0
-	>=app-crypt/gnupg-2
-	>=app-crypt/gpgme-1.2.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-desktop-file-validate.patch
-
-	local x=/usr/share/gettext/po/Makefile.in.in
-	[[ -e $x ]] && cp -f $x po/ #323743
-
-	sed -e "s|gnupg/:|:|g" -i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# By default gnupg puts gpgkeys_hkp in /usr/libexec/gnupg, so
-	# check if it is in uncommon /usr/lib/gnupg, and change libexecdir
-	# if so.  If we do not do this, hkp server types is not usable,
-	# as gpa cannot find gpgkeys_hkp ...
-	[[ -f /usr/lib/gnupg/gpgkeys_hkp ]] && myconf="--libexecdir=/usr/$(get_libdir)"
-
-	econf \
-		--with-gpgme-prefix=/usr \
-		--with-libassuan-prefix=/usr \
-		$(use_enable nls) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README NEWS TODO
-}
diff --git a/app-crypt/gpa/gpa-0.9.3.ebuild b/app-crypt/gpa/gpa-0.9.5.ebuild
index 9a7f0df9db85..a71e1f9ad5fb 100644
--- a/app-crypt/gpa/gpa-0.9.3.ebuild
+++ b/app-crypt/gpa/gpa-0.9.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpa/gpa-0.9.3.ebuild,v 1.7 2013/01/12 22:16:07 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpa/gpa-0.9.5.ebuild,v 1.1 2014/09/26 21:51:32 alonbl Exp $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG"
 HOMEPAGE="http://gpa.wald.intevation.org"
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE_LINGUAS=" ar cs de es fr ja nl pl pt_BR ru sv tr zh_TW"
 IUSE="nls ${IUSE_LINGUAS// / linguas_}"
 
@@ -18,7 +18,7 @@ RDEPEND=">=x11-libs/gtk+-2.10.0:2
 	>=dev-libs/libgpg-error-1.4
 	>=dev-libs/libassuan-1.1.0
 	>=app-crypt/gnupg-2
-	>=app-crypt/gpgme-1.2.0"
+	>=app-crypt/gpgme-1.5.0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
@@ -34,5 +34,3 @@ src_configure() {
 		$(use_enable nls) \
 		GPGKEYS_LDAP="/usr/libexec/gpgkeys_ldap"
 }
-
-DOCS=( AUTHORS ChangeLog README NEWS TODO )