Add a patch to fix compilation issues. Fix usage of kde eclasses.

Package-Manager: portage-2.0.51-r15

4 files changed, 99 insertions, 9 deletions

diff --git a/app-i18n/xsim/ChangeLog b/app-i18n/xsim/ChangeLog
index af60fca8cd03..b7cd78781c65 100644
--- a/app-i18n/xsim/ChangeLog
+++ b/app-i18n/xsim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/xsim
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/ChangeLog,v 1.8 2005/01/01 14:43:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/ChangeLog,v 1.9 2005/01/28 11:34:44 greg_g Exp $
+
+  28 Jan 2005; Gregorio Guidi <greg@gentoo.org>
+  +files/xsim-0.3.9.4-compile-fix.patch, xsim-0.3.9.4-r2.ebuild:
+  Add a patch to fix compilation issues. Fix usage of kde eclasses.
 
   01 Jun 2004; Aron Griffis <agriffis@gentoo.org> xsim-0.3.9.4-r1.ebuild,
   xsim-0.3.9.4-r2.ebuild:
diff --git a/app-i18n/xsim/Manifest b/app-i18n/xsim/Manifest
index 373086874901..d87c3f40cb1c 100644
--- a/app-i18n/xsim/Manifest
+++ b/app-i18n/xsim/Manifest
@@ -1,9 +1,10 @@
-MD5 5902f2dcff025edf3dc2bab631a38e0d ChangeLog 995
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 f6ac9c19b5d3912b0b8dc977ed27b169 xsim-0.3.9.4-r2.ebuild 1750
+MD5 d92dcbb12aa6f5426d299c44aded186f ChangeLog 1173
 MD5 521345b8ce7a14c0cae4f273acb59167 xsim-0.3.9.4-r1.ebuild 1788
-MD5 0148db44e0afcd7167177cc8c329cfbd xsim-0.3.9.4-r2.ebuild 1654
 MD5 f1134f7d52a6b1bbccb6254d54235b48 xsim-0.3.9.4.ebuild 1253
+MD5 f2699816a48c16ad587b27e48ccf4d8a files/xsim-0.3.9.4-compile-fix.patch 2563
 MD5 b09020ab653fd5cd1b693e3def773f0b files/digest-xsim-0.3.9.4 65
-MD5 b09020ab653fd5cd1b693e3def773f0b files/digest-xsim-0.3.9.4-r1 65
 MD5 b09020ab653fd5cd1b693e3def773f0b files/digest-xsim-0.3.9.4-r2 65
 MD5 922ec332bf51c73ead1e3082d62d23c8 files/xsim-0.3.9.4-db3.patch 934
+MD5 b09020ab653fd5cd1b693e3def773f0b files/digest-xsim-0.3.9.4-r1 65
diff --git a/app-i18n/xsim/files/xsim-0.3.9.4-compile-fix.patch b/app-i18n/xsim/files/xsim-0.3.9.4-compile-fix.patch
new file mode 100644
index 000000000000..0a53e3431261
--- /dev/null
+++ b/app-i18n/xsim/files/xsim-0.3.9.4-compile-fix.patch
@@ -0,0 +1,77 @@
+diff -uNr xsim-0.3.9.4.orig/configure xsim-0.3.9.4/configure
+--- xsim-0.3.9.4.orig/configure	2002-10-24 20:53:57.000000000 +0200
++++ xsim-0.3.9.4/configure	2005-01-27 16:21:18.553956144 +0100
+@@ -5067,13 +5067,13 @@
+ 
+ 
+ if test "x$enable_debug" = "x1" ; then
+-  CFLAGS="-g -Wall -O2 -DDEBUG -I$x_includes"
++  CFLAGS="-g -Wall -O2 -DDEBUG"
+   CXXFLAGS=$CFLAGS
+-  LDFLAGS="-g -L$x_libraries"
++  LDFLAGS="-g"
+ else
+-  CFLAGS="-Wall -O2 -I$x_includes"
++  CFLAGS="-Wall -O2"
+   CXXFLAGS=$CFLAGS
+-  LDFLAGS="-L$x_libraries"
++  LDFLAGS=""
+ fi
+ 
+ if test "x$enable_mdk_patch" = "x1" ; then
+@@ -5085,6 +5085,7 @@
+ 
+ if test "$bdbinc" = "NONE"; then
+   bdb_include_dirs="\
++    /usr/include/db4.1 \
+     /usr/include/db4 \
+     /usr/include/db3 \
+     /usr/local/include \
+diff -uNr xsim-0.3.9.4.orig/plugins/IMs/jianpin/pyphraser.cpp xsim-0.3.9.4/plugins/IMs/jianpin/pyphraser.cpp
+--- xsim-0.3.9.4.orig/plugins/IMs/jianpin/pyphraser.cpp	2002-09-29 05:03:29.000000000 +0200
++++ xsim-0.3.9.4/plugins/IMs/jianpin/pyphraser.cpp	2005-01-27 15:42:06.553514560 +0100
+@@ -16,6 +16,8 @@
+ 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++#include <cassert>
++
+ #include "wstring.h"
+ #include "pyphraser.h"
+ #include "simpleimc.h"
+diff -uNr xsim-0.3.9.4.orig/plugins/IMs/jianpin/simpleim.cpp xsim-0.3.9.4/plugins/IMs/jianpin/simpleim.cpp
+--- xsim-0.3.9.4.orig/plugins/IMs/jianpin/simpleim.cpp	2002-10-22 11:42:51.000000000 +0200
++++ xsim-0.3.9.4/plugins/IMs/jianpin/simpleim.cpp	2005-01-27 15:38:13.771902744 +0100
+@@ -15,6 +15,8 @@
+ 	License along with this library; if not, write to the Free Software
+ 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
++#include <cassert>
++
+ #include <X11/keysym.h>
+ 
+ #include "simpleim.h"
+diff -uNr xsim-0.3.9.4.orig/plugins/IMs/wubi/wubiim.cpp xsim-0.3.9.4/plugins/IMs/wubi/wubiim.cpp
+--- xsim-0.3.9.4.orig/plugins/IMs/wubi/wubiim.cpp	2002-10-22 11:22:13.000000000 +0200
++++ xsim-0.3.9.4/plugins/IMs/wubi/wubiim.cpp	2005-01-27 16:06:29.427123968 +0100
+@@ -16,6 +16,8 @@
+ 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++#include <cassert>
++
+ #include <X11/keysym.h>
+ 
+ #include "wubiim.h"
+diff -uNr xsim-0.3.9.4.orig/xsim/im.cpp xsim-0.3.9.4/xsim/im.cpp
+--- xsim-0.3.9.4.orig/xsim/im.cpp	2002-09-17 09:55:26.000000000 +0200
++++ xsim-0.3.9.4/xsim/im.cpp	2005-01-27 16:07:52.252532592 +0100
+@@ -16,6 +16,8 @@
+ 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++#include <cassert>
++
+ #include <dlfcn.h>
+ 
+ #include "im.h"
diff --git a/app-i18n/xsim/xsim-0.3.9.4-r2.ebuild b/app-i18n/xsim/xsim-0.3.9.4-r2.ebuild
index 22e1c4654f93..616681ce22cf 100644
--- a/app-i18n/xsim/xsim-0.3.9.4-r2.ebuild
+++ b/app-i18n/xsim/xsim-0.3.9.4-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-i18n/xsim/xsim-0.3.9.4-r2.ebuild,v 1.8 2005/01/01 14:43:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/xsim-0.3.9.4-r2.ebuild,v 1.9 2005/01/28 11:34:44 greg_g Exp $
 
-use kde && inherit kde
+inherit kde-functions eutils
 
 DESCRIPTION="A simple and fast GB and BIG5 Chinese XIM server"
 HOMEPAGE="http://developer.berlios.de/projects/xsim/"
@@ -20,8 +20,10 @@ DEPEND="virtual/libc
 
 src_unpack() {
 	unpack ${A}
-
 	cd ${S}
+
+	epatch ${FILESDIR}/${P}-compile-fix.patch
+
 	einfo "Patching ./configure to respect CFLAGS .."
 	sed -i -e "s/\(CFLAGS.*\)-O2/\1${CFLAGS}/" configure
 }
@@ -29,8 +31,14 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	use kde \
-		&& myconf="${myconf} --with-kde3=${KDEDIR} --with-qt3=${QTDIR} --enable-status-kde3"
+	if use kde; then
+		set-qtdir 3
+		set-kdedir 3
+		myconf="${myconf}
+			--with-kde3=${KDEDIR} \
+			--with-qt3=${QTDIR} \
+			--enable-status-kde3"
+	fi
 
 	econf ${myconf} || die "configure failed"
 	emake xsim_etcp=/etc || die "make failed"