Updating with a new cvs snapshot. Cleaning older files.

(Portage version: 2.0.51.20-r5)

7 files changed, 114 insertions, 178 deletions

diff --git a/app-pda/multisync/ChangeLog b/app-pda/multisync/ChangeLog
index 4729e1d29d94..530b636124e7 100644
--- a/app-pda/multisync/ChangeLog
+++ b/app-pda/multisync/ChangeLog
@@ -1,6 +1,14 @@
 # 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.21 2005/04/21 20:05:01 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/ChangeLog,v 1.22 2005/05/01 23:12:51 johnm Exp $
+
+*multisync-0.83_pre20050414 (01 May 2005)
+
+  01 May 2005; John Mylchreest <johnm@gentoo.org>
+  -files/multisync-0.80-r1-gentoo.patch, metadata.xml,
+  -multisync-0.83_pre20050115.ebuild, +multisync-0.83_pre20050414.ebuild:
+  Comitting new cvs snapshot, nice and stable it seems :D cleaning up older
+  files.
 
   21 Apr 2005; Simon Stelling <blubb@gentoo.org>
   multisync-0.83_pre20050115.ebuild:
diff --git a/app-pda/multisync/files/digest-multisync-0.83_pre20050115 b/app-pda/multisync/files/digest-multisync-0.83_pre20050115
deleted file mode 100644
index d143ee79cbb6..000000000000
--- a/app-pda/multisync/files/digest-multisync-0.83_pre20050115
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 499aaa3d41e33276ab162db1d1912a16 multisync-0.82.tar.bz2 1432473
-MD5 184f2cdc99e8c1a97da48c9a456b8a6f multisync-20050115-snapshot.tar.gz 3504569
diff --git a/app-pda/multisync/files/digest-multisync-0.83_pre20050414 b/app-pda/multisync/files/digest-multisync-0.83_pre20050414
new file mode 100644
index 000000000000..d99ce7b968bd
--- /dev/null
+++ b/app-pda/multisync/files/digest-multisync-0.83_pre20050414
@@ -0,0 +1 @@
+MD5 3b577f95b579f46aecdc060e4874bbe5 multisync-20050414.tar.gz 3505577
diff --git a/app-pda/multisync/files/multisync-0.80-r1-gentoo.patch b/app-pda/multisync/files/multisync-0.80-r1-gentoo.patch
deleted file mode 100644
index 40e5c8e54a67..000000000000
--- a/app-pda/multisync/files/multisync-0.80-r1-gentoo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/opie_sync/src/Makefile.am.orig	2003-12-10 14:52:35.000000000 -0800
-+++ plugins/opie_sync/src/Makefile.am	2003-12-10 14:53:12.000000000 -0800
-@@ -17,6 +17,7 @@
- INCLUDES = \
- 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-+	-I../../../include \
- 	-I../../../src/libversit -I$(top_srcdir) -I$(top_srcdir)/intl \
- 	-I$(MULTISYNC_HOME) \
- 	@PACKAGE_CFLAGS@
---- plugins/opie_sync/src/Makefile.in.orig	2003-12-10 15:05:04.000000000 -0800
-+++ plugins/opie_sync/src/Makefile.in	2003-12-10 15:05:29.000000000 -0800
-@@ -102,6 +102,7 @@
- INCLUDES = \
- 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-+	-I../../../include \
- 	-I../../../src/libversit -I$(top_srcdir) -I$(top_srcdir)/intl \
- 	-I$(MULTISYNC_HOME) \
- 	@PACKAGE_CFLAGS@
diff --git a/app-pda/multisync/metadata.xml b/app-pda/multisync/metadata.xml
index f37e8f718466..e7d9d76835d4 100644
--- a/app-pda/multisync/metadata.xml
+++ b/app-pda/multisync/metadata.xml
@@ -5,7 +5,7 @@
   <herd>app-pda</herd>
   <maintainer>
     <email>johnm@gentoo.org</email>
-    <name>John Mylchreesy</name>
+    <name>John Mylchreest</name>
     <description>Actively Maintained</description>
   </maintainer>
   <longdescription>
diff --git a/app-pda/multisync/multisync-0.83_pre20050115.ebuild b/app-pda/multisync/multisync-0.83_pre20050115.ebuild
deleted file mode 100644
index 5ee84efe83af..000000000000
--- a/app-pda/multisync/multisync-0.83_pre20050115.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# 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.3 2005/04/21 20:05:01 blubb Exp $
-
-inherit eutils versionator kde
-
-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}
-		if test "${plugin_dir}" = "kdepim_plugin";
-		then
-			temp_S=${S}
-			S=${S}/plugins/${plugin_dir}
-			set-kdedir
-			kde_src_compile myconf
-			einfo ${myconf}
-			kde_src_compile configure || die "${plugin_dir} configure failed!"
-			kde_src_compile make || "${plugin_dir} make failed!"
-			S=${temp_S}
-		else
-			econf || die "${plugin_dir} config failed!"
-			emake || die "${plugin_dir} make failed!"
-		fi
-	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} install failed!"
-	done
-}
diff --git a/app-pda/multisync/multisync-0.83_pre20050414.ebuild b/app-pda/multisync/multisync-0.83_pre20050414.ebuild
new file mode 100644
index 000000000000..4f16d1660c7d
--- /dev/null
+++ b/app-pda/multisync/multisync-0.83_pre20050414.ebuild
@@ -0,0 +1,103 @@
+# 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_pre20050414.ebuild,v 1.1 2005/05/01 23:12:51 johnm Exp $
+
+inherit versionator
+
+CVS_VERSION="${PV/*_pre/}"
+S=${WORKDIR}/${PN}
+export WANT_AUTOMAKE=1.7
+
+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 ppc"
+IUSE="evo irmc ldap bluetooth pda kdepim"
+# evo    - evolution plugin
+# irmc   - bluetooth/irmc/irda plugin ( local )
+# pda    - opie plugin                ( local )
+# ldap   - ldap plugin - experimental
+# kdepim - sync with the kdepim app
+
+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/kdepim )
+		ldap? ( >=net-nds/openldap-2.0.27
+				>=dev-libs/cyrus-sasl-2.1.4 )"
+
+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"
+}
+
+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 || 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}
+	EXTRA_ECONF="CPPFLAGS=-I/usr/include/libpisock"
+	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}
+		einstall || die "${plugin_dir} make install failed!"
+	done
+}