Fixing broken kdepim

Package-Manager: portage-2.0.51.21-r1

4 files changed, 26 insertions, 12 deletions

diff --git a/app-pda/multisync/ChangeLog b/app-pda/multisync/ChangeLog
index 918ac524504b..fcd61a3df662 100644
--- a/app-pda/multisync/ChangeLog
+++ b/app-pda/multisync/ChangeLog
@@ -1,6 +1,13 @@
 # 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.23 2005/05/02 11:19:54 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/ChangeLog,v 1.24 2005/05/10 19:12:33 johnm Exp $
+
+*multisync-0.83_pre20050414-r2 (10 May 2005)
+
+  10 May 2005; John Mylchreest <johnm@gentoo.org>
+  -multisync-0.83_pre20050414-r1.ebuild,
+  +multisync-0.83_pre20050414-r2.ebuild:
+  Fixing broken kdepim
 
 *multisync-0.83_pre20050414-r1 (02 May 2005)
 
diff --git a/app-pda/multisync/Manifest b/app-pda/multisync/Manifest
index 2334f646a5a3..306d04494abc 100644
--- a/app-pda/multisync/Manifest
+++ b/app-pda/multisync/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b149e063d5d9cf98b5eaaab5f3076a56 multisync-0.83_pre20050414-r1.ebuild 2987
 MD5 7cd2e05eacfffa423533551916cf5cc7 multisync-0.82.ebuild 2258
-MD5 4b383c23babd926373ab28a9bf5d1642 ChangeLog 3791
+MD5 2dd62b82aaf47570203c8c8c030da5d0 multisync-0.83_pre20050414-r2.ebuild 3147
+MD5 cc0527b5f418d9622761cf101964cecc ChangeLog 3993
 MD5 98c2170b9baad0146d1dc1e74a2bb445 metadata.xml 454
 MD5 8dcfd4b620831bf876a1a0f84469597e files/multisync-0.82-bluetooth-sdp.patch 714
 MD5 9caf6f63fb6ecf15986fb4752ffd5ffa files/multisync-0.81-gentoo.patch 902
 MD5 94a424df4dc4575edbb2a91c5ff4eaa3 files/digest-multisync-0.82 68
 MD5 d39bdf982f04d4b0ae776c3d1b2f2eba files/multisync-0.82-bluetooth-sdp-2.patch 814
-MD5 c668aca6eec704faa03632e0588bbe3e files/digest-multisync-0.83_pre20050414-r1 71
+MD5 c668aca6eec704faa03632e0588bbe3e files/digest-multisync-0.83_pre20050414-r2 71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCdgz6z7mlh8wQzGMRAnnsAJ0WpqYlad/krEHD1wdcSbRCwjKz2gCfT2+J
-xqxZqcTaomlDlKEHdOhiWIE=
-=9hvt
+iD8DBQFCgQe5z7mlh8wQzGMRAnteAJ4zMKDdSTmFPOXeuwjTO5AONL5ibACff8kQ
+yusQ9zX1f5jws75NXY7HlXo=
+=oFnZ
 -----END PGP SIGNATURE-----
diff --git a/app-pda/multisync/files/digest-multisync-0.83_pre20050414-r1 b/app-pda/multisync/files/digest-multisync-0.83_pre20050414-r2
index d99ce7b968bd..d99ce7b968bd 100644
--- a/app-pda/multisync/files/digest-multisync-0.83_pre20050414-r1
+++ b/app-pda/multisync/files/digest-multisync-0.83_pre20050414-r2
diff --git a/app-pda/multisync/multisync-0.83_pre20050414-r1.ebuild b/app-pda/multisync/multisync-0.83_pre20050414-r2.ebuild
index e582f3dcb59d..6f09cf69284e 100644
--- a/app-pda/multisync/multisync-0.83_pre20050414-r1.ebuild
+++ b/app-pda/multisync/multisync-0.83_pre20050414-r2.ebuild
@@ -1,8 +1,8 @@
 # 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-r1.ebuild,v 1.1 2005/05/02 11:19:54 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/multisync-0.83_pre20050414-r2.ebuild,v 1.1 2005/05/10 19:12:33 johnm Exp $
 
-inherit versionator
+inherit versionator kde-functions
 
 CVS_VERSION="${PV/*_pre/}"
 S=${WORKDIR}/${PN}
@@ -69,10 +69,19 @@ run_compile() {
 	autoheader || die "Failed during autoheader!"
 	automake --add-missing --gnu || die "Failed during automake!"
 	autoconf || die "Failed during autoconf!"
-	econf || die "Failed during econf!"
+	econf CPPFLAGS="${myInc} ${CPPFLAGS}" || die "Failed during econf!"
 	make || die "Failed during make!"
 }
 
+pkg_setup() {
+	if use kdepim; then
+		set-qtdir 3
+		set-kdedir 3
+		myInc="-I${KDEDIR}/include ${myInc}"
+	fi
+	use pda && myInc="-I/usr/include/libpisock ${myInc}"
+}
+
 src_compile() {
 	[[ -z ${PLUGINS} ]] && make_plugin_list
 
@@ -82,9 +91,7 @@ src_compile() {
 	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}