fixes bug #55311, #67588, #77546 and #29365

Package-Manager: portage-2.0.51-r13

5 files changed, 177 insertions, 11 deletions

diff --git a/app-pda/multisync/ChangeLog b/app-pda/multisync/ChangeLog
index a52f45f19bb0..e9e81d289757 100644
--- a/app-pda/multisync/ChangeLog
+++ b/app-pda/multisync/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-pda/multisync
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/ChangeLog,v 1.18 2005/01/01 15:46:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/ChangeLog,v 1.19 2005/01/20 19:15:05 johnm Exp $
+
+*multisync-0.83_pre20050115 (20 Jan 2005)
+
+  20 Jan 2005; John Mylchreest <johnm@gentoo.org> metadata.xml,
+  +multisync-0.83_pre20050115.ebuild:
+  fixes bug #55311, #67588, #77546 and #29365
 
   16 Oct 2004; Alastair Tse <liquidx@gentoo.org> multisync-0.81-r1.ebuild:
   removing bluez-sdp dep
diff --git a/app-pda/multisync/Manifest b/app-pda/multisync/Manifest
index d8155902ecec..81be012b20b7 100644
--- a/app-pda/multisync/Manifest
+++ b/app-pda/multisync/Manifest
@@ -1,8 +1,20 @@
-MD5 dbc146bd0717edf1ed8cb7f9feae9386 ChangeLog 2810
-MD5 8bf6f02e04d1b0ccf382064a2d1ee056 metadata.xml 331
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 7cd2e05eacfffa423533551916cf5cc7 multisync-0.82.ebuild 2258
-MD5 d39bdf982f04d4b0ae776c3d1b2f2eba files/multisync-0.82-bluetooth-sdp-2.patch 814
+MD5 08c085e87bf257fd363b6fb0ea38fd53 multisync-0.83_pre20050115.ebuild 4222
+MD5 57bcd49c39a60ea1bbd10ee62a2e3792 ChangeLog 2997
+MD5 888c368ec4caf443470860cacdc929be metadata.xml 454
 MD5 dd3fe0167fa09a793b91a0115253480f files/multisync-0.80-r1-gentoo.patch 842
+MD5 8dcfd4b620831bf876a1a0f84469597e files/multisync-0.82-bluetooth-sdp.patch 714
+MD5 bb3bb422e4cecc71f06e1c7092b5f4b5 files/digest-multisync-0.83_pre20050115 148
 MD5 9caf6f63fb6ecf15986fb4752ffd5ffa files/multisync-0.81-gentoo.patch 902
 MD5 94a424df4dc4575edbb2a91c5ff4eaa3 files/digest-multisync-0.82 68
-MD5 8dcfd4b620831bf876a1a0f84469597e files/multisync-0.82-bluetooth-sdp.patch 714
+MD5 d39bdf982f04d4b0ae776c3d1b2f2eba files/multisync-0.82-bluetooth-sdp-2.patch 814
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB8ANDm/TpOlox+n8RAtHJAJ9dFhy1S+bO+TNPj6xPofmEJA3ppgCgtV8h
+Gn+x/r3oDZFLe0jcIuwH02w=
+=2pXI
+-----END PGP SIGNATURE-----
diff --git a/app-pda/multisync/files/digest-multisync-0.83_pre20050115 b/app-pda/multisync/files/digest-multisync-0.83_pre20050115
new file mode 100644
index 000000000000..d143ee79cbb6
--- /dev/null
+++ b/app-pda/multisync/files/digest-multisync-0.83_pre20050115
@@ -0,0 +1,2 @@
+MD5 499aaa3d41e33276ab162db1d1912a16 multisync-0.82.tar.bz2 1432473
+MD5 184f2cdc99e8c1a97da48c9a456b8a6f multisync-20050115-snapshot.tar.gz 3504569
diff --git a/app-pda/multisync/metadata.xml b/app-pda/multisync/metadata.xml
index e53acf2f7457..f37e8f718466 100644
--- a/app-pda/multisync/metadata.xml
+++ b/app-pda/multisync/metadata.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>tad@gentoo.org</email>
-  <name>Troy Dack</name>
-</maintainer>
-<longdescription>Sync various portable devices with multiple clients</longdescription>
+  <herd>app-pda</herd>
+  <maintainer>
+    <email>johnm@gentoo.org</email>
+    <name>John Mylchreesy</name>
+    <description>Actively Maintained</description>
+  </maintainer>
+  <longdescription>
+    Multisync is a modular GTK utilities designed to sync many source plugins, with a destination.
+  </longdescription>
 </pkgmetadata>
