Fix bugs #102229, #107485 and #116184.

(Portage version: 2.0.54)

5 files changed, 151 insertions, 25 deletions

diff --git a/app-pda/multisync/ChangeLog b/app-pda/multisync/ChangeLog
index 62190175cd50..029d00ac30e9 100644
--- a/app-pda/multisync/ChangeLog
+++ b/app-pda/multisync/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-pda/multisync
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/ChangeLog,v 1.29 2006/03/16 17:40:27 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/ChangeLog,v 1.30 2006/04/22 08:52:03 mrness Exp $
+
+*multisync-0.83_pre20050414-r4 (22 Apr 2006)
+
+  22 Apr 2006; Alin Nastac <mrness@gentoo.org>
+  +files/multisync-0.83_pre20050414-evo2.patch,
+  +multisync-0.83_pre20050414-r4.ebuild:
+  Fix bugs #102229, #107485 and #116184.
 
   16 Mar 2006; Karol Wojtaszek <sekretarz@gentoo.org>
   +files/multisync-gcc4.patch, multisync-0.83_pre20050414-r3.ebuild:
diff --git a/app-pda/multisync/Manifest b/app-pda/multisync/Manifest
index 5267f9c5c14b..066b858bc60a 100644
--- a/app-pda/multisync/Manifest
+++ b/app-pda/multisync/Manifest
@@ -1,31 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 038c38450ee60ccc4440aad05fb51dd4 ChangeLog 5296
-RMD160 ea122ff3568e7da353f56f7b0154e50f6f606532 ChangeLog 5296
-SHA256 58c883698d2a138276de43362ca6835a7b0ebe0786f20038f874662c13aae2d5 ChangeLog 5296
 MD5 c668aca6eec704faa03632e0588bbe3e files/digest-multisync-0.83_pre20050414-r2 71
-RMD160 a69fb0f02fb31237a39196d5cca8530d20e52400 files/digest-multisync-0.83_pre20050414-r2 71
-SHA256 99d0e08768d85d3ec7a8fb78a88fba2cf7bdaa8b0208854381017bca7c7522dc files/digest-multisync-0.83_pre20050414-r2 71
 MD5 c668aca6eec704faa03632e0588bbe3e files/digest-multisync-0.83_pre20050414-r3 71
-RMD160 a69fb0f02fb31237a39196d5cca8530d20e52400 files/digest-multisync-0.83_pre20050414-r3 71
-SHA256 99d0e08768d85d3ec7a8fb78a88fba2cf7bdaa8b0208854381017bca7c7522dc files/digest-multisync-0.83_pre20050414-r3 71
+MD5 c668aca6eec704faa03632e0588bbe3e files/digest-multisync-0.83_pre20050414-r4 71
+MD5 06a3cc9f82ee514d66cd7b2a36f558f3 files/multisync-0.83_pre20050414-evo2.patch 626
 MD5 e1a658a1c5b7926e4f64119c14b71024 files/multisync-gcc4.patch 4578
-RMD160 071dfdcb731f81ebf64b6589392f5fa4dea944d3 files/multisync-gcc4.patch 4578
-SHA256 6e5e34e14709276b72f4efff6ec8aa622d5d5727fc0010673ab24a9b65ce0922 files/multisync-gcc4.patch 4578
 MD5 4eb51641834063e986569d108f657719 metadata.xml 450
-RMD160 cb27bb1e32585a1eea51391b3e46a4906535bdc7 metadata.xml 450
-SHA256 7bd44367e407f89392bf88f1e9de93e92b1eeeff4dc82e1901437ec1daa06ad0 metadata.xml 450
 MD5 1b02a3193fee90560f759fa0f4f9e33e multisync-0.83_pre20050414-r2.ebuild 3331
-RMD160 d2edd0a52b5e20afc4fc580a86a1fcfb8139b5e2 multisync-0.83_pre20050414-r2.ebuild 3331
-SHA256 2e8eb8b59f578dcf3618d133617c6a5da7d8fc9b1f0a37b67499f8b7bc8fed7b multisync-0.83_pre20050414-r2.ebuild 3331
 MD5 5d2b9955aa13d8e4a696aec3a3f2a5dc multisync-0.83_pre20050414-r3.ebuild 3541
-RMD160 0081c985228b1a13deb4e84db5d69df697ee61bf multisync-0.83_pre20050414-r3.ebuild 3541
-SHA256 f67c3bdaa3da6f8664cad6dd0c918026b01a479ab5a0c73a437f05c6489125b1 multisync-0.83_pre20050414-r3.ebuild 3541
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEGbGKub4+zaPCR/oRAmWtAJ0dKghmuLMHIF7yvbza3LtUAI+RNwCfYUb6
-1+xYfb2pqo+zBVV47nPT1G0=
-=Tc0X
------END PGP SIGNATURE-----
+MD5 11e722f372b8a05435998c95d889a4fe multisync-0.83_pre20050414-r4.ebuild 3736
diff --git a/app-pda/multisync/files/digest-multisync-0.83_pre20050414-r4 b/app-pda/multisync/files/digest-multisync-0.83_pre20050414-r4
new file mode 100644
index 000000000000..d99ce7b968bd
--- /dev/null
+++ b/app-pda/multisync/files/digest-multisync-0.83_pre20050414-r4
@@ -0,0 +1 @@
+MD5 3b577f95b579f46aecdc060e4874bbe5 multisync-20050414.tar.gz 3505577
diff --git a/app-pda/multisync/files/multisync-0.83_pre20050414-evo2.patch b/app-pda/multisync/files/multisync-0.83_pre20050414-evo2.patch
new file mode 100644
index 000000000000..5e5d1206281a
--- /dev/null
+++ b/app-pda/multisync/files/multisync-0.83_pre20050414-evo2.patch
@@ -0,0 +1,13 @@
+diff -ruaN multisync.orig/plugins/evolution2_sync/src/Makefile.am multisync/plugins/evolution2_sync/src/Makefile.am
+--- multisync.orig/plugins/evolution2_sync/src/Makefile.am	2006-01-31 07:39:29.000000000 +1100
++++ multisync/plugins/evolution2_sync/src/Makefile.am	2006-01-31 07:39:15.000000000 +1100
+@@ -22,7 +22,7 @@
+ 	callbacks.c
+ 
+ 
+-libevolution2_sync_la_LDFLAGS = @EVO_LDFLAGS@ -avoid-version -export-dynamic -module
+-libevolution2_sync_la_LIBADD = @PACKAGE_LIBS@ -lpthread @EVO_LIBS@ 
++libevolution2_sync_la_LDFLAGS = -avoid-version -export-dynamic -module
++libevolution2_sync_la_LIBADD = @PACKAGE_LIBS@ -lpthread 
+ 
+ 
diff --git a/app-pda/multisync/multisync-0.83_pre20050414-r4.ebuild b/app-pda/multisync/multisync-0.83_pre20050414-r4.ebuild
new file mode 100644
index 000000000000..88cb6b050a90
--- /dev/null
+++ b/app-pda/multisync/multisync-0.83_pre20050414-r4.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/multisync-0.83_pre20050414-r4.ebuild,v 1.1 2006/04/22 08:52:04 mrness Exp $
+
+inherit versionator kde-functions eutils
+
+CVS_VERSION="${PV/*_pre/}"
+
+DESCRIPTION="Modular sync client which supports an array of plugins."
+HOMEPAGE="http://multisync.sourceforge.net/"
+SRC_URI="mirror://gentoo/${PN}-${CVS_VERSION}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="evo irmc nokia6600 ldap bluetooth pda kdepim arts kdeenablefinal gnokii"
+# evo       - evolution plugin
+# irmc      - bluetooth/irmc/irda plugin ( local )
+# pda       - opie plugin                ( local )
+# nokia6600 - support for Nokia 6600     ( local )
+# ldap      - ldap plugin - experimental
+# kdepim    - sync with the kdepim app
+# arts      - potentially required for kdepim.
+# gnokii    - gnokii plugin
+
+DEPEND=">=gnome-base/libbonobo-2.2
+		>=gnome-base/libgnomeui-2.2
+		>=gnome-base/libgnome-2.2
+		>=dev-libs/glib-2
+		>=gnome-base/gconf-2
+		>=gnome-base/gnome-vfs-2.2
+		>=gnome-base/orbit-2.8.2
+		>=dev-libs/openssl-0.9.6j
+		evo?  ( mail-client/evolution )
+		irmc? ( >=net-wireless/irda-utils-0.9.15
+				>=dev-libs/openobex-1
+				bluetooth? ( 	>=net-wireless/bluez-libs-2.7
+				         		>=net-wireless/bluez-utils-2.7 ) )
+		pda? ( >=net-misc/curl-7.10.5
+				app-pda/pilot-link )
+		kdepim? ( || ( kde-base/kaddressbook kde-base/kdepim )
+				  arts? ( kde-base/arts ) )
+		ldap? ( >=net-nds/openldap-2.0.27
+				>=dev-libs/cyrus-sasl-2.1.4 )
+		gnokii? ( app-mobilephone/gnokii dev-libs/libvformat )
+		nokia6600? ( >=dev-libs/libwbxml-0.9.0 )"
+
+S="${WORKDIR}/${PN}"
+export WANT_AUTOMAKE=1.7
+
+make_plugin_list() {
+	local evoversion
+
+	PLUGINS="backup_plugin syncml_plugin"
+	if use evo
+	then
+		evoversion="$(best_version mail-client/evolution)"
+		# remove prefix
+		evoversion=${evoversion//*evolution-}
+		# remove revisions
+		evoversion=${evoversion//-*}
+		# find major
+		evoversion=$(get_major_version ${evoversion})
+
+		[[ ${evoversion} -eq 2 ]] 	&& PLUGINS="${PLUGINS} evolution2_sync"
+		[[ ${evoversion} -eq 1 ]] 	&& PLUGINS="${PLUGINS} evolution_sync"
+	fi
+	use irmc 	&& PLUGINS="${PLUGINS} irmc_sync"
+	use pda 	&& PLUGINS="${PLUGINS} opie_sync palm_sync"
+	use ldap 	&& PLUGINS="${PLUGINS} ldap_plugin"
+	use kdepim	&& PLUGINS="${PLUGINS} kdepim_plugin"
+	use gnokii	&& PLUGINS="${PLUGINS} gnokii_sync"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${PN}-gcc4.patch"
+	epatch "${FILESDIR}/${P}-evo2.patch"
+}
+
+run_compile() {
+	aclocal || die "failed aclocal"
+	libtoolize --copy --force || die "libtoolize failed!"
+	autoheader || die "Failed during autoheader!"
+	automake --add-missing --gnu || die "Failed during automake!"
+	autoconf || die "Failed during autoconf!"
+	econf CPPFLAGS="${myInc} ${CPPFLAGS}" ${myConf} || die "Failed during econf!"
+	make || die "Failed during make!"
+}
+
+src_compile() {
+	[[ -z "${PLUGINS}" ]] && make_plugin_list
+
+	einfo "Building Multisync with these plugins:"
+	for plugin_dir in ${PLUGINS}; do
+		einfo "      ${plugin_dir}"
+	done
+
+	cd "${S}"
+	if use kdepim; then
+		set-qtdir 3
+		set-kdedir 3
+		myInc="-I${KDEDIR}/include ${myInc}"
+		myConf="$(use_with arts)
+				$(use_enable kdeenablefinal final)"
+	fi
+
+	use pda && myInc="-I/usr/include/libpisock ${myInc}"
+	run_compile;
+	for plugin_dir in ${PLUGINS}; do
+		einfo "Building ${plugin_dir}"
+		cd "${S}/plugins/${plugin_dir}"
+		run_compile;
+	done
+}
+
+src_install() {
+	[[ -z "${PLUGINS}" ]] && make_plugin_list
+
+	einstall || die "Multisync install failed!"
+	for plugin_dir in ${PLUGINS}; do
+		cd "${S}/plugins/${plugin_dir}"
+		make install DESTDIR="${D}" || die "${plugin_dir} make install failed!"
+	done
+}