diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-06-26 20:47:09 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-06-26 20:47:09 +0000 |
commit | cc6c1c4e5a1a05501527332b6b8ebb51cf23f961 (patch) | |
tree | 6a63ba83dec81369d1d856ff1af922ce23144f76 /sci-libs/libqalculate | |
parent | Stable on amd64 wrt bug #325427 (diff) | |
download | historical-cc6c1c4e5a1a05501527332b6b8ebb51cf23f961.tar.gz historical-cc6c1c4e5a1a05501527332b6b8ebb51cf23f961.tar.bz2 historical-cc6c1c4e5a1a05501527332b6b8ebb51cf23f961.zip |
old
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sci-libs/libqalculate')
6 files changed, 0 insertions, 281 deletions
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest index 0e4cc3cf3f00..c69fc59aa6cc 100644 --- a/sci-libs/libqalculate/Manifest +++ b/sci-libs/libqalculate/Manifest @@ -1,10 +1,4 @@ -AUX libqalculate-0.9.6-check-fix.patch 687 RMD160 e35afa4e94a22c2741396d0d0128673d7adba90a SHA1 d8ad58203a8760fe46d0a3b54c1ef3f56745a1a8 SHA256 040a67e8f69eac2805f2b14c772d11696530846618a3c1b38b3eabc4f404311a -AUX libqalculate-0.9.6-cl_abort.patch 770 RMD160 5bddb84ba816c28187f57759685cff1e2fae1f6b SHA1 69619a265d0ac75e0f81bcf0b1bd68f240412567 SHA256 e3603747cabc58e3c97dbce7f54061785cfe3eec9ec922ee77a7cedf94b091f6 -AUX libqalculate-0.9.6-cln-config.patch 8897 RMD160 f86f2e4a4e9a53d838c105172c8c6bee8f473009 SHA1 9e8f9aef18e7c6f91a16d3bdd031ebf4d192221a SHA256 a61b9768192c1290df90c94132f04e6e6b2c23626c18a9a5259bd8d95da3c5f9 -AUX libqalculate-0.9.6-gcc4.3.patch 476 RMD160 5fcc750927f99303025dee27d82c78617587a57b SHA1 0bcee9493e17702719db06fbac1f2d45888b54b0 SHA256 b1d30fcb1c2672a66ce2d96ffbd2862996f3c241783281ac344d105ab91f07af -DIST libqalculate-0.9.6.tar.gz 1111134 RMD160 30f819530236da6b6b78088754643408c8aeb70d SHA1 0bcd42e13c23db9489ce594767d5017bdcb338ad SHA256 d9bd34a026e130d987e92994d9fd9437fc3187c022ef0931bea335e8479722fc DIST libqalculate-0.9.7.tar.gz 1256271 RMD160 cc9e198769bea9731f92d2f3836875c83f715674 SHA1 c15f7f3a97995decf62cc964956fc1e374ecd78c SHA256 9a6d97ce3339d104358294242c3ecd5e312446721e93499ff70acc1604607955 -EBUILD libqalculate-0.9.6-r1.ebuild 1439 RMD160 897677fffc407f0d05d242f96e7aa8a2a7dc8ebd SHA1 38f1e23245863704cc2f5268ee60a408d1279b9b SHA256 6d8413207cd6052d7b420874cc63e2eaeab17c4e0dca5ba5c5efa640a021a293 EBUILD libqalculate-0.9.7.ebuild 1227 RMD160 0026c495967293ce2165bedd1a009fa3ccda8224 SHA1 0aef475eb987b312cd2a3ac1e075fc3f7a5039a4 SHA256 c14a318d55e47bfadee224c3884c7f6ca0547e270b2380db7c4cae5fb69ac303 MISC ChangeLog 6227 RMD160 00ab3688ee3ae71f54a597fc21f81bef662e72a7 SHA1 751888d261d9ccf4230f2a634516f2fe29c1d9c7 SHA256 c2940c1376b20bfef66ee1e707b160e66e8fdb0fa11d2fd6b63a95fb60a2557e MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac diff --git a/sci-libs/libqalculate/files/libqalculate-0.9.6-check-fix.patch b/sci-libs/libqalculate/files/libqalculate-0.9.6-check-fix.patch deleted file mode 100644 index b09c1bf08037..000000000000 --- a/sci-libs/libqalculate/files/libqalculate-0.9.6-check-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur libqalculate-0.9.6.old/po/POTFILES.in libqalculate-0.9.6/po/POTFILES.in ---- libqalculate-0.9.6.old/po/POTFILES.in 2005-06-01 14:13:50.000000000 -0400 -+++ libqalculate-0.9.6/po/POTFILES.in 2007-07-08 20:21:17.000000000 -0400 -@@ -1,6 +1,7 @@ - # List of source files containing translatable strings. - [encoding: UTF-8] - src/qalc.cc -+src/defs2doc.cc - libqalculate/BuiltinFunctions.cc - libqalculate/Calculator.cc - libqalculate/DataSet.cc -@@ -12,3 +13,10 @@ - libqalculate/Unit.cc - libqalculate/Variable.cc - libqalculate/util.cc -+data/currencies.xml.in -+data/datasets.xml.in -+data/elements.xml.in -+data/functions.xml.in -+data/planets.xml.in -+data/units.xml.in -+data/variables.xml.in diff --git a/sci-libs/libqalculate/files/libqalculate-0.9.6-cl_abort.patch b/sci-libs/libqalculate/files/libqalculate-0.9.6-cl_abort.patch deleted file mode 100644 index 74a0c9dc0117..000000000000 --- a/sci-libs/libqalculate/files/libqalculate-0.9.6-cl_abort.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur libqalculate-0.9.6/libqalculate/Number.cc libqalculate-0.9.6.new1/libqalculate/Number.cc ---- libqalculate-0.9.6/libqalculate/Number.cc 2007-05-18 04:03:22.000000000 -0400 -+++ libqalculate-0.9.6.new1/libqalculate/Number.cc 2008-02-02 11:06:15.000000000 -0500 -@@ -28,6 +28,7 @@ - - using namespace cln; - -+/* - void cln::cl_abort() { - CALCULATOR->error(true, "CLN Error: see terminal output (probably too large or small floating point number)", NULL); - if(CALCULATOR->busy()) { -@@ -36,7 +37,7 @@ - exit(0); - } - } -- -+*/ - string printCL_I(cl_I integ, int base = 10, bool display_sign = true, BaseDisplay base_display = BASE_DISPLAY_NORMAL, bool lower_case = false) { - if(base == BASE_ROMAN_NUMERALS) { - if(!zerop(integ) && integ < 10000 && integ > -10000) { diff --git a/sci-libs/libqalculate/files/libqalculate-0.9.6-cln-config.patch b/sci-libs/libqalculate/files/libqalculate-0.9.6-cln-config.patch deleted file mode 100644 index d0e4d9bedcdc..000000000000 --- a/sci-libs/libqalculate/files/libqalculate-0.9.6-cln-config.patch +++ /dev/null @@ -1,171 +0,0 @@ -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 -Naur libqalculate-0.9.6/src/Makefile.in libqalculate-0.9.6.new/src/Makefile.in ---- libqalculate-0.9.6/src/Makefile.in 2007-06-17 04:45:49.000000000 -0400 -+++ libqalculate-0.9.6.new/src/Makefile.in 2008-02-02 11:37:48.000000000 -0500 -@@ -117,7 +117,7 @@ - INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ @CLN_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_QALCULATE = @LN_QALCULATE@ - LN_S = @LN_S@ diff --git a/sci-libs/libqalculate/files/libqalculate-0.9.6-gcc4.3.patch b/sci-libs/libqalculate/files/libqalculate-0.9.6-gcc4.3.patch deleted file mode 100644 index 66339480370c..000000000000 --- a/sci-libs/libqalculate/files/libqalculate-0.9.6-gcc4.3.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur libqalculate-0.9.6/libqalculate/Number.cc libqalculate-0.9.6.new/libqalculate/Number.cc ---- libqalculate-0.9.6/libqalculate/Number.cc 2007-05-18 04:03:22.000000000 -0400 -+++ libqalculate-0.9.6.new/libqalculate/Number.cc 2008-04-01 10:46:53.000000000 -0400 -@@ -15,6 +15,7 @@ - #include "Calculator.h" - - #include <sstream> -+#include <climits> - #include "util.h" - - #define REAL_PRECISION_FLOAT_RE(x) cln::cl_float(cln::realpart(x), cln::float_format(PRECISION + 1)) diff --git a/sci-libs/libqalculate/libqalculate-0.9.6-r1.ebuild b/sci-libs/libqalculate/libqalculate-0.9.6-r1.ebuild deleted file mode 100644 index 280c4abbde1e..000000000000 --- a/sci-libs/libqalculate/libqalculate-0.9.6-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/libqalculate/libqalculate-0.9.6-r1.ebuild,v 1.11 2010/01/19 00:53:55 jer Exp $ - -inherit eutils autotools - -DESCRIPTION="A modern multi-purpose calculator library" -HOMEPAGE="http://qalculate.sourceforge.net/" -SRC_URI="mirror://sourceforge/qalculate/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" -IUSE="readline" - -COMMON_DEPEND=">=sci-libs/cln-1.1 - dev-libs/libxml2 - >=dev-libs/glib-2.4 - sys-libs/zlib - readline? ( sys-libs/readline )" -DEPEND="${COMMON_DEPEND} - >=dev-util/pkgconfig-0.12.0 - dev-util/intltool - sys-devel/gettext" -RDEPEND="${COMMON_DEPEND} - >=sci-visualization/gnuplot-3.7 - net-misc/wget" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-check-fix.patch - epatch "${FILESDIR}"/${P}-cl_abort.patch - epatch "${FILESDIR}"/${P}-cln-config.patch - epatch "${FILESDIR}"/${P}-gcc4.3.patch - eautoconf -} - -src_compile() { - # The CLN test is buggy and will often fail though an appropriate version - # of the library is installed. - CONFIG="$(use_with readline) --disable-clntest" - econf ${CONFIG} || die "Configuration failed." - emake || die "Compilation failed." -} - -src_install() { - einstall || die "Installation failed." - DOCS="AUTHORS ChangeLog NEWS README TODO" - dodoc ${DOCS} || die "Documentation installation failed." -} |