* [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/libgpg-error/, dev-libs/libgpg-error/files/
@ 2019-06-20 6:52 Fabian Groffen
0 siblings, 0 replies; 3+ messages in thread
From: Fabian Groffen @ 2019-06-20 6:52 UTC (permalink / raw
To: gentoo-commits
commit: ec5325e7289a67726b22b3f3fca99ed83c9158db
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 06:51:47 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 06:52:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ec5325e7
dev-libs/libgpg-error: sync with gx86 picking up autogen fix
This is the problem as seen in sparcv9-sun-solaris2.10/20190311
Unfortunately, I didn't notice there was a copy of gpg-error in
prefix-tree.
Package-Manager: Portage-2.3.67-prefix, Repoman-2.3.14
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
dev-libs/libgpg-error/Manifest | 4 -
.../libgpg-error/files/1.29-yat2m-dep-exeext.patch | 96 ----------------------
dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild | 53 ------------
dev-libs/libgpg-error/libgpg-error-1.29.ebuild | 60 --------------
dev-libs/libgpg-error/libgpg-error-1.32.ebuild | 53 ------------
dev-libs/libgpg-error/libgpg-error-1.36.ebuild | 6 +-
6 files changed, 5 insertions(+), 267 deletions(-)
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index ec9af617bd..7c18d4d33b 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,5 +1 @@
-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
-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/1.29-yat2m-dep-exeext.patch b/dev-libs/libgpg-error/files/1.29-yat2m-dep-exeext.patch
deleted file mode 100644
index e1cfa43d51..0000000000
--- a/dev-libs/libgpg-error/files/1.29-yat2m-dep-exeext.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-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.27-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild
deleted file mode 100644
index 5196c3faf5..0000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils 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}] )
- abi_x86_32? (
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- !<=app-emulation/emul-linux-x86-baselibs-20131008-r12
- )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gpg-error-config
-)
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/gpg-error.h
- /usr/include/gpgrt.h
-)
-
-src_prepare() {
- default
- elibtoolize
- # https://lists.gnupg.org/pipermail/gnupg-devel/2017-March/032666.html
- sed -e '/@no_undefined\s*=\s*$/s/$/-no-undefined/' -i src/Makefile.in || die
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- CC_FOR_BUILD=$(tc-getBUILD_CC) \
- --enable-threads \
- $(use_enable nls) \
- $(use_enable static-libs static) \
- $(use_enable common-lisp languages) \
- $(multilib_is_native_abi || echo --disable-languages)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files --all
-}
diff --git a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
deleted file mode 100644
index 02ef002585..0000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune multilib-minimal toolchain-funcs autotools 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
- https://github.com/gpg/libgpg-error/commit/e35749023ca68de6f1f85d3072f7b36fd6f6fe7c.patch -> ${P}-solaris.patch"
-
-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}
- nls? ( sys-devel/gettext )"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gpg-error-config
-)
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/gpg-error.h
- /usr/include/gpgrt.h
-)
-
-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
- eautoreconf
- elibtoolize
-
- # upstream seems not interested in trying to understand (#584330)
- # https://lists.gnupg.org/pipermail/gnupg-devel/2017-March/032671.html
- 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 \
- CC_FOR_BUILD="$(tc-getBUILD_CC)" \
- --enable-threads \
- $(use_enable nls) \
- $(use_enable static-libs static) \
- $(use_enable common-lisp languages) \
- $(multilib_is_native_abi || echo --disable-languages)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files --all
-}
diff --git a/dev-libs/libgpg-error/libgpg-error-1.32.ebuild b/dev-libs/libgpg-error/libgpg-error-1.32.ebuild
deleted file mode 100644
index 290b4bca42..0000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.32.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune 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}
- nls? ( sys-devel/gettext )"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gpg-error-config
-)
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/gpg-error.h
- /usr/include/gpgrt.h
-)
-
-src_prepare() {
- default
- elibtoolize
-
- # upstream seems not interested in trying to understand (#584330)
- # https://lists.gnupg.org/pipermail/gnupg-devel/2017-March/032671.html
- 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 \
- CC_FOR_BUILD="$(tc-getBUILD_CC)" \
- --enable-threads \
- $(use_enable nls) \
- $(use_enable static-libs static) \
- $(use_enable common-lisp languages) \
- $(multilib_is_native_abi || echo --disable-languages)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files --all
-}
diff --git a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
index 2de6b0cda0..5d2d43ea8c 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools libtool multilib-minimal toolchain-funcs
+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"
@@ -30,6 +30,10 @@ 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)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/libgpg-error/, dev-libs/libgpg-error/files/
@ 2020-06-07 14:29 Fabian Groffen
0 siblings, 0 replies; 3+ messages in thread
From: Fabian Groffen @ 2020-06-07 14:29 UTC (permalink / raw
To: gentoo-commits
commit: 90124741cb1c79e5f4cb96f64508ec786ea0a6e4
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 7 14:29:11 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun 7 14:29:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=90124741
dev-libs/libgpg-error-1.38: sync with gx86
Package-Manager: Portage-2.3.84-prefix, Repoman-2.3.22
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
dev-libs/libgpg-error/Manifest | 1 +
.../libgpg-error-1.37-remove_broken_check.patch | 22 +++++++
dev-libs/libgpg-error/libgpg-error-1.38.ebuild | 67 ++++++++++++++++++++++
3 files changed, 90 insertions(+)
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 7c18d4d33b..913b6d8dc4 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1 +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
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch b/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch
new file mode 100644
index 0000000000..2919a9d73b
--- /dev/null
+++ b/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch
@@ -0,0 +1,22 @@
+This breaks our multilib builds:
+
+ Confirm gpg-error-config works... no
+ *** Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log
+
+--- libgpg-error-1.37/src/Makefile.am
++++ libgpg-error-1.37/src/Makefile.am
+@@ -338,14 +338,6 @@
+ cp gpg-error.h gpgrt.h
+
+ gpg-error-config: gpgrt-config gpg-error-config-old
+- @echo $(ECHO_N) "Confirm gpg-error-config works... $(ECHO_C)"
+- @if ./gpg-error-config-test.sh --old-new; then \
+- echo "good"; \
+- else \
+- echo "no"; \
+- echo "*** Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log"; \
+- exit 1; \
+- fi
+ cp gpg-error-config-old $@
+
+ install-data-local:
diff --git a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
new file mode 100644
index 0000000000..7f36c7a267
--- /dev/null
+++ b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 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.37-remove_broken_check.patch" )
+
+src_prepare() {
+ default
+
+ # don't hardcode /usr/xpg4/bin/sh as shell on Solaris
+ sed -i -e 's/solaris\*/disabled/' configure.ac || die
+
+ # 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() {
+ local myeconfargs=(
+ $(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 -o -- '--without-.*-prefix')
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -type f -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/, dev-libs/libgpg-error/files/
@ 2020-12-26 21:37 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2020-12-26 21:37 UTC (permalink / raw
To: gentoo-commits
commit: 13a3bb74203e8ba3c13020d751e58ecbfb40e0a5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 21:24:19 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 21:24:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=13a3bb74
dev-libs/libgpg-error: move to ::gentoo
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/libgpg-error/Manifest | 2 -
.../libgpg-error-1.37-remove_broken_check.patch | 22 -------
dev-libs/libgpg-error/libgpg-error-1.39.ebuild | 67 --------------------
dev-libs/libgpg-error/libgpg-error-1.41.ebuild | 73 ----------------------
dev-libs/libgpg-error/metadata.xml | 11 ----
5 files changed, 175 deletions(-)
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
deleted file mode 100644
index 5aae586e29..0000000000
--- a/dev-libs/libgpg-error/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST libgpg-error-1.39.tar.bz2 961676 BLAKE2B 8753a9295ca57ba79142ffbc7fa01a986addcdd6a8860cf80c9e1bf9f6f9dfce874f804205a5cdd956e026eb006f2662110c63e7ed52c7a42ee0c45923ae52be SHA512 b28be183ac3d3920363558c4b5b2c24f9074a302799915cc076674bb349dcfb6f09160bec1d3fb62e04047c3ce432d345f36b0905100a88cc730b53d4eb78e42
-DIST libgpg-error-1.41.tar.bz2 967117 BLAKE2B 9dc95bc09f55915d904e0f956ecf9281615028b8b8d876dbc786b752068fefea56adfb5dd5db65bad656ab664d567e56541e44a584c7f8672c30537ed05c4db0 SHA512 578d1d8090b9f6e6cbe59d9aeebec7df81aae492f75ec343f8df530950d30866fa0a7903ca050bf7bf721413f7b2708abe34f7467e2b208cc1447ffc9bd5b9a5
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch b/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch
deleted file mode 100644
index 2919a9d73b..0000000000
--- a/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-This breaks our multilib builds:
-
- Confirm gpg-error-config works... no
- *** Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log
-
---- libgpg-error-1.37/src/Makefile.am
-+++ libgpg-error-1.37/src/Makefile.am
-@@ -338,14 +338,6 @@
- cp gpg-error.h gpgrt.h
-
- gpg-error-config: gpgrt-config gpg-error-config-old
-- @echo $(ECHO_N) "Confirm gpg-error-config works... $(ECHO_C)"
-- @if ./gpg-error-config-test.sh --old-new; then \
-- echo "good"; \
-- else \
-- echo "no"; \
-- echo "*** Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log"; \
-- exit 1; \
-- fi
- cp gpg-error-config-old $@
-
- install-data-local:
diff --git a/dev-libs/libgpg-error/libgpg-error-1.39.ebuild b/dev-libs/libgpg-error/libgpg-error-1.39.ebuild
deleted file mode 100644
index 567d65a509..0000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.39.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 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="~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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.37-remove_broken_check.patch" )
-
-src_prepare() {
- default
-
- # don't hardcode /usr/xpg4/bin/sh as shell on Solaris
- sed -i -e 's/solaris\*/disabled/' configure.ac || die
-
- # 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() {
- local myeconfargs=(
- $(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 -o -- '--without-.*-prefix')
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
deleted file mode 100644
index be7802c9db..0000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp nls"
-
-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.37-remove_broken_check.patch"
-)
-
-src_prepare() {
- default
-
- if use prefix ; then
- # don't hardcode /usr/xpg4/bin/sh as shell on Solaris
- sed -i -e 's/solaris\*/disabled/' configure.ac || die
- fi
-
- # 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
-
- if use prefix ; then
- # 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
- fi
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- $(multilib_is_native_abi || echo --disable-languages)
- $(use_enable common-lisp languages)
- $(use_enable nls)
- --disable-static
- --enable-threads
- CC_FOR_BUILD="$(tc-getBUILD_CC)"
- $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -type f -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 89e984954f..0000000000
--- 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>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-26 21:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-26 21:37 [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/libgpg-error/, dev-libs/libgpg-error/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-06-07 14:29 Fabian Groffen
2019-06-20 6:52 Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox