gentoo auto-resync : 09:12:2024 - 02:07:41

10 files changed, 91 insertions, 126 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d71bedec6890..0c8e389825cf 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 41cccc64df8f..b020453acc2b 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,7 +1,5 @@
-DIST gns3-gui-2.2.49.tar.gz 5065254 BLAKE2B 4959dad7bad288100dfef467c71876dff287881630aa7e5e1d46f8b774403e5850db11fd525e43d2fd3a980ecd62aae8363e4af56d57c3ba9e37421131b8c7ff SHA512 f85c58287be3d1c9c8ada9590ac67a8703e28d7c5c01d52c8080e192318d42dd0c6bf06b9aed5d61a6e59b523e0de66d2535781ff78cca6b9451b4a7b3a414cb
-DIST gns3-gui-2.2.50.tar.gz 5066171 BLAKE2B 7d62e358b8863793c20eb03ecbc412c21c561c3afa3365d43434b96486a474ba3aded18dbdc35205ad2f98353ceead5aac63d807de68ef8b000f578287feb698 SHA512 264870e8aa132aad984c9e45297688eefbbd8be8ad8372f7851f759627f46e5d6fbf985af6ce39ba3b3de35b3e4f235f8f678b69b4f9b36655791c4332c8eaa4
 DIST gns3-gui-2.2.51.tar.gz 5065488 BLAKE2B 4eca5abcdc24d8493aa40aa0afc2a58ccc3adce71321fd6d27b8f950b9c04ada60081ec57ea128304b53f9d26b4d104358be984baa12a9f11d9a5d333d22170d SHA512 0558540f30c6f34555612d0188592b60844c4aa58cc0fd823b8cbc067620f3beb1e9a343ebc8f82a71a0abdd1af73511043142000c5f443ce86399781bd3581e
-EBUILD gns3-gui-2.2.49-r1.ebuild 1023 BLAKE2B dc56284d537850c3def24ff9da5d2c51e1c5e077bb72001b088f6f44ce37cdeb92ce2d90e652720a37e10f2788d00547700a18850045932142a8a434764a9703 SHA512 ccac62b662b7f143f29c7542a0c68bcf25dae54a78257121c3076270e041fca6c15ec16b82d8cb1d28763efaccade9e51e46c513349cc74ae626755c46e23dce
-EBUILD gns3-gui-2.2.50.ebuild 1023 BLAKE2B dc56284d537850c3def24ff9da5d2c51e1c5e077bb72001b088f6f44ce37cdeb92ce2d90e652720a37e10f2788d00547700a18850045932142a8a434764a9703 SHA512 ccac62b662b7f143f29c7542a0c68bcf25dae54a78257121c3076270e041fca6c15ec16b82d8cb1d28763efaccade9e51e46c513349cc74ae626755c46e23dce
+DIST gns3-gui-2.2.52.tar.gz 5065074 BLAKE2B b05a7b9326ddb09bc98dda51a4efd201cc4d64aafcdbc3602be087d16ac8e9c4879a7c2a484ca0d0c2d44a73ee4a0bedb390ab2353813b9a9da2c4592b7c7f2e SHA512 62e53dbf7aa7744539c0792f7af251e978481defbe65619b7e8f4569f24e367acbfca9454e0f2c50edeb220d242d43959942f8ff0937616c74a9940a65dc4f3a
 EBUILD gns3-gui-2.2.51.ebuild 1024 BLAKE2B 5232f5a22b446dbb16a4c15c879fda20d3c62e079358b504b8692888a93df5a8a3e9a77dd465792598586b79365530d6fc37ad923f5c8d8f8b488663f51621d3 SHA512 bfbd678d66d12b1849ec8c5be7158352117d54ba6542f7af1a85e16065549eb0f08a4ff50b74a062f3afa7d81e23275592dd3ffa1043f86e32cc596527646247
