gentoo auto-resync : 25:09:2023 - 05:24:31

5 files changed, 78 insertions, 4 deletions

diff --git a/app-crypt/asekey/Manifest b/app-crypt/asekey/Manifest
index 890d553a874b..858cddba2b52 100644
--- a/app-crypt/asekey/Manifest
+++ b/app-crypt/asekey/Manifest
@@ -1,4 +1,7 @@
 AUX asekey-3.7-bundle.patch 727 BLAKE2B 0758992095369eadb49e4daec62a0786e790acf7e39f980f74627440b53a4eae8ac57be07cb0cabbb898e207adda3e543631e9b398770e72cc4e38fd1e153a16 SHA512 4cc556687f59371d0f1919f8649b705801da4427cdc011a40b9627601e90cd27f3a06684a721cb25f1c51b10ec28f6ae728e33fbc30217716250d42c6c15efe2
+AUX asekey-3.7-dont-call-toolchain-cc-directly.patch 318 BLAKE2B 21cf3857e97c942c8d97c0ba80f476bd40aae01a00a205f77026e43da2954989bf4359d005794c62f529aec53fadd41d17e20c0e1d490841bfeb841b2d1566a1 SHA512 6b3e5a220a2bb183dbd0fbb124edab8b8221e3c5e37be617307468d8c56dd3c1859a0a206e9e9073eef9ab4ecbe1715778ec396cb637ee5c39a797797011dd5c
+AUX asekey-3.7-musl-ushort.patch 267 BLAKE2B 6015c4c7c79089c327d8c329724922e0e3d62044282a98747d6facfef89749f735024cf2ae1edf2bef576e1a16fb70b26d564426d3843732bf344c6973eff0c2 SHA512 7ce3f28d8d6d4d0422962395ad6a8f19279f5f5a1819cdc8edf17cfb0ca936200bcbae2bb7144e1c216b00853d92694f9e742e6b000ab533868f5c833ee16b0b
 DIST asekey-3.7.tar.bz2 33304 BLAKE2B 95bba8ded9557105dba50a587665ee638162ae6eefe1017a4ed272364eec1da7154b21833ed2f08fa7f4c3d570971795a0a6f65efebe517124da572d0b9b7d91 SHA512 29a01f8250d5fb26a4ba2aca562211cadf403c9e986f9fa6930faf477c374e13095c025b2917e6e837cbe8d83f3a3e023a527598b151ef1c704247c7e7c40647
-EBUILD asekey-3.7.ebuild 692 BLAKE2B dcb7a2545d4c4490d42255ec32b68cafd228493b9e7c9d3ccf86804b382b4b9e6625b4912ca2aa104a4e2e41792f145eb6e71551b1119ebb03757b9a1f4e6980 SHA512 eb53cbbb4cd928bbc75dec44e2ddef3027283b0fb321275c0d5e100c05ff9b73e6087a1eac62c7074892c75ab34d5128b04483523de0c32e4811d0d72d277774
+EBUILD asekey-3.7-r1.ebuild 868 BLAKE2B af81b6353a74ee536277c8152852393886391cc76adf80161bf44dac79a9bcc8fe9af3e1b21ecd066ed4c38417282d51be413f072bee38e963b56882fdc61a2e SHA512 c456299f3aeae1e683c3547579cf08c00737e66091ca5bd43e845969877ec567793fc9f8632c572fdd83db853eb0565c1d66f7d5c2582fbf2ca211f8f8de8cb2
+EBUILD asekey-3.7.ebuild 687 BLAKE2B 06fcda710c9df824c1c8924b38914e881f7388b960c86bf79ea0c844a8f0ba7193b9ec62fba9aa030ed01b06b5cf1e627b3c4041312bd1e640093f0981db75aa SHA512 269fe2fff411256d504af0f582f710671c172391bbf3eb708f9721aaef51d3896758a19f7446e1e3b664f53ccbccf189eefdbbd40513a37c5e512ec8f438032f
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-crypt/asekey/asekey-3.7-r1.ebuild b/app-crypt/asekey/asekey-3.7-r1.ebuild
new file mode 100644
index 000000000000..e6e750fd38e4
--- /dev/null
+++ b/app-crypt/asekey/asekey-3.7-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit udev
+
+DESCRIPTION="ASEKey USB SIM Card Reader"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/app-crypt/asekey/${P}.tar.bz2"
+
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	sys-apps/pcsc-lite[udev]
+	virtual/libusb:0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/asekey-3.7-bundle.patch"
+	"${FILESDIR}/asekey-3.7-dont-call-toolchain-cc-directly.patch"
+	"${FILESDIR}/asekey-3.7-musl-ushort.patch"
+)
+
+src_prepare() {
+	default
+	sed -i -e 's/GROUP="pcscd"/ENV{PCSCD}="1"/' "92_pcscd_${PN}.rules" || die
+}
+
+src_configure() {
+	econf --with-udev-rules-dir="$(get_udevdir)/rules.d"
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-crypt/asekey/asekey-3.7.ebuild b/app-crypt/asekey/asekey-3.7.ebuild
index e7f6dbe08462..a6c2a097c9bc 100644
--- a/app-crypt/asekey/asekey-3.7.ebuild
+++ b/app-crypt/asekey/asekey-3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit udev
 
 DESCRIPTION="ASEKey USB SIM Card Reader"
-HOMEPAGE="https://www.athena-scs.com/"
-SRC_URI="http://www.athena-scs.com/docs/reader-drivers/${PN}-${PV/./-}-tar.bz2 -> ${P}.tar.bz2"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/app-crypt/asekey/${P}.tar.bz2"
 LICENSE="BSD LGPL-2.1"
 
 SLOT="0"
diff --git a/app-crypt/asekey/files/asekey-3.7-dont-call-toolchain-cc-directly.patch b/app-crypt/asekey/files/asekey-3.7-dont-call-toolchain-cc-directly.patch
new file mode 100644
index 000000000000..ba51ff4dea9f
--- /dev/null
+++ b/app-crypt/asekey/files/asekey-3.7-dont-call-toolchain-cc-directly.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/745291
+
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@
+ DRIVER_DIR=${DESTDIR}/${USBDROPDIR}/ifd-ASEKey.bundle
+ UDEV_DIR=${DESTDIR}/${UDEVDIR}
+ 
+-CC=${BUILD}-gcc
++CC?=gcc
+ 
+ SOURCES=usb.c atr.c DriverIO.c CommandTypes.c ReaderCommands.c T1Protocol.c MemoryCards.c InitCardParams.c ifdhandler.c
+ 
diff --git a/app-crypt/asekey/files/asekey-3.7-musl-ushort.patch b/app-crypt/asekey/files/asekey-3.7-musl-ushort.patch
new file mode 100644
index 000000000000..5893527eff8a
--- /dev/null
+++ b/app-crypt/asekey/files/asekey-3.7-musl-ushort.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/714222
+
+Hack instead of fix because upstream is dead and the typedef is used extensively.
+
+--- a/Ase.h
++++ b/Ase.h
+@@ -24,6 +24,7 @@
+ #include "T1Protocol.h"
+ #include "MemoryCards.h"
+ 
++typedef unsigned short ushort;
+ 
+ //#define ASE_DEBUG
+