diff --git a/dev-python/huey/Manifest b/dev-python/huey/Manifest
index 9739280..68ee19c 100644
--- a/dev-python/huey/Manifest
+++ b/dev-python/huey/Manifest
@@ -1,2 +1,4 @@
 DIST huey-1.11.0.tar.gz 316784 BLAKE2B d6e2b08cacd1b501ccf319d1802f0597095e953e933fe26036ed33d119ed3bbf820694ffe3554a426b921933fa82722cb8ed750d8c89f2172a0cba6a7d976e18 SHA512 a3c7395800ee8d694f5c15aa905e11d9d09683d7c6c5c48dbf91d9f5fe65ed42965f85d6d74c0585b1187321842ce9d3978ce69677925f13b86b05e9e4aea485
+DIST huey-2.3.0.tar.gz 622394 BLAKE2B 92dda6b1544d118b30294b9989f62d03be5ac8df5087b3b9d882485e8f083275bb6e64df65a218a387e234fefa3b5b18e49d68581a3351f5c70a4a668034ee53 SHA512 3a38770e348869000f8f1a777b092b0171e8d6e6af2f24b3c4151fd40e25a860f23397e19028b0f0cb076750a846fff9d580d5e63c10f0d4403ec4dee04f9afd
 EBUILD huey-1.11.0.ebuild 523 BLAKE2B 75ec8f00c3b57097735e4a920c8569546ffcdf6df71d52dd589eb65bb419458e0712d66b5bac56be4f9419632d2bd95be24fb565e7968fd921c2291689bd4901 SHA512 fbe8a41840821e224ac77abc1cdacad69205da3db8b7c10dea6024e86f8b91ff0631f4f16d796f1edc6c334ca346411cbbb985825c0c7b745ef11fd16faff14a
+EBUILD huey-2.3.0.ebuild 525 BLAKE2B e99534c4d973a88f946d38f0de2bcd7fc55360b523dc3a87f45ead13cfca4c63c6722111219a8790ec3265b71d39af0cee78b51c6a3a5a9d8d3103fa08b91afd SHA512 ca27e9d504966bf0dbfd85d34505456dc9d4cd8f787af8be12d49e1e28c2a6ff734ecbc65ce66874523fd8d2a6b362e9fa23a8745a7c515410fd1b6c999434c5
diff --git a/dev-python/huey/huey-2.3.0.ebuild b/dev-python/huey/huey-2.3.0.ebuild
new file mode 100644
index 0000000..f93e815
--- /dev/null
+++ b/dev-python/huey/huey-2.3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="a little task queue for python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://huey.readthedocs.org/"
+
+IUSE=""
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="x86 amd64"
+
+RDEPEND="dev-python/redis-py[${PYTHON_USEDEP}]
+         dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND} dev-lang/python"
diff --git a/dev-python/pyrad/Manifest b/dev-python/pyrad/Manifest
index 2afcb23..ded759a 100644
--- a/dev-python/pyrad/Manifest
+++ b/dev-python/pyrad/Manifest
@@ -1,4 +1,4 @@
-DIST pyrad-2.0.tar.gz 38388 BLAKE2B 4ffc1cc387aefb21ddc68c0dac99639e018443caf008a94aea93e5d3cdfbbf987f80e120961d394f6d3360ad90df63c50c153fe0b0d742b19ef0db9a00056658 SHA512 d3a6eda18463666a1a4a26fcb4100b62a0b869f45964a49ae26267b29eb2a12ee50f8acaa0684bf230103ece42c813656fcb3b71662ee8fe502329c4087f39bd
 DIST pyrad-2.1.tar.gz 32353 BLAKE2B 2e79f23c757f42a3e98e4a290b76dd5793efe48a8428f2b6326f8f7a25d3876dad60c04c3d60818884d929fb710af5e68cc74fa7513b7a80ed516a78d0278f5e SHA512 1ccc070bfd1e0673e5d3cb6d0f64194d301d9c2c89eaf307d2c74393e9ea22a5e0149cbeac6bdcb3f03e46e4a5c07f807bfc84d235e95c603d5b39b88882073b
-EBUILD pyrad-2.0.ebuild 494 BLAKE2B 55727f0866cadf6ae9cd839911f25c10bcc6c487607af82452f286a80004fb90486281b20e4581e915942fcee655032b84f7fd553b85daa71c72da8bb9d39ac0 SHA512 a2bfadad7577a48f3b494ec9d327cdcc24cd972074c76345997c65c2ecd8d5f70e5803b5eb627e7d491f56139d61255a76182f8690dce135e986f60a307aa7ec
+DIST pyrad-2.3.tar.gz 46412 BLAKE2B 9ce9f3bc04de65f4d52dde0ad93b366ad2216469f77ee9f01d9c9e1e1f2c6bce664a935e92e6a5bf907f3f1490dd815558639be4f4dca0031155acc32015f952 SHA512 a3703a6c1cb79735e8c55656e6472461504b4e8cf493caa69cb088e17f8f442184c51123a81ac42a8d94f439bcb164a230da91a377175eb1d35b979055e37359
 EBUILD pyrad-2.1.ebuild 510 BLAKE2B fd09cc7b07143f8a0ce73be212030a087895276c0819591e227fabd42dc0467a8381e09514237984c951d983f9e74ad4b72c40057f03d3acdd19e5f33e3047e4 SHA512 100fc0d9f60d08aa8cbe1a12c69a904341b5bc96d3d3d4c8d66f8434c1c17e9609b6e7de09ea2a8e2eab05447b5db1e869bfbafab997851a30a2120f248bc061
+EBUILD pyrad-2.3.ebuild 522 BLAKE2B 75496b26e92f707b370e37c00c8752793f30aa04fb33837b76079effdb018697a9a856b258788818e1533ea22636e8e227a5dc0c4b14fc2ef63dab3ed4020d51 SHA512 6fdc13a7da1ed797c17e4c7c1bc68c9045a671f6088991171a5089968b5bf698e1bc2838626f71242ca64dcdd395f0a6dff5b6370c3f529e624d69e565bbc8a3
diff --git a/dev-python/pyrad/pyrad-2.0.ebuild b/dev-python/pyrad/pyrad-2.3.ebuild
similarity index 82%
rename from dev-python/pyrad/pyrad-2.0.ebuild
rename to dev-python/pyrad/pyrad-2.3.ebuild
index 48d9774..626c570 100644
--- a/dev-python/pyrad/pyrad-2.0.ebuild
+++ b/dev-python/pyrad/pyrad-2.3.ebuild
@@ -4,13 +4,13 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
 
 inherit distutils-r1
 
 DESCRIPTION="pyrad is an implementation of a RADIUS client as described in RFC2865"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://ag-projects.com/"
+HOMEPAGE="https://github.com/pyradius/pyrad"
 
 IUSE=""
 SLOT="0"
