Version Bump. Closing Bug #35554.

7 files changed, 173 insertions, 13 deletions

diff --git a/app-pda/multisync/ChangeLog b/app-pda/multisync/ChangeLog
index 0674630d5d66..015e51878d07 100644
--- a/app-pda/multisync/ChangeLog
+++ b/app-pda/multisync/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-pda/multisync
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/ChangeLog,v 1.2 2003/09/15 11:34:03 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/ChangeLog,v 1.3 2004/01/10 12:24:05 tad Exp $
+
+*multisync-0.81 (10 Jan 2004)
+
+  10 Jan 2004; Troy Dack <tad@gentoo.org> multisync-0.81.ebuild,
+  files/multisync-0.81-gentoo.patch:
+  Version bump to 0.81. Marked stable (0.81 is upstream stable release)
+
+  10 Jan 2004; Troy Dack <tad@gentoo.org> multisync-0.80-r1.ebuild,
+  files/multisync-0.80-r1-gentoo.patch:
+  Added patch from Jeremy Huddleston <jeremyhu@cory.eecs.berkeley.edu> to enable
+  the Opie plugin to build correctly. Closes Bug #35554.
 
   15 Sep 2003; Michael Sterrett <msterret@gentoo.org>
   multisync-0.80-r1.ebuild:
diff --git a/app-pda/multisync/Manifest b/app-pda/multisync/Manifest
index 9067b294741d..0a7c096e28f7 100644
--- a/app-pda/multisync/Manifest
+++ b/app-pda/multisync/Manifest
@@ -1,8 +1,8 @@
-MD5 dbd3aa8b27898abe70fcf3ed34de4044 multisync-0.81.ebuild 2253
-MD5 3b4b92ace4a7efea8a366806faf36f6c multisync-0.80-r1.ebuild 2252
-MD5 41e11a33b14c433f9b41b650dbc3fef5 ChangeLog 812
+MD5 1603ce414170ff20e47b11e63f47ae6a multisync-0.81.ebuild 2276
+MD5 d49b4b7e6bdf5e33e5cbe02f0eb4e7d8 multisync-0.80-r1.ebuild 2246
+MD5 dfbaefb9186522e37bf9282e9de9bf03 ChangeLog 1013
 MD5 8bf6f02e04d1b0ccf382064a2d1ee056 metadata.xml 331
 MD5 8ad3a49acbf349a211788f9fadd1285d files/digest-multisync-0.80-r1 69
 MD5 dd3fe0167fa09a793b91a0115253480f files/multisync-0.80-r1-gentoo.patch 842
-MD5 dd3fe0167fa09a793b91a0115253480f files/multisync-0.81-gentoo.patch 842
+MD5 9caf6f63fb6ecf15986fb4752ffd5ffa files/multisync-0.81-gentoo.patch 902
 MD5 88fd786cd5f1c92e85f887a3d994639d files/digest-multisync-0.81 68
diff --git a/app-pda/multisync/files/digest-multisync-0.81 b/app-pda/multisync/files/digest-multisync-0.81
new file mode 100644
index 000000000000..54ef7c33326b
--- /dev/null
+++ b/app-pda/multisync/files/digest-multisync-0.81
@@ -0,0 +1 @@
+MD5 e9091a2a1a364f2afb71149928a26c78 multisync-0.81.tar.bz2 1727892
diff --git a/app-pda/multisync/files/multisync-0.80-r1-gentoo.patch b/app-pda/multisync/files/multisync-0.80-r1-gentoo.patch
new file mode 100644
index 000000000000..40e5c8e54a67
--- /dev/null
+++ b/app-pda/multisync/files/multisync-0.80-r1-gentoo.patch
@@ -0,0 +1,20 @@
+--- 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/files/multisync-0.81-gentoo.patch b/app-pda/multisync/files/multisync-0.81-gentoo.patch
new file mode 100644
index 000000000000..96f34eb80afd
--- /dev/null
+++ b/app-pda/multisync/files/multisync-0.81-gentoo.patch
@@ -0,0 +1,20 @@
+--- plugins/opie_sync/src/Makefile.am.orig	2003-12-03 12:24:01.000000000 +1100
++++ plugins/opie_sync/src/Makefile.am	2004-01-10 22:41:52.986872376 +1100
+@@ -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$(top_srcdir)/../../include \
+ 	-I$(MULTISYNC_HOME) \
+ 	@PACKAGE_CFLAGS@
+--- plugins/opie_sync/src/Makefile.in.orig	2004-01-10 22:42:10.915146864 +1100
++++ plugins/opie_sync/src/Makefile.in	2004-01-10 22:42:52.262861056 +1100
+@@ -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$(top_srcdir)/../../include \
+ 	-I$(MULTISYNC_HOME) \
+ 	@PACKAGE_CFLAGS@
diff --git a/app-pda/multisync/multisync-0.80-r1.ebuild b/app-pda/multisync/multisync-0.80-r1.ebuild
index 30250af7d722..f6bf3383bab6 100644
--- a/app-pda/multisync/multisync-0.80-r1.ebuild
+++ b/app-pda/multisync/multisync-0.80-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/multisync-0.80-r1.ebuild,v 1.3 2003/09/15 11:34:03 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/multisync-0.80-r1.ebuild,v 1.4 2004/01/10 12:24:05 tad Exp $
 
 DESCRIPTION="Client to sync apps with WinCE or mobile devices"
 
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 # evo   - evolution plugin
 # irmc  - bluetooth/irmc/irda plugin ( local )