+EBUILD gns3-gui-2.2.52.ebuild 1024 BLAKE2B 5232f5a22b446dbb16a4c15c879fda20d3c62e079358b504b8692888a93df5a8a3e9a77dd465792598586b79365530d6fc37ad923f5c8d8f8b488663f51621d3 SHA512 bfbd678d66d12b1849ec8c5be7158352117d54ba6542f7af1a85e16065549eb0f08a4ff50b74a062f3afa7d81e23275592dd3ffa1043f86e32cc596527646247
 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.50.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.50.ebuild
deleted file mode 100644
index d72934069f01..000000000000
--- a/net-misc/gns3-gui/gns3-gui-2.2.50.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 virtualx xdg
-
-DESCRIPTION="Graphical Network Simulator"
-HOMEPAGE="https://www.gns3.com https://github.com/GNS3/gns3-gui"
-SRC_URI="https://github.com/GNS3/gns3-gui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-#net-misc/gns3-server version should always match gns3-gui version
-RDEPEND="
-	>=dev-python/distro-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.23.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/truststore-0.9.1[${PYTHON_USEDEP}]
-	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
-	dev-python/pyqt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-
-	# newer python packages are fine
-	sed -i -e 's/[<>=].*//' requirements.txt || die
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.49-r1.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.52.ebuild
index d72934069f01..ee747469d0c2 100644
--- a/net-misc/gns3-gui/gns3-gui-2.2.49-r1.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.2.52.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 virtualx xdg
@@ -20,8 +20,8 @@ KEYWORDS="~amd64"
 RDEPEND="
 	>=dev-python/distro-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-4.23.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/truststore-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/psutil-6.1.0[${PYTHON_USEDEP}]
+	>=dev-python/truststore-0.10.0[${PYTHON_USEDEP}]
 	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
 	dev-python/pyqt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
 "
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index caac31f3a2b4..542d1c851314 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,7 +1,5 @@
-DIST gns3-server-2.2.49.tar.gz 10851027 BLAKE2B c580f14e041b683bb738184c2cfa320936b61df8a5ee5fa138eff2c93ee193061f6ec24e25b2575d7ce8d5ab3e3e46e9178584fff4e72815ad961a7bffcf878c SHA512 1574d5f509283b3f6d4cac40320a6629e116a8f6fa126750a0c6f09a7dbeab015eb28fda380af0a2ed0756e524ab54a8e79d7cef5cad12f92affecb516d1329e
-DIST gns3-server-2.2.50.tar.gz 10856859 BLAKE2B 2fd917456a9ce38032160942ed08814ee463bb37831ab8f35e40f3f370161ce70c6290a8c8f9f6f825d9cac70edb10847a9eaee32fa4bb28d769c5561d8d4674 SHA512 66e5df340660007d0c34b4dcd0ad2bed1efd727904e24dfe775d8393e73eb1b5e843940d015be3d7e95163d63c48e8ebb377b2c26cc7528200b905380df01056
 DIST gns3-server-2.2.51.tar.gz 10859367 BLAKE2B 13e1a5a90d149c66b227ca8974d3564f8cc5bca88be1db0827c2a14f0ddac282229ec7cf7a5a6174689076155df0d84efbca2fdc884d43c042a12ecfe744bcd9 SHA512 f259e0b8b424ac14925b60a13d2a66afa8ce4d4280f1d5c733035efd5111e05875f08d6cd4456db01e97f6974c378a3d6f935adda28c312ce53b53e5f3953c28