diff --git a/app-pda/multisync/multisync-0.83_pre20050115.ebuild b/app-pda/multisync/multisync-0.83_pre20050115.ebuild
new file mode 100644
index 000000000000..afa27752b55b
--- /dev/null
+++ b/app-pda/multisync/multisync-0.83_pre20050115.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/multisync-0.83_pre20050115.ebuild,v 1.1 2005/01/20 19:15:05 johnm Exp $
+
+inherit eutils versionator
+
+CVS_VERSION="20050115"
+MY_PV="0.82"
+S=${WORKDIR}/${PN}-${MY_PV}
+
+DESCRIPTION="Modular sync client which supports an array of plugins."
+HOMEPAGE="http://multisync.sourceforge.net/"
+SRC_URI="mirror://sourceforge/multisync/${PN}-${MY_PV}.tar.bz2 \
+		mirror://gentoo/${PN}-${CVS_VERSION}-snapshot.tar.gz"
+
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~amd64 ppc"
+IUSE="evo irmc opie ldap bluetooth kdepim"
+# evo    - evolution plugin
+# irmc   - bluetooth/irmc/irda plugin ( local )
+# opie   - opie plugin                ( local )
+# ldap   - ldap plugin - experimental
+# gnokii - Sync mobile phonebook via gnokii - currently boken (missing vfolder)
+# csa    - sync with solaris calendar server - currently broken
+# kdepim - sync with the kde3 address book.
+
+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 ) )
+	opie? ( >=net-misc/curl-7.10.5 )
+	ldap? ( >=net-nds/openldap-2.0.27
+		>=dev-libs/cyrus-sasl-2.1.4 )
+	kdepim? ( >=kde-base/kdepim-3 )"
+
+src_unpack() {
+	unpack ${PN}-${MY_PV}.tar.bz2
+
+	cd ${S}
+	# Unpack stuff we want from the cvs build
+	tar -xzpf ${DISTDIR}/${PN}-${CVS_VERSION}-snapshot.tar.gz \
+		multisync/specs/multisync-evolution2.spec.in \
+		multisync/specs/multisync-irmc-bluetooth.spec.in \
+		multisync/specs/multisync-irmc.spec.in \
+		multisync/specs/multisync-opie.spec.in \
+		multisync/specs/multisync-kdepim.spec.in \
+		multisync/plugins/evolution2_sync \
+		multisync/plugins/irmc_sync \
+		multisync/plugins/opie_sync \
+		multisync/plugins/kdepim_plugin
+
+	# copy additional plugins over
+	mv multisync/plugins/evolution2_sync ${S}/plugins/
+	mv multisync/plugins/kdepim_plugin ${S}/plugins/
+	mv multisync/specs/multisync-evolution2.spec.in ${S}/specs
+	mv multisync/specs/multisync-kdepim.spec.in ${S}/specs
+
+	# fix up irmc_sync issues with bluez-sdp deprecation by using irmc_plugin
+	# from cvs
+	rm -Rf ${S}/plugins/irmc_sync
+	rm -Rf ${S}/specs/multisync-irmc*
+	mv multisync/plugins/irmc_sync ${S}/plugins/
+	mv multisync/specs/multisync-irmc.spec.in ${S}/specs
+	mv multisync/specs/multisync-irmc-bluetooth.spec.in ${S}/specs
+
+	# Update opie_sync to cvs version
+	rm -Rf ${S}/plugins/opie_sync
+	rm -Rf ${S}/specs/multisync-opie*
+	mv multisync/specs/multisync-opie.spec.in ${S}/specs
+	mv multisync/plugins/opie_sync ${S}/plugins/
+
+	# remove cvs tarball
+	rm -Rf multisync/
+}
+
+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 opie 	&& PLUGINS="${PLUGINS} opie_sync"
+	use ldap 	&& PLUGINS="${PLUGINS} ldap_plugin"
+	use kdepim 	&& PLUGINS="${PLUGINS} kdepim_plugin"
+}
+
+src_compile() {
+	make_plugin_list
+
+	einfo "Building Multisync with these plugins:"
+	for plugin_dir in ${PLUGINS}
+	do
+		einfo "      ${plugin_dir}"
+	done
+
+	cd ${S}
+	libtoolize --copy --force || die
+	econf || die
+	make || die "Multisync make failed"
+
+	for plugin_dir in ${PLUGINS}
+	do
+		einfo "Building ${plugin_dir}"
+		cd ${S}/plugins/${plugin_dir}
+		econf || die "${plugin_dir} config failed!"
+		emake || die "${plugin_dir} make failed!"
+	done
+}
+
+src_install() {
+	make_plugin_list
+	einstall || die "Multisync install failed!"
+	for plugin_dir in ${PLUGINS}
+	do
+		cd ${S}/plugins/${plugin_dir}
+		einstall || die "${plugin_dir} make failed!"
+	done
+}