aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/repoman.yml4
-rw-r--r--app-emulation/qemu/files/qemu-6.0.0-make.patch14
-rw-r--r--app-emulation/qemu/metadata.xml5
-rw-r--r--app-emulation/qemu/qemu-6.0.0-r3.ebuild (renamed from app-emulation/qemu/qemu-6.0.0.ebuild)18
-rw-r--r--app-office/libreoffice/Manifest4
-rw-r--r--app-office/libreoffice/files/libreoffice-7.1.5.2-bison-3.8.patch53
-rw-r--r--app-office/libreoffice/libreoffice-7.1.5.2.ebuild (renamed from app-office/libreoffice/libreoffice-7.1.3.2.ebuild)9
-rw-r--r--dev-java/icedtea-bin/Manifest98
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-3.20.0-r1.ebuild (renamed from dev-java/icedtea-bin/icedtea-bin-3.19.0.ebuild)5
-rw-r--r--dev-libs/elfutils/Manifest1
-rw-r--r--dev-libs/elfutils/elfutils-0.185.ebuild102
-rw-r--r--dev-libs/elfutils/files/0.185/musl-cdefs.patch29
-rw-r--r--dev-libs/elfutils/files/0.185/musl-fix-uninitialized-mnebuf.patch24
-rw-r--r--dev-libs/elfutils/files/elfutils-0.185-static-inline.patch12
-rw-r--r--mail-filter/libspf2/Manifest1
-rw-r--r--mail-filter/libspf2/files/libspf2-1.2.10-dn_skipname.patch120
-rw-r--r--mail-filter/libspf2/files/libspf2-1.2.10-expand.patch16
-rw-r--r--mail-filter/libspf2/files/libspf2-1.2.10-gcc5.patch22
-rw-r--r--mail-filter/libspf2/files/libspf2-1.2.10-musl.patch15
-rw-r--r--mail-filter/libspf2/files/libspf2-1.2.10-netdb.patch17
-rw-r--r--mail-filter/libspf2/files/libspf2-1.2.9-ipv6.patch61
-rw-r--r--mail-filter/libspf2/libspf2-1.2.10.ebuild49
-rw-r--r--mail-filter/libspf2/metadata.xml6
-rw-r--r--media-libs/mesa/Manifest3
-rw-r--r--media-libs/mesa/files/mesa-21.0.3-add-disable-tls-support.patch41
-rw-r--r--media-libs/mesa/mesa-21.0.3.ebuild573
-rw-r--r--media-libs/mesa/mesa-21.1.7.ebuild (renamed from media-libs/mesa/mesa-21.1.4-r1.ebuild)9
-rw-r--r--media-tv/kodi/Manifest2
-rw-r--r--media-tv/kodi/files/kodi-19.1-fmt-8.patch28
-rw-r--r--media-tv/kodi/kodi-19.3.ebuild (renamed from media-tv/kodi/kodi-19.1.ebuild)32
-rw-r--r--net-analyzer/openbsd-netcat/Manifest6
-rw-r--r--net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-b64_ntop.patch349
-rw-r--r--net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch86
-rw-r--r--net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-b64_ntop.patch349
-rw-r--r--net-analyzer/openbsd-netcat/files/openbsd-netcat-1.195-b64_ntop.patch349
-rw-r--r--net-analyzer/openbsd-netcat/metadata.xml11
-rw-r--r--net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild55
-rw-r--r--net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild57
-rw-r--r--net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild57
-rw-r--r--net-wireless/bluez/Manifest1
-rw-r--r--net-wireless/bluez/bluez-5.61.ebuild295
-rw-r--r--net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch58
-rw-r--r--net-wireless/bluez/files/0001-include-limits.h-for-PATH_MAX-for-musl-support.patch24
-rw-r--r--net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch38
-rw-r--r--net-wireless/bluez/files/bluetooth-conf.d1
-rw-r--r--net-wireless/bluez/files/bluetooth-init.d-r513
-rw-r--r--net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch42
-rw-r--r--net-wireless/bluez/files/bluez-udevadm-path-r1.patch10
-rw-r--r--net-wireless/bluez/metadata.xml26
-rw-r--r--sys-apps/groff/Manifest1
-rw-r--r--sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch24
-rw-r--r--sys-apps/groff/files/groff-1.22.4-musl.patch52
-rw-r--r--sys-apps/groff/groff-1.22.4.ebuild105
-rw-r--r--sys-apps/groff/metadata.xml11
-rw-r--r--sys-apps/lshw/Manifest1
-rw-r--r--sys-apps/lshw/files/lshw-02.18b-fixes.patch188
-rw-r--r--sys-apps/lshw/files/lshw-02.18b-gentoo.patch161
-rw-r--r--sys-apps/lshw/files/lshw-02.18b-gettext-array.patch31
-rw-r--r--sys-apps/lshw/files/lshw-02.18b-sgx.patch32
-rw-r--r--sys-apps/lshw/lshw-02.18b-r2.ebuild72
-rw-r--r--sys-apps/lshw/metadata.xml8
-rw-r--r--sys-devel/binutils/Manifest4
-rw-r--r--sys-devel/binutils/binutils-2.33.1-r1.ebuild439
-rw-r--r--sys-devel/binutils/binutils-2.34-r2.ebuild436
-rw-r--r--sys-devel/binutils/files/binutils-2.33-gcc-10.patch39
-rw-r--r--sys-devel/binutils/files/binutils-configure-LANG.patch65
-rw-r--r--sys-devel/binutils/metadata.xml17
-rw-r--r--sys-devel/gcc/Manifest8
-rw-r--r--sys-devel/gcc/files/gcc-6.1-musl-libssp.patch20
-rw-r--r--sys-devel/gcc/gcc-10.3.0-r2.ebuild (renamed from sys-devel/gcc/gcc-10.3.0.ebuild)6
-rw-r--r--sys-devel/gcc/gcc-10.3.0-r3.ebuild (renamed from sys-devel/gcc/gcc-10.2.0-r5.ebuild)10
-rw-r--r--sys-devel/gcc/gcc-11.1.0-r1.ebuild4
-rw-r--r--sys-devel/gcc/gcc-11.2.0.ebuild (renamed from sys-devel/gcc/gcc-9.3.0-r2.ebuild)22
-rw-r--r--sys-devel/lld/Manifest3
-rw-r--r--sys-devel/lld/lld-10.0.1-r1.ebuild52
-rw-r--r--sys-devel/lld/lld-11.1.0-r1.ebuild58
-rw-r--r--sys-devel/lld/lld-12.0.0.ebuild69
-rw-r--r--sys-devel/lld/metadata.xml7
-rw-r--r--sys-fs/lvm2/Manifest2
-rw-r--r--sys-fs/lvm2/lvm2-2.02.188-r2.ebuild (renamed from sys-fs/lvm2/lvm2-2.02.187-r3.ebuild)10
-rw-r--r--sys-process/procps/Manifest1
-rw-r--r--sys-process/procps/files/procps-3.3.11-sysctl-manpage.patch32
-rw-r--r--sys-process/procps/files/procps-3.3.12-proc-tests.patch47
-rw-r--r--sys-process/procps/files/procps-3.3.17-musl-fix.patch72
-rw-r--r--sys-process/procps/metadata.xml18
-rw-r--r--sys-process/procps/procps-3.3.17-r1.ebuild85
86 files changed, 928 insertions, 4484 deletions
diff --git a/.github/workflows/repoman.yml b/.github/workflows/repoman.yml
index f7a30db..b641440 100644
--- a/.github/workflows/repoman.yml
+++ b/.github/workflows/repoman.yml
@@ -19,7 +19,7 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install lxml pyyaml
- wget -qO - "https://github.com/gentoo/portage/archive/portage-3.0.16.tar.gz" | tar xz
+ wget -qO - "https://github.com/gentoo/portage/archive/portage-3.0.22.tar.gz" | tar xz
sudo groupadd -g 250 portage
sudo useradd -g portage -d /var/tmp/portage -s /bin/false -u 250 portage
- name: Setup master gentoo repository
@@ -28,7 +28,7 @@ jobs:
wget -qO - "https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz" | sudo tar xz -C /var/db/repos/gentoo --strip-components=1
sudo wget "https://www.gentoo.org/dtd/metadata.dtd" -O /var/cache/distfiles/metadata.dtd
sudo wget "https://gitweb.gentoo.org/proj/portage.git/plain/cnf/repos.conf" -O /etc/portage/repos.conf
- sudo ln -s /var/db/repos/gentoo/profiles/default/linux/amd64/17.1 /etc/portage/make.profile
+ sudo ln -s /var/db/repos/gentoo/profiles/default/linux/amd64/17.0/musl /etc/portage/make.profile
- name: Test with repoman
run: |
python3 portage-*/repoman/bin/repoman full -dx
diff --git a/app-emulation/qemu/files/qemu-6.0.0-make.patch b/app-emulation/qemu/files/qemu-6.0.0-make.patch
new file mode 100644
index 0000000..2dac1ca
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-6.0.0-make.patch
@@ -0,0 +1,14 @@
+Allow MAKE='make V=1' and similar.
+
+https://bugs.gentoo.org/795678
+--- a/configure
++++ b/configure
+@@ -1953,7 +1953,7 @@ if test -z "$python"
+ then
+ error_exit "Python not found. Use --python=/path/to/python"
+ fi
+-if ! has "$make"
++if ! has $make
+ then
+ error_exit "GNU make ($make) not found"
+ fi
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index ec3f45a..4245f6d 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -6,8 +6,8 @@
<name>Matthias Maier</name>
</maintainer>
<maintainer type="person">
- <email>slyfox@gentoo.org</email>
- <name>Sergei Trofimovich</name>
+ <email>zlogene@gentoo.org</email>
+ <name>Mikle Kolyada</name>
</maintainer>
<maintainer type="project">
<email>virtualization@gentoo.org</email>
@@ -20,6 +20,7 @@
<flag name="capstone">Enable disassembly support with <pkg>dev-libs/capstone</pkg></flag>
<flag name="curl">Support ISOs / -cdrom directives via HTTP or HTTPS.</flag>
<flag name="fdt">Enables firmware device tree support</flag>
+ <flag name="fuse">Enables FUSE block device export</flag>
<flag name="glusterfs">Enables GlusterFS cluster fileystem via
<pkg>sys-cluster/glusterfs</pkg></flag>
<flag name="gnutls">Enable TLS support for the VNC console server.
diff --git a/app-emulation/qemu/qemu-6.0.0.ebuild b/app-emulation/qemu/qemu-6.0.0-r3.ebuild
index 5c2c7c2..443089d 100644
--- a/app-emulation/qemu/qemu-6.0.0.ebuild
+++ b/app-emulation/qemu/qemu-6.0.0-r3.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="ncurses,readline"
FIRMWARE_ABI_VERSION="5.2.0-r50"
inherit eutils linux-info toolchain-funcs multilib python-r1
-inherit udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
+inherit udev fcaps readme.gentoo-r1 pax-utils xdg-utils
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
@@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then
SRC_URI=""
else
SRC_URI="https://download.qemu.org/${P}.tar.xz"
- KEYWORDS="amd64 arm64 ~ppc ppc64 ~x86"
+ KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@@ -33,7 +33,7 @@ LICENSE="GPL-2 LGPL-2 BSD-2"
SLOT="0"
IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
- +fdt glusterfs gnutls gtk infiniband iscsi io-uring
+ +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring
jack jemalloc +jpeg kernel_linux
kernel_FreeBSD lzo multipath
ncurses nfs nls numa opengl +oss +pin-upstream-blobs
@@ -108,7 +108,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
qemu_softmmu_targets_ppc? ( fdt )
qemu_softmmu_targets_riscv32? ( fdt )
qemu_softmmu_targets_riscv64? ( fdt )
- static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy )
+ sdl-image? ( sdl )
+ static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy !udev )
static-user? ( !plugins )
vhost-user-fs? ( caps seccomp )
virgl? ( opengl )
@@ -149,6 +150,7 @@ SOFTMMU_TOOLS_DEPEND="
caps? ( sys-libs/libcap-ng[static-libs(+)] )
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
+ fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
gnutls? (
dev-libs/nettle:=[static-libs(+)]
@@ -171,8 +173,8 @@ SOFTMMU_TOOLS_DEPEND="
lzo? ( dev-libs/lzo:2[static-libs(+)] )
multipath? ( sys-fs/multipath-tools )
ncurses? (
- sys-libs/ncurses:0=[unicode]
- sys-libs/ncurses:0=[static-libs(+)]
+ sys-libs/ncurses:=[unicode(+)]
+ sys-libs/ncurses:=[static-libs(+)]
)
nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
numa? ( sys-process/numactl[static-libs(+)] )
@@ -200,7 +202,7 @@ SOFTMMU_TOOLS_DEPEND="
>=app-emulation/spice-0.12.0[static-libs(+)]
)
ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
- udev? ( virtual/libudev[static-libs(+)] )
+ udev? ( virtual/libudev:= )
usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
vde? ( net-misc/vde[static-libs(+)] )
@@ -274,6 +276,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
"${FILESDIR}"/${PN}-5.2.0-dce-locks.patch
+ "${FILESDIR}"/${PN}-6.0.0-make.patch
)
QA_PREBUILT="
@@ -521,6 +524,7 @@ qemu_src_configure() {
$(conf_notuser caps cap-ng)
$(conf_notuser curl)
$(conf_notuser fdt)
+ $(conf_notuser fuse)
$(conf_notuser glusterfs)
$(conf_notuser gnutls)
$(conf_notuser gnutls nettle)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 14a9b2c..ccd6906 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -17,7 +17,7 @@ DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 BLAKE2B 8012d
DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743
DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
-DIST libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72
+DIST libreoffice-7.1.5.2.tar.xz 244350068 BLAKE2B ac3c7f5cabcb27ce3ed31febb04ce54b93bc8b4fa716259d1b93d5364e75b85af3352ad70a023b56271e769f5537b3f3151e837ee13498e08f1871e5b47d778c SHA512 dad5ffd344a7bad88ed8e77df4fb17b42237715e7b1feb7a7de164f2fbf6698feefedeb57974d8275067a06c0da60e9b07a333ccc1bb2f6d55a6b52408bd9b5f
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb
+DIST libreoffice-help-7.1.5.2.tar.xz 111785852 BLAKE2B 18962fe9260f6cf8ec7b1676f077b9f43e0277769b31b8e2c22cf83ac2963f3e92448901bc12f56dfb579da8a8a1ce20d6bd34c4bc3449f7e0972c03d22f63be SHA512 c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198ceeee1c7
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
diff --git a/app-office/libreoffice/files/libreoffice-7.1.5.2-bison-3.8.patch b/app-office/libreoffice/files/libreoffice-7.1.5.2-bison-3.8.patch
new file mode 100644
index 0000000..b60b99a
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.1.5.2-bison-3.8.patch
@@ -0,0 +1,53 @@
+From 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Tue, 14 Sep 2021 12:20:48 +0200
+Subject: Adapt to Bison 3.8 internal yyn -> yyrule rename
+
+see
+<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=f30067ed51f23802fc91761ede1506dfa72b2865>
+"glr2.cc: log the execution of deferred actions" including "Rename argument yyn
+as yyrule for clarity."
+
+YYBISON was defined as 1 rather than as a representation of the Bison version
+prior to
+<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=21c147b6e5372563b7c4741deadaddb9354f4b09>
+"yacc.c: provide the Bison version as an integral macro", which shouldn't be a
+problem here. And YYBISON is apparently completely undefined with
+/usr/bin/bison on macOS.
+
+(The preceding comment always mentioned "yyi" and "yyrmap" in apparent mismatch
+with the actually used "yyn" and "yyr1" ever since
+c25ec0608a167bcf1d891043f02273761c351701 "initial import", so just leave it
+untouched.)
+
+Change-Id: I4f901407aa21ed4abec84e661d813ee7599f02f0
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122082
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+---
+ connectivity/source/parse/sqlbison.y | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
+index d14f36e7794f..c4be0bc00bd0 100644
+--- a/connectivity/source/parse/sqlbison.y
++++ b/connectivity/source/parse/sqlbison.y
+@@ -74,9 +74,15 @@ inline connectivity::OSQLInternalNode* newNode(const OUString& _newValue,
+
+ // yyi is the internal number of the rule that is currently being reduced
+ // This can be mapped to external rule number via the yyrmap.
++#if defined YYBISON && YYBISON >= 30800
++#define SQL_NEW_RULE newNode("", SQLNodeType::Rule, yyr1[yyrule])
++#define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule, yyr1[yyrule])
++#define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule, yyr1[yyrule])
++#else
+ #define SQL_NEW_RULE newNode("", SQLNodeType::Rule, yyr1[yyn])
+ #define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule, yyr1[yyn])
+ #define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule, yyr1[yyn])
++#endif
+
+
+ extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;
+--
+cgit v1.2.1
+
diff --git a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild
index f45e96d..788fada 100644
--- a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="threads(+),xml"
MY_PV="${PV/_alpha/.alpha}"
@@ -177,7 +177,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/libXrandr
x11-libs/libXrender
accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
)
bluetooth? (
dev-libs/glib:2
@@ -213,7 +213,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/glib:2
dev-libs/gobject-introspection
gnome-base/dconf
- media-libs/mesa[egl]
+ media-libs/mesa[egl(+)]
x11-libs/gtk+:3[X]
x11-libs/pango
)
@@ -294,7 +294,8 @@ PATCHES=(
"${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
# master branch
- "${FILESDIR}/${P}-bashism.patch" # bug 780432
+ "${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432
+ "${FILESDIR}/${P}-bison-3.8.patch" # bug 812923
# musl compatibility by AlpineLinux
"${FILESDIR}/${PN}-6.4.4.2-linux-musl.patch"
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 7b3bf98..a6045ce 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,49 +1,49 @@
-DIST icedtea-bin-3.19.0-aarch64.tar.gz 15795636 BLAKE2B 3c6991e9a5e5a1c8c5449330a8de08d2f3ac7817beb557f4a5226b11de15714dcdd4942fc429302fc4710876a82a2133909269e594bc62398ffc53a38a5b34d7 SHA512 046364e9153379552b84357dcc92d2d2f60aa25f44450040152349107ecb37b07d6911454dcc813eaaf35069c2d5a5fe47930e03ad0885bd8f9178d0cb8a27be
-DIST icedtea-bin-3.19.0-armhf.tar.gz 15806449 BLAKE2B 8f1d0802af61b3c4834875872cf1710070207e086b650f6bb027dc5aebe7c5977c3c278277a6d2983da31b51a123de0833de0b947511270fea38d8aec261902e SHA512 fe409ee10e4f010fe7f25070b6171aa5dfaccea91f2ff61a9c06e634e474e3f30656e3c01080188f8e83b65924d6c6bcd3ec46f69144731f35f867c6b4404e76
-DIST icedtea-bin-3.19.0-armv7.tar.gz 15806663 BLAKE2B c22af2a4ee3775472da559c92888e8476677d427b6d1c35f927147c8417c238761e4ecf47a51d1810775aba3ad0c4ec17b40935525443345addf074c2a6febea SHA512 837276f01e51d33a566fcc1bd61b6f28e2a79c95e28f654a18c86ef9730ce6af8cdc368c79b1fc88f9b0ddbc2cdd44eb6ef8e0c1577bb32f689f51b219bdda74
-DIST icedtea-bin-3.19.0-dbg-aarch64.tar.gz 88919787 BLAKE2B f5c7aa0037fa118def5c25135153103eb2e7105906971211dde55ea80fc78dfdc7879014ed371003649d59dff328ab443360fac66241449d3270c1747dba98f1 SHA512 4a1f9d3dfedccafdbccbebac1faefc988595793149b8ed32f18aaa3893e09135aaa43a0a186e3d53fbd7860c4eade78eaffd28cd9d331d8fbf785d64be69733b
-DIST icedtea-bin-3.19.0-dbg-armhf.tar.gz 54537233 BLAKE2B aca555d0ed1080658df1c7eae542982bc6c6265c445fe165a50ba460f679f030efcb335e5ba4ae2b00768553f1c371ee721b6148efc15413b296315e65b5ad8c SHA512 dd023e6782462e81af84eaa92398ed3e2205e4252d2a2fd5d9c7082474b8ade2d2f0a8088334ef7da213236d8092da7e65567fb046669a1395ffcb34cf383382
-DIST icedtea-bin-3.19.0-dbg-armv7.tar.gz 54851344 BLAKE2B 5035f6e76e2679ba7f5eed8ef22ad20f0c4da33440072f5214e4a7c04eecc6fab9a2393b5d56c49ef8595c0b2148b1fab9f6aadcc6353f922a89e0d07b99d78b SHA512 beb242cdbc5ca5c6c4161f7c1764bb988146042cf834ed981b5d0a6c1a6f80b3f3eb34059b6594fc743d3500cf7175ff15b503117eafa196019f83b32101464c
-DIST icedtea-bin-3.19.0-dbg-ppc64le.tar.gz 72181011 BLAKE2B 7b57ee21f139797db1cd0ec3f1350366792687c5102aeff8924ece4694cec8e82b02503cad8cca97edc615e2419575e0cfe03b8c3cc9fddb2d3dc5559c92e2f1 SHA512 63493ae232c35726fa373faf52940b4c726fe11ddf60fa9f4c5c1b1182085f7d9faf67aea1545eac136a646da1dcef3eff4055253dca2808a7b6fd0eed1c5bc9
-DIST icedtea-bin-3.19.0-dbg-s390x.tar.gz 57090461 BLAKE2B 2e98c756c142418f8aeb54cb6521ad5c176226d610a68080b8a27799a1d80ed928ea51155033bdcaba8f8bcbcaf9aae724a07cde923cac44e093d625a7f6ed16 SHA512 51b025f45ce86c2e35de96750262165f4b6c8e141fc76983244cac12b843839cea6197879740581faa0bf23a251d54c965d799f00801fc23354d8238f67cb6b7
-DIST icedtea-bin-3.19.0-dbg-x86.tar.gz 85899321 BLAKE2B 27ae11dab2dbd888342f72f6393488b2542025ec35a536d370d3d4d20c949fea074068945a32e179ddc355236956394d7932529d38f9efdeec7d30b1886e0cab SHA512 7684fe3efbdc8cb6b2a8d295bbf41901a19368c24cc47616d27100e8adb0387d20d896ce3d94ba414994474133709082c5d16d020c2ca56bb1819a03771ba485
-DIST icedtea-bin-3.19.0-dbg-x86_64.tar.gz 89869825 BLAKE2B 85136a62db36b1d388649e41a5c092d382244ef5d891fd72b04b17c9f6a85df0d7134cbb74cd82594ddc16bedb04715782193b43effd000299ee0ee3cbed2951 SHA512 81d2a870b3dec6b6aa3850eb255662519a8f27566623bdd1753548990d0b0edf3cf0e2eed9342a01a58b7949adc3a541f1827e92e05b5ce273c8bb041a532354
-DIST icedtea-bin-3.19.0-demos-aarch64.tar.gz 2577834 BLAKE2B ba2761a03e9d3360c510d2daf81b8bb124a2a7e105b68ec6cd5d63f6e3b852c48697f7df9faf8eb83754b028c4a8456e59939291b16675804be4b1c683dee78b SHA512 4ba661180ab46b5ee41487c9d072e4fcf2e3bccedc6bd69c35ddde2be9142096f608278b39b8c4fd507e02602d59d089796c8fec6d02e69ed2eb63df6b41be3b
-DIST icedtea-bin-3.19.0-demos-armhf.tar.gz 2554829 BLAKE2B 35ce532ed2ccf8ae89242834543165d8290f4531822ccdfef5ed2e07f64edb9dc6798ee7fc26c09d8520c62a1bf05266807975a27f68b6e8ef31b01b4be050ba SHA512 1dc17dc7c82ca1c43635223058ddbdb34b3df5de8786068eb7b01b3fe0c5dfa7ef8d9f58a904a88e0a950fe654f51b058d4d768e3c1a360b427887f57f6a3af2
-DIST icedtea-bin-3.19.0-demos-armv7.tar.gz 2534411 BLAKE2B 40efea7f409dc0612eb034be62a1559f81463ed5125bb2b84d4e478fff579f195d1e7477a36ebf3aabf5f1d5d67f04a9c5ab17d0d97efeb6ea433eb8401bd76a SHA512 abdba8caf3a6a7d957d7f4fb388ec3b8e1d28e7e83fd3c4c9bb6e9ce907ecdf75ed128eaf4f49b86a84434aa370bdc241dd7f0263027ed128eeb373480e390e4
-DIST icedtea-bin-3.19.0-demos-ppc64le.tar.gz 2619614 BLAKE2B 3fd20a65bf81d028d0c353986cb60e8d44632b4cbd03a05293cf4c51845f64df09d4bd428829ebde5e8b93f4da8fed8fdd7c88ce3f6a7e953cbf5d844736e2a8 SHA512 154b3da3932128f03f258458756779cd99f9fc755723224ab443848cf6abc108f87e44f4831090387992edeb0a08d71d2a8bbe2ac23595b4bece9356e8641984
-DIST icedtea-bin-3.19.0-demos-s390x.tar.gz 2585296 BLAKE2B 99b58a596cfee0ae09ea88b579c0bee33c0cdad84980da95735c222fc6bf06c29b13886e0c698e3fe9250875f256f0140859ee2345caad561ab5ee42d7f04cda SHA512 736f985a2408083ccefa2fc0219157e6d2a1967f525e5dbee743955f6978429b770ac844a51bfd0ba8c4ad8448d1f18c73ff5b50104baca0ad5b8bb6c8983a67
-DIST icedtea-bin-3.19.0-demos-x86.tar.gz 2610057 BLAKE2B 280cc3151c5661d516fdaec9c929db7904bf5e718cc2ae6317a1ad1f31427ebbd813d0dd51e7d385072acd9998e9a95fb16e7486bd7a0577d7257bd7cecb5faf SHA512 296d1483d596e065ead1c189c769dd3fdfbd7cd8b40afd08e4c2a42fbf0e5e2b34ab734a72955b87f4f6fe4a093ece52599bda882f0022d346298a6471ef4cc7
-DIST icedtea-bin-3.19.0-demos-x86_64.tar.gz 2579328 BLAKE2B 6d98c1ad5ac965af15d3412a6ab159f4c35594a05bce0d954e96fbc3afe2884a408d5d711174541403a910e70ca1c5a4c087b771ece0f296254c6b2e6a9f44a7 SHA512 c01a23c25e4ea85e8cb3fa442577cf594c7f0414da905dd33f907fa7d301ac11997c3eeb4ed061e25a826cd74a97a1e079a9375d7f4300133aa77952bf184992
-DIST icedtea-bin-3.19.0-doc-aarch64.tar.gz 388966 BLAKE2B 4359807e0bb5958a6efcc7cb8b35dbf2330d3e56a95a19b7a54d310a67e1752e6f0035287fc2ce30d0557af395296575faa9da870eaa73ae4f38389beeb0adb7 SHA512 ecfd3c790839182312cdaceae512a2621e4fad246cbdcbe0dd0e64f6ac9d3a04b1a675c32747b4916a0363cd51fe3450e36a6991bd4ac765150611bb87bad92a
-DIST icedtea-bin-3.19.0-doc-armhf.tar.gz 388960 BLAKE2B e8f4527437071ab4e61bd6f5c2ac168402de021a945b02bcec6326ca51faea5f3cc5a50063ec5d7ca0a24fea9ecda8c0f9d31c54aa16a0cd72975de154552fee SHA512 82669dccaab384c4b85536c0484ec9679b0b5dad04f77d77e66f65da9ef66c8aa135f81fbe2360b3aafbeeb1b752fd39844db218bdaa7d0fbb75fcf10afd5e87
-DIST icedtea-bin-3.19.0-doc-armv7.tar.gz 388960 BLAKE2B e8f4527437071ab4e61bd6f5c2ac168402de021a945b02bcec6326ca51faea5f3cc5a50063ec5d7ca0a24fea9ecda8c0f9d31c54aa16a0cd72975de154552fee SHA512 82669dccaab384c4b85536c0484ec9679b0b5dad04f77d77e66f65da9ef66c8aa135f81fbe2360b3aafbeeb1b752fd39844db218bdaa7d0fbb75fcf10afd5e87
-DIST icedtea-bin-3.19.0-doc-ppc64le.tar.gz 388970 BLAKE2B 810ccf2defb8185068436778a2ab1859daa2f4897be1c434d2147c3b4dbd6c482908de82a87bb9737a20cd34f68a8b7707505322233740346dd07fa71be0aba2 SHA512 b54654019b94419ba7c8d3cf262953bcc5dc396e8460bcc1eeb05c08c088f5804ed874b24fddd9a4e6cb24215ea7b11d49e7382481c3c5e40ccfa88d650b9d66
-DIST icedtea-bin-3.19.0-doc-s390x.tar.gz 388969 BLAKE2B 9f6084b71157513e9a26fdfffcd7cbd2c4351f16a09688b3530fe019ecd1bb746c7144bf13c2fa568a5354e4dd129504a73d6d17ac79a9c846ef7d1f1e4c8ce7 SHA512 d3bf30d242b92ef6476b2773f9883959968155447195d4b7b63f4e2c78baed77de2af7dc4b293e2c95025ba314e91637f4d02addf233d73b5549bfebac755be1
-DIST icedtea-bin-3.19.0-doc-x86.tar.gz 388959 BLAKE2B 5b64d71c9aaae7dca6704b6eb93056cf49a05c25120443bc24e6d434b7e9ad7b9093416575e2a599459e5a6d26fb0691d256f8ddc6a80c70f3825c6b7e42939f SHA512 e4ff2c6a5b788c0438c36c60428bbd1bab06accbefdbf9d1cfdd7da6549ac1d3bd8f71afb66794597783e7d30e880cab7d4b69f4cf874c0e7191717af05d077d
-DIST icedtea-bin-3.19.0-doc-x86_64.tar.gz 388961 BLAKE2B 978f3cbc55af796f6931f92f4f40d5607a987664eb0d0ceeb5075f015f1d86b14b4314e50fda51ade251b51bb79bfe1a79f309070a2bb3b32c0b79003a3c363b SHA512 5bec311469b9307b8bb9bddcab73b7f4df9e7c495e5906a1168299529e64d4c4de1ecb6424c529eb83e36674af3c42435f0ea802dfea553fab32c694d6a1590b
-DIST icedtea-bin-3.19.0-jre-aarch64.tar.gz 356761 BLAKE2B d422316e74a0c739b8382cebd7957fd3240c53eff8f9b0e781485aa138ce8255540974dae8b3d5c523c73fee78de65dd4c07031b9f33437bdb702aff580da370 SHA512 e2bffb2f341a090b5c244151ca2de9227d02b45b819eafdd167cf8f38348db14b9a41ebb03e64a1f664becf48368807e1d71a2e8ed209759be253568ac6797d7
-DIST icedtea-bin-3.19.0-jre-armhf.tar.gz 317564 BLAKE2B 348f6eb14b5d536da205fc8476c732ea2247c7f324a2df7fe76dc7bb38c74375ee194acffddd9338a4438031bca365fcb6ee456f4ccb660389a4131fa924062e SHA512 ee4858f0f69e98a9200780d46e0c7887c3b3278c99ce1ef3903f265961b7eeba47c52cff9547d1c54726ab0f43cccd86922915f0ab49d13cf6b3863862466f5d
-DIST icedtea-bin-3.19.0-jre-armv7.tar.gz 294164 BLAKE2B 5336bcb62b69650390f3427cf6766377219145a8be2c82da13854f12e6312aae4594f1d579af0f9035b11e06e685d58163c2bab16e2eba2c3777e035d7a68ddb SHA512 eccc10b26b2cd4701bb539922b1ab28bbc6dd76c7bdbd417ad2438eec9cc9996d491e7a34661b32dd0a5518a34c7e56a531652121b58de82bf6f8a45ad45e2a4
-DIST icedtea-bin-3.19.0-jre-base-aarch64.tar.gz 4537136 BLAKE2B 07e5719bf1232fafcc1672781a23164c5ce752172b8dfe527a980206db90f4a4d16a7b6104ed231c8f64b5ca36df1cf0e56b5e59372578d2a659f124c84f495d SHA512 a2abfda1dc8dfd6a8b83ea0489e3006840d7f9795fd866d02316df3df1607cdfb06f3ed552492fe300b2aac942bceb70e10401cb20bb1bb0b83720300c6b0dba
-DIST icedtea-bin-3.19.0-jre-base-armhf.tar.gz 2711950 BLAKE2B 83e7d3fedeb6c6c7cdd845c935a316b9ed25739fe615a9535397d2d648dc6f0d8488784367159bfb030c45ea4df98c9886a37a9e3448aa0a9c01e08b42ea587f SHA512 79fa1fe4e481f450e53bb4186c65ce9509e0b9a74c6caca2aed0f175eac8e833eab377288a38971e9b23d5b8200a5976b21aaa3f7e46a272bb5af0d0a2cf43e5
-DIST icedtea-bin-3.19.0-jre-base-armv7.tar.gz 2488569 BLAKE2B a281bf6b9869d8eefd0cda929fd4c770fc82ac31acab048119949d3b19c5c828a1990d5771a3be6f3ba1b7686a684cb4f7115b9b56dfa303be43b5dcbd68acd8 SHA512 31aaf00d7700abd83bffdc483ba96db98a7b4e60828acbf3d62963958e63ae3bafde899ffdab13579eeb3f1888ba19a54d32b9054f8002d9a39127db6a311da4
-DIST icedtea-bin-3.19.0-jre-base-ppc64le.tar.gz 4641421 BLAKE2B 4ccbacad6e087fa428b91a860e461bae84afae757c71d507862fba00512b27bfaf444013e70223aee44ae985f344e36f76b66deab9037d3abeb70f654359fea9 SHA512 5872dd2b80a18aa77e1c14d04d590f3a8579206aa53ffed530ee829ea31cc72ec9e251e09e4d4ce21dc14dbc2dc8c45811818f4110d25cadc89d3b5be6f393e1
-DIST icedtea-bin-3.19.0-jre-base-s390x.tar.gz 3252094 BLAKE2B 306d7ba4fd8976095dad5b916b0cc27a30b452fbb244e8964e67d86488a9920872cf72ff32ef6fb9a17b451c31d8d8ebc2e1c84525e9e5d39f383d840e5f517c SHA512 26df665276a22754622cc84db4d2050ce59f0bd1d778ecb989082029b9e8fcd034af5914c573e4197eba5dc59c34f5fcabcabae9479035ae040d25edc51939f4
-DIST icedtea-bin-3.19.0-jre-base-x86.tar.gz 4892942 BLAKE2B 7af143f6b99715f9d901d2218c98d9018e0f7d84219e7360457177885145f670f5944e134e21c6e1530762f6eed501114bc908421db02f6a035d802587ed97c3 SHA512 731af15fa44fe3ab87e20e4757d8e1b2721651efaf587753e71b1413c53908c387de0be9d395b10e648788d661c5478947a123223cccaabb11a8befa21c10fd7
-DIST icedtea-bin-3.19.0-jre-base-x86_64.tar.gz 4761831 BLAKE2B da2f3bf35848c050168a8b2ad5715919abe0a813175669c015e1a73ce61dd23382719dd18b5ac64c8891badeef48a26434e68fcba0811cfe80f9b8753781cede SHA512 09fa52b5030b594ffe98cfb3272833923b2fb95c119e48f0ef1dc808a64b40115b9d110cfe7f2fe378a70847752ee8da19e41a252a6a385925578db915300483
-DIST icedtea-bin-3.19.0-jre-lib-aarch64.tar.gz 44021631 BLAKE2B b6bb640bbf925eb301a0ccef290f37a798aae7e5d620389628011df8c04962d1868c41c3f8a9f9aba1043fd69a830018b08dbed2a055b85fcba911ab6785b48a SHA512 3e2eadfb1d9bb61006c67cb24b199d32f7c2d78706d3774d6d28d7a816b30aa179e6828322b3bb25355368feff221841a18c5865d96399def1a9b255c2523ea3
-DIST icedtea-bin-3.19.0-jre-lib-armhf.tar.gz 43612244 BLAKE2B f249e0f514a9bf997611f6c745e0856ca6df24db936cde6ee4affb21d1cac759a90537e56ea6b2fb4f62611b32ed0596ffe14f64d0e23597ef9e2c48f9d282e8 SHA512 b47b49238fb876aacc404b51d1175e7e98667ee9502119ec04266dbe8ab6259aa9453064e423c56a3a9fa4b7875045460a0333a3e5814c1db82147f7cf7c4d58
-DIST icedtea-bin-3.19.0-jre-lib-armv7.tar.gz 43612653 BLAKE2B f1f8ff4679b72c55b0fefd53ea1f95c07ba95699e9fc370c1ebde862f1108816d87548c99672ffd4e56630d30dec1d216678ae1e95494ab355ba6efc126a0431 SHA512 c3dd42fbc29b2df6269269a6da80b48723123990b9c0cacc9ff9bf4afb66e63cc275df17800e8356aa1486bf26ec838f165eefd4a55a7f0dfe7ed8cde9ccf8d9
-DIST icedtea-bin-3.19.0-jre-lib-ppc64le.tar.gz 43591227 BLAKE2B d9645d6da589514270704ff09cf86d7ad5d90e7d98708fff47f1d0fb9fa7ab26afb28b59bf4705f95b9b3413a9bc15115455b91ddcc382c7d21ca279f56e996e SHA512 7dfe61d3f3a75b03e1f1c0d3c83f303c444217148829a2382622f3bf7e3790ab1f7c4876678876d52cfeed90c8e8de1c704ac7f07fa3acfec4fc5ddd489418e1
-DIST icedtea-bin-3.19.0-jre-lib-s390x.tar.gz 43627278 BLAKE2B b8cd7ae9d03b848562f495ee8317cefcda194b9444b3998ef256bd182c9d7b64011a191eb6ad3fb506aa499ff1a5e8d49b78bfadf922cc8f9499e5269b5e511b SHA512 a262a8b2276c639f1e69c4374104c44ce93a1aec417aac3c6c30bf935530059ef9f41c7b45e61484f48aa21217d1aaaff5330a34a7647e2f3f5afa074a9d1196
-DIST icedtea-bin-3.19.0-jre-lib-x86.tar.gz 44034863 BLAKE2B 8b816b02949961d079d1b2d0562443ba32c0f065bfdb0c0c1ca0e68b03f655ede04dc4329fb0494cd9a42f7f38ae99cfa4001a9b8dbaa35b5b4485da84116296 SHA512 7484c2908ef5aeae512fbb871bd1276635f9b582e19d591808919c0893993e606ceb42fc834438fd33d3af52c0ce144376bf1480145ebdc7b4cf9de18c76c086
-DIST icedtea-bin-3.19.0-jre-lib-x86_64.tar.gz 44039514 BLAKE2B fe2645ac9a1b62d8365808cc7c0335dfbb84fe59fea99895d1e5d58a3b2fb4933f52cd0a30b5472ab4be7dad8c68a68ce13a237e97c923f955467a0bcbfcd308 SHA512 8f82d28f0d5c75316638aa4ae712e6adedff3b17598d7a4d55fb602cc881fdc00204c06c42da3cfe443a5d020065dce5454d326c284ef03ec6197d7b2bcf6958
-DIST icedtea-bin-3.19.0-jre-ppc64le.tar.gz 425991 BLAKE2B 8c6191fef59aa5ba7a6024e3a9ff7c62c3b505ad11634b111f0bbb4bc58b99373fbde7c28f44c3db6940b939d2ad14b0c3ed815bf2b50d6b51d819fd10b33ce0 SHA512 c41351b873ef3e36bdcbef247045fed844a39d138463dde67d452aa0485c75bed5e373c366a6e4909b18d0aa525ab84eff577fbe57fd7cc05c169b481be98b3a
-DIST icedtea-bin-3.19.0-jre-s390x.tar.gz 357355 BLAKE2B 0c6e42cd8167ce92952b8a55e1f30f023ab142c79e78d88ae2cc290edfd61c7e610231f981d0de924b73eb39ada0a694f0b4460e32a681bac7f0a0e884ec81e5 SHA512 06b637f3f0bbd1708ce08e877684a625d8aab3773320780efd6ef95073166c79daef57c7e06a30ae70e9ee5df6a750b90e0fe7404b179d92892f2f66f87d80c1
-DIST icedtea-bin-3.19.0-jre-x86.tar.gz 390010 BLAKE2B ac2048f793de7f4d642c5158c9ef3344be1c600a2ebb7700d97a089c63ce4ed285782a196b478d9197fcfa89b756dd66aee68f32c003ece333453a22622e1345 SHA512 76404e7b0f8509362c9f12442524fe493e22d9d5d1ffbe10c3cba46f75e33023a305ee22a2035c3f2777136b92d483586ae728c2af999433972475e89ebec9c1
-DIST icedtea-bin-3.19.0-jre-x86_64.tar.gz 368348 BLAKE2B ca4b875bccd94a006dd5368f7e8bdd2af2efea700df7a464c2cc34298c95871c31473b8e1c1334ed7e03f55bc7439a0a7aaaa71ededb7be7b7d045b959b755e5 SHA512 a59f33ffc2ccf02ba7035539534633e8212416f0ff4ee8455efb21de78f8514cce1e00f7655cc5cec1a2010d4b6f5ec87b9ec19d7d2ada04fce7723e2eb07a42
-DIST icedtea-bin-3.19.0-ppc64le.tar.gz 15865849 BLAKE2B ea3ce5419050a5489be4a09ee0f347cf3432029754daf0ff1ef086d95f6260a6a7b4a949ac013e946dfe2abc032c55fc37501692f3e3b82eabef46b9d87fabb5 SHA512 48982f234e1bbf0fc45d74edd430ca109b5854b8b5db4cfaa4eeed7f558a5d251a8aecfe80df5a7994ee19923f19e1c8cb0276fb31a4fee80667aabebd253236
-DIST icedtea-bin-3.19.0-s390x.tar.gz 15809515 BLAKE2B daf4987abfa986cacff81ec7f53fb0be845c07868cfe1fc196eaddf923c86a9b61816befd9606ed327eb0e824980c953dad6b643dc1251b884f4df7ea84939cf SHA512 70405cd0b41ad4d70ad7fd8b6b93d491f93ec49528167f3bf2fc87158e504283e6702d2bd040e0d0348479f772e9f95a45fbf2ee4e6488c329acd6233e96a386
-DIST icedtea-bin-3.19.0-x86.tar.gz 15798287 BLAKE2B 62a1f17d88c532a4859a64f8bbdd32c2a98a6a00ff52aa3d0c29de008b5015d81a2670453d2aa5062d773017599eb9f55a4063e39dd1109c151eabaa306f4562 SHA512 9e4c6c238e9808fc2b28a0acb1954d92f2927a0a0b5cecf65d68aa5d3e2ae509201e905a5ceff8dc35e6d584785fa807a5072f67482a15b9cc0bef818b70d82b
-DIST icedtea-bin-3.19.0-x86_64.tar.gz 15805148 BLAKE2B 653d1848d32d0a4b32b3b7dd3d71d63c9d1781a3717e0454d31184b7d68104e78184ecbfbdf7e82ed57e26204846b8e5ceebe500778da6d4b214af0d2a94e35a SHA512 d4d4f64ed910eb10a9d06f6c0b62c125f7d5c845270b40ecfbd4a13fd6d785661104ba97d7753548cf2c5ea1881c7192b64d10cbe10e90b3aaac95266321f330
+DIST icedtea-bin-3.20.0-r1-aarch64.tar.gz 15796224 BLAKE2B 057abf8cc05c6e99f94789a869c2f08f8e79395b4b4fb48e386d9c61aa2e0397de10318f76b7a54e58e4a00e0874e34e24a5d1b73d9c5dfa07557d54519de706 SHA512 8d4e48d44829eb9abfa49b103cb82bd9aa6ce273b234b61808347ecedabfa76fdfd4d85cfcba000a966e8c60d69e06cb8d471b6d59a465864328734e258ad957
+DIST icedtea-bin-3.20.0-r1-armhf.tar.gz 15807137 BLAKE2B 77cc7e3eb253b5e86d28401f40fb4d12499ed46a23491a2955e336a73419cc2f41677e6ca1745b1dd73a2b799f82be7628c45cb28ad4d6843e76722eb879be95 SHA512 e94d0632dda7f0138c1ae203127a9470c56cf457b5e009e4a813e52e8205d1e2bd314a4913b9a8b47ae56f78d8f8eeab73248089f34f3b551784c8550e178183
+DIST icedtea-bin-3.20.0-r1-armv7.tar.gz 15807251 BLAKE2B ee3b4f5d316ecf6a9e79497475bf614ac0a499b5584319236e4376a125e8329f0727c5bb015fae2c4c25246469630df4eb9d17bb4167c9196c4f59d21bc3a8ce SHA512 4ada2909e6c3448cbede1e78f36231b785251f45cd1cac8a43bf1ae042a5ec9931292bd671f11f208cd76938d67cf56fdd2574253b21a7004b4dbf5e11820138
+DIST icedtea-bin-3.20.0-r1-dbg-aarch64.tar.gz 88706829 BLAKE2B b239267a3dda51b61be603c89e1fba0b14c5d9aa93e5158c8fb6b9c1845b7471c137d1c5c61d95ade2b5652a1ea081562c534e1b3391c9306cec7916abfde6b9 SHA512 8ba6d5a4cdb5f718237453586bd50198739cccae2bed5c8757c88c6c1520e0cf5583b3f3acca40c2bf14f4ef476f8bff1287a23a736040068206d6e70b6264c5
+DIST icedtea-bin-3.20.0-r1-dbg-armhf.tar.gz 54358467 BLAKE2B 4f51ede560657632b207284f81fde418b126fd7ffcc997fa428af4eae63d0109854201e126d1581c4c28c4f09696dd599b00e4e8737772758321af9762ba266f SHA512 47fa85bf0f2473d9f04eeec7ea5d7bdb8ef8beefd16d9a99be7f06d8b97c8916c11253ea6520ce858d8c91c1f82f76b7c627ddce97876e2d6e6571b06388ba55
+DIST icedtea-bin-3.20.0-r1-dbg-armv7.tar.gz 54665374 BLAKE2B 5ae18f03e507d956f21787c0dd89b65f4d304a69cd8402970df1a65c1e1f630e94b43dd8c78f6bcf80ff6575550f6753fb9608343c2b46ccd4c9e965fe891f31 SHA512 947607c4963f180f0e6cdf5606fe1ee6951554e5e82ec50bd62401b8fac9c450fc158ce20ae76a190143fbe0dc3286e3f631751d9e3d0d87ee0ad838f8432f31
+DIST icedtea-bin-3.20.0-r1-dbg-ppc64le.tar.gz 72001436 BLAKE2B f9820dcc81ad2f0382d1fd3898ae4389dea64e9f081a9c1e72fb6fa5c6d4e2c9a6b943b9a8586367552e8e81705cd0c5d0c9bcc5b9b27c7d6a79aca8013798a6 SHA512 32994c1f29d46e3d1f46fad589bbe95ab93ca94baf5ff1168bf0bbc8f5f2b8047ba97bfcf955f4c3b52562169f2a2a13b087abc16a21e2e7ce31c8c1be829340
+DIST icedtea-bin-3.20.0-r1-dbg-s390x.tar.gz 56916246 BLAKE2B ddfef9fc512446fca0bdcf4b8b489d8bddb8a45de570bbfd8e6b8094cb266a27f49eaac83a49cbc218280df86f8adb54afdf7e071d6ee712a7c157a41f4de170 SHA512 f2e95c10f1c758164691f3a820aba096c38dbb9d2062cea00c9b50cc0ac129d1a5bef38422af573ab45030d6021ef446f77f5e303971e5220ce9ee5ac2837ff8
+DIST icedtea-bin-3.20.0-r1-dbg-x86.tar.gz 85662346 BLAKE2B 8c1b85eefac1f48bffab51f28e60e4b8a9a2d98eb5ac254a5659005aa0f182fb0b2b98a72b3c2bc25d75f2e90765929d7955e335b9a3e78b14b083a2ef47c54a SHA512 78ce00d0904d571c21a06853516a3c32ec1ba1a350df5326fa04568c1bf0865e46b16b9332332bfd99257ebf8458b818092826f4a9c73ae1f419f5ae2484bb12
+DIST icedtea-bin-3.20.0-r1-dbg-x86_64.tar.gz 89628231 BLAKE2B 04af406e30d2d9b97d5d6aa2d106777faef41a3f98e68e6d1a294fe8445453a326822b8f38b58592d565ff6985426856656a83d30ba42927fb544faef7252d29 SHA512 bb1e2c8a0923d7d50f128c458a8f232b742131dc30f3f61605669eb70d1edcf747e5b5c6fa58aab5436be2ab41d3e4e5590f40e2867c2a9012ed084dfad6af03
+DIST icedtea-bin-3.20.0-r1-demos-aarch64.tar.gz 2577742 BLAKE2B b0b9b302ad38e59e10137322c4e7222f96eef7bed3177b4a2690ac07d2fa8ed79c9d491d8f21e62ab364e5b043d298d106272b334dcef0002c3d44d997e8fab5 SHA512 c75ab2cc0a44057f3682f92005e57c9178c0b798810aa68451a29d18815745b65fd1e1a746510e956dca629715b3774a7b0776ca9b2bf7c543d833f679f4e63f
+DIST icedtea-bin-3.20.0-r1-demos-armhf.tar.gz 2554955 BLAKE2B 382c6ee85a873bb64830fe5dcc7e8ca23dd232a16695f63b83f095503b1977e9e869dd400647676ed1cd85f02ec5e92b8e6541e496fa9fdda05c8295b7eb40ff SHA512 d79b9b674d16274547c789505249b910a2a26ce99aa15ba5467b7977fd312ab5e2a630b9fc6fcb3e3a043e2a38ea3a9631fe8c7eddfb88035c5aedb35dbca3d7
+DIST icedtea-bin-3.20.0-r1-demos-armv7.tar.gz 2534503 BLAKE2B 900d9f1881218b0ced74d4368299bc189ef5f2509b390ac6ab11de6530920da397a79f4dcdeac3f8c940b1c900cc0aec2aa37dd396ef79df525bfe0f98f4abba SHA512 2019e433baf35fb7ed0f5ce8c9474bbd303d2a5b0ee4608a942766c3136806dcfc416043100af4d7520e2e19ab2152d73e47cf477c519afdfb81fda0abe35fc0
+DIST icedtea-bin-3.20.0-r1-demos-ppc64le.tar.gz 2619704 BLAKE2B 9a3cc16f67bebc3fab17a269fa59c32d71fe74719895558bda628aa464c11ab576d9ae588e91cadf42c623be0e3507c703298527f52d879ba46dbb0383125cfa SHA512 c401c0c53df635e13ed4e36d147b11087190e16c190a848789c5c3247baf9ad2148570bb820991d26747ff095b17cba3690a33ae8eda6e4fda3f842205b5605b
+DIST icedtea-bin-3.20.0-r1-demos-s390x.tar.gz 2585294 BLAKE2B 36cce29f6e4a1c13434e1467368106e8bc62f5a4e32ee97a46dc1cda4dee554683985fdc53c7aa6eab3248c21f393a22bdb11ac371a77c2fc9f25b81c9192eec SHA512 8bb2366689e61a91361f7bb78946961f5620e5a24d1696c34e1db88f91623ac9700f4c975e9e7078e9b38f3c1ddb410de110f6f9701ead3fe265d3b669009406
+DIST icedtea-bin-3.20.0-r1-demos-x86.tar.gz 2610568 BLAKE2B 78870a708c85d87e03c8dbd531eb41f322e5f9030da7f2595a941575659a9c093e54d8a5fac88df554282a158732d9b9c69ed7050c1fc3a41eaf71775d1224c1 SHA512 e68a42b4eef3054c211acbc47414a71a2b3b389b6e5854089a3b4277c32d460b33c8881b2055daa8bf8e6cfa11fcb545da2edbd68833107c1667c252bb1e8b68
+DIST icedtea-bin-3.20.0-r1-demos-x86_64.tar.gz 2580912 BLAKE2B bbaf53a7260fc5076db2b50d025536f3ade58c78c5033754e66267c825fe47377363bdfa41c3a0f3b23cf6389cc82e9655c7239d599ef911c4dfb33491767a83 SHA512 09b8bf7fe7e40aacfed162fc3cbe8e6c81355fb54169bfe4c8f5b00472c301f87becb2faa96cb05e59ee84d9e8785698983a2cdc41f7aa0998fa54fd383ec728
+DIST icedtea-bin-3.20.0-r1-doc-aarch64.tar.gz 388971 BLAKE2B c31a097d7b6ced1aecdd85bed7418eca306cf9110329667c7bab204c80063e1ae461f70d22348fd90962b614db094ab77ddd01844f9712b91d52172df885009d SHA512 52ae3213ba87ab333589c68853134e308351a111281d9b7b57097519de48bed132334be462a830cabbab4537930885e411b85b9a129d71cec50dba852618e0a3
+DIST icedtea-bin-3.20.0-r1-doc-armhf.tar.gz 388967 BLAKE2B e59b54268a575745b47a0b33458f78f1fa9859012accf78fe7cd796532cf52e4b1fafb43d9abc907f5acee5e46553083e9323312852e35b9d78f52ceb817f942 SHA512 2ff119d21870a4534c3a3f0a9ae5139cafb1d1f4aa0c6775d7bd0ded673fe668c0191c6eefd3cdf97f2449f12694ddb91c3769c0cf4cdeb3d42fee30de7fed1c
+DIST icedtea-bin-3.20.0-r1-doc-armv7.tar.gz 388967 BLAKE2B e59b54268a575745b47a0b33458f78f1fa9859012accf78fe7cd796532cf52e4b1fafb43d9abc907f5acee5e46553083e9323312852e35b9d78f52ceb817f942 SHA512 2ff119d21870a4534c3a3f0a9ae5139cafb1d1f4aa0c6775d7bd0ded673fe668c0191c6eefd3cdf97f2449f12694ddb91c3769c0cf4cdeb3d42fee30de7fed1c
+DIST icedtea-bin-3.20.0-r1-doc-ppc64le.tar.gz 388974 BLAKE2B 029a00f515728e4a122da23c65f7f17b4c6b06402991191fd0c0d47f6ff2fe9369d21383813d5aba022f5ed2f7cabf558113f3570569c9845d7520d6853347f7 SHA512 fffb73100ab7c307855af98629b384075a0df78fb04670e43046d64167b567e30c687f5e8f786a9261543f67deb6a85f183ca2ec1e9ce140671f30bbf13826c0
+DIST icedtea-bin-3.20.0-r1-doc-s390x.tar.gz 388973 BLAKE2B b9158d896fb18c79e5cb6cbdaa6783cf08cba9e23199bf9629498c95848ccc8adb1e988e6fce4fa0dae3b471d7177cc95963d042fd9390ac290a2a64567a0bb1 SHA512 426bbcbb382924292582c1cf14e197d5754e13225af9c8058204eed6d860ce119841b29754260721be6d52160878b898fe86321ac28d6c605839a53b1c999809
+DIST icedtea-bin-3.20.0-r1-doc-x86.tar.gz 388968 BLAKE2B b44172b5fc053a91be7db2a5735d436c221f39ecff798cf221cb6ae7c10ec4b158161f48873bf01ad4717e15eb63cc0ab28c93e4c6c432b178137221ed07fe99 SHA512 322df669caadd247dff636b47df9b6c81d7bb2e30b78ea2522d7fe1beb5faabe392e8277e51a032d5585d608ee8b9c88d734e8df242de4c05bce9c58f3682e69
+DIST icedtea-bin-3.20.0-r1-doc-x86_64.tar.gz 388967 BLAKE2B 3e4c29c3b80b1ad9317aa553240d9ccf1c7c523166286edb3163a7e4c3ef3d4a7b683cb12d5cf57865a663b2cfae7fbeb4c37b1b3d595e5a4d4c243e22cc4f1d SHA512 5fa944770152e78322a3f33f0f32d525d67d171375357d3e39900f636691711df6223727859f49220654dae02a37986c3060beaac69ebbb90ad2fe45fc3057db
+DIST icedtea-bin-3.20.0-r1-jre-aarch64.tar.gz 356766 BLAKE2B 2105e5064e5cf31923d47332b5cf34a378fc61e825b4adca19a53c84dac989d52fb4b29a78e3334d126f34aeca5cec56ce7eab27119e5d641344eb39e89d80bf SHA512 f55778face76ea28005f590c35176582a2de8204caa60206666555bb55507c1035804f535151555f040cc36f77d20e8a8b031e21b03ff402614d4a6fd57cb910
+DIST icedtea-bin-3.20.0-r1-jre-armhf.tar.gz 317571 BLAKE2B c9f465911c364d4a7568a77df37bd22e48ceffea67de963f2706d8848d651a531729d24a1f14412a74afc31db6fd834b85b4665247c34018cef0f364e931a100 SHA512 8c3e4aa1c5332a8e01f457dd30ad2f7895e7894cd02852e2eebcf0f3772ae89a0606329fdc7e5200d11ec17e350debe407991da8c4888244336214f93fb6a988
+DIST icedtea-bin-3.20.0-r1-jre-armv7.tar.gz 294011 BLAKE2B 6d4a399bd3b367d3e9d7aaa1184fe0bfeeae297c476f20b3e8a74c31d4cb2e611ad05cb4fa8c63e014c6731cfbf70086acd227cc23b05d753f6798684936883e SHA512 f0692f6e8e66a9a4a6b84473bac91295a78c4edc1facba7d7cc06f553a9638738e508ca0948d365980f25b48a46846b1664e1258f259d393046577be355dbcd3
+DIST icedtea-bin-3.20.0-r1-jre-base-aarch64.tar.gz 4538519 BLAKE2B 185b77f28750b7f7b678d085f533b031b3d4fd56cc03b614d835dc800e4289243cd85ec03a8132a058d087a45654bcf5fe5eb44d29e7acd10761c029951ab164 SHA512 88ac344de141a1ff6df54fe8b2dc805ec179617f8984c7ac91320481d9f14fbfce61ecb24e1b95d6b440879bc6aab0ec3b35fe928892a9e34a941d553c0a5cd1
+DIST icedtea-bin-3.20.0-r1-jre-base-armhf.tar.gz 2713231 BLAKE2B 98633514ba79c7a7a987104669c3beeb986e249c41077b3f9075fc8a88f1215486a50753716eda640ee84b2f1069ded2647980ca7beae7627f7a0cdafc29b4d0 SHA512 1a52a1a1bd03491f3a82ef23f05de9d35b29e725fff8a1dd7518146d37c057ab2d421cdf410ed7cb5452d595bc8efeda83c73bb7f0ba86213a4f3c07c85f2462
+DIST icedtea-bin-3.20.0-r1-jre-base-armv7.tar.gz 2487404 BLAKE2B eb21d80da2feb666e05493549d9dacefdf52ba4ff9eda001a07541eb35b3160b15747b355cc0c1b4d5ad4920eff2b91d023d97589bf5b7abd3fb5cee73ba667b SHA512 3d40652e4ed970e30d8d01cbaf339eaca4df9bb028e6d9882ee78381bfe6fe581fb00989c0fe83ced4fefdcb827c8454d366b79a2c14166a20937a5cd60e43a8
+DIST icedtea-bin-3.20.0-r1-jre-base-ppc64le.tar.gz 4643525 BLAKE2B 46ed0de00651c08497d7630c9a0479ce3a8d73b377c8c9e94e0d473bb0272520062f338802680da5fd37449975508237ba94fa6b178c06b158f14a528a08f622 SHA512 aead865d6dc3c816ac976a312b4e2262a393f70c7b26c64305e22fa415f290754dae514fa32b25a9bbf8bf76f631f27c8f428f75a25c08b6c5963cf00d617470
+DIST icedtea-bin-3.20.0-r1-jre-base-s390x.tar.gz 3254041 BLAKE2B 016aa046ce7275534d2a55544690eb478ca53ac363153d3bc079597fcf0255baf4db5f08f9f91e08ce2b8264d381c82fa816871213e99b9e03c18a9245fc7857 SHA512 d27dd650510e58de4cc66e05327937bbdffaa8291bd4706eb2de0ac6f51c73672e3839022a92057066ba8c4cdcf7593158c64abf7c357df0d310b5c1e1ea9564
+DIST icedtea-bin-3.20.0-r1-jre-base-x86.tar.gz 4895384 BLAKE2B a66ecac837d8186fd8190a4599f61d803fef7a0dc4e97822cc994b6a4b1f10a7eb95cc12472a63e75e75a15f2e08b557de57e6db35231f7ea1b6f984cd042295 SHA512 30c4e618618831774e21beb3b7bd2d58fffa20852ea56af03bb5325839ab4dcb9f87c1492c004f7d9d7cadf203f0b689fc3096e7105248ce341b9b7fdddfec25
+DIST icedtea-bin-3.20.0-r1-jre-base-x86_64.tar.gz 4765822 BLAKE2B b6f53f2b13b85a2842fc9858126d96eb0e329e4abe13d9c587b76d4579660cbbc15996393088273a11c8f1d7cd5fced21dea11f42c1616a09395cfd1da2a0df6 SHA512 9ff6d29140519bf35bb5ccc1612bfa1a75b42079698122e118beb253818fe7ef80c0a274ad9f1ba6e2d62f8672939594898996b0f38431f83c40653d58f34487
+DIST icedtea-bin-3.20.0-r1-jre-lib-aarch64.tar.gz 44037470 BLAKE2B 6e8cc488cb7e9e96c7c1ada3e75c7289b330a8ef004e76ac21ad312aca4229a7a028275f6d4f1d5ca5e05a987f3caccb16bbb216eab54461f51e4fe6001ed382 SHA512 8f20e27f24a35cde9f285a14bb44be44d45f989c51b163c0e57127949f76a579dacbdbace6389f5c6ad161b946a9f995decd2ba0b199993d00dc9fc53015b372
+DIST icedtea-bin-3.20.0-r1-jre-lib-armhf.tar.gz 43630160 BLAKE2B 3c9e16a9f68391459225455e9dc33039ac59b4f8d0ae8ba831583b51715311205a1b17d44c70bbca0a723f1fe29815224ea4546628823bea450944ca045158fd SHA512 813360156a418a30218ab25529c6b2baac70464e088f53bdd33f73930bd62a5236a6adc3bb312f8184351442659d32aec3342bf359a6923e1eec8ab727f3cbd3
+DIST icedtea-bin-3.20.0-r1-jre-lib-armv7.tar.gz 43630359 BLAKE2B 377bd6eb13d392d8caf9605e02672c63565f987e4eee22e5b2677219ba0a39f40a44e7b1c7daa48c63c26ad3a674f511d7094ca0ccb86cd6ce95cd6e04464786 SHA512 50c919331db548e0c05c2f8f9af56bd2754ca5dd71dbe936c880ad546aa6e5ab5380c72b37ff26fb989e88fff06c6000a0fa868dc9b66611a8f6c70b241a6121
+DIST icedtea-bin-3.20.0-r1-jre-lib-ppc64le.tar.gz 43609213 BLAKE2B 0d5ea43eb4ecb393031dde850d41f40f4518ee3c6f6a597eab4086e48331a015a166d5df69ca2f5748f20cf2f41cb90a27f307f5e9bc0d88393e11d9beb76c88 SHA512 d4c1c9984d5334c96ce81c285e5650cac05e17ce010568041c0a084fdb3bd5c46bd63a9d50bc36d61613ea3b20c0d654273d81c31b935db3ffdc6ed824c40b97
+DIST icedtea-bin-3.20.0-r1-jre-lib-s390x.tar.gz 43644805 BLAKE2B df2b592a4f257f128cc2ebf969349e2b8a1d3d8ab60c131df8963e9c6b882ce0ae723152e859672fe51aaf888d43b13e5ee3385e868608c2d829f346a42b5420 SHA512 b06521a23fcdbd510a0bd191919b13e0aa53d599686278e1bacd478c47a6ff94a50fb94ee2195d1bf2fa6e03eb4758037343939187bb1f464c229d4a0cacdc72
+DIST icedtea-bin-3.20.0-r1-jre-lib-x86.tar.gz 44051481 BLAKE2B d2917f24ed725a6ac8544738b53ff5d399bd0218c61c7670145fc5187791fc9c12a6021179f7e2cbbe0889ffd67112d64ed11f567b526cdc9b10cefd9001114e SHA512 fa5da0aa8248f89b96b5ae6c576b0ecc489e15b02305e40994a7b2940341e2436a00c79aeff8f741921bf6a2cc4a7f503802217379f4e01128b5569b93d56509
+DIST icedtea-bin-3.20.0-r1-jre-lib-x86_64.tar.gz 44056381 BLAKE2B 927753ef96e25dc7ab238c8bf2b496013591b9e0f8b774d6c06e17ec22fb9acf8862397affedfd599b05969fab1c46372ddef2164bee3724f5bdd7ef59910f02 SHA512 80fa08b46154945cbb7958eddfac6f5d5be5a79718118ae3b8489c82169e1eacdaa33000f64c2c3ac4a0e40735c6a1039f506ed4784c3a6077586a08bb291df2
+DIST icedtea-bin-3.20.0-r1-jre-ppc64le.tar.gz 426022 BLAKE2B ce1f4c1b6eaf6db11cfe12e9e7258d916461e603229f7a845d8f4694e9ce0ad7f916926ecba2372758cb75c3fafeed97ac953879a0e350e5ba800ea7a28c2734 SHA512 7dc616ab4da29e00b48f52907b982889bb8214b714525a7a685156d0eb638ef9f1cb65515ca5dd22e09b661403ed7e6910f1cee2c884d1aebc96942073eeb0f3
+DIST icedtea-bin-3.20.0-r1-jre-s390x.tar.gz 357396 BLAKE2B e63b570a2880113758fa95df6bd76c42764b53f2731c74ab75cf4868b1d5978354f62728b4f823126f052670fbdd5f7cc0dcd5fa8e31a25d0612d60ed246608d SHA512 fef41b14fff27375fdc52ee7fa8e5d8c8871bdb50a50349e5c70f239fe2d64a52b9dea2e26d8c87bce50dbd4b8ae34d79b9394caf4a1903950ebc9a2cd809db7
+DIST icedtea-bin-3.20.0-r1-jre-x86.tar.gz 390456 BLAKE2B ec75c76224b65742eb9e9ecdd5b5a59b1180d87f77c490277e9a60d1bdfc9073b38ef083031056f1353732d3f2a4ba317bdd7b4874b0c2bd91b8ad0e5fc00284 SHA512 8a1567ba893b571c8c5c1fd0c117cafb72a7af3c1b522ec39957b0c14da14ed6876422d4926a2b95513fb2ebb637103d67dc7f14952023572b45b06652269506
+DIST icedtea-bin-3.20.0-r1-jre-x86_64.tar.gz 368633 BLAKE2B 2575bb00cce0e75d2e4f48b0beaf5dd27e83cfe86eea78132a8ee6db9ff7cd19bc8052a0dfd84d5b5296db042a12a86ded381428bef0b0c85a6e05798d3bf8e2 SHA512 e5f05c2c5bb2d5cc52bab933f816fc82ed86de63f6ca5ca4b3dff8c629ec4800aa856ec504034284e4f9e3d3522b92d135aaffdd16e27dca5bfb8470a96a8e4b
+DIST icedtea-bin-3.20.0-r1-ppc64le.tar.gz 15866282 BLAKE2B 75f3b75938c79bf5064eeb965d1ad28c4b0ec2b2f1551350745797602c47525af69fda6a6b2721805bdf993c9a04bddcc33243427ece6650b25713e360496d36 SHA512 07aab5ba47da8d000b617136841ea333176ba1b39b9bcd6880ebf961ccd4dba03bf00fe67afc36565cffc79448a5524bb4f88b83a7073606de2214664384e0ef
+DIST icedtea-bin-3.20.0-r1-s390x.tar.gz 15810355 BLAKE2B daa448d81530934b77fabba672b96c5bcc3b2761cbab6ecf2bda0255260edae57e84c34be98a58287c894933e844d1473fb90f993204a0f335a9600ed9b3b694 SHA512 6de66a640c49ad6ade91bd94856f242e7b07083529abfa68b68e986879c1f000f44eda7c348b3878605d17aeb52efb7e9b1606eb27cbee452b58d1224bdbb082
+DIST icedtea-bin-3.20.0-r1-x86.tar.gz 15799213 BLAKE2B 0313637ec98721665c964b03b299efb067232d6ae8d51b1955f4877a632da2056897bb8c4c3b79aa710b732128c3e21205f5cffe0ac44d9f10e48b5c8fe4a109 SHA512 98cac633eb4fc06a09e75579559d149a9f7c197a1186a26baa99019d966814d8c6aefb905f24f3f255bbe5b3818d1342daaae98454538d1680781c9da0ecff20
+DIST icedtea-bin-3.20.0-r1-x86_64.tar.gz 15805858 BLAKE2B afa9c5e43d2c2787cae2469b2606d51ba3bd03de2f1cff8787620fea90e41b3e26fe496bb6518b998e4e6f1acc52fa8c03e14e3f52d31356bc0ffe60fa13f0f9 SHA512 de62b1e19b5df6d3829e1ce35f9b3b9b1c55684a3768c0c5fc51e35be25a74603317594a3198b67a358631a31f96b6b40ca40ab66c997f60a47c8658e4a20dc1
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.19.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.20.0-r1.ebuild
index cc40659..7d8112e 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.19.0.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.20.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit java-vm-2 toolchain-funcs multilib-build estack
ALPINE_PN="openjdk8"
-ALPINE_PV="8.292.10-r0"
+ALPINE_PV="8.302.08-r1"
ALPINE_P="java-1.8-openjdk"
ALPINE_PATH="usr/lib/jvm/${ALPINE_P}"
S="${WORKDIR}"
@@ -50,7 +50,8 @@ REQUIRED_USE="
RESTRICT="preserve-libs mirror"
QA_PREBUILT="opt/.*"
-RDEPEND=""
+RDEPEND="${DEPEND}
+ dev-libs/nss"
DEPEND="
dev-libs/elfutils[utils]
>=dev-libs/glib-2.60.7:2
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index f8c5896..6132314 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -1 +1,2 @@
DIST elfutils-0.180.tar.bz2 9079640 BLAKE2B bd7863b82a71d2932a23c9d125d5eb6485977a3256a8a0b25980183d33f7345c3d9fae78277de5c955eb0ceeb955f8fa71d209f4f39bcf6dd49e46a8bbd7efcf SHA512 62e96035ccfe8928baca2285decbe8b8703a2daa956df81ece18fecf643272fb68955806b3e807a514141a7a9bf44520bf09461672aa580bd6807485fb604d25
+DIST elfutils-0.185.tar.bz2 9187627 BLAKE2B 57cfa7e4060975c4bf6170dbd354687a19a92f7069c060db1ac2fa4da5a9d34e8bddd07c7ce376b5c28b5670ad5b8c1df795164cbcfb600a44cf1db60c20c4af SHA512 34de0de1355b11740e036e0fc64f2fc063587c8eb121b19216ee5548d3f0f268d8fc3995176c47190466b9d881007cfa11a9d01e9a50e38af6119492bf8bb47f
diff --git a/dev-libs/elfutils/elfutils-0.185.ebuild b/dev-libs/elfutils/elfutils-0.185.ebuild
new file mode 100644
index 0000000..36658ab
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.185.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2003-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="http://elfutils.org/"
+SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
+IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
+ bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
+ lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
+ zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] )
+ !dev-libs/libelf
+ elibc_musl? (
+ sys-libs/argp-standalone
+ sys-libs/fts-standalone
+ sys-libs/obstack-standalone
+ dev-libs/libbsd
+ )
+"
+DEPEND="${RDEPEND}
+ valgrind? ( dev-util/valgrind )
+"
+BDEPEND="nls? ( sys-devel/gettext )
+ >=sys-devel/flex-2.5.4a
+ sys-devel/m4
+"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
+ "${FILESDIR}"/${PN}-0.177-disable-large.patch
+ "${FILESDIR}"/${PN}-0.180-PaX-support.patch
+ "${FILESDIR}"/${PN}-0.185-static-inline.patch
+
+ # Musl support patches
+ "${FILESDIR}"/0.178/fix-aarch64_fregs.patch
+ "${FILESDIR}"/0.178/musl-asm_ptrace_h.patch
+ "${FILESDIR}"/0.185/musl-cdefs.patch
+ "${FILESDIR}"/0.178/musl-macros.patch
+ "${FILESDIR}"/0.178/musl-strndupa.patch
+ "${FILESDIR}"/0.178/musl-error_h.patch
+ "${FILESDIR}"/0.185/musl-fix-uninitialized-mnebuf.patch
+)
+
+src_prepare() {
+ default
+
+ if ! use static-libs; then
+ sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
+ fi
+ # https://sourceware.org/PR23914
+ sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+ use test && append-flags -g #407135
+
+ # Symbol aliases are implemented as asm statements.
+ # Will require porting: https://gcc.gnu.org/PR48200
+ filter-flags '-flto*'
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ $(use_enable nls) \
+ $(use_enable threads thread-safety) \
+ $(use_enable valgrind) \
+ --disable-debuginfod \
+ --disable-libdebuginfod \
+ --program-prefix="eu-" \
+ --with-zlib \
+ $(use_with bzip2 bzlib) \
+ $(use_with lzma) \
+ $(use_with zstd)
+}
+
+multilib_src_test() {
+ env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
+ LC_ALL="C" \
+ emake check VERBOSE=1
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ dodoc NOTES
+ # These build quick, and are needed for most tests, so don't
+ # disable their building when the USE flag is disabled.
+ if ! use utils; then
+ rm -rf "${ED}"/usr/bin || die
+ fi
+}
diff --git a/dev-libs/elfutils/files/0.185/musl-cdefs.patch b/dev-libs/elfutils/files/0.185/musl-cdefs.patch
new file mode 100644
index 0000000..c102f04
--- /dev/null
+++ b/dev-libs/elfutils/files/0.185/musl-cdefs.patch
@@ -0,0 +1,29 @@
+From 4e124b57e40c15c9ccb19c6a219816cfc8d2a167 Mon Sep 17 00:00:00 2001
+From: Jory Pratt <anarchy@gentoo.org>
+Date: Thu, 12 Dec 2019 22:38:30 -0600
+Subject: [PATCH 3/3] Fix cdefs.h include for musl
+
+---
+ lib/fixedsizehash.h | 5 ++++-
+ 1 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/lib/fixedsizehash.h b/lib/fixedsizehash.h
+index dac2a5f..910f3ac 100644
+--- a/lib/fixedsizehash.h
++++ b/lib/fixedsizehash.h
+@@ -30,8 +30,11 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <string.h>
++#if !defined(__GLIBC__)
++#include <bsd/sys/cdefs.h>
++#else
+ #include <sys/cdefs.h>
+-
++#endif
+ #include <system.h>
+
+ #ifdef __CONCAT
+--
+2.24.1
+
diff --git a/dev-libs/elfutils/files/0.185/musl-fix-uninitialized-mnebuf.patch b/dev-libs/elfutils/files/0.185/musl-fix-uninitialized-mnebuf.patch
new file mode 100644
index 0000000..21514af
--- /dev/null
+++ b/dev-libs/elfutils/files/0.185/musl-fix-uninitialized-mnebuf.patch
@@ -0,0 +1,24 @@
+From 2c2d8d71838e9de7f711ea753414301e02f1e5a8 Mon Sep 17 00:00:00 2001
+From:
+Date: Sat, 4 Sep 2021 10:08:49 -0500
+Subject: [PATCH] Fix uninitialized mnebuf
+
+---
+ libcpu/i386_disasm.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libcpu/i386_disasm.c b/libcpu/i386_disasm.c
+index fd7340c..61a8256 100644
+--- a/libcpu/i386_disasm.c
++++ b/libcpu/i386_disasm.c
+@@ -714,6 +714,7 @@ i386_disasm (Ebl *ebl __attribute__((unused)),
+
+ case 'm':
+ /* Mnemonic. */
++ str = mnebuf;
+
+ if (unlikely (instrtab[cnt].mnemonic == MNE_INVALID))
+ {
+--
+2.32.0
+
diff --git a/dev-libs/elfutils/files/elfutils-0.185-static-inline.patch b/dev-libs/elfutils/files/elfutils-0.185-static-inline.patch
new file mode 100644
index 0000000..ec1aaf4
--- /dev/null
+++ b/dev-libs/elfutils/files/elfutils-0.185-static-inline.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/794601
+--- a/src/elflint.c
++++ b/src/elflint.c
+@@ -3434,7 +3434,7 @@ buffer_pos (Elf_Data *data, const unsigned char *p)
+ return p - (const unsigned char *) data->d_buf;
+ }
+
+-inline size_t
++static inline size_t
+ buffer_left (Elf_Data *data, const unsigned char *p)
+ {
+ return (const unsigned char *) data->d_buf + data->d_size - p;
diff --git a/mail-filter/libspf2/Manifest b/mail-filter/libspf2/Manifest
deleted file mode 100644
index c083874..0000000
--- a/mail-filter/libspf2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libspf2-1.2.10.tar.gz 508842 BLAKE2B d15a44f64c5e3da20aa349e61a6cc02a15f83ed3acff93fe4c23970e30533d6424b1db35d7d60ff488c9a239d343f8544426fbf8fcb66271237155e0b57df1b5 SHA512 162ce382628c6fcadac3e11f5a12442db622bb23f7ec503e16f5ba7fc88afdd777bce6b093c12a58210355985fd11b74b140f08fab347334d82d953dd183b130
diff --git a/mail-filter/libspf2/files/libspf2-1.2.10-dn_skipname.patch b/mail-filter/libspf2/files/libspf2-1.2.10-dn_skipname.patch
deleted file mode 100644
index e53001f..0000000
--- a/mail-filter/libspf2/files/libspf2-1.2.10-dn_skipname.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 808b584d22106828aaaa3f2a52b1d076b6e66040 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 11 Sep 2014 08:09:34 +0000
-Subject: [PATCH] provide dn_skipname
-
----
- configure.ac | 2 +-
- src/libreplace/__dn_skipname.c | 87 ++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 88 insertions(+), 1 deletion(-)
- create mode 100644 src/libreplace/__dn_skipname.c
-
-diff --git a/configure.ac b/configure.ac
-index 63e398c..739da3b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -274,7 +274,7 @@ AC_CHECK_FUNCS([strcasecmp strncasecmp strspn strtoul])
- AC_CHECK_FUNCS([gethostbyname inet_ntoa select strrchr strstr strtol])
-
- AC_REPLACE_FUNCS([getopt_long_only strncasecmp])
--AC_REPLACE_FUNCS([__ns_initparse __ns_name_uncompress __ns_msg_getflag])
-+AC_REPLACE_FUNCS([__ns_initparse __ns_name_uncompress __ns_msg_getflag __dn_skipname])
- dnl Magnus Holmgren says this avoids linking a private function
- AC_LIBOBJ([__ns_get16])
-
-diff --git a/src/libreplace/__dn_skipname.c b/src/libreplace/__dn_skipname.c
-new file mode 100644
-index 0000000..88d48b5
---- /dev/null
-+++ b/src/libreplace/__dn_skipname.c
-@@ -0,0 +1,87 @@
-+/* taken from OpenBSD source */
-+/*
-+ * ++Copyright++ 1985, 1993
-+ * -
-+ * Copyright (c) 1985, 1993
-+ * The Regents of the University of California. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ * may be used to endorse or promote products derived from this software
-+ * without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ * -
-+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies, and that
-+ * the name of Digital Equipment Corporation not be used in advertising or
-+ * publicity pertaining to distribution of the document or software without
-+ * specific, written prior permission.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
-+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT
-+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-+ * SOFTWARE.
-+ * -
-+ * --Copyright--
-+ */
-+
-+/*
-+ * Skip over a compressed domain name. Return the size or -1.
-+ */
-+#include <sys/types.h>
-+#include <resolv.h>
-+
-+int
-+__dn_skipname(const u_char *comp_dn, const u_char *eom)
-+{
-+ const u_char *cp;
-+ int n;
-+
-+ cp = comp_dn;
-+ while (cp < eom && (n = *cp++)) {
-+ /*
-+ * check for indirection
-+ */
-+ switch (n & INDIR_MASK) {
-+ case 0: /* normal case, n == len */
-+ cp += n;
-+ continue;
-+ case INDIR_MASK: /* indirection */
-+ cp++;
-+ break;
-+ default: /* illegal type */
-+ return (-1);
-+ }
-+ break;
-+ }
-+ if (cp > eom)
-+ return (-1);
-+ return (cp - comp_dn);
-+}
-+
-+
---
-2.1.0
-
diff --git a/mail-filter/libspf2/files/libspf2-1.2.10-expand.patch b/mail-filter/libspf2/files/libspf2-1.2.10-expand.patch
deleted file mode 100644
index 77d6d78..0000000
--- a/mail-filter/libspf2/files/libspf2-1.2.10-expand.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/libreplace/arpa_nameser.h b/src/libreplace/arpa_nameser.h
-index e59ca3d..35e32b3 100644
---- a/src/libreplace/arpa_nameser.h
-+++ b/src/libreplace/arpa_nameser.h
-@@ -59,11 +59,6 @@
- # define __P(x) x
- #endif
-
--#if defined( HAVE_ARPA_NAMESER_H ) && defined( HAVE_NS_TYPE )
--#define dn_expand __dn_expand
--int dn_expand __P((const u_char *, const u_char *, const u_char *,
-- char *, int));
--#endif
- #define dn_skipname __dn_skipname
- int dn_skipname __P((const u_char *, const u_char *));
-
diff --git a/mail-filter/libspf2/files/libspf2-1.2.10-gcc5.patch b/mail-filter/libspf2/files/libspf2-1.2.10-gcc5.patch
deleted file mode 100644
index d36ec96..0000000
--- a/mail-filter/libspf2/files/libspf2-1.2.10-gcc5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/shevek/libspf2/issues/13
-https://bugs.gentoo.org/show_bug.cgi?id=570486
-
-Index: libspf2-1.2.10/src/include/spf_log.h
-===================================================================
---- libspf2-1.2.10/src/include/spf_log.h
-+++ libspf2-1.2.10/src/include/spf_log.h 2015-10-20 23:23:04.579055906 +0200
-@@ -60,10 +60,10 @@
-
- #if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L
-
--#define SPF_errorf(format, ... ) SPF_errorx( __FILE__, __LINE__, format, __VA_ARGS__ )
--#define SPF_warningf(format, ... ) SPF_warningx( __FILE__, __LINE__, format, __VA_ARGS__ )
--#define SPF_infof(format, ... ) SPF_infox( __FILE__, __LINE__, format, __VA_ARGS__ )
--#define SPF_debugf(format, ... ) SPF_debugx( __FILE__, __LINE__, format, __VA_ARGS__ )
-+#define SPF_errorf(...) SPF_errorx( __FILE__, __LINE__, __VA_ARGS__ )
-+#define SPF_warningf(...) SPF_warningx( __FILE__, __LINE__, __VA_ARGS__ )
-+#define SPF_infof(...) SPF_infox( __FILE__, __LINE__, __VA_ARGS__ )
-+#define SPF_debugf(...) SPF_debugx( __FILE__, __LINE__, __VA_ARGS__ )
-
- #elif defined( __GNUC__ )
-
diff --git a/mail-filter/libspf2/files/libspf2-1.2.10-musl.patch b/mail-filter/libspf2/files/libspf2-1.2.10-musl.patch
deleted file mode 100644
index 97c3431..0000000
--- a/mail-filter/libspf2/files/libspf2-1.2.10-musl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-musl does not have res_close and if it had, it would have been a NOP
-
-diff --git a/src/libspf2/spf_dns_resolv.c b/src/libspf2/spf_dns_resolv.c
-index 8f795ce..e3563d8 100644
---- a/src/libspf2/spf_dns_resolv.c
-+++ b/src/libspf2/spf_dns_resolv.c
-@@ -606,7 +606,7 @@ SPF_dns_resolv_free(SPF_dns_server_t *spf_dns_server)
- {
- SPF_ASSERT_NOTNULL(spf_dns_server);
-
--#if ! HAVE_DECL_RES_NINIT
-+#if ! HAVE_DECL_RES_NINIT && HAVE_RES_CLOSE
- res_close();
- #endif
-
diff --git a/mail-filter/libspf2/files/libspf2-1.2.10-netdb.patch b/mail-filter/libspf2/files/libspf2-1.2.10-netdb.patch
deleted file mode 100644
index 0f87882..0000000
--- a/mail-filter/libspf2/files/libspf2-1.2.10-netdb.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./src/include/spf_dns.h.orig
-+++ ./src/include/spf_dns.h
-@@ -99,11 +99,13 @@
- */
-
- #if !defined(HAVE_NETDB_H) && !defined(_WIN32)
--#define NETDB_SUCCESS 0
- #define HOST_NOT_FOUND 1 /**< NXDOMAIN (authoritative answer)*/
- #define TRY_AGAIN 2 /**< SERVFAIL (no authoritative answer)*/
- #define NO_RECOVERY 3 /**< invalid/unimplmeneted query */
- #define NO_DATA 4 /**< host found, but no RR of req type*/
-+#endif
-+#ifndef NETDB_SUCCESS
-+#define NETDB_SUCCESS 0
- #endif
- typedef int SPF_dns_stat_t;
-
diff --git a/mail-filter/libspf2/files/libspf2-1.2.9-ipv6.patch b/mail-filter/libspf2/files/libspf2-1.2.9-ipv6.patch
deleted file mode 100644
index 76e8cd3..0000000
--- a/mail-filter/libspf2/files/libspf2-1.2.9-ipv6.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2009/09/08 10:36:27 tron Exp $
-
-Fix an abort() caused by miscalculating the size of an internal buffer.
-This can crash applications using "libspf2" (e.g. "milter-greylist")
-in an e-mail gets delivered via SMTP over IPv6 depending on the
-remote machine's IPv6 address.
-
---- src/libspf2/spf_expand.c.orig 2008-11-03 21:29:00.000000000 +0000
-+++ src/libspf2/spf_expand.c 2009-09-08 11:27:52.000000000 +0100
-@@ -245,7 +245,7 @@
- case PARM_CLIENT_IP: /* SMTP client IP */
- #ifdef COMPUTE
- if (compute_length) {
-- len = sizeof(ip6_buf);
-+ len = sizeof(ip6_rbuf);
- if (d->dv.url_encode)
- len *= 3;
- buflen += len;
-
-http://www.gossamer-threads.com/lists/spf/devel/35098
-
---- src/libspf2/spf_compile.c 2008-11-03 15:37:33.000000000 -0500
-+++ src/libspf2/spf_compile.c 2009-09-07 23:46:02.000000000 -0400
-@@ -778,7 +778,7 @@
- const char *end;
- const char *p;
-
-- char buf[ INET_ADDRSTRLEN ];
-+ char buf[ INET6_ADDRSTRLEN ];
- size_t len;
- int err;
-
---- src/libspf2/spf_interpret.c 2008-10-22 11:47:43.000000000 -0400
-+++ src/libspf2/spf_interpret.c 2009-09-08 00:42:25.000000000 -0400
-@@ -505,7 +505,7 @@
- char dst_ip6_buf[ INET6_ADDRSTRLEN ];
-
- struct in6_addr src_ipv6;
-- int cidr, mask;
-+ int cidr, cidr_save, mask;
- int i;
- int match;
-
-@@ -517,6 +517,7 @@
- cidr = SPF_i_mech_cidr(spf_request, mech);
- if ( cidr == 0 )
- cidr = 128;
-+ cidr_save = cidr;
-
- match = TRUE;
- for( i = 0; i < array_elem( ipv6.s6_addr ) && match; i++ )
-@@ -538,7 +539,7 @@
- INET_NTOP(AF_INET6, &ipv6.s6_addr,
- dst_ip6_buf, sizeof(dst_ip6_buf));
- SPF_debugf( "ip_match: %s == %s (/%d): %d",
-- src_ip6_buf, dst_ip6_buf, cidr, match );
-+ src_ip6_buf, dst_ip6_buf, cidr_save, match );
- }
-
- return match;
-
diff --git a/mail-filter/libspf2/libspf2-1.2.10.ebuild b/mail-filter/libspf2/libspf2-1.2.10.ebuild
deleted file mode 100644
index 6b4c3ec..0000000
--- a/mail-filter/libspf2/libspf2-1.2.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocols"
-HOMEPAGE="http://www.libspf2.org"
-SRC_URI="http://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 BSD-2 )"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="static static-libs"
-
-DEPEND=""
-RDEPEND="!dev-perl/Mail-SPF-Query"
-REQUIRED_USE="static? ( static-libs )"
-
-src_prepare() {
- if ! use static; then
- sed -i -e '/bin_PROGRAMS/s/spfquery_static//' src/spfquery/Makefile.am \
- -e '/bin_PROGRAMS/s/spftest_static//' src/spftest/Makefile.am \
- -e '/bin_PROGRAMS/s/spfd_static//' src/spfd/Makefile.am \
- -e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am \
- || die
- #eautoreconf
- fi
- epatch "${FILESDIR}"/${P}-gcc5.patch #570486
- epatch "${FILESDIR}"/${PN}-1.2.10-netdb.patch
- epatch "${FILESDIR}"/${PN}-1.2.10-dn_skipname.patch
- epatch "${FILESDIR}"/${PN}-1.2.10-expand.patch
- epatch "${FILESDIR}"/${PN}-1.2.10-musl.patch
-
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc README TODO INSTALL
-
- use static-libs || rm -f "${D}"/usr/lib*/libspf2.la
-}
diff --git a/mail-filter/libspf2/metadata.xml b/mail-filter/libspf2/metadata.xml
deleted file mode 100644
index 9134037..0000000
--- a/mail-filter/libspf2/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocol pair. libspf2 is a library which allows email systems such as Sendmail, Postfix, Exim, Zmailer and MS Exchange to check SPF records and make sure that the email is authorized by the domain name that it is coming from. This prevents email forgery, commonly used by spammers, scammers and email viruses/worms.</longdescription>
-</pkgmetadata>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index fd1089e..513939a 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,2 +1 @@
-DIST mesa-21.0.3.tar.xz 14710004 BLAKE2B f2165da4487824931d8ff90e4f13624546a297b0d3577d69b7cfd6078a965282b4a732cb720cbb08ea83a3a987603cfe67876fb18022fa444b011fcc9b7df352 SHA512 4a8aee48a8ea7f32e8aa3bbbd91db26c6053b9a43e62ff88256929e6bc147884f0fef988726b5a3d59d7008663f017c746a0352fd3fcc1c476b8190af4a2531f
-DIST mesa-21.1.4.tar.xz 15254812 BLAKE2B 7ec6177ad4fb6f053553b634c9ff03c5d618d0212fd77c2fda8803197bef529c74ccf3c3ae75a810ba1d57862f08405c6df702e41f6cb0fd202833ce7b9efef0 SHA512 1f4e2d8ba2c3c02bad5468687752d7e87d6e79c4a0e6ec4b2741a57fb270d18ae4712aaa07a9e09a2d3348540f5a26cdbe05464cd52adb8df1e2e28a581b2b53
+DIST mesa-21.1.7.tar.xz 15391776 BLAKE2B a9138f189ef953d5efa4e287fbbe795ef2539c113dc7e0f565d3f35dcfaa59ab08674bf37fda196ba34e5963637c3ebb133db40b558bd275e29c8387b1acfdfa SHA512 1fd677437f292c30fbf08bfef8c1088557841f426090ccba20ab2a222b08fb5c3ec48a7a0301466e03a23019d09414c700a4f5e299479cacd6972a9f3ba030c8
diff --git a/media-libs/mesa/files/mesa-21.0.3-add-disable-tls-support.patch b/media-libs/mesa/files/mesa-21.0.3-add-disable-tls-support.patch
deleted file mode 100644
index e6f9e18..0000000
--- a/media-libs/mesa/files/mesa-21.0.3-add-disable-tls-support.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 7af845bca9eafb67b32c2f5e2de7bc2a56772aa4 Mon Sep 17 00:00:00 2001
-From:
-Date: Fri, 28 May 2021 11:48:26 -0500
-Subject: [PATCH] Allow to disable glx_tls for musl users
-
----
- meson.build | 3 ++-
- meson_options.txt | 6 ++++++
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 26cfd01..38d4802 100644
---- a/meson.build
-+++ b/meson.build
-@@ -448,7 +448,8 @@ endif
-
- # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
- use_elf_tls = false
--if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
-+with_use_elf_tls = get_option('use-elf-tls')
-+if with_use_elf_tls and not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
- pre_args += '-DUSE_ELF_TLS'
- use_elf_tls = true
- endif
-diff --git a/meson_options.txt b/meson_options.txt
-index fc73f6e..edd3886 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -464,3 +464,9 @@ option(
- value : true,
- description : 'use msse2 flag for mingw x86. Default: true',
- )
-+option(
-+ 'use-elf-tls',
-+ type : 'boolean',
-+ value : false,
-+ description : 'Build support for initial-exec TLS model'
-+)
---
-2.31.1
-
diff --git a/media-libs/mesa/mesa-21.0.3.ebuild b/media-libs/mesa/mesa-21.0.3.ebuild
deleted file mode 100644
index fdca704..0000000
--- a/media-libs/mesa/mesa-21.0.3.ebuild
+++ /dev/null
@@ -1,573 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit llvm meson multilib-minimal python-any-r1 linux-info
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
- inherit git-r3
-else
- SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
- KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
- !test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
- lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
- vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
- d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
- gles1? ( egl )
- gles2? ( egl )
- osmesa? ( gallium )
- vulkan? ( dri3
- video_cards_radeonsi? ( llvm ) )
- vulkan-overlay? ( vulkan )
- wayland? ( egl gbm )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_iris? ( gallium )
- video_cards_lima? ( gallium )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_panfrost? ( gallium )
- video_cards_radeon? ( || ( classic gallium )
- gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_v3d? ( gallium )
- video_cards_vc4? ( gallium )
- video_cards_virgl? ( gallium )
- video_cards_vivante? ( gallium gbm )
- video_cards_vmware? ( gallium )
- xa? ( X )
- xvmc? ( X )
- zink? ( gallium vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
-RDEPEND="
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
- gallium? (
- unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
- llvm? (
- video_cards_radeonsi? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- video_cards_r600? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- video_cards_radeon? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- )
- lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
- opencl? (
- >=virtual/opencl-3[${MULTILIB_USEDEP}]
- dev-libs/libclc
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- vaapi? (
- >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
- )
- vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- )
- selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
- wayland? (
- >=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
- >=dev-libs/wayland-protocols-1.8
- )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
- video_cards_intel? (
- !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- )
- video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
- )
- zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-RDEPEND="${RDEPEND}
- video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="11"
-LLVM_DEPSTR="
- || (
- sys-devel/llvm:11[${MULTILIB_USEDEP}]
- sys-devel/llvm:10[${MULTILIB_USEDEP}]
- )
- <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
- gallium? (
- llvm? (
- opencl? (
- video_cards_r600? (
- ${CLANG_DEPSTR_AMDGPU}
- )
- !video_cards_r600? (
- video_cards_radeonsi? (
- ${CLANG_DEPSTR_AMDGPU}
- )
- )
- !video_cards_r600? (
- !video_cards_radeonsi? (
- video_cards_radeon? (
- ${CLANG_DEPSTR_AMDGPU}
- )
- )
- )
- !video_cards_r600? (
- !video_cards_radeon? (
- !video_cards_radeonsi? (
- ${CLANG_DEPSTR}
- )
- )
- )
- )
- !opencl? (
- video_cards_r600? (
- ${LLVM_DEPSTR_AMDGPU}
- )
- !video_cards_r600? (
- video_cards_radeonsi? (
- ${LLVM_DEPSTR_AMDGPU}
- )
- )
- !video_cards_r600? (
- !video_cards_radeonsi? (
- video_cards_radeon? (
- ${LLVM_DEPSTR_AMDGPU}
- )
- )
- )
- !video_cards_r600? (
- !video_cards_radeon? (
- !video_cards_radeonsi? (
- ${LLVM_DEPSTR}
- )
- )
- )
- )
- )
- )
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
- valgrind? ( dev-util/valgrind )
- X? (
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-base/xorg-proto
- )
-"
-BDEPEND="
- ${PYTHON_DEPS}
- opencl? (
- >=sys-devel/gcc-4.6
- )
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
- wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- usr/lib*/libglapi.so.0.0.0
- usr/lib*/libGLESv1_CM.so.1.1.0
- usr/lib*/libGLESv2.so.2.0.0
- usr/lib*/libGL.so.1.2.0
- usr/lib*/libOSMesa.so.8.0.0
- usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-21.0.3-add-disable-tls-support.patch
-)
-
-llvm_check_deps() {
- local flags=${MULTILIB_USEDEP}
- if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
- then
- flags+=",llvm_targets_AMDGPU(-)"
- fi
-
- if use opencl; then
- has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
- fi
- has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
- if use vulkan; then
- if ! use video_cards_i965 &&
- ! use video_cards_iris &&
- ! use video_cards_radeonsi &&
- ! use video_cards_v3d; then
- ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
- fi
- fi
-
- if use opencl; then
- if ! use video_cards_r600 &&
- ! use video_cards_radeonsi; then
- ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi"
- fi
- fi
-
- if use vaapi; then
- if ! use video_cards_r600 &&
- ! use video_cards_radeonsi &&
- ! use video_cards_nouveau; then
- ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
- fi
- fi
-
- if use vdpau; then
- if ! use video_cards_r300 &&
- ! use video_cards_r600 &&
- ! use video_cards_radeonsi &&
- ! use video_cards_nouveau; then
- ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
- fi
- fi
-
- if use xa; then
- if ! use video_cards_freedreno &&
- ! use video_cards_nouveau &&
- ! use video_cards_vmware; then
- ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
- fi
- fi
-
- if use xvmc; then
- if ! use video_cards_r600 &&
- ! use video_cards_nouveau; then
- ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau"
- fi
- fi
-
- if ! use gallium; then
- use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
- use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium"
- use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium"
- use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium"
- use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium"
- use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium"
- use xa && ewarn "Ignoring USE=xa since USE does not contain gallium"
- use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium"
- fi
-
- if ! use llvm; then
- use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm"
- fi
-
- if use osmesa && ! use llvm; then
- ewarn "OSMesa will be slow without enabling USE=llvm"
- fi
-}
-
-python_check_deps() {
- has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- if use video_cards_i965 ||
- use video_cards_iris ||
- use video_cards_radeonsi; then
- if kernel_is -ge 5 11 3; then
- CONFIG_CHECK="~KCMP"
- elif kernel_is -ge 5 11; then
- CONFIG_CHECK="~CHECKPOINT_RESTORE"
- elif kernel_is -ge 5 10 20; then
- CONFIG_CHECK="~KCMP"
- else
- CONFIG_CHECK="~CHECKPOINT_RESTORE"
- fi
- linux-info_pkg_setup
- fi
-
- if use gallium && use llvm; then
- llvm_pkg_setup
- fi
- python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
- local emesonargs=()
-
- if use classic; then
- # Intel code
- dri_driver_enable video_cards_i915 i915
- dri_driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- dri_driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- dri_driver_enable video_cards_nouveau nouveau
-
- # ATI code
- dri_driver_enable video_cards_r100 r100
- dri_driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- dri_driver_enable video_cards_radeon r100 r200
- fi
- fi
-
- local platforms
- use X && platforms+="x11"
- use wayland && platforms+=",wayland"
- emesonargs+=(-Dplatforms=${platforms#,})
-
- if use X || use egl; then
- emesonargs+=(-Dglvnd=true)
- else
- emesonargs+=(-Dglvnd=false)
- fi
-
- # Disable glx tls support on musl
- if use elibc_musl; then
- emesonargs+=( -Delf-tls=false )
- fi
-
- if use gallium; then
- emesonargs+=(
- $(meson_feature llvm)
- $(meson_feature lm-sensors lmsensors)
- $(meson_feature unwind libunwind)
- )
-
- if use video_cards_iris ||
- use video_cards_r300 ||
- use video_cards_r600 ||
- use video_cards_radeonsi ||
- use video_cards_nouveau ||
- use video_cards_vmware; then
- emesonargs+=($(meson_use d3d9 gallium-nine))
- else
- emesonargs+=(-Dgallium-nine=false)
- fi
-
- if use video_cards_r600 ||
- use video_cards_radeonsi ||
- use video_cards_nouveau; then
- emesonargs+=($(meson_feature vaapi gallium-va))
- use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
- else
- emesonargs+=(-Dgallium-va=disabled)
- fi
-
- if use video_cards_r300 ||
- use video_cards_r600 ||
- use video_cards_radeonsi ||
- use video_cards_nouveau; then
- emesonargs+=($(meson_feature vdpau gallium-vdpau))
- else
- emesonargs+=(-Dgallium-vdpau=disabled)
- fi
-
- if use video_cards_freedreno ||
- use video_cards_nouveau ||
- use video_cards_vmware; then
- emesonargs+=($(meson_feature xa gallium-xa))
- else
- emesonargs+=(-Dgallium-xa=disabled)
- fi
-
- if use video_cards_r600 ||
- use video_cards_nouveau; then
- emesonargs+=($(meson_feature xvmc gallium-xvmc))
- else
- emesonargs+=(-Dgallium-xvmc=disabled)
- fi
-
- if use video_cards_freedreno ||
- use video_cards_lima ||
- use video_cards_panfrost ||
- use video_cards_v3d ||
- use video_cards_vc4 ||
- use video_cards_vivante; then
- gallium_enable -- kmsro
- fi
-
- gallium_enable -- swrast
- gallium_enable video_cards_lima lima
- gallium_enable video_cards_panfrost panfrost
- gallium_enable video_cards_v3d v3d
- gallium_enable video_cards_vc4 vc4
- gallium_enable video_cards_vivante etnaviv
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
- gallium_enable zink zink
-
- # Only one i915 driver (classic vs gallium). Default to classic.
- if ! use classic; then
- gallium_enable video_cards_i915 i915
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
- fi
-
- gallium_enable video_cards_iris iris
-
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
-
- gallium_enable video_cards_freedreno freedreno
- gallium_enable video_cards_virgl virgl
-
- # opencl stuff
- emesonargs+=(
- -Dgallium-opencl="$(usex opencl icd disabled)"
- )
- fi
-
- if use vulkan; then
- vulkan_enable video_cards_i965 intel
- vulkan_enable video_cards_iris intel
- vulkan_enable video_cards_radeonsi amd
- vulkan_enable video_cards_v3d broadcom
- fi
-
- driver_list() {
- local drivers="$(sort -u <<< "${1// /$'\n'}")"
- echo "${drivers//$'\n'/,}"
- }
-
- emesonargs+=(
- $(meson_use test build-tests)
- -Dglx=$(usex X dri disabled)
- -Dshared-glapi=enabled
- $(meson_feature dri3)
- $(meson_feature egl)
- $(meson_feature gbm)
- $(meson_feature gles1)
- $(meson_feature gles2)
- $(meson_use osmesa)
- $(meson_use selinux)
- $(meson_feature zstd)
- -Dvalgrind=$(usex valgrind auto false)
- -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
- -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
- -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
- $(meson_use vulkan vulkan-device-select-layer)
- $(meson_use vulkan-overlay vulkan-overlay-layer)
- --buildtype $(usex debug debug plain)
- -Db_ndebug=$(usex debug false true)
- )
- meson_src_configure
-}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_install() {
- meson_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-}
-
-multilib_src_test() {
- meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
- if [[ $1 == -- ]] || use $1; then
- shift
- DRI_DRIVERS+=("$@")
- fi
-}
-
-gallium_enable() {
- if [[ $1 == -- ]] || use $1; then
- shift
- GALLIUM_DRIVERS+=("$@")
- fi
-}
-
-vulkan_enable() {
- if [[ $1 == -- ]] || use $1; then
- shift
- VULKAN_DRIVERS+=("$@")
- fi
-}
diff --git a/media-libs/mesa/mesa-21.1.4-r1.ebuild b/media-libs/mesa/mesa-21.1.7.ebuild
index 0ae0768..242a045 100644
--- a/media-libs/mesa/mesa-21.1.4-r1.ebuild
+++ b/media-libs/mesa/mesa-21.1.7.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
- KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
fi
LICENSE="MIT"
@@ -510,6 +510,11 @@ multilib_src_configure() {
echo "${drivers//$'\n'/,}"
}
+ local vulkan_layers
+ use vulkan && vulkan_layers+="device-select"
+ use vulkan-overlay && vulkan_layers+=",overlay"
+ emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
emesonargs+=(
$(meson_use test build-tests)
-Dglx=$(usex X dri disabled)
@@ -526,8 +531,6 @@ multilib_src_configure() {
-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
- $(meson_use vulkan vulkan-device-select-layer)
- $(meson_use vulkan-overlay vulkan-overlay-layer)
--buildtype $(usex debug debug plain)
-Db_ndebug=$(usex debug false true)
)
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index f63a724..7aef093 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,5 +1,5 @@
DIST ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz 13490949 BLAKE2B 90007f2c4bac0e0a52b419d9333cf75b00e291f1ea7447cbdc579ee2f860de7c436c924253600f3fbd6e3faaabe97aaf46db083a5bbd2f5f03badcca5d643e89 SHA512 d3719253d674b16638b873545583b82fba3176803c81ba8bcb37e90456dd956f1c2ee8996493840cff2d61c6399f06ed0524a759f46e4ce174bce23e9c6eda4a
-DIST kodi-19.1.tar.gz 52323919 BLAKE2B 6aa82632d2d70e5f84340c572b586e903e7dbc50c4f99fc5118761d495bd13dcbbcd70462e6288147dd4a305952d1e07f08daf45bbc402b59e3ef785391e1fe7 SHA512 725cbc270259ef5d3b79f9bc271b789dc8ef6616a6d4038e0cd449755ca4ed25198ad6e854b304aedc1fb911ecb98a0aad1b3e469857f8aed54fc4634193eb75
+DIST kodi-19.3-Matrix.tar.gz 52354039 BLAKE2B 33d9f0081391fcc37d5f2548d92e0746540394db5e495dfd43fed3e68e776091b505ef4ef21a5fa4c3bef74793642d81ad270c58414ab995ab51a20af76ad530 SHA512 ccb8f26ff8a9ca0cec50e069ff9c658de89a868093a8da25d6a55317d68656de6fd7107c5348c545b4f3cdd541293cfd58f8d171877bfa7533d39e072df68c04
DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
diff --git a/media-tv/kodi/files/kodi-19.1-fmt-8.patch b/media-tv/kodi/files/kodi-19.1-fmt-8.patch
new file mode 100644
index 0000000..ea82d00
--- /dev/null
+++ b/media-tv/kodi/files/kodi-19.1-fmt-8.patch
@@ -0,0 +1,28 @@
+https://github.com/xbmc/xbmc/pull/19904
+
+From 18ff80a9c169fb969b75e2143d9f1f234b71a730 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Thu, 24 Jun 2021 20:41:11 -0400
+Subject: [PATCH] [utils] include fmt/xchar.h
+
+fmt 8 moved wchar/custom char overloads to xchar.h, so for fmt 8 compatibility, xchar.h must be included
+
+See https://github.com/fmtlib/fmt/commit/76ee490468212f8705a1421b4c88f8f814b2d351
+---
+ xbmc/utils/StringUtils.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/xbmc/utils/StringUtils.h b/xbmc/utils/StringUtils.h
+index ca6f82953d90a..2dc5c3f03af2f 100644
+--- a/xbmc/utils/StringUtils.h
++++ b/xbmc/utils/StringUtils.h
+@@ -36,6 +36,9 @@
+ #if FMT_VERSION >= 40000
+ #include <fmt/printf.h>
+ #endif
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
+
+ #include "XBDateTime.h"
+ #include "utils/params_check_macros.h"
diff --git a/media-tv/kodi/kodi-19.1.ebuild b/media-tv/kodi/kodi-19.3.ebuild
index 9cbf604..794ad4f 100644
--- a/media-tv/kodi/kodi-19.1.ebuild
+++ b/media-tv/kodi/kodi-19.3.ebuild
@@ -10,7 +10,7 @@ LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
FFMPEG_VERSION="4.3.2"
CODENAME="Matrix"
FFMPEG_KODI_VERSION="19.1"
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
@@ -24,12 +24,21 @@ else
MY_PV=${MY_PV/_alpha/a}
MY_PV=${MY_PV/_beta/b}
MY_PV=${MY_PV/_rc/RC}
+ MY_PV="${MY_PV}-${CODENAME}"
MY_P="${PN}-${MY_PV}"
SRC_URI+=" https://github.com/xbmc/xbmc/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm arm64 ~x86"
S=${WORKDIR}/xbmc-${MY_PV}
fi
+PATCHES=(
+ "${FILESDIR}/musl/19.0/0001-add-missing-stdint.h.patch"
+ "${FILESDIR}/musl/19.0/0002-fix-fileemu.patch"
+ "${FILESDIR}/musl/19.0/0003-Use-stdint.h-defined-types-uint8_t-uint16_t-uint32_t.patch"
+ "${FILESDIR}/musl/19.0/0004-Fix-ldt-for-musl.patch"
+ "${FILESDIR}/musl/19.0/0005-Fix-fortify-sources.patch"
+)
+
inherit autotools cmake desktop flag-o-matic linux-info pax-utils python-single-r1 xdg
DESCRIPTION="A free and open source media-player and entertainment hub"
@@ -62,7 +71,7 @@ RESTRICT="!test? ( test )"
COMMON_DEPEND="
>=dev-libs/lzo-2.04
- >=dev-libs/flatbuffers-1.12.0
+ >=dev-libs/flatbuffers-1.12.0:=
>=media-libs/libjpeg-turbo-2.0.4:=
>=media-libs/libpng-1.6.26:0=
"
@@ -84,8 +93,8 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
>=dev-libs/spdlog-1.5.0:=
dev-libs/tinyxml[stl]
$(python_gen_cond_dep '
- dev-python/pillow[${PYTHON_MULTI_USEDEP}]
- dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pycryptodome[${PYTHON_USEDEP}]
')
>=dev-libs/libcdio-2.1.0[cxx]
>=dev-libs/libfmt-6.1.2
@@ -119,7 +128,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
>=net-misc/curl-7.68.0[http2]
nfs? ( >=net-fs/libnfs-2.0.0:= )
!gles? ( media-libs/glu )
- >=dev-libs/openssl-1.0.2l:0=
+ >=dev-libs/openssl-1.1.1k:0=
raspberry-pi? (
|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] )
)
@@ -190,14 +199,6 @@ In some cases Kodi needs to access multicast addresses.
Please consider enabling IP_MULTICAST under Networking options.
"
-PATCHES=(
- "${FILESDIR}/musl/19.0/0001-add-missing-stdint.h.patch"
- "${FILESDIR}/musl/19.0/0002-fix-fileemu.patch"
- "${FILESDIR}/musl/19.0/0003-Use-stdint.h-defined-types-uint8_t-uint16_t-uint32_t.patch"
- "${FILESDIR}/musl/19.0/0004-Fix-ldt-for-musl.patch"
- "${FILESDIR}/musl/19.0/0005-Fix-fortify-sources.patch"
-)
-
pkg_setup() {
check_extra_config
python-single-r1_pkg_setup
@@ -240,10 +241,11 @@ src_prepare() {
|| die
# Required to prevent addons from crashing
- use elibc_musl && append-ldflags -Wl,-z,stack-size=1048576
+ use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
}
src_configure() {
+ filter-flags -fstack-protector-all
local platform=()
use gbm && platform+=( gbm )
use wayland && platform+=( wayland )
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest
deleted file mode 100644
index 2b80e39..0000000
--- a/net-analyzer/openbsd-netcat/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST netcat-openbsd_1.105-7.debian.tar.gz 31843 SHA256 eee759327ffea293e81d0dde67921b7fcfcad279ffd7a2c9d037bbc8f882b363 SHA512 ec507c858a9f0e75f5a8d6ee8e60eef5200428e55091e831a7acba6c61d70f97af01103c9b65354b0ce773214b0758d957852af793debb70be8aab5b5900b3f6 WHIRLPOOL 62878c51077b26578626f45e1282f2c1f16ae869714b355ef1797ec2911b8773ef07c81468e35bae02087f9f061b828be39200333c204e77b0bdb1ac9eceb957
-DIST netcat-openbsd_1.105.orig.tar.gz 14891 SHA256 40653fe66c1516876b61b07e093d826e2a5463c5d994f1b7e6ce328f3edb211e SHA512 1e515b5af83a12c6f270d6e8bede6406cc7c9f83ca0e316816508dfe2e2c49cda3fffb6b24a3922bf9908dc8b70d540eb8cc49e9cbfe867e49133c004d3f4703 WHIRLPOOL 7e80dde953575b5fc21399ef1d1d40c8cd6b40a5d6cd81d8a606d14b35ce8432c304d3e1bdaf9fb4697cf6dffc017b565cd60033ec0700d2442bc3ea3ca6aa9a
-DIST netcat-openbsd_1.190-2.debian.tar.xz 34836 BLAKE2B 3ff4390c07d05e8d1a19c8696da12bdc6bba07c6e88281b04cd7915509f44a14dda66462128da768b255d92f3a02d008750a860db9290f9f8e0e0bb9dd66e01b SHA512 c33510ad6761627e0b7e564747f6ae82c7569157bdc91f6a282a97b038b2b0917c27fdfba137462c7c34d84fcfdfe8b6393204884d153e3d200a86f5c6657a9a
-DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe6b66718dfca217f713a0d7016cb0a3c75c78580fbdd277bd7b5324371145c4b986ebb867e6f779cd61ffecb8e732ebabcb84 SHA512 32310813391f63b8283dc4a63e52821e464ecbfcd0ea995e8e15047c6252a86b31eb4725dc69b778594c43d6ce0cc081aa0f00d7cda0587c91941f20b93a33fe
-DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576be76f4f98392e1f455863fa3cdc06bde2714612819b7dfa98dd45c1739a65680469460410f5e4b2f4144f4c24fea04b59dda4d0da SHA512 2a5cc6d04112fdde007be4b9adb3aee44060570c0cb2ae0e33e54af3d37c0b2ff4d6c96edf1f16047365106c7c3720195b38417af3c332226c9be81d49caa552
-DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e42700e2b3ee888d946a09503a22fa3bcbc2c73658f38787314bef628d609ad370223f6889b7019760bf51817f73fc570e1dcc SHA512 ea95cda028f2759835ea8832db0174c178b002d5a917f4c51594445a5377a30d6114ac261071eea98d3d0b60ae1ec72102609db1625dbc5a6e57c67e28d2ff51
diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-b64_ntop.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-b64_ntop.patch
deleted file mode 100644
index a9603b3..0000000
--- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-b64_ntop.patch
+++ /dev/null
@@ -1,349 +0,0 @@
-diff -Naur netcat-openbsd-1.105.orig/Makefile netcat-openbsd-1.105/Makefile
---- netcat-openbsd-1.105.orig/Makefile 2017-06-18 09:01:44.293852659 -0700
-+++ netcat-openbsd-1.105/Makefile 2017-06-18 09:04:35.566687655 -0700
-@@ -1,7 +1,7 @@
- # $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $
-
- PROG= nc
--SRCS= netcat.c atomicio.c socks.c
-+SRCS= netcat.c atomicio.c socks.c compat/base64.c
-
- LIBS= `pkg-config --libs libbsd` -lresolv
- OBJS= $(SRCS:.c=.o)
-diff -Naur netcat-openbsd-1.105.orig/compat/base64.c netcat-openbsd-1.105/compat/base64.c
---- netcat-openbsd-1.105.orig/compat/base64.c 1969-12-31 16:00:00.000000000 -0800
-+++ netcat-openbsd-1.105/compat/base64.c 2017-06-18 09:01:31.288700637 -0700
-@@ -0,0 +1,315 @@
-+/* $OpenBSD: base64.c,v 1.8 2015/01/16 16:48:51 deraadt Exp $ */
-+
-+/*
-+ * Copyright (c) 1996 by Internet Software Consortium.
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
-+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
-+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-+ * SOFTWARE.
-+ */
-+
-+/*
-+ * Portions Copyright (c) 1995 by International Business Machines, Inc.
-+ *
-+ * International Business Machines, Inc. (hereinafter called IBM) grants
-+ * permission under its copyrights to use, copy, modify, and distribute this
-+ * Software with or without fee, provided that the above copyright notice and
-+ * all paragraphs of this notice appear in all copies, and that the name of IBM
-+ * not be used in connection with the marketing of any product incorporating
-+ * the Software or modifications thereof, without specific, written prior
-+ * permission.
-+ *
-+ * To the extent it has a right to do so, IBM grants an immunity from suit
-+ * under its patents, if any, for the use, sale or manufacture of products to
-+ * the extent that such products are used for performing Domain Name System
-+ * dynamic updates in TCP/IP networks by means of the Software. No immunity is
-+ * granted for any product per se or for any other function of any product.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
-+ * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
-+ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
-+ */
-+
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <arpa/nameser.h>
-+
-+#include <ctype.h>
-+#include <resolv.h>
-+#include <stdio.h>
-+
-+#include <stdlib.h>
-+#include <string.h>
-+
-+static const char Base64[] =
-+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-+static const char Pad64 = '=';
-+
-+/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
-+ The following encoding technique is taken from RFC 1521 by Borenstein
-+ and Freed. It is reproduced here in a slightly edited form for
-+ convenience.
-+
-+ A 65-character subset of US-ASCII is used, enabling 6 bits to be
-+ represented per printable character. (The extra 65th character, "=",
-+ is used to signify a special processing function.)
-+
-+ The encoding process represents 24-bit groups of input bits as output
-+ strings of 4 encoded characters. Proceeding from left to right, a
-+ 24-bit input group is formed by concatenating 3 8-bit input groups.
-+ These 24 bits are then treated as 4 concatenated 6-bit groups, each
-+ of which is translated into a single digit in the base64 alphabet.
-+
-+ Each 6-bit group is used as an index into an array of 64 printable
-+ characters. The character referenced by the index is placed in the
-+ output string.
-+
-+ Table 1: The Base64 Alphabet
-+
-+ Value Encoding Value Encoding Value Encoding Value Encoding
-+ 0 A 17 R 34 i 51 z
-+ 1 B 18 S 35 j 52 0
-+ 2 C 19 T 36 k 53 1
-+ 3 D 20 U 37 l 54 2
-+ 4 E 21 V 38 m 55 3
-+ 5 F 22 W 39 n 56 4
-+ 6 G 23 X 40 o 57 5
-+ 7 H 24 Y 41 p 58 6
-+ 8 I 25 Z 42 q 59 7
-+ 9 J 26 a 43 r 60 8
-+ 10 K 27 b 44 s 61 9
-+ 11 L 28 c 45 t 62 +
-+ 12 M 29 d 46 u 63 /
-+ 13 N 30 e 47 v
-+ 14 O 31 f 48 w (pad) =
-+ 15 P 32 g 49 x
-+ 16 Q 33 h 50 y
-+
-+ Special processing is performed if fewer than 24 bits are available
-+ at the end of the data being encoded. A full encoding quantum is
-+ always completed at the end of a quantity. When fewer than 24 input
-+ bits are available in an input group, zero bits are added (on the
-+ right) to form an integral number of 6-bit groups. Padding at the
-+ end of the data is performed using the '=' character.
-+
-+ Since all base64 input is an integral number of octets, only the
-+ -------------------------------------------------
-+ following cases can arise:
-+
-+ (1) the final quantum of encoding input is an integral
-+ multiple of 24 bits; here, the final unit of encoded
-+ output will be an integral multiple of 4 characters
-+ with no "=" padding,
-+ (2) the final quantum of encoding input is exactly 8 bits;
-+ here, the final unit of encoded output will be two
-+ characters followed by two "=" padding characters, or
-+ (3) the final quantum of encoding input is exactly 16 bits;
-+ here, the final unit of encoded output will be three
-+ characters followed by one "=" padding character.
-+ */
-+
-+int
-+b64_ntop(src, srclength, target, targsize)
-+ u_char const *src;
-+ size_t srclength;
-+ char *target;
-+ size_t targsize;
-+{
-+ size_t datalength = 0;
-+ u_char input[3];
-+ u_char output[4];
-+ int i;
-+
-+ while (2 < srclength) {
-+ input[0] = *src++;
-+ input[1] = *src++;
-+ input[2] = *src++;
-+ srclength -= 3;
-+
-+ output[0] = input[0] >> 2;
-+ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-+ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-+ output[3] = input[2] & 0x3f;
-+
-+ if (datalength + 4 > targsize)
-+ return (-1);
-+ target[datalength++] = Base64[output[0]];
-+ target[datalength++] = Base64[output[1]];
-+ target[datalength++] = Base64[output[2]];
-+ target[datalength++] = Base64[output[3]];
-+ }
-+
-+ /* Now we worry about padding. */
-+ if (0 != srclength) {
-+ /* Get what's left. */
-+ input[0] = input[1] = input[2] = '\0';
-+ for (i = 0; i < srclength; i++)
-+ input[i] = *src++;
-+
-+ output[0] = input[0] >> 2;
-+ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-+ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-+
-+ if (datalength + 4 > targsize)
-+ return (-1);
-+ target[datalength++] = Base64[output[0]];
-+ target[datalength++] = Base64[output[1]];
-+ if (srclength == 1)
-+ target[datalength++] = Pad64;
-+ else
-+ target[datalength++] = Base64[output[2]];
-+ target[datalength++] = Pad64;
-+ }
-+ if (datalength >= targsize)
-+ return (-1);
-+ target[datalength] = '\0'; /* Returned value doesn't count \0. */
-+ return (datalength);
-+}
-+
-+/* skips all whitespace anywhere.
-+ converts characters, four at a time, starting at (or after)
-+ src from base - 64 numbers into three 8 bit bytes in the target area.
-+ it returns the number of data bytes stored at the target, or -1 on error.
-+ */
-+
-+int
-+b64_pton(src, target, targsize)
-+ char const *src;
-+ u_char *target;
-+ size_t targsize;
-+{
-+ int tarindex, state, ch;
-+ u_char nextbyte;
-+ char *pos;
-+
-+ state = 0;
-+ tarindex = 0;
-+
-+ while ((ch = (unsigned char)*src++) != '\0') {
-+ if (isspace(ch)) /* Skip whitespace anywhere. */
-+ continue;
-+
-+ if (ch == Pad64)
-+ break;
-+
-+ pos = strchr(Base64, ch);
-+ if (pos == 0) /* A non-base64 character. */
-+ return (-1);
-+
-+ switch (state) {
-+ case 0:
-+ if (target) {
-+ if (tarindex >= targsize)
-+ return (-1);
-+ target[tarindex] = (pos - Base64) << 2;
-+ }
-+ state = 1;
-+ break;
-+ case 1:
-+ if (target) {
-+ if (tarindex >= targsize)
-+ return (-1);
-+ target[tarindex] |= (pos - Base64) >> 4;
-+ nextbyte = ((pos - Base64) & 0x0f) << 4;
-+ if (tarindex + 1 < targsize)
-+ target[tarindex+1] = nextbyte;
-+ else if (nextbyte)
-+ return (-1);
-+ }
-+ tarindex++;
-+ state = 2;
-+ break;
-+ case 2:
-+ if (target) {
-+ if (tarindex >= targsize)
-+ return (-1);
-+ target[tarindex] |= (pos - Base64) >> 2;
-+ nextbyte = ((pos - Base64) & 0x03) << 6;
-+ if (tarindex + 1 < targsize)
-+ target[tarindex+1] = nextbyte;
-+ else if (nextbyte)
-+ return (-1);
-+ }
-+ tarindex++;
-+ state = 3;
-+ break;
-+ case 3:
-+ if (target) {
-+ if (tarindex >= targsize)
-+ return (-1);
-+ target[tarindex] |= (pos - Base64);
-+ }
-+ tarindex++;
-+ state = 0;
-+ break;
-+ }
-+ }
-+
-+ /*
-+ * We are done decoding Base-64 chars. Let's see if we ended
-+ * on a byte boundary, and/or with erroneous trailing characters.
-+ */
-+
-+ if (ch == Pad64) { /* We got a pad char. */
-+ ch = (unsigned char)*src++; /* Skip it, get next. */
-+ switch (state) {
-+ case 0: /* Invalid = in first position */
-+ case 1: /* Invalid = in second position */
-+ return (-1);
-+
-+ case 2: /* Valid, means one byte of info */
-+ /* Skip any number of spaces. */
-+ for (; ch != '\0'; ch = (unsigned char)*src++)
-+ if (!isspace(ch))
-+ break;
-+ /* Make sure there is another trailing = sign. */
-+ if (ch != Pad64)
-+ return (-1);
-+ ch = (unsigned char)*src++; /* Skip the = */
-+ /* Fall through to "single trailing =" case. */
-+ /* FALLTHROUGH */
-+
-+ case 3: /* Valid, means two bytes of info */
-+ /*
-+ * We know this char is an =. Is there anything but
-+ * whitespace after it?
-+ */
-+ for (; ch != '\0'; ch = (unsigned char)*src++)
-+ if (!isspace(ch))
-+ return (-1);
-+
-+ /*
-+ * Now make sure for cases 2 and 3 that the "extra"
-+ * bits that slopped past the last full byte were
-+ * zeros. If we don't check them, they become a
-+ * subliminal channel.
-+ */
-+ if (target && tarindex < targsize &&
-+ target[tarindex] != 0)
-+ return (-1);
-+ }
-+ } else {
-+ /*
-+ * We ended by seeing the end of the string. Make sure we
-+ * have no partial bytes lying around.
-+ */
-+ if (state != 0)
-+ return (-1);
-+ }
-+
-+ return (tarindex);
-+}
-diff -Naur netcat-openbsd-1.105.orig/compat/base64.h netcat-openbsd-1.105/compat/base64.h
---- netcat-openbsd-1.105.orig/compat/base64.h 1969-12-31 16:00:00.000000000 -0800
-+++ netcat-openbsd-1.105/compat/base64.h 2017-06-18 09:09:02.057554167 -0700
-@@ -0,0 +1,3 @@
-+#include <sys/types.h>
-+int b64_ntop(u_char const* src, size_t srclength, char *target, size_t targsize);
-+int b64_pton(char const* src, u_char *target, size_t targsize);
-diff -Naur netcat-openbsd-1.105.orig/socks.c netcat-openbsd-1.105/socks.c
---- netcat-openbsd-1.105.orig/socks.c 2017-06-18 09:01:44.293852659 -0700
-+++ netcat-openbsd-1.105/socks.c 2017-06-18 09:09:21.105757665 -0700
-@@ -40,6 +40,7 @@
- #include <resolv.h>
- #include <bsd/readpassphrase.h>
- #include "atomicio.h"
-+#include "compat/base64.h"
-
- #define SOCKS_PORT "1080"
- #define HTTP_PROXY_PORT "3128"
diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch
deleted file mode 100644
index 8c68a66..0000000
--- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Allow compilation on Darwin
-
---- netcat.c
-+++ netcat.c
-@@ -43,11 +43,13 @@
- #include <arpa/telnet.h>
- #include <arpa/inet.h>
-
-+#ifndef IPTOS_LOWCOST
-+# define IPTOS_LOWCOST 0x02
-+#endif
- #ifndef IPTOS_LOWDELAY
- # define IPTOS_LOWDELAY 0x10
- # define IPTOS_THROUGHPUT 0x08
- # define IPTOS_RELIABILITY 0x04
--# define IPTOS_LOWCOST 0x02
- # define IPTOS_MINCOST IPTOS_LOWCOST
- #endif /* IPTOS_LOWDELAY */
-
-@@ -96,8 +98,9 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <limits.h>
--#include <bsd/stdlib.h>
--#include <bsd/string.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <ctype.h>
- #include "atomicio.h"
-
- #ifndef SUN_LEN
-@@ -169,6 +172,43 @@
- socklen_t salen, int ctimeout);
- static void quit();
-
-+static char* strtonumerrs[] = {
-+ "too large",
-+ "too small",
-+ "invalid"
-+};
-+
-+static long long
-+strtonum(
-+ const char *nptr,
-+ long long minval,
-+ long long maxval,
-+ const char **errstr)
-+{
-+ long long val;
-+
-+ while (*nptr != '\0' && isspace(*nptr))
-+ nptr++;
-+ if (*nptr == '\0') {
-+ if (errstr != NULL)
-+ *errstr = strtonumerrs[2];
-+ return 0;
-+ }
-+ val = atoll(nptr);
-+ if (val < minval) {
-+ if (errstr != NULL)
-+ *errstr = strtonumerrs[1];
-+ return 0;
-+ }
-+ if (val > maxval) {
-+ if (errstr != NULL)
-+ *errstr = strtonumerrs[0];
-+ return 0;
-+ }
-+ *errstr = NULL;
-+ return val;
-+}
-+
- int
- main(int argc, char *argv[])
- {
---- socks.c
-+++ socks.c
-@@ -38,7 +38,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <resolv.h>
--#include <bsd/readpassphrase.h>
-+#include <readpassphrase.h>
- #include "atomicio.h"
-
- #define SOCKS_PORT "1080"
diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-b64_ntop.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-b64_ntop.patch
deleted file mode 100644
index a9603b3..0000000
--- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-b64_ntop.patch
+++ /dev/null
@@ -1,349 +0,0 @@
-diff -Naur netcat-openbsd-1.105.orig/Makefile netcat-openbsd-1.105/Makefile
---- netcat-openbsd-1.105.orig/Makefile 2017-06-18 09:01:44.293852659 -0700
-+++ netcat-openbsd-1.105/Makefile 2017-06-18 09:04:35.566687655 -0700
-@@ -1,7 +1,7 @@
- # $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $
-
- PROG= nc
--SRCS= netcat.c atomicio.c socks.c
-+SRCS= netcat.c atomicio.c socks.c compat/base64.c
-
- LIBS= `pkg-config --libs libbsd` -lresolv
- OBJS= $(SRCS:.c=.o)
-diff -Naur netcat-openbsd-1.105.orig/compat/base64.c netcat-openbsd-1.105/compat/base64.c
---- netcat-openbsd-1.105.orig/compat/base64.c 1969-12-31 16:00:00.000000000 -0800
-+++ netcat-openbsd-1.105/compat/base64.c 2017-06-18 09:01:31.288700637 -0700
-@@ -0,0 +1,315 @@
-+/* $OpenBSD: base64.c,v 1.8 2015/01/16 16:48:51 deraadt Exp $ */
-+
-+/*
-+ * Copyright (c) 1996 by Internet Software Consortium.
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
-+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
-+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-+ * SOFTWARE.
-+ */
-+
-+/*
-+ * Portions Copyright (c) 1995 by International Business Machines, Inc.
-+ *
-+ * International Business Machines, Inc. (hereinafter called IBM) grants
-+ * permission under its copyrights to use, copy, modify, and distribute this
-+ * Software with or without fee, provided that the above copyright notice and
-+ * all paragraphs of this notice appear in all copies, and that the name of IBM
-+ * not be used in connection with the marketing of any product incorporating
-+ * the Software or modifications thereof, without specific, written prior
-+ * permission.
-+ *
-+ * To the extent it has a right to do so, IBM grants an immunity from suit
-+ * under its patents, if any, for the use, sale or manufacture of products to
-+ * the extent that such products are used for performing Domain Name System
-+ * dynamic updates in TCP/IP networks by means of the Software. No immunity is
-+ * granted for any product per se or for any other function of any product.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
-+ * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
-+ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
-+ */
-+
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <arpa/nameser.h>
-+
-+#include <ctype.h>
-+#include <resolv.h>
-+#include <stdio.h>
-+
-+#include <stdlib.h>
-+#include <string.h>
-+
-+static const char Base64[] =
-+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-+static const char Pad64 = '=';
-+
-+/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
-+ The following encoding technique is taken from RFC 1521 by Borenstein
-+ and Freed. It is reproduced here in a slightly edited form for
-+ convenience.
-+
-+ A 65-character subset of US-ASCII is used, enabling 6 bits to be
-+ represented per printable character. (The extra 65th character, "=",
-+ is used to signify a special processing function.)
-+
-+ The encoding process represents 24-bit groups of input bits as output
-+ strings of 4 encoded characters. Proceeding from left to right, a
-+ 24-bit input group is formed by concatenating 3 8-bit input groups.
-+ These 24 bits are then treated as 4 concatenated 6-bit groups, each
-+ of which is translated into a single digit in the base64 alphabet.
-+
-+ Each 6-bit group is used as an index into an array of 64 printable
-+ characters. The character referenced by the index is placed in the
-+ output string.
-+
-+ Table 1: The Base64 Alphabet
-+
-+ Value Encoding Value Encoding Value Encoding Value Encoding
-+ 0 A 17 R 34 i 51 z
-+ 1 B 18 S 35 j 52 0
-+ 2 C 19 T 36 k 53 1
-+ 3 D 20 U 37 l 54 2
-+ 4 E 21 V 38 m 55 3
-+ 5 F 22 W 39 n 56 4
-+ 6 G 23 X 40 o 57 5
-+ 7 H 24 Y 41 p 58 6
-+ 8 I 25 Z 42 q 59 7
-+ 9 J 26 a 43 r 60 8
-+ 10 K 27 b 44 s 61 9
-+ 11 L 28 c 45 t 62 +
-+ 12 M 29 d 46 u 63 /
-+ 13 N 30 e 47 v
-+ 14 O 31 f 48 w (pad) =
-+ 15 P 32 g 49 x
-+ 16 Q 33 h 50 y
-+
-+ Special processing is performed if fewer than 24 bits are available
-+ at the end of the data being encoded. A full encoding quantum is
-+ always completed at the end of a quantity. When fewer than 24 input
-+ bits are available in an input group, zero bits are added (on the
-+ right) to form an integral number of 6-bit groups. Padding at the
-+ end of the data is performed using the '=' character.
-+
-+ Since all base64 input is an integral number of octets, only the
-+ -------------------------------------------------
-+ following cases can arise:
-+
-+ (1) the final quantum of encoding input is an integral
-+ multiple of 24 bits; here, the final unit of encoded
-+ output will be an integral multiple of 4 characters
-+ with no "=" padding,
-+ (2) the final quantum of encoding input is exactly 8 bits;
-+ here, the final unit of encoded output will be two
-+ characters followed by two "=" padding characters, or
-+ (3) the final quantum of encoding input is exactly 16 bits;
-+ here, the final unit of encoded output will be three
-+ characters followed by one "=" padding character.
-+ */
-+
-+int
-+b64_ntop(src, srclength, target, targsize)
-+ u_char const *src;
-+ size_t srclength;
-+ char *target;
-+ size_t targsize;
-+{
-+ size_t datalength = 0;
-+ u_char input[3];
-+ u_char output[4];
-+ int i;
-+
-+ while (2 < srclength) {
-+ input[0] = *src++;
-+ input[1] = *src++;
-+ input[2] = *src++;
-+ srclength -= 3;
-+
-+ output[0] = input[0] >> 2;
-+ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-+ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-+ output[3] = input[2] & 0x3f;
-+
-+ if (datalength + 4 > targsize)
-+ return (-1);
-+ target[datalength++] = Base64[output[0]];
-+ target[datalength++] = Base64[output[1]];
-+ target[datalength++] = Base64[output[2]];
-+ target[datalength++] = Base64[output[3]];
-+ }
-+
-+ /* Now we worry about padding. */
-+ if (0 != srclength) {
-+ /* Get what's left. */
-+ input[0] = input[1] = input[2] = '\0';
-+ for (i = 0; i < srclength; i++)
-+ input[i] = *src++;
-+
-+ output[0] = input[0] >> 2;
-+ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-+ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-+
-+ if (datalength + 4 > targsize)
-+ return (-1);
-+ target[datalength++] = Base64[output[0]];
-+ target[datalength++] = Base64[output[1]];
-+ if (srclength == 1)
-+ target[datalength++] = Pad64;
-+ else
-+ target[datalength++] = Base64[output[2]];
-+ target[datalength++] = Pad64;
-+ }
-+ if (datalength >= targsize)
-+ return (-1);
-+ target[datalength] = '\0'; /* Returned value doesn't count \0. */
-+ return (datalength);
-+}
-+
-+/* skips all whitespace anywhere.
-+ converts characters, four at a time, starting at (or after)
-+ src from base - 64 numbers into three 8 bit bytes in the target area.
-+ it returns the number of data bytes stored at the target, or -1 on error.
-+ */
-+
-+int
-+b64_pton(src, target, targsize)
-+ char const *src;
-+ u_char *target;
-+ size_t targsize;
-+{
-+ int tarindex, state, ch;
-+ u_char nextbyte;
-+ char *pos;
-+
-+ state = 0;
-+ tarindex = 0;
-+
-+ while ((ch = (unsigned char)*src++) != '\0') {
-+ if (isspace(ch)) /* Skip whitespace anywhere. */
-+ continue;
-+
-+ if (ch == Pad64)
-+ break;
-+
-+ pos = strchr(Base64, ch);
-+ if (pos == 0) /* A non-base64 character. */
-+ return (-1);
-+
-+ switch (state) {
-+ case 0:
-+ if (target) {
-+ if (tarindex >= targsize)
-+ return (-1);
-+ target[tarindex] = (pos - Base64) << 2;
-+ }
-+ state = 1;
-+ break;
-+ case 1:
-+ if (target) {
-+ if (tarindex >= targsize)
-+ return (-1);
-+ target[tarindex] |= (pos - Base64) >> 4;
-+ nextbyte = ((pos - Base64) & 0x0f) << 4;
-+ if (tarindex + 1 < targsize)
-+ target[tarindex+1] = nextbyte;
-+ else if (nextbyte)
-+ return (-1);
-+ }
-+ tarindex++;
-+ state = 2;
-+ break;
-+ case 2:
-+ if (target) {
-+ if (tarindex >= targsize)
-+ return (-1);
-+ target[tarindex] |= (pos - Base64) >> 2;
-+ nextbyte = ((pos - Base64) & 0x03) << 6;
-+ if (tarindex + 1 < targsize)
-+ target[tarindex+1] = nextbyte;
-+ else if (nextbyte)
-+ return (-1);
-+ }
-+ tarindex++;
-+ state = 3;
-+ break;
-+ case 3:
-+ if (target) {
-+ if (tarindex >= targsize)
-+ return (-1);
-+ target[tarindex] |= (pos - Base64);
-+ }
-+ tarindex++;
-+ state = 0;
-+ break;
-+ }
-+ }
-+
-+ /*
-+ * We are done decoding Base-64 chars. Let's see if we ended
-+ * on a byte boundary, and/or with erroneous trailing characters.
-+ */
-+
-+ if (ch == Pad64) { /* We got a pad char. */
-+ ch = (unsigned char)*src++; /* Skip it, get next. */
-+ switch (state) {
-+ case 0: /* Invalid = in first position */
-+ case 1: /* Invalid = in second position */
-+ return (-1);
-+
-+ case 2: /* Valid, means one byte of info */
-+ /* Skip any number of spaces. */
-+ for (; ch != '\0'; ch = (unsigned char)*src++)
-+ if (!isspace(ch))
-+ break;
-+ /* Make sure there is another trailing = sign. */
-+ if (ch != Pad64)
-+ return (-1);
-+ ch = (unsigned char)*src++; /* Skip the = */
-+ /* Fall through to "single trailing =" case. */
-+ /* FALLTHROUGH */
-+
-+ case 3: /* Valid, means two bytes of info */
-+ /*
-+ * We know this char is an =. Is there anything but
-+ * whitespace after it?
-+ */
-+ for (; ch != '\0'; ch = (unsigned char)*src++)
-+ if (!isspace(ch))
-+ return (-1);
-+
-+ /*
-+ * Now make sure for cases 2 and 3 that the "extra"
-+ * bits that slopped past the last full byte were
-+ * zeros. If we don't check them, they become a
-+ * subliminal channel.
-+ */
-+ if (target && tarindex < targsize &&
-+ target[tarindex] != 0)
-+ return (-1);
-+ }
-+ } else {
-+ /*
-+ * We ended by seeing the end of the string. Make sure we
-+ * have no partial bytes lying around.
-+ */
-+ if (state != 0)
-+ return (-1);
-+ }
-+
-+ return (tarindex);
-+}
-diff -Naur netcat-openbsd-1.105.orig/compat/base64.h netcat-openbsd-1.105/compat/base64.h
---- netcat-openbsd-1.105.orig/compat/base64.h 1969-12-31 16:00:00.000000000 -0800
-+++ netcat-openbsd-1.105/compat/base64.h 2017-06-18 09:09:02.057554167 -0700
-@@ -0,0 +1,3 @@
-+#include <sys/types.h>
-+int b64_ntop(u_char const* src, size_t srclength, char *target, size_t targsize);
-+int b64_pton(char const* src, u_char *target, size_t targsize);
-diff -Naur netcat-openbsd-1.105.orig/socks.c netcat-openbsd-1.105/socks.c
---- netcat-openbsd-1.105.orig/socks.c 2017-06-18 09:01:44.293852659 -0700
-+++ netcat-openbsd-1.105/socks.c 2017-06-18 09:09:21.105757665 -0700
-@@ -40,6 +40,7 @@
- #include <resolv.h>
- #include <bsd/readpassphrase.h>
- #include "atomicio.h"
-+#include "compat/base64.h"
-
- #define SOCKS_PORT "1080"
- #define HTTP_PROXY_PORT "3128"
diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.195-b64_ntop.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.195-b64_ntop.patch
deleted file mode 100644
index a9603b3..0000000
--- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.195-b64_ntop.patch
+++ /dev/null
@@ -1,349 +0,0 @@
-diff -Naur netcat-openbsd-1.105.orig/Makefile netcat-openbsd-1.105/Makefile
---- netcat-openbsd-1.105.orig/Makefile 2017-06-18 09:01:44.293852659 -0700
-+++ netcat-openbsd-1.105/Makefile 2017-06-18 09:04:35.566687655 -0700
-@@ -1,7 +1,7 @@
- # $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $
-
- PROG= nc
--SRCS= netcat.c atomicio.c socks.c
-+SRCS= netcat.c atomicio.c socks.c compat/base64.c
-
- LIBS= `pkg-config --libs libbsd` -lresolv
- OBJS= $(SRCS:.c=.o)
-diff -Naur netcat-openbsd-1.105.orig/compat/base64.c netcat-openbsd-1.105/compat/base64.c
---- netcat-openbsd-1.105.orig/compat/base64.c 1969-12-31 16:00:00.000000000 -0800
-+++ netcat-openbsd-1.105/compat/base64.c 2017-06-18 09:01:31.288700637 -0700
-@@ -0,0 +1,315 @@
-+/* $OpenBSD: base64.c,v 1.8 2015/01/16 16:48:51 deraadt Exp $ */
-+
-+/*
-+ * Copyright (c) 1996 by Internet Software Consortium.
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
-+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
-+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-+ * SOFTWARE.
-+ */
-+
-+/*
-+ * Portions Copyright (c) 1995 by International Business Machines, Inc.
-+ *
-+ * International Business Machines, Inc. (hereinafter called IBM) grants
-+ * permission under its copyrights to use, copy, modify, and distribute this
-+ * Software with or without fee, provided that the above copyright notice and
-+ * all paragraphs of this notice appear in all copies, and that the name of IBM
-+ * not be used in connection with the marketing of any product incorporating
-+ * the Software or modifications thereof, without specific, written prior
-+ * permission.
-+ *
-+ * To the extent it has a right to do so, IBM grants an immunity from suit
-+ * under its patents, if any, for the use, sale or manufacture of products to
-+ * the extent that such products are used for performing Domain Name System
-+ * dynamic updates in TCP/IP networks by means of the Software. No immunity is
-+ * granted for any product per se or for any other function of any product.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
-+ * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
-+ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
-+ */
-+
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <arpa/nameser.h>
-+
-+#include <ctype.h>
-+#include <resolv.h>
-+#include <stdio.h>
-+
-+#include <stdlib.h>
-+#include <string.h>
-+
-+static const char Base64[] =
-+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-+static const char Pad64 = '=';
-+
-+/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
-+ The following encoding technique is taken from RFC 1521 by Borenstein
-+ and Freed. It is reproduced here in a slightly edited form for
-+ convenience.
-+
-+ A 65-character subset of US-ASCII is used, enabling 6 bits to be
-+ represented per printable character. (The extra 65th character, "=",
-+ is used to signify a special processing function.)
-+
-+ The encoding process represents 24-bit groups of input bits as output
-+ strings of 4 encoded characters. Proceeding from left to right, a
-+ 24-bit input group is formed by concatenating 3 8-bit input groups.
-+ These 24 bits are then treated as 4 concatenated 6-bit groups, each
-+ of which is translated into a single digit in the base64 alphabet.
-+
-+ Each 6-bit group is used as an index into an array of 64 printable
-+ characters. The character referenced by the index is placed in the
-+ output string.
-+
-+ Table 1: The Base64 Alphabet
-+
-+ Value Encoding Value Encoding Value Encoding Value Encoding
-+ 0 A 17 R 34 i 51 z
-+ 1 B 18 S 35 j 52 0
-+ 2 C 19 T 36 k 53 1
-+ 3 D 20 U 37 l 54 2
-+ 4 E 21 V 38 m 55 3
-+ 5 F 22 W 39 n 56 4
-+ 6 G 23 X 40 o 57 5
-+ 7 H 24 Y 41 p 58 6
-+ 8 I 25 Z 42 q 59 7
-+ 9 J 26 a 43 r 60 8
-+ 10 K 27 b 44 s 61 9
-+ 11 L 28 c 45 t 62 +
-+ 12 M 29 d 46 u 63 /
-+ 13 N 30 e 47 v
-+ 14 O 31 f 48 w (pad) =
-+ 15 P 32 g 49 x
-+ 16 Q 33 h 50 y
-+
-+ Special processing is performed if fewer than 24 bits are available
-+ at the end of the data being encoded. A full encoding quantum is
-+ always completed at the end of a quantity. When fewer than 24 input
-+ bits are available in an input group, zero bits are added (on the
-+ right) to form an integral number of 6-bit groups. Padding at the
-+ end of the data is performed using the '=' character.
-+
-+ Since all base64 input is an integral number of octets, only the
-+ -------------------------------------------------
-+ following cases can arise:
-+
-+ (1) the final quantum of encoding input is an integral
-+ multiple of 24 bits; here, the final unit of encoded
-+ output will be an integral multiple of 4 characters
-+ with no "=" padding,
-+ (2) the final quantum of encoding input is exactly 8 bits;
-+ here, the final unit of encoded output will be two
-+ characters followed by two "=" padding characters, or
-+ (3) the final quantum of encoding input is exactly 16 bits;
-+ here, the final unit of encoded output will be three
-+ characters followed by one "=" padding character.
-+ */
-+
-+int
-+b64_ntop(src, srclength, target, targsize)
-+ u_char const *src;
-+ size_t srclength;
-+ char *target;
-+ size_t targsize;
-+{
-+ size_t datalength = 0;
-+ u_char input[3];
-+ u_char output[4];
-+ int i;
-+
-+ while (2 < srclength) {
-+ input[0] = *src++;
-+ input[1] = *src++;
-+ input[2] = *src++;
-+ srclength -= 3;
-+
-+ output[0] = input[0] >> 2;
-+ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-+ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-+ output[3] = input[2] & 0x3f;
-+
-+ if (datalength + 4 > targsize)
-+ return (-1);
-+ target[datalength++] = Base64[output[0]];
-+ target[datalength++] = Base64[output[1]];
-+ target[datalength++] = Base64[output[2]];
-+ target[datalength++] = Base64[output[3]];
-+ }
-+
-+ /* Now we worry about padding. */
-+ if (0 != srclength) {
-+ /* Get what's left. */
-+ input[0] = input[1] = input[2] = '\0';
-+ for (i = 0; i < srclength; i++)
-+ input[i] = *src++;
-+
-+ output[0] = input[0] >> 2;
-+ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-+ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-+
-+ if (datalength + 4 > targsize)
-+ return (-1);
-+ target[datalength++] = Base64[output[0]];
-+ target[datalength++] = Base64[output[1]];
-+ if (srclength == 1)
-+ target[datalength++] = Pad64;
-+ else
-+ target[datalength++] = Base64[output[2]];
-+ target[datalength++] = Pad64;
-+ }
-+ if (datalength >= targsize)
-+ return (-1);
-+ target[datalength] = '\0'; /* Returned value doesn't count \0. */
-+ return (datalength);
-+}
-+
-+/* skips all whitespace anywhere.
-+ converts characters, four at a time, starting at (or after)
-+ src from base - 64 numbers into three 8 bit bytes in the target area.
-+ it returns the number of data bytes stored at the target, or -1 on error.
-+ */
-+
-+int
-+b64_pton(src, target, targsize)
-+ char const *src;
-+ u_char *target;
-+ size_t targsize;
-+{
-+ int tarindex, state, ch;
-+ u_char nextbyte;
-+ char *pos;
-+
-+ state = 0;
-+ tarindex = 0;
-+
-+ while ((ch = (unsigned char)*src++) != '\0') {
-+ if (isspace(ch)) /* Skip whitespace anywhere. */
-+ continue;
-+
-+ if (ch == Pad64)
-+ break;
-+
-+ pos = strchr(Base64, ch);
-+ if (pos == 0) /* A non-base64 character. */
-+ return (-1);
-+
-+ switch (state) {
-+ case 0:
-+ if (target) {
-+ if (tarindex >= targsize)
-+ return (-1);
-+ target[tarindex] = (pos - Base64) << 2;
-+ }
-+ state = 1;
-+ break;
-+ case 1:
-+ if (target) {
-+ if (tarindex >= targsize)
-+ return (-1);
-+ target[tarindex] |= (pos - Base64) >> 4;
-+ nextbyte = ((pos - Base64) & 0x0f) << 4;
-+ if (tarindex + 1 < targsize)
-+ target[tarindex+1] = nextbyte;
-+ else if (nextbyte)
-+ return (-1);
-+ }
-+ tarindex++;
-+ state = 2;
-+ break;
-+ case 2:
-+ if (target) {
-+ if (tarindex >= targsize)
-+ return (-1);
-+ target[tarindex] |= (pos - Base64) >> 2;
-+ nextbyte = ((pos - Base64) & 0x03) << 6;
-+ if (tarindex + 1 < targsize)
-+ target[tarindex+1] = nextbyte;
-+ else if (nextbyte)
-+ return (-1);
-+ }
-+ tarindex++;
-+ state = 3;
-+ break;
-+ case 3:
-+ if (target) {
-+ if (tarindex >= targsize)
-+ return (-1);
-+ target[tarindex] |= (pos - Base64);
-+ }
-+ tarindex++;
-+ state = 0;
-+ break;
-+ }
-+ }
-+
-+ /*
-+ * We are done decoding Base-64 chars. Let's see if we ended
-+ * on a byte boundary, and/or with erroneous trailing characters.
-+ */
-+
-+ if (ch == Pad64) { /* We got a pad char. */
-+ ch = (unsigned char)*src++; /* Skip it, get next. */
-+ switch (state) {
-+ case 0: /* Invalid = in first position */
-+ case 1: /* Invalid = in second position */
-+ return (-1);
-+
-+ case 2: /* Valid, means one byte of info */
-+ /* Skip any number of spaces. */
-+ for (; ch != '\0'; ch = (unsigned char)*src++)
-+ if (!isspace(ch))
-+ break;
-+ /* Make sure there is another trailing = sign. */
-+ if (ch != Pad64)
-+ return (-1);
-+ ch = (unsigned char)*src++; /* Skip the = */
-+ /* Fall through to "single trailing =" case. */
-+ /* FALLTHROUGH */
-+
-+ case 3: /* Valid, means two bytes of info */
-+ /*
-+ * We know this char is an =. Is there anything but
-+ * whitespace after it?
-+ */
-+ for (; ch != '\0'; ch = (unsigned char)*src++)
-+ if (!isspace(ch))
-+ return (-1);
-+
-+ /*
-+ * Now make sure for cases 2 and 3 that the "extra"
-+ * bits that slopped past the last full byte were
-+ * zeros. If we don't check them, they become a
-+ * subliminal channel.
-+ */
-+ if (target && tarindex < targsize &&
-+ target[tarindex] != 0)
-+ return (-1);
-+ }
-+ } else {
-+ /*
-+ * We ended by seeing the end of the string. Make sure we
-+ * have no partial bytes lying around.
-+ */
-+ if (state != 0)
-+ return (-1);
-+ }
-+
-+ return (tarindex);
-+}
-diff -Naur netcat-openbsd-1.105.orig/compat/base64.h netcat-openbsd-1.105/compat/base64.h
---- netcat-openbsd-1.105.orig/compat/base64.h 1969-12-31 16:00:00.000000000 -0800
-+++ netcat-openbsd-1.105/compat/base64.h 2017-06-18 09:09:02.057554167 -0700
-@@ -0,0 +1,3 @@
-+#include <sys/types.h>
-+int b64_ntop(u_char const* src, size_t srclength, char *target, size_t targsize);
-+int b64_pton(char const* src, u_char *target, size_t targsize);
-diff -Naur netcat-openbsd-1.105.orig/socks.c netcat-openbsd-1.105/socks.c
---- netcat-openbsd-1.105.orig/socks.c 2017-06-18 09:01:44.293852659 -0700
-+++ netcat-openbsd-1.105/socks.c 2017-06-18 09:09:21.105757665 -0700
-@@ -40,6 +40,7 @@
- #include <resolv.h>
- #include <bsd/readpassphrase.h>
- #include "atomicio.h"
-+#include "compat/base64.h"
-
- #define SOCKS_PORT "1080"
- #define HTTP_PROXY_PORT "3128"
diff --git a/net-analyzer/openbsd-netcat/metadata.xml b/net-analyzer/openbsd-netcat/metadata.xml
deleted file mode 100644
index e6b017e..0000000
--- a/net-analyzer/openbsd-netcat/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="person">
- <email>heroxbd@gentoo.org</email>
- <name>Benda Xu</name>
-</maintainer>
-<longdescription lang="en">
- This package provides the openbsd linux port of netcat.
-</longdescription>
-</pkgmetadata>
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild
deleted file mode 100644
index 79387dd..0000000
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="The OpenBSD network swiss army knife"
-HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/"
-SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz
- http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-IUSE="elibc_Darwin"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="virtual/pkgconfig"
-RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
- !net-analyzer/netcat
- !net-analyzer/netcat6
-"
-
-S=${WORKDIR}/netcat-openbsd-${PV}
-
-PATCHES=( "${WORKDIR}/debian/patches" )
-
-src_prepare() {
- default
- if [[ ${CHOST} == *-darwin* ]] ; then
- # this undoes some of the Debian/Linux changes
- epatch "${FILESDIR}"/${P}-darwin.patch
- fi
- use elibc_musl && epatch "${FILESDIR}"/${P}-b64_ntop.patch
-}
-
-src_compile() {
- emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
- dobin nc
- doman nc.1
- cd "${WORKDIR}/debian"
- newdoc netcat-openbsd.README.Debian README
- dodoc -r examples
-}
-
-pkg_postinst() {
- if [[ ${KERNEL} = "linux" ]]; then
- ewarn "FO_REUSEPORT is introduced in linux 3.9. If your running kernel is older"
- ewarn "and kernel header is newer, nc will not listen correctly. Matching the header"
- ewarn "to the running kernel will do. See bug #490246 for details."
- fi
-}
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild
deleted file mode 100644
index bb60a00..0000000
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="The OpenBSD network swiss army knife"
-HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/
- https://salsa.debian.org/debian/netcat-openbsd"
-SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz
- http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-2.debian.tar.xz"
-LICENSE="BSD"
-SLOT="0"
-IUSE="elibc_Darwin"
-
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-DEPEND="virtual/pkgconfig"
-RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
- !net-analyzer/netcat
- !net-analyzer/netcat6
-"
-
-S=${WORKDIR}/netcat-openbsd-${PV}
-
-src_prepare() {
- for i_patch in $(<"${WORKDIR}"/debian/patches/series); do
- eapply "${WORKDIR}"/debian/patches/"${i_patch}"
- done
- if [[ ${CHOST} == *-darwin* ]] ; then
- # this undoes some of the Debian/Linux changes
- eapply "${FILESDIR}"/${P}-darwin.patch
- fi
- use elibc_musl && eapply "${FILESDIR}"/${P}-b64_ntop.patch
- default
-}
-
-src_compile() {
- emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dobin nc
- doman nc.1
- cd "${WORKDIR}"/debian || die
- newdoc netcat-openbsd.README.Debian README
- dodoc -r examples
-}
-
-pkg_postinst() {
- if [[ ${KERNEL} = "linux" ]]; then
- ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older"
- ewarn "and kernel header is newer, nc will not listen correctly. Matching the header"
- ewarn "to the running kernel will do. See bug #490246 for details."
- fi
-}
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
deleted file mode 100644
index eebada9..0000000
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="The OpenBSD network swiss army knife"
-HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/
- https://salsa.debian.org/debian/netcat-openbsd"
-SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz
- http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-2.debian.tar.xz"
-LICENSE="BSD"
-SLOT="0"
-IUSE="elibc_Darwin"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-DEPEND="virtual/pkgconfig"
-RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
- !net-analyzer/netcat
- !net-analyzer/netcat6
-"
-
-S=${WORKDIR}/netcat-openbsd-${PV}
-
-src_prepare() {
- for i_patch in $(<"${WORKDIR}"/debian/patches/series); do
- eapply "${WORKDIR}"/debian/patches/"${i_patch}"
- done
- if [[ ${CHOST} == *-darwin* ]] ; then
- # this undoes some of the Debian/Linux changes
- eapply "${FILESDIR}"/${P}-darwin.patch
- fi
- use elibc_musl && eapply "${FILESDIR}"/${P}-b64_ntop.patch
- default
-}
-
-src_compile() {
- emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dobin nc
- doman nc.1
- cd "${WORKDIR}"/debian || die
- newdoc netcat-openbsd.README.Debian README
- dodoc -r examples
-}
-
-pkg_postinst() {
- if [[ ${KERNEL} = "linux" ]]; then
- ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older"
- ewarn "and kernel header is newer, nc will not listen correctly. Matching the header"
- ewarn "to the running kernel will do. See bug #490246 for details."
- fi
-}
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
new file mode 100644
index 0000000..a788677
--- /dev/null
+++ b/net-wireless/bluez/Manifest
@@ -0,0 +1 @@
+DIST bluez-5.61.tar.xz 2137412 BLAKE2B 2fc1b44f726d48b4a0e8bbecc664077db1db69bbc87c66e9d7ac85d7b2e066de8b349c18597a5ba140c5fcb1ef867ee3980ebdd839ded69ae30491fb7b836940 SHA512 a2318637258f9db0bf05fecbfbea2c3ca5e21867378e28ab4c77f658fe42f10c8c607939f2b437ec40d1ceb00b99f7916c0275faaedd9edd247f7dc91329937a
diff --git a/net-wireless/bluez/bluez-5.61.ebuild b/net-wireless/bluez/bluez-5.61.ebuild
new file mode 100644
index 0000000..1d4400f
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.61.ebuild
@@ -0,0 +1,295 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://www.bluez.org"
+SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
+IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session"
+
+# Since this release all remaining extra-tools need readline support, but this could
+# change in the future, hence, this REQUIRED_USE constraint could be dropped
+# again in the future.
+REQUIRED_USE="
+ extra-tools? ( deprecated readline )
+ test? ( ${PYTHON_REQUIRED_USE} )
+ test-programs? ( ${PYTHON_REQUIRED_USE} )
+"
+
+TEST_DEPS="${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ >=dev-python/dbus-python-1[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ ')
+"
+BDEPEND="
+ dev-python/docutils
+ virtual/pkgconfig
+ test? ( ${TEST_DEPS} )
+"
+DEPEND="
+ >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+ >=sys-apps/hwids-20121202.2
+ btpclient? ( >=dev-libs/ell-0.39 )
+ cups? ( net-print/cups:= )
+ mesh? (
+ >=dev-libs/ell-0.39
+ >=dev-libs/json-c-0.13:=
+ sys-libs/readline:0=
+ )
+ midi? ( media-libs/alsa-lib )
+ obex? ( dev-libs/libical:= )
+ readline? ( sys-libs/readline:0= )
+ systemd? (
+ >=sys-apps/dbus-1.6:=[user-session=]
+ sys-apps/systemd
+ )
+ !systemd? ( >=sys-apps/dbus-1.6:= )
+ udev? ( >=virtual/udev-172 )
+"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-bluetooth )
+ test-programs? ( ${TEST_DEPS} )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
+ # http://www.spinics.net/lists/linux-bluetooth/msg58739.html
+ # https://bugs.gentoo.org/539844
+ "${FILESDIR}"/${PN}-udevadm-path-r1.patch
+
+ # Fedora patches
+ # http://www.spinics.net/lists/linux-bluetooth/msg40136.html
+ "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+
+ # https://marc.info/?l=linux-bluetooth&m=161498090629584&w=2
+ "${FILESDIR}"/${PN}-5.60-glibc-2.34.patch
+
+ # Required for musl support
+ "${FILESDIR}"/0001-include-limits.h-for-PATH_MAX-for-musl-support.patch
+)
+
+pkg_setup() {
+ # From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html
+ # to prevent bugs like:
+ # https://bugzilla.kernel.org/show_bug.cgi?id=196621
+ CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER
+ ~BT_BNEP_PROTO_FILTER ~BT_HIDP ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER ~RFKILL"
+ # https://bugzilla.kernel.org/show_bug.cgi?id=196621
+ # https://bugzilla.kernel.org/show_bug.cgi?id=206815
+ if use mesh || use test; then
+ CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER
+ ~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC"
+ fi
+ linux-info_pkg_setup
+
+ if use test || use test-programs; then
+ python-single-r1_pkg_setup
+ fi
+
+ if ! use udev; then
+ ewarn
+ ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
+ ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
+ ewarn "and hid2hci will not be available."
+ ewarn
+ fi
+}
+
+src_prepare() {
+ default
+
+ # http://www.spinics.net/lists/linux-bluetooth/msg38490.html
+ if ! use user-session || ! use systemd; then
+ eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
+ fi
+
+ eautoreconf
+
+ if use cups; then
+ # Only not .am to not need to run eautoreconf only because of this
+ sed -i \
+ -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
+ Makefile.{in,tools} || die
+ fi
+
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local myconf=(
+ # readline is automagic when client is enabled
+ # --enable-client always needs readline, bug #504038
+ # --enable-mesh is handled in the same way
+ ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
+ ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
+ )
+
+ if ! multilib_is_native_abi; then
+ myconf+=(
+ # deps not used for the library
+ {DBUS,GLIB}_{CFLAGS,LIBS}=' '
+ )
+ fi
+
+ econf \
+ --localstatedir=/var \
+ --disable-android \
+ --enable-datafiles \
+ --enable-optimization \
+ $(use_enable debug) \
+ --enable-pie \
+ --enable-threads \
+ --enable-library \
+ --enable-tools \
+ --enable-manpages \
+ --enable-monitor \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+ --with-systemduserunitdir="$(systemd_get_userunitdir)" \
+ $(multilib_native_use_enable btpclient) \
+ $(multilib_native_use_enable btpclient external-ell) \
+ $(multilib_native_use_enable cups) \
+ $(multilib_native_use_enable deprecated) \
+ $(multilib_native_use_enable experimental) \
+ $(multilib_native_use_enable mesh) \
+ $(multilib_native_use_enable mesh external-ell) \
+ $(multilib_native_use_enable midi) \
+ $(multilib_native_use_enable obex) \
+ $(multilib_native_use_enable readline client) \
+ $(multilib_native_use_enable systemd) \
+ $(multilib_native_use_enable test-programs test) \
+ $(multilib_native_use_enable udev) \
+ $(multilib_native_use_enable udev hid2hci) \
+ $(multilib_native_use_enable udev sixaxis)
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ default
+ else
+ emake -f Makefile -f - libs \
+ <<<'libs: $(lib_LTLIBRARIES)'
+ fi
+}
+
+multilib_src_test() {
+ multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake DESTDIR="${D}" install
+
+ # Only install extra-tools when relevant USE flag is enabled
+ if use extra-tools; then
+ ewarn "Upstream doesn't support using this tools and their bugs are"
+ ewarn "likely to be ignored forever, also they can break without"
+ ewarn "previous announcement."
+ ewarn "Upstream also states all this tools are not really needed,"
+ ewarn "then, if you still need to rely on them, you must ask them"
+ ewarn "to either install that tool by default or add the needed"
+ ewarn "functionality to the existing 'official' tools."
+ ewarn "Please report this issues to:"
+ ewarn "http://www.bluez.org/development/lists/"
+
+ # Upstream doesn't install this, bug #524640
+ # http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
+ # http://comments.gmane.org/gmane.linux.bluez.kernel/54564
+ dobin tools/btmgmt
+ # gatttool is only built with readline, bug #530776
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1141909
+ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486
+ # https://bugs.archlinux.org/task/37686
+ dobin attrib/gatttool
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1699680
+ dobin tools/avinfo
+ fi
+
+ # Not installed by default after being built, bug #666756
+ use btpclient && dobin tools/btpclient
+
+ # Unittests are not that useful once installed, so make them optional
+ if use test-programs; then
+ # Drop python2 only test tools
+ # https://bugzilla.kernel.org/show_bug.cgi?id=206819
+ rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die
+ # https://bugzilla.kernel.org/show_bug.cgi?id=206821
+ rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die
+ # https://bugzilla.kernel.org/show_bug.cgi?id=206823
+ rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server || die
+
+ python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
+
+ for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
+ dosym "${i}" /usr/bin/bluez-"${i##*/}"
+ done
+ fi
+ else
+ emake DESTDIR="${D}" \
+ install-pkgincludeHEADERS \
+ install-libLTLIBRARIES \
+ install-pkgconfigDATA
+ fi
+}
+
+multilib_src_install_all() {
+ # We need to ensure obexd can be spawned automatically by systemd
+ # when user-session is enabled:
+ # http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
+ # https://bugs.gentoo.org/show_bug.cgi?id=577842
+ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
+ # https://bugs.archlinux.org/task/45816
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1318441
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1389347
+ if use user-session && use systemd; then
+ ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
+ fi
+
+ find "${D}" -name '*.la' -type f -delete || die
+
+ keepdir /var/lib/bluetooth
+
+ # Upstream don't want people to play with them
+ # But we keep installing them due to 'historical' reasons
+ insinto /etc/bluetooth
+ local d
+ for d in input network; do
+ doins profiles/${d}/${d}.conf
+ done
+ # Setup auto enable as Fedora does for allowing to use
+ # keyboards/mouse as soon as possible
+ sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die
+ doins src/main.conf
+
+ newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth
+ newconfd "${FILESDIR}"/bluetooth-conf.d bluetooth
+
+ einstalldocs
+ use doc && dodoc doc/*.txt
+ # Install .json files as examples to be used by meshctl
+ if use mesh; then
+ dodoc tools/mesh-gatt/*.json
+ local DOC_CONTENTS="Some example .json files were installed into
+ /usr/share/doc/${PF} to be used with meshctl. Feel free to
+ uncompress and copy them to ~/.config/meshctl to use them."
+ readme.gentoo_create_doc
+ fi
+}
+
+pkg_postinst() {
+ use udev && udev_reload
+ systemd_reenable bluetooth.service
+
+ has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp"
+ use mesh && readme.gentoo_print_elog
+}
diff --git a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
new file mode 100644
index 0000000..dcebaa0
--- /dev/null
+++ b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
@@ -0,0 +1,58 @@
+From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org>
+Date: Sat, 12 Oct 2013 17:45:25 +0200
+Subject: [PATCH] Allow using obexd without systemd in the user session
+
+Not all sessions run systemd --user (actually, the majority
+doesn't), so the dbus daemon must be able to spawn obexd
+directly, and to do so it needs the full path of the daemon.
+---
+ Makefile.obexd | 4 ++--
+ obexd/src/org.bluez.obex.service | 4 ----
+ obexd/src/org.bluez.obex.service.in | 4 ++++
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+ delete mode 100644 obexd/src/org.bluez.obex.service
+ create mode 100644 obexd/src/org.bluez.obex.service.in
+
+diff --git a/Makefile.obexd b/Makefile.obexd
+index 3760867..142e7c3 100644
+--- a/Makefile.obexd
++++ b/Makefile.obexd
+@@ -2,12 +2,12 @@
+ if SYSTEMD
+ systemduserunitdir = $(SYSTEMD_USERUNITDIR)
+ systemduserunit_DATA = obexd/src/obex.service
++endif
+
+ dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
+ dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+-endif
+
+-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
+
+ obex_plugindir = $(libdir)/obex/plugins
+
+diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
+deleted file mode 100644
+index a538088..0000000
+--- a/obexd/src/org.bluez.obex.service
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[D-BUS Service]
+-Name=org.bluez.obex
+-Exec=/bin/false
+-SystemdService=dbus-org.bluez.obex.service
+diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
+new file mode 100644
+index 0000000..9c815f2
+--- /dev/null
++++ b/obexd/src/org.bluez.obex.service.in
+@@ -0,0 +1,4 @@
++[D-BUS Service]
++Name=org.bluez.obex
++Exec=@pkglibexecdir@/obexd
++SystemdService=dbus-org.bluez.obex.service
+--
+1.8.3.1
+
diff --git a/net-wireless/bluez/files/0001-include-limits.h-for-PATH_MAX-for-musl-support.patch b/net-wireless/bluez/files/0001-include-limits.h-for-PATH_MAX-for-musl-support.patch
new file mode 100644
index 0000000..ebdffc3
--- /dev/null
+++ b/net-wireless/bluez/files/0001-include-limits.h-for-PATH_MAX-for-musl-support.patch
@@ -0,0 +1,24 @@
+From e5dcac6abd6129829c4983d6635916cee8f1a627 Mon Sep 17 00:00:00 2001
+From: Jory Pratt <anarchy@gentoo.org>
+Date: Sun, 12 Sep 2021 09:46:11 -0500
+Subject: [PATCH] include limits.h for PATH_MAX for musl support
+
+---
+ tools/mesh-cfgtest.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/mesh-cfgtest.c b/tools/mesh-cfgtest.c
+index fa0474f..bfc8e1b 100644
+--- a/tools/mesh-cfgtest.c
++++ b/tools/mesh-cfgtest.c
+@@ -26,6 +26,7 @@
+ #include <time.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
++#include <limits.h>
+
+ #include <ell/ell.h>
+
+--
+2.32.0
+
diff --git a/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch b/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
new file mode 100644
index 0000000..004a389
--- /dev/null
+++ b/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
@@ -0,0 +1,38 @@
+From f7861d27fbcbc519f57d8496aa9486f487908821 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Sat, 9 Nov 2013 18:13:43 +0100
+Subject: [PATCH 1/5] obex: Use GLib helper function to manipulate paths
+
+Instead of trying to do it by hand. This also makes sure that
+relative paths aren't used by the agent.
+---
+ obexd/src/manager.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/obexd/src/manager.c b/obexd/src/manager.c
+index cec8a39..f18896e 100644
+--- a/obexd/src/manager.c
++++ b/obexd/src/manager.c
+@@ -651,14 +651,14 @@ static void agent_reply(DBusPendingCall *call, void *user_data)
+ DBUS_TYPE_STRING, &name,
+ DBUS_TYPE_INVALID)) {
+ /* Splits folder and name */
+- const char *slash = strrchr(name, '/');
++ gboolean is_relative = !g_path_is_absolute(name);
+ DBG("Agent replied with %s", name);
+- if (!slash) {
+- agent->new_name = g_strdup(name);
++ if (is_relative) {
++ agent->new_name = g_path_get_basename(name);
+ agent->new_folder = NULL;
+ } else {
+- agent->new_name = g_strdup(slash + 1);
+- agent->new_folder = g_strndup(name, slash - name);
++ agent->new_name = g_path_get_basename(name);
++ agent->new_folder = g_path_get_dirname(name);
+ }
+ }
+
+--
+1.8.4.2
+
diff --git a/net-wireless/bluez/files/bluetooth-conf.d b/net-wireless/bluez/files/bluetooth-conf.d
new file mode 100644
index 0000000..d5b5005
--- /dev/null
+++ b/net-wireless/bluez/files/bluetooth-conf.d
@@ -0,0 +1 @@
+#BLUETOOTH_OPTS="-E"
diff --git a/net-wireless/bluez/files/bluetooth-init.d-r5 b/net-wireless/bluez/files/bluetooth-init.d-r5
new file mode 100644
index 0000000..4d60234
--- /dev/null
+++ b/net-wireless/bluez/files/bluetooth-init.d-r5
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/run/bluetoothd.pid"
+command="/usr/libexec/bluetooth/bluetoothd"
+command_args="${BLUETOOTH_OPTS}"
+command_background=1
+
+depend() {
+ after coldplug
+ need dbus localmount hostname
+}
diff --git a/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch b/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch
new file mode 100644
index 0000000..1e84610
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch
@@ -0,0 +1,42 @@
+From 124dee151746b4a8a2e8a7194af78f2c82f75d79 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Wed, 3 Mar 2021 08:57:36 +0100
+Subject: [PATCH] media: rename local function conflicting with pause(2)
+
+profiles/audio/media.c:1284:13: error: conflicting types for 'pause'; have '_Bool(void *)'
+ 1284 | static bool pause(void *user_data)
+ | ^~~~~
+In file included from /usr/include/bits/sigstksz.h:24,
+ from /usr/include/signal.h:315,
+ from /usr/include/glib-2.0/glib/gbacktrace.h:36,
+ from /usr/include/glib-2.0/glib.h:34,
+ from profiles/audio/media.c:21:
+/usr/include/unistd.h:478:12: note: previous declaration of 'pause' with type 'int(void)'
+ 478 | extern int pause (void);
+ | ^~~~~
+---
+ profiles/audio/media.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/profiles/audio/media.c b/profiles/audio/media.c
+index c84bbe22dc..3d8c4b69c3 100644
+--- a/profiles/audio/media.c
++++ b/profiles/audio/media.c
+@@ -1281,7 +1281,7 @@ static bool stop(void *user_data)
+ return media_player_send(mp, "Stop");
+ }
+
+-static bool pause(void *user_data)
++static bool pause_play(void *user_data)
+ {
+ struct media_player *mp = user_data;
+
+@@ -1331,7 +1331,7 @@ static struct avrcp_player_cb player_cb = {
+ .set_volume = set_volume,
+ .play = play,
+ .stop = stop,
+- .pause = pause,
++ .pause = pause_play,
+ .next = next,
+ .previous = previous,
+ };
diff --git a/net-wireless/bluez/files/bluez-udevadm-path-r1.patch b/net-wireless/bluez/files/bluez-udevadm-path-r1.patch
new file mode 100644
index 0000000..ac1c94c
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-udevadm-path-r1.patch
@@ -0,0 +1,10 @@
+--- a/tools/hid2hci.rules
++++ b/tools/hid2hci.rules
+@@ -20,6 +20,7 @@
+ # Unfortunately the only event seen is the BT device disappearing, so the mouse
+ # device needs to be chased down on the USB bus.
+ ATTR{bDeviceClass}=="e0", ATTR{bDeviceSubClass}=="01", ATTR{bDeviceProtocol}=="01", ATTR{idVendor}=="413c", \
++ ENV{REMOVE_CMD}="/bin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1" \
+ ENV{REMOVE_CMD}="/sbin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1"
+
+ # CSR devices
diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml
new file mode 100644
index 0000000..60e3ee7
--- /dev/null
+++ b/net-wireless/bluez/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>pacho@gentoo.org</email>
+ <name>Pacho Ramos</name>
+ </maintainer>
+<use>
+ <flag name="btpclient">Enable BTP client</flag>
+ <flag name="deprecated">Build deprecated plugins</flag>
+ <flag name="experimental">Build experimental plugins</flag>
+ <flag name="extra-tools">Install tools that upstream doesn't install on
+ purpose by default. All this tools shouldn't be used. Then, please
+ notify upstream about you still need them to let them know the
+ situation.</flag>
+ <flag name="mesh">Add support for Bluetooth Mesh control application and advertising bearer.</flag>
+ <flag name="midi">Enable MIDI support</flag>
+ <flag name="obex">Enable OBEX transfer support</flag>
+ <flag name="test-programs">Install tools for testing of various Bluetooth functions</flag>
+ <flag name="user-session">Allow compatibility with user-session semantics for session bus under systemd</flag>
+</use>
+<upstream>
+ <remote-id type="cpe">cpe:/a:bluez:bluez</remote-id>
+ <remote-id type="cpe">cpe:/a:bluez:bluez-libs</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
deleted file mode 100644
index 67a1953..0000000
--- a/sys-apps/groff/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
diff --git a/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch b/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch
deleted file mode 100644
index 276460f..0000000
--- a/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-format dashes as dashes so as to not confuse people
-
-http://bugs.gentoo.org/16108
-http://bugs.gentoo.org/17580
-http://bugs.gentoo.org/121502
-
---- a/tmac/man.local
-+++ b/tmac/man.local
-@@ -1,2 +1,6 @@
- .\" This file is loaded after an-old.tmac.
- .\" Put any local modifications to an-old.tmac here.
-+.if '\*[.T]'utf8' \{\
-+. char \- \N'45'
-+. char - \N'45'
-+.\}
---- a/tmac/mdoc.local
-+++ b/tmac/mdoc.local
-@@ -1,2 +1,6 @@
- .\" This file is loaded after doc.tmac.
- .\" Put any local modifications to doc.tmac here.
-+.if '\*[.T]'utf8' \{\
-+. char \- \N'45'
-+. char - \N'45'
-+.\}
diff --git a/sys-apps/groff/files/groff-1.22.4-musl.patch b/sys-apps/groff/files/groff-1.22.4-musl.patch
deleted file mode 100644
index 0ed0e09..0000000
--- a/sys-apps/groff/files/groff-1.22.4-musl.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/gnulib_m4/signbit.m4 b/gnulib_m4/signbit.m4
-index 9e7884d..ef1ed6f 100644
---- a/gnulib_m4/signbit.m4
-+++ b/gnulib_m4/signbit.m4
-@@ -29,12 +29,12 @@ AC_DEFUN([gl_SIGNBIT],
- [gl_cv_func_signbit=yes],
- [gl_cv_func_signbit=no],
- [case "$host_os" in
-- # Guess yes on glibc systems.
-- *-gnu* | gnu*) gl_cv_func_signbit="guessing yes" ;;
-- # Guess yes on native Windows.
-- mingw*) gl_cv_func_signbit="guessing yes" ;;
-- # If we don't know, assume the worst.
-- *) gl_cv_func_signbit="guessing no" ;;
-+ # Guess yes on glibc systems.
-+ *-gnu* | gnu* | *musl*) gl_cv_func_signbit="guessing yes" ;;
-+ # Guess yes on native Windows.
-+ mingw*) gl_cv_func_signbit="guessing yes" ;;
-+ # If we don't know, assume the worst.
-+ *) gl_cv_func_signbit="guessing no" ;;
- esac
- ])
- ])
-@@ -60,17 +60,17 @@ AC_DEFUN([gl_SIGNBIT],
- [gl_cv_func_signbit_gcc=yes],
- [gl_cv_func_signbit_gcc=no],
- [case "$host_os" in
-- # Guess yes on glibc systems.
-- *-gnu* | gnu*) gl_cv_func_signbit_gcc="guessing yes" ;;
-- # Guess yes on mingw, no on MSVC.
-- mingw*) if test -n "$GCC"; then
-- gl_cv_func_signbit_gcc="guessing yes"
-- else
-- gl_cv_func_signbit_gcc="guessing no"
-- fi
-- ;;
-- # If we don't know, assume the worst.
-- *) gl_cv_func_signbit_gcc="guessing no" ;;
-+ # Guess yes on glibc systems.
-+ *-gnu* | gnu* | *musl*) gl_cv_func_signbit_gcc="guessing yes" ;;
-+ # Guess yes on mingw, no on MSVC.
-+ mingw*) if test -n "$GCC"; then
-+ gl_cv_func_signbit_gcc="guessing yes"
-+ else
-+ gl_cv_func_signbit_gcc="guessing no"
-+ fi
-+ ;;
-+ # If we don't know, assume the worst.
-+ *) gl_cv_func_signbit_gcc="guessing no" ;;
- esac
- ])
- ])
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
deleted file mode 100644
index 195f215..0000000
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P="${P/_/.}"
-
-DESCRIPTION="Text formatter used for man pages"
-HOMEPAGE="https://www.gnu.org/software/groff/groff.html"
-SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz
- https://alpha.gnu.org/gnu/groff/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples uchardet X"
-
-RDEPEND="
- uchardet? ( app-i18n/uchardet )
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXmu
- x11-libs/libXt
- )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-lang/perl
- sys-apps/texinfo"
-
-DOCS=( BUG-REPORT ChangeLog MORE.STUFF NEWS PROBLEMS PROJECTS README TODO )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.19.2-man-unicode-dashes.patch #16108 #17580 #121502
-)
-
-src_prepare() {
- default
-
- if use elibc_musl ; then
- eapply "${FILESDIR}"/${PN}-1.22.4-musl.patch
- fi
-
- # honor Gentoo's docdir
- sed -i -e "s|^docdir =.*|docdir = \"${EPREFIX}/usr/share/doc/${PF}\"|g" \
- Makefile.in \
- || die "failed to modify Makefile.in"
-
- local pfx=$(usex prefix ' Prefix' '')
- cat <<-EOF >> tmac/mdoc.local
- .ds volume-operating-system Gentoo${pfx}
- .ds operating-system Gentoo${pfx}/${KERNEL}
- .ds default-operating-system Gentoo${pfx}/${KERNEL}
- EOF
-
- # make sure we don't get a crappy `g' nameprefix on UNIX systems with real
- # troff (GROFF_G macro runs some test to see, its own troff doesn't satisfy)
- sed -i -e 's/^[ \t]\+g=g$/g=/' configure || die
-}
-
-src_configure() {
- local myeconfargs=(
- --with-appresdir="${EPREFIX}"/usr/share/X11/app-defaults
- $(use_with uchardet)
- $(use_with X x)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local -a CROSS_ARGS
- tc-is-cross-compiler && CROSS_ARGS+=(
- GROFFBIN="$(type -P groff)"
- TROFFBIN="$(type -P troff)"
- GROFF_BIN_DIR=
- GROFF_BIN_PATH=
- )
-
- emake AR="$(tc-getAR)" "${CROSS_ARGS[@]}"
-}
-
-src_install() {
- default
-
- # The following links are required for man #123674
- dosym eqn /usr/bin/geqn
- dosym tbl /usr/bin/gtbl
-
- if ! use examples ; then
- # The pdf files might not be generated if ghostscript is unavailable. #602020
- local pdf="${ED}/usr/share/doc/${PF}/examples/mom/mom-pdf.pdf"
- if [[ -e ${pdf} ]] ; then
- # Keep mom-pdf.pdf since it's more of a manual than an example. #454196 #516732
- mv "${pdf}" "${ED}/usr/share/doc/${PF}/pdf/" || die
- fi
- rm -rf "${ED}/usr/share/doc/${PF}/examples"
- fi
-}
diff --git a/sys-apps/groff/metadata.xml b/sys-apps/groff/metadata.xml
deleted file mode 100644
index b96055e..0000000
--- a/sys-apps/groff/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>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-<use>
- <flag name="uchardet">Enable automatic encoding detection via <pkg>app-i18n/uchardet</pkg></flag>
-</use>
-</pkgmetadata>
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
deleted file mode 100644
index e68eaf4..0000000
--- a/sys-apps/lshw/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lshw-B.02.18.tar.gz 2322176 BLAKE2B 66183895fcdd5b47bfaa044c10f7b561b3310829b53828444a20f078ce63e166a878595c8a8a79e22f1e4ab726e98165a1b31225997785d2bfc3ad5d7b0c5214 SHA512 4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47
diff --git a/sys-apps/lshw/files/lshw-02.18b-fixes.patch b/sys-apps/lshw/files/lshw-02.18b-fixes.patch
deleted file mode 100644
index ce395e1..0000000
--- a/sys-apps/lshw/files/lshw-02.18b-fixes.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-diff --git a/src/core/cpuinfo.cc b/src/core/cpuinfo.cc
-index 5a2b8c0..c5100d8 100644
---- a/src/core/cpuinfo.cc
-+++ b/src/core/cpuinfo.cc
-@@ -16,7 +16,7 @@ static int currentcpu = 0;
- static hwNode *getcpu(hwNode & node,
- int n = 0)
- {
-- char cpubusinfo[10];
-+ char cpubusinfo[16];
- hwNode *cpu = NULL;
-
- if (n < 0)
-diff --git a/src/core/device-tree.cc b/src/core/device-tree.cc
-index 2823233..3ffd316 100644
---- a/src/core/device-tree.cc
-+++ b/src/core/device-tree.cc
-@@ -420,7 +420,7 @@ static void scan_devtree_memory(hwNode & core)
-
- while (true)
- {
-- char buffer[10];
-+ char buffer[16];
- string mcbase;
- vector < string > slotnames;
- vector < string > dimmtypes;
-diff --git a/src/core/hw.h b/src/core/hw.h
-index 4211a82..8adaf3f 100644
---- a/src/core/hw.h
-+++ b/src/core/hw.h
-@@ -3,6 +3,7 @@
-
- #include <string>
- #include <vector>
-+#include <libgen.h>
-
- using namespace std;
-
-diff --git a/src/core/network.cc b/src/core/network.cc
-index 15a961d..8bdb3fa 100644
---- a/src/core/network.cc
-+++ b/src/core/network.cc
-@@ -396,7 +396,7 @@ bool scan_network(hwNode & n)
-
- // check for wireless extensions
- memset(buffer, 0, sizeof(buffer));
-- strncpy(buffer, interfaces[i].c_str(), sizeof(buffer));
-+ strncpy(buffer, interfaces[i].c_str(), sizeof(buffer)-1);
- if (ioctl(fd, SIOCGIWNAME, &buffer) == 0)
- {
- interface.addCapability("wireless", _("Wireless-LAN"));
-diff --git a/src/core/partitions.cc b/src/core/partitions.cc
-index 634a8c0..44f69d1 100644
---- a/src/core/partitions.cc
-+++ b/src/core/partitions.cc
-@@ -690,7 +690,7 @@ static bool detect_gpt(source & s, hwNode & n)
- static uint8_t buffer[BLOCKSIZE];
- static gpth gpt_header;
- uint32_t i = 0;
-- char gpt_version[8];
-+ char gpt_version[16];
- uint8_t *partitions = NULL;
- uint8_t type;
-
-@@ -1108,11 +1108,11 @@ static bool detect_gpt(source & s, hwNode & n)
- partition.setConfig("name", p.PartitionName);
- if(p.Attributes && PARTITION_PRECIOUS)
- partition.addCapability("precious", "This partition is required for the platform to function");
-- if(p.Attributes && PARTITION_READONLY)
-+ if(p.Attributes & PARTITION_READONLY)
- partition.addCapability("readonly", "Read-only partition");
-- if(p.Attributes && PARTITION_HIDDEN)
-+ if(p.Attributes & PARTITION_HIDDEN)
- partition.addCapability("hidden");
-- if(p.Attributes && PARTITION_NOMOUNT)
-+ if(p.Attributes & PARTITION_NOMOUNT)
- partition.addCapability("nomount", "No automatic mount");
-
- partition.describeCapability("nofs", "No filesystem");
-diff --git a/src/core/scsi.cc b/src/core/scsi.cc
-index afc582b..dd0699f 100644
---- a/src/core/scsi.cc
-+++ b/src/core/scsi.cc
-@@ -210,7 +210,7 @@ int channel = -1,
- int id = -1,
- int lun = -1)
- {
-- char buffer[10];
-+ char buffer[16];
- string result = "SCSI:";
-
- snprintf(buffer, sizeof(buffer), "%02d", host);
-diff --git a/src/core/sysfs.cc b/src/core/sysfs.cc
-index acc9d00..24f7152 100644
---- a/src/core/sysfs.cc
-+++ b/src/core/sysfs.cc
-@@ -97,9 +97,11 @@ static string sysfs_getbustype(const string & path)
-
- for (i = 0; i < n; i++)
- {
-+ char *tmp_path = strdup(path.c_str());
- devname =
- string(fs.path + "/bus/") + string(namelist[i]->d_name) +
-- "/devices/" + basename(path.c_str());
-+ "/devices/" + basename(tmp_path);
-+ free (tmp_path);
-
- if (samefile(devname, path))
- return string(namelist[i]->d_name);
-@@ -139,7 +141,9 @@ static string sysfstobusinfo(const string & path)
-
- if (bustype == "virtio")
- {
-- string name = basename(path.c_str());
-+ char *tmp_path = strdup(path.c_str());
-+ string name = basename(tmp_path);
-+ free(tmp_path);
- if (name.compare(0, 6, "virtio") == 0)
- return "virtio@" + name.substr(6);
- else
-@@ -207,7 +211,10 @@ string entry::driver() const
- string driverlink = This->devpath + "/driver";
- if (!exists(driverlink))
- return "";
-- return basename(readlink(driverlink).c_str());
-+ char *tmp_path = strdup(readlink(driverlink).c_str());
-+ driverlink = string(basename(tmp_path));
-+ free(tmp_path);
-+ return driverlink;
- }
-
-
-@@ -288,7 +295,10 @@ string entry::name_in_class(const string & classname) const
-
- string entry::name() const
- {
-- return basename(This->devpath.c_str());
-+ char *tmp_path = strdup(This->devpath.c_str());
-+ string name = string(basename(tmp_path));
-+ free(tmp_path);
-+ return name;
- }
-
-
-diff --git a/src/core/volumes.cc b/src/core/volumes.cc
-index b433956..1185e34 100644
---- a/src/core/volumes.cc
-+++ b/src/core/volumes.cc
-@@ -446,7 +446,7 @@ static string dos_serial(unsigned long serial)
- {
- char buffer[16];
-
-- snprintf(buffer, sizeof(buffer), "%04lx-%04lx", serial >> 16, serial & 0xffff);
-+ snprintf(buffer, sizeof(buffer), "%04lx-%04lx", (serial >> 16) & 0xffff, serial & 0xffff);
-
- return string(buffer);
- }
-@@ -987,13 +987,13 @@ static bool detect_ntfs(hwNode & n, source & s)
- else
- n.setConfig("state", "clean");
-
-- if(vi->flags && VOLUME_MODIFIED_BY_CHKDSK)
-+ if(vi->flags & VOLUME_MODIFIED_BY_CHKDSK)
- n.setConfig("modified_by_chkdsk", "true");
-- if(vi->flags && VOLUME_MOUNTED_ON_NT4)
-+ if(vi->flags & VOLUME_MOUNTED_ON_NT4)
- n.setConfig("mounted_on_nt4", "true");
-- if(vi->flags && VOLUME_UPGRADE_ON_MOUNT)
-+ if(vi->flags & VOLUME_UPGRADE_ON_MOUNT)
- n.setConfig("upgrade_on_mount", "true");
-- if(vi->flags && VOLUME_RESIZE_LOG_FILE)
-+ if(vi->flags & VOLUME_RESIZE_LOG_FILE)
- n.setConfig("resize_log_file", "true");
- }
- if(info)
-diff --git a/src/lshw.cc b/src/lshw.cc
-index 77a5932..74643fc 100644
---- a/src/lshw.cc
-+++ b/src/lshw.cc
-@@ -219,7 +219,7 @@ char **argv)
- exit(1);
- }
-
-- if(enabled("output:X")) execl(SBINDIR"/gtk-lshw", SBINDIR"/gtk-lshw", NULL);
-+ if(enabled("output:X")) execl(SBINDIR"/gtk-lshw", SBINDIR"/gtk-lshw", (char *)NULL);
-
- if (geteuid() != 0)
- {
diff --git a/sys-apps/lshw/files/lshw-02.18b-gentoo.patch b/sys-apps/lshw/files/lshw-02.18b-gentoo.patch
deleted file mode 100644
index 0a50e9d..0000000
--- a/sys-apps/lshw/files/lshw-02.18b-gentoo.patch
+++ /dev/null
@@ -1,161 +0,0 @@
---- lshw-B.02.18/src/Makefile
-+++ lshw-B.02.18/src/Makefile
-@@ -21,11 +21,11 @@
- CXX?=c++
- INCLUDES=-I./core/
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- ifeq ($(SQLITE), 1)
- CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
- endif
--LDFLAGS=-L./core/ -g
-+LDFLAGS += -L./core/
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
- LDFLAGS+= -Wl,--as-needed
- endif
-@@ -39,27 +39,25 @@
- export LIBS
- export LDFLAGS
-
--DATAFILES = pci.ids usb.ids oui.txt manuf.txt
--
--all: $(PACKAGENAME) $(PACKAGENAME).1 $(DATAFILES)
-+all: $(PACKAGENAME) $(PACKAGENAME).1
-
- .cc.o:
- $(CXX) $(CXXFLAGS) -c $< -o $@
-
- .PHONY: core
- core:
-- +make -C core all
-+ $(MAKE) -C core all
-
- $(PACKAGENAME): core $(PACKAGENAME).o
- $(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
-
- .PHONY: po
- po:
-- +make -C po all
-+ $(MAKE) -C po all
-
- .PHONY: gui
- gui: core
-- +make -C gui all
-+ $(MAKE) -C gui all
-
- .PHONY: nologo
- nologo:
-@@ -70,7 +68,6 @@
-
- $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
- $(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
-- $(STRIP) $@
-
- .PHONY: compressed
- compressed: $(PACKAGENAME)-compressed
-@@ -93,14 +90,13 @@
- manuf.txt:
- wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf
-
--install: all
-+install:
- $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
- $(INSTALL) -m 0755 $(PACKAGENAME) $(DESTDIR)/$(SBINDIR)
- $(INSTALL) -d -m 0755 $(DESTDIR)/$(MANDIR)/man1
- $(INSTALL) -m 0644 $(PACKAGENAME).1 $(DESTDIR)/$(MANDIR)/man1
- $(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
-- $(INSTALL) -m 0644 $(DATAFILES) $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
-- make -C po install
-+ $(MAKE) -C po install
-
- install-gui: gui
- $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
-@@ -112,8 +108,8 @@
-
- clean:
- rm -f $(PACKAGENAME).o $(PACKAGENAME) $(PACKAGENAME)-static $(PACKAGENAME)-compressed
-- make -C core clean
-- make -C gui clean
-+ $(MAKE) -C core clean
-+ $(MAKE) -C gui clean
-
- .timestamp:
- date --utc +%Y%m%d%H%M%S > $@
---- lshw-B.02.18/src/core/Makefile
-+++ lshw-B.02.18/src/core/Makefile
-@@ -1,10 +1,9 @@
- PACKAGENAME?=lshw
-
--CXX=c++
-+CXX?=c++
- INCLUDES=
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
--LDFLAGS=
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- LDSTATIC=
- LIBS=
-
---- lshw-B.02.18/src/core/pci.cc
-+++ lshw-B.02.18/src/core/pci.cc
-@@ -17,7 +17,7 @@
-
- #define PROC_BUS_PCI "/proc/bus/pci"
- #define SYS_BUS_PCI "/sys/bus/pci"
--#define PCIID_PATH DATADIR"/pci.ids:/usr/share/lshw/pci.ids:/usr/local/share/pci.ids:/usr/share/pci.ids:/etc/pci.ids:/usr/share/hwdata/pci.ids:/usr/share/misc/pci.ids"
-+#define PCIID_PATH "/usr/share/misc/pci.ids"
-
- #define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */
- #define PCI_VENDOR_ID 0x00 /* 16 bits */
---- lshw-B.02.18/src/core/usb.cc
-+++ lshw-B.02.18/src/core/usb.cc
-@@ -27,7 +27,7 @@
-
- #define PROCBUSUSBDEVICES "/proc/bus/usb/devices"
- #define SYSKERNELDEBUGUSBDEVICES "/sys/kernel/debug/usb/devices"
--#define USBID_PATH DATADIR"/usb.ids:/usr/share/lshw/usb.ids:/usr/local/share/usb.ids:/usr/share/usb.ids:/etc/usb.ids:/usr/share/hwdata/usb.ids:/usr/share/misc/usb.ids"
-+#define USBID_PATH "/usr/share/misc/usb.ids"
-
- #define USB_CLASS_PER_INTERFACE 0 /* for DeviceClass */
- #define USB_CLASS_AUDIO 1
---- lshw-B.02.18/src/gui/Makefile
-+++ lshw-B.02.18/src/gui/Makefile
-@@ -1,5 +1,7 @@
- PACKAGENAME?=lshw
-
-+SQLITE?=0
-+
- CXX?=c++
- CC?=cc
- STRIP?=strip
-@@ -8,14 +10,15 @@
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
- GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
- INCLUDES=-I../core $(GTKINCLUDES)
--CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- CFLAGS=$(CXXFLAGS) $(DEFINES)
- GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs)
--LIBS=-L../core -llshw -lresolv $(GTKLIBS)
--LDFLAGS=
--ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
-- LDFLAGS+= -Wl,--as-needed
--endif
-+LIBS=-L../core -llshw -lresolv $(GTKLIBS)
-+
-+ifeq ($(SQLITE), 1)
-+ CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
-+ LIBS+= $(shell pkg-config --libs sqlite3)
-+endif
-
- OBJS = gtk-lshw.o callbacks.o engine.o print-gui.o stock.o
- SRCS = $(OBJS:.o=.c)
-@@ -39,7 +42,6 @@
- $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
-
- install: all
-- $(STRIP) gtk-$(PACKAGENAME)
-
- clean:
- rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak callbacks.c.bak callbacks.h.bak Makefile.bak
diff --git a/sys-apps/lshw/files/lshw-02.18b-gettext-array.patch b/sys-apps/lshw/files/lshw-02.18b-gettext-array.patch
deleted file mode 100644
index 4aea642..0000000
--- a/sys-apps/lshw/files/lshw-02.18b-gettext-array.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-patch sent upstream
-
-From 1fb7ebed787ec1b73218c1f12cbb71b103433375 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 14 Mar 2017 22:25:12 -0700
-Subject: [PATCH] fix array access with string translations
-
-The code forgot to rebase the num to 0 before indexing the string array.
-It also provides 5 strings, but was only allowing 4 to be accessed.
----
- src/core/dmi.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/dmi.cc b/src/core/dmi.cc
-index 250f48572d54..0db074975f2d 100644
---- a/src/core/dmi.cc
-+++ b/src/core/dmi.cc
-@@ -510,8 +510,8 @@ static const char *dmi_memory_array_location(u8 num)
- };
- if (num <= 0x0A)
- return _(memory_array_location[num]);
-- if (num >= 0xA0 && num < 0xA4)
-- return _(jp_memory_array_location[num]);
-+ if (num >= 0xA0 && num <= 0xA4)
-+ return _(jp_memory_array_location[num - 0xA0]);
- return "";
- }
-
---
-2.12.0
-
diff --git a/sys-apps/lshw/files/lshw-02.18b-sgx.patch b/sys-apps/lshw/files/lshw-02.18b-sgx.patch
deleted file mode 100644
index 92bd6c2..0000000
--- a/sys-apps/lshw/files/lshw-02.18b-sgx.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-patch from upstream:
-https://ezix.org/src/pkg/lshw/commit/5e5744732b2dcdf83845919256388b3842033183
-
-From 5e5744732b2dcdf83845919256388b3842033183 Mon Sep 17 00:00:00 2001
-From: Wenkai Du <wenkai.du@intel.com>
-Date: Fri, 22 Dec 2017 09:57:57 -0800
-Subject: [PATCH] lshw: fix segmentation fault when /dev/sgx is present
-
-When Intel SGX is enabled in kernel, /dev/sgx is created and is
-picked up by "/dev/sg*" glob matching.
-
-Signed-off-by: Wenkai Du <wenkai.du@intel.com>
----
- src/core/scsi.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/scsi.cc b/src/core/scsi.cc
-index b38dda2cd8a8..75061c0fb195 100644
---- a/src/core/scsi.cc
-+++ b/src/core/scsi.cc
-@@ -30,7 +30,7 @@
-
- __ID("@(#) $Id$");
-
--#define SG_X "/dev/sg*"
-+#define SG_X "/dev/sg[0-9]*"
- #define SG_MAJOR 21
-
- #ifndef SCSI_IOCTL_GET_PCI
---
-2.15.1
-
diff --git a/sys-apps/lshw/lshw-02.18b-r2.ebuild b/sys-apps/lshw/lshw-02.18b-r2.ebuild
deleted file mode 100644
index e2254b7..0000000
--- a/sys-apps/lshw/lshw-02.18b-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PLOCALES='fr'
-
-inherit flag-o-matic toolchain-funcs l10n desktop
-
-MAJ_PV=$(ver_cut 1-2)
-MIN_PV=$(ver_cut 3)
-
-MY_P="$PN-${MIN_PV^^}.$MAJ_PV"
-DESCRIPTION="Hardware Lister"
-HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter"
-SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~x86"
-IUSE="gtk sqlite static"
-
-REQUIRED_USE="static? ( !gtk )"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
- sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
- gtk? ( virtual/pkgconfig )
- sqlite? ( virtual/pkgconfig )"
-RDEPEND="${RDEPEND}
- sys-apps/hwids"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-02.18b-gentoo.patch"
- "${FILESDIR}/${PN}-02.18b-gettext-array.patch"
- "${FILESDIR}/${PN}-02.18b-sgx.patch"
- "${FILESDIR}/${PN}-02.18b-fixes.patch"
-)
-
-src_prepare() {
- default
- l10n_find_plocales_changes "src/po" "" ".po" || die
- sed -i \
- -e "/^LANGUAGES =/ s/=.*/= $(l10n_get_locales)/" \
- src/po/Makefile || die
- sed -i \
- -e 's:\<pkg-config\>:${PKG_CONFIG}:' \
- src/Makefile src/gui/Makefile || die
-}
-
-src_compile() {
- tc-export CC CXX AR PKG_CONFIG
- use static && append-ldflags -static
-
- # Need two sep make statements to avoid parallel build issues. #588174
- local sqlite=$(usex sqlite 1 0)
- emake SQLITE=${sqlite} all
- use gtk && emake SQLITE=${sqlite} gui
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '')
- dodoc README.md docs/*
- if use gtk ; then
- newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg
- make_desktop_entry \
- "${EPREFIX}"/usr/sbin/gtk-lshw \
- "${DESCRIPTION}"
- fi
-}
diff --git a/sys-apps/lshw/metadata.xml b/sys-apps/lshw/metadata.xml
deleted file mode 100644
index 56c1244..0000000
--- a/sys-apps/lshw/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
deleted file mode 100644
index 1d49d57..0000000
--- a/sys-devel/binutils/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST binutils-2.33.1-patches-2.tar.xz 18636 BLAKE2B 0e0757329b6a83aeff4f4c450c95e73fd48fcc89f83e63f294568632bee0972552cf2f57494352c5d9a7c16a51cdbc4108b38fa6028d4388c8e76046b3da9212 SHA512 d982f68d1f5fdb384309a2a1b7426bf840a90e7a85b37229b4223b62c36cab9dd9ec0c08382c85c68adf996dec21133df3180a2fc649363adae8645f8282f71d
-DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
-DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B d0e866d0941d2b550c7d7f23530c6ee393fa13b4f2f27832f07790989476f11d1beddb5ad5a9be5c65c1d4dff9d4598d21adcb00c1d0490f69a99127f4527447 SHA512 e05ed8886acb5cb95a3e97c5bc0564215f7d44b604610f5c4545997fd9625d6de909c37063127e819926cd1548a48d3529dd3e82e98ee6a5dbaced028c57355d
-DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
diff --git a/sys-devel/binutils/binutils-2.33.1-r1.ebuild b/sys-devel/binutils/binutils-2.33.1-r1.ebuild
deleted file mode 100644
index 6963e7e..0000000
--- a/sys-devel/binutils/binutils-2.33.1-r1.ebuild
+++ /dev/null
@@ -1,439 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="GPL-3+"
-IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test"
-REQUIRED_USE="default-gold? ( gold )"
-
-# Variables that can be set here:
-# PATCH_VER - the patchset version
-# Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-# - Default: PV
-# PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-# for the patchsets
-
-PATCH_VER=2
-PATCH_DEV=slyfox
-
-case ${PV} in
- 9999)
- EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
- inherit git-r3
- S=${WORKDIR}/binutils
- EGIT_CHECKOUT_DIR=${S}
- SLOT=${PV}
- ;;
- *.9999)
- EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
- inherit git-r3
- S=${WORKDIR}/binutils
- EGIT_CHECKOUT_DIR=${S}
- EGIT_BRANCH=$(ver_cut 1-2)
- EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
- SLOT=$(ver_cut 1-2)
- ;;
- *)
- SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
- SLOT=$(ver_cut 1-2)
- KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
- ;;
-esac
-
-#
-# The Gentoo patchset
-#
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-slyfox}
-
-[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
- >=sys-devel/binutils-config-3
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- doc? ( sys-apps/texinfo )
- test? ( dev-util/dejagnu )
- nls? ( sys-devel/gettext )
- sys-devel/flex
- virtual/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.33-gcc-10.patch
-)
-
-MY_BUILDDIR=${WORKDIR}/build
-
-src_unpack() {
- case ${PV} in
- *9999)
- git-r3_src_unpack
- ;;
- *)
- ;;
- esac
- default
- mkdir -p "${MY_BUILDDIR}"
-}
-
-src_prepare() {
- if [[ ! -z ${PATCH_VER} ]] ; then
- einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
- eapply "${WORKDIR}/patch"/*.patch
- fi
-
- # This check should probably go somewhere else, like pkg_pretend.
- if [[ ${CTARGET} == *-uclibc* ]] ; then
- if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
- die "sorry, but this binutils doesn't yet support uClibc :("
- fi
- fi
-
- # Make sure our explicit libdir paths don't get clobbered. #562460
- sed -i \
- -e 's:@bfdlibdir@:@libdir@:g' \
- -e 's:@bfdincludedir@:@includedir@:g' \
- {bfd,opcodes}/Makefile.in || die
-
- # Fix locale issues if possible #122216
- if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
- einfo "Fixing misc issues in configure files"
- for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
- ebegin " Updating ${f/${S}\/}"
- patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
- || eerror "Please file a bug about this"
- eend $?
- done
- fi
-
- # Fix conflicts with newer glibc #272594
- if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
- sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
- fi
-
- # Apply things from PATCHES and user dirs
- default
-
- # Run misc portage update scripts
- gnuconfig_update
- elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
- printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
- printf "Gentoo ${PV}"
- [[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
- # Setup some paths
- LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
- INCPATH=${LIBPATH}/include
- DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
- if is_cross ; then
- TOOLPATH=/usr/${CHOST}/${CTARGET}
- else
- TOOLPATH=/usr/${CTARGET}
- fi
- BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
- # Make sure we filter $LINGUAS so that only ones that
- # actually work make it through #42033
- strip-linguas -u */po
-
- # Keep things sane
- strip-flags
-
- use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
- local x
- echo
- for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
- einfo "$(printf '%10s' ${x}:) ${!x}"
- done
- echo
-
- cd "${MY_BUILDDIR}"
- local myconf=()
-
- if use plugins ; then
- myconf+=( --enable-plugins )
- fi
- # enable gold (installed as ld.gold) and ld's plugin architecture
- if use gold ; then
- myconf+=( --enable-gold )
- if use default-gold; then
- myconf+=( --enable-gold=default )
- fi
- fi
-
- if use nls ; then
- myconf+=( --without-included-gettext )
- else
- myconf+=( --disable-nls )
- fi
-
- myconf+=( --with-system-zlib )
-
- # For bi-arch systems, enable a 64bit bfd. This matches
- # the bi-arch logic in toolchain.eclass. #446946
- # We used to do it for everyone, but it's slow on 32bit arches. #438522
- case $(tc-arch) in
- ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
- esac
-
- use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
- [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
- is_cross && myconf+=(
- --with-sysroot="${EPREFIX}"/usr/${CTARGET}
- --enable-poison-system-directories
- )
-
- # glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
- # on everyone in alpha (for now), we'll just enable it when possible
- has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
- has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
-
- # mips can't do hash-style=gnu ...
- if [[ $(tc-arch) != mips ]] ; then
- myconf+=( --enable-default-hash-style=gnu )
- fi
-
- myconf+=(
- --prefix="${EPREFIX}"/usr
- --host=${CHOST}
- --target=${CTARGET}
- --datadir="${EPREFIX}"${DATAPATH}
- --datarootdir="${EPREFIX}"${DATAPATH}
- --infodir="${EPREFIX}"${DATAPATH}/info
- --mandir="${EPREFIX}"${DATAPATH}/man
- --bindir="${EPREFIX}"${BINPATH}
- --libdir="${EPREFIX}"${LIBPATH}
- --libexecdir="${EPREFIX}"${LIBPATH}
- --includedir="${EPREFIX}"${INCPATH}
- --enable-obsolete
- --enable-shared
- --enable-threads
- # Newer versions (>=2.27) offer a configure flag now.
- --enable-relro
- # Newer versions (>=2.24) make this an explicit option. #497268
- --enable-install-libiberty
- --disable-werror
- --with-bugurl="$(toolchain-binutils_bugurl)"
- --with-pkgversion="$(toolchain-binutils_pkgversion)"
- $(use_enable static-libs static)
- ${EXTRA_ECONF}
- # Disable modules that are in a combined binutils/gdb tree. #490566
- --disable-{gdb,libdecnumber,readline,sim}
- # Strip out broken static link flags.
- # https://gcc.gnu.org/PR56750
- --without-stage1-ldflags
- # Change SONAME to avoid conflict across
- # {native,cross}/binutils, binutils-libs. #666100
- --with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
- )
- echo ./configure "${myconf[@]}"
- "${S}"/configure "${myconf[@]}" || die
-
- # Prevent makeinfo from running if doc is unset.
- if ! use doc ; then
- sed -i \
- -e '/^MAKEINFO/s:=.*:= true:' \
- Makefile || die
- fi
-}
-
-src_compile() {
- cd "${MY_BUILDDIR}"
- # see Note [tooldir hack for ldscripts]
- emake tooldir="${EPREFIX}${TOOLPATH}" all
-
- # only build info pages if the user wants them
- if use doc ; then
- emake info
- fi
-
- # we nuke the manpages when we're left with junk
- # (like when we bootstrap, no perl -> no manpages)
- find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
- cd "${MY_BUILDDIR}"
-
- # bug 637066
- filter-flags -Wall -Wreturn-type
-
- emake -k check
-}
-
-src_install() {
- local x d
-
- cd "${MY_BUILDDIR}"
- # see Note [tooldir hack for ldscripts]
- emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
- rm -rf "${ED}"/${LIBPATH}/bin
- use static-libs || find "${ED}" -name '*.la' -delete
-
- # Newer versions of binutils get fancy with ${LIBPATH} #171905
- cd "${ED}"/${LIBPATH}
- for d in ../* ; do
- [[ ${d} == ../${PV} ]] && continue
- mv ${d}/* . || die
- rmdir ${d} || die
- done
-
- # Now we collect everything intp the proper SLOT-ed dirs
- # When something is built to cross-compile, it installs into
- # /usr/$CHOST/ by default ... we have to 'fix' that :)
- if is_cross ; then
- cd "${ED}"/${BINPATH}
- for x in * ; do
- mv ${x} ${x/${CTARGET}-}
- done
-
- if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
- mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
- mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
- rm -r "${ED}"/usr/${CHOST}/{include,lib}
- fi
- fi
- insinto ${INCPATH}
- local libiberty_headers=(
- # Not all the libiberty headers. See libiberty/Makefile.in:install_to_libdir.
- demangle.h
- dyn-string.h
- fibheap.h
- hashtab.h
- libiberty.h
- objalloc.h
- splay-tree.h
- )
- doins "${libiberty_headers[@]/#/${S}/include/}"
- if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
- mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
- rm -r "${ED}"/${LIBPATH}/lib
- fi
-
- # Generate an env.d entry for this binutils
- insinto /etc/env.d/binutils
- cat <<-EOF > "${T}"/env.d
- TARGET="${CTARGET}"
- VER="${PV}"
- LIBPATH="${EPREFIX}${LIBPATH}"
- EOF
- newins "${T}"/env.d ${CTARGET}-${PV}
-
- # Handle documentation
- if ! is_cross ; then
- cd "${S}"
- dodoc README
- docinto bfd
- dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
- docinto binutils
- dodoc binutils/ChangeLog binutils/NEWS binutils/README
- docinto gas
- dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
- docinto gprof
- dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
- docinto ld
- dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
- docinto libiberty
- dodoc libiberty/ChangeLog* libiberty/README
- docinto opcodes
- dodoc opcodes/ChangeLog*
- fi
-
- # Remove shared info pages
- rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
- # Trim all empty dirs
- find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-}
-
-pkg_postinst() {
- # Make sure this ${CTARGET} has a binutils version selected
- [[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
- binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
- local current_profile=$(binutils-config -c ${CTARGET})
-
- # If no other versions exist, then uninstall for this
- # target ... otherwise, switch to the newest version
- # Note: only do this if this version is unmerged. We
- # rerun binutils-config if this is a remerge, as
- # we want the mtimes on the symlinks updated (if
- # it is the same as the current selected profile)
- if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
- local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
- choice=${choice//$'\n'/ }
- choice=${choice/* }
- if [[ -z ${choice} ]] ; then
- binutils-config -u ${CTARGET}
- else
- binutils-config ${choice}
- fi
- elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
- binutils-config ${CTARGET}-${PV}
- fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-# /usr/bin/${CTARGET}-<tool>
-# /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-# /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-# ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-# ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils/binutils-2.34-r2.ebuild b/sys-devel/binutils/binutils-2.34-r2.ebuild
deleted file mode 100644
index 89699c5..0000000
--- a/sys-devel/binutils/binutils-2.34-r2.ebuild
+++ /dev/null
@@ -1,436 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="GPL-3+"
-IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test"
-REQUIRED_USE="default-gold? ( gold )"
-
-# Variables that can be set here:
-# PATCH_VER - the patchset version
-# Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-# - Default: PV
-# PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-# for the patchsets
-
-PATCH_VER=6
-PATCH_DEV=dilfridge
-
-case ${PV} in
- 9999)
- EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
- inherit git-r3
- S=${WORKDIR}/binutils
- EGIT_CHECKOUT_DIR=${S}
- SLOT=${PV}
- ;;
- *.9999)
- EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
- inherit git-r3
- S=${WORKDIR}/binutils
- EGIT_CHECKOUT_DIR=${S}
- EGIT_BRANCH=$(ver_cut 1-2)
- EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
- SLOT=$(ver_cut 1-2)
- ;;
- *)
- SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
- SLOT=$(ver_cut 1-2)
- KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 x86"
- ;;
-esac
-
-#
-# The Gentoo patchset
-#
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-slyfox}
-
-[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
- >=sys-devel/binutils-config-3
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? ( sys-apps/texinfo )
- test? ( dev-util/dejagnu )
- nls? ( sys-devel/gettext )
- sys-devel/flex
- virtual/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-MY_BUILDDIR=${WORKDIR}/build
-
-src_unpack() {
- case ${PV} in
- *9999)
- git-r3_src_unpack
- ;;
- *)
- ;;
- esac
- default
- mkdir -p "${MY_BUILDDIR}"
-}
-
-src_prepare() {
- if [[ ! -z ${PATCH_VER} ]] ; then
- einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
- eapply "${WORKDIR}/patch"/*.patch
- fi
-
- # This check should probably go somewhere else, like pkg_pretend.
- if [[ ${CTARGET} == *-uclibc* ]] ; then
- if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
- die "sorry, but this binutils doesn't yet support uClibc :("
- fi
- fi
-
- # Make sure our explicit libdir paths don't get clobbered. #562460
- sed -i \
- -e 's:@bfdlibdir@:@libdir@:g' \
- -e 's:@bfdincludedir@:@includedir@:g' \
- {bfd,opcodes}/Makefile.in || die
-
- # Fix locale issues if possible #122216
- if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
- einfo "Fixing misc issues in configure files"
- for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
- ebegin " Updating ${f/${S}\/}"
- patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
- || eerror "Please file a bug about this"
- eend $?
- done
- fi
-
- # Fix conflicts with newer glibc #272594
- if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
- sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
- fi
-
- # Apply things from PATCHES and user dirs
- default
-
- # Run misc portage update scripts
- gnuconfig_update
- elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
- printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
- printf "Gentoo ${PV}"
- [[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
- # Setup some paths
- LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
- INCPATH=${LIBPATH}/include
- DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
- if is_cross ; then
- TOOLPATH=/usr/${CHOST}/${CTARGET}
- else
- TOOLPATH=/usr/${CTARGET}
- fi
- BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
- # Make sure we filter $LINGUAS so that only ones that
- # actually work make it through #42033
- strip-linguas -u */po
-
- # Keep things sane
- strip-flags
-
- use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
- local x
- echo
- for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
- einfo "$(printf '%10s' ${x}:) ${!x}"
- done
- echo
-
- cd "${MY_BUILDDIR}"
- local myconf=()
-
- if use plugins ; then
- myconf+=( --enable-plugins )
- fi
- # enable gold (installed as ld.gold) and ld's plugin architecture
- if use gold ; then
- myconf+=( --enable-gold )
- if use default-gold; then
- myconf+=( --enable-gold=default )
- fi
- fi
-
- if use nls ; then
- myconf+=( --without-included-gettext )
- else
- myconf+=( --disable-nls )
- fi
-
- myconf+=( --with-system-zlib )
-
- # For bi-arch systems, enable a 64bit bfd. This matches
- # the bi-arch logic in toolchain.eclass. #446946
- # We used to do it for everyone, but it's slow on 32bit arches. #438522
- case $(tc-arch) in
- ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
- esac
-
- use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
- [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
- is_cross && myconf+=(
- --with-sysroot="${EPREFIX}"/usr/${CTARGET}
- --enable-poison-system-directories
- )
-
- # glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
- # on everyone in alpha (for now), we'll just enable it when possible
- has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
- has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
-
- # mips can't do hash-style=gnu ...
- if [[ $(tc-arch) != mips ]] ; then
- myconf+=( --enable-default-hash-style=gnu )
- fi
-
- myconf+=(
- --prefix="${EPREFIX}"/usr
- --host=${CHOST}
- --target=${CTARGET}
- --datadir="${EPREFIX}"${DATAPATH}
- --datarootdir="${EPREFIX}"${DATAPATH}
- --infodir="${EPREFIX}"${DATAPATH}/info
- --mandir="${EPREFIX}"${DATAPATH}/man
- --bindir="${EPREFIX}"${BINPATH}
- --libdir="${EPREFIX}"${LIBPATH}
- --libexecdir="${EPREFIX}"${LIBPATH}
- --includedir="${EPREFIX}"${INCPATH}
- --enable-obsolete
- --enable-shared
- --enable-threads
- # Newer versions (>=2.27) offer a configure flag now.
- --enable-relro
- # Newer versions (>=2.24) make this an explicit option. #497268
- --enable-install-libiberty
- --disable-werror
- --with-bugurl="$(toolchain-binutils_bugurl)"
- --with-pkgversion="$(toolchain-binutils_pkgversion)"
- $(use_enable static-libs static)
- ${EXTRA_ECONF}
- # Disable modules that are in a combined binutils/gdb tree. #490566
- --disable-{gdb,libdecnumber,readline,sim}
- # Strip out broken static link flags.
- # https://gcc.gnu.org/PR56750
- --without-stage1-ldflags
- # Change SONAME to avoid conflict across
- # {native,cross}/binutils, binutils-libs. #666100
- --with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
- )
- echo ./configure "${myconf[@]}"
- "${S}"/configure "${myconf[@]}" || die
-
- # Prevent makeinfo from running if doc is unset.
- if ! use doc ; then
- sed -i \
- -e '/^MAKEINFO/s:=.*:= true:' \
- Makefile || die
- fi
-}
-
-src_compile() {
- cd "${MY_BUILDDIR}"
- # see Note [tooldir hack for ldscripts]
- emake tooldir="${EPREFIX}${TOOLPATH}" all
-
- # only build info pages if the user wants them
- if use doc ; then
- emake info
- fi
-
- # we nuke the manpages when we're left with junk
- # (like when we bootstrap, no perl -> no manpages)
- find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
- cd "${MY_BUILDDIR}"
-
- # bug 637066
- filter-flags -Wall -Wreturn-type
-
- emake -k check
-}
-
-src_install() {
- local x d
-
- cd "${MY_BUILDDIR}"
- # see Note [tooldir hack for ldscripts]
- emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
- rm -rf "${ED}"/${LIBPATH}/bin
- use static-libs || find "${ED}" -name '*.la' -delete
-
- # Newer versions of binutils get fancy with ${LIBPATH} #171905
- cd "${ED}"/${LIBPATH}
- for d in ../* ; do
- [[ ${d} == ../${PV} ]] && continue
- mv ${d}/* . || die
- rmdir ${d} || die
- done
-
- # Now we collect everything intp the proper SLOT-ed dirs
- # When something is built to cross-compile, it installs into
- # /usr/$CHOST/ by default ... we have to 'fix' that :)
- if is_cross ; then
- cd "${ED}"/${BINPATH}
- for x in * ; do
- mv ${x} ${x/${CTARGET}-}
- done
-
- if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
- mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
- mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
- rm -r "${ED}"/usr/${CHOST}/{include,lib}
- fi
- fi
- insinto ${INCPATH}
- local libiberty_headers=(
- # Not all the libiberty headers. See libiberty/Makefile.in:install_to_libdir.
- demangle.h
- dyn-string.h
- fibheap.h
- hashtab.h
- libiberty.h
- objalloc.h
- splay-tree.h
- )
- doins "${libiberty_headers[@]/#/${S}/include/}"
- if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
- mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
- rm -r "${ED}"/${LIBPATH}/lib
- fi
-
- # Generate an env.d entry for this binutils
- insinto /etc/env.d/binutils
- cat <<-EOF > "${T}"/env.d
- TARGET="${CTARGET}"
- VER="${PV}"
- LIBPATH="${EPREFIX}${LIBPATH}"
- EOF
- newins "${T}"/env.d ${CTARGET}-${PV}
-
- # Handle documentation
- if ! is_cross ; then
- cd "${S}"
- dodoc README
- docinto bfd
- dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
- docinto binutils
- dodoc binutils/ChangeLog binutils/NEWS binutils/README
- docinto gas
- dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
- docinto gprof
- dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
- docinto ld
- dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
- docinto libiberty
- dodoc libiberty/ChangeLog* libiberty/README
- docinto opcodes
- dodoc opcodes/ChangeLog*
- fi
-
- # Remove shared info pages
- rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
- # Trim all empty dirs
- find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-}
-
-pkg_postinst() {
- # Make sure this ${CTARGET} has a binutils version selected
- [[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
- binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
- local current_profile=$(binutils-config -c ${CTARGET})
-
- # If no other versions exist, then uninstall for this
- # target ... otherwise, switch to the newest version
- # Note: only do this if this version is unmerged. We
- # rerun binutils-config if this is a remerge, as
- # we want the mtimes on the symlinks updated (if
- # it is the same as the current selected profile)
- if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
- local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
- choice=${choice//$'\n'/ }
- choice=${choice/* }
- if [[ -z ${choice} ]] ; then
- binutils-config -u ${CTARGET}
- else
- binutils-config ${choice}
- fi
- elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
- binutils-config ${CTARGET}-${PV}
- fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-# /usr/bin/${CTARGET}-<tool>
-# /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-# /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-# ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-# ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils/files/binutils-2.33-gcc-10.patch b/sys-devel/binutils/files/binutils-2.33-gcc-10.patch
deleted file mode 100644
index 9e1a999..0000000
--- a/sys-devel/binutils/files/binutils-2.33-gcc-10.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-binutils: drop redundant 'program_name' definition
-
-https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=0b398d69acde3377dfbbeb8a4cfe87ae8c8562fa
---- a/binutils/coffdump.c
-+++ b/binutils/coffdump.c
-@@ -456,8 +456,6 @@ coff_dump (struct coff_ofile *ptr)
- dump_coff_section (ptr->sections + i);
- }
-
--char * program_name;
--
- static void
- show_usage (FILE *file, int status)
- {
---- a/binutils/srconv.c
-+++ b/binutils/srconv.c
-@@ -1687,8 +1687,6 @@ prescan (struct coff_ofile *otree)
- }
- }
-
--char *program_name;
--
- ATTRIBUTE_NORETURN static void
- show_usage (FILE *ffile, int status)
- {
---- a/binutils/sysdump.c
-+++ b/binutils/sysdump.c
-@@ -633,8 +633,6 @@ module (void)
- }
- }
-
--char *program_name;
--
- ATTRIBUTE_NORETURN static void
- show_usage (FILE *ffile, int status)
- {
---
-2.25.0
-
diff --git a/sys-devel/binutils/files/binutils-configure-LANG.patch b/sys-devel/binutils/files/binutils-configure-LANG.patch
deleted file mode 100644
index 5521d19..0000000
--- a/sys-devel/binutils/files/binutils-configure-LANG.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in
-option parsing, it may break.
-
-http://bugs.gentoo.org/103483
-http://bugs.gentoo.org/122216
-
---- configure
-+++ configure
-@@ -54,6 +54,19 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
-
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ unset $as_var
-+ fi
-+done
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -452,16 +463,6 @@
- esac
- done
-
--# NLS nuisances.
--# Only set these to C if already set. These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}" = set; then LANG=C; export LANG; fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.
-@@ -1850,6 +1850,19 @@
- # Compiler output produced by configure, useful for debugging
- # configure, is in ./config.log if it exists.
-
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -z "`(eval \$as_var=C; export \$as_var) 2>&1`"); then
-+ eval \$as_var=C; export \$as_var
-+ else
-+ unset \$as_var
-+ fi
-+done
-+
- ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
- for ac_option
- do
diff --git a/sys-devel/binutils/metadata.xml b/sys-devel/binutils/metadata.xml
deleted file mode 100644
index 66f4f23..0000000
--- a/sys-devel/binutils/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>toolchain@gentoo.org</email>
- <name>Gentoo Toolchain Project</name>
- </maintainer>
- <use>
- <flag name="default-gold">Set ld to point to ld.gold instead of ld.bfd</flag>
- <flag name="gold">Build ld.gold linker</flag>
- <flag name="plugins">Enable plugin support in tools</flag>
- <flag name="multitarget">Adds support to binutils for cross compiling (does not work with gas)</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:gnu:binutils</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 314397c..63ae0c0 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,8 +1,6 @@
-DIST gcc-10.2.0-patches-6.tar.bz2 24103 BLAKE2B f719012f86136ad9c4ea1397548caca6e69687534599a88cc25fe0e4f83dd7fd34c07375fa6e612e2b430e078c1a59913160cce07312e94fa1ce575a33e5457b SHA512 61d97dba29024c7a22806689ebf33f5cb9ce099230bcc344f2865b976c3fdfd8ebec5962eaffd0156de75eca58499ba785867bd4a4ac92c6f799ab1bee8844a1
-DIST gcc-10.2.0.tar.xz 75004144 BLAKE2B 1d79397330354e61439283cac96a109bf78ffc726265442e6d3ec131f107589ab7349d6612836edd8c8512f7bcc1d901a65a0d5d925d28a5bf3ef5cc3f9787ee SHA512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e
-DIST gcc-10.3.0-patches-1.tar.bz2 15282 BLAKE2B ef283e8b108af9bfd3324fabb95c835374113c6ff2cf1430a5568b3d1b27183e6de6751367c1e5720c85ac4c45132848888d5510c63f95e88a1f623b6bcf4000 SHA512 6dc435c8619a1532000fae843b9964d0d1e28d3cc9cc1962ab7391570a0cf1135424ea5c0b0d3d5ec5ea863f02e963be2ec4c94822f217fc692a1d808325404e
+DIST gcc-10.3.0-patches-3.tar.bz2 18935 BLAKE2B 13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a SHA512 c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084
DIST gcc-10.3.0.tar.xz 76692288 BLAKE2B ac7898f5eb8a7c5f151a526d1bb38913a68b50a65e4d010ac09fa20b6c801c671c790d780f23ccb8e4ecdfc686f4aa588082ccc9eb5c80c7b0e30788f824c1eb SHA512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
DIST gcc-11.1.0-patches-2.tar.bz2 18492 BLAKE2B 37ffb2b2a92287c434d3730772b73b88926788db8b609611447318a28fd43963fa04ee664bb1c83815ee80742457ab703f7bc2d1e6d700e342760b1d9cd13867 SHA512 62297a37b0f1ff48858c59f761291f0fc4efe14bd471d53763899c2f272cc21764d4521682219a57857118e846766dcb9e24646f749d735acd58bb2d7b8b05d6
DIST gcc-11.1.0.tar.xz 78877216 BLAKE2B fe617e776b0270d11adea21b5c37d889de90865c19ab82d1c37bbd5c5b9c583a98c174606c4f893ca4950a4233e2a58aae93ad6aa7ad33d4e78a31c72371c1ed SHA512 fd6bba0f67ff48069d03073d1a9b5e896383b1cfc9dde008e868e60a9ec5014a837d56af0ecbf467b3fb9b37ec74a676e819a18b44393a0a3c4280175b5d7ad8
-DIST gcc-9.3.0-patches-4.tar.bz2 15474 BLAKE2B b06fdfce4402850bb1c6c211ace4c3a07ad2114ffa48eac58d1624124d5d1bddd6d2b4faa18be3291a340272c022bea26dfcaf17929828ceb6474a5211401389 SHA512 54904a4a1c4a784f1a707cbdd9f6f498457e4aa550dc6f3d6eff71ed05a75685e23e6b71c2a614b1dea7e506b9f42fb0109ecfde00ef00373275bbc0409cb7e0
-DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
+DIST gcc-11.2.0-patches-1.tar.bz2 11537 BLAKE2B 9dd791ada244c9b70b8b99f9f305a688c248134715ed1b26d406e53b114983faae6873cdc521497164388d24d5f61c199e98df146bc02f5578e877295bcf5c82 SHA512 6539efc60c656d0798a5896dc1b944ed69914b815102c7a1c10bdba4ef935abd326b01309f38316e121f1ed90ceb2abcaf65df6af116892daad829ac2623cefc
+DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa4454ef4da573e82587e1a42dc420189e949cfdadaf4cb37fc0de9674822210a95b77ff03aca0dbedfe67df19cc6 SHA512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf
diff --git a/sys-devel/gcc/files/gcc-6.1-musl-libssp.patch b/sys-devel/gcc/files/gcc-6.1-musl-libssp.patch
new file mode 100644
index 0000000..fe5c614
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-6.1-musl-libssp.patch
@@ -0,0 +1,20 @@
+Author: Timo Teräs <timo.teras@iki.fi>
+
+Alpine musl package provides libssp_nonshared.a. We link to it unconditionally,
+as otherwise we get link failures if some objects are -fstack-protector built
+and final link happens with -fno-stack-protector. This seems to be the common
+case when bootstrapping gcc, the piepatches do not seem to fully fix the
+crosstoolchain and bootstrap sequence wrt. stack-protector flag usage.
+
+--- gcc-6.1.0/gcc/gcc.c.orig
++++ gcc-6.1.0/gcc/gcc.c
+@@ -870,8 +870,7 @@
+
+ #ifndef LINK_SSP_SPEC
+ #ifdef TARGET_LIBC_PROVIDES_SSP
+-#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
+- "|fstack-protector-strong|fstack-protector-explicit:}"
++#define LINK_SSP_SPEC "-lssp_nonshared"
+ #else
+ #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
+ "|fstack-protector-strong|fstack-protector-explicit" \
diff --git a/sys-devel/gcc/gcc-10.3.0.ebuild b/sys-devel/gcc/gcc-10.3.0-r2.ebuild
index 61ff1bf..7dec59f 100644
--- a/sys-devel/gcc/gcc-10.3.0.ebuild
+++ b/sys-devel/gcc/gcc-10.3.0-r2.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-PATCH_VER="1"
+PATCH_VER="3"
inherit toolchain
@@ -23,5 +23,9 @@ src_prepare() {
esac
fi
+ if [[ ${CATEGORY} != cross-* ]] ; then
+ eapply "${FILESDIR}"/gcc-6.1-musl-libssp.patch
+ fi
+
eapply_user
}
diff --git a/sys-devel/gcc/gcc-10.2.0-r5.ebuild b/sys-devel/gcc/gcc-10.3.0-r3.ebuild
index 3cb2712..60b7cbc 100644
--- a/sys-devel/gcc/gcc-10.2.0-r5.ebuild
+++ b/sys-devel/gcc/gcc-10.3.0-r3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PATCH_VER="6"
+PATCH_VER="3"
inherit toolchain
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
+KEYWORDS="ppc x86"
RDEPEND=""
BDEPEND="${CATEGORY}/binutils"
@@ -23,5 +23,9 @@ src_prepare() {
esac
fi
+ if [[ ${CATEGORY} != cross-* ]] ; then
+ eapply "${FILESDIR}"/gcc-6.1-musl-libssp.patch
+ fi
+
eapply_user
}
diff --git a/sys-devel/gcc/gcc-11.1.0-r1.ebuild b/sys-devel/gcc/gcc-11.1.0-r1.ebuild
index f60c567..5b6db15 100644
--- a/sys-devel/gcc/gcc-11.1.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-11.1.0-r1.ebuild
@@ -27,5 +27,9 @@ src_prepare() {
esac
fi
+ if [[ ${CATEGORY} != cross-* ]] ; then
+ eapply "${FILESDIR}"/gcc-6.1-musl-libssp.patch
+ fi
+
eapply_user
}
diff --git a/sys-devel/gcc/gcc-9.3.0-r2.ebuild b/sys-devel/gcc/gcc-11.2.0.ebuild
index 04fcb86..ccb6c1c 100644
--- a/sys-devel/gcc/gcc-9.3.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-11.2.0.ebuild
@@ -1,33 +1,31 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PATCH_VER="4"
+PATCH_VER="1"
inherit toolchain
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
RDEPEND=""
-DEPEND="${RDEPEND}
- elibc_glibc? ( >=sys-libs/glibc-2.13 )
- >=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
- PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
+BDEPEND="${CATEGORY}/binutils"
src_prepare() {
toolchain_src_prepare
if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then
- eapply "${FILESDIR}"/6.3.0/cpu_indicator.patch
+ eapply "${FILESDIR}"/10.1.0/cpu_indicator.patch
eapply "${FILESDIR}"/7.1.0/posix_memalign.patch
case $(tc-arch) in
amd64|arm64|ppc64) eapply "${FILESDIR}"/9.3.0/gcc-pure64.patch ;;
esac
fi
+ if [[ ${CATEGORY} != cross-* ]] ; then
+ eapply "${FILESDIR}"/gcc-6.1-musl-libssp.patch
+ fi
+
eapply_user
-}
+} \ No newline at end of file
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
deleted file mode 100644
index 716813f..0000000
--- a/sys-devel/lld/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
-DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
-DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
diff --git a/sys-devel/lld/lld-10.0.1-r1.ebuild b/sys-devel/lld/lld-10.0.1-r1.ebuild
deleted file mode 100644
index 89535c3..0000000
--- a/sys-devel/lld/lld-10.0.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lld )
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
-
-python_check_deps() {
- has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
- use test && python-any-r1_pkg_setup
- use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
- -DLLVM_INCLUDE_TESTS=$(usex test)
- )
- use test && mycmakeargs+=(
- -DLLVM_BUILD_TESTS=ON
- -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
- -DLLVM_LIT_ARGS="$(get_lit_flags)"
- )
- cmake_src_configure
-}
-
-src_test() {
- local -x LIT_PRESERVES_TMP=1
- cmake_build check-lld
-}
diff --git a/sys-devel/lld/lld-11.1.0-r1.ebuild b/sys-devel/lld/lld-11.1.0-r1.ebuild
deleted file mode 100644
index b0133dc..0000000
--- a/sys-devel/lld/lld-11.1.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="
- test? (
- >=dev-util/cmake-3.16
- $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
- )"
-
-LLVM_COMPONENTS=( lld )
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
-llvm.org_set_globals
-
-python_check_deps() {
- has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
- use test && python-any-r1_pkg_setup
- use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
- -DLLVM_INCLUDE_TESTS=$(usex test)
- )
- use test && mycmakeargs+=(
- -DLLVM_BUILD_TESTS=ON
- -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
- -DLLVM_LIT_ARGS="$(get_lit_flags)"
- -DPython3_EXECUTABLE="${PYTHON}"
- )
- cmake_src_configure
-}
-
-src_test() {
- local -x LIT_PRESERVES_TMP=1
- cmake_build check-lld
-}
diff --git a/sys-devel/lld/lld-12.0.0.ebuild b/sys-devel/lld/lld-12.0.0.ebuild
deleted file mode 100644
index c3f3d1a..0000000
--- a/sys-devel/lld/lld-12.0.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="
- test? (
- >=dev-util/cmake-3.16
- $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
- )"
-
-LLVM_COMPONENTS=( lld libunwind/include/mach-o )
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
-llvm.org_set_globals
-
-python_check_deps() {
- has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
- use test && python-any-r1_pkg_setup
- use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-}
-
-src_unpack() {
- llvm.org_src_unpack
-
- # Directory ${WORKDIR}/llvm does not exist with USE="-test",
- # but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
- # and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
- # (lld/MachO/CMakeLists.txt) and is expected to be resolvable
- # to existent directory ${WORKDIR}/libunwind/include.
- mkdir -p "${WORKDIR}/llvm" || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
- -DLLVM_INCLUDE_TESTS=$(usex test)
- -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
- )
- use test && mycmakeargs+=(
- -DLLVM_BUILD_TESTS=ON
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
- -DLLVM_LIT_ARGS="$(get_lit_flags)"
- -DPython3_EXECUTABLE="${PYTHON}"
- )
- cmake_src_configure
-}
-
-src_test() {
- local -x LIT_PRESERVES_TMP=1
- cmake_build check-lld
-}
diff --git a/sys-devel/lld/metadata.xml b/sys-devel/lld/metadata.xml
deleted file mode 100644
index 89c4bdb..0000000
--- a/sys-devel/lld/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>llvm@gentoo.org</email>
- </maintainer>
-</pkgmetadata>
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index a94c173..686afb0 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1 +1 @@
-DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91
+DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca
diff --git a/sys-fs/lvm2/lvm2-2.02.187-r3.ebuild b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
index f974d16..14cda96 100644
--- a/sys-fs/lvm2/lvm2-2.02.187-r3.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic
+inherit autotools linux-info multilib systemd toolchain-funcs tmpfiles udev flag-o-matic
DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
HOMEPAGE="https://sourceware.org/lvm2/"
@@ -11,9 +11,11 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
+ static? ( !systemd !udev )
+ static-libs? ( !udev )
systemd? ( udev )"
DEPEND_COMMON="
@@ -23,7 +25,7 @@ DEPEND_COMMON="
readline? ( sys-libs/readline:0= )
sanlock? ( sys-cluster/sanlock )
systemd? ( >=sys-apps/systemd-205:0= )
- udev? ( >=virtual/libudev-208:=[static-libs(-)?] )"
+ udev? ( >=virtual/libudev-208:= )"
# /run is now required for locking during early boot. /var cannot be assumed to
# be available -- thus, pull in recent enough baselayout for /run.
# This version of LVM is incompatible with cryptsetup <1.1.2.
@@ -268,6 +270,8 @@ src_install() {
}
pkg_postinst() {
+ tmpfiles_process lvm2.conf
+
if [[ -z "${REPLACING_VERSIONS}" ]]; then
# This is a new installation
ewarn "Make sure the \"lvm\" init script is in the runlevels:"
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
deleted file mode 100644
index f9a2cf0..0000000
--- a/sys-process/procps/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST procps-ng-3.3.17.tar.xz 1008428 BLAKE2B 43aa1a21d4f0725b1c02457f343cf1fc66bc1771b25c6eaf689c9775c190e90545bfac1729f027abc4d3d13de37ffac4828554b5b25e12bcf6af9540de1695f3 SHA512 59e9a5013430fd9da508c4655d58375dc32e025bb502bb28fb9a92a48e4f2838b3355e92b4648f7384b2050064d17079bf4595d889822ebb5030006bc154a1a7
diff --git a/sys-process/procps/files/procps-3.3.11-sysctl-manpage.patch b/sys-process/procps/files/procps-3.3.11-sysctl-manpage.patch
deleted file mode 100644
index 3523aad..0000000
--- a/sys-process/procps/files/procps-3.3.11-sysctl-manpage.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- procps-ng-3.3.11-orig/sysctl.8
-+++ procps-ng-3.3.11/sysctl.8
-@@ -123,21 +123,21 @@
- \fB\-V\fR, \fB\-\-version\fR
- Display version information and exit.
- .SH EXAMPLES
--/sbin/sysctl \-a
-+/usr/sbin/sysctl \-a
- .br
--/sbin/sysctl \-n kernel.hostname
-+/usr/sbin/sysctl \-n kernel.hostname
- .br
--/sbin/sysctl \-w kernel.domainname="example.com"
-+/usr/sbin/sysctl \-w kernel.domainname="example.com"
- .br
--/sbin/sysctl \-p/etc/sysctl.conf
-+/usr/sbin/sysctl \-p/etc/sysctl.conf
- .br
--/sbin/sysctl \-a \-\-pattern forward
-+/usr/sbin/sysctl \-a \-\-pattern forward
- .br
--/sbin/sysctl \-a \-\-pattern forward$
-+/usr/sbin/sysctl \-a \-\-pattern forward$
- .br
--/sbin/sysctl \-a \-\-pattern 'net.ipv4.conf.(eth|wlan)0.arp'
-+/usr/sbin/sysctl \-a \-\-pattern 'net.ipv4.conf.(eth|wlan)0.arp'
- .br
--/sbin/sysctl \-\-system \-\-pattern '^net.ipv6'
-+/usr/sbin/sysctl \-\-system \-\-pattern '^net.ipv6'
- .SH DEPRECATED PARAMETERS
- The
- .B base_reachable_time
diff --git a/sys-process/procps/files/procps-3.3.12-proc-tests.patch b/sys-process/procps/files/procps-3.3.12-proc-tests.patch
deleted file mode 100644
index 9549252..0000000
--- a/sys-process/procps/files/procps-3.3.12-proc-tests.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://bugs.gentoo.org/583036
-http://www.freelists.org/post/procps/Patch-Test-suite-fails-if-procpidsmaps-is-absent,1
-
-From: tobbs@opentrash.com
-To: procps@freelists.org
-Date: Sun, 11 Sep 2016 15:01:29 +0200
-Subject: [procps] [Patch] Test suite fails if /proc/<pid>/smaps is absent
-Message-Id: <20160911130129.9A8B3322A81@astra4649.startdedicated.de>
-
-Summary: Some Linux systems do not have /proc/<pid>/smaps, hence the test
-suite fails. Attached a patch to skip tests in that case it.
-
-When pmap is called with either -c, -x, or -x it tries to read
-/proc/<pid>/smaps (pmap.c, l. 540). If not present it exits.
-The file /proc/<pid>/smaps exits on Linux systems only if the kernel is
-compiled with the option CONFIG_PROC_PAGE_MONITOR (see man page proc(5)).
-
-In the test suite some tests check the output of pmap -X et al, but they
-fail if /proc/<pid>/smaps is not present, because pmap does not produce
-their expected output.
-
-Attached a patch which checks if /proc/<pid>/smaps exits, if not it
-skipps the test related to it.
-
-Note: It is unclear what the 'expected' behaviour/output of pmap should
-be if the file /proc/<pid>/smaps is not present. Maybe add an additional
-test to check the return code if /proc/<pid>/smaps is absent.
-
---- a/testsuite/pmap.test/pmap.exp
-+++ b/testsuite/pmap.test/pmap.exp
-@@ -45,6 +45,11 @@
- spawn $pmap -qd $mypid
- expect_table $test $pmap_procname $pmap_device_items "\$"
-
-+if { [ file readable "/proc/self/smaps" ] == 0 } {
-+ unsupported "Skipping test which require pmap to access /proc/<pid>/smaps, because kernel seems to be compiled without CONFIG_PROC_PAGE_MONITOR."
-+
-+} else {
-+
- set test "pmap extended output"
- spawn $pmap -x $mypid
- expect_table $test $pmap_ext_header $pmap_ext_items $pmap_ext_footer
-@@ -66,3 +71,4 @@
- spawn $pmap -XX 1
- expect_pass $test "$pmap_initname\$"
-
-+}
diff --git a/sys-process/procps/files/procps-3.3.17-musl-fix.patch b/sys-process/procps/files/procps-3.3.17-musl-fix.patch
deleted file mode 100644
index ec3d1f8..0000000
--- a/sys-process/procps/files/procps-3.3.17-musl-fix.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 7bfe2b7c12b33aabca71491360c433d2d3f7bbf4 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Wed, 24 Feb 2021 21:14:31 +0000
-Subject: [PATCH 1/2] w.c: correct musl builds
-
-No need to redefine UT_ stuff to something that does not exist.
-
-UT_ is already provided in musl but via utmp.h header, so include
-it always.
-
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- w.c | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/w.c b/w.c
-index 9d07ac9e..d10639b8 100644
---- a/w.c
-+++ b/w.c
-@@ -57,9 +57,8 @@
- #include <unistd.h>
- #ifdef HAVE_UTMPX_H
- # include <utmpx.h>
--#else
--# include <utmp.h>
- #endif
-+#include <utmp.h>
- #include <arpa/inet.h>
-
- static int ignoreuser = 0; /* for '-u' */
-@@ -72,12 +71,6 @@ typedef struct utmpx utmp_t;
- typedef struct utmp utmp_t;
- #endif
-
--#if !defined(UT_HOSTSIZE) || defined(__UT_HOSTSIZE)
--# define UT_HOSTSIZE __UT_HOSTSIZE
--# define UT_LINESIZE __UT_LINESIZE
--# define UT_NAMESIZE __UT_NAMESIZE
--#endif
--
- #ifdef W_SHOWFROM
- # define FROM_STRING "on"
- #else
---
-GitLab
-
-
-From 145165aba6c659f3f0f3567a323a3e6170408ea6 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Wed, 24 Feb 2021 21:16:14 +0000
-Subject: [PATCH 2/2] proc/escape.c: add missing include
-
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- proc/escape.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/proc/escape.c b/proc/escape.c
-index 2e8fb7dd..e1f4612d 100644
---- a/proc/escape.c
-+++ b/proc/escape.c
-@@ -21,6 +21,7 @@
- #include <sys/types.h>
- #include <string.h>
- #include <limits.h>
-+#include <langinfo.h>
- #include "procps.h"
- #include "escape.h"
- #include "readproc.h"
---
-GitLab
-
diff --git a/sys-process/procps/metadata.xml b/sys-process/procps/metadata.xml
deleted file mode 100644
index c0aa0de..0000000
--- a/sys-process/procps/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-<use>
- <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag>
- <flag name="kill">Build the kill program</flag>
- <flag name="modern-top">Enables new startup defaults of top. Keeps old defaults if disabled</flag>
- <flag name="ncurses">Build programs that use ncurses: top, slabtop, watch</flag>
-</use>
-<upstream>
- <remote-id type="sourceforge">procps</remote-id>
- <remote-id type="cpe">cpe:/a:procps_project:procps</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/sys-process/procps/procps-3.3.17-r1.ebuild b/sys-process/procps/procps-3.3.17-r1.ebuild
deleted file mode 100644
index c2df728..0000000
--- a/sys-process/procps/procps-3.3.17-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal usr-ldscript
-
-DESCRIPTION="Standard informational utilities and process-handling tools"
-HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps"
-SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/8" # libprocps.so
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
-IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- elogind? ( sys-auth/elogind )
- ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode(+)?] )
- selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
-"
-BDEPEND="
- elogind? ( virtual/pkgconfig )
- ncurses? ( virtual/pkgconfig )
- systemd? ( virtual/pkgconfig )
- test? ( dev-util/dejagnu )
-"
-RDEPEND="${DEPEND}
- kill? (
- !sys-apps/coreutils[kill]
- !sys-apps/util-linux[kill]
- )
- !<app-i18n/man-pages-l10n-4.2.0-r1
- !<app-i18n/man-pages-de-2.12-r1
- !<app-i18n/man-pages-pl-0.7-r1
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304
- "${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036
- "${FILESDIR}"/${PN}-3.3.17-musl-fix.patch
-)
-
-multilib_src_configure() {
- # http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
- append-lfs-flags #471102
- local myeconfargs=(
- $(multilib_native_use_with elogind) # No elogind multilib support
- $(multilib_native_use_enable kill)
- $(multilib_native_use_enable modern-top)
- $(multilib_native_use_with ncurses)
- $(use_enable nls)
- $(use_enable selinux libselinux)
- $(use_enable static-libs static)
- $(use_with systemd)
- $(use_enable unicode watch8bit)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
- emake check </dev/null #461302
-}
-
-multilib_src_install() {
- default
- dodoc "${S}"/sysctl.conf
-
- if multilib_is_native_abi ; then
- dodir /bin
- mv "${ED}"/usr/bin/ps "${ED}"/bin/ || die
- if use kill ; then
- mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die
- fi
-
- gen_usr_ldscript -a procps
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -type f -name '*.la' -delete || die
-}