-EBUILD gns3-server-2.2.49-r1.ebuild 1933 BLAKE2B f83679db97e030d69689ee1b6f35b598b15e86ae53625b79a51ed4615f0e4f86858e5aac9cc24a8cdd92893a73924f7a109d5588f6722d47067f20881cfd1adf SHA512 f3d4375d560ccd546a9a89dc19fe176da3600cf408beb9bcc31aab7255afa3b91f682c0519685159ea10f75924e7f462b4a79bd4bbea5e5993aac7e61b1d88f3
-EBUILD gns3-server-2.2.50.ebuild 1934 BLAKE2B 13e806e6d64ba3aab53c49acf2133534109ff967fe48586f42a50da8371c548f66183da5e42d854037e13fa5ff87103d9557b0dc11e31be2bc8acbb2796faa3d SHA512 c894744807ea442e236b60be0007dfc3567e83ecf1903a9d229043c2057cf86be7e3bed11350e91618349cceabc0c753555c4afc3a1bc2c3c63dbfa9c34016f1
+DIST gns3-server-2.2.52.tar.gz 10857965 BLAKE2B 2a5651826bf0ffe7c912aa6c75c9127811018006e4272a6087868973928401d190fff2c47307fd6a65148991ad6a59d4d176c3760180ef499b6edb658c0b8f31 SHA512 15c13a9c3ebb1b0622fee512bedce2ed77eb89b47b03f2eac81c37ec1bbf5edffa34b6fe149d61e889c2b32c752a497888fa0e8288579d24d5d5c642513ecf48
 EBUILD gns3-server-2.2.51.ebuild 1936 BLAKE2B d8d5ab605c8c53b2e475e5219746c6b810456f70ff97fd0679d906767800626daea872d2c7cb0d7d38d7f9c8dfb3c2965a2dec06d931cceec596afe27f90c0bc SHA512 c57b5daaf1706f378f82b00e0a1ee7fea18a8bb0a9054a0d2d9102d1733313154153ca8555d0dc75c40a40dc95c4776b5df3b01d9ba10f509207e7a19a68ccf1
+EBUILD gns3-server-2.2.52.ebuild 1936 BLAKE2B d8d5ab605c8c53b2e475e5219746c6b810456f70ff97fd0679d906767800626daea872d2c7cb0d7d38d7f9c8dfb3c2965a2dec06d931cceec596afe27f90c0bc SHA512 c57b5daaf1706f378f82b00e0a1ee7fea18a8bb0a9054a0d2d9102d1733313154153ca8555d0dc75c40a40dc95c4776b5df3b01d9ba10f509207e7a19a68ccf1
 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-server/gns3-server-2.2.50.ebuild b/net-misc/gns3-server/gns3-server-2.2.50.ebuild
