gentoo auto-resync : 31:05:2023 - 15:23:38

7 files changed, 75 insertions, 17 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 266efb092f09..63f340c8ca6d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libax25/Manifest b/dev-libs/libax25/Manifest
index 7abfc47d39e5..2d15d28c25a2 100644
--- a/dev-libs/libax25/Manifest
+++ b/dev-libs/libax25/Manifest
@@ -1,3 +1,4 @@
+AUX libax25-0.0.12_rc5-musl.patch 656 BLAKE2B 8b71801ee939f0d53c464d665023f021c720cbba92024a85f5e56a206738ceb3f50efaea09cc8721b54f14e9ad48812d6eb0e7a2c380ee92e73465c809310b44 SHA512 098e0cbaf612c2bba5020a3947b50568f65d5907ba67265e2feb6708b3f9dfc0244312a8ae9960ca1d1a1f4287e25bff0d6935668c78650e97bd3ab4b3db0ccd
 DIST libax25-0.0.12-rc5.tar.xz 247072 BLAKE2B 9d39e1fc5489e9bdd78b8f5a3eb033e7561922a44de8da4c08b14a890c1d2bf24e5ee63dbc3cce4ec8195ac857948a262e40bf379341e24bfb8f1d8a4c391ab4 SHA512 2e5b46b065763a47ee1d92866ee108390661adbd0ac9ececa5abf3e34ebf3bc9c8a1d082b16fc89e0bbc868b551dd894991c687f4c753b67e533e81b80dd1da0
-EBUILD libax25-0.0.12_rc5.ebuild 561 BLAKE2B 1e127ba15af2d862e3530e358273c6243945a5ee9fd2d36f7781239cb663b29e5ffc02af479f90b5165057a42e8a0bbfa1d1400c289ab667a29dd6ee761814f6 SHA512 6659e92c9956c5115c6e6f09ab0750683612d5611b08da1181af2a57912215f5065c20ad5143edd91ff06286767f8a878568aed4b27e353a7d7ceafff6568759
+EBUILD libax25-0.0.12_rc5.ebuild 681 BLAKE2B 8e56a203dab516be855bc35df09625a39b04f899e2799565c2cfa696bcc672f8550a28338d6cdda24e8e2b792a35b2a81a48f7c014c551a99819e07d7e966f41 SHA512 2bb3ee60ae9c2b5df6c9c841124358deba99ab970805a4615f3aa7a9b8a1bc537ed4061a06cce9b563e9707fd0c4e2e78c03958cbbbf80874b93e0c33892ae79
 MISC metadata.xml 256 BLAKE2B f5d5a93344d150a5211f11075344a863ec1b6b11b1ac9acb15364a05f23b7439d9688ab2a153af32e610e4ed5120cd8a044558edc48e5ee0d91f96ed9ba9ed71 SHA512 1971736573e03d6f2bbc45273991f004e8766d076ccf6369c6bf96583afe3a98665a1a0cf51cda40d678e9ef38739453837395c3f1d50c637c35d395a392ca15
diff --git a/dev-libs/libax25/files/libax25-0.0.12_rc5-musl.patch b/dev-libs/libax25/files/libax25-0.0.12_rc5-musl.patch
new file mode 100644
index 000000000000..2507d25ea83b
--- /dev/null
+++ b/dev-libs/libax25/files/libax25-0.0.12_rc5-musl.patch
@@ -0,0 +1,23 @@
+As MUSL libc does not provide netax25/ax25.h, netrom/netrom.h and 
+netrose/rose.h instatll substitute files uncondiditionally. See bug #907465
+
+diff --git a/Makefile.am b/Makefile.am
+index 0ff5f37..517e084 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,15 +7,9 @@ libax25ioincludedir = $(includedir)
+ AM_CPPFLAGS = -DAX25_SYSCONFDIR=\""$(sysconfdir)/ax25/"\" \
+ 	      -DAX25_LOCALSTATEDIR=\""$(localstatedir)/ax25/"\"
+ 
+-if !AX25_H
+ USE_LIBAX25_AX25_H = netax25/ax25.h
+-endif
+-if !NETROM_H
+ USE_LIBAX25_NETROM_H = netrom/netrom.h
+-endif
+-if !ROSE_H
+ USE_LIBAX25_ROSE_H = netrose/rose.h
+-endif
+ 
+ nobase_libax25include_HEADERS = 	\
+ 	netax25/axlib.h			\
diff --git a/dev-libs/libax25/libax25-0.0.12_rc5.ebuild b/dev-libs/libax25/libax25-0.0.12_rc5.ebuild
index 7b1d1c34fbd9..3eea73794bff 100644
--- a/dev-libs/libax25/libax25-0.0.12_rc5.ebuild
+++ b/dev-libs/libax25/libax25-0.0.12_rc5.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 MY_P=${PN}-$(ver_rs 3 '-')
 
