Version bump from upstream with many, many bug fixes. Bug 430694 by Dustin C. Hatch

(Portage version: 2.1.10.65/cvs/Linux i686)

4 files changed, 23 insertions, 113 deletions

diff --git a/x11-misc/synergy/ChangeLog b/x11-misc/synergy/ChangeLog
index b9c5b1563a99..c7846edacb12 100644
--- a/x11-misc/synergy/ChangeLog
+++ b/x11-misc/synergy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/synergy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.84 2012/07/19 15:59:54 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.85 2012/08/10 13:49:23 darkside Exp $
+
+*synergy-1.4.10 (10 Aug 2012)
+
+  10 Aug 2012; Jeremy Olexa <darkside@gentoo.org> -synergy-1.3.1.ebuild,
+  -synergy-1.3.6.ebuild, -synergy-1.4.2.ebuild, +synergy-1.4.10.ebuild:
+  Version bump from upstream with many, many bug fixes. Bug 430694 by Dustin C.
+  Hatch
 
   19 Jul 2012; Michael Palimaka <kensington@gentoo.org> synergy-1.4.2.ebuild,
   synergy-1.4.5-r2.ebuild, synergy-1.4.7.ebuild:
diff --git a/x11-misc/synergy/synergy-1.3.1.ebuild b/x11-misc/synergy/synergy-1.3.1.ebuild
deleted file mode 100644
index 6ce116cceca0..000000000000
--- a/x11-misc/synergy/synergy-1.3.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.3.1.ebuild,v 1.15 2012/03/07 16:06:41 darkside Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers."
-SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz"
-HOMEPAGE="http://synergy2.sourceforge.net/"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 ~sparc x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-RDEPEND="x11-libs/libXtst
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/kbproto
-	x11-proto/xineramaproto
-	x11-libs/libXt"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}+gcc-4.3.patch"
-
-	# Remove -Werror usage.
-	sed -i -e '/ACX_CXX_WARNINGS_ARE_ERRORS/d' \
-		configure.in || die "unable to sed out -Werror usage."
-	eautoreconf
-}
-
-src_compile() {
-	# debug causes an assertion error in switchInDirection()
-	econf --sysconfdir=/etc \
-		--disable-dependency-tracking \
-		--disable-debug
-	emake || die
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-	insinto /etc
-	doins "${S}"/examples/synergy.conf
-}
-
-pkg_postinst() {
-	elog
-	elog "${PN} can also be used to connect to computers running Windows."
-	elog "Visit ${HOMEPAGE} to find the Windows client."
-	elog
-}
diff --git a/x11-misc/synergy/synergy-1.3.6.ebuild b/x11-misc/synergy/synergy-1.3.6.ebuild
deleted file mode 100644
index b2afba1a3409..000000000000
--- a/x11-misc/synergy/synergy-1.3.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.3.6.ebuild,v 1.7 2012/02/19 13:24:19 klausman Exp $
-
-EAPI=3
-
-inherit cmake-utils
-
-DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers."
-HOMEPAGE="http://synergy-foss.org/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}-Source.tar.gz"
-
-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=""
-
-RDEPEND="x11-libs/libXtst
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/kbproto
-	x11-proto/xineramaproto
-	x11-libs/libXt"
-
-S=${WORKDIR}/${P}-Source
-
-src_install () {
-	dobin "${CMAKE_BUILD_DIR}"/${PN}{c,s} || die
-
-	insinto /etc
-	doins examples/synergy.conf || die
-
-	mv doc/${PN}c.man  doc/${PN}c.1 || die
-	mv doc/${PN}s.man  doc/${PN}s.1 || die
-	doman doc/${PN}{c,s}.1 || die
-
-	dodoc README || die
-}
diff --git a/x11-misc/synergy/synergy-1.4.2.ebuild b/x11-misc/synergy/synergy-1.4.10.ebuild
index 640aa5f87a24..5e17eb95c46a 100644
--- a/x11-misc/synergy/synergy-1.4.2.ebuild
+++ b/x11-misc/synergy/synergy-1.4.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.2.ebuild,v 1.4 2012/07/19 15:59:54 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.10.ebuild,v 1.1 2012/08/10 13:49:23 darkside Exp $
 
-EAPI=3
+EAPI=4
 
 inherit eutils cmake-utils qt4-r2
 
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/libXtst
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXinerama
-	qt4? ( x11-libs/qt-gui:4 )
+	qt4? ( x11-libs/qt-gui )
 	qt4? ( !x11-misc/qsynergy )"
 DEPEND="${RDEPEND}
 	x11-proto/xextproto
@@ -31,10 +31,13 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P}-Source
 
 src_configure() {
+	# 1.4.4+ : http://synergy-foss.org/pm/issues/3016
+	append-ldflags $(no-as-needed)
+
 	cmake-utils_src_configure
 
 	if use qt4 ; then
-		cd gui
+		cd src/gui
 		qt4-r2_src_configure
 	fi
 }
@@ -43,27 +46,27 @@ src_compile() {
 	cmake-utils_src_compile
 
 	if use qt4 ; then
-		cd gui
+		cd src/gui
 		qt4-r2_src_compile
 	fi
 }
 
 src_install () {
-	dobin "${CMAKE_BUILD_DIR}"/${PN}{c,s} || die
+	dobin bin/${PN}{c,s}
 
 	if use qt4 ; then
-		dobin bin/q${PN} || die
-		insinto /usr/share/icons
-		newins gui/res/win/QSynergy.ico q${PN}.ico
+		newbin bin/${PN} qsynergy
+		# FIXME: convert the .ico file to a real png instead
+		newicon src/gui/res/win/QSynergy.ico q${PN}.png
 		make_desktop_entry q${PN} ${PN/s/S} q${PN} Utility;
 	fi
 
 	insinto /etc
-	doins conf/synergy.conf || die
+	newins doc/synergy.conf.example synergy.conf
 
 	mv doc/${PN}c.man  doc/${PN}c.1 || die
 	mv doc/${PN}s.man  doc/${PN}s.1 || die
-	doman doc/${PN}{c,s}.1 || die
+	doman doc/${PN}{c,s}.1
 
-	dodoc README doc/synergy.conf.example* || die
+	dodoc README doc/synergy.conf.example* ChangeLog
 }