Fixed autotools per bug #226813 and removed old ebuilds.

(Portage version: 2.1.4.4)

6 files changed, 55 insertions, 510 deletions

diff --git a/sci-calculators/qalculate-kde/ChangeLog b/sci-calculators/qalculate-kde/ChangeLog
index f1dea07605f4..b4ab099bc4e2 100644
--- a/sci-calculators/qalculate-kde/ChangeLog
+++ b/sci-calculators/qalculate-kde/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-calculators/qalculate-kde
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-kde/ChangeLog,v 1.22 2008/04/26 12:08:20 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-kde/ChangeLog,v 1.23 2008/06/15 14:31:40 markusle Exp $
+
+  15 Jun 2008; Markus Dittrich <markusle@gentoo.org>
+  -files/qalculate-kde-makefile.patch, -qalculate-kde-0.9.4.ebuild,
+  -qalculate-kde-0.9.5.ebuild, 
+  files/qalculate-kde-0.9.6-cln-config.patch,
+  qalculate-kde-0.9.6-r1.ebuild:
+  Fixed autotools per bug #226813 and removed old ebuilds.
 
   26 Apr 2008; Markus Dittrich <markusle@gentoo.org>
   qalculate-kde-0.9.6-r1.ebuild:
diff --git a/sci-calculators/qalculate-kde/files/qalculate-kde-0.9.6-cln-config.patch b/sci-calculators/qalculate-kde/files/qalculate-kde-0.9.6-cln-config.patch
index fa57e94445ba..0978d0aef771 100644
--- a/sci-calculators/qalculate-kde/files/qalculate-kde-0.9.6-cln-config.patch
+++ b/sci-calculators/qalculate-kde/files/qalculate-kde-0.9.6-cln-config.patch
@@ -1,171 +1,32 @@
-diff -Naur qalculate-kde-0.9.6.old/acinclude.m4 qalculate-kde-0.9.6/acinclude.m4
---- qalculate-kde-0.9.6.old/acinclude.m4	2007-06-17 07:33:57.000000000 -0400
-+++ qalculate-kde-0.9.6/acinclude.m4	2008-02-02 14:18:02.000000000 -0500
-@@ -3231,7 +3231,7 @@
-           CXXFLAGS="$CXXFLAGS -fno-reorder-blocks"
-           CFLAGS="$CFLAGS -fno-reorder-blocks"
-     fi
--    KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
-+    KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS"])
-     KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
-     KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
-     KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS=	)
-diff -Naur qalculate-kde-0.9.6.old/aclocal.m4 qalculate-kde-0.9.6/aclocal.m4
---- qalculate-kde-0.9.6.old/aclocal.m4	2007-06-17 07:34:08.000000000 -0400
-+++ qalculate-kde-0.9.6/aclocal.m4	2008-02-02 14:17:39.000000000 -0500
-@@ -27,146 +27,27 @@
- [dnl 
- dnl Get the cppflags and libraries from the cln-config script
- dnl
--AC_ARG_WITH(cln-prefix,[  --with-cln-prefix=PFX   Prefix where CLN is installed (optional)],
--            cln_config_prefix="$withval", cln_config_prefix="")
--AC_ARG_WITH(cln-exec-prefix,[  --with-cln-exec-prefix=PFX Exec prefix where CLN is installed (optional)],
--            cln_config_exec_prefix="$withval", cln_config_exec_prefix="")
--AC_ARG_ENABLE(clntest, [  --disable-clntest       Do not try to compile and run a test CLN program],
--              , enable_clntest=yes)
--
--if test x$cln_config_exec_prefix != x ; then
--    cln_config_args="$cln_config_args --exec-prefix=$cln_config_exec_prefix"
--    if test x${CLN_CONFIG+set} != xset ; then
--        CLN_CONFIG=$cln_config_exec_prefix/bin/cln-config
--    fi
--fi
--if test x$cln_config_prefix != x ; then
--    cln_config_args="$cln_config_args --prefix=$cln_config_prefix"
--    if test x${CLN_CONFIG+set} != xset ; then
--        CLN_CONFIG=$cln_config_prefix/bin/cln-config
--    fi
--fi
+diff -Naur qalculate-kde-0.9.6/configure.in qalculate-kde-0.9.6.new/configure.in
+--- qalculate-kde-0.9.6/configure.in	2007-06-17 07:33:58.000000000 -0400
++++ qalculate-kde-0.9.6.new/configure.in	2008-06-15 07:20:32.000000000 -0400
+@@ -73,11 +73,7 @@
  
--AC_PATH_PROG(CLN_CONFIG, cln-config, no)
-+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- cln_min_version=ifelse([$1], ,1.1.0,$1)
- AC_MSG_CHECKING(for CLN - version >= $cln_min_version)
--if test "$CLN_CONFIG" = "no" ; then
-+if test "$PKG_CONFIG" = "no" ; then
-     AC_MSG_RESULT(no)
--    echo "*** The cln-config script installed by CLN could not be found"
--    echo "*** If CLN was installed in PREFIX, make sure PREFIX/bin is in"
--    echo "*** your path, or set the CLN_CONFIG environment variable to the"
--    echo "*** full path to cln-config."
-+    echo "*** could not find pkg-config" 
-     ifelse([$3], , :, [$3])
- else
- dnl Parse required version and the result of cln-config.
--    cln_min_major_version=`echo $cln_min_version | \
--            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
--    cln_min_minor_version=`echo $cln_min_version | \
--            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
--    cln_min_micro_version=`echo $cln_min_version | \
--            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
--    CLN_CPPFLAGS=`$CLN_CONFIG $cln_config_args --cppflags`
--    CLN_LIBS=`$CLN_CONFIG $cln_config_args --libs`
--    cln_config_version=`$CLN_CONFIG $cln_config_args --version`
--    cln_config_major_version=`echo $cln_config_version | \
--            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
--    cln_config_minor_version=`echo $cln_config_version | \
--            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
--    cln_config_micro_version=`echo $cln_config_version | \
--            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
--dnl Check if the installed CLN is sufficiently new according to cln-config.
--    if test \( $cln_config_major_version -lt $cln_min_major_version \) -o \
--            \( $cln_config_major_version -eq $cln_min_major_version -a $cln_config_minor_version -lt $cln_min_minor_version \) -o \
--            \( $cln_config_major_version -eq $cln_min_major_version -a $cln_config_minor_version -eq $cln_min_minor_version -a $cln_config_micro_version -lt $cln_min_micro_version \); then
--        echo -e "\n*** 'cln-config --version' returned $cln_config_major_version.$cln_config_minor_version.$cln_config_micro_version, but the minimum version"
--        echo "*** of CLN required is $cln_min_major_version.$cln_min_minor_version.$cln_min_micro_version. If cln-config is correct, then it is"
--        echo "*** best to upgrade to the required version."
--        echo "*** If cln-config was wrong, set the environment variable CLN_CONFIG"
--        echo "*** to point to the correct copy of cln-config, and remove the file"
--        echo "*** config.cache before re-running configure."
--        ifelse([$3], , :, [$3])
-+    if $PKG_CONFIG cln --atleast-version=${cln_min_version}; then
-+       echo "Found cln >= ${cln_min_version}"	
-+       CLN_CPPFLAGS=`$PKG_CONFIG cln --cflags`
-+       CLN_LIBS=`$PKG_CONFIG cln --libs`
-     else
--dnl The versions match so far.  Now do a sanity check: Does the result of cln-config
--dnl match the version of the headers and the version built into the library, too?
--        no_cln=""
--        if test "x$enable_clntest" = "xyes" ; then
--            ac_save_CPPFLAGS="$CPPFLAGS"
--            ac_save_LIBS="$LIBS"
--            CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
--            LIBS="$LIBS $CLN_LIBS"
--            rm -f conf.clntest
--            AC_TRY_RUN([
--#include <stdio.h>
--#include <string.h>
--#include <cln/version.h>
--
--/* we do not #include <stdlib.h> because autoconf in C++ mode inserts a
--   prototype for exit() that conflicts with the one in stdlib.h */
--extern "C" int system(const char *);
--
--int main(void)
--{
--    system("touch conf.clntest");
--
--    if ((CL_VERSION_MAJOR != $cln_config_major_version) ||
--        (CL_VERSION_MINOR != $cln_config_minor_version) ||
--        (CL_VERSION_PATCHLEVEL != $cln_config_micro_version)) {
--        printf("\n*** 'cln-config --version' returned %d.%d.%d, but the header file I found\n", $cln_config_major_version, $cln_config_minor_version, $cln_config_micro_version);
--        printf("*** corresponds to %d.%d.%d. This mismatch suggests your installation of CLN\n", CL_VERSION_MAJOR, CL_VERSION_MINOR, CL_VERSION_PATCHLEVEL);
--        printf("*** is corrupted or you have specified some wrong -I compiler flags.\n");
--        printf("*** Please inquire and consider reinstalling CLN.\n");
--        return 1;
--    }
--    if ((cln::version_major != $cln_config_major_version) ||
--        (cln::version_minor != $cln_config_minor_version) ||
--        (cln::version_patchlevel != $cln_config_micro_version)) {
--        printf("\n*** 'cln-config --version' returned %d.%d.%d, but the library I found\n", $cln_config_major_version, $cln_config_minor_version, $cln_config_micro_version);
--        printf("*** corresponds to %d.%d.%d. This mismatch suggests your installation of CLN\n", cln::version_major, cln::version_minor, cln::version_patchlevel);
--        printf("*** is corrupted or you have specified some wrong -L compiler flags.\n");
--        printf("*** Please inquire and consider reinstalling CLN.\n");
--        return 1;
--    }
--    return 0;
--}
--],, no_cln=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
--            CPPFLAGS="$ac_save_CPPFLAGS"
--            LIBS="$ac_save_LIBS"
--        fi
--        if test "x$no_cln" = x ; then
--            AC_MSG_RESULT([yes, $cln_config_version])
--            ifelse([$2], , :, [$2])
--        else
--            AC_MSG_RESULT(no)
--            if test ! -f conf.clntest ; then
--                echo "*** Could not run CLN test program, checking why..."
--                CPPFLAGS="$CFLAGS $CLN_CPPFLAGS"
--                LIBS="$LIBS $CLN_LIBS"
--                AC_TRY_LINK([
--#include <stdio.h>
--#include <cln/version.h>
--],              [ return 0; ],
--                [ echo "*** The test program compiled, but did not run. This usually means"
--                  echo "*** that the run-time linker is not finding CLN or finding the wrong"
--                  echo "*** version of CLN. If it is not finding CLN, you'll need to set your"
--                  echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
--                  echo "*** to the installed location. Also, make sure you have run ldconfig if that"
--                  echo "*** is required on your system."],
--                [ echo "*** The test program failed to compile or link. See the file config.log for the"
--                  echo "*** exact error that occured. This usually means CLN was incorrectly installed"
--                  echo "*** or that you have moved CLN since it was installed. In the latter case, you"
--                  echo "*** may want to edit the cln-config script: $CLN_CONFIG." ])
--                CPPFLAGS="$ac_save_CPPFLAGS"
--                LIBS="$ac_save_LIBS"
--            fi
--            CLN_CPPFLAGS=""
--            CLN_LIBS=""
--            ifelse([$3], , :, [$3])
--        fi
-+	echo "ERROR: cln >= ${cln_min_version} not found"
-+        ifelse([$3], , :, [$3])
-     fi
- fi
- AC_SUBST(CLN_CPPFLAGS)
- AC_SUBST(CLN_LIBS)
--rm -f conf.clntest
- ])
+ AC_LANG([C++])
  
- # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+-AC_PATH_CLN(1.1.0, [
+-     	LIBS="$LIBS $CLN_LIBS"
+-     	CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
+-  	AC_DEFINE(HAVE_LIBCLN,1,[If CLN can be used])
+-], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
++PKG_CHECK_MODULES([CLN], [cln >= 1.1.0])
+ 
+ PKG_CHECK_MODULES(QALCULATE, [
+ 	libxml-2.0
+diff -Naur qalculate-kde-0.9.6/configure.in.in qalculate-kde-0.9.6.new/configure.in.in
+--- qalculate-kde-0.9.6/configure.in.in	2007-05-18 04:10:17.000000000 -0400
++++ qalculate-kde-0.9.6.new/configure.in.in	2008-06-15 07:20:47.000000000 -0400
+@@ -8,11 +8,7 @@
+ 
+ AC_LANG([C++])
+ 
+-AC_PATH_CLN(1.1.0, [
+-     	LIBS="$LIBS $CLN_LIBS"
+-     	CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
+-  	AC_DEFINE(HAVE_LIBCLN,1,[If CLN can be used])
+-], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
++PKG_CHECK_MODULES([CLN], [cln >= 1.1.0])
+ 
+ PKG_CHECK_MODULES(QALCULATE, [
+ 	libxml-2.0
diff --git a/sci-calculators/qalculate-kde/files/qalculate-kde-makefile.patch b/sci-calculators/qalculate-kde/files/qalculate-kde-makefile.patch
deleted file mode 100644
index 5acc8119dd9d..000000000000
--- a/sci-calculators/qalculate-kde/files/qalculate-kde-makefile.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-diff -Naur qalculate-kde-0.9.4/Makefile.in qalculate-kde-0.9.4-new/Makefile.in
---- qalculate-kde-0.9.4/Makefile.in	2006-06-01 17:20:55.000000000 -0400
-+++ qalculate-kde-0.9.4-new/Makefile.in	2006-06-17 10:37:09.000000000 -0400
-@@ -39,11 +39,6 @@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
- 
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -299,26 +294,6 @@
- 
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-  configure.lineno
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
--#>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  Makefile
--#>+ 3
--	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  Makefile
--	cd $(top_srcdir) && perl admin/am_edit Makefile.in
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
--
--$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--	$(SHELL) ./config.status --recheck
--$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
--#>- 	cd $(srcdir) && $(AUTOCONF)
--#>+ 2
--	cd $(srcdir) && rm -f configure
--	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
--
--$(ACLOCAL_M4):  configure.in acinclude.m4
--	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
- 
- config.h: stamp-h1
- 	@if test ! -f $@; then \
-@@ -330,10 +305,6 @@
- 	@rm -f stamp-h1
- 	cd $(top_builddir) && $(SHELL) ./config.status config.h
- 
--$(srcdir)/config.h.in:  $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOHEADER)
--	touch $(srcdir)/config.h.in
--
- distclean-hdr:
- 	-rm -f config.h stamp-h1
- 
-@@ -667,13 +638,6 @@
- #>+ 2
- docs-am:
- 
--#>+ 6
--force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  Makefile
--	cd $(top_srcdir) && perl admin/am_edit Makefile.in
--
--
- #>+ 21
- clean-bcheck: 
- 	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-diff -Naur qalculate-kde-0.9.4/doc/Makefile.in qalculate-kde-0.9.4-new/doc/Makefile.in
---- qalculate-kde-0.9.4/doc/Makefile.in	2006-06-01 17:20:55.000000000 -0400
-+++ qalculate-kde-0.9.4-new/doc/Makefile.in	2006-06-17 10:40:52.000000000 -0400
-@@ -42,11 +42,6 @@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
- 
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -289,13 +284,6 @@
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
--#>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  doc/Makefile
--#>+ 3
--	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/Makefile
--	cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
- 
-@@ -538,13 +526,6 @@
- #>+ 2
- docs-am:
- 
--#>+ 6
--force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/Makefile
--	cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
--
--
- #>+ 21
- clean-bcheck: 
- 	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-diff -Naur qalculate-kde-0.9.4/doc/en/Makefile.in qalculate-kde-0.9.4-new/doc/en/Makefile.in
---- qalculate-kde-0.9.4/doc/en/Makefile.in	2006-06-01 17:20:55.000000000 -0400
-+++ qalculate-kde-0.9.4-new/doc/en/Makefile.in	2006-06-17 10:43:28.000000000 -0400
-@@ -42,11 +42,6 @@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
- 
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -289,13 +284,6 @@
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
--#>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  doc/en/Makefile
--#>+ 3
--	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/en/Makefile
--	cd $(top_srcdir) && perl admin/am_edit doc/en/Makefile.in
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
- 
-@@ -538,13 +526,6 @@
- #>+ 2
- docs-am:
- 
--#>+ 6
--force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/en/Makefile
--	cd $(top_srcdir) && perl admin/am_edit doc/en/Makefile.in
--
--
- #>+ 21
- clean-bcheck: 
- 	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-diff -Naur qalculate-kde-0.9.4/doc/en/qalculate_kde/Makefile.in qalculate-kde-0.9.4-new/doc/en/qalculate_kde/Makefile.in
---- qalculate-kde-0.9.4/doc/en/qalculate_kde/Makefile.in	2006-06-01 17:20:55.000000000 -0400
-+++ qalculate-kde-0.9.4-new/doc/en/qalculate_kde/Makefile.in	2006-06-17 10:44:04.000000000 -0400
-@@ -39,9 +39,6 @@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../../..
- 
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
- AUTOHEADER = @AUTOHEADER@
- 
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-@@ -275,13 +272,6 @@
- all: docs-am  all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
--#>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  doc/en/qalculate_kde/Makefile
--#>+ 3
--	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/en/qalculate_kde/Makefile
--	cd $(top_srcdir) && perl admin/am_edit doc/en/qalculate_kde/Makefile.in
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
- 
-@@ -462,13 +452,6 @@
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
--#>+ 6
--force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/en/qalculate_kde/Makefile
--	cd $(top_srcdir) && perl admin/am_edit doc/en/qalculate_kde/Makefile.in
--
--
- #>+ 21
- clean-bcheck: 
- 	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-diff -Naur qalculate-kde-0.9.4/po/Makefile.in qalculate-kde-0.9.4-new/po/Makefile.in
---- qalculate-kde-0.9.4/po/Makefile.in	2006-06-01 17:20:55.000000000 -0400
-+++ qalculate-kde-0.9.4-new/po/Makefile.in	2006-06-17 10:47:08.000000000 -0400
-@@ -39,11 +39,6 @@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
- 
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -277,13 +272,6 @@
- all: all-nls docs-am  all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
--#>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  po/Makefile
--#>+ 3
--	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/Makefile
--	cd $(top_srcdir) && perl admin/am_edit po/Makefile.in
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
- 
-@@ -471,13 +459,6 @@
- #>+ 2
- docs-am:
- 
--#>+ 6
--force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/Makefile
--	cd $(top_srcdir) && perl admin/am_edit po/Makefile.in
--
--
- #>+ 21
- clean-bcheck: 
- 	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-diff -Naur qalculate-kde-0.9.4/src/Makefile.in qalculate-kde-0.9.4-new/src/Makefile.in
---- qalculate-kde-0.9.4/src/Makefile.in	2006-06-01 17:20:56.000000000 -0400
-+++ qalculate-kde-0.9.4-new/src/Makefile.in	2006-06-17 10:40:13.000000000 -0400
-@@ -39,11 +39,6 @@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
- 
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -520,13 +515,6 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
--#>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  src/Makefile
--#>+ 3
--	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  src/Makefile
--	cd $(top_srcdir) && perl admin/am_edit src/Makefile.in
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-@@ -1075,13 +1063,6 @@
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/qalculate_convert.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/qalculate_kde.png
- 
--#>+ 6
--force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  src/Makefile
--	cd $(top_srcdir) && perl admin/am_edit src/Makefile.in
--
--
- #>+ 21
- clean-bcheck: 
- 	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
diff --git a/sci-calculators/qalculate-kde/qalculate-kde-0.9.4.ebuild b/sci-calculators/qalculate-kde/qalculate-kde-0.9.4.ebuild
deleted file mode 100644
index 3f03eec7438f..000000000000
--- a/sci-calculators/qalculate-kde/qalculate-kde-0.9.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-kde/qalculate-kde-0.9.4.ebuild,v 1.4 2007/09/24 14:48:58 markusle Exp $
-
-myconf="--disable-clntest"
-
-inherit kde
-
-DESCRIPTION="A modern multi-purpose calculator for KDE"
-LICENSE="GPL-2"
-HOMEPAGE="http://qalculate.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qalculate/${P}.tar.gz"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~sparc x86"
-
-DEPEND="=sci-libs/libqalculate-0.9.4*
-	kde-base/kdelibs"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_unpack() {
-	kde_src_unpack
-	epatch "${FILESDIR}/${PN}-makefile.patch"
-}
-
-need-kde 3.1
diff --git a/sci-calculators/qalculate-kde/qalculate-kde-0.9.5.ebuild b/sci-calculators/qalculate-kde/qalculate-kde-0.9.5.ebuild
deleted file mode 100644
index d1382677582f..000000000000
--- a/sci-calculators/qalculate-kde/qalculate-kde-0.9.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-kde/qalculate-kde-0.9.5.ebuild,v 1.2 2007/07/15 06:05:01 mr_bones_ Exp $
-
-myconf="--disable-clntest"
-
-inherit kde
-
-DESCRIPTION="A modern multi-purpose calculator for KDE"
-LICENSE="GPL-2"
-HOMEPAGE="http://qalculate.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qalculate/${P}.tar.gz"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~sparc ~x86"
-
-DEPEND="~sci-libs/libqalculate-0.9.5
-	kde-base/kdelibs"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_unpack() {
-	kde_src_unpack
-}
-
-need-kde 3.1
diff --git a/sci-calculators/qalculate-kde/qalculate-kde-0.9.6-r1.ebuild b/sci-calculators/qalculate-kde/qalculate-kde-0.9.6-r1.ebuild
index 02ecf3058e86..255a557103e1 100644
--- a/sci-calculators/qalculate-kde/qalculate-kde-0.9.6-r1.ebuild
+++ b/sci-calculators/qalculate-kde/qalculate-kde-0.9.6-r1.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-kde/qalculate-kde-0.9.6-r1.ebuild,v 1.3 2008/04/27 03:31:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-kde/qalculate-kde-0.9.6-r1.ebuild,v 1.4 2008/06/15 14:31:40 markusle Exp $
 
-myconf="--disable-clntest"
-
-inherit kde autotools
+inherit kde 
 
 DESCRIPTION="A modern multi-purpose calculator for KDE"
 LICENSE="GPL-2"
@@ -25,5 +23,19 @@ src_unpack() {
 	kde_src_unpack
 	epatch "${FILESDIR}"/${P}-remove-link.patch
 	epatch "${FILESDIR}"/${P}-cln-config.patch
-	eautoconf
+}
+
+src_compile() {
+	# remove configure to force rebuild of autotools
+	# by the kde eclass
+	rm -f ./configure || die "Failed to remove configure"
+
+	kde_src_compile myconf configure
+
+	# get rid of the -fno-exceptions flag since it breaks cln
+	sed -e "s:\$CXXFLAGS -fno-exceptions:\$CXXFLAGS:" \
+		-i configure \
+		|| die "Failed to remove -fno-exceptions from configure script"
+
+	kde_src_compile make
 }