diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-misc/synergy | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-misc/synergy')
-rw-r--r-- | x11-misc/synergy/Manifest | 3 | ||||
-rw-r--r-- | x11-misc/synergy/files/synergy-1.4.16_p1969-pthread.patch | 11 | ||||
-rw-r--r-- | x11-misc/synergy/files/synergy-1.4.17_p2055-CSocketMultiplexer.patch | 13 | ||||
-rw-r--r-- | x11-misc/synergy/files/synergy-1.4.17_p2055-cryptopp.patch | 96 | ||||
-rw-r--r-- | x11-misc/synergy/files/synergy-1.4.17_p2055-gentoo.patch | 11 | ||||
-rw-r--r-- | x11-misc/synergy/files/synergy-1.4.17_p2055-test.patch | 33 | ||||
-rw-r--r-- | x11-misc/synergy/metadata.xml | 9 | ||||
-rw-r--r-- | x11-misc/synergy/synergy-1.6.3.ebuild | 117 | ||||
-rw-r--r-- | x11-misc/synergy/synergy-1.7.3.ebuild | 118 |
9 files changed, 411 insertions, 0 deletions
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest new file mode 100644 index 000000000000..a9d503a4b860 --- /dev/null +++ b/x11-misc/synergy/Manifest @@ -0,0 +1,3 @@ +DIST synergy-1.6.3.tar.gz 4405517 SHA256 93b1965b8e0cfc55cc654aab7053a58b9e730d09e68bbc520be32353a01dce1a SHA512 de67b0663c5ef411570f163208b2a295a8f16537dcc37a41a31039a2d01de083410c023b7f255664eb0c84f0290473690b638934082c2276ddce594126861165 WHIRLPOOL cb8737f0fe75105c9f5c8c371a5aef55c5eb8f1c419b3a7315ed66880e79c379efc6d7bced20c0d046bc281be935322def54f98d67e383d7236620a948ae1c14 +DIST synergy-1.7.3.tar.gz 13661943 SHA256 a4effc3ddb0ef6de95f83fa62b5290e2909f8b76729b1bde89c5061e5d381e25 SHA512 334cad16b843f0a6c1337960d76b37724bdb2a5f9841cffab4dbcbe6393cb0c4323860b64a15cccba1158763ef8cbea820900a5c53d0abbb6a92cfbeff827287 WHIRLPOOL c8e1587016b1fb930d8de9cb18a0fcfbf7423ab351c50bc7923da97b68008c57ef12bcd069cc2b15e87175ff1521a60af63dbb2bc09d94a4e45aec6994f035e5 +DIST synergy.png 26910 SHA256 c7e6cbaea549a189daed46c7170477772d932144ca20c9ea0db6859bd896f08c SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d WHIRLPOOL 7b3e7f9b05462fb536de0ca8d2257ea8abc0b2f17f0335d7eee73322f79a9ecccf729b992e58cd0965a9c9842f48020b6588cd4af47ea0f6d2b2cd7793c64e3a 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 new file mode 100644 index 000000000000..adddf2f73b67 --- /dev/null +++ b/x11-misc/synergy/files/synergy-1.4.16_p1969-pthread.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..0e99fd3bce5d --- /dev/null +++ b/x11-misc/synergy/files/synergy-1.4.17_p2055-CSocketMultiplexer.patch @@ -0,0 +1,13 @@ +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 new file mode 100644 index 000000000000..59f85a9c29a0 --- /dev/null +++ b/x11-misc/synergy/files/synergy-1.4.17_p2055-cryptopp.patch @@ -0,0 +1,96 @@ +--- 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 <http://www.gnu.org/licenses/>. + +-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 <cryptopp562/gcm.h> +-#include <cryptopp562/modes.h> +-#include <cryptopp562/aes.h> ++#include <crypto++/gcm.h> ++#include <crypto++/modes.h> ++#include <crypto++/aes.h> +--- a/src/lib/io/CryptoStream_cryptopp.h ++++ b/src/lib/io/CryptoStream_cryptopp.h +@@ -25,5 +25,5 @@ + # pragma GCC system_header + #endif + +-#include <cryptopp562/osrng.h> +-#include <cryptopp562/sha.h> ++#include <crypto++/osrng.h> ++#include <crypto++/sha.h> 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 new file mode 100644 index 000000000000..89f46f3c9af0 --- /dev/null +++ b/x11-misc/synergy/files/synergy-1.4.17_p2055-gentoo.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..e0e25c2e128b --- /dev/null +++ b/x11-misc/synergy/files/synergy-1.4.17_p2055-test.patch @@ -0,0 +1,33 @@ +--- 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 <http://www.gnu.org/licenses/>. + +-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/metadata.xml b/x11-misc/synergy/metadata.xml new file mode 100644 index 000000000000..e3df9aad5ab5 --- /dev/null +++ b/x11-misc/synergy/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>desktop-misc</herd> + <upstream> + <remote-id type="google-code">synergy</remote-id> + <remote-id type="github">synergy/synergy</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-misc/synergy/synergy-1.6.3.ebuild b/x11-misc/synergy/synergy-1.6.3.ebuild new file mode 100644 index 000000000000..b949a61d0d0c --- /dev/null +++ b/x11-misc/synergy/synergy-1.6.3.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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/synergy/synergy" +SRC_URI=" + https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + http://dev.gentoo.org/~hasufell/distfiles/${PN}.png +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~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/gmock-1.6.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.7.3.ebuild b/x11-misc/synergy/synergy-1.7.3.ebuild new file mode 100644 index 000000000000..2a781dd6a1a3 --- /dev/null +++ b/x11-misc/synergy/synergy-1.7.3.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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/synergy/synergy" +SRC_URI=" + https://github.com/${PN}/${PN}/archive/v${PV}-stable.tar.gz -> ${P}.tar.gz + http://dev.gentoo.org/~hasufell/distfiles/${PN}.png +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="qt4 test" + +S=${WORKDIR}/${P}-stable + +COMMON_DEPEND=" + dev-libs/openssl + 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/gmock-1.6.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-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} 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 +} |