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.
Package-Manager: portage-2.1.3.9

4 files changed, 44 insertions, 36 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/Manifest b/app-pda/multisync/Manifest
index 1d880d6594ca..fadd1523088f 100644
--- a/app-pda/multisync/Manifest
+++ b/app-pda/multisync/Manifest
@@ -10,25 +10,25 @@ MD5 e1a658a1c5b7926e4f64119c14b71024 files/multisync-gcc4.patch 4578
 RMD160 071dfdcb731f81ebf64b6589392f5fa4dea944d3 files/multisync-gcc4.patch 4578
 SHA256 6e5e34e14709276b72f4efff6ec8aa622d5d5727fc0010673ab24a9b65ce0922 files/multisync-gcc4.patch 4578
 DIST multisync-20050414.tar.gz 3505577 RMD160 51f19f41ebc67483020006639bb5ad1041988f0b SHA1 e3828836fb860e8838692811b1dd1348645fe7b3 SHA256 ae42b89b813ce6536eafd5a8249d43c8e47ace0bf44a9077d937d8d1afaeb49c
-EBUILD multisync-0.83_pre20050414-r4.ebuild 3657 RMD160 a4db728eec34b4e24af099714d05518ba01d63e6 SHA1 b316c9f55dd9ead681af37cc2cf6e9b778ef3338 SHA256 24f826cf7cdfa22565c7c7843be4a927900e90a3d0b1f1976d86023a6a375642
-MD5 e72d0526f74d48670446a7c296177cc8 multisync-0.83_pre20050414-r4.ebuild 3657
-RMD160 a4db728eec34b4e24af099714d05518ba01d63e6 multisync-0.83_pre20050414-r4.ebuild 3657
-SHA256 24f826cf7cdfa22565c7c7843be4a927900e90a3d0b1f1976d86023a6a375642 multisync-0.83_pre20050414-r4.ebuild 3657
-MISC ChangeLog 6518 RMD160 7e9d3de9435fb2fcc65ead55c6fad2a49e9ff336 SHA1 6da85a64f279ed8fe81c1f2eaa565d5c34cbe21a SHA256 94dcf029d74873cee04d0fe192366cccba1c9ef02046a6a46ae904e35a7560c5
-MD5 3c17d28976f3da967a636a317eb4ee7d ChangeLog 6518
-RMD160 7e9d3de9435fb2fcc65ead55c6fad2a49e9ff336 ChangeLog 6518
-SHA256 94dcf029d74873cee04d0fe192366cccba1c9ef02046a6a46ae904e35a7560c5 ChangeLog 6518
-MISC metadata.xml 450 RMD160 cb27bb1e32585a1eea51391b3e46a4906535bdc7 SHA1 a1146f664689f77798110e735a651ce105c5c65e SHA256 7bd44367e407f89392bf88f1e9de93e92b1eeeff4dc82e1901437ec1daa06ad0
-MD5 4eb51641834063e986569d108f657719 metadata.xml 450
-RMD160 cb27bb1e32585a1eea51391b3e46a4906535bdc7 metadata.xml 450
-SHA256 7bd44367e407f89392bf88f1e9de93e92b1eeeff4dc82e1901437ec1daa06ad0 metadata.xml 450
+EBUILD multisync-0.83_pre20050414-r4.ebuild 3891 RMD160 34735ea75ea00f2165332f7a4582d4ea494534e1 SHA1 d4a5b07dc1867cf196edf7577771669a90f897cc SHA256 07e0c6cb0794cfbe041288cda7b1b3c09a4b30d1eeb974fcd3912240527a07d2
+MD5 f6e3d135dab52ca125904e10db771682 multisync-0.83_pre20050414-r4.ebuild 3891
+RMD160 34735ea75ea00f2165332f7a4582d4ea494534e1 multisync-0.83_pre20050414-r4.ebuild 3891
+SHA256 07e0c6cb0794cfbe041288cda7b1b3c09a4b30d1eeb974fcd3912240527a07d2 multisync-0.83_pre20050414-r4.ebuild 3891
+MISC ChangeLog 6870 RMD160 ac3c53936c45626bfda1238e400266263a0436f6 SHA1 127f1fb00be7fb0c40a2dc17fede6eee0a996f5c SHA256 6e7d86811d104085c63f8e6202f2b30d41c0a35102c758bfbf846cc9119e4bef
+MD5 dd05c7068c9e37d8a449c9403fcbd21e ChangeLog 6870
+RMD160 ac3c53936c45626bfda1238e400266263a0436f6 ChangeLog 6870
+SHA256 6e7d86811d104085c63f8e6202f2b30d41c0a35102c758bfbf846cc9119e4bef ChangeLog 6870
+MISC metadata.xml 156 RMD160 6a6d0f6bfe83e3a54c2d72444564ed6ab19857fe SHA1 5b9cb277159d763c133920e483df8d3d587cf7e2 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb
+MD5 075fea99b82d61028585dc3e42f00466 metadata.xml 156
+RMD160 6a6d0f6bfe83e3a54c2d72444564ed6ab19857fe metadata.xml 156
+SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb metadata.xml 156
 MD5 73b0a5be9a9c16a57f1740dd79c86dc6 files/digest-multisync-0.83_pre20050414-r4 259
 RMD160 da4a2fef9908409be374351421ec0ee6c7785b92 files/digest-multisync-0.83_pre20050414-r4 259
 SHA256 bd2225040ecaa5307a5a1164716bd0c96c2d5019f957decfd83bed108d9952e5 files/digest-multisync-0.83_pre20050414-r4 259
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFFnQzHAiZjviIA2XgRAv/GAKDERerYa3FMjpEjVPWfUyOsOoq1KgCeOS8k
-DDBORh+/SE6QUKWyCIP1/tE=
-=E95Y
+iD8DBQFG7UW4CkvF58q80IkRAqHZAKCsxvbRJLvh+2MXd/1bm9tze78CcgCfRIyo
+n9ROoabiDv3LLQ/pile6NLM=
+=uhyB
 -----END PGP SIGNATURE-----
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
+}