@@ -27,12 +27,12 @@ IUSE="evo irmc opie ldap"
 DEPEND="virtual/glibc
 		>=gnome-base/libbonobo-2.2
 		>=gnome-base/libgnome-2.2
-	    >=gnome-base/ORBit-0.5.17
+		>=gnome-base/ORBit-0.5.17
 		>=dev-libs/openssl-0.9.6j
 		evo?  ( gtk2? ( =net-mail/evolution-1.4*
-		                =x11-libs/gtk+-2* ) :
-					  ( =net-mail/evolution-1.2*
-		                =x11-libs/gtk+-1* )
+				=x11-libs/gtk+-2* ) :
+			      ( =net-mail/evolution-1.2*
+				=x11-libs/gtk+-1* )
 		)
 		irmc? ( >=sys-apps/irda-utils-0.9.15
 		         >=net-wireless/bluez-utils-2.3
@@ -61,9 +61,16 @@ if [ `use ldap` ] ; then
 	PLUGINS="${PLUGINS} ldap_plugin"
 fi
 
+src_unpack() {
+	unpack ${A}
+
+	# Fix the opie Makefile
+	cd ${S}
+	epatch ${FILESDIR}/${PF}-gentoo.patch
+}
 
 src_compile() {
-	einfo "Building Multisynx with these plugins:"
+	einfo "Building Multisync with these plugins:"
 	for plugin_dir in ${PLUGINS}
 	do
 		einfo "      ${plugin_dir}"
diff --git a/app-pda/multisync/multisync-0.81.ebuild b/app-pda/multisync/multisync-0.81.ebuild
new file mode 100644
index 000000000000..34d847fec3c6
--- /dev/null
+++ b/app-pda/multisync/multisync-0.81.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/multisync-0.81.ebuild,v 1.1 2004/01/10 12:24:05 tad Exp $
+
+DESCRIPTION="Client to sync apps with WinCE or mobile devices"
+
+HOMEPAGE="http://multisync.sourceforge.net/"
+
+# Point to any required sources; these will be automatically downloaded by
+# Portage.
+MY_P="${PF/r1/1}"
+SRC_URI="mirror://sourceforge/multisync/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+
+KEYWORDS="x86"
+
+# evo   - evolution plugin
+# irmc  - bluetooth/irmc/irda plugin ( local )
+# opie  - opie plugin                ( local )
+# ldap  - ldap plugin - experimental
+
+IUSE="evo irmc opie ldap"
+
+DEPEND="virtual/glibc
+		>=gnome-base/libbonobo-2.2
+		>=gnome-base/libgnome-2.2
+		>=gnome-base/ORBit-0.5.17
+		>=dev-libs/openssl-0.9.6j
+		evo?  ( gtk2? ( =net-mail/evolution-1.4*
+				=x11-libs/gtk+-2* ) :
+			      ( =net-mail/evolution-1.2*
+				=x11-libs/gtk+-1* )
+		)
+		irmc? ( >=sys-apps/irda-utils-0.9.15
+		         >=net-wireless/bluez-utils-2.3
+		         >=dev-libs/openobex-1.0.0 )
+		opie? ( >=net-ftp/curl-7.10.5 )
+		ldap? ( >=net-nds/openldap-2.0.27
+				>=dev-libs/cyrus-sasl-2.1.4 )"
+
+# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
+
+S=${WORKDIR}/${PF/-r1/}
+
+PLUGINS="backup_plugin syncml_plugin"
+
+if [ `use irmc` ] ; then
+	PLUGINS="${PLUGINS} irmc_sync"
+fi
+if [ `use evo` ] ; then
+	PLUGINS="${PLUGINS} evolution_sync"
+fi
+
+if [ `use opie` ] ; then
+	PLUGINS="${PLUGINS} opie_sync"
+fi
+
+if [ `use ldap` ] ; then
+	PLUGINS="${PLUGINS} ldap_plugin"
+fi
+
+src_unpack() {
+	unpack ${A}
+
+	# Fix the opie Makefile
+	cd ${S}
+	epatch ${FILESDIR}/${PF}-gentoo.patch
+}
+
+src_compile() {
+	einfo "Building Multisync with these plugins:"
+	for plugin_dir in ${PLUGINS}
+	do
+		einfo "      ${plugin_dir}"
+	done
+
+	cd ${S}
+	econf || die
+	make || die "Multisync make failed"
+
+	cd ${S}/plugins
+	for plugin_dir in ${PLUGINS}
+	do
+		cd ${S}/plugins/${plugin_dir}
+		econf || die "${plugin_dir} config failed!"
+		make || die "${plugin_dir} make failed!"
+	done
+}
+
+src_install() {
+	cd ${S}
+	einstall || die "Multisync install failed!"
+	for plugin_dir in ${PLUGINS}
+	do
+		cd ${S}/plugins/${plugin_dir}
+		einstall || die "${plugin_dir} make failed!"
+	done
+}