Updating liguros repo

29 files changed, 667 insertions, 126 deletions

diff --git a/app-doc/geant-docs/Manifest b/app-doc/geant-docs/Manifest
index d3ade9741fc6..d1fa378f7ce0 100644
--- a/app-doc/geant-docs/Manifest
+++ b/app-doc/geant-docs/Manifest
@@ -1,14 +1,21 @@
 DIST BookFAQ-4.10.6.pdf 183227 BLAKE2B 50065fea13a2f5fed0e0de52b316968da05ebaf7fc8704fd9860b07ac83af9423ff2937a5b134a987b32dfec108b86548e4b0e0bcaddb1608850f336dc38ba7b SHA512 99a80740dd996d0a5f6ad198d82b9cbf991dac13096f4220530a9e87103791b65a43c887797efb261e2e461a0a89e652f18665095a661e68d1bbd763d8385d6d
 DIST BookFAQ-4.10.6c.pdf 183227 BLAKE2B 50065fea13a2f5fed0e0de52b316968da05ebaf7fc8704fd9860b07ac83af9423ff2937a5b134a987b32dfec108b86548e4b0e0bcaddb1608850f336dc38ba7b SHA512 99a80740dd996d0a5f6ad198d82b9cbf991dac13096f4220530a9e87103791b65a43c887797efb261e2e461a0a89e652f18665095a661e68d1bbd763d8385d6d
+DIST BookFAQ-4.10.7.pdf 182327 BLAKE2B 5a625b1d455a7313ccd9a36296b11390c7497ba7cab4fe952933c29b9e706cac370332057a79d444100130dc5d4097258f71c6d51e36cc7b74cd62d8685f5479 SHA512 79a10f6b0d318ef19b05fc28b499d7d60a358a7a15cf8194a4a935721e35fe34c50b05b50032eb7134183b4ef8f4fc8f43f742007e2ffa0db0bf9c6ddd8ec917
 DIST BookForApplicationDevelopers-4.10.6.pdf 3731281 BLAKE2B 40a7ba97dbde79bbdfcf800922bad6e8678818fcb49d175a1f8514dff1c893036fddc9f5a04710961a9612fa7d5ce9e422e5bf12d025f665cc60c29af4094b23 SHA512 1b78eb945bd8819daa0d218d069e9a799736ce8e8added481038e4c61619f533491b5d1119791e0adefb5c5bf0eedcc36435b23120ea3276977c459d20e1ee3c
 DIST BookForApplicationDevelopers-4.10.6c.pdf 3731281 BLAKE2B 40a7ba97dbde79bbdfcf800922bad6e8678818fcb49d175a1f8514dff1c893036fddc9f5a04710961a9612fa7d5ce9e422e5bf12d025f665cc60c29af4094b23 SHA512 1b78eb945bd8819daa0d218d069e9a799736ce8e8added481038e4c61619f533491b5d1119791e0adefb5c5bf0eedcc36435b23120ea3276977c459d20e1ee3c
+DIST BookForApplicationDevelopers-4.10.7.pdf 3796649 BLAKE2B 75acd17cfd29245604fb95ffd606b72ef59943d3916e34e0c33ed271d92f2091994c99ebbae0b95fc09bc42092e1983a320142bc62a7156d702584dd276273ec SHA512 273c0b0ca94dc9d26b44955ea13150417e766b08762b5b2c94d743fbf6ea7b47dada9009cc8765b62e3e7e6a2ad37b95168c45f206e20cbb23cea9c577da3f64
 DIST BookForToolkitDevelopers-4.10.6.pdf 7331646 BLAKE2B f5ef48bf09284e1207dbfd9513c096dba0595dd357caf45f52aa164206fb0c24935844b3b45f95d606339756c0a9bd558965b78de7cb62abc5bfd74a2b01bfbd SHA512 e108577c2d3dba45422fd5523b2a6fc222457e0cae76e34ebb2d1f4692b4ff9714a8a9f1ae95307aaae528b86373a844821a4a073733185ee56a3df94ce6e24a
 DIST BookForToolkitDevelopers-4.10.6c.pdf 7331646 BLAKE2B f5ef48bf09284e1207dbfd9513c096dba0595dd357caf45f52aa164206fb0c24935844b3b45f95d606339756c0a9bd558965b78de7cb62abc5bfd74a2b01bfbd SHA512 e108577c2d3dba45422fd5523b2a6fc222457e0cae76e34ebb2d1f4692b4ff9714a8a9f1ae95307aaae528b86373a844821a4a073733185ee56a3df94ce6e24a
+DIST BookForToolkitDevelopers-4.10.7.pdf 7336024 BLAKE2B f217c2bd01b73138f5b6b7f4211f5277fe2ea0f48e9849fedc4d5c56b766b69705fac2cf3d7523c8d008d6a546e4753ce485d852c4b8886a2403c6ba7212704e SHA512 62a68b3c02dc301f3c627da3b029620606e975316f90637b76e06e5e766647608d69eb29a14fdbe3264401d664eecd5d128b9990cef0c5f6f69d244dc804cfb8
 DIST Geant4InstallationGuide-4.10.6.pdf 327501 BLAKE2B 9379ce8243dcdc08f764f7217b86d1dd414c649cfc163702a16e883774be9ea2242b8f326672be0088dd180de727c95539227d8d17002f0bf79e74ecf5a5955c SHA512 3c480f493d093d22c6cf4378ddcebd7d192684a4202597fe04640e695cecc7ec36fb403311eae8a59fd88a5136d5734fadf03174b3391cdc06744a7b91834caa
 DIST Geant4InstallationGuide-4.10.6c.pdf 327501 BLAKE2B 9379ce8243dcdc08f764f7217b86d1dd414c649cfc163702a16e883774be9ea2242b8f326672be0088dd180de727c95539227d8d17002f0bf79e74ecf5a5955c SHA512 3c480f493d093d22c6cf4378ddcebd7d192684a4202597fe04640e695cecc7ec36fb403311eae8a59fd88a5136d5734fadf03174b3391cdc06744a7b91834caa
+DIST Geant4InstallationGuide-4.10.7.pdf 282056 BLAKE2B 36e3ce01c836796973a63f1f48248024d55e6cb4c2383aa245baaf85b57fbc722d2ff518c11078434571160d2ccfe8d8b7770c58e31a24b264100cdf792b7508 SHA512 13372a61629c6ccadbec4416da06db1c8f53be5f69d8918997643de16f8547d74eb604cbf1b6fba55001093ce3cfbf74f0ebf249cc6f7dae877c9397d67d153b
 DIST IntroductionToGeant4-4.10.6.pdf 142963 BLAKE2B 69b3594fbe888c4d00cf41f27a20a4127df970d4b58da68ab921245b7a888f3d3e439c6bc2fd2b32b7720aef6e867159ea1dcc22a66f4fb91c78c7a8c60ff255 SHA512 ef04dfc8ef49f05d3eaeb625fa61d74c6b59dd1b3504d63ddf6a0c80dd547ca03f5ce0cd28fdd7e9f1638bb91ce7dbea059cc5ae26ed776d78767cddf8b237be
 DIST IntroductionToGeant4-4.10.6c.pdf 142963 BLAKE2B 69b3594fbe888c4d00cf41f27a20a4127df970d4b58da68ab921245b7a888f3d3e439c6bc2fd2b32b7720aef6e867159ea1dcc22a66f4fb91c78c7a8c60ff255 SHA512 ef04dfc8ef49f05d3eaeb625fa61d74c6b59dd1b3504d63ddf6a0c80dd547ca03f5ce0cd28fdd7e9f1638bb91ce7dbea059cc5ae26ed776d78767cddf8b237be
+DIST IntroductionToGeant4-4.10.7.pdf 142118 BLAKE2B 975906d4cc1dd2a54bd283c228cc4ff577f842eac853b491899dbce243732231843ee9296c4511f171fdb089f98a4bf8dc14fbed85b3e3fd908f77d7e4395a6c SHA512 940cfe00e9ffac83ceedde03438a2b05b80ce6f7d763811924ec07e2eb8f69516c3a2ba18bf7bfab37c1026a00481d483129835830ecfd75e4277ef063dbd464
 DIST PhysicsListGuide-4.10.6.pdf 343740 BLAKE2B f53d7e06692af87aeee32a43406ff8388bc491e3cdfb37c41106e6d0848433ab3ab8c12da2160dc4a89593998f40d3447a026e1b294e989c902352f01e941d68 SHA512 58ffc1ed365f14cd03dce76ce98a6ef54d52bb4b4fa5d6906e64cbb8e81045e2ed980815760d5a25b95883c01ec081bfc8a21def2b43f9b61964cb50a79b5bfd
 DIST PhysicsListGuide-4.10.6c.pdf 343740 BLAKE2B f53d7e06692af87aeee32a43406ff8388bc491e3cdfb37c41106e6d0848433ab3ab8c12da2160dc4a89593998f40d3447a026e1b294e989c902352f01e941d68 SHA512 58ffc1ed365f14cd03dce76ce98a6ef54d52bb4b4fa5d6906e64cbb8e81045e2ed980815760d5a25b95883c01ec081bfc8a21def2b43f9b61964cb50a79b5bfd
