8 files changed, 8 insertions, 360 deletions
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 45911375deaa..d3e8f5ca62c5 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index 9cf00b6149e0..85a3a5eae995 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -4,5 +4,5 @@ DIST c-ares-1.14.0.tar.gz 1335940 BLAKE2B d62a0b6d5ea4a2926ff8f2f719d267f9a0c97f
 DIST c-ares-1.15.0.tar.gz 1347687 BLAKE2B c4028bb2840af23274b79c73600bfcf73a348c7ab63ae3c215829e0fe2cf149f4ad38a3ec657c3997bad818ced3cacaed0579dd0dd2ef42eaffd074bdc4f22ed SHA512 a1de6c5e7e1a6a13c926aae690e83d5caa51e7313d63da1cf2af6bc757c41d585aad5466bc3ba7b7f7793cb1748fa589f40972b196728851c8b059cfc8c3be50
 EBUILD c-ares-1.13.0.ebuild 991 BLAKE2B 7280a6be8d366fa4f21d283c7a1a2b36706c6a6003adfba6ec5faee7bbd734e27866bd66e47cc06a66eecd2b0b0cb41c060fdcffe0f159be13e4e2ea625ccf40 SHA512 1906777bbfe4a76e72a870fd3f40fbd4c2c600d8feaffec2072dd5833056fcd2ce334d277d45474ebb8c10c1fab2565105fee4684dc71486e29e7c88a2d3ec98
 EBUILD c-ares-1.14.0.ebuild 1004 BLAKE2B a196f3b114548c95b8cbb3f7bd1adb5eeda613ee1a04d800695ed7600a20ebd2d9507a6ddd157d40a78d74c3210062bac1282a8da5280898aa3e11878eaf8014 SHA512 184e50603133fe1449c77a94f8a159f6f0aa3b964ad4bb62e2c63aeb36977d88edb65a858f9245216fe7a0710e1c62fdf42516f3a4fc1f2fd8d5bc2a79eff30a
-EBUILD c-ares-1.15.0.ebuild 1001 BLAKE2B 054d349ff07baf02b22a2423f24ed08199d0d66b995d91b620f30f6ee91012e0140f3a8ca2e27c259adddd2ad3ea7b43514c969e2c6c3696fe5f08c815354375 SHA512 03cdd5b956084064fa9c11492e67791ba012839b61c26950cf53b5769141166cb9c6b51760a643feaba5e5a5599734367b2a2af9d2f6962237073f75ae3dcf4b
+EBUILD c-ares-1.15.0.ebuild 1008 BLAKE2B 5532bdcb3ec72f359fca062daed6117e73c6358152d0eaa68fc57744af65138c9b50320b60d56cad627bfcf5773c63bb47880f44a860d82de5916c1f4fbf136b SHA512 7c6da72d1b212989171e1b4fa69166034a5ae68fa16ce0697adb59075d22c7dfb2e045d3852ed7254634caa8e632a122b680b309db111fc2c05d27cdfd06b450
 MISC metadata.xml 339 BLAKE2B e32a823a5af6c260cfb7ebc58dfa81bcb97ff1792aca66662e8206ad3bfb5304784e2f9ec800fe1230472510f864edcacec07df97493e1b481c157e3e5fc971b SHA512 fb726c9af8f3b9b104f13f5d7f8c1d38659848afdd619fe8c9242e8d2dea24c21a2654baca4bac96a94cadf68a0f649c87346f296e6b5d2aa5d88a4276c41755
diff --git a/net-dns/c-ares/c-ares-1.15.0.ebuild b/net-dns/c-ares/c-ares-1.15.0.ebuild
index c90ba00fe1b5..25adeaa01cad 100644
--- a/net-dns/c-ares/c-ares-1.15.0.ebuild
+++ b/net-dns/c-ares/c-ares-1.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://c-ares.haxx.se/"
 SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 IUSE="static-libs"
 
 # Subslot = SONAME of libcares.so.2
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index f4288f5b6676..8a08b4f5da35 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -1,5 +1,4 @@
 AUX 1.05-errno-r1.patch 242 BLAKE2B b02d686bbdad4178de2e8ba822feeeec5a3aa4549119c86ec806bfc34d0bebdcef7ee6bb2f57ffe73dc42e9d96b2bf08a28be7502aa8974f8f96cd32dcece178 SHA512 086d02600034d486f084fd2500aba9041dfa02110781594cdc3781a3ad7823f61f11c54c053c8c1241f58660527abe536906aba0e7f6c49ed3b8dbd74ba8f2b7