diff --git a/dev-python/python-yubico/Manifest b/dev-python/python-yubico/Manifest
index 3b35a83..ea9dfaa 100644
--- a/dev-python/python-yubico/Manifest
+++ b/dev-python/python-yubico/Manifest
@@ -1,4 +1,2 @@
-DIST python-yubico-1.3.2.tar.gz 45709 BLAKE2B c4eb1399c3c394762fc88db39dd0a74c599093e53bd9d04f6b56c31ee0bf7134da65bb71cdc09cf8de1684dbf3486fbd730f540f04c6d89a99933af1a4aead11 SHA512 0e32f6593c64cfb0aeee2cd3d5554719e6d585585ed0564dd45da5bbb55dd403d04beeaddab315ec4676851c12d208a63667cf799f29097085fcd4719df19320
 DIST python-yubico-1.3.3.tar.gz 41154 BLAKE2B 450f26b445cfb6af15c6277129471cf3dfbd1605e993c5589a0ad66833cb6aa39280728fe8e376d0b2c42a9549b358a6d8ac3825a22b820edaf63a7d0e2091ec SHA512 8e0b585b1dd457a86bd0238d770330321962cc8e394ed67ba62f40f04e084584c7578681bdcbf3368a53cdf593a0172afbead89e8ce5dd484b9bae6c6ba5f526
-EBUILD python-yubico-1.3.2.ebuild 504 BLAKE2B 40285da1916e95f586a978f70c6568e18a83cac9d231e7643a3e31598c80f0e52ca5b5608de0f5c0801d9f992eb8b771accc13b8c3cfbd990939011f2a8fd90f SHA512 d07ca3bead04ffdda93b35546f4bc1a0f1b86f5ad6c1f268d45e7c9e76f6a54bb2ebac8e8e14db57f0cd59cdd1e943ecb4f810d87fd4892247ffc4a03bcc54cf
-EBUILD python-yubico-1.3.3.ebuild 520 BLAKE2B 2d3139f1fa2ebc7a028571875fca97a4d1e1e8ea62349389505dd4e7f3aea79071206c2cfc4a224dcd0b4e469023cc9d86eb06605e06257808b5a2193fd73564 SHA512 614452eec146183a24e971aea7b1e83970d7232eeba68de6df2eb17c37e165a6903bcc31734da5e9cf41f66ade8c7beed43c7e4fd106ed6967e156441039f576
+EBUILD python-yubico-1.3.3.ebuild 522 BLAKE2B 7d32b5d101714e9a0ff9846dc46449c12f36a456c4bb1fe6d246a8c37e5152dcb57684c6956605ecd12515170011514f9939298fc717413f51bbbd8d7b7a1119 SHA512 1d3d8cc0a7ea3f4004c56b539a5d10bba837fbfda096e7b5b458ebf05f04ab38d9afe4ac583caf88a75f2adfea94279c02ec4045c42862f73b019648d1c686d4
diff --git a/dev-python/python-yubico/python-yubico-1.3.2.ebuild b/dev-python/python-yubico/python-yubico-1.3.2.ebuild
deleted file mode 100644
index c65c26a..0000000
--- a/dev-python/python-yubico/python-yubico-1.3.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for talking to YubiKeys"
-SRC_URI="https://github.com/Yubico/${PN}/releases/download/${P}/${P}.tar.gz"
-HOMEPAGE="https://github.com/Yubico/python-yubico"
-
-IUSE=""
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="x86 amd64"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND} dev-lang/python"
diff --git a/dev-python/python-yubico/python-yubico-1.3.3.ebuild b/dev-python/python-yubico/python-yubico-1.3.3.ebuild
index 6dcf41e..c2c7e61 100644
--- a/dev-python/python-yubico/python-yubico-1.3.3.ebuild
+++ b/dev-python/python-yubico/python-yubico-1.3.3.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/smpplib/Manifest b/dev-python/smpplib/Manifest
index 6d1c16d..88764fa 100644
--- a/dev-python/smpplib/Manifest
+++ b/dev-python/smpplib/Manifest
@@ -1,2 +1,4 @@
 DIST smpplib-2.0.1.tar.gz 19623 BLAKE2B 73d1e44ca1444b9f4c4a330a7ae323088ec81fade7a2dea757af9657807ced15b694c8621c48699429b598501126d5c7ad2d90f455aeedbd784c845e82c03571 SHA512 277810bc19440dbca0886c707a6280d672ba197e0f0efb8d5914263fdc0175a9fe593611efbddf0010f88e44ab00f1c9d17579f5b7a172844f1e0358ab40e6e4
+DIST smpplib-2.1.0.tar.gz 20712 BLAKE2B 873fcddc5396a3d335a0d5c585d94b02f892e54fc5228362d48ef37d4ed3745c2cb01f7327fe7ea99fab88914544bf3f4d6a27b8dc5fc56c92f14c1e0bc7274a SHA512 5d2c137c6fe3147b18ddef51ebc9832debac8b79f8180ad63b555f914e2697c93f8260115414bbfeaca5b8d655434e31a254144a932b33ef7a6d1f76b4ee1784
 EBUILD smpplib-2.0.1.ebuild 750 BLAKE2B ebc667efdf4d0e0b18561ea5ebaa725af22fa8e885458cc5cf46cb6fb9f712e89e2bd99a6184ef3d279050f9df4b7b586730745c5c86beec7f2da28dbe4cfac0 SHA512 8c09a612975866e773a20608b7b2a7f5b9c94d6c13026928e3a3553b0b039dc4c9f5a4d46c15aa0d91f0ffd9d54e3da460d06a755d79725a28b372f951ab74fb
+EBUILD smpplib-2.1.0.ebuild 752 BLAKE2B 75a316849027c771d255104de50760c1cacee9d115ba89c64d9d41841ccb4bbf44c7fe6c72fe4f72be3467c07e618b28160619a9f45a703dc20afce036bcb114 SHA512 fe66638ecb919ed5947bcfafac8575855b85a7c203819bd8ca603bac1ebb7f014fbbb0be1d31a1ea62bf881cef01ff944e2d56a0346f60bb9bee3298c6a3cc1a
diff --git a/dev-python/smpplib/smpplib-2.1.0.ebuild b/dev-python/smpplib/smpplib-2.1.0.ebuild
new file mode 100644
index 0000000..b719e33
--- /dev/null
+++ b/dev-python/smpplib/smpplib-2.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="SMPP library for python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="https://github.com/podshumok/python-smpplib"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	${PYTHON_DEPS}
+"
+DEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
+
+DOCS="README.md"
+
+src_prepare() {
+	sed -i -e 's;packages=find_packages();packages=find_packages(exclude=["tests"]);' "setup.py"
+	eapply_user
+}
diff --git a/dev-python/sqlsoup/Manifest b/dev-python/sqlsoup/Manifest
index 7c8f32b..53ce855 100644
--- a/dev-python/sqlsoup/Manifest
+++ b/dev-python/sqlsoup/Manifest
@@ -1,2 +1,2 @@
 DIST sqlsoup-0.9.1.tar.gz 20622 BLAKE2B 4356f935192423ea196e6d29e4e1d520667fe4a55add7b91d7930e19d6470c97e296e6373ae4dc539ca5487c75360592073b91d714acfb54439c2e155d862d4c SHA512 a6fee93bf7be24545c785ab995e345374ae947714c5233ede6aaf7a263e75f88987c8a875903891f35088eebdba789467ada3bcfc030cc77a65afc63aae069d7
