gentoo resync : 29.12.2022

3 files changed, 98 insertions, 0 deletions

diff --git a/sys-libs/argp-standalone/Manifest b/sys-libs/argp-standalone/Manifest
index 82bef5752f46..dea77bc5db5c 100644
--- a/sys-libs/argp-standalone/Manifest
+++ b/sys-libs/argp-standalone/Manifest
@@ -1,7 +1,10 @@
 AUX argp-standalone-1.3-shared.patch 1711 BLAKE2B a1a4df243b805b889f03df0a35362ae065bb93c0846257038582f8202ee4f827d627fcbbe452491f5d0fc10ad53a7a1c8f54dde3867a4aef775655807fe8899a SHA512 080a214bb372df8bfefbceef106bd6a773ef3d722feab05e21d8d24bfad9a3da6598be03cafcde20f197ff4ea73c77abc4032fb446dbd358f98855e8842390b8
 AUX argp-standalone-1.3-throw-in-funcdef.patch 2500 BLAKE2B 050476f7dec2ff8d79e09f717eada121bc07ef26e0567c2d89ed18d44a4905741494d660ce82df8fb39f19020cf529b513d0e21b651197066d781250a921177e SHA512 5e4cdeeb16e6a4fb46a00ab95f3da9276ee554eec00bb2a05da7467961234ba3f9a630aafa7ceb5feb429a84ece8bf03b869fa996b86468f4716935a914c79a4
+AUX argp-standalone-1.5.0-shared.patch 1708 BLAKE2B e4be456d7ca598d1fba57ffb34745b2d103b17b065c320d557571f4df62696ed96fcc89c1a4cfc6301fa866ca1327aac54fc2730d759566d0a63c9b645fb4726 SHA512 8f0e1d9cfa1a6b76b7784c6353acb5bc82de3be0f69dc83270fb95d2aa118aa18328e32f9d6848493d7e6ce0cb52f7df36f1f15dce9d4d1ff1eaa9d56c06a744
 DIST argp-standalone-1.3.tar.gz 130255 BLAKE2B 0848a0e7a98cfa09de52fa152eb9a793a9bf25c1edfc7401851ef134b62c051ad6ef2134d6f528e167046be582be23f311e74614c5511d659060addc14de6b2f SHA512 58c3feb8852b90248fff39e49b5019bd0dcf646790c3eaf70c3262eb81dda31a61dc0a45963c7b4a010e80fc14b37288dcb3b3ef48d02f2d33dd72c1c62e62d9
 DIST argp-standalone-1.4.1.tar.gz 58158 BLAKE2B aa55965d6c4a9d61e82a5f3af7a62bf1a35b82ad91c87b4b31a6fa314ba0bcf30667137b420ccae5fbe24301c994971ef48c8dfa4db48620e56edc4300fbd961 SHA512 c5f07e88434589a13a2e88e66d1142b581f19aa82da28507f3c31ea782e080a13a4504d8108c003b5d3c8a3aa20f52ea5e81f337c11a4b1342b16361d4877c1c
+DIST argp-standalone-1.5.0.tar.gz 65889 BLAKE2B 01f4ceb3ad18be534605db09db708f17ab5df6bfd8fc0259451a70163c8e9bda92c4f9445e98d6b6cc0bc19bc61b8b122eddacf96bd026fc2ed0db00dda318f3 SHA512 fa2eb61ea00f7a13385e5c1e579dd88471d6ba3a13b6353e924fe71914b90b40688b42a9f1789bc246e03417fee1788b1990753cda8c8d4a544e85f26b63f9e2
 EBUILD argp-standalone-1.3-r2.ebuild 798 BLAKE2B 5ae6cbd67e575f2f43bb34812bc9db103e2a1562b688c72fafb84ab23df3c4a3b8e087c7c4f37624779656184660357925942be7775b8e793c2034792cf319e9 SHA512 9e71d722741aeae44aaf89e70df7932ec0336487dc8d06334d495cb478ca2e537f5ee3f75c14a366a38d5865c8d4472460a9fed4d8abb589c14a941f3fa2d3f5
 EBUILD argp-standalone-1.4.1-r1.ebuild 818 BLAKE2B 29f5058db3a21d18d413343f9076fdd4824041ecb40998d7cde05fe8282ec0714b113ed404fc68dd8ebcf3f79bb446ccd3a976393c61ecf2c3e6efb63ed56208 SHA512 87182b6412c9c85c205cf1df8f2e9ad644ec6f0bc1dbcb87a3f404a8e378ddc1d21ff50d1bf770b50459ed004bcca28e93baa9793270842a1484769de4b88646