-AUX CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test25-r1.patch 9944 BLAKE2B 05be2d88ff5e8c212370cea199d7e817d07fa9ecb807c567d48b34c963e101c18bd1d785be9d46ee6cbf6f8a84ca53e4dd1432c868d9acecabbb3ffcc326f878 SHA512 6c40018bfe97f9ed2ab1bb4034ceb20089edc93514a4c9931a5e1f09cb6d9a8f221eb9652b3b1485f80df643a1fb1d2c88ff148421e86af7cf7b1485b9c61c30
 AUX CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test28.patch 9954 BLAKE2B ab189b25421c016bd24ecc34d9eae3552eeeb1303d158a2adeeb9c27b48a8935425d76f803104ba0be4bcc1bacd6cac48fb9b800c7401ea306d017525404b0cb SHA512 3ff6e971739bfe7f0fd7defd6520f4a03f88dd907668018c10efd91d03e4dbc2068773953d6feed22308d82fb2d38066b2102c6f6fd738c15c4bee6835a52dce
 AUX CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch 9914 BLAKE2B 3224e58eac5ac254359158a193b8a4c7618ff12826cce0f71b7c45e9c886ff54d1fb883d02a6b2d80801f395b721dee46390b6b5191e22cc5f2d75da06f2b08c SHA512 59e9aae2fd8e7c1e4d275066afceaade3b1276c6cda78cd58fef1dfbe9749c9e1bb415a80643b3c50a33372166aec055a9b3a6bcb3ed4cfd77e6e6038e069cff
 AUX CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch 3043 BLAKE2B 224cf29a7db357c3c421212cc240c16801ea544e1cbad65605e0ba8413139c09d37144f2f784a751015abbb99c2f36e3716c28a821b8f66edf02310c72d28417 SHA512 f830bfd2fabd4d9b4e2649bcc4061d656d4645b93829415d070b26c6a22e8e17d941666b8e776947bf9a8ef93007f77d8be57fc9911dcc6dc2b7ac607d556ba0