-EBUILD sqlsoup-0.9.1.ebuild 515 BLAKE2B d365c0beb9ea9554c8f790cec44328239dce2024c11273a6195f5ad84e53e860ae07d76bd701a990e8ca0cf8fed9a8d5c661793cdfaf01ce823e862ba21802af SHA512 7859ee568664b1421f28a866075008d9246fd1046824b55a82458b8d6c393eefb8c544d720830270d4236c770d51e0b924ebf87a6d1935b893ae12f4e6eb5ad4
+EBUILD sqlsoup-0.9.1.ebuild 517 BLAKE2B e67395d0a097996874a509990811a6d25f2cbef71c78a9bfb1dc3ed902eae4344ecc9b985ab5bef8ce25f252c06f791c86b079019ff3ca740567a117477a792e SHA512 c46e94211b588358525976c39f8b01819f1f3621ebd7e0491022564e1a304a13c2b27f279914d4287bb987c247f54ef6eb411c331c655473f095f7eb8b255483
diff --git a/dev-python/sqlsoup/sqlsoup-0.9.1.ebuild b/dev-python/sqlsoup/sqlsoup-0.9.1.ebuild
index 0c70578..7ce2bbf 100644
--- a/dev-python/sqlsoup/sqlsoup-0.9.1.ebuild
+++ b/dev-python/sqlsoup/sqlsoup-0.9.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
 
 inherit distutils-r1
 
diff --git a/www-apps/privacyidea/Manifest b/www-apps/privacyidea/Manifest
index e659d92..89a7b05 100644
--- a/www-apps/privacyidea/Manifest
+++ b/www-apps/privacyidea/Manifest
@@ -1,19 +1,6 @@
-DIST privacyidea-2.17.tar.gz 6162129 BLAKE2B e6700a1cd5a1f645937698cf5a41ee1d1e789d1d97858250e982f069f6df3862771bb735ab769c70d65f84a8fb5f36ead1949b65e9a31bb0c46ccca26eee59f3 SHA512 25b0dfc7edffac5343f27006219a1ba8e3ad4fe8b095c2cddb7f25a085ab7237595b7271107d93b189806a25d4fc647522fb0b71fa9f6e9c30e52cb5c8290938
-DIST privacyidea-2.19.tar.gz 6252833 BLAKE2B 9b300ea8ff278fb8e7b5b4de048212c56f79ad296a8894bcca1bd2cc820534f9de267139623063801c548c3967a7732d9fe058a6ec7de05d5f5b40a91a934e39 SHA512 cf0f4f4f638a74f76143e1d161c38b77422d39b115a079539fb6fcedf44fc17b6be79e221b1e1269b2a8c858b9be9afe5d9ec7b908ab8e9dbad8d1d2245c4573
-DIST privacyidea-2.23.2.tar.gz 6658967 BLAKE2B c348afd01cacbeb15494d51675a20bbc5fa14f1d8764cf32264290903d1f5e3e31e5c5ae5b3a3b063262536215d766198004f9317849aaf2d1b9123c17b28d22 SHA512 3dada5a1c8668d7ecba4f320e02386fffafaab8a6df8e38bc0410f5a264ab02d00f85d7ccb6800ad7113538f42e99393eb4a6415cd7512c33874ef46317656c9
-DIST privacyidea-2.23.5.tar.gz 6670821 BLAKE2B 519930a8a19499513debaaf771a3affcc81e3d2871cc918151e6798bdda03a15561cb1224dbed7ef7e7f64d6115202b248ec26acd5feaffe7d43e712a975979a SHA512 061b981c4fa14d984b57bfd6dfe60129035581850c82cd34098f87252a7632b9c1e6ef3b2530ab619904ced46284d053a44b10366c04860612fc9726edcbcb9e
-DIST privacyidea-3.0.2.tar.gz 6724488 BLAKE2B ae253379bb0c28e0e452f417a955b90d57e75285a1f99bbf90ae24cb32ea1b5b07a7ac4bd06c03569a04f08f001614b171221b4b596fbb528b05ac1b7022e7b7 SHA512 5d77db44f2dffcbabadb690bbb4809cfe47a48e64368a9eead38dfc50a10851665ae8461c5dc69c3b753e4cecfbda8c765f911bf9c3fa0d602682893be44bbc8
 DIST privacyidea-3.2.2.tar.gz 6784639 BLAKE2B 23030f250c46be8ab704a367caa5eb96ea332ba015eaec0cc3daadb6e8fa9daaa713d6878cf7b299baf7c10031b985d95e20b8b174cad4bdbdfff4046bf1104f SHA512 eab03bf1a9e8326b77a90b1e0fcc7339a2e5e20b2d8bbf367395728e1b21455bcdc44a188e10d7927baf6f42e4078f2456feb9ef5634002639daaa0a31ebf57e
-DIST privacyidea-FreeRADIUS-2.17.zip 14861 BLAKE2B 088b4a5402d606218e65774e725229a4dc23598d7016eae4a9e568eb6248414b6a1ed67597b7d1fef131e00b347f885c75e3bb90fff7ea268f36b0687de91b07 SHA512 cee04c6aa14e191f9c3672842c7d4950786f55f77b594edde44596c7bb7d124da4e8c7aefe7f15fd6d9a2663fd370d73b3a39bfb2cc0641a27a54c5694256f4b
-DIST privacyidea-FreeRADIUS-2.19.tar.gz 12367 BLAKE2B 2edfd843516b97bab42c7a5383489645ddd7da7bb439d909a16eacb3d57a87ea790a12a78316ede7d9ee856ac7cd6b84cdd1af521060bd97c6457be88eadce79 SHA512 234b01f58842db34bc04923c7cf5317e19e0b2feb013e3c3af5a75c1244f2f9aea2f2c7956501956379077a83f60f95d257b5f6e53e6d13b76f40beac6276f72
-DIST privacyidea-FreeRADIUS-2.23.2.tar.gz 13317 BLAKE2B f7201dbdaa0219317ee7ec141218f1fd1b252fdc8106d91ff9432f894d2044cfffa916fac675eddadce72d35680e652eafed1b1884e22993ca6f6e13e9f8da5f SHA512 06ece6ca69dabf69e0969825fdf78293023aa9b07e2ba4e79d7c3d559a23a93c1bd6284f6afc9e65faddadeb3f0ad68d8d0182712adbce62ff36c1ee40a54aef
-DIST privacyidea-FreeRADIUS-2.23.5.tar.gz 13317 BLAKE2B f7201dbdaa0219317ee7ec141218f1fd1b252fdc8106d91ff9432f894d2044cfffa916fac675eddadce72d35680e652eafed1b1884e22993ca6f6e13e9f8da5f SHA512 06ece6ca69dabf69e0969825fdf78293023aa9b07e2ba4e79d7c3d559a23a93c1bd6284f6afc9e65faddadeb3f0ad68d8d0182712adbce62ff36c1ee40a54aef
-DIST privacyidea-FreeRADIUS-3.1.tar.gz 13951 BLAKE2B 89452c033e33cf4c2d372d373091303d4df6e82b0eb87f71a5072ffe38c5c833dfbaa55a7dbe84a796644ea843ab06f7a65f2fa1c94c0569852d2fb9ca0d8227 SHA512 6bbb4cbc026023fbbd3b0ddf0798a83998dcd3c317b9e6889fc57a942fc85f4875113ce36aa559983a340441f0e91e2d40fa97c87087f5ecf253b631f0737514
+DIST privacyidea-3.4.tar.gz 8548152 BLAKE2B e5d655f694a4697635814b3a2533321b68cac61d58f308c9a7108f7eea1f186f0750e802d4e3eb10e307d5eb4d46e5a2c599fe16c158ed6b9f13c16c29052b50 SHA512 7706e0c2d0213facf5cc3a9717ada76130450f03ec03235bf9e6a9511f05a6faa0173edaf7cc43dd8ca6c9b86148dd16e8bfbac8abaa3efe49175880871fc36c
 DIST privacyidea-FreeRADIUS-3.2.tar.gz 14519 BLAKE2B 6388b239aaed3299a5caa829963922c509e0b3a8555ae947df1f90db0f6df8c2b5fbf9d85c6e9c4c04cd916b126cdb79974c1c1e3e7033475976b807f8693268 SHA512 ebebc5d4c98f835f0ad08cec8a74b1b311dcbbc65ef2480af38caad99f15a5a40652a3cde60cb4d299d6b43fcaaf9e207642d181ab8c2edbd56961d097942a7c
