* app-crypt/gnupg: add git version * dev-libs/npth: Add git version
authorkristianf <devnull@localhost>
Sun, 20 Oct 2013 18:32:41 +0000 (20:32 +0200)
committerkristianf <devnull@localhost>
Sun, 20 Oct 2013 18:32:41 +0000 (20:32 +0200)
app-crypt/gnupg/Manifest [new file with mode: 0644]
app-crypt/gnupg/files/gnupg_master_0002-Fix-building-with-GNU-Automake-1.13.patch [new file with mode: 0644]
app-crypt/gnupg/gnupg-9999.ebuild [new file with mode: 0644]
app-crypt/pinentry/pinentry-0.8.3.ebuild [new file with mode: 0644]
dev-libs/npth/Manifest [new file with mode: 0644]
dev-libs/npth/files/npth_master_0001-Switch-to-non-deprecated-form-of-GNU-Automake-initia.patch [new file with mode: 0644]
dev-libs/npth/files/npth_master_0002-Fix-building-with-GNU-Automake-1.13.patch [new file with mode: 0644]
dev-libs/npth/npth-9999.ebuild [new file with mode: 0644]

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
new file mode 100644 (file)
index 0000000..6258830
--- /dev/null
@@ -0,0 +1,2 @@
+AUX gnupg_master_0002-Fix-building-with-GNU-Automake-1.13.patch 2143 SHA256 2413ac5c9607450c7792c52754d4500249ab5e07ded649c752f89f243cf43b4e SHA512 adf90513afd9b3c7384b53e3b5b95c305567b6707ed9a60d76e49b28744e358da4b4412b0df266e9a214e3c4fbcf9ebe8523584436143b7e57aca620a0db422e WHIRLPOOL f2d2f59656caf1abfaf0066383deb1d27aab43c2b25bd3a9fa27cf3c4a0357e875058ef138b7a5237526fece6c3910604deac5fec6af01ada97e88f7b44b54bf
+EBUILD gnupg-9999.ebuild 1124 SHA256 9e772a4ebb2e428e96a340e7cbf16c8b9e827637b939c7d4927294ba0d6982e2 SHA512 4ce56833e20f0f1146ad103580592f0e81b98ff9456b8380eb0526df912efb48bbe3d11d6524ecbaf023c477b9514dc437960794f00ab9cc92cb45be30ac4298 WHIRLPOOL aa60d2912e23e1e543b0760cb7949f3e1a320be380af9ad9e73de7d9fea6446ff91a8cca42b061d74fa3c72524dbb15bbe1666fb83bcaccdef3d169b6a9d7a2b
diff --git a/app-crypt/gnupg/files/gnupg_master_0002-Fix-building-with-GNU-Automake-1.13.patch b/app-crypt/gnupg/files/gnupg_master_0002-Fix-building-with-GNU-Automake-1.13.patch
new file mode 100644 (file)
index 0000000..797c64d
--- /dev/null
@@ -0,0 +1,59 @@
+From c83f37c0b24671b3afd558f37b0da3b22e35ceef Mon Sep 17 00:00:00 2001
+From: Christian Aistleitner <christian@quelltextlich.at>
+Date: Sun, 14 Jul 2013 13:00:19 +0200
+Subject: [PATCH] Fix building with GNU Automake 1.13+
+
+* configure.ac: Force serial tests for GNU Automake 1.13+.
+(serial_tests): New.
+--
+
+GNU Automake switched the default test harness to parallel beginning
+with GNU Automake 1.13. Until we upgrade our tests, we force
+serial-tests beginning with GNU Automake 1.13.
+
+This commit is a minor adaption of libguestfs's (GPLv2+) commit
+a1c89bf03dd432f0e4c8c26fe01fd9b2a50df97e by Richard W.M. Jones.
+
+Signed-off-by: Christian Aistleitner <christian@quelltextlich.at>
+---
+ configure.ac | 24 +++++++++++++++++++++---
+ 1 file changed, 21 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 01530e0..88cb4d8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -66,9 +66,27 @@ VERSION=$PACKAGE_VERSION
+ AC_CONFIG_AUX_DIR([scripts])
+ AC_CONFIG_SRCDIR([sm/gpgsm.c])
+ AC_CONFIG_HEADER([config.h])
+-# Note: For automake 1.13 add the option
+-#          serial-tests
+-AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
++
++dnl Initialize automake.  automake < 1.12 didn't have serial-tests and
++dnl gives an error if it sees this, but for automake >= 1.13
++dnl serial-tests is required so we have to include it.  Solution is to
++dnl test for the version of automake (by running an external command)
++dnl and provide it if necessary.  Note we have to do this entirely using
++dnl m4 macros since automake queries this macro by running
++dnl 'autoconf --trace'.
++m4_define([serial_tests], [
++    m4_esyscmd([automake --version | awk 'NR==1 {
++                       split ($NF, V_ARR, ".");
++                       V_INT=1000000*V_ARR[1]+1000*V_ARR[2]+V_ARR[3]
++                       if (V_INT >= 1013000)
++                         # GNU Automake is version 1.13 or newer
++                         print "serial-tests";
++                     }'
++    ])
++])
++
++dnl As we need expansion of the serial_tests macro, do not [quote] it.
++AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip] serial_tests)
+ AC_CANONICAL_HOST
+ AB_INIT
+-- 
+1.8.1.5
+
diff --git a/app-crypt/gnupg/gnupg-9999.ebuild b/app-crypt/gnupg/gnupg-9999.ebuild
new file mode 100644 (file)
index 0000000..9c85b84
--- /dev/null
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.7 2013/05/03 07:56:29 djc Exp $
+
+EAPI=4
+
+inherit eutils autotools flag-o-matic user git-2
+
+DESCRIPTION="Npth: part of gnupg update"
+EGIT_REPO_URI="git://git.gnupg.org/${PN}.git"
+HOMEPAGE="http://gnupg.org/"
+
+LICENSE="GPL-2"
+SLOT="2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="localprefix"
+
+REQUIRED_USE=""
+
+COMMON_DEPEND_LIBS="
+    >=dev-libs/libassuan-2.1
+    >=dev-libs/libgcrypt-1.5
+    >=dev-libs/libgpg-error-1.11
+    >=dev-libs/libksba-1.2.0
+    >=dev-libs/npth-0.91
+    >=net-misc/curl-7.10"
+
+DEPEND="
+       ${COMMON_DEPEND_LIBS}
+       media-gfx/transfig
+       "
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+       epatch "${FILESDIR}/gnupg_master_0002-Fix-building-with-GNU-Automake-1.13.patch"
+       ./autogen.sh
+}
+
+src_configure() {
+       local myconf2; 
+
+       if use localprefix; then
+               myconf2+=(
+                       --prefix=/usr/local
+                       --datarootdir=/usr/local
+               )
+       fi
+
+       ./configure \
+               ${myconf2[@]} \
+               --enable-maintainer-mode \
+               --enable-symcryptrun \
+               --enable-mailto \
+               --enable-gpgtar
+}
diff --git a/app-crypt/pinentry/pinentry-0.8.3.ebuild b/app-crypt/pinentry/pinentry-0.8.3.ebuild
new file mode 100644 (file)
index 0000000..5c2cf8e
--- /dev/null
@@ -0,0 +1,95 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.3.ebuild,v 1.1 2013/10/07 18:24:02 radhermit Exp $
+
+EAPI=5
+
+inherit autotools multilib eutils flag-o-matic
+
+DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="http://gnupg.org/aegypten2/index.html"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="gtk ncurses qt4 caps static"
+
+RDEPEND="
+       app-admin/eselect-pinentry
+       caps? ( sys-libs/libcap )
+       gtk? ( x11-libs/gtk+:2 )
+       ncurses? ( sys-libs/ncurses )
+       qt4? ( >=dev-qt/qtgui-4.4.1:4 )
+       static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
+"
+DEPEND="${RDEPEND}
+       gtk? ( virtual/pkgconfig )
+       qt4? ( virtual/pkgconfig )
+"
+REQUIRED_USE="
+       || ( ncurses gtk qt4 )
+       gtk? ( !static )
+       qt4? ( !static )
+       static? ( ncurses )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+       if use qt4; then
+               local f
+               for f in qt4/*.moc; do
+                       "${EPREFIX}"/usr/bin/moc ${f/.moc/.h} > ${f} || die
+               done
+       fi
+       epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+       epatch "${FILESDIR}/${PN}-0.8.2-texi.patch"
+       sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+       eautoreconf
+}
+
+src_configure() {
+       use static && append-ldflags -static
+
+       # Issues finding qt on multilib systems
+       export QTLIB="${QTDIR}/$(get_libdir)"
+
+       econf \
+               --disable-dependency-tracking \
+               --enable-maintainer-mode \
+               --disable-pinentry-gtk \
+               $(use_enable gtk pinentry-gtk2) \
+               --disable-pinentry-qt \
+               $(use_enable ncurses pinentry-curses) \
+               $(use_enable ncurses fallback-curses) \
+               $(use_enable qt4 pinentry-qt4) \
+               $(use_with caps libcap) \
+               --without-x
+}
+
+src_compile() {
+       emake AR="$(tc-getAR)"
+}
+
+src_install() {
+       default
+       rm -f "${ED}"/usr/bin/pinentry || die
+}
+
+pkg_postinst() {
+       if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
+               elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
+               elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
+               elog "The soft resource limit for memory locking specifies the limit an"
+               elog "unprivileged process may lock into memory. You can also use POSIX"
+               elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
+               elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
+               elog "your users."
+       fi
+       eselect pinentry update ifunset
+}
+
+pkg_postrm() {
+       eselect pinentry update ifunset
+}
diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest
new file mode 100644 (file)
index 0000000..cd525b4
--- /dev/null
@@ -0,0 +1,3 @@
+AUX npth_master_0001-Switch-to-non-deprecated-form-of-GNU-Automake-initia.patch 745 SHA256 aac959d49f7c18cdef610c79101b3391b8b15a1bc12e092ebda23220fb0e2ed3 SHA512 a87a5ad70c93141ea284998079a79cb01f1ce0821a27b1f80621223470f968a3ba795f3758073b71844d7d502d8834868e0ffd2f3814365e5b71e203775eeb4c WHIRLPOOL 692e44c802312fb93f655f0941ce8acaa493c93c9e9045b57b4095461a69791293d19132d8fc26bac1f47f28a1f91730c58992025fe941d6156ca44c8a72101b
+AUX npth_master_0002-Fix-building-with-GNU-Automake-1.13.patch 2034 SHA256 f4477ba27bced7d33f97cff2306bb29690e2d15ed38696adc54da645630ebfb8 SHA512 480f556aca5a9d56d96e75e006a9001e69d9b08d6593a4c50bca6f2780e714dad91dd7b436aff6baf879a639bc979476869ad8fc4528b08fb66b89f245e48b68 WHIRLPOOL c8fb1265af7d32a10903d3a4dfb3d0531eead2f710be15ac6ec92875945d4bb935adecc2fea8d7468320d3a689aa2a7e59e19425d9dbd414b574c4d5abb29521
+EBUILD npth-9999.ebuild 787 SHA256 037da565b5bf636ccb0834d1e0f45111cd5461fc1509a25f9e95792172986dac SHA512 8f7253d7996843503af2c0627e4cd40af3afda5a7b4b828f7ea25d50122356576699b08cf245d565d4612b6711233e373e26deabaad0e593af8fa5811a4d6932 WHIRLPOOL 998127ef0882ea97554eb30a190aff497f6866c11dff45c6ab74c15611a31fb7568835cd4c1d5aaa0e480ecf671aae187ae482bf18055e70b49edc5f151f058e
diff --git a/dev-libs/npth/files/npth_master_0001-Switch-to-non-deprecated-form-of-GNU-Automake-initia.patch b/dev-libs/npth/files/npth_master_0001-Switch-to-non-deprecated-form-of-GNU-Automake-initia.patch
new file mode 100644 (file)
index 0000000..9e9365c
--- /dev/null
@@ -0,0 +1,29 @@
+From bfb43b855fa2023a24a3b045c613274eef6bfd9d Mon Sep 17 00:00:00 2001
+From: Christian Aistleitner <christian@quelltextlich.at>
+Date: Sun, 14 Jul 2013 12:26:36 +0200
+Subject: [PATCH 1/2] Switch to non-deprecated form of GNU Automake
+ initialization
+
+--
+
+Signed-off-by: Christian Aistleitner <christian@quelltextlich.at>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index bd650c7..cbb63f4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -73,7 +73,7 @@ VERSION=$PACKAGE_VERSION
+ AC_CONFIG_SRCDIR([src/npth.c])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
+-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
++AM_INIT_AUTOMAKE
+ AM_MAINTAINER_MODE
+ AC_CANONICAL_HOST
+-- 
+1.8.1.5
+
diff --git a/dev-libs/npth/files/npth_master_0002-Fix-building-with-GNU-Automake-1.13.patch b/dev-libs/npth/files/npth_master_0002-Fix-building-with-GNU-Automake-1.13.patch
new file mode 100644 (file)
index 0000000..59aff33
--- /dev/null
@@ -0,0 +1,57 @@
+From 13f3b8ec618d027b83b99bc1678394f26e32bac0 Mon Sep 17 00:00:00 2001
+From: Christian Aistleitner <christian@quelltextlich.at>
+Date: Sun, 14 Jul 2013 12:31:03 +0200
+Subject: [PATCH 2/2]  Fix building with GNU Automake 1.13+
+
+* configure.ac: Force serial tests for GNU Automake 1.13+.
+(serial_tests): New.
+--
+
+GNU Automake switched the default test harness to parallel beginning
+with GNU Automake 1.13. Until we upgrade our tests, we force
+serial-tests beginning with GNU Automake 1.13.
+
+This commit is a minor adaption of libguestfs's (GPLv2+) commit
+a1c89bf03dd432f0e4c8c26fe01fd9b2a50df97e by Richard W.M. Jones.
+
+Signed-off-by: Christian Aistleitner <christian@quelltextlich.at>
+---
+ configure.ac | 22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index cbb63f4..9cf8f59 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -73,7 +73,27 @@ VERSION=$PACKAGE_VERSION
+ AC_CONFIG_SRCDIR([src/npth.c])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
+-AM_INIT_AUTOMAKE
++
++dnl Initialize automake.  automake < 1.12 didn't have serial-tests and
++dnl gives an error if it sees this, but for automake >= 1.13
++dnl serial-tests is required so we have to include it.  Solution is to
++dnl test for the version of automake (by running an external command)
++dnl and provide it if necessary.  Note we have to do this entirely using
++dnl m4 macros since automake queries this macro by running
++dnl 'autoconf --trace'.
++m4_define([serial_tests], [
++    m4_esyscmd([automake --version | awk 'NR==1 {
++                       split ($NF, V_ARR, ".");
++                       V_INT=1000000*V_ARR[1]+1000*V_ARR[2]+V_ARR[3]
++                       if (V_INT >= 1013000)
++                         # GNU Automake is version 1.13 or newer
++                         print "serial-tests";
++                     }'
++    ])
++])
++
++dnl As we need expansion of the serial_tests macro, do not [quote] it.
++AM_INIT_AUTOMAKE(serial_tests)
+ AM_MAINTAINER_MODE
+ AC_CANONICAL_HOST
+-- 
+1.8.1.5
+
diff --git a/dev-libs/npth/npth-9999.ebuild b/dev-libs/npth/npth-9999.ebuild
new file mode 100644 (file)
index 0000000..3d0857e
--- /dev/null
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.7 2013/05/03 07:56:29 djc Exp $
+
+EAPI=4
+
+inherit autotools flag-o-matic user git-2
+
+DESCRIPTION="Npth: part of gnupg update"
+EGIT_REPO_URI="git://git.gnupg.org/${PN}.git"
+HOMEPAGE="http://gnupg.org/"
+
+LICENSE="GPL-2"
+SLOT="2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+       epatch "${FILESDIR}/npth_master_0001-Switch-to-non-deprecated-form-of-GNU-Automake-initia.patch"
+       #epatch "${FILESDIR}/npth_master_0002-Fix-building-with-GNU-Automake-1.13.patch"
+       ./autogen.sh
+       eautoreconf
+}
+
+src_configure() {
+       econf \
+               ${myconf} \
+               --enable-maintainer-mode
+}