+inherit autotools
+
 DESCRIPTION="AX.25 library for hamradio applications"
 HOMEPAGE="http://www.linux-ax25.org/"
 SRC_URI="http://www.linux-ax25.org/pub/${PN}/${MY_P}.tar.xz"
@@ -16,6 +18,12 @@ IUSE="static-libs"
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	use elibc_musl && eapply "${FILESDIR}/${P}-musl.patch"
+	eapply_user
+	eautoreconf
+}
+
 src_configure() {
 	econf  $(use_enable static-libs static)
 }
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 0302145c2ecb..cda17c119377 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,6 +1,5 @@
 AUX opensc.module 390 BLAKE2B 4c5ea159ed2038af51c9ca3e903b23db1acdfa8a6c79be7f922f8a03602f15e3b1a98570be0a1f3f2db922c9083976eeb164d011b981c8709a9b1459e959634f SHA512 52a0a47963d0938a3a644dedcd913bb22ea6d5e3d539b759872c4175085491cc11a3958bb308029eb4942ea20e0f7890865c21cb063e335e38a154957a64ed58
-DIST opensc-0.22.0.tar.gz 2287020 BLAKE2B 74e4bb6843b640c5a397b820a52180a34159c330f5ecb81af166096f23e2499ef1a4d555b5d71613da57ba121d0f984dcfdc2ba9491f26f826a423725a2321e2 SHA512 70ad5f1219f2ec2a5529a30d8e9955510c77c87d0bc857d5951c7227c75cf9de1c6071f43dd3816a2034123ebd902709793ff776e84d5379fdd54c811ccfaaee
 DIST opensc-0.23.0.tar.gz 2366469 BLAKE2B c0f74379a70347a58be27684ae2cf833e6f35328b566af2c6daa8276174864406fa176acf7ba84931970fe07e3dd8d6eccf7884f079cb0110c4d6ff9a76792dc SHA512 cd102cd64e719c59153960a4921b7525055045f16e6f6ffa8c9def6ce999a9c5098267b41f8753b41107f626bea20c34561002f5d38eddb4ce6b371913a17a1b
-EBUILD opensc-0.22.0.ebuild 1590 BLAKE2B 2c7a622f626c78be1310af078205ee09f95a4abee16e4469f119296a340c573a32033399c84ec0dae6e4e524249a9288dfd59c9059bc5d983f68177841cf37d1 SHA512 624397c0bccce33471d9d1e665303262906240faf9d63d264156a6a8ee93b7e3be1682c7ec3221972dcca12affe8594c75030d0296286ede8fde225840d07daa
-EBUILD opensc-0.23.0.ebuild 1700 BLAKE2B c89da7d660db50b3383c88967524f9c38601e6a14f5ab81c6736df6c0969e023f35bb31836f8ab1d8933bd5fdbb65c4c5d4d1dba6815b016ce9ebe63da2cc993 SHA512 b9376faeab22d35f92a3c588a9a9547b5f073668503df3f138897d62a5cd0909c2bec3bbb02d4f987719e11cce91628a4f35e917a50554150c680e93cabc3b74
+EBUILD opensc-0.23.0.ebuild 1878 BLAKE2B fc0859070a61c2a07d8358525918e3775ba9b1e6b6917389e23e95ba7aafb8ddb24a6a89fded06f5c210623de6e8d843cbdb72b8501fd6c4986cbbbd7ecba7a6 SHA512 9496512a1b9565196de7202aa2294e0ff24ccea983c4d35622586c6e77ab0fd5a7c7c5e8eae0672ba0f872a90045007a7a7f88f624702a15f082bc1918f04fcf
+EBUILD opensc-9999.ebuild 1881 BLAKE2B ae0acc8bcc7081ceea38b6a59ed04dd6acf37bf4e86f3979ac317e5bd8dffba6cfdb0480cfc574ca23d5ab5f491ea2b301ce4b2ae86835e8210af391cdfe11c6 SHA512 8ce8e223359c15a15159a006ecfa2b1c4f10063902450c4fa120902cc1193a0478e87cd0678241b0f4e96aa7cb870267d4d80e44e1e13c952a322412801dba26
 MISC metadata.xml 1305 BLAKE2B 8560829a2784e38e10b41f5e083568a7fafd19e9fe185b1675c787b2514ea01a18b3fa6c7d0018b6e45638512d02e9bec12fbc5df4e50bf49db6558ef89a9af8 SHA512 8b477d96f6acb7a808e24af1d4b29e16e06b83eaf29799dbc6b74181ded74de47d7527712e21412bfb92a26e1d03974368a2c1790208785230280a18d21aff06