diff --git a/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test25-r1.patch b/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test25-r1.patch
deleted file mode 100644
index 1d132d6d4f5e..000000000000
--- a/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test25-r1.patch
+++ /dev/null
@@ -1,351 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 5ccd647..eee09dd 100644
---- a/Makefile
-+++ b/Makefile
-@@ -346,11 +346,11 @@ stralloc.h iopause.h taia.h tai.h uint64.h taia.h
- 	./compile dns_txt.c
- 
- dnscache: \
--load dnscache.o droproot.o okclient.o log.o cache.o query.o \
-+load dnscache.o droproot.o okclient.o log.o cache.o query.o qmerge.o \
- response.o dd.o roots.o iopause.o prot.o dns.a env.a alloc.a buffer.a \
- libtai.a unix.a byte.a socket.lib
- 	./load dnscache droproot.o okclient.o log.o cache.o \
--	query.o response.o dd.o roots.o iopause.o prot.o dns.a \
-+	query.o qmerge.o response.o dd.o roots.o iopause.o prot.o dns.a \
- 	env.a alloc.a buffer.a libtai.a unix.a byte.a  `cat \
- 	socket.lib`
- 
-@@ -371,7 +371,7 @@ compile dnscache.c env.h exit.h scan.h strerr.h error.h ip4.h \
- uint16.h uint64.h socket.h uint16.h dns.h stralloc.h gen_alloc.h \
- iopause.h taia.h tai.h uint64.h taia.h taia.h byte.h roots.h fmt.h \
- iopause.h query.h dns.h uint32.h alloc.h response.h uint32.h cache.h \
--uint32.h uint64.h ndelay.h log.h uint64.h okclient.h droproot.h
-+uint32.h uint64.h ndelay.h log.h uint64.h okclient.h droproot.h maxclient.h
- 	./compile dnscache.c
- 
- dnsfilter: \
-@@ -749,11 +749,16 @@ qlog.o: \
- compile qlog.c buffer.h qlog.h uint16.h
- 	./compile qlog.c
- 
-+qmerge.o: \
-+compile qmerge.c qmerge.h dns.h stralloc.h gen_alloc.h iopause.h \
-+taia.h tai.h uint64.h log.h maxclient.h
-+	./compile qmerge.c
-+
- query.o: \
- compile query.c error.h roots.h log.h uint64.h case.h cache.h \
- uint32.h uint64.h byte.h dns.h stralloc.h gen_alloc.h iopause.h \
- taia.h tai.h uint64.h taia.h uint64.h uint32.h uint16.h dd.h alloc.h \
--response.h uint32.h query.h dns.h uint32.h
-+response.h uint32.h query.h dns.h uint32.h qmerge.h
- 	./compile query.c
- 
- random-ip: \
-diff --git a/dnscache.c b/dnscache.c
-index abcba69..c84e4b8 100644
---- a/dnscache.c
-+++ b/dnscache.c
-@@ -23,6 +23,7 @@
- #include "log.h"
- #include "okclient.h"
- #include "droproot.h"
-+#include "maxclient.h"
- 
- long interface;
- 
-@@ -59,7 +60,6 @@ uint64 numqueries = 0;
- 
- static int udp53;
- 
--#define MAXUDP 200
- static struct udpclient {
-   struct query q;
-   struct taia start;
-@@ -136,7 +136,6 @@ void u_new(void)
- 
- static int tcp53;
- 
--#define MAXTCP 20
- struct tcpclient {
-   struct query q;
-   struct taia start;
-diff --git a/log.c b/log.c
-index df465e2..1b0d98c 100644
---- a/log.c
-+++ b/log.c
-@@ -149,6 +149,13 @@ void log_tx(const char *q,const char qtype[2],const char *control,const char ser
-   line();
- }
- 
-+void log_tx_piggyback(const char *q, const char qtype[2], const char *control)
-+{
-+  string("txpb ");
-+  logtype(qtype); space(); name(q); space(); name(control);
-+  line();
-+}
-+
- void log_cachedanswer(const char *q,const char type[2])
- {
-   string("cached "); logtype(type); space();
-diff --git a/log.h b/log.h
-index fe62fa3..d9a829b 100644
---- a/log.h
-+++ b/log.h
-@@ -18,6 +18,7 @@ extern void log_cachednxdomain(const char *);
- extern void log_cachedns(const char *,const char *);
- 
- extern void log_tx(const char *,const char *,const char *,const char *,unsigned int);
-+extern void log_tx_piggyback(const char *,const char *,const char *);
- 
- extern void log_nxdomain(const char *,const char *,unsigned int);
- extern void log_nodata(const char *,const char *,const char *,unsigned int);
-diff --git a/maxclient.h b/maxclient.h
-new file mode 100644
-index 0000000..e52fcd1
---- /dev/null
-+++ b/maxclient.h
-@@ -0,0 +1,7 @@
-+#ifndef MAXCLIENT_H
-+#define MAXCLIENT_H
-+
-+#define MAXUDP 200
-+#define MAXTCP 20
-+
-+#endif /* MAXCLIENT_H */
-diff --git a/qmerge.c b/qmerge.c
-new file mode 100644
-index 0000000..7c92299
---- /dev/null
-+++ b/qmerge.c
-@@ -0,0 +1,115 @@
-+#include "qmerge.h"
-+#include "byte.h"
-+#include "log.h"
-+#include "maxclient.h"
-+
-+#define QMERGE_MAX (MAXUDP+MAXTCP)
-+struct qmerge inprogress[QMERGE_MAX];
-+
-+static
-+int qmerge_key_init(struct qmerge_key *qmk, const char *q, const char qtype[2],
-+    const char *control)
-+{
-+  if (!dns_domain_copy(&qmk->q, q)) return 0;
-+  byte_copy(qmk->qtype, 2, qtype);
-+  if (!dns_domain_copy(&qmk->control, control)) return 0;
-+  return 1;
-+}
-+
-+static
-+int qmerge_key_equal(struct qmerge_key *a, struct qmerge_key *b)
-+{
-+  return
-+    byte_equal(a->qtype, 2, b->qtype) &&
-+    dns_domain_equal(a->q, b->q) &&
-+    dns_domain_equal(a->control, b->control);
-+}
-+
-+static
-+void qmerge_key_free(struct qmerge_key *qmk)
-+{
-+  dns_domain_free(&qmk->q);
-+  dns_domain_free(&qmk->control);
-+}
-+
-+void qmerge_free(struct qmerge **x)
-+{
-+  struct qmerge *qm;
-+
-+  qm = *x;
-+  *x = 0;
-+  if (!qm || !qm->active) return;
-+
-+  qm->active--;
-+  if (!qm->active) {
-+    qmerge_key_free(&qm->key);
-+    dns_transmit_free(&qm->dt);
-+  }
-+}
-+
-+int qmerge_start(struct qmerge **qm, const char servers[64], int flagrecursive,
-+    const char *q, const char qtype[2], const char localip[4],
-+    const char *control)
-+{
-+  struct qmerge_key k;
-+  int i;
-+  int r;
-+
-+  qmerge_free(qm);
-+
-+  byte_zero(&k, sizeof k);
-+  if (!qmerge_key_init(&k, q, qtype, control)) return -1;
-+  for (i = 0; i < QMERGE_MAX; i++) {
-+    if (!inprogress[i].active) continue;
-+    if (!qmerge_key_equal(&k, &inprogress[i].key)) continue;
-+    log_tx_piggyback(q, qtype, control);
-+    inprogress[i].active++;
-+    *qm = &inprogress[i];
-+    qmerge_key_free(&k);
-+    return 0;
-+  }
-+
-+  for (i = 0; i < QMERGE_MAX; i++)
-+    if (!inprogress[i].active)
-+      break;
-+  if (i == QMERGE_MAX) return -1;
-+
-+  log_tx(q, qtype, control, servers, 0);
-+  r = dns_transmit_start(&inprogress[i].dt, servers, flagrecursive, q, qtype, localip);
-+  if (r == -1) { qmerge_key_free(&k); return -1; }
-+  inprogress[i].active++;
-+  inprogress[i].state = 0;
-+  qmerge_key_free(&inprogress[i].key);
-+  byte_copy(&inprogress[i].key, sizeof k, &k);
-+  *qm = &inprogress[i];
-+  return 0;
-+}
-+
-+void qmerge_io(struct qmerge *qm, iopause_fd *io, struct taia *deadline)
-+{
-+  if (qm->state == 0) {
-+    dns_transmit_io(&qm->dt, io, deadline);
-+    qm->state = 1;
-+  }
-+  else {
-+    io->fd = -1;
-+    io->events = 0;
-+  }
-+}
-+
-+int qmerge_get(struct qmerge **x, const iopause_fd *io, const struct taia *when)
-+{
-+  int r;
-+  struct qmerge *qm;
-+
-+  qm = *x;
-+  if (qm->state == -1) return -1; /* previous error */
-+  if (qm->state == 0) return 0; /* no packet */
-+  if (qm->state == 2) return 1; /* already got packet */
-+
-+  r = dns_transmit_get(&qm->dt, io, when);
-+  if (r == -1) { qm->state = -1; return -1; } /* error */
-+  if (r == 0) { qm->state = 0; return 0; } /* must wait for i/o */
-+  if (r == 1) { qm->state = 2; return 1; } /* got packet */
-+  return -1; /* bug */
-+}
-diff --git a/qmerge.h b/qmerge.h
-new file mode 100644
-index 0000000..9a58157
---- /dev/null
-+++ b/qmerge.h
-@@ -0,0 +1,24 @@
-+#ifndef QMERGE_H
-+#define QMERGE_H
-+
-+#include "dns.h"
-+
-+struct qmerge_key {
-+  char *q;
-+  char qtype[2];
-+  char *control;
-+};
-+
-+struct qmerge {
-+  int active;
-+  struct qmerge_key key;
-+  struct dns_transmit dt;
-+  int state; /* -1 = error, 0 = need io, 1 = need get, 2 = got packet */
-+};
-+
-+extern int qmerge_start(struct qmerge **,const char *,int,const char *,const char *,const char *,const char *);
-+extern void qmerge_io(struct qmerge *,iopause_fd *,struct taia *);
-+extern int qmerge_get(struct qmerge **,const iopause_fd *,const struct taia *);
-+extern void qmerge_free(struct qmerge **);
-+
-+#endif /* QMERGE_H */
-diff --git a/query.c b/query.c
-index d61b20c..d9be8b8 100644
---- a/query.c
-+++ b/query.c
-@@ -84,7 +84,7 @@ static void cleanup(struct query *z)
-   int j;
-   int k;
- 
--  dns_transmit_free(&z->dt);
-+  qmerge_free(&z->qm);
-   for (j = 0;j < QUERY_MAXALIAS;++j)
-     dns_domain_free(&z->alias[j]);
-   for (j = 0;j < QUERY_MAXLEVEL;++j) {
-@@ -624,15 +624,9 @@ static int doit(struct query *z,int state)
-   if (j == 256) goto SERVFAIL;
- 
-   dns_sortip6(z->servers[z->level],256);
--  if (z->level) {
--    dtype = z->ipv6[z->level] ? DNS_T_AAAA : DNS_T_A;
--    log_tx(z->name[z->level],dtype,z->control[z->level],z->servers[z->level],z->level);
--    if (dns_transmit_start(&z->dt,z->servers[z->level],flagforwardonly,z->name[z->level],dtype,z->localip) == -1) goto DIE;
--  }
--  else {
--    log_tx(z->name[0],z->type,z->control[0],z->servers[0],0);
--    if (dns_transmit_start(&z->dt,z->servers[0],flagforwardonly,z->name[0],z->type,z->localip) == -1) goto DIE;
--  }
-+  dtype = z->level ? (z->ipv6[z->level] ? DNS_T_AAAA : DNS_T_A) : z->type;
-+  if (qmerge_start(&z->qm,z->servers[z->level],flagforwardonly,z->name[z->level],dtype,z->localip,z->control[z->level]) == -1) goto DIE;
-+
-   return 0;
- 
- 
-@@ -646,10 +640,10 @@ static int doit(struct query *z,int state)
- 
-   HAVEPACKET:
-   if (++z->loop == 200) goto DIE;
--  buf = z->dt.packet;
--  len = z->dt.packetlen;
-+  buf = z->qm->dt.packet;
-+  len = z->qm->dt.packetlen;
- 
--  whichserver = z->dt.servers + 16 * z->dt.curserver;
-+  whichserver = z->qm->dt.servers + 16 * z->qm->dt.curserver;
-   control = z->control[z->level];
-   d = z->name[z->level];
- /*  dtype = z->level ? DNS_T_A : z->type; */
-@@ -1071,7 +1065,7 @@ int query_start(struct query *z,char *dn,char type[2],char class[2],char localip
- 
- int query_get(struct query *z,iopause_fd *x,struct taia *stamp)
- {
--  switch(dns_transmit_get(&z->dt,x,stamp)) {
-+  switch(qmerge_get(&z->qm,x,stamp)) {
-     case 1:
-       return doit(z,1);
-     case -1:
-@@ -1082,5 +1076,5 @@ int query_get(struct query *z,iopause_fd *x,struct taia *stamp)
- 
- void query_io(struct query *z,iopause_fd *x,struct taia *deadline)
- {
--  dns_transmit_io(&z->dt,x,deadline);
-+  qmerge_io(z->qm,x,deadline);
- }
-diff --git a/query.h b/query.h
-index 61812aa..93a322e 100644
---- a/query.h
-+++ b/query.h
-@@ -1,7 +1,7 @@
- #ifndef QUERY_H
- #define QUERY_H
- 
--#include "dns.h"
-+#include "qmerge.h"
- #include "uint32.h"
- 
- #define QUERY_MAXLEVEL 5
-@@ -22,7 +22,7 @@ struct query {
-   uint32 scope_id;
-   char type[2];
-   char class[2];
--  struct dns_transmit dt;
-+  struct qmerge *qm;
- } ;
- 
- extern int query_start(struct query *,char *,char *,char *,char *,unsigned int);
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index aff5fabdc591..761c9dfdf019 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,5 +1,5 @@
 DIST libidn2-2.1.1a.tar.gz 2122867 BLAKE2B 616bdf4c2c5095a29511db293fa908d4cac23f77e17bb6c60f8aa8c8a8a10f1b4e8b84b82406599fe0cc7122fd89c50ec252f1716198f72496800a19924fa09c SHA512 404a739e33d324f700ac8e8119de3feef0de778bbb11be09049cb64eab447cd101883f6d489cca1e88c230f58bcaf9758fe102e571b6501450aa750ec2a4a9c6
 DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
-EBUILD libidn2-2.1.1a.ebuild 1310 BLAKE2B 93808e974baf42da581cf1d57d2be56a1bb330048b67496ac4edec26aa2de822580f63a5ce054262b23120ffd7db641ffd46d096f4d61ded1aeef46dcafd35bf SHA512 4354f1e07a501f06de95a4858f0d811090f4d2a414006cd55612453d82431fbaaf0983024ce7b725e04820c2b2ca379a486d1302efb630ef4a4d050b036b2dab
-EBUILD libidn2-99999.ebuild 1414 BLAKE2B e6218cc1f9e34463fdfb2add7ca5046614ed8a5e628197f26e1a7ac5479434de6ff74d4ae13d397551fbb2775e66a562501483b2fc84756ec078898ebc668dc9 SHA512 3205a27af62f61a568dfbe152c7b566be2c893926f06f6bed0c673f630699d2df55167b2cda444e05ca260a82dd0bcfbae229bfe5a2115846f1d243ef689a44d
+EBUILD libidn2-2.1.1a-r1.ebuild 1319 BLAKE2B 15d25cfc11f73533d94bdd40c20bb3bcf313c7b79e3a2750b12af32f712b0156469b4a1198ab3f8653246ef19e1ebccb29a3b8f0bbf04d2ed0a4261b3497cb91 SHA512 a5c09aa232d92230a4ed703c8ca022b387fd2c2e9afd287f0bfa69912c97210fc79da5876b520d573dd7983604967e89a62911ebbc82d3462bde4736f0bb2b7d
+EBUILD libidn2-99999.ebuild 1416 BLAKE2B ea56153f0eb2ca68fcd2fd170e2cfeedc8399a3bf5ba78d8bc78250ebbd59dd05e4074dee3bb4d3caf67b4c3391de331a495423d0f0cdc16c953fd4fa75ea278 SHA512 66f96b4e87d01dbb779d29ab83cfe6c1e756dcbc5db1555ca9128f0faa7888156c45e71befb2daa45c86aa77afeb9bdd6551b6336b955f57fb4179d1b2c6e512
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/net-dns/libidn2/libidn2-2.1.1a.ebuild b/net-dns/libidn2/libidn2-2.1.1a-r1.ebuild
index 59ac826e2a2d..c6f5d3489584 100644
--- a/net-dns/libidn2/libidn2-2.1.1a.ebuild
+++ b/net-dns/libidn2/libidn2-2.1.1a-r1.ebuild
@@ -11,8 +11,8 @@ SRC_URI="
 "
 
 LICENSE="GPL-2+ LGPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0/2"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-dns/libidn2/libidn2-99999.ebuild b/net-dns/libidn2/libidn2-99999.ebuild
index 9c8ed496c8ac..408ce3cd2ad1 100644
--- a/net-dns/libidn2/libidn2-99999.ebuild
+++ b/net-dns/libidn2/libidn2-99999.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://gitlab.com/libidn/libidn2.git/"
 SRC_URI="mirror://gnu/libunistring/libunistring-0.9.10.tar.gz"
 
 LICENSE="GPL-2+ LGPL-3+"
-SLOT="0"
+SLOT="0/2"
 KEYWORDS=""
 IUSE="static-libs"