Version bump (thanks to Arfrever in bug #432636 for reporting). Simplify thanks to EAPI 4 and fix bug #417437.

(Portage version: 2.2.0_alpha122/cvs/Linux x86_64)

4 files changed, 44 insertions, 84 deletions

diff --git a/app-crypt/gpa/ChangeLog b/app-crypt/gpa/ChangeLog
index 1c3c4cb0e581..16e203d2f807 100644
--- a/app-crypt/gpa/ChangeLog
+++ b/app-crypt/gpa/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/gpa
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpa/ChangeLog,v 1.79 2012/05/03 18:16:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpa/ChangeLog,v 1.80 2012/08/27 01:52:43 flameeyes Exp $
+
+*gpa-0.9.3 (27 Aug 2012)
+
+  27 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> +gpa-0.9.3.ebuild,
+  -files/gpa-desktop-file-validate-new.patch, -gpa-0.9.1_pre20100416-r1.ebuild:
+  Version bump (thanks to Arfrever in bug #432636 for reporting). Simplify
+  thanks to EAPI 4 and fix bug #417437.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> gpa-0.9.1_pre20100416.ebuild,
   gpa-0.9.1_pre20100416-r1.ebuild:
diff --git a/app-crypt/gpa/files/gpa-desktop-file-validate-new.patch b/app-crypt/gpa/files/gpa-desktop-file-validate-new.patch
deleted file mode 100644
index 980b42462904..000000000000
--- a/app-crypt/gpa/files/gpa-desktop-file-validate-new.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- gpa.desktop	2010-04-16 16:00:00.000000000 -0400
-+++ gpa.desktop.new	2010-12-10 08:46:13.000000000 -0500
-@@ -1,13 +1,12 @@
- [Desktop Entry]
--Name=gpa
--Name[sv]=gpa
--Name[en_US.ISO8859-1]=gpa
--GenericName=GNU Privacy Assistant
--GenericName[sv]=GNU Integritets-hjälpreda
--GenericName[en_US.ISO8859-1]=GNU Privacy Assistant
-+Name=GNU Privacy Assistant
-+Name[sv]=GNU Integritets-hjälpreda
-+Name[en_US.ISO8859-1]=GNU Privacy Assistant
-+GenericName=Cryptographic Keyring Manager
-+GenericName[sv]=Cryptographic Nyckelring Manager
-+GenericName[en_US.ISO8859-1]=Cryptographic Keyring Manager
- 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-r1.ebuild b/app-crypt/gpa/gpa-0.9.1_pre20100416-r1.ebuild
deleted file mode 100644
index 66e77ca05f6b..000000000000
--- a/app-crypt/gpa/gpa-0.9.1_pre20100416-r1.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-r1.ebuild,v 1.3 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-new.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 || die
-}
diff --git a/app-crypt/gpa/gpa-0.9.3.ebuild b/app-crypt/gpa/gpa-0.9.3.ebuild
new file mode 100644
index 000000000000..2b967ea68700
--- /dev/null
+++ b/app-crypt/gpa/gpa-0.9.3.ebuild
@@ -0,0 +1,36 @@
+# 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.3.ebuild,v 1.1 2012/08/27 01:52:43 flameeyes Exp $
+
+EAPI=4
+
+DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG"
+HOMEPAGE="http://gpa.wald.intevation.org"
+SRC_URI="mirror://gnupg/${PN}/${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_configure() {
+	# force --libexecdir so that it doesn't expand to
+	# ${exec_prefix}/libexec instead.
+	econf \
+		--libexecdir=/usr/libexec \
+		--with-gpgme-prefix=/usr \
+		--with-libassuan-prefix=/usr \
+		$(use_enable nls) \
+		${myconf}
+}
+
+DOCS=( AUTHORS ChangeLog README NEWS TODO )