Migrate changes from Gentoo Prefix overlay. Convert to EAPI3, add KEYWORDS, adjust...

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

diff --git a/x11-misc/synergy/ChangeLog b/x11-misc/synergy/ChangeLog
index bee720145629a43f58fdf704ea2e3020daa4da0c..300fc6432edb2195458f981ad923c2af1fb7b429 100644 (file)
--- a/x11-misc/synergy/ChangeLog
+++ b/x11-misc/synergy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/synergy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.61 2010/07/19 18:07:30 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.62 2010/07/19 18:49:43 darkside Exp $
+
+  19 Jul 2010; Jeremy Olexa <darkside@gentoo.org> synergy-1.3.1-r2.ebuild:
+  Migrate changes from Gentoo Prefix overlay. Convert to EAPI3, add
+  KEYWORDS, adjust econf call. Signed off by wired in #gentoo-dev
 
 *synergy-1.3.1-r2 (19 Jul 2010)
 

diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index ff16859e2688535e1c6d804593454558938c8744..de2c870900b88f9ce60476f2469876cabca50148 100644 (file)
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -1,29 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX synergy-1.3.1+gcc-4.3.patch 4463 RMD160 e7c4fb526ec0011a3a9b9974dc20956ccef03a22 SHA1 b3a179405bc5b98c2379e13c27a760b543f7a476 SHA256 0dfcdedce8de2cf1285a7af30652eba7234d95d769f762774975ea4d0f293375
 AUX synergy-1.3.1-infinite-timeout-fix.patch 548 RMD160 59f2740e7da43d77ffb82704dab4c90a8c1e0821 SHA1 1fd4646f6b0000f44a7b6d12fe13ca6872c41143 SHA256 9038062a1e678ef858f161393332acdde9124beca45cedff9179582f33d20cca
 AUX synergy-1.3.1-stuttered-delay-fix.patch 2144 RMD160 0b375058a69d7f74e5f0da45e16b26bb114eb38f SHA1 b4be9b68a7caae1aa5476139e10566c380a80169 SHA256 4ffbbaea726e507e024d550459fb0ab25a9da70cb90245400e86d035bbd9a1b9
 DIST synergy-1.3.1.tar.gz 793172 RMD160 5f5d7cb8fcfb57a6c8eae83fb53c704cb85c6c16 SHA1 03113ec8aadfecaeba8e369b083f4fb5b44f5c62 SHA256 4a15e26456498dda5f3aa7d688a4892e0c50394a2f01685136fbc954bacc9691
 EBUILD synergy-1.3.1-r1.ebuild 1505 RMD160 533a7aa6a13363bded155070b4ba915c369aba6b SHA1 23f23ee03045a759bf5431b2b4d7ac476220dc99 SHA256 01222850654e54021f2bf3d94a26bf384530de45c72a92661d8e636704d214f5
-EBUILD synergy-1.3.1-r2.ebuild 1579 RMD160 4516305b50eb0dac0df5e919e5d7aeb5c5ac150e SHA1 46dae06c7f56e111e4af59a69477bd85cc4451c5 SHA256 a3dff5870f7a4047809f837d056b9d907da54f763cbdfabd83d41daff4df62c1
+EBUILD synergy-1.3.1-r2.ebuild 1641 RMD160 a084ff2229d5a63d7e049d2621def26016f41a74 SHA1 75fd5f93c3bdaf790f65538b7f9f5337cd3458a4 SHA256 cacf055123e9100bbaab6a92315da895963dc51b8c010860881c77bb9de8a596
 EBUILD synergy-1.3.1.ebuild 1427 RMD160 5fd8e2b3c2e4adbfa10a79d9a608f8a41fa6d777 SHA1 987920d242b123b19cca0c637f2bd6eb8e5ff2a7 SHA256 3c6f65e2d4284ce44add8f33d224d7a44c3cf6c4f7783f0a73004bb8346a36fe
