Punt USE="evo" that pulled in libopensync-plugin-evolution2 wrt #352506

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 42 insertions, 30 deletions

diff --git a/app-pda/multisync-gui/ChangeLog b/app-pda/multisync-gui/ChangeLog
index 18e2375ce26a..33664c2d7670 100644
--- a/app-pda/multisync-gui/ChangeLog
+++ b/app-pda/multisync-gui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/multisync-gui
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync-gui/ChangeLog,v 1.11 2012/05/03 20:20:59 jdhore Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync-gui/ChangeLog,v 1.12 2014/04/06 07:09:03 ssuominen Exp $
+
+  06 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  multisync-gui-0.91.0.ebuild:
+  Punt USE="evo" that pulled in libopensync-plugin-evolution2 wrt #352506
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> multisync-gui-0.91.0.ebuild,
   multisync-gui-0.92.0_pre20080531.ebuild:
diff --git a/app-pda/multisync-gui/Manifest b/app-pda/multisync-gui/Manifest
index 96d50795b3e7..8aae241f3f66 100644
--- a/app-pda/multisync-gui/Manifest
+++ b/app-pda/multisync-gui/Manifest
@@ -1,8 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX multisync-gui-0.92.0-cmake.patch 1774 SHA256 04e401a60bcdac969e4dbad9ba8f1adcdb8721782a0d9c949cd26c5a0a9b2f5b SHA512 3fd4007f7730aee7586e66f31be3aea41507ad2e4a5b9bd1fe4542cfed7c90d2accfb6f21bea6805dc88c74f8499fbe964e0f543593c39605c1f4d2543d5b8cd WHIRLPOOL d1584bdb76bc0bf138a27782ccff3a9a13eafeffcc4a59b8bd9e9979af97f4b3fb13a04bdd1aa2563b0b0c7bc1b94ed7433e67a8a3a58dade08943fc3f87343a
 AUX multisync-gui-0.92.0-pixbuf-include.patch 528 SHA256 04093fb613c37edf6a92dd62e22ec3fcb1823eb38974cbc5a78c133e2796bd10 SHA512 63b63c1940c1a5a76a456b51248ab6c9e2455ec8c26b0306bb370da8647bfb6ff43a307e0620946896bf7fe755ec2eedc9434594ab94520b032ba7ffe702d839 WHIRLPOOL bedd97b1a81d32dd8e29fc0968cbcfc6628939c731bd3930e5b13ec8275b28fedc612ab44682994aa42672b96af9159fab16b8f1512e6f5a347ac5f184ed42b2
 DIST multisync-gui-0.91.0.tar.gz 112933 SHA256 958b9f2ecf4726095be7a8a5de5d24d325e487891dce56d02b566a93027f769d SHA512 66697d8d48d494d6a2aef7cf26cbe3b2602e9661b5c557acc15b2b0942062edcb7cba95c9c2192d097ff7a1a16f051ac613eb8dbcd2429287153fc8354f2fe2b WHIRLPOOL 137019f6d750b8045d0a35bd76dfe2330b896f4a6b413eeb66eeea64c87d5f39fb8306c8dfdb7c16add85b0c8bbdbde8599ff4edde0e37201bc0b9fb3d93d4b3
 DIST multisync-gui-0.92.0_pre20080531.tar.bz2 47265 SHA256 a7dcbcf2a1d367772e7bb83260cac8c66a524135bc96cef674d891cbec08de9d SHA512 f800f63f63283feb1fa7a2ff4f4beba4807c6ba24665a28b249ee5399a8a41062707c3cd04ff5e359c6f9c7f0f5ba4b5941d6a584befe4d8cc63b31f109fa858 WHIRLPOOL acee792dfa19d4ff039122681e2e5ff41dfc3857d3427ce1d77d5e7c2768fe527577f832f04faed47264eb4d8908e5e92367464f6812010d757adea9643642eb