diff --git a/dev-libs/opensc/opensc-0.23.0.ebuild b/dev-libs/opensc/opensc-0.23.0.ebuild
index b46faccba7b9..5e6d2db59ebf 100644
--- a/dev-libs/opensc/opensc-0.23.0.ebuild
+++ b/dev-libs/opensc/opensc-0.23.0.ebuild
@@ -7,11 +7,17 @@ inherit bash-completion-r1 libtool
 
 DESCRIPTION="Libraries and applications to access smartcards"
 HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
-SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/OpenSC/OpenSC.git"
+else
+	SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="amd64 ppc64 x86"
+fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
 IUSE="ctapi doc openct notify pace +pcsc-lite readline secure-messaging ssl test zlib"
 RESTRICT="!test? ( test )"
 
@@ -36,7 +42,12 @@ REQUIRED_USE="
 
 src_prepare() {
 	default
-	elibtoolize
+
+	if [[ ${PV} == *9999 ]]; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
 }
 
 src_configure() {
diff --git a/dev-libs/opensc/opensc-0.22.0.ebuild b/dev-libs/opensc/opensc-9999.ebuild
index f4aee906f6aa..a470c4913c37 100644
--- a/dev-libs/opensc/opensc-0.22.0.ebuild
+++ b/dev-libs/opensc/opensc-9999.ebuild
@@ -7,18 +7,25 @@ inherit bash-completion-r1 libtool
 
 DESCRIPTION="Libraries and applications to access smartcards"
 HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
-SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/OpenSC/OpenSC.git"
+else
+	SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="ctapi doc openct notify +pcsc-lite readline secure-messaging ssl test zlib"
+IUSE="ctapi doc openct notify pace +pcsc-lite readline secure-messaging ssl test zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="zlib? ( sys-libs/zlib )
 	readline? ( sys-libs/readline:0= )
 	ssl? ( dev-libs/openssl:0= )
 	openct? ( >=dev-libs/openct-0.5.0 )
+	pace? ( dev-libs/openpace:= )
 	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
 	notify? ( dev-libs/glib:2 )"
 DEPEND="${RDEPEND}
@@ -35,20 +42,27 @@ REQUIRED_USE="
 
 src_prepare() {
 	default
-	elibtoolize
+
+	if [[ ${PV} == *9999 ]]; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
 }
 
 src_configure() {
+	# don't want to run upstream's clang-tidy checks
+	export ac_cv_path_CLANGTIDY=""
+
 	econf \
 		--with-completiondir="$(get_bashcompdir)" \
-		--disable-openpace \
-		--disable-static \
 		--disable-strict \
 		--enable-man \
 		$(use_enable ctapi) \
 		$(use_enable doc) \
-		$(use_enable notify ) \
+		$(use_enable notify) \
 		$(use_enable openct) \
+		$(use_enable pace openpace) \
 		$(use_enable pcsc-lite pcsc) \
 		$(use_enable readline) \
 		$(use_enable secure-messaging sm) \
@@ -59,7 +73,9 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+
 	insinto /etc/pkcs11/modules/
-	doins "${FILESDIR}/${PN}.module"
+	doins "${FILESDIR}"/opensc.module
+
+	find "${ED}" -name '*.la' -delete || die
 }