-EBUILD privacyidea-2.17.ebuild 2865 BLAKE2B 8dd7859fc8e339e7df065e06b1af804eac6d63a18677c76285850cdb60ea1d7d62ad3b1a011b14430706938d4675ba5d98ffa58f3d43ea973289ee4db2349c73 SHA512 b363f96ed46cc0c9af7445fad201e9834b61930431dd2fb53d25e6a69daffaa3858b25f7c87ddab43dd000dbf15bb13e8de6f7ee2f2190efeb609f8b96a3a362
-EBUILD privacyidea-2.19.ebuild 3010 BLAKE2B 8248028c762b0cec3053149091a450b309e1e73f81a8e1328d1334626ef95e3ddb637e91bbf6da9a9a44a26213c5457e91260e7a9d54431099f764110d56233e SHA512 27b6293dcd4edc4686f2c900c35355b46e4aed7cff2c710125a59b1df8ac6756d0480e2d10af771994f0ba9b85011476e0eccc395e80a430e186fafebc76b25a
-EBUILD privacyidea-2.23.2.ebuild 3068 BLAKE2B 58e4a3dc762bf0f552081489313fcdf023606873281544c14a908240c764f63e1d170371d658d2bcfb98cc5529f16d910082aac477ab3c28889ab7b405360cd7 SHA512 7177e2c6ffb8d8de6ca39ab66fa67d334070e1766d014ebee37326d6273b00fbe8c90f0d43c8da5bbb7b270194361afcd8d30a57fc7762fac93d1412e1ce5762
-EBUILD privacyidea-2.23.5-r1.ebuild 3112 BLAKE2B 3dccbaa14248368c7e3a53e891bc861e7cf7a09d41d9f00005fc3899fa1e318606f9346ba789d6d9059c02b4323a9f1bcf112583ff1f9b0c156cb6eba6143103 SHA512 4d901ce5e5994354cdaef390927cf0ffacb3d048264375236aeab65a2accf77ae805efc3833a4d013a9f58824365da5667334b4fa826e8526ca9b1c959322bee
-EBUILD privacyidea-2.23.5.ebuild 3068 BLAKE2B 58e4a3dc762bf0f552081489313fcdf023606873281544c14a908240c764f63e1d170371d658d2bcfb98cc5529f16d910082aac477ab3c28889ab7b405360cd7 SHA512 7177e2c6ffb8d8de6ca39ab66fa67d334070e1766d014ebee37326d6273b00fbe8c90f0d43c8da5bbb7b270194361afcd8d30a57fc7762fac93d1412e1ce5762
-EBUILD privacyidea-3.0.2.ebuild 3223 BLAKE2B 1b06c97aa2896f584fad2c479b0f558e4d47618924899616ab8d5e664b37801208b56e2093f3067707a8eab98ddee54888fa32c342eac06734bdc070b20bf0b8 SHA512 cd8877fc58241ff78b84be80ece420163b2091be22310c9830f54d098a12ec2a4429342ba2b38ab35ca9e2cb4a865efc68f223401c7d7a724a0c8dc17c6a0d81
+DIST privacyidea-FreeRADIUS-3.4.tar.gz 15222 BLAKE2B 2058f1be8a8f5e7ba41f8f166f9ae1846947c16c0518729a8edf02791c47d1572a5715facd839e3dc66e290d3e5dd352e9804ebe5e34d889c932daa9559834c3 SHA512 6e22b82b5ad7d99fae68a435ba3249a6c127b9d2c49925005ac289873916f18837d9814153667b1085c59e3ce31bfc3bc3a8bb2c2ce927589bf3aa5b47976bc7
 EBUILD privacyidea-3.2.2.ebuild 3759 BLAKE2B ee9663ed9cc963a44687f6802ee611d66365810778b4471af10e36eea66f323e00c4c011634e41e9656326d00e5c78e5579913d32e2439ec7bd1927f8bf4d36f SHA512 cd0186b0bbf50d86723948a3683f2ceb5af43571b69ba208753a438c197b89067529100854ad809876fa4bbe0777143df0354b6bf88ca2555d2dc82a519b37c3