-EBUILD multisync-gui-0.91.0.ebuild 816 SHA256 6dcca6a344b2dc06f5dbbe31289bfd050ba10b629c21e5f69b53daa1b31d5c1b SHA512 07508a6802165df837a6af38f2637f2d04404b97ca1eea67efdef3acf482388b2b120f90013c5dc63335c04e039b99c533a16e3061b86ec2f114ca76db3d78a5 WHIRLPOOL 08d1c8edf717fd6ff00307cb6305173879f612bf1074269fdb0adb1b41b0c435d384318ce0799624bf88e1f579c6cabd0f4f0075bf9ea0f4cf77f5afb563189a
-EBUILD multisync-gui-0.92.0_pre20080531.ebuild 731 SHA256 501c9b4803e60e2a379bc1cbe5f8f2501ea4defa11de8ef1cbcab7544c0f5c45 SHA512 6ca8240b345351156d58f5a718aea85c93128ca0f608fa3d400192bf7693b31949ed311fc8ce77640636bc4721c4b56686ae41b9661ec9c1b3e996eae11600dd WHIRLPOOL ee95f120be930a67ac9b1f8991812c43619cd66b9d0044ae88a8debc2176521d95dbf7ce7d4d83d7dea1a6f4a549f3901e4c88a6c686636a1359ca420471b10b
-MISC ChangeLog 2002 SHA256 760bb1e835ce131f81a20f0743995be7317e4a3071684991d0920fe56d59a763 SHA512 c9359fcad19251614368d0a61b1ef7b7ead80e641e05b20a623bbde101a74c9c742dc959a969a8e53722fe95dbdc08562e71f2eebbbd42c2356da4483c73b392 WHIRLPOOL 7cb9902b633366f6635dc27e37400671f02bcef239b616b4add4eda578fb81ff35d742a63aa7462bad76ecf12ecac0c9b376446fd1d1e2edd7545719b34c98d5
-MISC metadata.xml 206 SHA256 35944e169760b3ea15f78997b09cd38206105efdae5323d99f03db9b3bea4e53 SHA512 5ac0f3aa94cb86dbcaff9c15823d282ef2679e9a48541945f5f18509488632a32e006d0fe774733166f006a61d598a5309f87d52646c4ccc3180a97b16a9d8cf WHIRLPOOL 641791e143e91a4e94cd3d34af42b2cc3ccd5fe46cb67e54b304e0ac00bc7e16127fdfa72a4feb8aab8b896afc96424d926bb24997f4747ef5ba47a582b40df5
+EBUILD multisync-gui-0.91.0.ebuild 662 SHA256 abba5dc62bf247558d3fcef764c671f69df59ffd807f76f9c0f6bf5bb9c00a60 SHA512 b4a0f8559d15936c69f18adf87ec4f9221517b0678ffb74171741fe1c639f2262957d5ec94fb271af28602c939c6c0ea215d9c378346a684aa7dfee0e69a8c72 WHIRLPOOL e03eba7e5e6e6f621a3166cd4492efcb3161ed81daea594166bf0622dd6df7d5ced3f80553946fe5ff5eb71a304c2ad379a8ee31a542267dc75f74565e3a503f
+EBUILD multisync-gui-0.92.0_pre20080531.ebuild 731 SHA256 71191586d986e0eec3a35ed5251d861fc006802c17fedce61360999fcfb4fb91 SHA512 3b30e196391d142dd10e2f69ddbafc03455a5b643163c9c8cc2022de638d9807280dfa7443fc1dcaa0c2ea4dd10e182a51f3ae5d836a69334be309b53b8f2c1c WHIRLPOOL b96a7e063cfb78ac23db6eeb05ef3ada38f17ecb5963ca1caff3e9494f10b9bc65b37fc5f9c4ae7ff4a656e71a4ef402be863413d83efec6ae81951666de42d8
+MISC ChangeLog 2165 SHA256 27ec0d04b6108f0a928c546bd68d32f3761afc8efa7b66bb4c574d14bf0e88df SHA512 5f5d3cfee6866c70780c1372286a3f1d2951ad396e80c05b7a3290ea3ed230285243e8e5a732c17a41e16b8f4f7d2bf91a25bc10895a21347e6c6f60cf6b81d8 WHIRLPOOL ba09e1a1b6b84c63e231c95cf817630dbd41be645d405d3b32133c682aac0014d9006c74b94a5acf9fb731698ff20415333ff86026e74e08cf1ed65f597e44be
+MISC metadata.xml 156 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb SHA512 c07d56b6668ae429bd774f35ecae73eb324423aa863c7cc327a511de84d24f099668029fde69132110676115b4763ee96e3e1a7ef1a9db6248d606e65df11d4b WHIRLPOOL 4364f66f79aa67bc6b1762698b41683da5018d08602f509f525bc3e4a3521f2100e0ea92d84bb30617bef9beda48a3cc0ef9b1b9a4219fe05a54559d7423b6d1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTQPw0AAoJEEdUh39IaPFNJZUH/2obVOBN7QP9x3wqCDQH0RqP
+cj9bqhJOonifVu9abAQ2pKZbXzzHxFgY3EZ+KYHaDnFiLj64M9NVCMkCalC64Ja5
+b+jLO3ErfdUQPbFNTIlfR3HsKNGufVSfO8pzgddIcPuej2/ozv1WeEw05wM5nQrL
+DdoNdwWt0YTxj5clAxoevM5/tcTuyQ+BZHDRl7/+ujy8UJooTU5AUh/EwBEtG04Z
+JAqrIQvVZ62AubzXJghXWKQcuVJ0mkov+eyhIxunMvdZum1I2gO3zH5UL+jmOEI8
+YSGedAfn5pup971XzZEmCjFt/4J4LiyOhAoW5wFyvU8JPnUP7/hNE5nJmiRqFpA=
+=Jq4Z
+-----END PGP SIGNATURE-----
diff --git a/app-pda/multisync-gui/metadata.xml b/app-pda/multisync-gui/metadata.xml
index f72acf2181ba..228404d3a4b2 100644
--- a/app-pda/multisync-gui/metadata.xml
+++ b/app-pda/multisync-gui/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pda</herd>
-	<longdescription lang="en">
-	</longdescription>
+<herd>pda</herd>
 </pkgmetadata>
