From 82dad90e8bc5b3e6a11815538949476489d95c07 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 18 Apr 2010 14:19:31 +0000 Subject: old (Portage version: 2.2_rc67/cvs/Linux x86_64) --- sci-calculators/qalculate-gtk/Manifest | 6 - .../qalculate-gtk/files/gtk-crash-fix.patch | 12 -- .../files/qalculate-gtk-0.9.6-check-fix.patch | 8 -- .../files/qalculate-gtk-0.9.6-cln-config.patch | 159 --------------------- .../files/qalculate-gtk-0.9.6-remove-link.patch | 30 ---- .../qalculate-gtk/qalculate-gtk-0.9.6-r1.ebuild | 43 ------ 6 files changed, 258 deletions(-) delete mode 100644 sci-calculators/qalculate-gtk/files/gtk-crash-fix.patch delete mode 100644 sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.6-check-fix.patch delete mode 100644 sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.6-cln-config.patch delete mode 100644 sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.6-remove-link.patch delete mode 100644 sci-calculators/qalculate-gtk/qalculate-gtk-0.9.6-r1.ebuild (limited to 'sci-calculators') diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest index e83812416469..535ecb08eced 100644 --- a/sci-calculators/qalculate-gtk/Manifest +++ b/sci-calculators/qalculate-gtk/Manifest @@ -1,11 +1,5 @@ -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 AUX qalculate-gtk-0.9.7-entry.patch 394 RMD160 04752e9ec9a22a427555752a6570ecfcf6771e8f SHA1 4d8415e08e9e5e065dd1ce46e6b2bb4d56f2293c SHA256 1c2ce9a221a9cafbde65f9729b28a3b57c40e1933749397a52cbc696c6fa997e -DIST qalculate-gtk-0.9.6.tar.gz 1544175 RMD160 91db6e31407df65f164fcd4adfe97278ff60a303 SHA1 1f69097457f6e28b67d1d767670dc519548876b5 SHA256 2f12ecbda36ca17baf294e572b387d4cc11afe30c6dcc01dd0d37793c148348e DIST qalculate-gtk-0.9.7.tar.gz 1511036 RMD160 bbb89fbfc6199dcf87666596ee0d7df3019635af SHA1 c714c91224045fa49f261686e985df0aefa1d678 SHA256 a4ea8ee2366ac3ad53bb17fd2f76a7bed7211640cf2fdadfcf3b79eb4b37282d -EBUILD qalculate-gtk-0.9.6-r1.ebuild 1110 RMD160 3813d0d3a8d32168f00035002962c80d88c11bb7 SHA1 45027612bcc827f4d48c15b2aa9bf585a2e67dd9 SHA256 8aa6d210d1fec690341246aa3133669c0817d7862bd46b99661da75214748800 EBUILD qalculate-gtk-0.9.7.ebuild 1048 RMD160 142fb23aab761c89c39aa1295af22d4ccc916d59 SHA1 c27c127c43676cf13abd7fc93ac180f0b9d50da9 SHA256 7059ce3ca4e6ab5da584f72b75cb0096c652b3b8c524680df40a2e764d670b88 MISC ChangeLog 4658 RMD160 d170785e006d911d8104919ba7384718b1de9cb8 SHA1 2a59d802c161b773cc3777b9d6a9cf884d6fb186 SHA256 e7fc3ea3f31a13e8d3ed9969f8ac0c89d768576db7ef2a7c7e98cf53af339472 MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac diff --git a/sci-calculators/qalculate-gtk/files/gtk-crash-fix.patch b/sci-calculators/qalculate-gtk/files/gtk-crash-fix.patch deleted file mode 100644 index c8d7b7e7e6e0..000000000000 --- a/sci-calculators/qalculate-gtk/files/gtk-crash-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur qalculate-gtk-0.9.5-old/src/main.cc qalculate-gtk-0.9.5/src/main.cc ---- qalculate-gtk-0.9.5-old/src/main.cc 2006-11-05 04:27:49.000000000 -0500 -+++ qalculate-gtk-0.9.5/src/main.cc 2007-01-04 15:09:03.000000000 -0500 -@@ -96,7 +96,7 @@ - - #else - -- gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR "/pixmaps/qalculate.png", NULL); -+ /*gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR "/pixmaps/qalculate.png", NULL); */ - - gtk_init(&argc, &argv); - diff --git a/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.6-check-fix.patch b/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.6-check-fix.patch deleted file mode 100644 index 0efac1bd964c..000000000000 --- a/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.6-check-fix.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -Naur qalculate-gtk-0.9.6/po/POTFILES.in qalculate-gtk-0.9.6.new/po/POTFILES.in ---- qalculate-gtk-0.9.6/po/POTFILES.in 2006-04-10 09:33:08.000000000 -0400 -+++ qalculate-gtk-0.9.6.new/po/POTFILES.in 2007-07-09 11:03:42.000000000 -0400 -@@ -28,3 +28,4 @@ - src/main.cc - src/interface.cc - src/callbacks.cc -+data/periodictable.glade 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 deleted file mode 100644 index 459445dc692d..000000000000 --- a/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.6-cln-config.patch +++ /dev/null @@ -1,159 +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 --#include --#include -- --/* we do not #include 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 --#include --], [ 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/files/qalculate-gtk-0.9.6-remove-link.patch b/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.6-remove-link.patch deleted file mode 100644 index eee2315a4e96..000000000000 --- a/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.6-remove-link.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur qalculate-gtk-0.9.6/src/Makefile.in qalculate-gtk-0.9.6-new/src/Makefile.in ---- qalculate-gtk-0.9.6/src/Makefile.in 2007-06-17 07:07:35.000000000 -0400 -+++ qalculate-gtk-0.9.6-new/src/Makefile.in 2007-09-24 09:59:18.000000000 -0400 -@@ -497,7 +497,7 @@ - - install-data-am: - --install-exec-am: install-binPROGRAMS install-exec-local -+install-exec-am: install-binPROGRAMS - - install-info: install-info-am - -@@ -530,7 +530,7 @@ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-exec install-exec-am \ -- install-exec-local install-info install-info-am install-man \ -+ install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ -@@ -538,8 +538,6 @@ - uninstall-binPROGRAMS uninstall-info-am - - --install-exec-local: -- cd $(DESTDIR)$(bindir) && rm -f qalculate; $(LN_S) @LN_QALCULATE@ qalculate - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: 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 deleted file mode 100644 index 11db8cd32e2c..000000000000 --- a/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.6-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# 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.4 2008/11/30 21:17:43 bluebird 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 -} -- cgit v1.2.3-65-gdbad