-MISC ChangeLog 8191 RMD160 c1b055c33b4e40e04f3dd5c5a18dc0e90e7b7317 SHA1 3405301ca17a4faf53c1d81b4a9088c1a055c177 SHA256 5f9b50c984b545878845ea44e79da260532b24f83f5a46035a2f7da2348fc5a2
+MISC ChangeLog 8404 RMD160 da76b3b7654a427f000e6fb9fd128f4d391d7a89 SHA1 422ef35f626812bfc42710fafdcd02fd4fe8ba3f SHA256 dd7650c138d58dfb67791d8cb3fb4fd8707b2999210aed21e723b01e435ee717
 MISC metadata.xml 270 RMD160 6aa4dff8f35775a40f4d04bfca8e1e24161e9585 SHA1 d38202d496f7bbe77326209191e346917562d9ab SHA256 f683d99386ed59553eff64672bda4e5ecc840de7f5cdf8aa4c117b1dd3b2235a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
-
-iQIcBAEBCAAGBQJMRJTTAAoJEDZF8K7rm0r6Bq4QAK2MICp89XIylhfr8Jwtkbdv
-84ioVVR6z9TCuWw4cBwjM14CkKcU75V4buMaNR62BX8j6uUvVR4jJ2kbgWHmMi60
-RGLSKK6oUqsy0RldBV++ZKJbfQC1mloVapU5vGT6pMeKxlR2Ott2dx0QFfQBRjTJ
-0beOPhAc8yS/J04JzeF2Y3RqeOjoREh57TOLLK9Jaa+x3dVXdQeAKdi/A/oT47iY
-JUrcgRcD3M3GB3OmH6YT3AJsvLsPgmtoTTyJ3EbnMon66Dhzdd8EqTE7keRveaQ+
-hsY+mqkg2fbtetCRzVIfZxDESGh5cunDe6QiSUrP4aqS9rgAeEJlKd/8XTH9WV62
-PVyMoMzED83H7CUykRLvVNQrxTs8HW+1uuyKrUPSmw1nmEF2Y1TbkKVvgUk/IGIu
-fDzGDGoR+8CtPoMCWC2bV0w5nG6H59r8uTVCGvHCV/NywbismZQGBDIw7R4BEkQK
-NllDMngE+aoZy/rnR4whkmlKxj11co/VeOOif3VuoZVhwPlaffpR/1r6gT2vgdkg
-KB0PUzGxf4KoTPGowAwfaNin0ye8G9f3vbcnN1t7a8NuZ85BfypkUJTzwb9w7nvk
-eew9eXWR1JyR6oWckUre6uY+kz8aNSvm6xSgVHCbeWJ9R4z49xKBWBjDIPgDwQC7
-iaUN0O8iFsHqmmfHPSc0
-=k2o/
------END PGP SIGNATURE-----

diff --git a/x11-misc/synergy/synergy-1.3.1-r2.ebuild b/x11-misc/synergy/synergy-1.3.1-r2.ebuild
index 01f64a5b632cd6777a5d4ccdbd4527048de8fe73..f7e0bce1436b65e4f83e0e0ae9d08274e8509ddb 100644 (file)
--- a/x11-misc/synergy/synergy-1.3.1-r2.ebuild
+++ b/x11-misc/synergy/synergy-1.3.1-r2.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2010 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-r2.ebuild,v 1.1 2010/07/19 18:07:30 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.3.1-r2.ebuild,v 1.2 2010/07/19 18:49:43 darkside Exp $
 
+EAPI=3
 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="~arm ~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
@@ -23,10 +24,7 @@ DEPEND="${RDEPEND}
        x11-proto/xineramaproto
        x11-libs/libXt"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
+src_prepare() {
        epatch "${FILESDIR}/${P}+gcc-4.3.patch"
 
        # fix for #257794
@@ -41,12 +39,11 @@ src_unpack() {
        eautoreconf
 }
 
-src_compile() {
+src_configure() {
        # debug causes an assertion error in switchInDirection()
-       econf --sysconfdir=/etc \
+       econf --sysconfdir="${EPREFIX}"/etc \
                --disable-dependency-tracking \
                --disable-debug
-       emake || die
 }
 
 src_install () {