diff options
author | Jory Pratt <anarchy@gentoo.org> | 2019-04-22 17:19:35 -0500 |
---|---|---|
committer | Jory Pratt <anarchy@gentoo.org> | 2019-04-22 17:19:35 -0500 |
commit | b659eb1ffeb31ca12e143e8d6b19e5b38d8402a6 (patch) | |
tree | 0510bca71f2c0e8fa86f92187dc47203dceb0c4b | |
parent | dev-qt/qtnetwork: version bump with libressl support (diff) | |
download | anarchy-b659eb1ffeb31ca12e143e8d6b19e5b38d8402a6.tar.gz anarchy-b659eb1ffeb31ca12e143e8d6b19e5b38d8402a6.tar.bz2 anarchy-b659eb1ffeb31ca12e143e8d6b19e5b38d8402a6.zip |
dev-libs/libgpg-error: Fixed in main tree
Signed-off-by: Jory Pratt <anarchy@gentoo.org>
-rw-r--r-- | dev-libs/libgpg-error/Manifest | 4 | ||||
-rw-r--r-- | dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch | 158 | ||||
-rw-r--r-- | dev-libs/libgpg-error/libgpg-error-1.36.ebuild | 50 | ||||
-rw-r--r-- | dev-libs/libgpg-error/metadata.xml | 11 |
4 files changed, 0 insertions, 223 deletions
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest deleted file mode 100644 index 55df376..0000000 --- a/dev-libs/libgpg-error/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX libgpg-error-1.36-gawk5-support.patch 4306 BLAKE2B 60bca612d1ce3b69facd0d27daac6275ad1f33ea1a514c762fdd4ff28c55a5e9725c2cd83429e1c2368b42fa6e9850400ffa668a6ce160cdbbc289e421d53c02 SHA512 69cd5219f47193a4b350661fde2d3dcf639ac38dacb6e076ae1d49bd1989562e034f5a238db3fa8af6fb1b80c22d5a6a7fa3f20a2fed95fe756e1a7840a1d886 -DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346 -EBUILD libgpg-error-1.36.ebuild 1477 BLAKE2B df5af3df399aaee3c8dcc6baf5f36a519c9770aaadcb702650eb5b7080c9e3ff40691e2516f13b73da15c9f1b9118366519ff9dc7cc3845fd24fd8ad65e370b9 SHA512 5bb74a4ced8b58c5226a474f5f8fcaa7e924716fef3687db0b5e892f68ac99b796c3085b4fb99589bf974ffba44a2b03f3a053fdc561ec432952679180dd6465 -MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334 diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch b/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch deleted file mode 100644 index 17e8816..0000000 --- a/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka <gniibe@fsij.org> -Date: Mon, 15 Apr 2019 15:10:44 +0900 -Subject: [PATCH] awk: Prepare for Gawk 5.0. - -* src/Makefile.am: Use pkg_namespace (instead of namespace). -* src/mkerrnos.awk: Likewise. -* lang/cl/mkerrcodes.awk: Don't escape # in regexp. -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. - --- - -In Gawk 5.0, regexp routines are replaced by Gnulib implementation, -which only allows escaping specific characters. - -GnuPG-bug-id: 4459 -Reported-by: Marius Schamschula -Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> ---- - lang/cl/mkerrcodes.awk | 2 +- - src/Makefile.am | 2 +- - src/mkerrcodes.awk | 2 +- - src/mkerrcodes1.awk | 2 +- - src/mkerrcodes2.awk | 2 +- - src/mkerrnos.awk | 2 +- - src/mkstrtable.awk | 10 +++++----- - 7 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk -index ae29043..9a1fc18 100644 ---- a/lang/cl/mkerrcodes.awk -+++ b/lang/cl/mkerrcodes.awk -@@ -122,7 +122,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/Makefile.am b/src/Makefile.am -index ce1b882..f2590cb 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile - - errnos-sym.h: Makefile mkstrtable.awk errnos.in - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ -- -v prefix=GPG_ERR_ -v namespace=errnos_ \ -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ - $(srcdir)/errnos.in >$@ - - -diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk -index 46d436c..e9c857c 100644 ---- a/src/mkerrcodes.awk -+++ b/src/mkerrcodes.awk -@@ -85,7 +85,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk -index a771a73..4578e29 100644 ---- a/src/mkerrcodes1.awk -+++ b/src/mkerrcodes1.awk -@@ -81,7 +81,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk -index ea58503..188f7a4 100644 ---- a/src/mkerrcodes2.awk -+++ b/src/mkerrcodes2.awk -@@ -91,7 +91,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk -index f79df66..15b1aad 100644 ---- a/src/mkerrnos.awk -+++ b/src/mkerrnos.awk -@@ -83,7 +83,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk -index c9de9c1..285e45f 100644 ---- a/src/mkstrtable.awk -+++ b/src/mkstrtable.awk -@@ -77,7 +77,7 @@ - # - # The variable prefix can be used to prepend a string to each message. - # --# The variable namespace can be used to prepend a string to each -+# The variable pkg_namespace can be used to prepend a string to each - # variable and macro name. - - BEGIN { -@@ -102,7 +102,7 @@ header { - print "/* The purpose of this complex string table is to produce"; - print " optimal code with a minimum of relocations. */"; - print ""; -- print "static const char " namespace "msgstr[] = "; -+ print "static const char " pkg_namespace "msgstr[] = "; - header = 0; - } - else -@@ -110,7 +110,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -@@ -150,7 +150,7 @@ END { - else - print " gettext_noop (\"" last_msgstr "\");"; - print ""; -- print "static const int " namespace "msgidx[] ="; -+ print "static const int " pkg_namespace "msgidx[] ="; - print " {"; - for (i = 0; i < coded_msgs; i++) - print " " pos[i] ","; -@@ -158,7 +158,7 @@ END { - print " };"; - print ""; - print "static GPG_ERR_INLINE int"; -- print namespace "msgidxof (int code)"; -+ print pkg_namespace "msgidxof (int code)"; - print "{"; - print " return (0 ? 0"; - --- -2.21.0 - diff --git a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild deleted file mode 100644 index 0963821..0000000 --- a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools libtool multilib-minimal toolchain-funcs - -DESCRIPTION="Contains error handling functions used by GnuPG software" -HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="common-lisp nls static-libs" - -RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND="nls? ( sys-devel/gettext )" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gpg-error-config -) -MULTILIB_WRAPPED_HEADERS=( - /usr/include/gpg-error.h - /usr/include/gpgrt.h -) - -PATCHES=( "${FILESDIR}/${PN}-1.36-gawk5-support.patch" ) - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(multilib_is_native_abi || echo --disable-languages) \ - $(use_enable common-lisp languages) \ - $(use_enable nls) \ - $(use_enable static-libs static) \ - --enable-threads \ - CC_FOR_BUILD="$(tc-getBUILD_CC)" \ - $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') -} - -multilib_src_install_all() { - einstalldocs - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/libgpg-error/metadata.xml b/dev-libs/libgpg-error/metadata.xml deleted file mode 100644 index 89e9849..0000000 --- a/dev-libs/libgpg-error/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>crypto@gentoo.org</email> - <name>Crypto</name> - </maintainer> - <use> - <flag name="common-lisp">Install common-lisp files</flag> - </use> -</pkgmetadata> |