Fixing broken kdepim

(Portage version: 2.0.51.21-r1)

3 files changed, 20 insertions, 6 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/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}