From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6300B1382C5 for ; Sat, 12 May 2018 11:21:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7D72E0AB9; Sat, 12 May 2018 11:21:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6DA56E0AB9 for ; Sat, 12 May 2018 11:21:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1D32C335C9E for ; Sat, 12 May 2018 11:21:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7BA1075 for ; Sat, 12 May 2018 11:21:53 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1526124081.aaddf051277b5a0e40a1a924bf34fc01bbc1719a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/synergy/files/, profiles/, x11-misc/synergy/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/package.mask x11-misc/synergy/Manifest x11-misc/synergy/files/synergy-1.4.16_p1969-pthread.patch x11-misc/synergy/files/synergy-1.4.17_p2055-CSocketMultiplexer.patch x11-misc/synergy/files/synergy-1.4.17_p2055-cryptopp.patch x11-misc/synergy/files/synergy-1.4.17_p2055-gentoo.patch x11-misc/synergy/files/synergy-1.4.17_p2055-test.patch x11-misc/synergy/files/synergy-1.7.5-gentoo.patch x11-misc/synergy/files/synergy-1.8.1-internal-gmock-gtest.patch x11-misc/synergy/files/synergy-1.8.5-gtest.patch x11-misc/synergy/synergy-1.6.3.ebuild x11-misc/synergy/synergy-1.8.6.ebuild x11-misc/synergy/synergy-1.8.8.ebuild X-VCS-Directories: profiles/ x11-misc/synergy/files/ x11-misc/synergy/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: aaddf051277b5a0e40a1a924bf34fc01bbc1719a X-VCS-Branch: master Date: Sat, 12 May 2018 11:21:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 407b54da-c050-428d-beeb-d27e173142fc X-Archives-Hash: 8567d777404fb75b9830e365021285ab commit: aaddf051277b5a0e40a1a924bf34fc01bbc1719a Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri May 11 22:02:00 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat May 12 11:21:21 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaddf051 x11-misc/synergy: Drop old Closes: https://bugs.gentoo.org/649572 Package-Manager: Portage-2.3.36, Repoman-2.3.9 profiles/package.mask | 5 - x11-misc/synergy/Manifest | 3 - .../files/synergy-1.4.16_p1969-pthread.patch | 11 -- .../synergy-1.4.17_p2055-CSocketMultiplexer.patch | 13 --- .../files/synergy-1.4.17_p2055-cryptopp.patch | 96 ----------------- .../files/synergy-1.4.17_p2055-gentoo.patch | 11 -- .../synergy/files/synergy-1.4.17_p2055-test.patch | 33 ------ x11-misc/synergy/files/synergy-1.7.5-gentoo.patch | 11 -- .../files/synergy-1.8.1-internal-gmock-gtest.patch | 23 ---- x11-misc/synergy/files/synergy-1.8.5-gtest.patch | 38 ------- x11-misc/synergy/synergy-1.6.3.ebuild | 116 --------------------- x11-misc/synergy/synergy-1.8.6.ebuild | 112 -------------------- x11-misc/synergy/synergy-1.8.8.ebuild | 111 -------------------- 13 files changed, 583 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 203fb94519d..59f48f87a67 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -39,11 +39,6 @@ dev-libs/libmemcache # Depends on dead Qt4. Masked for removal in 30 days. dev-python/pyside-tools -# Andreas Sturmlechner (10 May 2018) -# Depends on dead Qt4, newer versions do not provide a GUI. -# Masked for removal, bug #649572 - (10 May 2018) # Depends on dead Qt4, does not build, needs someone to bump to Qt5. # Masked for removal in 30 days. Bugs #588892, #588898, #649656 diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest index 7fd062f77f5..0cbd3276f02 100644 --- a/x11-misc/synergy/Manifest +++ b/x11-misc/synergy/Manifest @@ -1,6 +1,3 @@ -DIST synergy-1.6.3.tar.gz 4405517 BLAKE2B 46a56a9833ac0132d0fefcbeefccbc440d3d4e123eceb4ccb04eedadd6fa9dec9abb6f7770d6739b576006783a8890788d53027d9d5a5b245ef6b14dc704e72b SHA512 de67b0663c5ef411570f163208b2a295a8f16537dcc37a41a31039a2d01de083410c023b7f255664eb0c84f0290473690b638934082c2276ddce594126861165 -DIST synergy-1.8.6.tar.gz 13497043 BLAKE2B f74f6d48203bc49d7a74cf2f951ea506a1887b659e34954651d2a8333e604e3e41e04b5e6b6115b8b8ded6e94fbad004b0673465cb0734a57d137992f432a3c4 SHA512 e0816c280c77d4a865f4b7d4a9081963032a156bfb6da51e6b67a6fc41f8f18b097d3fc7c96218db268c36d0148021f9ddba95fe56daff8bfc54219dbdfe14a5 -DIST synergy-1.8.8.tar.gz 13498599 BLAKE2B 40c52ed036ef21594d330f1b4e32b647bdb3076147d40f2437f649a54700cb4a7822137587c129f9bede26a93e872961135ee27dfb3b8f4256153a5e982737a1 SHA512 b4909930af7da10d877297e674df4c042ec54333eed585334da4a8c834c0ca3ad7c93fd2436c7d8d2f0e9e039d7bd385bb9e8a8c706750cbab3c3664a9b16bc6 DIST synergy-1.9.1.tar.gz 6694745 BLAKE2B d7e19fd3e55e60b6a41dffa04d6a53c897c0a7e4895ff65ddfae18b06892959e8c7e56092b3d49f123768b3ce92d59fc890afe756192b3625db664b5fa19331e SHA512 83301f2d035bd91578cf83e335d721748791f62c85252156fd27d09db7b5216a745cfa81c06b27995d1785e676ee4c75f795b5fad2b9a700a981d27d05e5a8fe DIST synergy-2.0.0.tar.gz 5892923 BLAKE2B 661f42031499c9c1b2cbb90d9af45f5210c8e1b109f62cfc1cbdedf264f8c358c394005f4a040a8071773d538383adf3e85a059bc54ff67284aaf86990e0a6fa SHA512 69b8e4ea9d22f5699d3a0761cf9811d0689b06a920056b4b4dde466767ec89caaaa8c5736a78d0857ebfb814aaa3bf07591feaf0e64e0555949c5ee6d6974a13 DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d diff --git a/x11-misc/synergy/files/synergy-1.4.16_p1969-pthread.patch b/x11-misc/synergy/files/synergy-1.4.16_p1969-pthread.patch deleted file mode 100644 index adddf2f73b6..00000000000 --- a/x11-misc/synergy/files/synergy-1.4.16_p1969-pthread.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -141,6 +141,8 @@ - check_library_exists("pthread" pthread_create "" HAVE_PTHREAD) - if (HAVE_PTHREAD) - list(APPEND libs pthread) -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") - else() - message(FATAL_ERROR "Missing library: pthread") - endif() diff --git a/x11-misc/synergy/files/synergy-1.4.17_p2055-CSocketMultiplexer.patch b/x11-misc/synergy/files/synergy-1.4.17_p2055-CSocketMultiplexer.patch deleted file mode 100644 index 0e99fd3bce5..00000000000 --- a/x11-misc/synergy/files/synergy-1.4.17_p2055-CSocketMultiplexer.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://synergy-project.org/spit/issues/details/2935/ -https://bugs.gentoo.org/show_bug.cgi?id=505978 - ---- a/src/lib/net/SocketMultiplexer.cpp -+++ b/src/lib/net/SocketMultiplexer.cpp -@@ -243,6 +243,7 @@ - for (CSocketJobMap::iterator i = m_socketJobMap.begin(); - i != m_socketJobMap.end();) { - if (*(i->second) == NULL) { -+ m_socketJobs.erase(i->second); - m_socketJobMap.erase(i++); - m_update = true; - } diff --git a/x11-misc/synergy/files/synergy-1.4.17_p2055-cryptopp.patch b/x11-misc/synergy/files/synergy-1.4.17_p2055-cryptopp.patch deleted file mode 100644 index 59f85a9c29a..00000000000 --- a/x11-misc/synergy/files/synergy-1.4.17_p2055-cryptopp.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -145,6 +145,10 @@ - check_type_size(long SIZEOF_LONG) - check_type_size(short SIZEOF_SHORT) - -+ set(CMAKE_REQUIRED_LIBRARIES crypto++) -+ set(CMAKE_REQUIRED_LIBRARIES) -+ set(CMAKE_INCLUDE_DIRECTORIES) -+ - # pthread is used on both Linux and Mac - check_library_exists("pthread" pthread_create "" HAVE_PTHREAD) - if (HAVE_PTHREAD) ---- a/ext/CMakeLists.txt -+++ b/ext/CMakeLists.txt -@@ -13,47 +13,6 @@ - # You should have received a copy of the GNU General Public License - # along with this program. If not, see . - --set(cryptopp_dir cryptopp562) -- --# only compile the crypto++ files we need. --set(cryptopp_src -- ${cryptopp_dir}/3way.cpp -- ${cryptopp_dir}/algparam.cpp -- ${cryptopp_dir}/asn.cpp -- ${cryptopp_dir}/authenc.cpp -- ${cryptopp_dir}/basecode.cpp -- ${cryptopp_dir}/cpu.cpp -- ${cryptopp_dir}/cryptlib.cpp -- ${cryptopp_dir}/des.cpp -- ${cryptopp_dir}/dessp.cpp -- ${cryptopp_dir}/dll.cpp -- ${cryptopp_dir}/ec2n.cpp -- ${cryptopp_dir}/ecp.cpp -- ${cryptopp_dir}/filters.cpp -- ${cryptopp_dir}/fips140.cpp -- ${cryptopp_dir}/gcm.cpp -- ${cryptopp_dir}/gf2n.cpp -- ${cryptopp_dir}/gfpcrypt.cpp -- ${cryptopp_dir}/hex.cpp -- ${cryptopp_dir}/hmac.cpp -- ${cryptopp_dir}/hrtimer.cpp -- ${cryptopp_dir}/integer.cpp -- ${cryptopp_dir}/iterhash.cpp -- ${cryptopp_dir}/misc.cpp -- ${cryptopp_dir}/modes.cpp -- ${cryptopp_dir}/mqueue.cpp -- ${cryptopp_dir}/nbtheory.cpp -- ${cryptopp_dir}/oaep.cpp -- ${cryptopp_dir}/osrng.cpp -- ${cryptopp_dir}/pubkey.cpp -- ${cryptopp_dir}/queue.cpp -- ${cryptopp_dir}/randpool.cpp -- ${cryptopp_dir}/rdtables.cpp -- ${cryptopp_dir}/rijndael.cpp -- ${cryptopp_dir}/rng.cpp -- ${cryptopp_dir}/sha.cpp --) -- - # if 64-bit windows, compile asm file. - if (CMAKE_CL_64) - list(APPEND cryptopp_src ${cryptopp_dir}/x64dll.asm ${cryptopp_dir}/x64masm.asm) -@@ -87,10 +46,3 @@ - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${CRYPTOPP_ARCH}") - endif() - endif() -- --add_library(cryptopp STATIC ${cryptopp_src}) -- --if (UNIX) -- # ignore warnings in crypto++ -- set_target_properties(cryptopp PROPERTIES COMPILE_FLAGS "-w") --endif() ---- a/src/lib/io/CryptoMode_cryptopp.h -+++ b/src/lib/io/CryptoMode_cryptopp.h -@@ -25,6 +25,6 @@ - # pragma GCC system_header - #endif - --#include --#include --#include -+#include -+#include -+#include ---- a/src/lib/io/CryptoStream_cryptopp.h -+++ b/src/lib/io/CryptoStream_cryptopp.h -@@ -25,5 +25,5 @@ - # pragma GCC system_header - #endif - --#include --#include -+#include -+#include diff --git a/x11-misc/synergy/files/synergy-1.4.17_p2055-gentoo.patch b/x11-misc/synergy/files/synergy-1.4.17_p2055-gentoo.patch deleted file mode 100644 index 89f46f3c9af..00000000000 --- a/x11-misc/synergy/files/synergy-1.4.17_p2055-gentoo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -77,7 +77,7 @@ - - # warnings as errors: - # we have a problem with people checking in code with warnings. -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") -+ #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") - - # For config.h, detect the libraries, functions, etc. - include(CheckIncludeFiles) diff --git a/x11-misc/synergy/files/synergy-1.4.17_p2055-test.patch b/x11-misc/synergy/files/synergy-1.4.17_p2055-test.patch deleted file mode 100644 index e0e25c2e128..00000000000 --- a/x11-misc/synergy/files/synergy-1.4.17_p2055-test.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -19,6 +19,6 @@ - add_subdirectory(plugin) - add_subdirectory(micro) - --if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX") -+if (${WITH_GENTOO_TEST} MATCHES "ON") - add_subdirectory(test) - endif() ---- a/src/test/CMakeLists.txt -+++ b/src/test/CMakeLists.txt -@@ -14,20 +14,5 @@ - # You should have received a copy of the GNU General Public License - # along with this program. If not, see . - --include_directories( -- ../../ext/gtest-1.6.0 -- ../../ext/gtest-1.6.0/include -- ../../ext/gmock-1.6.0 -- ../../ext/gmock-1.6.0/include) -- --add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc) --add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc) -- --if (UNIX) -- # ignore warnings in gtest and gmock -- set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-w") -- set_target_properties(gmock PROPERTIES COMPILE_FLAGS "-w") --endif() -- - add_subdirectory(integtests) - add_subdirectory(unittests) diff --git a/x11-misc/synergy/files/synergy-1.7.5-gentoo.patch b/x11-misc/synergy/files/synergy-1.7.5-gentoo.patch deleted file mode 100644 index 9c508f68eee..00000000000 --- a/x11-misc/synergy/files/synergy-1.7.5-gentoo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -80,7 +80,7 @@ - - # warnings as errors: - # we have a problem with people checking in code with warnings. -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-unused-local-typedef") -+ #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-unused-local-typedef") - - # For config.h, detect the libraries, functions, etc. - include(CheckIncludeFiles) diff --git a/x11-misc/synergy/files/synergy-1.8.1-internal-gmock-gtest.patch b/x11-misc/synergy/files/synergy-1.8.1-internal-gmock-gtest.patch deleted file mode 100644 index 7814c7418cd..00000000000 --- a/x11-misc/synergy/files/synergy-1.8.1-internal-gmock-gtest.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/src/test/CMakeLists.txt -+++ b/src/test/CMakeLists.txt -@@ -14,20 +14,5 @@ - # You should have received a copy of the GNU General Public License - # along with this program. If not, see . - --include_directories( -- ../../ext/gtest-1.6.0 -- ../../ext/gtest-1.6.0/include -- ../../ext/gmock-1.6.0 -- ../../ext/gmock-1.6.0/include) -- --add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc) --add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc) -- --if (UNIX) -- # ignore warnings in gtest and gmock -- set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-w") -- set_target_properties(gmock PROPERTIES COMPILE_FLAGS "-w") --endif() -- - add_subdirectory(integtests) - add_subdirectory(unittests) diff --git a/x11-misc/synergy/files/synergy-1.8.5-gtest.patch b/x11-misc/synergy/files/synergy-1.8.5-gtest.patch deleted file mode 100644 index 69391b217db..00000000000 --- a/x11-misc/synergy/files/synergy-1.8.5-gtest.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/src/lib/synergy/KeyMap.h -+++ b/src/lib/synergy/KeyMap.h -@@ -24,7 +24,9 @@ - #include "common/stdset.h" - #include "common/stdvector.h" - -+#if WITH_GENTOO_TEST - #include "gtest/gtest_prod.h" -+#endif - - namespace synergy { - -@@ -327,6 +329,7 @@ - //@} - - -+#if WITH_GENTOO_TEST - private: - FRIEND_TEST(KeyMapTests, - findBestKey_requiredDown_matchExactFirstItem); -@@ -341,6 +344,7 @@ - FRIEND_TEST(KeyMapTests, - findBestKey_onlyOneRequiredDown_matchTwoRequiredChangesItem); - FRIEND_TEST(KeyMapTests, findBestKey_noRequiredDown_cannotMatch); -+#endif - - private: - //! Ways to synthesize a key ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -50,6 +50,6 @@ - add_subdirectory(cmd) - add_subdirectory(micro) - --if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX") -+if (${WITH_GENTOO_TEST}) - add_subdirectory(test) - endif() diff --git a/x11-misc/synergy/synergy-1.6.3.ebuild b/x11-misc/synergy/synergy-1.6.3.ebuild deleted file mode 100644 index ec6ab70007c..00000000000 --- a/x11-misc/synergy/synergy-1.6.3.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2 - -DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers" -HOMEPAGE="http://synergy-project.org/ https://github.com/symless/synergy-core" -SRC_URI=" - https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~jer/${PN}.png -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="qt4 test" - -COMMON_DEPEND=" - >=dev-libs/crypto++-5.6.2 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXtst - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - net-dns/avahi[mdnsresponder-compat] - ) -" -DEPEND=" - ${COMMON_DEPEND} - test? ( >=dev-cpp/gtest-1.8.0 ) - x11-proto/kbproto - x11-proto/randrproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto -" -RDEPEND=" - ${COMMON_DEPEND} - qt4? ( !x11-misc/qsynergy ) -" - -PATCHES=( - "${FILESDIR}/${PN}-1.4.16_p1969-pthread.patch" - "${FILESDIR}/${PN}-1.4.17_p2055-cryptopp.patch" - "${FILESDIR}/${PN}-1.4.17_p2055-test.patch" - "${FILESDIR}/${PN}-1.4.17_p2055-gentoo.patch" - "${FILESDIR}/${PN}-1.4.17_p2055-CSocketMultiplexer.patch" -) - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=$(cmake-utils_use_with test GENTOO_TEST) - cmake-utils_src_configure - - if use qt4 ; then - cd src/gui || die - qt4-r2_src_configure - fi -} - -src_compile() { - cmake-utils_src_compile - - if use qt4 ; then - cd src/gui || die - qt4-r2_src_compile - fi -} - -src_test() { - local exe fail - for exe in bin/integtests bin/unittests; do - ${exe} || fail+=" ${exe}" - done - [[ ${fail} ]] && ewarn "${fail} failed" -} - -src_install () { - dobin bin/${PN}{c,s} - - if use qt4 ; then - newbin bin/${PN} qsynergy - newicon -s 256 "${DISTDIR}"/${PN}.png q${PN}.png - make_desktop_entry q${PN} ${PN/s/S} q${PN} Utility; - fi - - insinto /etc - newins doc/synergy.conf.example synergy.conf - - newman doc/${PN}c.man ${PN}c.1 - newman doc/${PN}s.man ${PN}s.1 - - dodoc README doc/synergy.conf.example* ChangeLog -} - -pkg_preinst() { - use qt4 && gnome2_icon_savelist -} - -pkg_postinst() { - use qt4 && gnome2_icon_cache_update -} - -pkg_postrm() { - use qt4 && gnome2_icon_cache_update -} diff --git a/x11-misc/synergy/synergy-1.8.6.ebuild b/x11-misc/synergy/synergy-1.8.6.ebuild deleted file mode 100644 index 32a8d362ae1..00000000000 --- a/x11-misc/synergy/synergy-1.8.6.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2 - -DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers" -HOMEPAGE="http://synergy-project.org/ https://github.com/symless/synergy-core" -SRC_URI=" - https://github.com/symless/${PN}/archive/v${PV}-stable.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~jer/${PN}.png -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="libressl qt4" -RESTRICT="test" - -S=${WORKDIR}/${P}-stable - -COMMON_DEPEND=" - !libressl? ( dev-libs/openssl:* ) - libressl? ( dev-libs/libressl ) - net-misc/curl - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXtst - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - net-dns/avahi[mdnsresponder-compat] - ) -" -DEPEND=" - ${COMMON_DEPEND} - x11-proto/kbproto - x11-proto/randrproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto -" -RDEPEND=" - ${COMMON_DEPEND} - qt4? ( !x11-misc/qsynergy ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.4.16_p1969-pthread.patch - "${FILESDIR}"/${PN}-1.7.5-gentoo.patch - "${FILESDIR}"/${PN}-1.8.1-internal-gmock-gtest.patch - "${FILESDIR}"/${PN}-1.8.5-gtest.patch -) - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - append-cxxflags ${mycmakeargs} - - cmake-utils_src_configure - - if use qt4 ; then - cd src/gui || die - qt4-r2_src_configure - fi -} - -src_compile() { - cmake-utils_src_compile - - if use qt4 ; then - cd src/gui || die - qt4-r2_src_compile - fi -} - -src_install () { - dobin bin/${PN}{c,s} bin/syntool - - if use qt4 ; then - newbin bin/${PN} qsynergy - newicon -s 256 "${DISTDIR}"/${PN}.png q${PN}.png - make_desktop_entry q${PN} ${PN/s/S} q${PN} Utility; - fi - - insinto /etc - newins doc/synergy.conf.example synergy.conf - - newman doc/${PN}c.man ${PN}c.1 - newman doc/${PN}s.man ${PN}s.1 - - dodoc README doc/synergy.conf.example* ChangeLog -} - -pkg_preinst() { - use qt4 && gnome2_icon_savelist -} - -pkg_postinst() { - use qt4 && gnome2_icon_cache_update -} - -pkg_postrm() { - use qt4 && gnome2_icon_cache_update -} diff --git a/x11-misc/synergy/synergy-1.8.8.ebuild b/x11-misc/synergy/synergy-1.8.8.ebuild deleted file mode 100644 index 9d978829cda..00000000000 --- a/x11-misc/synergy/synergy-1.8.8.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2 - -DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers" -HOMEPAGE="http://synergy-project.org/ https://github.com/symless/synergy-core" -SRC_URI=" - https://github.com/symless/${PN}/archive/v${PV}-stable.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~jer/${PN}.png -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="libressl qt4" -RESTRICT="test" - -S=${WORKDIR}/${P}-stable - -COMMON_DEPEND=" - !libressl? ( dev-libs/openssl:* ) - libressl? ( dev-libs/libressl ) - net-misc/curl - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXtst - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - net-dns/avahi[mdnsresponder-compat] - ) -" -DEPEND=" - ${COMMON_DEPEND} - x11-proto/kbproto - x11-proto/randrproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto -" -RDEPEND=" - ${COMMON_DEPEND} - qt4? ( !x11-misc/qsynergy ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.4.16_p1969-pthread.patch - "${FILESDIR}"/${PN}-1.8.1-internal-gmock-gtest.patch - "${FILESDIR}"/${PN}-1.8.5-gtest.patch -) - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - append-cxxflags ${mycmakeargs} - - cmake-utils_src_configure - - if use qt4 ; then - cd src/gui || die - qt4-r2_src_configure - fi -} - -src_compile() { - cmake-utils_src_compile - - if use qt4 ; then - cd src/gui || die - qt4-r2_src_compile - fi -} - -src_install () { - dobin bin/${PN}{c,s} bin/syntool - - if use qt4 ; then - newbin bin/${PN} qsynergy - newicon -s 256 "${DISTDIR}"/${PN}.png q${PN}.png - make_desktop_entry q${PN} ${PN/s/S} q${PN} Utility; - fi - - insinto /etc - newins doc/synergy.conf.example synergy.conf - - newman doc/${PN}c.man ${PN}c.1 - newman doc/${PN}s.man ${PN}s.1 - - dodoc README doc/synergy.conf.example* ChangeLog -} - -pkg_preinst() { - use qt4 && gnome2_icon_savelist -} - -pkg_postinst() { - use qt4 && gnome2_icon_cache_update -} - -pkg_postrm() { - use qt4 && gnome2_icon_cache_update -}