Little cleanup

4 files changed, 11 insertions, 37 deletions

diff --git a/app-sci/ksimus/ChangeLog b/app-sci/ksimus/ChangeLog
index de45ff12a7e7..0d542a8d834e 100644
--- a/app-sci/ksimus/ChangeLog
+++ b/app-sci/ksimus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-sci/ksimus
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/ksimus/ChangeLog,v 1.5 2003/07/08 11:47:07 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/ksimus/ChangeLog,v 1.6 2003/07/14 11:44:40 phosphan Exp $
+
+  14 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> ksimus-0.3.6-r1.ebuild,
+  files/ksimus-0.3.6-patch.patch:
+  Little modification that allows to remove the patch for the patch.
+  Since the official patch touches configure.in.in, we have to update
+  the configure script first. Thanks go to Rasmus for the support.
 
   08 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> ksimus-0.3.6-r1.ebuild:
   Fixing bug 23994
diff --git a/app-sci/ksimus/Manifest b/app-sci/ksimus/Manifest
index 61faa9f741df..68acd9f7040f 100644
--- a/app-sci/ksimus/Manifest
+++ b/app-sci/ksimus/Manifest
@@ -1,7 +1,6 @@
 MD5 6b2b67632eebb3f72d238a9934ce228a ksimus-0.3.6.ebuild 578
-MD5 e470870dce13871708845d2e8aa3f754 ksimus-0.3.6-r1.ebuild 909
-MD5 0c398b2c15278c796eca4b5f29592320 ChangeLog 789
+MD5 5c673b3fb6c721466404dd3572c22c39 ksimus-0.3.6-r1.ebuild 809
+MD5 453db88ab33fbcbe540fa7cb74fdb621 ChangeLog 1107
 MD5 c000c0728c9136f1b54cbc3a5fc07644 metadata.xml 220
 MD5 744267bc1f43695ed7f186e671a127c0 files/digest-ksimus-0.3.6-r1 133
 MD5 55164f1100d647c9abc6309cff7139e9 files/digest-ksimus-0.3.6 67
-MD5 85c22e349fc91b5127eb54816b7d069f files/ksimus-0.3.6-patch.patch 1022
diff --git a/app-sci/ksimus/files/ksimus-0.3.6-patch.patch b/app-sci/ksimus/files/ksimus-0.3.6-patch.patch
deleted file mode 100644
index b3e646a0fa63..000000000000
--- a/app-sci/ksimus/files/ksimus-0.3.6-patch.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- ksimus-patch-0.3.6-2	2003-07-08 13:38:24.000000000 +0200
-+++ ksimus-patch-0.3.6-2.new	2003-07-08 13:39:01.000000000 +0200
-@@ -37,26 +37,6 @@
-   
-   ####### kdevelop will overwrite this part!!! (end)############
-   # not a GNU package. You can remove this line, if 
--Index: ksimus/configure.in.in
--diff -c ksimus/configure.in.in:1.16 ksimus/configure.in.in:1.16.2.1
--*** ksimus/configure.in.in:1.16	Sat Mar 29 13:30:51 2003
----- ksimus/configure.in.in	Fri May  9 22:28:36 2003
--***************
--*** 2,7 ****
----- 2,14 ----
--  
--  AM_INIT_AUTOMAKE(ksimus,0.3.6)
--  
--+ AC_DEFUN(KSIMUS_CHECK_LTDL_H,
--+ [
--+   AC_CHECK_HEADER(ltdl.h, , [ AC_MSG_ERROR(The header file ltdl.h is part of libtool. Please check the installation.) ])
--+ ])
--+ 
--+ KSIMUS_CHECK_LTDL_H
--+ 
--  CPPFLAGS="$CPPFLAGS -Wno-long-long"
--  CXXFLAGS="$CXXFLAGS -fPIC"
--  LDFLAGS="$LDFLAGS -rdynamic"
- Index: ksimus/ksimus.kdevprj
- diff -c ksimus/ksimus.kdevprj:1.47 ksimus/ksimus.kdevprj:1.47.2.1
- *** ksimus/ksimus.kdevprj:1.47	Sat Mar 29 13:30:51 2003
diff --git a/app-sci/ksimus/ksimus-0.3.6-r1.ebuild b/app-sci/ksimus/ksimus-0.3.6-r1.ebuild
index eab727c38c7f..7fe3b130014d 100644
--- a/app-sci/ksimus/ksimus-0.3.6-r1.ebuild
+++ b/app-sci/ksimus/ksimus-0.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/ksimus/ksimus-0.3.6-r1.ebuild,v 1.2 2003/07/08 11:47:07 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/ksimus/ksimus-0.3.6-r1.ebuild,v 1.3 2003/07/14 11:44:40 phosphan Exp $
 
 inherit kde-base
 
@@ -20,10 +20,8 @@ need-kde 3
 
 src_unpack() {
 	unpack ${A}
-	patch < ${FILESDIR}/${PN}-${PV}-patch.patch || die "patch for patch failed"
 	cd ${S}
 	patch -p1 < ../${MY_PATCH} || die "patch failed"
-	cd ksimus/tools
-	uic ksimfilelistselectorui.ui -o ksimfilelistselectorui.h
+	make -f Makefile.dist # configure.in.in was patched
 }