gentoo resync : 05.12.2021

4 files changed, 55 insertions, 3 deletions

diff --git a/sys-libs/argp-standalone/Manifest b/sys-libs/argp-standalone/Manifest
index 811ac414aa89..82bef5752f46 100644
--- a/sys-libs/argp-standalone/Manifest
+++ b/sys-libs/argp-standalone/Manifest
@@ -1,5 +1,7 @@
-AUX argp-standalone-1.3-shared.patch 1407 BLAKE2B 6d838b7b65b38562eca560bf094a74bb671cc0e911aed8e858e37768f12756cb579d9d984fe9444dd9b78f33b28ab080a7f6d0160dfeaf3ca4f0758c2d732d4d SHA512 2ee3386b1f63d64abff6a6b58dd7d0a7724bc07fd20f3f9daf24de1abb39d1ef35e3c616926fe3e939ccd491e84a82373e9554566a78683c3622494be2071d72
+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
 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
 EBUILD argp-standalone-1.3-r2.ebuild 798 BLAKE2B 5ae6cbd67e575f2f43bb34812bc9db103e2a1562b688c72fafb84ab23df3c4a3b8e087c7c4f37624779656184660357925942be7775b8e793c2034792cf319e9 SHA512 9e71d722741aeae44aaf89e70df7932ec0336487dc8d06334d495cb478ca2e537f5ee3f75c14a366a38d5865c8d4472460a9fed4d8abb589c14a941f3fa2d3f5
-MISC metadata.xml 254 BLAKE2B 499e85f1d389e50e0599d7e5be6888d828f46d66a065a8d69757543c5e63472ffdb8b7d9c2e95685b1d5b8287ae8e25adc8f91766532035d9313911e0cc1938b SHA512 9211c6278fd886d05d8c6b235e9e0f914c0c3220fe60b4be134d4119ddd01da335a4024201b67e88c8c50280381a0be0f3e32fb7f295134b348bfc157304d267
+EBUILD argp-standalone-1.4.1-r1.ebuild 818 BLAKE2B 29f5058db3a21d18d413343f9076fdd4824041ecb40998d7cde05fe8282ec0714b113ed404fc68dd8ebcf3f79bb446ccd3a976393c61ecf2c3e6efb63ed56208 SHA512 87182b6412c9c85c205cf1df8f2e9ad644ec6f0bc1dbcb87a3f404a8e378ddc1d21ff50d1bf770b50459ed004bcca28e93baa9793270842a1484769de4b88646
+MISC metadata.xml 330 BLAKE2B b4dbb8cb3424140a3286bd442dc4996da5678ead43e08ce02fe8f86e6b7540c2c76f2221776e09e49f9b5e8e2ded3cc45f9b85c430cee0dc03e5d0e3c5f08b33 SHA512 aa460753f6f9537cb67f2d83a98108f9904e9bf1d50e030fe04822aa1f16b89cb91538fee54581aae1d05d8de070565113cecefe61a6078db1fb1eba69047e09
diff --git a/sys-libs/argp-standalone/argp-standalone-1.4.1-r1.ebuild b/sys-libs/argp-standalone/argp-standalone-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..c665f174dc20
--- /dev/null
+++ b/sys-libs/argp-standalone/argp-standalone-1.4.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Standalone argp library for use with musl"
+HOMEPAGE="https://github.com/ericonr/argp-standalone"
+SRC_URI="https://github.com/ericonr/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}"/argp-standalone-1.3-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.3-shared.patch b/sys-libs/argp-standalone/files/argp-standalone-1.3-shared.patch
index 7164103f8a7d..eea801c4ee98 100644
--- a/sys-libs/argp-standalone/files/argp-standalone-1.3-shared.patch
+++ b/sys-libs/argp-standalone/files/argp-standalone-1.3-shared.patch
@@ -1,3 +1,8 @@
+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	2009-05-28 15:19:50.000000000 +0200
 +++ b/Makefile.am	2009-05-28 15:30:57.000000000 +0200
 @@ -21,20 +21,20 @@
diff --git a/sys-libs/argp-standalone/metadata.xml b/sys-libs/argp-standalone/metadata.xml
index bfcf597206ec..b4d9c5f484e7 100644
--- a/sys-libs/argp-standalone/metadata.xml
+++ b/sys-libs/argp-standalone/metadata.xml
@@ -5,4 +5,7 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
-	</pkgmetadata>
+	<maintainer type="project">
+		<email>musl@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>