diff --git a/app-pda/multisync-gui/multisync-gui-0.91.0.ebuild b/app-pda/multisync-gui/multisync-gui-0.91.0.ebuild
index 30e54282bd09..850abeba7c86 100644
--- a/app-pda/multisync-gui/multisync-gui-0.91.0.ebuild
+++ b/app-pda/multisync-gui/multisync-gui-0.91.0.ebuild
@@ -1,31 +1,27 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync-gui/multisync-gui-0.91.0.ebuild,v 1.7 2012/05/03 20:20:59 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync-gui/multisync-gui-0.91.0.ebuild,v 1.8 2014/04/06 07:09:03 ssuominen Exp $
 
-EAPI=1
+EAPI=5
 inherit toolchain-funcs
 
 DESCRIPTION="OpenSync multisync-gui"
 HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://dev.gentooexperimental.org/~peper/distfiles/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
 LICENSE="GPL-2"
-IUSE="evo"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
 
 RDEPEND="<=app-pda/libopensync-0.35
-	evo? ( >=app-pda/libopensync-plugin-evolution2-0.20 )
 	>=gnome-base/libgnomeui-2
-	>=x11-libs/gtk+-2.6:2"
+	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_compile(){
-	CPPFLAGS="${CXXFLAGS}" CFLAGS="${CXXFLAGS}" ./configure --prefix=/usr
-	emake || die
-}
+DOCS=""
 
-src_install() {
-	emake install DESTDIR="${D}" || die
+src_configure() {
+	CPPFLAGS="${CXXFLAGS}" CFLAGS="${CXXFLAGS}" ./configure --prefix=/usr
 }
diff --git a/app-pda/multisync-gui/multisync-gui-0.92.0_pre20080531.ebuild b/app-pda/multisync-gui/multisync-gui-0.92.0_pre20080531.ebuild
index b39a8620a5d9..b3921f763f59 100644
--- a/app-pda/multisync-gui/multisync-gui-0.92.0_pre20080531.ebuild
+++ b/app-pda/multisync-gui/multisync-gui-0.92.0_pre20080531.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync-gui/multisync-gui-0.92.0_pre20080531.ebuild,v 1.4 2012/05/03 20:20:59 jdhore Exp $
-
-EAPI="3"
+# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync-gui/multisync-gui-0.92.0_pre20080531.ebuild,v 1.5 2014/04/06 07:09:03 ssuominen Exp $
 
+EAPI=5
 inherit cmake-utils
 
 DESCRIPTION="OpenSync multisync-gui"
@@ -23,6 +22,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.92.0-cmake.patch
-	epatch "${FILESDIR}"/${PN}-0.92.0-pixbuf-include.patch
+	epatch \
+		"${FILESDIR}"/${PN}-0.92.0-cmake.patch \
+		"${FILESDIR}"/${PN}-0.92.0-pixbuf-include.patch
 }