+EBUILD privacyidea-3.4.ebuild 4069 BLAKE2B ebb917dceb4bdba90858033111554e8adbbe59c54ad77ebbef5a0284c4e28457d7fb99fded9534417e4ed165ec97f2dce101a6b581c35a1df4a8e41b526086cb SHA512 d2c1ed667149f4359dec1d541619b6d5c461e17a6a4586df4aeae7fd10d7231a274d9fd22fc92e0fefa46e62c5553f5283d375e55238441f3747951a04f1e709
diff --git a/www-apps/privacyidea/privacyidea-2.17.ebuild b/www-apps/privacyidea/privacyidea-2.17.ebuild
deleted file mode 100644
index 784f858..0000000
--- a/www-apps/privacyidea/privacyidea-2.17.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 user
-
-VRADIUS="f5d2e0f8637c6d233a9a4fd97f1ad666d340b75b"
-VADMIN="d1de48361b5e145957a3b95db3de63d234e8b832"
-
-DESCRIPTION="privacyIDEA is a modular authentication system"
-HOMEPAGE="https://www.privacyidea.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/${PN}/FreeRADIUS/archive/${VRADIUS}.zip -> ${PN}-FreeRADIUS-${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+mysql postgres sqlite -translation"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	translation? ( dev-nodejs/grunt-cli )"
-RDEPEND="
-	mysql? ( dev-python/mysql-python
-	         >=virtual/mysql-5.0 )
-	postgres? ( dev-python/psycopg )
-	sqlite? ( dev-python/sqlalchemy[sqlite] )
-	dev-perl/Config-IniFiles
-	dev-perl/Data-Dump
-	dev-perl/JSON
-	dev-perl/Try-Tiny
-	dev-perl/libwww-perl
-	dev-python/alembic
-	dev-python/bcrypt
-	dev-python/beautifulsoup:4
-	dev-python/configobj
-	dev-python/cookies
-	dev-python/cov-core
-	dev-python/coverage
-	dev-python/ecdsa
-	dev-python/flask
-	dev-python/flask-migrate
-	dev-python/flask-script
-	dev-python/flask-sqlalchemy
-	dev-python/funcparserlib
-	dev-python/imagesize
-	dev-python/itsdangerous
-	dev-python/ldap3
-	dev-python/lxml
-	dev-python/mako
-	dev-python/matplotlib
-	dev-python/mock
-	dev-python/netaddr
-	dev-python/nose
-	dev-python/numpy
-	dev-python/pandas
-	dev-python/passlib
-	dev-python/pillow
-	dev-python/pycrypto
-	dev-python/pyjwt
-	dev-python/pyparsing
-	dev-python/pytest
-	dev-python/pytest-cov
-	dev-python/pytest-runner
-	dev-python/python-dateutil
-	dev-python/python-gnupg
-	dev-python/pyusb
-	dev-python/pyyaml
-	dev-python/qrcode
-	dev-python/requests
-	dev-python/responses
-	dev-python/sphinx
-	dev-python/sphinxcontrib-httpdomain
-	dev-python/sqlalchemy
-	dev-python/werkzeug
-	dev-python/pyrad
-	dev-python/redis-py
-	dev-python/sqlsoup
-	www-apache/mod_wsgi
-	www-servers/gunicorn
-"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-python_prepare_all() {
-	rm -rf tests
-	rmdir authmodules/FreeRADIUS
-	ln -s ../../FreeRADIUS-${VRADIUS} authmodules/FreeRADIUS
-
-	make translate
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN}/home ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	mv ${D}/usr/etc ${D}/etc
-
-	insinto /etc/privacyidea
-	doins deploy/debian/pi.cfg
-	doins deploy/privacyidea/NetKnights.pem
-	doins authmodules/FreeRADIUS/rlm_perl.ini
-
-	insinto /etc/privacyidea/CA
-	doins deploy/debian/openssl.cnf
-
-	fowners -R ${PN}:root /etc/privacyidea
-	fperms 600 /etc/privacyidea/enckey \
-	           /etc/privacyidea/private.pem
-
-##	insinto /etc/logrotate.d
-##	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	diropts -o privacyidea -g root
-	keepdir /var/log/privacyidea
-}
diff --git a/www-apps/privacyidea/privacyidea-2.19.ebuild b/www-apps/privacyidea/privacyidea-2.19.ebuild
deleted file mode 100644
index 8f04b87..0000000
--- a/www-apps/privacyidea/privacyidea-2.19.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 user
-
-VRADIUS="f5d2e0f8637c6d233a9a4fd97f1ad666d340b75b"
-
-DESCRIPTION="privacyIDEA is a modular authentication system"
-HOMEPAGE="https://www.privacyidea.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/${PN}/FreeRADIUS/archive/${VRADIUS}.tar.gz -> ${PN}-FreeRADIUS-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+mysql postgres sqlite -translation"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	translation? ( net-libs/nodejs[npm] 
-	               app-i18n/poedit )"
-RDEPEND="
-	mysql? ( dev-python/mysql-python
-	         >=virtual/mysql-5.0 )
-	postgres? ( dev-python/psycopg )
-	sqlite? ( dev-python/sqlalchemy[sqlite] )
-	dev-perl/Config-IniFiles
-	dev-perl/Data-Dump
-	dev-perl/JSON
-	dev-perl/Try-Tiny
-	dev-perl/libwww-perl
-	dev-python/alembic
-	dev-python/bcrypt
-	dev-python/beautifulsoup:4
-	dev-python/configobj
-	dev-python/cookies
-	dev-python/cov-core
-	dev-python/coverage
-	dev-python/defusedxml
-	dev-python/ecdsa
-	dev-python/flask
-	dev-python/flask-babel
-	dev-python/flask-migrate
-	dev-python/flask-script
-	dev-python/flask-sqlalchemy
-	dev-python/funcparserlib
-	dev-python/imagesize
-	dev-python/itsdangerous
-	dev-python/ldap3
-	dev-python/lxml
-	dev-python/mako
-	dev-python/matplotlib
-	dev-python/mock
-	dev-python/netaddr
-	dev-python/nose
-	dev-python/numpy
-	dev-python/pandas
-	dev-python/passlib
-	dev-python/pillow
-	dev-python/pycrypto
-	dev-python/pyjwt
-	dev-python/pyparsing
-	dev-python/pytest
-	dev-python/pytest-cov
-	dev-python/pytest-runner
-	dev-python/python-dateutil
-	dev-python/python-gnupg
-	dev-python/pyusb
-	dev-python/pyyaml
-	dev-python/qrcode
-	dev-python/requests
-	dev-python/responses
-	dev-python/sphinx
-	dev-python/sphinxcontrib-httpdomain
-	dev-python/sqlalchemy
-	dev-python/werkzeug
-	dev-python/pyrad
-	dev-python/redis-py
-	dev-python/sqlsoup
-	www-apache/mod_wsgi
-	www-servers/gunicorn
-"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-python_prepare_all() {
-	rm -rf tests
-	rmdir authmodules/FreeRADIUS
-	ln -s ../../FreeRADIUS-${VRADIUS} authmodules/FreeRADIUS
-
-	if use translation; then
-		npm install grunt --save-dev
-		npm install grunt-angular-gettext --save-dev
-		make translate
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN}/home ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	mv ${D}/usr/etc ${D}/etc
-
-	insinto /etc/privacyidea
-	doins deploy/debian/pi.cfg
-	doins deploy/privacyidea/NetKnights.pem
-	doins authmodules/FreeRADIUS/rlm_perl.ini
-
-	insinto /etc/privacyidea/CA
-	doins deploy/debian/openssl.cnf
-
-	fowners -R ${PN}:root /etc/privacyidea
-	fperms 600 /etc/privacyidea/enckey \
-	           /etc/privacyidea/private.pem
-
-##	insinto /etc/logrotate.d
-##	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	diropts -o privacyidea -g root
-	keepdir /var/log/privacyidea
-}
diff --git a/www-apps/privacyidea/privacyidea-2.23.2.ebuild b/www-apps/privacyidea/privacyidea-2.23.2.ebuild
deleted file mode 100644
index 4a54e2b..0000000
--- a/www-apps/privacyidea/privacyidea-2.23.2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 user
-
-VRADIUS="81513be16e6db775effac9ed39ab10dc381be66d"
-
-DESCRIPTION="privacyIDEA is a modular authentication system"
-HOMEPAGE="https://www.privacyidea.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-         https://github.com/${PN}/FreeRADIUS/archive/${VRADIUS}.tar.gz -> ${PN}-FreeRADIUS-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+mysql postgres sqlite -translation"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	translation? ( net-libs/nodejs[npm] 
-	               app-i18n/poedit )"
-RDEPEND="
-	mysql? ( dev-python/mysql-python
-	         dev-python/pymysql
-	         >=virtual/mysql-5.0 )
-	postgres? ( dev-python/psycopg )
-	sqlite? ( dev-python/sqlalchemy[sqlite] )
-	dev-perl/Config-IniFiles
-	dev-perl/Data-Dump
-	dev-perl/JSON
-	dev-perl/Try-Tiny
-	dev-perl/libwww-perl
-	dev-python/alembic
-	dev-python/bcrypt
-	dev-python/beautifulsoup:4
-	dev-python/configobj
-	dev-python/cookies
-	dev-python/cov-core
-	dev-python/coverage
-	dev-python/croniter
-	dev-python/defusedxml
-	dev-python/ecdsa
-	dev-python/flask
-	dev-python/flask-babel
-	dev-python/flask-migrate
-	dev-python/flask-script
-	dev-python/flask-sqlalchemy
-	dev-python/funcparserlib
-	dev-python/imagesize
-	dev-python/itsdangerous
-	dev-python/ldap3
-	dev-python/lxml
-	dev-python/mako
-	dev-python/matplotlib
-	dev-python/mock
-	dev-python/netaddr
-	dev-python/nose
-	dev-python/numpy
-	dev-python/pandas
-	dev-python/passlib
-	dev-python/pillow
-	dev-python/pycrypto
-	dev-python/pyjwt
-	dev-python/pyparsing
-	dev-python/pytest
-	dev-python/pytest-cov
-	dev-python/pytest-runner
-	dev-python/python-dateutil
-	dev-python/python-gnupg
-	dev-python/pyusb
-	dev-python/pyyaml
-	dev-python/qrcode
-	dev-python/requests
-	dev-python/responses
-	dev-python/sphinx
-	dev-python/sphinxcontrib-httpdomain
-	dev-python/sqlalchemy
-	dev-python/werkzeug
-	dev-python/pyrad
-	dev-python/redis-py
-	dev-python/sqlsoup
-	www-apache/mod_wsgi
-	www-servers/gunicorn
-"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-python_prepare_all() {
-	rm -rf tests
-	rmdir authmodules/FreeRADIUS
-	ln -s ../../FreeRADIUS-${VRADIUS} authmodules/FreeRADIUS
-
-	if use translation; then
-		npm install grunt --save-dev
-		npm install grunt-angular-gettext --save-dev
-		make translate
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN}/home ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	mv ${D}/usr/etc ${D}/etc
-
-	insinto /etc/privacyidea
-	doins deploy/debian/pi.cfg
-	doins deploy/privacyidea/NetKnights.pem
-	doins authmodules/FreeRADIUS/rlm_perl.ini
-
-	insinto /etc/privacyidea/CA
-	doins deploy/debian/openssl.cnf
-
-	fowners -R ${PN}:root /etc/privacyidea
-	fperms 600 /etc/privacyidea/enckey \
-	           /etc/privacyidea/private.pem
-
-##	insinto /etc/logrotate.d
-##	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	diropts -o privacyidea -g root
-	keepdir /var/log/privacyidea
-}
diff --git a/www-apps/privacyidea/privacyidea-2.23.5-r1.ebuild b/www-apps/privacyidea/privacyidea-2.23.5-r1.ebuild
deleted file mode 100644
index c5ba4aa..0000000
--- a/www-apps/privacyidea/privacyidea-2.23.5-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 user
-
-VRADIUS="81513be16e6db775effac9ed39ab10dc381be66d"
-
-DESCRIPTION="privacyIDEA is a modular authentication system"
-HOMEPAGE="https://www.privacyidea.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-         https://github.com/${PN}/FreeRADIUS/archive/${VRADIUS}.tar.gz -> ${PN}-FreeRADIUS-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+mysql postgres sqlite -translation"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	translation? ( net-libs/nodejs[npm] 
-	               app-i18n/poedit )"
-RDEPEND="
-	mysql? ( dev-python/mysql-python
-	         dev-python/pymysql
-	         >=virtual/mysql-5.0 )
-	postgres? ( dev-python/psycopg )
-	sqlite? ( dev-python/sqlalchemy[sqlite] )
-	dev-perl/Config-IniFiles
-	dev-perl/Crypt-SSLeay
-	dev-perl/Data-Dump
-	dev-perl/JSON
-	dev-perl/Net-SSLeay
-	dev-perl/Try-Tiny
-	dev-perl/libwww-perl
-	dev-python/alembic
-	dev-python/bcrypt
-	dev-python/beautifulsoup:4
-	dev-python/configobj
-	dev-python/cookies
-	dev-python/cov-core
-	dev-python/coverage
-	dev-python/croniter
-	dev-python/defusedxml
-	dev-python/ecdsa
-	dev-python/flask
-	dev-python/flask-babel
-	dev-python/flask-migrate
-	dev-python/flask-script
-	dev-python/flask-sqlalchemy
-	dev-python/funcparserlib
-	dev-python/imagesize
-	dev-python/itsdangerous
-	dev-python/ldap3
-	dev-python/lxml
-	dev-python/mako
-	dev-python/matplotlib
-	dev-python/mock
-	dev-python/netaddr
-	dev-python/nose
-	dev-python/numpy
-	dev-python/pandas
-	dev-python/passlib
-	dev-python/pillow
-	dev-python/pycrypto
-	dev-python/pyjwt
-	dev-python/pyparsing
-	dev-python/pytest
-	dev-python/pytest-cov
-	dev-python/pytest-runner
-	dev-python/python-dateutil
-	dev-python/python-gnupg
-	dev-python/pyusb
-	dev-python/pyyaml
-	dev-python/qrcode
-	dev-python/requests
-	dev-python/responses
-	dev-python/sphinx
-	dev-python/sphinxcontrib-httpdomain
-	dev-python/sqlalchemy
-	dev-python/werkzeug
-	dev-python/pyrad
-	dev-python/redis-py
-	dev-python/sqlsoup
-	www-apache/mod_wsgi
-	www-servers/gunicorn
-"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-python_prepare_all() {
-	rm -rf tests
-	rmdir authmodules/FreeRADIUS
-	ln -s ../../FreeRADIUS-${VRADIUS} authmodules/FreeRADIUS
-
-	if use translation; then
-		npm install grunt --save-dev
-		npm install grunt-angular-gettext --save-dev
-		make translate
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN}/home ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	mv ${D}/usr/etc ${D}/etc
-
-	insinto /etc/privacyidea
-	doins deploy/debian/pi.cfg
-	doins deploy/privacyidea/NetKnights.pem
-	doins authmodules/FreeRADIUS/rlm_perl.ini
-
-	insinto /etc/privacyidea/CA
-	doins deploy/debian/openssl.cnf
-
-	fowners -R ${PN}:root /etc/privacyidea
-	fperms 600 /etc/privacyidea/enckey \
-	           /etc/privacyidea/private.pem
-
-##	insinto /etc/logrotate.d
-##	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	diropts -o privacyidea -g root
-	keepdir /var/log/privacyidea
-}
diff --git a/www-apps/privacyidea/privacyidea-2.23.5.ebuild b/www-apps/privacyidea/privacyidea-2.23.5.ebuild
deleted file mode 100644
index 4a54e2b..0000000
--- a/www-apps/privacyidea/privacyidea-2.23.5.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 user
-
-VRADIUS="81513be16e6db775effac9ed39ab10dc381be66d"
-
-DESCRIPTION="privacyIDEA is a modular authentication system"
-HOMEPAGE="https://www.privacyidea.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-         https://github.com/${PN}/FreeRADIUS/archive/${VRADIUS}.tar.gz -> ${PN}-FreeRADIUS-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+mysql postgres sqlite -translation"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	translation? ( net-libs/nodejs[npm] 
-	               app-i18n/poedit )"
-RDEPEND="
-	mysql? ( dev-python/mysql-python
-	         dev-python/pymysql
-	         >=virtual/mysql-5.0 )
-	postgres? ( dev-python/psycopg )
-	sqlite? ( dev-python/sqlalchemy[sqlite] )
-	dev-perl/Config-IniFiles
-	dev-perl/Data-Dump
-	dev-perl/JSON
-	dev-perl/Try-Tiny
-	dev-perl/libwww-perl
-	dev-python/alembic
-	dev-python/bcrypt
-	dev-python/beautifulsoup:4
-	dev-python/configobj
-	dev-python/cookies
-	dev-python/cov-core
-	dev-python/coverage
-	dev-python/croniter
-	dev-python/defusedxml
-	dev-python/ecdsa
-	dev-python/flask
-	dev-python/flask-babel
-	dev-python/flask-migrate
-	dev-python/flask-script
-	dev-python/flask-sqlalchemy
-	dev-python/funcparserlib
-	dev-python/imagesize
-	dev-python/itsdangerous
-	dev-python/ldap3
-	dev-python/lxml
-	dev-python/mako
-	dev-python/matplotlib
-	dev-python/mock
-	dev-python/netaddr
-	dev-python/nose
-	dev-python/numpy
-	dev-python/pandas
-	dev-python/passlib
-	dev-python/pillow
-	dev-python/pycrypto
-	dev-python/pyjwt
-	dev-python/pyparsing
-	dev-python/pytest
-	dev-python/pytest-cov
-	dev-python/pytest-runner
-	dev-python/python-dateutil
-	dev-python/python-gnupg
-	dev-python/pyusb
-	dev-python/pyyaml
-	dev-python/qrcode
-	dev-python/requests
-	dev-python/responses
-	dev-python/sphinx
-	dev-python/sphinxcontrib-httpdomain
-	dev-python/sqlalchemy
-	dev-python/werkzeug
-	dev-python/pyrad
-	dev-python/redis-py
-	dev-python/sqlsoup
-	www-apache/mod_wsgi
-	www-servers/gunicorn
-"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-python_prepare_all() {
-	rm -rf tests
-	rmdir authmodules/FreeRADIUS
-	ln -s ../../FreeRADIUS-${VRADIUS} authmodules/FreeRADIUS
-
-	if use translation; then
-		npm install grunt --save-dev
-		npm install grunt-angular-gettext --save-dev
-		make translate
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN}/home ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	mv ${D}/usr/etc ${D}/etc
-
-	insinto /etc/privacyidea
-	doins deploy/debian/pi.cfg
-	doins deploy/privacyidea/NetKnights.pem
-	doins authmodules/FreeRADIUS/rlm_perl.ini
-
-	insinto /etc/privacyidea/CA
-	doins deploy/debian/openssl.cnf
-
-	fowners -R ${PN}:root /etc/privacyidea
-	fperms 600 /etc/privacyidea/enckey \
-	           /etc/privacyidea/private.pem
-
-##	insinto /etc/logrotate.d
-##	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	diropts -o privacyidea -g root
-	keepdir /var/log/privacyidea
-}
diff --git a/www-apps/privacyidea/privacyidea-3.0.2.ebuild b/www-apps/privacyidea/privacyidea-3.4.ebuild
similarity index 74%
rename from www-apps/privacyidea/privacyidea-3.0.2.ebuild
rename to www-apps/privacyidea/privacyidea-3.4.ebuild
index 2f22805..9bd8288 100644
--- a/www-apps/privacyidea/privacyidea-3.0.2.ebuild
+++ b/www-apps/privacyidea/privacyidea-3.4.ebuild
@@ -4,11 +4,11 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
 
 inherit distutils-r1 user
 
