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

Package-Manager: portage-2.1.4.1

4 files changed, 214 insertions, 3 deletions

diff --git a/sci-calculators/qalculate-gtk/ChangeLog b/sci-calculators/qalculate-gtk/ChangeLog
index 2546d7f368cc..bc5ea72ef5db 100644
--- a/sci-calculators/qalculate-gtk/ChangeLog
+++ b/sci-calculators/qalculate-gtk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-calculators/qalculate-gtk
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-gtk/ChangeLog,v 1.24 2007/10/19 20:17:24 nixnut Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-gtk/ChangeLog,v 1.25 2008/02/04 11:52:58 markusle Exp $
+
+*qalculate-gtk-0.9.6-r1 (02 Feb 2008)
+
+  02 Feb 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/qalculate-gtk-0.9.6-cln-config.patch,
+  +qalculate-gtk-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-gtk-0.9.6.ebuild:
   Stable on ppc wrt bug 193455
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index 78788c6e9e3b..0903586cbcab 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -1,11 +1,13 @@
 AUX gtk-crash-fix.patch 471 RMD160 92dc079dbc685fa1d76779bebaca9b0026eba2af SHA1 cc55327ef250252ca21c2a9d0147884fb6828457 SHA256 d9fc8ca71ca8f39f48cb0d450fcee166724106b1642a76ceff923fdf092d8133
 AUX qalculate-gtk-0.9.6-check-fix.patch 332 RMD160 7c2938af6fcd247ef6a5e622fd25ddfa69142dcf SHA1 83211b9cd970529b3977f417de63153c24a4f9a0 SHA256 3e6686af8f6a5533dda866043dd7bd18b6ff39248f3ce77f28aaa8a37265ab16
+AUX qalculate-gtk-0.9.6-cln-config.patch 8447 RMD160 a7e9305427a76da72a1e3219fadc6de55b6f488e SHA1 48bd34a19c6272654616ba4bc086a22b33cefea6 SHA256 ca2e2acc2c554436f9463a149df4f209badd8d93bf32909bd4308c55756ead5c
 AUX qalculate-gtk-0.9.6-remove-link.patch 1234 RMD160 eb01a82c640dbbb0f1093c7c77aa3319f26f6e76 SHA1 0681f6b5a67acf37ca0ee6b8f68cc40d17f051a6 SHA256 82a242fcb634af887d80e0d8c7566346b6d162c8a7f632131bae869060b48497
 DIST qalculate-gtk-0.9.4.tar.gz 1546220 RMD160 3cf72bc37e04548f7174909648dcee43c1c18dff SHA1 1cf5219d7f5c5375468e521a0784eb186ebe1253 SHA256 c0236c96c27726cebd7e29c870a276e733f9aa8b6e9fead15dd465a5ff5979f1
 DIST qalculate-gtk-0.9.5.tar.gz 1549393 RMD160 518e72c8b2dfe60ad68695d7ab453815573269a5 SHA1 9b6802a68f609749185ada9fd011fda565a48546 SHA256 92ccf2a2678a6a38d4db96ceaf293c5f53511f02aac4498b054a4c0be3d24ee2
 DIST qalculate-gtk-0.9.6.tar.gz 1544175 RMD160 91db6e31407df65f164fcd4adfe97278ff60a303 SHA1 1f69097457f6e28b67d1d767670dc519548876b5 SHA256 2f12ecbda36ca17baf294e572b387d4cc11afe30c6dcc01dd0d37793c148348e
 EBUILD qalculate-gtk-0.9.4.ebuild 856 RMD160 479c03c9bc10edf148c317dd6aff924dce1a4c91 SHA1 6ae288a84a5059679778b632544eaed1e7337ff5 SHA256 0c060fadbc967f12a6ed6ccf100895072a98d51fd1aedaaa7701f638aa9b4e72
 EBUILD qalculate-gtk-0.9.5.ebuild 949 RMD160 4e0facc2ab58403288d22bae198e07a82ce06949 SHA1 bcc778bb110358443c8fa8841acbbc676670bc26 SHA256 12595572c4cfcd592290473a296e3e78699c580afbc10b853628793f71bb61db
+EBUILD qalculate-gtk-0.9.6-r1.ebuild 1114 RMD160 85d2887481569335a00bccc24f97e38d02c92fa9 SHA1 15b128ea22b41b83eff729b300f2352b86b24bff SHA256 74fed0f99be098424e62c1a2be2ccf9488e0e3ce3d6e6f6ff47c9c12003b2c3c
 EBUILD qalculate-gtk-0.9.6.ebuild 1038 RMD160 46a20358dd831f309353a0f0431bc75c54918aa1 SHA1 8d98aac6ee38ca927a2b337401ebfa2874be0501 SHA256 4fb3ce6c938726dff75ace401ba0a739b3cc10917c0c079fb8d4a94aa489aa5c
-MISC ChangeLog 3166 RMD160 79ae03db0aacdfa56dd8c4e969db0b0980f566a9 SHA1 cfd49b1398ba370ed9609701401ec841f09af7fd SHA256 ffdb2ae96eff85c6c238f9f75c802db18a857e5dce3948dac49c897f228a62d3
+MISC ChangeLog 3414 RMD160 119f74d6f2f3eb30578dcff5c0baa2e97b154908 SHA1 f8b17cc30455abecb07760bd6b5b824c258b2fb6 SHA256 dbdec3802452d75c254abcb330516a75f900ab5c872d291cbd2198540c9a98f9
 MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac
diff --git a/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.6-cln-config.patch b/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.6-cln-config.patch
new file mode 100644
index 000000000000..459445dc692d
--- /dev/null
+++ b/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.6-cln-config.patch
@@ -0,0 +1,159 @@
+diff -Naur libqalculate-0.9.6/aclocal.m4 libqalculate-0.9.6.new/aclocal.m4
+--- libqalculate-0.9.6/aclocal.m4	2007-06-17 04:45:44.000000000 -0400
++++ libqalculate-0.9.6.new/aclocal.m4	2008-02-02 11:04:21.000000000 -0500
+@@ -7836,146 +7836,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-gtk/qalculate-gtk-0.9.6-r1.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..f4abce09b181
--- /dev/null
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.6-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.6-r1.ebuild,v 1.1 2008/02/04 11:52:58 markusle Exp $
+
+inherit eutils autotools gnome2
+
+DESCRIPTION="A modern multi-purpose calculator for GNOME"
+LICENSE="GPL-2"
+HOMEPAGE="http://qalculate.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qalculate/${P}.tar.gz"
+
+SLOT="0"
+IUSE="gnome nls"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="app-text/scrollkeeper
+	dev-lang/perl
+	dev-perl/XML-Parser
+	>=dev-util/pkgconfig-0.12.0"
+
+RDEPEND=">=sci-libs/libqalculate-0.9.6-r1
+	>=x11-libs/gtk+-2.4
+	>=gnome-base/libglade-2.0
+	gnome? (
+		>=gnome-base/libgnome-2.0
+		gnome-extra/yelp )
+	nls? ( sys-devel/gettext )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/gtk-crash-fix.patch
+	epatch "${FILESDIR}"/${P}-check-fix.patch
+	epatch "${FILESDIR}"/${P}-remove-link.patch
+	epatch "${FILESDIR}"/${P}-cln-config.patch
+	eautoconf
+}
+
+src_compile() {
+	gnome2_src_compile --disable-clntest
+}