gentoo resync : 04.05.2021

3 files changed, 4 insertions, 123 deletions

diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 6bba89236196..2df8dc745be3 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -1,8 +1,5 @@
 DIST googletest-18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6.tar.gz 876756 BLAKE2B f51050e656a449e7d8b7d4d920439825dc5857a8fac637b96191bbf668b6353b0e83c5221395f761ca8d1d29a20596ced4d8b4e08b3ce364a866cf7bcc977e4c SHA512 f77c747218dc5ae4858b2b4c58a401eb895493adf470a331d6bac32cd20542533ff3a77081db653bbc18b9f55f6864be04e1739ef4afaed7db39d7c698abf880
-DIST googletest-aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
 DIST synergy-1.12.0.png 31383 BLAKE2B 228487058d09ee4fe7d3c909a3aee567b63c0d1aeaecf0e724a7bc9c59e48abecac71f8074902fd4f02ff9347fe8f6488b0554fb78a253339b04fe8d2e958d24 SHA512 7044395b41a0d2e49d308c599710fa32398d11584e70da32d4a1ccb292b02437c09860ed14f7bdd113a646daf696988fd3c0b80f3ab52ebbcaddf4c846cdd7ab
-DIST synergy-core-1.13.0-stable.tar.gz 8657662 BLAKE2B b4da6abd1b396f71aa37531e1adf71ff06d4804b74659db362a8fe2701c44786108ecc8b52932038490dfad8b7ae617f13a365ebe1ecf559f50106772bda9102 SHA512 317f0aae7742a3ecaea2f3138364a5cd1a098d76a2decdb6558900112e5dd0b53c457b461201d25d3a33cc2d9189e1f7f4e777a80b98c87d693f51b636cbb564
 DIST synergy-core-1.13.1.41-stable.tar.gz 8663717 BLAKE2B 13d0722b183080361492382d3dd489b911cfe2384390c7b614d17df7f681dfbd8be94fa79cc4088602ea3d431fee793aaebc07f1d976cdd9c22493fba2212392 SHA512 3743ea4ccf8734928d021d414c2f10839056cdac64768f2e3e89b73392969b392030a0d9250041a1c2c21db06659088c8ca66d952c07395baada154df0311b87
-EBUILD synergy-1.13.0.ebuild 2457 BLAKE2B 7e80aa1fa1092a93a53f9ab2324a4d2fe791adb79697bb45f704eb9408dd21aaabdf13437eb6d4ec9c1fa0c3dc4e965ca9e96125347adee03615945b477725f2 SHA512 b7d7df1beb565846951b9f228ac3c8c6107e3b505845b868ded9c88eb4b95e0ee75f415ea8704d266b77cd492f3afbd6388e218e37430b5dfe580581e71a23a2
-EBUILD synergy-1.13.1.41.ebuild 2525 BLAKE2B ca6121e35ffd6cac1497b776edf0bba6159ede74363877611652c7e4ef9fa9d5b687f59376e5b716785059511028a5e6487bdd26a246060720d2d316a8fdcf8d SHA512 ba883f7782ca4b11871a45585573b549d3b53f1e43d68cf9941c510e017730e1abde1b5a42868ce772cbffc26cf71c226469c7987c6477d148341fe0fb16c569
+EBUILD synergy-1.13.1.41.ebuild 2465 BLAKE2B 4c841e8b2643d6098a99f6ca929d4dc0e40dfddc797c27920a440c8d6488931c275aa2112489055912b51a5e1745bed54198a8d1452dbedfb7b9a1afb2f61be8 SHA512 5916ec2e135a39fd83491f83d5953f6583501d13f1527319ad777799721d1eede814ffb1840f5884d5490fa6704a5e724ddfcc5260be231effed43345c9c1b9a
 MISC metadata.xml 332 BLAKE2B 04a719c2b19204a1ea7ed755c89b072b271760a85f3b2b7e734796deca104682c147372a1d154d4fdb493d7025e16cfc2012e7d352fdc88dde93d0f3df477b67 SHA512 8c447ce795a81157c40a2839d8845d6db89ee768f70aa397b686b5ec9a7e59fc66f9fec5561e25ab0aed68bcabc369c0c53660ee2a0b7e24b52e169d5debaae0
diff --git a/x11-misc/synergy/synergy-1.13.0.ebuild b/x11-misc/synergy/synergy-1.13.0.ebuild
deleted file mode 100644
index bc5d23654028..000000000000
--- a/x11-misc/synergy/synergy-1.13.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg-utils virtualx
-
-MY_P=synergy-core-${PV}-stable
-GTEST_COMMIT=aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e
-
-DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
-HOMEPAGE="https://symless.com/synergy https://github.com/symless/synergy-core/"
-SRC_URI="
-	https://github.com/symless/${PN}-core/archive/v${PV}-stable.tar.gz
-		-> ${MY_P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/synergy-1.12.0.png
-	test? (
-		https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz
-			-> googletest-${GTEST_COMMIT}.tar.gz
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="libressl gui test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	x11-libs/libICE:=
-	x11-libs/libSM:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXi:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXtst:=
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		net-dns/avahi[mdnsresponder-compat]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	gui? (
-		dev-qt/linguist-tools:5
-	)"
-
-DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} )
-
-src_prepare() {
-	# broken on Xvfb
-	rm src/test/integtests/platform/XWindowsScreenTests.cpp || die
-
-	if use test; then
-		rmdir ext/googletest || die
-		mv "${WORKDIR}/googletest-${GTEST_COMMIT}" ext/googletest || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYNERGY_BUILD_LEGACY_GUI=$(usex gui)
-		-DSYNERGY_BUILD_LEGACY_INSTALLER=OFF
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-my_test() {
-	"${BUILD_DIR}"/bin/unittests &&
-	"${BUILD_DIR}"/bin/integtests
-}
-
-src_test() {
-	virtx my_test
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/bin/{synergy{c,s},syntool}
-
-	if use gui; then
-		newbin "${BUILD_DIR}"/bin/synergy qsynergy
-		newicon -s 256 "${DISTDIR}"/synergy-1.12.0.png qsynergy.png
-		make_desktop_entry qsynergy Synergy qsynergy 'Utility;'
-	fi
-
-	insinto /etc
-	newins doc/synergy.conf.example synergy.conf
-
-	newman doc/synergyc.man synergyc.1
-	newman doc/synergys.man synergys.1
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use gui && xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	use gui && xdg_icon_cache_update
-}
diff --git a/x11-misc/synergy/synergy-1.13.1.41.ebuild b/x11-misc/synergy/synergy-1.13.1.41.ebuild
index 7726b27d8d65..21abd7f2c78b 100644
--- a/x11-misc/synergy/synergy-1.13.1.41.ebuild
+++ b/x11-misc/synergy/synergy-1.13.1.41.ebuild
@@ -23,13 +23,12 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="libressl gui test zeroconf"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="gui test zeroconf"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
+	dev-libs/openssl:=
 	x11-libs/libICE:=
 	x11-libs/libSM:=
 	x11-libs/libX11:=