From 421d5d2eb68359e3c4137e375106c30ef1fc4eb1 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Tue, 19 Jul 2016 20:16:09 +0200 Subject: x11-misc/synergy: exeinto not insinto (bug #550692). Package-Manager: portage-2.3.0 --- x11-misc/synergy/synergy-1.8.1-r2.ebuild | 127 ------------------------------- x11-misc/synergy/synergy-1.8.1-r3.ebuild | 127 +++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+), 127 deletions(-) delete mode 100644 x11-misc/synergy/synergy-1.8.1-r2.ebuild create mode 100644 x11-misc/synergy/synergy-1.8.1-r3.ebuild diff --git a/x11-misc/synergy/synergy-1.8.1-r2.ebuild b/x11-misc/synergy/synergy-1.8.1-r2.ebuild deleted file mode 100644 index f3f34bce0643..000000000000 --- a/x11-misc/synergy/synergy-1.8.1-r2.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2016 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/symless/synergy" -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 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="libressl qt4 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} - 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.7.5-gentoo.patch - "${FILESDIR}"/${PN}-1.8.1-internal-gmock-gtest.patch - "${FILESDIR}"/${PN}-1.8.1-gtest.patch -) - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - "$(usex test -DWITH_GENTOO_TEST=1 -DWITH_GENTOO_TEST=0)" - ) - 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_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 - - insinto /usr/$(get_libdir)/${PN}/plugins - doexe bin/plugins/libns.so - - 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.1-r3.ebuild b/x11-misc/synergy/synergy-1.8.1-r3.ebuild new file mode 100644 index 000000000000..b0029e399a41 --- /dev/null +++ b/x11-misc/synergy/synergy-1.8.1-r3.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2016 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/symless/synergy" +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 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="libressl qt4 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} + 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.7.5-gentoo.patch + "${FILESDIR}"/${PN}-1.8.1-internal-gmock-gtest.patch + "${FILESDIR}"/${PN}-1.8.1-gtest.patch +) + +src_prepare() { + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + "$(usex test -DWITH_GENTOO_TEST=1 -DWITH_GENTOO_TEST=0)" + ) + 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_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 + + exeinto /usr/$(get_libdir)/${PN}/plugins + doexe bin/plugins/libns.so + + 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 +} -- cgit v1.2.3