+DIST PhysicsListGuide-4.10.7.pdf 347016 BLAKE2B eaf1ba5fadf80180478715e69074e88377a036f4e69d42dbff50b8c8112ecfe32f6265b7397965432b077c34b4e81d8740f008e03f1445b697702d521b1e6944 SHA512 ca90ccfecd9f1c8a3cc34589359d3d1e5ccd8499a2d747fe8735a776b3dd7815e6090d01e42beca2c61c330bc21e34ea0948e8e62cea7ed1e59f61fbad102799
 DIST PhysicsReferenceManual-4.10.6.pdf 19489188 BLAKE2B 4323a460a62a9cb7a1bf575489ab02f15bb96dfe017a19d71e15f6d3a06ed8355246c2d5f362601ca5dff9cfad1e0032a85cc8aac88e150dca36308925016efe SHA512 7e42749e578809e89ed589498e18e15fa2a62cac61668e628c77af093a85454d79a5738f4ca034c73a2fb7c67afb9a563e9ffc16a20d85fdbab9f57b6bda4d55
 DIST PhysicsReferenceManual-4.10.6c.pdf 19489188 BLAKE2B 4323a460a62a9cb7a1bf575489ab02f15bb96dfe017a19d71e15f6d3a06ed8355246c2d5f362601ca5dff9cfad1e0032a85cc8aac88e150dca36308925016efe SHA512 7e42749e578809e89ed589498e18e15fa2a62cac61668e628c77af093a85454d79a5738f4ca034c73a2fb7c67afb9a563e9ffc16a20d85fdbab9f57b6bda4d55
+DIST PhysicsReferenceManual-4.10.7.pdf 19522499 BLAKE2B 9d386c81910ac695c172c2c692ce5b8d6c4b9e7213f07851ddbbad43b299da5788d1027238a25d00fbcae47091c5194d43fd6b8abe0d6385376c4cd98c6f73a2 SHA512 269ddc752a11c8257e9fe042dcc0a115a1bdeb5f312dd16378df6db751477f36758189894a0f07a6303f8fef9a26cff05e99aa691fb83e17c8db3a1de674a8ae
diff --git a/app-doc/geant-docs/geant-docs-4.10.7.ebuild b/app-doc/geant-docs/geant-docs-4.10.7.ebuild
new file mode 100644
index 000000000000..56ae17a3ab7e
--- /dev/null
+++ b/app-doc/geant-docs/geant-docs-4.10.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=V$(ver_cut 2-3)
+
+DESCRIPTION="User documentation for Geant4 physics simulation toolkit"
+HOMEPAGE="https://geant4.web.cern.ch/support/user_documentation"
+SRC_DOC="https://geant4-userdoc.web.cern.ch/geant4-userdoc/UsersGuides"
+SRC_URI="
+	${SRC_DOC}/FAQ/BackupVersions/${MY_PV}/fo/BookFAQ.pdf
+		-> BookFAQ-${PV}.pdf
+	${SRC_DOC}/ForApplicationDeveloper/BackupVersions/${MY_PV}/fo/BookForApplicationDevelopers.pdf
+		-> BookForApplicationDevelopers-${PV}.pdf
+	${SRC_DOC}/ForToolkitDeveloper/BackupVersions/${MY_PV}/fo/BookForToolkitDevelopers.pdf
+		-> BookForToolkitDevelopers-${PV}.pdf
+	${SRC_DOC}/InstallationGuide/BackupVersions/${MY_PV}/fo/Geant4InstallationGuide.pdf
+		-> Geant4InstallationGuide-${PV}.pdf
+	${SRC_DOC}/IntroductionToGeant4/BackupVersions/${MY_PV}/fo/IntroductionToGeant4.pdf
+		-> IntroductionToGeant4-${PV}.pdf
+	${SRC_DOC}/PhysicsListGuide/BackupVersions/${MY_PV}/fo/PhysicsListGuide.pdf
+		-> PhysicsListGuide-${PV}.pdf
+	${SRC_DOC}/PhysicsReferenceManual/BackupVersions/${MY_PV}/fo/PhysicsReferenceManual.pdf
+		-> PhysicsReferenceManual-${PV}.pdf
+"
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${DISTDIR}"
+
+src_install() {
+	local doc
+	for doc in *.pdf; do
+		newdoc ${doc} ${doc/-${PV}};
+	done
+}
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
index a0bca80effe2..070ebbf0a35c 100644
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@@ -2,3 +2,4 @@ DIST elt-patches-20170317.tar.xz 23356 BLAKE2B 8e402496e4c064a56a6bafbf369bf9771
 DIST elt-patches-20170422.tar.xz 27864 BLAKE2B 0b6a764a7030d78618139f2c2a51f33b224f38e9f117ce45d119375e20566df55266f9684b53d3d311f91570803f937922f93801ad5a3664dae70828ebbedd12 SHA512 90867925f797ec815cfd8f45655cbc0bdc5f46e1a84792988ca76aaed97489907a926acf8f50c0499c56f6e70ea7081732f71c74a8d49bf24a6d265a0a4202dc
 DIST elt-patches-20170815.tar.xz 27864 BLAKE2B ca699e3fc3f5903f660fba70aa424603d42ef3b3aaa5e8768cfad0561d423972b21e75e578faeaaa89d8b0932f5161079a57e5d0d4ab7b56d5a09b91fb0e8d46 SHA512 deba10767b6a8cb5e8139e6f47a30e6f8a4a9312adb1d3e0199df24321d89601915fc91003da2d14fda679e7cbd30a4d4cf39d94ba57bce06432eefc168650dd
 DIST elt-patches-20170826.1.tar.xz 27912 BLAKE2B 886644713651448784e040fbcde6ef11f98f12abffb347f2213b990c1f0ec2df3af6c729c18781235a393e6de907b4da6ec5d140f7fb856466de6e7cefd54b00 SHA512 30a1e8b77d2963b7c56eef3a7a0a576ea6d30f1133c7bf6ad3b5b57cbe3e2de5e8cfbc50a929fea589b42ca02802a7ed16ccf7adb868290a2cc3add5b4fc77d3
