From 020040497d4063553f691de753d68bcd5af92ff4 Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Mon, 10 Nov 2014 23:00:22 +0100
Subject: [PATCH 1/3] libgpg-error: update to 1.17.

---
 srcpkgs/libgpg-error/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgpg-error/template b/srcpkgs/libgpg-error/template
index 42a1203fd07..2411ecb3e86 100644
--- a/srcpkgs/libgpg-error/template
+++ b/srcpkgs/libgpg-error/template
@@ -1,6 +1,6 @@
 # Template build file for 'libgpg-error'.
 pkgname=libgpg-error
-version=1.13
+version=1.17
 revision=1
 build_style=gnu-configure
 short_desc="Library for error values used by GnuPG component"
@@ -8,7 +8,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnupg.org"
 license="LGPL-2.1"
 distfiles="ftp://ftp.gnupg.org/gcrypt/libgpg-error/$pkgname-$version.tar.bz2"
-checksum=f8aba9038d8a46cefe6a6c4a7e4527144c029eb4e3ca1ed27011b962102c9b0a
+checksum=3ff4e5a71116eb862cd14185fcd282850927b8608e3b4186834fd940fbef57b5
 
 post_configure() {
 	if [ "$CROSS_BUILD" ]; then

From 9fed73dc47f6c67bdcf32a8ca1bb1044e4e93f75 Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Mon, 10 Nov 2014 23:01:19 +0100
Subject: [PATCH 2/3] npth: update to 1.1.

---
 common/shlibs         |  1 +
 srcpkgs/npth-devel    |  1 +
 srcpkgs/npth/template | 22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 120000 srcpkgs/npth-devel
 create mode 100644 srcpkgs/npth/template

diff --git a/common/shlibs b/common/shlibs
index a3fe328a7dc..23ee96a7f70 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1847,3 +1847,4 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
 libfm-qt5.so.1 libfm-qt5-0.8.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
+libnpth.so.0 npth-1.1_1
diff --git a/srcpkgs/npth-devel b/srcpkgs/npth-devel
new file mode 120000
index 00000000000..f59fb54ffe8
--- /dev/null
+++ b/srcpkgs/npth-devel
@@ -0,0 +1 @@
+npth
\ No newline at end of file
diff --git a/srcpkgs/npth/template b/srcpkgs/npth/template
new file mode 100644
index 00000000000..2c271a43f16
--- /dev/null
+++ b/srcpkgs/npth/template
@@ -0,0 +1,22 @@
+# Template file for 'npth'
+pkgname=npth
+version=1.1
+revision=1
+build_style=gnu-configure
+short_desc="New portable threads library"
+maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
+license="GPL-2,LGPL-3"
+homepage="http://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git"
+distfiles="ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2"
+checksum=896c561eb2ec8da35f11828fb04a3fbff12d41ff657c799056d7dc4a66e5df7f
+
+npth-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/share
+		vmove usr/bin/npth-config
+	}
+}

From dbbdeb7cb8679bf18631657df8982cb86b1a4eb4 Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Mon, 10 Nov 2014 23:01:40 +0100
Subject: [PATCH 3/3] New package: gnupg2-2.1.0

---
 srcpkgs/gnupg2/template | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 srcpkgs/gnupg2/template

diff --git a/srcpkgs/gnupg2/template b/srcpkgs/gnupg2/template
new file mode 100644
index 00000000000..d0c6748040e
--- /dev/null
+++ b/srcpkgs/gnupg2/template
@@ -0,0 +1,34 @@
+# Template file for 'gnupg2'
+pkgname=gnupg2
+version=2.1.0
+revision=1
+wrksrc="gnupg-${version}"
+build_style=gnu-configure
+configure_args="--sbindir=/usr/bin
+ --with-libgcrypt-prefix=${XBPS_CROSS_BASE}
+ --with-ksba-prefix=${XBPS_CROSS_BASE}
+ --with-npth-prefix=${XBPS_CROSS_BASE}
+ --with-libassuan-prefix=${XBPS_CROSS_BASE}"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel libldap-devel libcurl-devel readline-devel>=6.3
+ libusb-compat-devel libgpg-error-devel>=1.15 libgcrypt-devel libassuan-devel
+ libksba-devel npth-devel gnutls-devel"
+depends="pinentry"
+replaces="gnupg-agent>=0"
+short_desc="The GNU Privacy Guard"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-3"
+homepage="http://www.gnupg.org/"
+distfiles="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${version}.tar.bz2"
+checksum=16a8c3f50a15bf37d2dfb1c5e4bb3ec533e1d0b6a4043ff3680a376a3ad4058b
+
+post_install() {
+	# remove conflicts with gnupg 1.
+	rm ${DESTDIR}/usr/share/man/man1/gpg-zip.1
+	rm ${DESTDIR}/usr/share/man/man7/gnupg.7
+
+	vmkdir usr/share/examples
+	mv ${DESTDIR}/usr/share/doc/gnupg/examples ${DESTDIR}/usr/share/examples/gnupg2
+
+	rm -rf ${DESTDIR}/usr/share/doc/gnupg
+}