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

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

4 files changed, 24 insertions, 26 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/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
 }