Added revision

5 files changed, 95 insertions, 19 deletions

diff --git a/app-crypt/gpa/Manifest b/app-crypt/gpa/Manifest
index 2e5d3bf..939dbd8 100644
--- a/app-crypt/gpa/Manifest
+++ b/app-crypt/gpa/Manifest
@@ -1,5 +1,7 @@
-AUX gpa-desktop-file-validate.patch 759 RMD160 b34a8b6929aee3895a66db0d69fba7c04ade681e SHA1 b53ebce4a21d13f00ce251fc27fd7588a14224e2 SHA256 1290c8dc08e163579e7cedd3a5ba743e7129adc54bf97bc17da64e90ec95f8a9
+AUX gpa-desktop-file-validate-new.patch 759 RMD160 b34a8b6929aee3895a66db0d69fba7c04ade681e SHA1 b53ebce4a21d13f00ce251fc27fd7588a14224e2 SHA256 1290c8dc08e163579e7cedd3a5ba743e7129adc54bf97bc17da64e90ec95f8a9
+AUX gpa-desktop-file-validate.patch 370 RMD160 6d2b816c8aaa35fc81df473eb41bb155c90a332f SHA1 fba193712c664db2a9acfe74f684173ee5df703b SHA256 9fadf4e45722cfc576cf4ec1b6ee51639c9d17f009a72896f0c8164ce19ff61e
 DIST gpa-0.9.1_pre20100416.tar.bz2 974400 RMD160 47ec9faa62323fe873bd86c7525733fd6dfd8558 SHA1 b2f2cb63cdfad31c8716b754c968c13dd867c8c9 SHA256 89ff78e01f78865dfec6af38f6035d235707b326e394d4b55239393ea3ed8cf1
-EBUILD gpa-0.9.1_pre20100416.ebuild 1599 RMD160 a12ef8f2e7e6a37a933b4d31fc550c851b868c88 SHA1 e73d18ba049390a900a4675ed381fbe98fc26e42 SHA256 8d760e1b98bb64700ae3367ce044f1140dc0f9ba1d5c9f07d78418858ca39e62
+EBUILD gpa-0.9.1_pre20100416-r1.ebuild 1647 RMD160 e4b9b0dc5bb3fbfb3cf145ac1f2726f438f68123 SHA1 5ec5470603bd3697bc110529d60e39c7c3c59c19 SHA256 6ebecfb42896cbd9d931c4f590c2310e062a670ae5dc3c6b9b417e2315d7ae71
+EBUILD gpa-0.9.1_pre20100416.ebuild 1630 RMD160 6a85d5586d52a4ff44ca0f079f3e036b840102d9 SHA1 92b778fe249569889570880b06d5d398e5264749 SHA256 76a93e1bb2b27269d0dc7e8209d6554bbab55439216ff64d25f1795d8da586ba
 MISC ChangeLog 9012 RMD160 cf7c53abb34daadd817763d5ad1d073b9cc9743d SHA1 e862f663a2dd24e0cba6a8e62d73bdf0a4003903 SHA256 a039a621690d3e6bcd19ffb347737f734f0c50fd1df37288de6f24bee2b6c94e
 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
diff --git a/app-crypt/gpa/files/gpa-desktop-file-validate-new.patch b/app-crypt/gpa/files/gpa-desktop-file-validate-new.patch
new file mode 100644
index 0000000..980b424
--- /dev/null
+++ b/app-crypt/gpa/files/gpa-desktop-file-validate-new.patch
@@ -0,0 +1,24 @@
+--- 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/files/gpa-desktop-file-validate.patch b/app-crypt/gpa/files/gpa-desktop-file-validate.patch
index 980b424..d33763c 100644
--- a/app-crypt/gpa/files/gpa-desktop-file-validate.patch
+++ b/app-crypt/gpa/files/gpa-desktop-file-validate.patch
@@ -1,19 +1,10 @@
---- 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
+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
diff --git a/app-crypt/gpa/gpa-0.9.1_pre20100416-r1.ebuild b/app-crypt/gpa/gpa-0.9.1_pre20100416-r1.ebuild
new file mode 100644
index 0000000..2ff018a
--- /dev/null
+++ b/app-crypt/gpa/gpa-0.9.1_pre20100416-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 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.7 2010/09/29 06:20:47 ssuominen 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
+	>=dev-libs/libgpg-error-1.4
+	>=dev-libs/libassuan-1.1.0
+	>=app-crypt/gnupg-2
+	>=app-crypt/gpgme-1.2.0"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.7
+	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.1_pre20100416.ebuild b/app-crypt/gpa/gpa-0.9.1_pre20100416.ebuild
index bdba0e3..8631b6b 100644
--- a/app-crypt/gpa/gpa-0.9.1_pre20100416.ebuild
+++ b/app-crypt/gpa/gpa-0.9.1_pre20100416.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE="nls"
 
 RDEPEND=">=x11-libs/gtk+-2.10.0