Fixes bug #22992

5 files changed, 77 insertions, 10 deletions

diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index 7c3aa6442bb7..0d70d81e0902 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for kde-base/kdepim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.39 2003/06/22 19:16:39 caleb Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.40 2003/07/04 16:14:26 brain Exp $
+*kdepim-3.1.2-r1 (04 Jul 2003)
+  04 Jul 2003; Michele Balisitreri <brain@gentoo.org> kdepim-3.1.2-r1.ebuild:
+  Fixes bug #22992.
+  
   21 Jun 2003; Caleb Tennis <caleb@gentoo.org>:
   Removing old ebuilds: 3.0.5a, 3.1
 
diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index 1eab13dc362a..d0cd6b9c6614 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -1,13 +1,17 @@
-MD5 692b11ee455064b79eea0cd9049a7f18 kdepim-3.0.4.ebuild 570
-MD5 db3b7dedc1f16cdbd88b19061d618250 kdepim-3.1.2.ebuild 749
-MD5 2c9781679b00dcced358a4830c9a2a83 kdepim-3.1.1.ebuild 749
+MD5 9d4a33fefd77139fc48148ed26626d47 ChangeLog 5342
 MD5 1a6297f8f2f99c6ddf058d3aa3e54862 kdepim-2.2.2-r1.ebuild 697
-MD5 697b661944796355e094965090be3adb ChangeLog 5211
+MD5 692b11ee455064b79eea0cd9049a7f18 kdepim-3.0.4.ebuild 570
 MD5 2d0a203ebe2c85c806027544bbe0fa35 kdepim-3.0.5b.ebuild 580
+MD5 2c9781679b00dcced358a4830c9a2a83 kdepim-3.1.1.ebuild 749
+MD5 6e11d5d28479a5b7dc57bc1d4a4b7e40 kdepim-3.1.2-r1.ebuild 1020
+MD5 db3b7dedc1f16cdbd88b19061d618250 kdepim-3.1.2.ebuild 749
+MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+MD5 25b7171189f4ffbf21eb256a43758295 files/digest-kdepim-2.2.2-r1 66
 MD5 ce5fa57255f8b647438149e6fc6c0cd0 files/digest-kdepim-3.0.4 66
-MD5 d4b7a2d165d35d1c82d4b79713209870 files/digest-kdepim-3.1.1 66
-MD5 d870663d465fa52954057d4e4edca9ba files/digest-kdepim-3.1.2 66
 MD5 d833726815dce86df6d79630ceeecfdc files/digest-kdepim-3.0.5b 67
-MD5 b6096c1f83c6be572d1fe8fa91bd9d83 files/post-2.2.2-kdepim.diff 7037
+MD5 d4b7a2d165d35d1c82d4b79713209870 files/digest-kdepim-3.1.1 66
 MD5 9531924495b374de9fc7acf45105c3d7 files/kdepim-2.2.2-gentoo.diff 1054
-MD5 25b7171189f4ffbf21eb256a43758295 files/digest-kdepim-2.2.2-r1 66
+MD5 b6096c1f83c6be572d1fe8fa91bd9d83 files/post-2.2.2-kdepim.diff 7037
+MD5 d870663d465fa52954057d4e4edca9ba files/digest-kdepim-3.1.2 66
+MD5 d870663d465fa52954057d4e4edca9ba files/digest-kdepim-3.1.2-r1 66
+MD5 c13bf6597f7d7edba5e3cdc29efcae2a files/kdepim-3.1.2-libmal-support.diff 1134
diff --git a/kde-base/kdepim/files/digest-kdepim-3.1.2-r1 b/kde-base/kdepim/files/digest-kdepim-3.1.2-r1
new file mode 100644
index 000000000000..52d895196950
--- /dev/null
+++ b/kde-base/kdepim/files/digest-kdepim-3.1.2-r1
@@ -0,0 +1 @@
+MD5 37253cbba0fcf1201f6b24d3e8efa943 kdepim-3.1.2.tar.bz2 3289340
diff --git a/kde-base/kdepim/files/kdepim-3.1.2-libmal-support.diff b/kde-base/kdepim/files/kdepim-3.1.2-libmal-support.diff
new file mode 100644
index 000000000000..b6ed7d9655c5
--- /dev/null
+++ b/kde-base/kdepim/files/kdepim-3.1.2-libmal-support.diff
@@ -0,0 +1,29 @@
+--- kpilot/conduits/configure.in.in.orig	2003-07-04 10:09:05.000000000 +0200
++++ kpilot/conduits/configure.in.in	2003-07-04 10:13:35.000000000 +0200
+@@ -93,7 +93,7 @@
+   kde_safe_CXXFLAGS="$CXXFLAGS"
+   LIBS="$LIBS $MAL_LIBS -ldl"
+   CFLAGS="$CFLAGS $MAL_INCS"
+-  CXXFLAGS="$CXXFLAGS $MAL_INCS"
++  CXXFLAGS="$CXXFLAGS $MAL_INCS -I/usr/include/libpisock"
+   AC_LANG_SAVE
+   AC_LANG_CPLUSPLUS
+   AC_TRY_LINK(dnl
+--- kpilot/conduits/malconduit/Makefile.am.orig	2003-07-04 10:09:57.000000000 +0200
++++ kpilot/conduits/malconduit/Makefile.am	2003-07-04 11:21:12.000000000 +0200
+@@ -6,7 +6,7 @@
+ 
+ ### usual kde library settings
+ 
+-INCLUDES= $(PISOCK_INCLUDE)  $(MAL_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
++INCLUDES= $(PISOCK_INCLUDE) $(MAL_INCS) -I$(top_srcdir)/kpilot/lib $(all_includes)
+ METASOURCES = AUTO
+ 
+ servicedir = $(kde_servicesdir)
+@@ -21,5 +21,5 @@
+ 	mal-conduit.cc \
+ 	mal-setup_dialog.ui
+ libmalconduit_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
+-libmalconduit_la_LIBADD = ../../lib/libkpilot.la $(MAL_LIB) $(LIB_KDEUI)
++libmalconduit_la_LIBADD = ../../lib/libkpilot.la $(MAL_LIBS) $(LIB_KDEUI)
+ 
diff --git a/kde-base/kdepim/kdepim-3.1.2-r1.ebuild b/kde-base/kdepim/kdepim-3.1.2-r1.ebuild
new file mode 100644
index 000000000000..cff91cd2423a
--- /dev/null
+++ b/kde-base/kdepim/kdepim-3.1.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.1.2-r1.ebuild,v 1.1 2003/07/04 16:14:26 brain Exp $
+inherit kde-dist 
+
+IUSE="pda"
+DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer..."
+KEYWORDS="~x86 ~ppc ~sparc -alpha" # mark as stable only after marking stable libmal
+
+newdepend "pda? ( >=dev-libs/pilot-link-0.11.1-r1 
+				>=dev-libs/libmal-0.31 )
+	dev-lang/perl
+	=kde-base/kdebase-${PV}*
+	~kde-base/kdenetwork-${PV}" # mimelib is needed for support of some stuff with exchange servers
+
+use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock" && PATCHES="${FILESDIR}/kdepim-3.1.2-libmal-support.diff"
+
+# reported by doctomoe on ppc
+MAKEOPTS="$MAKEOPTS -j1"
+src_compile() {
+        use pda && rm -f configure configure.in
+		kde_src_compile myconf configure
+		kde_src_compile make
+}
+								
+src_install() {
+	kde_src_install
+	docinto html
+	dodoc *.html
+}