+DIST elt-patches-20201205.tar.xz 39240 BLAKE2B aa2e2377f0d0cba14f38c59664174d066eff04c9d2a71346c998c4324987fbce25cfd91b79e8e40bde0d81bf7d3c43126bffd0a6b0b219aaad11f4f9f22abde4 SHA512 67e199f060e2c93e01b7a7809f52c0a18d82e86f1b1eb34b965c2acd24e5538a874b820028e363d3002cf58b43c2fe3376ae28d2bef0ca81feabb90c83ae47c2
diff --git a/app-portage/elt-patches/elt-patches-20201205.ebuild b/app-portage/elt-patches/elt-patches-20201205.ebuild
new file mode 100644
index 000000000000..e6ebc44e78a3
--- /dev/null
+++ b/app-portage/elt-patches/elt-patches-20201205.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Collection of patches for libtool.eclass"
+HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/"
+SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="sys-apps/gentoo-functions"
+DEPEND="app-arch/xz-utils"
+
+src_compile() {
+	emake rootprefix="${EPREFIX}" libdirname="$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" rootprefix="${EPREFIX}" install
+}
diff --git a/dev-go/go-bindata/Manifest b/dev-go/go-bindata/Manifest
index bab3f4c9d656..e89354dd767c 100644
--- a/dev-go/go-bindata/Manifest
+++ b/dev-go/go-bindata/Manifest
@@ -1 +1 @@
-DIST go-bindata-3.21.0.tar.gz 15615959 BLAKE2B b635869202025992a7f92645de7aa96fadd18f5c99d5e312a1e645712940d05342e192401eb5aec04aac72c50b17d1fe370ef317356d47a40141cec3dc8f01a7 SHA512 004b9f0389d26f82d1419e8e8ad249d33583e85c4b4aaa4e36215bd5289a24146a237bcb55b9d51ff29c1b01ebd822ff60dcf205cb73d34f810e6838df172265
+DIST go-bindata-3.1.3.tar.gz 21280 BLAKE2B cf54b50113006f02eeab47312fcf1eaa1e4b820847ee9c579318a5aac0b720648f73cbf3d2d41e120ea79b65dc3dcfa32accaff16ed4610bcf9a9dd317e9d819 SHA512 870f939cfb07b43c54000d39fa37e8151ca5c20d13eac9bde59e7ec3e2693d8386a1ea4b5372171dac42f8a4f69a754445cb9a4fa51a7a7ba9ec54f3e8a2a2f6
diff --git a/dev-go/go-bindata/go-bindata-3.1.3.ebuild b/dev-go/go-bindata/go-bindata-3.1.3.ebuild
new file mode 100644
index 000000000000..10d5d8179d7e
--- /dev/null
+++ b/dev-go/go-bindata/go-bindata-3.1.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2020 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=7
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/go-bindata/go-bindata/..."
+KEYWORDS="amd64 ~arm ~arm64"
+
+DESCRIPTION="A small utility which generates Go code from any file"
+HOMEPAGE="https://github.com/go-bindata/go-bindata"
+SRC_URI="https://github.com/go-bindata/go-bindata/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="CC-PD"
+SLOT="0/${PVR}"
+
+src_install() {
+	GOBIN=${S}/bin \
+		golang-build_src_install
+	dobin bin/*
+}
diff --git a/dev-go/go-bindata/go-bindata-3.21.0.ebuild b/dev-go/go-bindata/go-bindata-3.21.0.ebuild
deleted file mode 100644
index 02d914964278..000000000000
--- a/dev-go/go-bindata/go-bindata-3.21.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Go Overlay Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# NOTE: The original github.com/jteeuwen/go-bindata is no more maintained.
-#       Instead, we use a fork which is API compatible.
-#       For more details, see https://github.com/Dr-Terrible/go-overlay/issues/76
-GOLANG_PKG_IMPORTPATH="github.com/kevinburke"
-GOLANG_PKG_ARCHIVEPREFIX="v"
-GOLANG_PKG_IS_MULTIPLE=1
-GOLANG_PKG_HAVE_TEST=1
-
-inherit golang-single
-
-DESCRIPTION="A small utility for embedding binary data in a GoLang program."
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
diff --git a/dev-go/go-bindata/metadata.xml b/dev-go/go-bindata/metadata.xml
index 0afda6620771..8c1d74d431e9 100644
--- a/dev-go/go-bindata/metadata.xml
+++ b/dev-go/go-bindata/metadata.xml
@@ -1,18 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>toffanin.mauro@gmail.com</email>
-		<name>Mauro Toffanin</name>
-		<description>Maintainer. Assign bugs to him</description>
-	</maintainer>
+  <maintainer type="project">
+    <email>dev@liguros.net</email>
+    <name>Development</name>
+  </maintainer>
 	<upstream>
-		<bugs-to>https://github.com/jteeuwen/go-bindata/issues</bugs-to>
+		<remote-id type="github">jteeuwen/go-bindata</remote-id>
 	</upstream>
-	<longdescription lang="en">
-		This package converts any file into managable Go source code. Useful for
-		embedding binary data into a go program. The file data is optionally
-		gzip compressed before being converted to a raw byte slice.
-	</longdescription>
-	<origin>go-overlay</origin>
+	<origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index 07df7a57ecc4..25d074452ccf 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -1 +1,2 @@
 DIST xmlrpc-c-1.39.11.tgz 815463 BLAKE2B 7d169d51835e64e5ac822c48b1a6d7622293c1ce1e7379985ebf6c10f3ab331c55eeff9f655cf914c4cf7e3c107fbdbd741d664489f4ad7aadb5e576ceb383c2 SHA512 13e7ddf5264436671437c0bcd698380baca35c4469f592edf79cb4cafda254fe8207ecb992ee728ed20ec70457a20bd0cf8e180ce5cf0561a38a21f1e588f584
+DIST xmlrpc-c-1.51.06.tgz 933161 BLAKE2B 8023444e14e7e41f5433cebeb0fcb7a7323dd734f658155e117d3547b4d61ef81c189395662bf68074dcf1ec5c47ee550cd18773ce8bf0bd53cb0a1764cce945 SHA512 2927fc8c01d42b6f838d8b0c839f09a7dd0d1ddc5a3d7b36c9d479f1c7bf7fdf14923f640883f98ba66067eda0f5379737bf3a5bc9d4b9abe1a7eff7d7def066
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06.ebuild
new file mode 100644
index 000000000000..25b4188c4fbd
--- /dev/null
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html
+# 1. Only the "Super Stable" series is released as a tarball
+# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/
+# Because of this, we are following the "Super Stable" release channel
+
+DESCRIPTION="A lightweigt RPC library based on XML and HTTP"
+HOMEPAGE="https://sourceforge.net/projects/xmlrpc-c/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( abyss curl cxx )"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	curl? ( net-misc/curl )
+	libxml2? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	use curl || ewarn "Curl support disabled: No client library will be built"
+}
+
+src_prepare() {
+	sed -i \
+		-e "/CFLAGS_COMMON/s|-g -O3$||" \
+		-e "/CXXFLAGS_COMMON/s|-g$||" \
+		common.mk || die
+
+	default
+}
+
+src_configure() {
+	econf \
+		--disable-libwww-client \
+		--disable-wininet-client \
+		--without-libwww-ssl \
+		$(use_enable abyss abyss-server) \
+		$(use_enable cgi cgi-server) \
+		$(use_enable curl curl-client) \
+		$(use_enable cxx cplusplus) \
+		$(use_enable libxml2 libxml2-backend) \
+		$(use_enable threads abyss-threads)
+}
+
+src_compile() {
+	default
+	# Tools building is broken in this release
+	#use tools && emake -rC "${S}"/tools
+}
+
+src_install() {
+	default
+	# Tools building is broken in this release
+	#use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
+}
diff --git a/dev-util/cppcheck/cppcheck-2.2.ebuild b/dev-util/cppcheck/cppcheck-2.2.ebuild
index 4589cb21f5d9..11db1fddb9e0 100644
--- a/dev-util/cppcheck/cppcheck-2.2.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
-inherit distutils-r1 toolchain-funcs cmake-utils
+inherit distutils-r1 toolchain-funcs cmake
 
 DESCRIPTION="Static analyzer of C/C++ code"
 HOMEPAGE="https://github.com/danmar/cppcheck"
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -40,14 +40,14 @@ src_configure() {
 		-DHAVE_RULES="$(usex pcre)"
 		-DBUILD_GUI="$(usex qt5)"
 		-DUSE_Z3="$(usex z3)"
-		-DFILESDIR="${EROOT}/usr/share/${PN}/"
+		-DFILESDIR="usr/share/${PN}/"
 		-ENABLE_OSS_FUZZ=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if use htmlreport ; then
 		pushd htmlreport || die
@@ -59,7 +59,7 @@ src_compile() {
 src_install() {
 	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
 	emake install DESTDIR="${ED}" \
-		FILESDIR="${EROOT}/usr/share/${PN}/"
+		FILESDIR="usr/share/${PN}/"
 
 	insinto "/usr/share/${PN}/cfg"
 	doins cfg/*.cfg
diff --git a/games-util/steam-launcher/Manifest b/games-util/steam-launcher/Manifest
index baad77293f63..3a93a1410923 100644
--- a/games-util/steam-launcher/Manifest
+++ b/games-util/steam-launcher/Manifest
@@ -1 +1 @@
-DIST steam_1.0.0.67.tar.gz 2959520 BLAKE2B 1a47f1d5a1fea7ba01c250f8765b2ee8bea87f0cd242ae52bdc78b51fb05c43c333efb667d3e7cf7b401a2fa5131efce176cead3c5ecdb214257fb2da75a36cf SHA512 74af8019b9d216c02860654e9a0162b1089b979e63bbe13645be2ee79414f896e9e57cbb85d762725756e99ed6333a75c8712a827dd88de2b3631bc119b6b0b8
+DIST steam_1.0.0.64.tar.gz 3013735 BLAKE2B f8e19a768ecc507fa503ad774ce2bbf31f79f8bbaf205d687153a523761cb067ae83b718a0954ec6389dbdc7b97001932163efd888de7c73a12e1dec7e429dab SHA512 4a287b993d0ba6f49041d116512a28ca827eeac280808b70542d304f0de2d489be1f75d66d614f65ae11686a78e0d026b12e983ead7843e9ad0a28f1d21bdf4c
diff --git a/games-util/steam-launcher/metadata.xml b/games-util/steam-launcher/metadata.xml
deleted file mode 100644
index 907f2c278497..000000000000
--- a/games-util/steam-launcher/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>dev@kicherer.org</email>
-		<name>Mario Kicherer</name>
-	</maintainer>
-	<longdescription>
-		This ebuild installs common files for the Steam environment,
-		like bootstrap archive and icons, but not the client itself.
-	</longdescription>
-	<upstream>
-		<bugs-to>https://github.com/anyc/steam-overlay</bugs-to>
-	</upstream>
-	<use>
-		<flag name='steamruntime'>Use the official steam runtime libraries</flag>
-	</use>
-	<origin>steam-overlay</origin>
-</pkgmetadata>
diff --git a/games-util/steam-launcher/steam-launcher-1.0.0.67.ebuild b/games-util/steam-launcher/steam-launcher-1.0.0.64.ebuild
index 87f35fafd126..350d9e8c7d5b 100644
--- a/games-util/steam-launcher/steam-launcher-1.0.0.67.ebuild
+++ b/games-util/steam-launcher/steam-launcher-1.0.0.64.ebuild
@@ -6,16 +6,16 @@ EAPI=7
 # Please report bugs/suggestions on: https://github.com/anyc/steam-overlay
 # or come to #gentoo-gamerlay in freenode IRC
 
-inherit linux-info prefix xdg-utils
+inherit linux-info prefix udev xdg-utils
 
 DESCRIPTION="Installer, launcher and supplementary files for Valve's Steam client"
 HOMEPAGE="https://steampowered.com"
-SRC_URI="https://repo.steampowered.com/steam/archive/precise/steam_${PV}.tar.gz"
+SRC_URI="https://repo-steampowered-com.steamos.cloud/steam/pool/steam/s/steam/steam_${PV}.tar.gz"
 
 LICENSE="ValveSteamLicense MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+joystick +steamruntime +udev"
+IUSE="+steamruntime"
 RESTRICT="bindist mirror test"
 
 RDEPEND="
@@ -27,9 +27,6 @@ RDEPEND="
 			x11-terms/xterm
 			)
 
-		joystick? (
-			udev? ( games-util/game-device-udev-rules )
-		)
 		steamruntime? (
 			virtual/opengl[abi_x86_32]
 			x11-libs/libX11[abi_x86_32]
@@ -89,6 +86,9 @@ src_prepare() {
 	xdg_environment_reset
 	default
 
+	sed -i 's:TAG+="uaccess":\0, TAG+="udev-acl":g' \
+		subprojects/steam-devices/*.rules || die
+
 	sed \
 		-e "s#@@PVR@@#${PVR}#g" \
 		-e "s#@@GENTOO_LD_LIBRARY_PATH@@#$(multilib_path_entries debiancompat fltk)#g" \
@@ -110,11 +110,14 @@ src_install() {
 
 	dodoc README debian/changelog
 	doman steam.6
+
+	udev_dorules subprojects/steam-devices/60-steam-{input,vr}.rules
 }
 
 pkg_postinst() {
 	xdg_icon_cache_update
 	xdg_desktop_database_update
+	udev_reload
 
 	elog "Execute ${EPREFIX}/usr/bin/steam to download and install the actual"
 	elog "client into your home folder. After installation, the script"
diff --git a/gnome-extra/nemo-fileroller/Manifest b/gnome-extra/nemo-fileroller/Manifest
index eb25f7e430ae..21000abd033a 100644
--- a/gnome-extra/nemo-fileroller/Manifest
+++ b/gnome-extra/nemo-fileroller/Manifest
@@ -1,2 +1,2 @@
-DIST 3.2.0.tar.gz 1162843 BLAKE2B 79c864f4d74e2e8d382185abd16c873b64e745ac176a2aa162db37a86a3644d3f0d8ff83c6f2e2a1986d35dba18b5ce0769926a81afd8a193cf35c443f3a1097 SHA512 961aafd1f48033e538b6da2ceee11f98e4319944709b874ad78416790e7d42fd1a82e94a1625fbcd1dbf1fac52f7734be1f58684476e97a66ca63b13ccd7a626
-DIST 4.4.0.tar.gz 790589 BLAKE2B 655edfcfb99baf2b36cc8fea4ee12a1d2f6ed9740bbae0231d8e4daacbf8e2117cbcc12420c0d6eac56eb45dd91dd632e5544581b72063d7095ed6a4dc784c8c SHA512 5ca2cf57950986fdc0f3ed5962fa8ee914ac34bf46c702a0fe0323169060ae8f300406bcb5194fbf88b50aa41e6deb8fa2ee32fdf14eedb7fd9553b10240a2c9
+DIST nemo-extensions-4.6.0.tar.gz 754433 BLAKE2B 83ce84f78a1b991edc7eca156ce7ddb792b70e467004671a00a713227488ca96576c9ab280805eff71090dc47b6eecfdeec636aa4e20d046e38241cba95de987 SHA512 b496732b984f3d4f3fc93dc96ef65b711eaa55bb9c777c19ab224e7ab138f8c6784aa2f16e9a0cc77e79581ed7a04a439955369804dbf930b835df042d7dbd32
+EBUILD nemo-fileroller-4.6.0.ebuild 633 BLAKE2B 7b754a69a1fa0ce08c74eb153eec2fc791cf79b3ddccd8ec65f26a0326e40ea41825eab08632fb7d0eb2dd52f128350ced9ce703ae5ba77479f46dd3a37dc17a SHA512 31853fae4d30f41474523f2f253270744a41bed55fa8d2cd9d3f1e61190771f169247de33ef27ffb971e6c6e4be58014d321eb9f3c25e4810030efcbc2538b86
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-3.2.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-3.2.0.ebuild
deleted file mode 100644
index 83a06b536884..000000000000
--- a/gnome-extra/nemo-fileroller/nemo-fileroller-3.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="File Roller integration for Nemo"
-HOMEPAGE="https://github.com/linuxmint/nemo-extensions"
-SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/${PV}.tar.gz"
-S="${WORKDIR}/nemo-extensions-${PV}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-DEPEND="app-arch/file-roller
-	>=gnome-extra/nemo-${PV}[introspection]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if [[ ! -e configure ]] ; then
-		./autogen.sh || die
-	fi
-}
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-4.4.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-4.4.0.ebuild
deleted file mode 100644
index a35d1af48b05..000000000000
--- a/gnome-extra/nemo-fileroller/nemo-fileroller-4.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="File Roller integration for Nemo"
-HOMEPAGE="https://github.com/linuxmint/nemo-extensions"
-SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/${PV}.tar.gz"
-S="${WORKDIR}/nemo-extensions-${PV}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-DEPEND="app-arch/file-roller
-	>=gnome-extra/nemo-${PV}"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if [[ ! -e configure ]] ; then
-		./autogen.sh || die
-	fi
-}
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-4.6.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-4.6.0.ebuild
new file mode 100644
index 000000000000..06de99fc4051
--- /dev/null
+++ b/gnome-extra/nemo-fileroller/nemo-fileroller-4.6.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Nemo file-roller integration"
+HOMEPAGE="https://github.com/linuxmint/nemo-extensions"
+SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/${PV}.tar.gz -> nemo-extensions-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="gnome-extra/nemo"
+RDEPEND="${DEPEND}
+	app-arch/file-roller"
+
+S="${WORKDIR}/nemo-extensions-${PV}/${PN}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	find "${D}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
diff --git a/net-misc/frr/frr-7.5.ebuild b/net-misc/frr/frr-7.5.ebuild
index ff9906f3ce4c..6e93234f0f4c 100644
--- a/net-misc/frr/frr-7.5.ebuild
+++ b/net-misc/frr/frr-7.5.ebuild
@@ -14,9 +14,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd"
+IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test"
 
 COMMON_DEPEND="
+	${PYTHON_DEPS}
 	acct-user/frr
 	dev-libs/json-c:0=
 	>=net-libs/libyang-1.0.184
@@ -30,19 +31,18 @@ COMMON_DEPEND="
 "
 
 BDEPEND="
-	${COMMON_DEPEND}
 	doc? ( dev-python/sphinx )
 	sys-devel/flex
 	virtual/yacc
 "
 
 DEPEND="
-	${PYTHON_DEPS}
 	${COMMON_DEPEND}
+	test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )
 "
 
 RDEPEND="
-	${DEPEND}
+	${COMMON_DEPEND}
 	$(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
 	!!net-misc/quagga
 "
@@ -53,6 +53,8 @@ PATCHES=(
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+RESTRICT="!test? ( test )"
+
 # FRR tarballs have weird format.
 S="${WORKDIR}/frr-${P}"
 
@@ -142,4 +144,7 @@ src_install() {
 	# Install init scripts
 	systemd_dounit tools/frr.service
 	newinitd "${FILESDIR}/frr-openrc-v1" frr
+
+	# Conflict files, installed by net-libs/libsmi, bug #758383
+	rm "${D}/usr/share/yang/ietf-interfaces.yang" || die
 }
diff --git a/sci-physics/geant-data/Manifest b/sci-physics/geant-data/Manifest
index 537b15f1d655..1057c9ce8b6a 100644
--- a/sci-physics/geant-data/Manifest
+++ b/sci-physics/geant-data/Manifest
@@ -1,13 +1,19 @@
 DIST G4ABLA.3.1.tar.gz 107286 BLAKE2B ff60665b01dcdb85a76028af472e6f71068b8132187701c46e5c4e8509125d34853d3c574561be22f34cc5f35503ec0808f2964888cd19259392de8054f19647 SHA512 4178870783ca015dade0b07006afc27fed095ff195251c672a0812f9c8e13908b5dfa9a127e8f3ec473f242bf7faf6d49a3371a75e669a06245722924b7c4278
+DIST G4EMLOW.7.13.tar.gz 298636910 BLAKE2B ee9c83410183a6fef3a2d44e866818a765f85aecb637879a6f96b2958e0c3675acb0a2891b6dd07c81fffabcb95dcc541f23f076b4aa1cbb2131e72b2b869b93 SHA512 8789ee0cae6d62c6e6af5f8c5f49706f37230df609cad375bef9568d13d5cd62fa1bded616385fd4790d047bb305090ba08957980fe7881d169a2a0e31693879
 DIST G4EMLOW.7.9.1.tar.gz 119756769 BLAKE2B 67be0b7ac34beb995ad4132883927fb99a78f93e7c99390c93fe897b4208a94a3ea5faaab1d04def5c248151c82d46431b411cb22303ffe941c6fe8a57d30423 SHA512 7f52ad5a3935323b60e5ea5196a64a2209337ca3d208109bceb648b95a5a3b0aa33f9a46f878884cb398e49302733c6f5b6316254261d350d038af8ec412952f
 DIST G4EMLOW.7.9.tar.gz 118027817 BLAKE2B 3456d07a0d87accbdf90049626e653488bb592f113e898e364638924259ce889940a20b7c84e40f16e654ca3fbb9e892050ce7e66a62a9e267706c5750bcd313 SHA512 6c5ae214915b273d20bec1483267279d53a015a13ed30ba1de325d489b5b34e65b227f8fd6caeb5fef28c2a582b7285002338e866f32c7f151fb1508ee55c54d
 DIST G4ENSDFSTATE.2.2.tar.gz 290632 BLAKE2B aff44d0b6512e4a227fa61a33045023652699843f80d1e90e236d491afd90be828a7bb393a4bb5b224b296d6e3f899a11027340b9e1ebffe705d08708af283fa SHA512 4feaa4229ac520d0e81ab0e31691ee899fa1f10b1a57f66b986fbe19729f7548000b8bac3519d09e91a1f7e116aa7a5bfeae5a3f5b6c3364168b51f4b5bb88c3
+DIST G4ENSDFSTATE.2.3.tar.gz 290745 BLAKE2B 89c642a43ebcb979b233cfb1af1bde9b2f4fd5a5ff2f282f8975aae9514c3579d67e66b1b3559e75a633b13d272c0f54fc41aef415463583a6920fc6e3f66b78 SHA512 0f92d1871f532a979829406a150e263ac13141e594acca6728edd1dbe0a181c03d0be23f7cbb6a6e73550dc71bf1337edb799c9845dff6df991b44ea8cb8ceec
 DIST G4INCL.1.0.tar.gz 95840 BLAKE2B 2c264b7563620cdbdb8a5e529f21766a5b5ea3e2e51047362518714d01854de8d9ca2ca2a0183ab672cc2f8a4d951327b0e1a7298799695fd48233fa5e529686 SHA512 9d769566d1728674bd6d1e59fc05882943cd240d2f0a9e47dff37fa64fe27720b20b66f6dea6d300c3c9082a22f7f71bb416df8c7d2b5bae87251c4a0113f49b
 DIST G4NDL.4.6.tar.gz 599862135 BLAKE2B 78e30dd0f02f3b7d7fce12a3a4dcb83e1405ba45f19ed2a743ee7e72be426e09a31cedb521a62a116a8a580a39c83987d4e39ab621b73e0d7a41e7dab8f36d41 SHA512 29b7d933d3e691b03cf45db0c4a9335c03f34ce57149a37b66a0f85e41d500d985f86bc8becc206d85202f129f60ea9fb1ef16bc4a9eef48cde593ffd5a85f24
 DIST G4PARTICLEXS.2.1.tar.gz 4600435 BLAKE2B 7132411824d9d3f47b5a4b1fced0a4099baed6a91596661d74ba540b91b5d12e475eb5bb364b8be7457592136fe2c629c98a9f8015a7b6fbd380c8c720078cd5 SHA512 b96c62a4cfd654381cf57eddcff10902ce42327a500eee007dc01ce4fbda6da44905d00ed9731740f6ff2ad2177194d7098b675bb7b72deba16394add81028c1
+DIST G4PARTICLEXS.3.1.tar.gz 8598195 BLAKE2B 2c45ca634991c5def3781c3c9eb801bd5e5475d46817147d3be59d4b6abdfd7f2c4fbeeb64bb0152fa45f68b82a73f2bc590a30d4d0fb0e3651fe34e3ea87121 SHA512 a4e134e15a0a6582da56bee84ae525d1e8cf126517da9bd3dea01d5149e6b0b4dd223825e851a932899e73fab8733cb9c2e7da90e09f15fb1ae792d8a6f7c18b
 DIST G4PII.1.3.tar.gz 4293607 BLAKE2B 1ddf90c0e49ea51129b08bf6eb3cdf62f88abe19325e8aec76f156da32602c0498ddee36d1598035fa21df95f9d86b99137f9a6f49d7c9ef2b8eb6081db233b1 SHA512 dc458f5845948f54315477886d28fd51ea2d45f3675f45d42e8352cc5961705d920d200097dc9b55ad826ff426a655258b970ddd5a96867f706eb14e9ebbfd1a
 DIST G4PhotonEvaporation.5.5.tar.gz 10087354 BLAKE2B c336b015c0fe8471e899b95d66c3feb3a1b9aeac01010bd840a9d9bf88b7e91924c9f2d17e5626451be8841f5b95ddf10540e05305269a97608b339d6cd5cf78 SHA512 50c27edbcc271e5af353addc08132470df9b5efdeeece8c980d8d449adea6996109b880cd9cac0abab6e0a65e8c3f5c32ac7dc998a7760196bc862ccfc87f0bd
+DIST G4PhotonEvaporation.5.7.tar.gz 10089240 BLAKE2B 5a82697f3f5f94e98ab7f6fbc033cab251d0f18d885fe3f124a0a1f8dd73ff8bf12db45ec748bc1baf24945407fdedadc0e10b237ceb587852e8fa6340dd7ac2 SHA512 5a03921c5974f329637ce74f03cad444b989c3affa22bf40b68103a6a668ac6425e85da3d0b72ce3d81c2e4360e7202cd26cbb9e20ccc355f2243cd92031496f
 DIST G4RadioactiveDecay.5.4.tar.gz 1059968 BLAKE2B 5093ca0c7e529c1f1ddb732f6d2ddb24b7533d266a325601271a73fff23fe05b57a591a5ca229e1c479c5d85dfe3a40aa00869231976e9ecf2976679030a8027 SHA512 2462c8f1503a4dde96c62d9644155a5c7de4430251c06f76b8e3dd35df98d96e34687c77cc11a9be198b918ad64585a10a81a0fef4ff26d63f0737b5b1254f17
+DIST G4RadioactiveDecay.5.6.tar.gz 1059792 BLAKE2B 610761030c01445ecd3159df0193814f96fc011e677bc9306788c93cd3089f2623aab96c1ad94edf22b0e9aed701288de465c898e3dce59540e2619947ea8f75 SHA512 825b04f79097c39aac7152484e322f87e69046ee5a8bb25b6e2d337026ae0eb0f77faed83e870816571c42c83120eda085dbbf2bd2f891f2b2932fad9078334d
 DIST G4RealSurface.2.1.1.tar.gz 133386050 BLAKE2B 68fb3ebadabe0c04a34279c9ff3a15545cfcf05ea18324d0fa776f4616feaeea2cd26af61d0078204c95c819d247963b416326433fda1e96a2918f23d4b2ff02 SHA512 f7755b41e30f8728710cf878d8783df9ac07d5394d0cf3358d9f4f6f4f73b9563c22657bdd9cf4ee7bebb9823fa530d86a64d2e0acbca77a80a411786c6b7202
+DIST G4RealSurface.2.2.tar.gz 132506346 BLAKE2B 8b725cdd4ed5739692e3c07627661921e8d7e08bd448cb70f1d9cdd7ca8e2e090f4c65ac3b4fc3fbceb96cca22bef3ac9000075df490b3ac520b515a40b2cf6e SHA512 360fc0cd829f9daa21300b4df8da294982d13659a9fe77cbdf1f5c411eace0153d8202c658525d4b82b7925524baf8e138a51ae71bdbd1f91f674fc80958ffed
 DIST G4SAIDDATA.2.0.tar.gz 38502 BLAKE2B 349608f8f8f57b091579b4892f1547c25f0c730fe8b22de3a7355f45ea08232c3ab12af64583cf4d48528b54489d0c71c724066715592766a2a51a1a6d4eb745 SHA512 cb192c10cc9805ab8d57d5f6dca595f85ac628ccac5b975b5d8ff965ed3841b9b01071ffa76469c9a03f9ca564267f5c4a300f13d8df5056b43cd71c669bd35c
 DIST G4TENDL.1.3.2.tar.gz 585100935 BLAKE2B f58bc9e4f6741d7df84559bb41542ecd4de3891b3f79d8194d3f8174de6aed6e87f8d2d648315dac988b6daf6106780b6f88398da2040e67608da8614fb2cf42 SHA512 635707dc421354d8cd596398d69745b6038a80c44b7284951a3e0966829c08ac731bd42f7321adfab75d06d868f99e466c6f1425685770568f44ec6c1035903f
diff --git a/sci-physics/geant-data/geant-data-4.10.7.ebuild b/sci-physics/geant-data/geant-data-4.10.7.ebuild
new file mode 100644
index 000000000000..43db6debe2ed
--- /dev/null
+++ b/sci-physics/geant-data/geant-data-4.10.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Data files for Geant4 physical processes"
+HOMEPAGE="https://geant4.web.cern.ch"
+SRC_DATA="https://geant4-data.web.cern.ch/geant4-data/datasets"
+
+declare -A DATASETS
+
+DATASETS=(
+	[G4NDL]="G4NDL 4.6 G4NEUTRONHPDATA"
+	[G4EMLOW]="G4EMLOW 7.13 G4LEDATA"
+	[PhotonEvaporation]="G4PhotonEvaporation 5.7 G4LEVELGAMMADATA"
+	[RadioactiveDecay]="G4RadioactiveDecay 5.6 G4RADIOACTIVEDATA"
+	[G4PARTICLEXS]="G4PARTICLEXS 3.1 G4PARTICLEXSDATA"
+	[G4PII]="G4PII 1.3 G4PIIDATA"
+	[RealSurface]="G4RealSurface 2.2 G4REALSURFACEDATA"
+	[G4SAIDDATA]="G4SAIDDATA 2.0 G4SAIDXSDATA"
+	[G4ABLA]="G4ABLA 3.1 G4ABLADATA"
+	[G4INCL]="G4INCL 1.0 G4INCLDATA"
+	[G4ENSDFSTATE]="G4ENSDFSTATE 2.3 G4ENSDFSTATEDATA"
+	[G4TENDL]="G4TENDL 1.3.2 G4PARTICLEHPDATA"
+)
+
+for DATASET in ${!DATASETS[@]}; do
+	read FILENAME VERSION ENVVAR <<< "${DATASETS[$DATASET]}"
+	SRC_URI+="${SRC_DATA}/${FILENAME}.${VERSION}.tar.gz "
+done
+unset DATASET FILENAME VERSION ENVVAR
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_unpack() {
+	# unpack in destination only to avoid copy
+	return
+}
+
+src_install() {
+	for DATASET in ${!DATASETS[@]}; do
+		read FILENAME VERSION ENVVAR <<< "${DATASETS[$DATASET]}"
+		echo $ENVVAR=\"${EPREFIX}/usr/share/geant4/data/${DATASET}${VERSION}\";
+	done >| 99geant-data
+	doenvd 99geant-data
+	dodir /usr/share/geant4/data
+	cd "${ED}/usr/share/geant4/data" || die
+	unpack ${A}
+}
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index b3df16fbb6b6..2aadd1760dca 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -2,3 +2,4 @@ DIST geant4.10.06.p01.tar.gz 34869969 BLAKE2B 0a27f34df213a0dcc2d87c6001c100269b
 DIST geant4.10.06.p02.tar.gz 34833550 BLAKE2B c1a3b51cf5fc135edd8f547e5a88c80f8f6ed991be92439e161225afa0447473b67c0ef0757011e1e3a22a370f43ad9b14c9fe9cb3d5f5f0a78a762c86e0dd80 SHA512 bcfbea05c88a6021898e361ffa0c8e28637631e65b2f9ae2d694deae36a67c6af78785569c5971d1c63a4692a3dfbfc082cf14d7af209cb9f36efff9bec9bc20
 DIST geant4.10.06.p03.tar.gz 35099426 BLAKE2B 75668b87eb3f1d8be00c46dc3e6e2131707ad89f4d077d2c55b7c985803709da565dbddd2ebd6ee7b6a3f4d58dc84a41bcded3b1db926127b480fb8e9fab2765 SHA512 844769991e20f4397a336a8e94bb82434b4ce44c84c956935659d2407ebf29b388b672650466f9683d3c99f9c7fa4f2c81e3f27075427f1613d825f38a74df69
 DIST geant4.10.06.tar.gz 34834510 BLAKE2B 48f50c734186e444f5ef2fd02b013565db7f404b7fbaeb3127d7dd67ede76196fd5fa4512a5482cceb7696305eb72dbe819fe43fa26ac63ded49259d804f5ccf SHA512 e03d69cb66947ddc71d20b9065fd5db384dfc8b2b8e905ddab9ebb992c642dc33f369d7eba5f2338487da5d9d28f20f3078917f222d187c65e5af1a0112ee044
+DIST geant4.10.07.tar.gz 36422877 BLAKE2B d81a37e0968f3c13bb846efc252b1b31cb01a8642610b079bcf6ec1741e7f5da09d50f4abe4054b7a06433dc7d9b611110c4f9a1f971a5f1df27580d49b8906d SHA512 057ab2c6ee5d5ad7012bd889bf883faa3ef1fa72a93190d00d1320f250b7b52e21cbae552cbc35065ad5f5bd46cd91fd1536dd4d5e620afa0abb6b065bd7c86b
diff --git a/sci-physics/geant/geant-4.10.7.ebuild b/sci-physics/geant/geant-4.10.7.ebuild
new file mode 100644
index 000000000000..d286262db573
--- /dev/null
+++ b/sci-physics/geant/geant-4.10.7.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
+
+case ${PV} in
+*_beta*)
+	MY_P+=.b$(printf %02d $(ver_cut 5))
+	DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
+	;;
+*)
+	if [[ $(ver_cut 4) -gt 0 ]]; then
+		MY_P+=.p$(printf %02d $(ver_cut 4))
+		DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
+	fi
+	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
+	;;
+esac
+
+DESCRIPTION="Toolkit for simulation of passage of particles through matter"
+HOMEPAGE="https://geant4.web.cern.ch/"
+SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5
+	inventor motif opengl qt5 raytracerx static-libs threads vrml"
+
+REQUIRED_USE="
+	^^ ( c++11 c++14 c++17 )
+	inventor? ( opengl )
+	motif? ( opengl )
+	qt5? ( opengl )
+"
+
+RDEPEND="
+	dev-libs/expat
+	>=sci-physics/clhep-2.4.4.0:2=[threads?]
+	data? ( ~sci-physics/geant-data-${PV} )
+	dawn? ( media-gfx/dawn )
+	doc? ( =app-doc/geant-docs-$(ver_cut 1-3)* )
+	gdml? ( dev-libs/xerces-c )
+	hdf5? ( sci-libs/hdf5[threads?] )
+	inventor? ( media-libs/SoXt )
+	motif? ( x11-libs/motif:0 )
+	opengl? ( virtual/opengl )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raytracerx? (
+		x11-libs/libX11
+		x11-libs/libXmu
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
+		-DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
+		-DGEANT4_BUILD_STORE_TRAJECTORY=OFF
+		-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
+		-DGEANT4_BUILD_VERBOSE_CODE=OFF
+		-DGEANT4_INSTALL_DATA=OFF
+		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
+		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
+		-DGEANT4_INSTALL_PACKAGE_CACHE=OFF
+		-DGEANT4_USE_FREETYPE=$(usex freetype)
+		-DGEANT4_USE_G3TOG4=$(usex geant3)
+		-DGEANT4_USE_GDML=$(usex gdml)
+		-DGEANT4_USE_HDF5=$(usex hdf5)
+		-DGEANT4_USE_INVENTOR=$(usex inventor)
+		-DGEANT4_USE_NETWORKDAWN=$(usex dawn)
+		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
+		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
+		-DGEANT4_USE_QT=$(usex qt5)
+		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
+		-DGEANT4_USE_SYSTEM_CLHEP=ON
+		-DGEANT4_USE_SYSTEM_EXPAT=ON
+		-DGEANT4_USE_SYSTEM_ZLIB=ON
+		-DGEANT4_USE_XM=$(usex motif)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		${EXTRA_ECONF}
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	# adjust clhep linking flags for system clhep
+	# binmake.gmk is only useful for legacy build systems
+	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
+	cmake_src_install
+	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
+
+	einstalldocs
+}
diff --git a/sys-devel/libtool/files/libtool-2.4.6-darwin20.patch b/sys-devel/libtool/files/libtool-2.4.6-darwin20.patch
new file mode 100644
index 000000000000..12e87bcbc901
--- /dev/null
+++ b/sys-devel/libtool/files/libtool-2.4.6-darwin20.patch
@@ -0,0 +1,13 @@
+macOS Big Sur is 11.0, Darwin 20, after a long line of 10.X releases.
+
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -1076,7 +1076,7 @@
+ 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+ 	10.[[012]][[,.]]*)
+ 	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+-	10.*)
++	10.*|11.*)
+ 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+       esac
+     ;;
diff --git a/sys-devel/libtool/libtool-2.4.6-r6.ebuild b/sys-devel/libtool/libtool-2.4.6-r6.ebuild
index aa4b7a76057b..7a5cc2bf6dcb 100644
--- a/sys-devel/libtool/libtool-2.4.6-r6.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r6.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.6-mint.patch
 	"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
 	"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
+	"${FILESDIR}"/${PN}-2.4.6-darwin20.patch
 )
 
 src_prepare() {
diff --git a/x11-plugins/lurch/Manifest b/x11-plugins/lurch/Manifest
index 7bfc6cb7dff5..04316110470c 100644
--- a/x11-plugins/lurch/Manifest
+++ b/x11-plugins/lurch/Manifest
@@ -1,2 +1,3 @@
+DIST axc-0.3.3.tar.gz 39497 BLAKE2B 7f13f2ee6bb98fecc3ff5ddb726e19d412d588613be50e6666e8bfdcf248e842b97c00cccbc19fef55c0df50053e0b80539f0573dfa7a54a8c88725735382bc6 SHA512 9fe494eb4a264a31c137a4f21e4a53358d55f6f6b3bd2fab0fbe43c0e85f2372127a2a85d00d2e308f3785b30cf8161de3f696aaf71c232f594ef3c54b8f6771
 DIST libomemo-0.7.0.tar.gz 23678 BLAKE2B 91b57f6c93d5f777996687ea0648d996950bc893314e4e3ee02973c70165a9e533ab6980a420bd270d7a4acaa45da7cf83b401b69e2b305b017a3fbb42d5b4d2 SHA512 f9843a35958e4a7930ed9e9f4bef1e765bd51721d6e79d2c092bad86d26f092d22d1cdd4df1c4017b9434bb84c33e226985136d35dfcbcf9b915eb3cae862fa5
 DIST lurch-0.6.8.tar.gz 398267 BLAKE2B 23211e82b80e26105f0d62510dc321abdd818eae21dd9f3e24f6ab01458748df64283acb99371a8ece34248f06e9e04edd35da30c771f45779474b3b43c3a53d SHA512 8b93523049d05a00f1d7286ec9d0d8d03c7ae46793ac72ea08c0d12cb5193324be4805fb6278d6c0f906d9c63db9d7ce6ca2a21442236df51e0ee0b48de6ef1d
diff --git a/x11-plugins/lurch/files/lurch-0.6.8-axc-0.3.3-libsignal-protocol-c.patch b/x11-plugins/lurch/files/lurch-0.6.8-axc-0.3.3-libsignal-protocol-c.patch
new file mode 100644
index 000000000000..261c3ac57c5b
--- /dev/null
+++ b/x11-plugins/lurch/files/lurch-0.6.8-axc-0.3.3-libsignal-protocol-c.patch
@@ -0,0 +1,91 @@
+From d5c2d8902ec268a1e6f8a9f5bd6fabde1e8ddf6a Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Thu, 3 Dec 2020 23:59:00 +0100
+Subject: [PATCH] axc: Use system's libsignal-protocol-c shared library
+
+---
+ Makefile | 26 ++++++++++----------------
+ 1 file changed, 10 insertions(+), 16 deletions(-)
+
+diff --git a/lib/axc/Makefile b/lib/axc/Makefile
+index 601e4fb..d08dd85 100644
+--- a/lib/axc/Makefile
++++ b/lib/axc/Makefile
+@@ -14,6 +14,9 @@ GLIB_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs glib-2.0)
+ SQLITE3_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags sqlite3)
+ SQLITE3_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs sqlite3)
+ 
++LIBSIGNAL_PROTOCOL_C_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags libsignal-protocol-c)
++LIBSIGNAL_PROTOCOL_C_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs libsignal-protocol-c)
++
+ LIBGCRYPT_CONFIG ?= libgcrypt-config
+ LIBGCRYPT_LDFLAGS ?= $(shell $(LIBGCRYPT_CONFIG) --libs)
+ 
+@@ -24,26 +27,24 @@ TDIR = test
+ TFN = test_all
+ CDIR = coverage
+ 
+-AX_DIR=./lib/libsignal-protocol-c
+-AX_BDIR=$(AX_DIR)/build/src
+-AX_PATH=$(AX_BDIR)/libsignal-protocol-c.a
+-
+ PKGCFG_C=$(GLIB_CFLAGS) \
+ 	 $(SQLITE3_CFLAGS) \
++	 $(LIBSIGNAL_PROTOCOL_C_CFLAGS) \
+ 	 $(LIBGCRYPT_CFLAGS)
+ 
+ PKGCFG_L=$(GLIB_LDFLAGS) \
+ 	 $(SQLITE3_LDFLAGS) \
++	 $(LIBSIGNAL_PROTOCOL_C_LDFLAGS) \
+ 	 $(LIBGCRYPT_LDFLAGS)
+ 
+-HEADERS=-I$(AX_DIR)/src
++HEADERS=
+ CFLAGS += $(HEADERS) $(PKGCFG_C) -std=c11 -g -Wall -Wextra -Wpedantic \
+ 		  -Wstrict-overflow -fno-strict-aliasing -funsigned-char \
+ 		  -fno-builtin-memset
+ CPPFLAGS += -D_XOPEN_SOURCE=700 -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE -D_DEFAULT_SOURCE
+ TESTFLAGS=$(HEADERS) $(PKGCFG_C) -g -O0 --coverage
+ PICFLAGS=-fPIC $(CFLAGS)
+-LDFLAGS += -pthread -ldl $(PKGCFG_L) $(AX_PATH) -lm
++LDFLAGS += -pthread -ldl $(PKGCFG_L) -lm
+ LDFLAGS_T= -lcmocka $(LDFLAGS)
+ 
+ all: $(BDIR)/libaxc.a
+@@ -51,7 +52,7 @@ all: $(BDIR)/libaxc.a
+ $(BDIR):
+ 	$(MKDIR_P) $@
+ 
+-client: $(SDIR)/message_client.c $(BDIR)/axc_store.o $(BDIR)/axc_crypto.o $(BDIR)/axc.o $(AX_PATH)
++client: $(SDIR)/message_client.c $(BDIR)/axc_store.o $(BDIR)/axc_crypto.o $(BDIR)/axc.o
+ 	$(MKDIR_P) $@
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@/$@.o $(LDFLAGS)
+ 
+@@ -73,15 +74,8 @@ $(BDIR)/libaxc.a: $(BDIR)/axc.o $(BDIR)/axc_crypto.o $(BDIR)/axc_store.o
+ $(BDIR)/libaxc-nt.a: $(BDIR)/axc-nt.o $(BDIR)/axc_crypto.o $(BDIR)/axc_store.o
+ 	$(AR) rcs $@ $^
+ 
+-$(AX_PATH):
+-	cd $(AX_DIR) && \
+-		$(MKDIR_P) build && \
+-		cd build && \
+-		$(CMAKE) $(CMAKE_FLAGS) ..  && \
+-		$(MAKE)
+-
+ .PHONY: test
+-test: $(AX_PATH) test_store test_client
++test: test_store test_client
+ 
+ .PHONY: test_store
+ test_store: $(SDIR)/axc_store.c $(SDIR)/axc_crypto.c $(TDIR)/test_store.c
+@@ -109,6 +103,6 @@ clean:
+ 	
+ .PHONY: clean-all
+ clean-all: clean
+-	rm -rf client $(BDIR) $(CDIR) $(AX_DIR)/build
++	rm -rf client $(BDIR) $(CDIR)
+ 
+ 
+-- 
+2.27.0
+
diff --git a/x11-plugins/lurch/files/lurch-0.6.8-libsignal-protocol-c.patch b/x11-plugins/lurch/files/lurch-0.6.8-libsignal-protocol-c.patch
new file mode 100644
index 000000000000..4b3de986154d
--- /dev/null
+++ b/x11-plugins/lurch/files/lurch-0.6.8-libsignal-protocol-c.patch
@@ -0,0 +1,92 @@
+From 72f286f389236fe99cb10fdeda3ee9b474de645d Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 4 Dec 2020 00:10:17 +0100
+Subject: [PATCH] lurch: Use system's libsignal-protocol-c shared library
+
+---
+ Makefile | 37 ++++++++++++++++++++++++-------------
+ 1 file changed, 24 insertions(+), 13 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 32bc9c9..937401d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -28,16 +28,21 @@ LIBPURPLE_LDFLAGS=$(shell $(PKG_CONFIG) --cflags purple) \
+ XML2_CFLAGS ?= $(shell $(XML2_CONFIG) --cflags)
+ XML2_LDFLAGS ?= $(shell $(XML2_CONFIG) --libs)
+ 
++LIBSIGNAL_PROTOCOL_C_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags libsignal-protocol-c)
++LIBSIGNAL_PROTOCOL_C_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs libsignal-protocol-c)
++
+ LIBGCRYPT_LDFLAGS ?= $(shell $(LIBGCRYPT_CONFIG) --libs)
+ 
+ PKGCFG_C=$(GLIB_CFLAGS) \
+ 	 $(LIBPURPLE_CFLAGS) \
++	 $(LIBSIGNAL_PROTOCOL_C_CFLAGS) \
+ 	 $(XML2_CFLAGS)
+ 
+ 
+ PKGCFG_L=$(shell $(PKG_CONFIG) --libs sqlite3 mxml) \
+  	$(GLIB_LDFLAGS) \
+ 	 $(LIBPURPLE_LDFLAGS) \
++	 $(LIBSIGNAL_PROTOCOL_C_LDFLAGS) \
+ 	 $(XML2_LDFLAGS) \
+ 	 $(LIBGCRYPT_LDFLAGS)
+ 
+@@ -51,7 +56,7 @@ else
+ endif
+ endif
+ 
+-HEADERS=-I$(HDIR)/jabber -I$(LOMEMO_SRC) -I$(AXC_SRC) -I$(AX_DIR)/src
++HEADERS=-I$(HDIR)/jabber -I$(LOMEMO_SRC) -I$(AXC_SRC)
+ CFLAGS += -std=c11 -Wall -g -Wstrict-overflow $(PKGCFG_C) $(HEADERS)
+ PLUGIN_CPPFLAGS=-DPURPLE_PLUGINS
+ # -D_BSD_SOURCE can be removed once nobody uses glibc <= 2.18 any more
+@@ -79,26 +84,32 @@ AXC_SRC=$(AXC_DIR)/src
+ AXC_BUILD=$(AXC_DIR)/build
+ AXC_PATH=$(AXC_BUILD)/libaxc-nt.a
+ 
+-AX_DIR=$(AXC_DIR)/lib/libsignal-protocol-c
+-AX_PATH=$(AX_DIR)/build/src/libsignal-protocol-c.a
+-
+-VENDOR_LIBS=$(LOMEMO_PATH) $(AXC_PATH) $(AX_PATH)
++VENDOR_LIBS=$(LOMEMO_PATH) $(AXC_PATH)
+ 
+ 
+ ### make rules
+ #
+-all: $(BDIR)/lurch.so
++all: $(BDIR)/lurch.so $(BDIR)/linkdummy
++
++
++$(BDIR)/linkdummy.c:
++	echo 'int main() { return 0; }' > $@
++
++$(BDIR)/liblinklurch.so: $(BDIR)/lurch.so | $(BDIR)
++	ln -f $^ $@
++
++$(BDIR)/linkdummy: $(BDIR)/linkdummy.o $(BDIR)/liblinklurch.so
++	$(CC) \
++		$(shell $(PKG_CONFIG) --libs purple) \
++		-L$(BDIR) -llinklurch \
++		$^ \
++		-o $@ \
++		$(LDFLAGS)
++
+ 
+ $(BDIR):
+ 	$(MKDIR_P) build
+ 
+-$(AX_PATH):
+-	cd $(AX_DIR)/ && \
+-	   $(MKDIR_P) build && \
+-	   cd build && \
+-	   $(CMAKE) $(CMAKE_FLAGS) .. \
+-	   && $(MAKE)
+-
+ $(AXC_PATH):
+ 	$(MAKE) -C "$(AXC_DIR)" build/libaxc-nt.a
+ 
+-- 
+2.27.0
+
diff --git a/x11-plugins/lurch/lurch-0.6.8-r2.ebuild b/x11-plugins/lurch/lurch-0.6.8-r2.ebuild
new file mode 100644
index 000000000000..d0d3d5c728b1
--- /dev/null
+++ b/x11-plugins/lurch/lurch-0.6.8-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+AXC_PV=0.3.3
+LIBOMEMO_PV=0.7.0
+
+DESCRIPTION="OMEMO encryption for libpurple (XEP-0384)"
+HOMEPAGE="https://github.com/gkdr/lurch"
+SRC_URI="https://github.com/gkdr/lurch/releases/download/v${PV}/lurch-${PV}-src.tar.gz -> ${P}.tar.gz
+	https://github.com/gkdr/axc/archive/v${AXC_PV}.tar.gz -> axc-${AXC_PV}.tar.gz
+	https://github.com/gkdr/libomemo/archive/v${LIBOMEMO_PV}.tar.gz -> libomemo-${LIBOMEMO_PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+# NOTE
+#   The build systems of axc (ex-libaxolotl)
+#   at https://github.com/gkdr/axc and of libomemo
+#   at https://github.com/gkdr/libomemo build static
+#   libraries (*.a files) only, so it is not clear when or
+#   how to best unbundle them into standalone packages.
+#   Related yet-to-be-merged pull requests to build shared libraries
+#   exist upstream:
+#   - https://github.com/gkdr/axc/pull/17
+#   - https://github.com/gkdr/lurch/pull/151
+#   - https://github.com/gkdr/libomemo/pull/30
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib
+	dev-libs/libgcrypt:=
+	dev-libs/libxml2
+	dev-libs/mxml
+	net-im/pidgin:=
+	>=net-libs/libsignal-protocol-c-2.3.2
+	"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	"
+
+PATCHES=(
+	# Unbundle net-libs/libsignal-protocol-c
+	"${FILESDIR}"/${P}-libsignal-protocol-c.patch
+	"${FILESDIR}"/${P}-axc-${AXC_PV}-libsignal-protocol-c.patch
+)
+
+src_prepare() {
+	# Upgrade outdated bundle of axc
+	rm -R lib/axc || die
+	mv "${WORKDIR}"/axc-${AXC_PV} lib/axc || die
+
+	# Upgrade outdated bundle of libomemo
+	rm -R lib/libomemo || die
+	mv "${WORKDIR}"/libomemo-${LIBOMEMO_PV} lib/libomemo || die
+
+	# Unbundle axc's bundled net-libs/libsignal-protocol-c
+	rm -R lib/axc/lib/libsignal-protocol-c || die
+
+	default
+}
+
+src_compile() {
+	local makeargs=(
+		CC="$(tc-getCC)"
+		LIBGCRYPT_CONFIG="$(tc-getPROG LIBGCRYPT_CONFIG libgcrypt-config)"
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		XML2_CONFIG="$(tc-getPROG XML2_CONFIG xml2-config)"
+	)
+	emake "${makeargs[@]}"
+}