deleted file mode 100644
index 421c7b510785..000000000000
--- a/net-misc/gns3-server/gns3-server-2.2.50.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 optfeature systemd
-
-DESCRIPTION="GNS3 server to asynchronously manage emulators"
-HOMEPAGE="https://www.gns3.com https://github.com/GNS3/gns3-server"
-SRC_URI="https://github.com/GNS3/gns3-server/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	acct-group/gns3
-	acct-user/gns3
-	app-emulation/dynamips
-	>=dev-python/aiofiles-24.1.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3.10.3[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/async-timeout-4.0.3[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja2-3.1.4[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.23.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}]
-	>=dev-python/truststore-0.9.1[${PYTHON_USEDEP}]
-	net-misc/ubridge
-	sys-apps/busybox[static]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-
-	# newer python packages are fine
-	sed -i -e 's/[<>=].*//' requirements.txt || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	systemd_dounit init/gns3.service.systemd
-	newinitd init/gns3.service.openrc gns3server
-}
-
-pkg_postinst() {
-	elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
-	elog ""
-	optfeature "QEMU Support" "app-emulation/qemu"
-	optfeature "Virtualbox Support" "app-emulation/virtualbox"
-	optfeature "Docker Support" "app-containers/docker"
-	optfeature "Wireshark Support" "net-analyzer/wireshark"
-	elog ""
-	elog "The following packages are currently unsupported:"
-	elog "iouyap and vpcs"
-}
diff --git a/net-misc/gns3-server/gns3-server-2.2.49-r1.ebuild b/net-misc/gns3-server/gns3-server-2.2.52.ebuild
index 92bf5f812136..0f156170f6ed 100644
--- a/net-misc/gns3-server/gns3-server-2.2.49-r1.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.52.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 optfeature systemd
@@ -21,16 +21,16 @@ RDEPEND="
 	acct-user/gns3
 	app-emulation/dynamips
 	>=dev-python/aiofiles-24.1.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3.9.5[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.10.10[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/async-timeout-4.0.3[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/jinja2-3.1.4[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-4.23.0[${PYTHON_USEDEP}]
 	>=dev-python/platformdirs-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-6.1.0[${PYTHON_USEDEP}]
 	>=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}]
-	>=dev-python/truststore-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/truststore-0.10.0[${PYTHON_USEDEP}]
 	net-misc/ubridge
 	sys-apps/busybox[static]
 "
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index abc72d4636c9..56cbcf3f94bb 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -2,6 +2,8 @@ AUX sslh.conf.d-2 621 BLAKE2B 095522c582be245f1e49018848be738a33eb722cd9be4bd8a0
 AUX sslh.init.d-3 270 BLAKE2B 98cc6c6ccc37a6e8af6d0e84356779e0f304e3d6f45f9fff53c3d1c870ff6b03ac780c04c29e4dce7d6aa3e4cdce365fb54228600e7ce70d9d32691202a5ffb5 SHA512 b919ae318c789ba3e5dd0f5df665a7421be791e89074b07ee00c47b3fe12475562eb5675bbb168c86388902bf50069e0d6f3e804a14666563de07a0a71075ee0
 AUX sslh.service 661 BLAKE2B d6a94b992745a1282a6ac9ba3d95395f708f703b1a22a591c03092243d5e73f87c177685d4d469ed96ef439aead22e505ba2f479107e640c3434af6536c2b866 SHA512 4fa63d43159c3f3f66bdecd087caf6a2677619dcd8baa65e97593f70c334efa5d5835e98ecf9771ad28e624c2b69b3798f1025014f4a70de65610caff8917694
 DIST sslh-2.1.2.tar.gz 214091 BLAKE2B 220841c7105032b02351b6073ffd994a22efb0241ebec96704bd2ec534197a19c366d925ebf07a494773e89d83df5f284567e34d419b887edb73545523abb71e SHA512 4f0b3c61e6153b912b11c49baba2df1a9df6732ea9fcdee628bf02043efc1b6505ac97eec97740c67d09f7d58a1bb79e0e06d949cb7fabcffa1fb91733372631
+DIST sslh-2.1.3.tar.gz 461954 BLAKE2B 93b84130077933fe05f825d19972b85bfb03abe09b6ee63a8dc31ba90076e55d9851155e2a9e4c1ed86a2350eb890e0daf7105a450f568b4f3db786b5f7abac3 SHA512 680ad2ac8c6e5fbbbee3973c7862533c12722f0633c7dc545cfea7873031a918d6a8529c707d2fa1ec097b7abe5420d9a11f9eb15c9d84e12a9a954fdb987dab
 EBUILD sslh-2.1.2-r1.ebuild 1707 BLAKE2B d35fd9bc8b3e785ba1e833c079306335f8d4d2119fc930e7f937a060e271023b620386ef3d3e87b8df07de262620f2fda6a9bef1e6c377561783a23613bcaf6f SHA512 4ecb6c54657eb23c236d7cb483b5d5a9b85f94d336c131ed5409876633790c04c901f42c50869ea8d40a6b943dcde6ca86f7dba8df4c6101b9f0234e5e75e912
-EBUILD sslh-9999.ebuild 1707 BLAKE2B d35fd9bc8b3e785ba1e833c079306335f8d4d2119fc930e7f937a060e271023b620386ef3d3e87b8df07de262620f2fda6a9bef1e6c377561783a23613bcaf6f SHA512 4ecb6c54657eb23c236d7cb483b5d5a9b85f94d336c131ed5409876633790c04c901f42c50869ea8d40a6b943dcde6ca86f7dba8df4c6101b9f0234e5e75e912
+EBUILD sslh-2.1.3.ebuild 1709 BLAKE2B 4871e72eb1802e9f03a2fbc0743f0f6e7005cd78f95fb9d33dccf396feb9f48ecbf073ca38e6292ad65ff22aea2ada0d90402c6969d93ff4faf00e814e172fab SHA512 27cf41bea808ddebc882a3005f57b076b58d8b505aa218927abebb7f256ad53f3c7a8a9f2f7f7b0597b668c73821809134089bfd5d166b3decc994b9f4c67acd
+EBUILD sslh-9999.ebuild 1709 BLAKE2B 4871e72eb1802e9f03a2fbc0743f0f6e7005cd78f95fb9d33dccf396feb9f48ecbf073ca38e6292ad65ff22aea2ada0d90402c6969d93ff4faf00e814e172fab SHA512 27cf41bea808ddebc882a3005f57b076b58d8b505aa218927abebb7f256ad53f3c7a8a9f2f7f7b0597b668c73821809134089bfd5d166b3decc994b9f4c67acd
 MISC metadata.xml 482 BLAKE2B d2c26b25b184b90e3a7d85e81ceb0a0631fca8c267823a87f9302e91d40e80a31c23b184c572af1a32c5b02f86e62ec86efb7a39d5d2c01187e16dd6dc4e2f6c SHA512 3ba2f78c8498d79c318619ddf6e2b3ccd35821ead01dfd65bd2dbae95b1c7d66d7f16751221cceb1439db9629add3bb0538057feeacccc8caea3a0e5041e9184
diff --git a/net-misc/sslh/sslh-2.1.3.ebuild b/net-misc/sslh/sslh-2.1.3.ebuild
new file mode 100644
index 000000000000..9e89e052625b
--- /dev/null
+++ b/net-misc/sslh/sslh-2.1.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
+HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86"
+	SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S=${WORKDIR}/${P}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps libev systemd tcpd"
+
+RDEPEND="caps? ( sys-libs/libcap )
+	dev-libs/libpcre2:=
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	dev-libs/libconfig:=
+	libev? ( dev-libs/libev )
+	>=dev-libs/libconfig-1.5:="
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+RESTRICT="test"
+
+src_prepare() {
+	sed -i \
+		-e '/MAN/s:| gzip -9 - >:>:' \
+		-e '/MAN=sslh.8.gz/s:.gz::' \
+		Makefile.in || die
+	default
+}
+
+src_compile() {
+	append-lfs-flags
+
+	emake \
+		CC="$(tc-getCC)" \
+		USELIBCAP=$(usev caps) \
+		USELIBEV=$(usev libev) \
+		USELIBWRAP=$(usev tcpd) \
+		USESYSTEMD=$(usev systemd)
+}
+
+src_install() {
+	dosbin sslh-{fork,select}
+	if use libev; then
+		dosbin sslh-ev
+		dosym sslh-fork /usr/sbin/sslh
+	else
+		dosym sslh-fork /usr/sbin/sslh
+	fi
+
+	doman ${PN}.8
+
+	dodoc ChangeLog README.md
+
+	newinitd "${FILESDIR}"/sslh.init.d-3 sslh
+	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
+
+	if use systemd; then
+		# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
+		systemd_newunit "${FILESDIR}/sslh.service" sslh.service
+		exeinto /usr/lib/systemd/system-generators/
+		doexe systemd-sslh-generator
+	fi
+}
diff --git a/net-misc/sslh/sslh-9999.ebuild b/net-misc/sslh/sslh-9999.ebuild
index 453e5f7b10ac..9e89e052625b 100644
--- a/net-misc/sslh/sslh-9999.ebuild
+++ b/net-misc/sslh/sslh-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 x86"
+	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86"
 	SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S=${WORKDIR}/${P}
 fi