* [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/libgpg-error/files/, dev-libs/libgpg-error/
@ 2018-07-02 16:26 Michael Haubenwallner
0 siblings, 0 replies; 3+ messages in thread
From: Michael Haubenwallner @ 2018-07-02 16:26 UTC (permalink / raw
To: gentoo-commits
commit: 8bc3e9357bac813dab9c79ce98c943f78f1eb52e
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 2 16:26:38 2018 +0000
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 2 16:26:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8bc3e935
dev-libs/libgpg-error: fix yat2m dep bug with Cygwin
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: 0x29FB0E9EC719EE20
dev-libs/libgpg-error/Manifest | 23 ++++++
.../libgpg-error/files/1.29-yat2m-dep-exeext.patch | 96 ++++++++++++++++++++++
dev-libs/libgpg-error/libgpg-error-1.29.ebuild | 1 +
3 files changed, 120 insertions(+)
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 5547341e5d..988f2c4db9 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,3 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 1.29-yat2m-dep-exeext.patch 2802 BLAKE2B 30dddaeb5779381b336c95074e70e864c57ec9d12a8d22f4bdc2340af58a3d529a77ccfaf97c3f632e5e54f3a6d7bde8c49e5e4919928db1b33c79bd86a46a64 SHA512 58390b214f0c01d8119bc6b0cc51a4a04c6d45828743d2d22c0fab5efd4204794e65ef8434a81d1b81abf94cffd10ce1fa02a410b02043051109f0a1d3a92483
DIST libgpg-error-1.27.tar.bz2 813060 BLAKE2B ece50b2f6f2fc21584724c07e4285ba6e3cd7c11def7155ef1e7be1d496e0d3a7abf977afa1f618b33ca8bcd0427c0c3b46fce2d0a2b9613378f06780f1aa47c SHA512 51b313c1159074fdbbce84f63bd8afd84b3b58cd608714865b25bed84c1862d050708aa06ac3dab92f1906593df5121161e594c2809653b0fb2c236cae5dcc2f
DIST libgpg-error-1.29-solaris.patch 1445 BLAKE2B 5c7cc0babe2e4bc883991691d95eddb2c96d71972ae05e875fa9c2c8fa964489c6a0f542e1ea4bd5f8efd9df18da4787d4be337657225c0060c8e380370bc84b SHA512 6071e3dc6f280f94a96453d953baa21caac1ff0c7a258d0a2d4e3ca272b664be6fe260ed619a66a6e5d87a7cf22e877e9c30189c641b37a401d84255a2e1add1
DIST libgpg-error-1.29.tar.bz2 894749 BLAKE2B 27f7eb516663e31b5a4734d83117127d88abecf87aefb655eb7847546148a6a887caf7f574aae101274da20375b90b32c35d599508711f7b5eac2addfabfe4b8 SHA512 57b95a7ed0ed808f05a75d7ee700ed0317da06fde1f8c59f5a4f049d784c4598f3c693068ddd47cd8bb0efdb43b9b628b876d34211f8a3e67d5088110a15323b
+EBUILD libgpg-error-1.27-r1.ebuild 1495 BLAKE2B 72f4fcf8748d80668827499a003b60101cba1ba94c83d3450a3ecdb3116ea53f20d8484d8297f4cfdd8c45be067faa4a7b4ffa15b379047f084f408d3ce3e176 SHA512 2331146f2baba155a89a02124b2c6b3ffb65c4acb10656324fd6d124b37df496ec96e815a045d6d8b2cb0a89cd383436a5c753aa0d24bcaeda90981e2bf01d4d
+EBUILD libgpg-error-1.29.ebuild 1834 BLAKE2B bdb42d2e2af4f1ba3a7ceb0723f6c1617896e9c1c5b0825b1417a24f9b015579ee4b09d2c907ab433970c46a20cacfc4ca0127122b0548c0bf22658c34ddac44 SHA512 1519f9f7a951d8e63c1b8df3951e8e59c8b45f12ef9a31691aebbd712bb895b7a2e61e9389bc37ad75dada588ef89017bbaf4e619ad98eec0d3a5fcca9afe405
+MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEqGPdSmYcJzzTeG67KfsOnscZ7iAFAls6UjwACgkQKfsOnscZ
+7iBtHBAAlVmz7RvOgyO7et1jkOprn5dGbeOSu/tYkQwrnc9c3L8tFfj/8GvFSzdZ
+tlH/+vcdBhHBljrC4X65F/m/7L2vT1I7ot63xwwHMfwZEw6Ivy8coUGhts7eEjdU
+WG7e23FpbxKMEMiHp7FGbXKiTokWLHYrsnQchHojm1Umu56HifBdkgGmz9Wf5zd+
+EJigJXoMx9k2YaaG6JbeMmiJxE6jMLVw/Wa6z5PxAq2cmeNOXCMZWr+dheSrGK8x
+Pq/390laHb3N7u2BkBnM8U8G9UrXLMEJzSTjKjoCpjwlpHDBluRbDxZ4UwmLSqTB
+/pjTDPTZAF5rwzQLLTmglqqXQHljC11nciPDi7dw6N8Chbv1wCvXhxYbfwCDFQwd
+AajCMN5P+Sql19qal+HoBR+I7fhjvk2FGz3tNZMVt8B0vAUk68Elh/7Ix7OPUaLd
+eOd9KvcIzTX0JZ99Eoc9BvSRP9WxJRiYBSJMIYZJMrWov0K0bg3QL4exzm4xJtqP
+p/+JqiIYcp0AK2jOxkmuNjeBH2rvnbsmX9x8Z/6ZKkfDDd4oCVBYwNdaDs6+4dUf
+QypqPD/v1TtxYrj0CsTt5o+urfcz5Ki/gZy+sVk986k31dy/+rcDFBAYBg01iwLA
+MHwf4s6lkIRVBV3U6QgjZbCPPwQ50xo6Msx/x0MCDJAyI7cC1TM=
+=BxMZ
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libgpg-error/files/1.29-yat2m-dep-exeext.patch b/dev-libs/libgpg-error/files/1.29-yat2m-dep-exeext.patch
new file mode 100644
index 0000000000..e1cfa43d51
--- /dev/null
+++ b/dev-libs/libgpg-error/files/1.29-yat2m-dep-exeext.patch
@@ -0,0 +1,96 @@
+From b174418aaf00b82c12b291a86a06855d35a10e10 Mon Sep 17 00:00:00 2001
+From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
+Date: Mon, 2 Jul 2018 15:20:41 +0200
+Subject: [PATCH] doc: if ever, depend on yat2m$(EXEEXT)
+
+Cygwin is not a "real" w32 system, and transparently hides the still
+required '.exe' extension whenever possible. Unfortunately, this does
+not apply to Makefile targets, so we still have to use '.exe' here.
+Fortunately, there is the portable EXEEXT Makefile variable we can use.
+
+Furthermore, we want to use a detected yat2m utility only if we are
+cross compiling, but we do not need a Makefile dependency then.
+Otherwise, the just created yat2m utility should work fine.
+
+* doc/Makefile.am (CROSS_COMPILING, HAVE_YAT2M): Set empty YAT2M_DEP.
+(not CROSS_COMPILING): Ignore detected yat2m, use local one. Use EXEEXT
+in YAT2M_DEP rather than explicit '.exe' based on HAVE_W32_SYSTEM.
+--
+
+Analysis for the problem on Cygwin when YAT2M_DEP does lack EXEEXT:
+* make has a default rule to create 'yat2m' from 'yat2m.c' (uses CC)
+* gcc transparently adds '.exe' when creating executables for Cygwin
+* 'yat2m.exe' created from default rule does perfectly work
+* automake generates the 'yat2m$(EXEEXT)' Makefile target (uses libtool)
+* with EXEEXT=.exe, Makefile has both targets 'yat2m' and 'yat2m.exe'
+* parallel make does execute commands for both targets in parallel
+* both targets really create 'yat2m.exe', overwriting each other...
+---
+ doc/Makefile.am | 15 +++++----------
+ 1 file changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 6f3e5a1..3fff0a6 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+#@@ -37,26 +37,21 @@ myman_pages = gpg-error-config.1
+
+ man_MANS = $(myman_pages)
+
++if CROSS_COMPILING
+ if HAVE_YAT2M
+ YAT2M_CMD = $(YAT2M)
+-YAT2M_DEP = $(YAT2M)
++YAT2M_DEP =
+ else
+-if CROSS_COMPILING
+ YAT2M_CMD = ./yat2m-for-build
+ YAT2M_DEP = yat2m-for-build
+ CLEANFILES += yat2m-for-build
+
+ yat2m-for-build: yat2m.c
+ $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
+-else
+-if HAVE_W32_SYSTEM
+-YAT2M_CMD = ./yat2m.exe
+-YAT2M_DEP = yat2m.exe
+-else
+-YAT2M_CMD = ./yat2m
+-YAT2M_DEP = yat2m
+-endif
+ endif
++else
++YAT2M_CMD = ./yat2m$(EXEEXT)
++YAT2M_DEP = yat2m$(EXEEXT)
+ endif
+
+ yat2m-stamp: $(myman_sources) $(srcdir)/version.texi
+--
+2.16.1
+
+@@ -37,21 +37,21 @@
+
+ man_MANS = $(myman_pages)
+
++if CROSS_COMPILING
+ if HAVE_YAT2M
+ YAT2M_CMD = $(YAT2M)
+ YAT2M_DEP = $(YAT2M)
+ else
+-if CROSS_COMPILING
+ YAT2M_CMD = ./yat2m-for-build
+ YAT2M_DEP = yat2m-for-build
+ CLEANFILES += yat2m-for-build
+
+ yat2m-for-build$(EXEEXT): yat2m.c
+ $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
+-else
+-YAT2M_CMD = ./yat2m
+-YAT2M_DEP = yat2m
+ endif
++else
++YAT2M_CMD = ./yat2m$(EXEEXT)
++YAT2M_DEP = yat2m$(EXEEXT)
+ endif
+
+ yat2m-stamp: $(myman_sources)
diff --git a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
index da73f4e943..02ef002585 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
@@ -30,6 +30,7 @@ MULTILIB_WRAPPED_HEADERS=(
src_prepare() {
default
eapply "${DISTDIR}"/${P}-solaris.patch
+ eapply "${FILESDIR}"/1.29-yat2m-dep-exeext.patch
# autogen is needed for getting a version number, it needs a
# POSIX compliant shell
hprefixify "${S}"/autogen.sh
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/libgpg-error/files/, dev-libs/libgpg-error/
@ 2019-04-30 14:39 Michael Haubenwallner
0 siblings, 0 replies; 3+ messages in thread
From: Michael Haubenwallner @ 2019-04-30 14:39 UTC (permalink / raw
To: gentoo-commits
commit: f884bb34f6e9685f130a2f4480d6ebea6c6c4e62
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 14:37:40 2019 +0000
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 14:39:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f884bb34
dev-libs/libgpg-error: sync
Package-Manager: Portage-2.3.62-prefix, Repoman-2.3.12
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>
dev-libs/libgpg-error/Manifest | 1 +
.../files/libgpg-error-1.36-gawk5-support.patch | 158 +++++++++++++++++++++
dev-libs/libgpg-error/libgpg-error-1.36.ebuild | 57 ++++++++
3 files changed, 216 insertions(+)
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 499efc3321..ec9af617bd 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -2,3 +2,4 @@ DIST libgpg-error-1.27.tar.bz2 813060 BLAKE2B ece50b2f6f2fc21584724c07e4285ba6e3
DIST libgpg-error-1.29-solaris.patch 1445 BLAKE2B 5c7cc0babe2e4bc883991691d95eddb2c96d71972ae05e875fa9c2c8fa964489c6a0f542e1ea4bd5f8efd9df18da4787d4be337657225c0060c8e380370bc84b SHA512 6071e3dc6f280f94a96453d953baa21caac1ff0c7a258d0a2d4e3ca272b664be6fe260ed619a66a6e5d87a7cf22e877e9c30189c641b37a401d84255a2e1add1
DIST libgpg-error-1.29.tar.bz2 894749 BLAKE2B 27f7eb516663e31b5a4734d83117127d88abecf87aefb655eb7847546148a6a887caf7f574aae101274da20375b90b32c35d599508711f7b5eac2addfabfe4b8 SHA512 57b95a7ed0ed808f05a75d7ee700ed0317da06fde1f8c59f5a4f049d784c4598f3c693068ddd47cd8bb0efdb43b9b628b876d34211f8a3e67d5088110a15323b
DIST libgpg-error-1.32.tar.bz2 904382 BLAKE2B 92141af9e00725015ef31152ccfe4db9535a7a6ba0aa6d011f2404bc998d7b0932fdce742a45d271995c838d34342e5197a081a42eb2e5e29c11271a1c11c6f7 SHA512 0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20
+DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
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
new file mode 100644
index 0000000000..17e8816453
--- /dev/null
+++ b/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch
@@ -0,0 +1,158 @@
+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
new file mode 100644
index 0000000000..2de6b0cda0
--- /dev/null
+++ b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
@@ -0,0 +1,57 @@
+# 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="~ppc-aix ~x64-cygwin ~amd64-linux ~arm-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
+
+ # upstream seems not interested in trying to understand (#584330)
+ # https://lists.gnupg.org/pipermail/gnupg-devel/2017-March/032671.html
+ # again reported as https://dev.gnupg.org/T4474
+ einfo "Forcing -no-undefined libtool flag ..."
+ sed -i -e 's/\$(no_undefined)/-no-undefined/' src/Makefile.in
+ eend $? || die
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/libgpg-error/files/, dev-libs/libgpg-error/
@ 2020-12-09 0:46 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2020-12-09 0:46 UTC (permalink / raw
To: gentoo-commits
commit: 5a099b9b073c68e082bb0e28e9c4365f0835a682
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 9 00:46:11 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 9 00:46:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5a099b9b
dev-libs/libgpg-error: cleanup old
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/libgpg-error/Manifest | 1 -
.../files/libgpg-error-1.36-gawk5-support.patch | 158 ---------------------
dev-libs/libgpg-error/libgpg-error-1.36.ebuild | 61 --------
3 files changed, 220 deletions(-)
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 6406ca30d2..008697b626 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,3 +1,2 @@
-DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de
DIST libgpg-error-1.39.tar.bz2 961676 BLAKE2B 8753a9295ca57ba79142ffbc7fa01a986addcdd6a8860cf80c9e1bf9f6f9dfce874f804205a5cdd956e026eb006f2662110c63e7ed52c7a42ee0c45923ae52be SHA512 b28be183ac3d3920363558c4b5b2c24f9074a302799915cc076674bb349dcfb6f09160bec1d3fb62e04047c3ce432d345f36b0905100a88cc730b53d4eb78e42
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 17e8816453..0000000000
--- 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 5d2d43ea8c..0000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
+++ /dev/null
@@ -1,61 +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 prefix
-
-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="~ppc-aix ~x64-cygwin ~amd64-linux ~arm-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
- # only necessary for as long as we run eautoreconf, configure.ac
- # uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
- # not a pure /bin/sh script, so it fails on some hosts
- hprefixify -w 1 autogen.sh
- eautoreconf
-
- # upstream seems not interested in trying to understand (#584330)
- # https://lists.gnupg.org/pipermail/gnupg-devel/2017-March/032671.html
- # again reported as https://dev.gnupg.org/T4474
- einfo "Forcing -no-undefined libtool flag ..."
- sed -i -e 's/\$(no_undefined)/-no-undefined/' src/Makefile.in
- eend $? || die
-}
-
-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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-09 0:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-02 16:26 [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/libgpg-error/files/, dev-libs/libgpg-error/ Michael Haubenwallner
-- strict thread matches above, loose matches on Subject: below --
2019-04-30 14:39 Michael Haubenwallner
2020-12-09 0:46 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox