Added patches to allow compilation against cln-1.2 (see bug #208527).

Package-Manager: portage-2.1.4.1

4 files changed, 213 insertions, 3 deletions

diff --git a/sci-calculators/qalculate-kde/ChangeLog b/sci-calculators/qalculate-kde/ChangeLog
index edee5ddab5f3..a55a2fe05564 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-kde/ChangeLog,v 1.20 2007/10/19 20:22:15 nixnut Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-kde/ChangeLog,v 1.21 2008/02/04 12:00:03 markusle Exp $
+
+*qalculate-kde-0.9.6-r1 (02 Feb 2008)
+
+  02 Feb 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/qalculate-kde-0.9.6-cln-config.patch,
+  +qalculate-kde-0.9.6-r1.ebuild:
+  Added patches to allow compilation against cln-1.2 (see bug #208527).
 
   19 Oct 2007; nixnut <nixnut@gentoo.org> qalculate-kde-0.9.6.ebuild:
   Added ~ppc wrt bug 193455
diff --git a/sci-calculators/qalculate-kde/Manifest b/sci-calculators/qalculate-kde/Manifest
index dce6a7ec116b..9f197c86f2fe 100644
--- a/sci-calculators/qalculate-kde/Manifest
+++ b/sci-calculators/qalculate-kde/Manifest
@@ -1,3 +1,4 @@
+AUX qalculate-kde-0.9.6-cln-config.patch 9213 RMD160 3782c029fa05f3e5da4f1cc7f2e45168cc7b4426 SHA1 b37023d034adf1cbded36983efe11ecdcda4b2bb SHA256 e12ae250e6e4e88f812c4f15dde293c566726e07ec235173bfb53e1d732e0ba3
 AUX qalculate-kde-0.9.6-remove-link.patch 1338 RMD160 de20af106712466f95e33e7a0f9aa2a966285b1c SHA1 f37e82b66fc000ec55a546bbcfde5d31f566a02a SHA256 f890a91ff13f5609423abc7252b4be5fe2f2d760d5770d8f7618d0baae7cad7e
 AUX qalculate-kde-makefile.patch 8788 RMD160 c6ea37cb3e21780d1ec0f4fd155f7eec07947c67 SHA1 86c265f73672c1dbb5b6049c35c611f50780b11b SHA256 c83daf0632cb6de3a02b551d61a969d737bdde3b945dacc7c2bca6d8cb22d76e
 DIST qalculate-kde-0.9.4.tar.gz 1575881 RMD160 98e888a602aef74560e1f6fcd324cb50de8e237b SHA1 2646a7d53a741e43422de4f973392f54e995d785 SHA256 5f9b00603e01db4b26d6ed3878a85be2b4449477c10ccfd5e35c0dc84d624618
@@ -5,6 +6,7 @@ DIST qalculate-kde-0.9.5.tar.gz 1562344 RMD160 1808d53d8f49d7f0222ba2db891391e70
 DIST qalculate-kde-0.9.6.tar.gz 1520061 RMD160 49ffbf2eb0634c2b47fcba8b6ccac9ee7ebaab95 SHA1 f9ebf4e3b7a94d867f45061bc528f0b1e31f72d6 SHA256 5235fc4bae44a88dd226ada94c662e7889ae3faa91d722c14b61702fc34d021a
 EBUILD qalculate-kde-0.9.4.ebuild 691 RMD160 8a97c8563cc55de1dab22dfccd151bfc368630f4 SHA1 8a5e75863599f72c86f5b1359791a7f136201f28 SHA256 3c0e0d8973fdbfa4d57917375cca3fce53c014def5d875cb8ed615aafb6a8a1a
 EBUILD qalculate-kde-0.9.5.ebuild 649 RMD160 ee1e4ea96a09c5e1855ab3b10aea1124387ad951 SHA1 a3f9d059374a35b957350dd8060fee82cc6e0ddc SHA256 6ddb385b7ab0688d3b76f487fa481c973114ab157413d491cec2e5f1fb2da1b9
+EBUILD qalculate-kde-0.9.6-r1.ebuild 770 RMD160 b3495bee7b12cea83bebc680b921b4631dea728c SHA1 6893c6620c289569568a3499b8965b101cf37660 SHA256 8de8eff8f6c32de33885eab11a6060511e0a8a8e9864b14c90c220f57a6e17ca
 EBUILD qalculate-kde-0.9.6.ebuild 695 RMD160 af548cb03e525bc047a91262167e7d1dc78c02f3 SHA1 f3a52d80a672de36e653a6532dc89a1a6496e5fc SHA256 47aa22e3da004b3b72590d4495211438172ce8b17c7d81bdb43f782dfb67651b
-MISC ChangeLog 3196 RMD160 9c5ccb8de2f43dba353484033320ee56a8a48e52 SHA1 8375da468c71c7102956024dc872160f4285e356 SHA256 f173de3083b3c9e0c610fa821f7453faaa189ba7bf1af399ed6cfb8789dc5864
+MISC ChangeLog 3444 RMD160 91cf39b95fe1d20c9b84e2456223d9adfcd9bd8a SHA1 65196d384eb4c7cabb43f974ab6f2542bd445322 SHA256 2b0db3385abd43b3ef385db3c1580324147d832a42173bdda8273e3e24f4a35f
 MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac
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
new file mode 100644
index 000000000000..fa57e94445ba
--- /dev/null
+++ b/sci-calculators/qalculate-kde/files/qalculate-kde-0.9.6-cln-config.patch
@@ -0,0 +1,171 @@
+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
+ 
+-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
+ ])
+ 
+ # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
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
new file mode 100644
index 000000000000..844743c7fa9b
--- /dev/null
+++ b/sci-calculators/qalculate-kde/qalculate-kde-0.9.6-r1.ebuild
@@ -0,0 +1,30 @@
+# 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.1 2008/02/04 12:00:03 markusle Exp $
+
+myconf="--disable-clntest"
+
+inherit kde autotools
+
+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 ~ppc ~sparc ~x86"
+
+DEPEND=">=sci-libs/libqalculate-0.9.6-r1
+	kde-base/kdelibs"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_unpack() {
+	kde_src_unpack
+	epatch "${FILESDIR}"/${P}-remove-link.patch
+	epatch "${FILESDIR}"/${P}-cln-config.patch
+	eautoconf
+}
+
+need-kde 3.1