-VRADIUS="3.1"
+VRADIUS="3.4"
 
 DESCRIPTION="privacyIDEA is a modular authentication system"
 HOMEPAGE="https://www.privacyidea.org/"
@@ -39,10 +39,12 @@ RDEPEND="
 	dev-python/configobj[${PYTHON_USEDEP}]
 	dev-python/croniter[${PYTHON_USEDEP}]
 	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/flask-babel[${PYTHON_USEDEP}]
 	dev-python/flask-migrate[${PYTHON_USEDEP}]
 	dev-python/flask-script[${PYTHON_USEDEP}]
+	dev-python/flask-versioned[${PYTHON_USEDEP}]
 	dev-python/funcparserlib[${PYTHON_USEDEP}]
 	dev-python/huey[${PYTHON_USEDEP}]
 	dev-python/itsdangerous[${PYTHON_USEDEP}]
@@ -58,6 +60,11 @@ RDEPEND="
 	dev-python/qrcode[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/smpplib[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-httpdomain[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
 	dev-python/sqlsoup[${PYTHON_USEDEP}]
 	dev-python/urllib3[${PYTHON_USEDEP}]
 	dev-python/werkzeug[${PYTHON_USEDEP}]
@@ -68,8 +75,6 @@ REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 python_prepare_all() {
 	rm -rf tests
-	rmdir authmodules/FreeRADIUS
-	ln -s ../../FreeRADIUS-${VRADIUS} authmodules/FreeRADIUS
 
 	if use translation; then
 		npm install grunt --save-dev
@@ -97,7 +102,18 @@ python_install_all() {
 	doins deploy/privacyidea/enckey
 	doins deploy/privacyidea/private.pem
 	doins deploy/privacyidea/public.pem
-	doins authmodules/FreeRADIUS/rlm_perl.ini
+	doins ../FreeRADIUS-${VRADIUS}/rlm_perl.ini
+	doins ../FreeRADIUS-${VRADIUS}/dictionary.netknights
+
+	insinto /etc/privacyidea/freeradius2
+	doins ../FreeRADIUS-${VRADIUS}/config/freeradius2/mods-perl-privacyidea
+	doins ../FreeRADIUS-${VRADIUS}/config/freeradius2/privacyidea
+	insinto /etc/privacyidea/freeradius3
+	doins ../FreeRADIUS-${VRADIUS}/config/freeradius3/mods-perl-privacyidea
+	doins ../FreeRADIUS-${VRADIUS}/config/freeradius3/privacyidea
+
+	insinto /usr/share/privacyidea/freeradius
+	doins ../FreeRADIUS-${VRADIUS}/privacyidea_radius.pm
 
 ##	insinto /etc/privacyidea/CA
 ##	doins deploy/debian/openssl.cnf
@@ -111,4 +127,7 @@ python_install_all() {
 
 	diropts -o privacyidea -g root
 	keepdir /var/log/privacyidea
+
+	diropts -o privacyidea -g privacyidea
+	keepdir /var/lib/privacyidea/home
 }
diff --git a/www-apps/privacyideaadm/Manifest b/www-apps/privacyideaadm/Manifest
index 27b748c..f2eb0c7 100644
--- a/www-apps/privacyideaadm/Manifest
+++ b/www-apps/privacyideaadm/Manifest
@@ -1,8 +1,4 @@
-DIST privacyideaadm-2.1.tar.gz 51230 BLAKE2B 0c0c96cdced7506164e412ee29cc6de77d984a9b81b9e604bd98cbe79f913c1f5cdc47fb53373e823ed5677a87f6b96e473e7d73949d76c30c556d88a8a4aa59 SHA512 95cfc6adf787cc5adffd417e2e576382a3391d03006c93b64828ad2d36b869723e177bd00b0cb73a340b7274e00f2ba4cf36171d1649ca066b7872cc798e10a3
-DIST privacyideaadm-2.15.tar.gz 58059 BLAKE2B 5a9ba9d7ee1e19ab648b904aa182e15be3f444c929c9ff059c542672eadafc074afb72aa7eac6b1723611eea408a3bae3be92866745bf3a7df06e962ae1d6b11 SHA512 2ac4dfc6d5d52c62b0742547162a0409cf5049ed351fa02409335337502ab20833f136d616e60cfa9f53cd993e579182128af96f061138bae0f6a6e886a3809a
-DIST privacyideaadm-2.22.2.tar.gz 58554 BLAKE2B 258bcdba83401706f1d9d32b369dde05ee903acd7a957e812ae621f64118328cebad2c7739864d119131c8349c0d65be32ced204110e063c0507fc0ef897911a SHA512 b8cefcbaf178b4a62734397ee86f5ba02e75e503e3aea204fe5a8c6e3862f2e2ff8f2be798c8413fc34f6cecddb6e904f943973adb2de4d7f0989e3fe7c40712
 DIST privacyideaadm-2.23.5.tar.gz 59034 BLAKE2B b23b297e9d182760cf1e977f42b16b528cb2eff29b72687250b78fa69d266275dd82ebd1e0d8eddb499ecf9693976f5ba9aeabbac1d9b7049144bfac869a9003 SHA512 cbad4380335cb1f9c572cec4c9f9764bdbdcb6e5b537aaff5732e4fa49ed41e8f65ec1e6b67cbf514e7a0f41737fcf6170cf272723d645c4cf9f4cd3c4b5ce6e
-EBUILD privacyideaadm-2.1.ebuild 673 BLAKE2B b6437c60ed43f6f5eb421fdaaf913f6de4658a66be84598854a8ef8c7bc6d501634bd77b27d9a3a0edbc8266acd3f9bbe53cee9c3c6a2c7a892283e13149e955 SHA512 02b1a2e7116bf0200a4b92f258375f1342ffdfc572eacf37d6ec9850271f767fb7cec7517a5e4161b1a99236115506c1b9babe2caa47e2d47a94a3cbd1916a91
-EBUILD privacyideaadm-2.15.ebuild 766 BLAKE2B a46e3a02dd9f68a02a16c3c4804466e6b7f0ad1e19a37e38754fa8dc9e125093cb624843d6885491a4cb5530ccf2e15f69e47b995e46017a442e933001c6f8a5 SHA512 6e81f141a71c2aff78b82680292e3686b7af86ec8444aea99a78313292ce25580d77b8f211c38d48779ca47a43a64d6a5b22f155f80cabe6508c138d75601ba9
-EBUILD privacyideaadm-2.22.2.ebuild 793 BLAKE2B f7c59ce3e30a104d9cb842ad54f478b2c170a9a8bc3817846882e6243b635f0030281068e7f5470983756a2ad2f365f8ccfe04f627f516265f00129bf8587332 SHA512 fab8bd4cf39b8ac13d1aca9f90e512387d228dd6b944554d87b57856659c71eb5839905afaeb03f6fd5baaa1d779394acb26a3bd6bc00e031093dbc67b2c72b4
+DIST privacyideaadm-3.0.tar.gz 62895 BLAKE2B edf74ff8f2892aaeab8fa6b6c2c0a2b6ca79f19b2b33b712b30c5a452b658ed581ea322d29ac933ea5f160e0d50646203e9adc9c806200ad3130d5f668399854 SHA512 fad29d008cd87e6806a04ceeae42663c544d68c358361c3e9ae1e61abf249792809d4eb2f4cf0030f29681b44ad1336a772aa81e924a409bcb58bbafb0e54f30
 EBUILD privacyideaadm-2.23.5.ebuild 1006 BLAKE2B 606034b8d09b321abf75a8db7282b9eba1f8beee7475a530da24c2915babf230481acb9ae44a8a23bfb3db46a344eccf616f3c39ca00039734996a75fd3c624f SHA512 2ab47be98daeffa43c7651bebc045d819aea42375a2bff30e09f545080cf7f1337d4e38a9108077499c9cdbee1eb310c574b640b043be9631eb7fabc8c41261c
+EBUILD privacyideaadm-3.0.ebuild 1008 BLAKE2B f13708941d6e125723d99ef2c25bf4e3ba019b6687687a2ebf245518da0c0f6f4fe0e5321f2f713173c41b121279daefb172bb9542fd0d8e816240f825d99a50 SHA512 d0f45c84f9debea87f0bc91383b5caee6fed8ef7b61d5b077030fcedbb37bcf3b0732adf7b2cdc30a61771985e5b323dd33b2f6931c71bb70e5033e2b2fa430f
diff --git a/www-apps/privacyideaadm/privacyideaadm-2.1.ebuild b/www-apps/privacyideaadm/privacyideaadm-2.1.ebuild
deleted file mode 100644
index 3b87fe6..0000000
--- a/www-apps/privacyideaadm/privacyideaadm-2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="a command line client to manage the privacyIDEA server"
-HOMEPAGE="https://www.privacyidea.org/"
-SRC_URI="https://github.com/privacyidea/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-        dev-python/sphinx"
-RDEPEND="dev-python/requests
-         dev-python/pycrypto
-         dev-python/pyusb
-         dev-python/python-yubico"
-
-src_prepare(){
-	rm -rf tests
-	emake man
-	eapply_user
-}
diff --git a/www-apps/privacyideaadm/privacyideaadm-2.22.2.ebuild b/www-apps/privacyideaadm/privacyideaadm-2.22.2.ebuild
deleted file mode 100644
index adcd747..0000000
--- a/www-apps/privacyideaadm/privacyideaadm-2.22.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-PV_COMMIT="e3ceb5a06c3f1a6c0a251515ce7ebcf66c61b2b0"
-
-inherit distutils-r1
-
-DESCRIPTION="a command line client to manage the privacyIDEA server"
-HOMEPAGE="https://www.privacyidea.org/"
-SRC_URI="https://github.com/privacyidea/${PN}/archive/${PV_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}-${PV_COMMIT}
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-        dev-python/sphinx"
-RDEPEND="dev-python/requests
-         dev-python/pycrypto
-         dev-python/pyusb
-         dev-python/python-yubico
-         dev-python/qrcode"
-
-src_prepare(){
-	rm -rf tests
-	emake man
-	eapply_user
-}
diff --git a/www-apps/privacyideaadm/privacyideaadm-2.15.ebuild b/www-apps/privacyideaadm/privacyideaadm-3.0.ebuild
similarity index 53%
rename from www-apps/privacyideaadm/privacyideaadm-2.15.ebuild
rename to www-apps/privacyideaadm/privacyideaadm-3.0.ebuild
index 04eae31..8e40a67 100644
--- a/www-apps/privacyideaadm/privacyideaadm-2.15.ebuild
+++ b/www-apps/privacyideaadm/privacyideaadm-3.0.ebuild
@@ -4,9 +4,9 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 
-PV_COMMIT="86e845de15d9fdcd59fa321228a60351d0312092"
+PV_COMMIT="96eadf89893d73de480b6fe6a06dcf88c69cb7f6"
 
 inherit distutils-r1
 
@@ -22,11 +22,15 @@ IUSE=""
 S=${WORKDIR}/${PN}-${PV_COMMIT}
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-        dev-python/sphinx"
-RDEPEND="dev-python/requests
-         dev-python/pycrypto
-         dev-python/pyusb
-         dev-python/python-yubico"
+        >dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
+RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]
+         dev-python/click[${PYTHON_USEDEP}]
+         dev-python/cryptography[${PYTHON_USEDEP}]
+         dev-python/python-yubico[${PYTHON_USEDEP}]
+         dev-python/qrcode[${PYTHON_USEDEP}]
+         dev-python/requests[${PYTHON_USEDEP}]
+         dev-python/six[${PYTHON_USEDEP}]"
+
 
 src_prepare(){
 	rm -rf tests