Removed johnm from metadata.xml. cf. bug 186467.

Added a post-install message about multisync-gui.
Changed dependency on pilot-link to 0.11.8. cf. bug 190218.
Added a compatibility fix for recent OpenLDAP versions. Fixes bug 175604.
(Portage version: 2.1.3.9)

3 files changed, 28 insertions, 20 deletions

diff --git a/app-pda/multisync/ChangeLog b/app-pda/multisync/ChangeLog
index 33d6c1e43b1f..d0aba69edfbd 100644
--- a/app-pda/multisync/ChangeLog
+++ b/app-pda/multisync/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-pda/multisync
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/ChangeLog,v 1.38 2007/01/04 14:18:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/ChangeLog,v 1.39 2007/09/16 15:03:09 philantrop Exp $
+
+  16 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org> metadata.xml,
+  multisync-0.83_pre20050414-r4.ebuild:
+  Removed johnm from metadata.xml. cf. bug 186467.
+  Added a post-install message about multisync-gui.
+  Changed dependency on pilot-link to 0.11.8. cf. bug 190218.
+  Added a compatibility fix for recent OpenLDAP versions. Fixes bug 175604.
 
   04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   multisync-0.83_pre20050414-r4.ebuild:
diff --git a/app-pda/multisync/metadata.xml b/app-pda/multisync/metadata.xml
index 455f27056223..228404d3a4b2 100644
--- a/app-pda/multisync/metadata.xml
+++ b/app-pda/multisync/metadata.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-  <herd>pda</herd>
-  <maintainer>
-    <email>johnm@gentoo.org</email>
-    <name>John Mylchreest</name>
-    <description>Actively Maintained</description>
-  </maintainer>
-  <longdescription>
-    Multisync is a modular GTK utilities designed to sync many source plugins, with a destination.
-  </longdescription>
+<herd>pda</herd>
 </pkgmetadata>
diff --git a/app-pda/multisync/multisync-0.83_pre20050414-r4.ebuild b/app-pda/multisync/multisync-0.83_pre20050414-r4.ebuild
index 22ab6be1cb1c..4ad7ba1a20b4 100644
--- a/app-pda/multisync/multisync-0.83_pre20050414-r4.ebuild
+++ b/app-pda/multisync/multisync-0.83_pre20050414-r4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 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.8 2007/01/04 14:18:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/multisync-0.83_pre20050414-r4.ebuild,v 1.9 2007/09/16 15:03:09 philantrop Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 
-inherit versionator kde-functions eutils multilib autotools
+inherit versionator kde-functions eutils multilib autotools flag-o-matic
 
 CVS_VERSION="${PV/*_pre/}"
 
@@ -40,16 +40,16 @@ RDEPEND=">=gnome-base/libbonobo-2.2
 				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
+				~app-pda/pilot-link-0.11.8 )
+		kdepim? ( || ( kde-base/kdepim kde-base/kaddressbook )
+				arts? ( kde-base/arts ) )
+		ldap? ( >=net-nds/openldap-2.3.35-r1
 				>=dev-libs/cyrus-sasl-2.1.4 )
 		gnokii? ( app-mobilephone/gnokii dev-libs/libvformat )
 		nokia6600? ( >=dev-libs/libwbxml-0.9.0 )"
 
 DEPEND="${RDEPEND}
-	sys-devel/gettext"
+		sys-devel/gettext"
 
 S="${WORKDIR}/${PN}"
 
@@ -89,11 +89,14 @@ src_unpack() {
 }
 
 run_compile() {
-	econf CPPFLAGS="${myInc} ${CPPFLAGS}" ${myConf} || die "Failed during econf!"
-	make || die "Failed during make!"
+	append-flags "${myInc}"
+	econf ${myConf} || die "Failed during econf!"
+	emake || die "Failed during make!"
 }
 
 src_compile() {
+	use ldap && append-flags "-DLDAP_DEPRECATED"
+
 	[[ -z "${PLUGINS}" ]] && make_plugin_list
 
 	einfo "Building Multisync with these plugins:"
@@ -128,3 +131,10 @@ src_install() {
 		make install DESTDIR="${D}" libdir="\$(prefix)/$(get_libdir)/${PN}" || die "${plugin_dir} make install failed!"
 	done
 }
+
+pkg_postinst() {
+	echo
+	elog "${P} is unmaintained by upstream and deprecated. Use it at your own risk."
+	elog "Try using its successor app-pda/multisync-gui."
+	echo
+}