+EBUILD argp-standalone-1.5.0.ebuild 819 BLAKE2B b196558123aa03f730b046c83cd08d3c01c0bd12e4eca2ebd44d46258fc4a4a08800e32d354dcae0eb978cd86198b861682a5fed62b01975fcc2f223d87fdf3e SHA512 31f31b911c2b871b15d6af9f6e1da50e7d535009dd90498db53c403b22a9311bad83fbda804bcd67f80277865edb9bdfd9af93a9067e97a16977af0e7f6cb618
 MISC metadata.xml 330 BLAKE2B b4dbb8cb3424140a3286bd442dc4996da5678ead43e08ce02fe8f86e6b7540c2c76f2221776e09e49f9b5e8e2ded3cc45f9b85c430cee0dc03e5d0e3c5f08b33 SHA512 aa460753f6f9537cb67f2d83a98108f9904e9bf1d50e030fe04822aa1f16b89cb91538fee54581aae1d05d8de070565113cecefe61a6078db1fb1eba69047e09
diff --git a/sys-libs/argp-standalone/argp-standalone-1.5.0.ebuild b/sys-libs/argp-standalone/argp-standalone-1.5.0.ebuild
new file mode 100644
index 000000000000..29f3f326a366
--- /dev/null
+++ b/sys-libs/argp-standalone/argp-standalone-1.5.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Standalone argp library for use with musl"
+HOMEPAGE="https://github.com/argp-standalone/argp-standalone"
+SRC_URI="https://github.com/argp-standalone/argp-standalone/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain GPL-2 GPL-3 XC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~x86"
+IUSE="static-libs"
+
+DEPEND="!sys-libs/glibc"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-shared.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cflags "-fgnu89-inline"
+
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	insinto /usr/include
+	doins argp.h
+}
diff --git a/sys-libs/argp-standalone/files/argp-standalone-1.5.0-shared.patch b/sys-libs/argp-standalone/files/argp-standalone-1.5.0-shared.patch
new file mode 100644
index 000000000000..1c6c599942c8
--- /dev/null
+++ b/sys-libs/argp-standalone/files/argp-standalone-1.5.0-shared.patch
@@ -0,0 +1,53 @@
+Initially added in https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb196546c62e9894a46900e8078f753388d4cc1a.
+Commit mentions it being from Debian but not found any other references yet.
+
+We use -largp fairly extensively across the tree which this patch
+accommodates (easier than forcing includes?).
+--- a/Makefile.am	2022-05-03 03:41:05.000000000 -0400
++++ b/Makefile.am	2022-05-30 12:28:33.850249380 -0400
+@@ -21,19 +21,19 @@
+ AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = . testsuite
+ 
+-LIBOBJS = @LIBOBJS@
++LTLIBOBJS = @LTLIBOBJS@
+ 
+-noinst_LIBRARIES = libargp.a
++lib_LTLIBRARIES = libargp.la
+ noinst_PROGRAMS = argp-test
+ noinst_HEADERS = argp.h argp-fmtstream.h argp-namefrob.h # argp-comp.h
+ 
+ EXTRA_DIST = mempcpy.c strchrnul.c strndup.c Versions
+ 
+ # Leaves out argp-fs-xinl.c and argp-xinl.c
+-libargp_a_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c \
++libargp_la_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c \
+ 		    argp-help.c argp-parse.c argp-pv.c \
+ 		    argp-pvh.c
+ 
+-libargp_a_LIBADD = $(LIBOBJS)
++libargp_la_LIBADD = $(LTLIBOBJS)
+ 
+-argp_test_LDADD = libargp.a
++argp_test_LDADD = libargp.la
+--- a/configure.ac	2022-05-03 03:41:05.000000000 -0400
++++ b/configure.ac	2022-05-30 12:27:08.688735341 -0400
+@@ -17,6 +17,7 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
+ AM_PROG_CC_STDC
++AC_PROG_LIBTOOL
+ 
+ if test "x$am_cv_prog_cc_stdc" = xno ; then
+   AC_ERROR([the C compiler doesn't handle ANSI-C])
+--- a/testsuite/Makefile.am	2022-05-03 03:41:05.000000000 -0400
++++ b/testsuite/Makefile.am	2022-05-30 12:27:08.688735341 -0400
+@@ -5,7 +5,7 @@
+ 
+ noinst_PROGRAMS = $(TS_PROGS) ex1 ex3 ex4
+ 
+-LDADD = ../libargp.a
++LDADD = -L../.libs -largp
+ 
+ EXTRA_DIST = $(TS_SH) run-tests
+ CLEANFILES = test.out