Remove optional depend on x11-misc/synergy-plus since its out of the tree and people...

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

diff --git a/x11-misc/qsynergy/ChangeLog b/x11-misc/qsynergy/ChangeLog
index b1b12acc20d0d7d8d59c19b1e2088431f0068342..df0ce22564d3e168db21debc08e829c727eac2d8 100644 (file)
--- a/x11-misc/qsynergy/ChangeLog
+++ b/x11-misc/qsynergy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/qsynergy
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qsynergy/ChangeLog,v 1.2 2010/06/03 20:02:30 wired Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qsynergy/ChangeLog,v 1.3 2012/01/11 23:33:11 cardoe Exp $
+
+  11 Jan 2012; Doug Goldstein <cardoe@gentoo.org> qsynergy-0.9.1-r1.ebuild:
+  Remove optional depend on x11-misc/synergy-plus since its out of the tree and
+  people should be using x11-misc/synergy exclusively now.
 
 *qsynergy-0.9.1-r1 (03 Jun 2010)
 

diff --git a/x11-misc/qsynergy/Manifest b/x11-misc/qsynergy/Manifest
index 1d952bf6d1d178e30e9b493ecbf1401529fb5df2..6bb927ebc87c379a00f289ab03498457975cefa7 100644 (file)
--- a/x11-misc/qsynergy/Manifest
+++ b/x11-misc/qsynergy/Manifest
@@ -1,24 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST qsynergy-0.9.1.tar.gz 158259 RMD160 7f82a04643a61efa38d3fd838057fb31b784b9d0 SHA1 fc764254d07b8f60ad3e6fb4f3fba7d85712ab69 SHA256 3ae886f977cae04c2152cc9f0bdcf88b17bd6ebe6b003c3eba58c68b1eb24630
-EBUILD qsynergy-0.9.1-r1.ebuild 683 RMD160 05e55bd4bd9c842f544caa48890a3e58396f1634 SHA1 c0234706f9cf5544d53edd75e0b212f33ef20b40 SHA256 25c6d87c47f702d93ef6f935336f51b8b669d42c7b5ca263de08392d0fc42911
-MISC ChangeLog 495 RMD160 d821042c1af9eacdb20ccde280b030333d96e754 SHA1 30cb97092cd017124a882ec0048baf398e7d93c8 SHA256 a3a6218dbea74d245721a62e3066954dd7ed06f16c1f568378f79cc097db27ef
+EBUILD qsynergy-0.9.1-r1.ebuild 655 RMD160 3a5b8fda870d77c6b968ea0edf17c96decfcf9fe SHA1 36fa63f2e14a09f9ff74f4f01e55e0e4ebd8b96f SHA256 238b8a0b87c74d6b9cc866639aa314833cfc89d6f0c207895e5d748e92e5649a
+MISC ChangeLog 712 RMD160 53b5506bd445a57c59738bb9f00369d4629372b8 SHA1 a5c128d0b83ba7de8331f1e62e967cac41db1173 SHA256 1f54055e6b202343b9eba24915de40c0596cc32e5ba57002ca30f6ad1ff660fd
 MISC metadata.xml 250 RMD160 1e5ba2c89b8d11cd2082fb828d635f0fe5d1c796 SHA1 6800c47de6f0244554a09ed6a279ef8053ae103f SHA256 1e35fbf76f695b025cede60bad619086690429606b8186e7cfb3a4f2e8101c39
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
-
-iQIcBAEBCAAGBQJMCAsyAAoJEDZF8K7rm0r6jREQAJEbBJN06ABwjlxaq2assCur
-kYNtqoJ2OIWjgWiSblXPbTWDuwaUp8bcg0vCc4Jwthb562ChVoG3hD1gtLBKm9BP
-G/7WynQiv6OYlunie+2HUGNDaQU1VqwpKcqe9lCyKZGYeK0B2iDc6IpM/LtvTrBQ
-173HQxvLbRz6HNeW9ImRZLn5yqv9hiuo9SHRKF0ED6EW5f0DO2cf85L4PpE4GgGi
-B2K3An7lu5vN+PDG11c5gMsmnK1pulXlWqgL2mYFTy/1ofwACUlc8Z4yqKJV3+fV
-iCViFFvpmdqWSfhnju+g7QA3bSn4uc96FE5xeS380hb1aZbSfNKHjmKIGSqAhx5g
-tM85pKqekCVsr/WUesrjfBrxTJ1JrQB/Jihhp4esWDPw4Yi6EkfqNv+bmvyvTV6y
-oR3T9LFGFLWG8/2MBFG4sz6iajhMJgA+qBllO4uUDXDKTruPuBhFt2ATXq+xFr1w
-x8+G1w+7El+I6dWJbZiTkT9CJdskOc9AdzQmlQncwN/9gOk8k32qFCGds4CGGGe6
-0ll//CBGxmkJnuP0ZK6jNzcP/L4ifsJCuadOR0WEucmHBRKoTEiaDiFSGucWPJPB
-4NQEMVfdTaTlzmZ/KdHgnf1wiYl1/sKb2iUu3vnZmNiQK+Tyx9EUqO7g0WBdQZbb
-0khp0qnLaYfASwpLbaaL
-=8sV0
------END PGP SIGNATURE-----

diff --git a/x11-misc/qsynergy/qsynergy-0.9.1-r1.ebuild b/x11-misc/qsynergy/qsynergy-0.9.1-r1.ebuild
index 7b9466144106643e3c8d4e647c9825592227546a..166d0983e1efc7455618e67e205523d39b238a79 100644 (file)
--- a/x11-misc/qsynergy/qsynergy-0.9.1-r1.ebuild
+++ b/x11-misc/qsynergy/qsynergy-0.9.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qsynergy/qsynergy-0.9.1-r1.ebuild,v 1.1 2010/06/03 20:02:30 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qsynergy/qsynergy-0.9.1-r1.ebuild,v 1.2 2012/01/11 23:33:11 cardoe Exp $
 
 EAPI=3
 
@@ -17,7 +17,7 @@ IUSE="debug"
 
 DEPEND="x11-libs/qt-gui:4"
 RDEPEND="${DEPEND}
-       || ( x11-misc/synergy-plus x11-misc/synergy )"
+       x11-misc/synergy"
 
 src_install () {
        qt4-r2_src_install