summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Armak <danarmak@gentoo.org>2001-12-18 19:52:48 +0000
committerDan Armak <danarmak@gentoo.org>2001-12-18 19:52:48 +0000
commit2360e2df8b5064613e4cf2c468ec0a8477f50f2f (patch)
tree41245aeb9d089eb7a5ecbc44b689159114653326 /app-office/koffice
parentkde_src_configure section myconf now prints out $myconf at its end via debug-... (diff)
downloadhistorical-2360e2df8b5064613e4cf2c468ec0a8477f50f2f.tar.gz
historical-2360e2df8b5064613e4cf2c468ec0a8477f50f2f.tar.bz2
historical-2360e2df8b5064613e4cf2c468ec0a8477f50f2f.zip
added the patch from 1.1. verwilst apparently forgot it. also added --enable-all.
i'm now testing it (i.e. compiling) and if it compiles and runs ok i'll unmask it.
Diffstat (limited to 'app-office/koffice')
-rw-r--r--app-office/koffice/files/koffice-1.1.1-gentoo.diff18
-rw-r--r--app-office/koffice/koffice-1.1.1.ebuild7
2 files changed, 22 insertions, 3 deletions
diff --git a/app-office/koffice/files/koffice-1.1.1-gentoo.diff b/app-office/koffice/files/koffice-1.1.1-gentoo.diff
new file mode 100644
index 000000000000..cbe01508c87a
--- /dev/null
+++ b/app-office/koffice/files/koffice-1.1.1-gentoo.diff
@@ -0,0 +1,18 @@
+--- admin/acinclude.m4.in~ Wed May 16 14:39:19 2001
++++ admin/acinclude.m4.in Tue May 22 04:32:31 2001
+@@ -3566,14 +3566,7 @@
+ dnl Note: this test is very weak
+ kde_python_link_found=no
+ KDE_TRY_LINK_PYTHON(normal)
+- KDE_TRY_LINK_PYTHON(m, -lm)
+- KDE_TRY_LINK_PYTHON(pthread, $LIBPTHREAD)
+- KDE_TRY_LINK_PYTHON(tcl, -ltcl)
+- KDE_TRY_LINK_PYTHON(m_and_thread, [$LIBPTHREAD -lm])
+- KDE_TRY_LINK_PYTHON(m_and_thread_and_util, [$LIBPTHREAD -lm -lutil])
+- KDE_TRY_LINK_PYTHON(m_and_thread_and_db3, [$LIBPTHREAD -lm -ldb-3 -lutil])
+- KDE_TRY_LINK_PYTHON(pthread_and_db3, [$LIBPTHREAD -ldb-3])
+- KDE_TRY_LINK_PYTHON(m_and_thread_and_db, [$LIBPTHREAD -lm -ldb -ltermcap -lutil])
++ KDE_TRY_LINK_PYTHON(gentoo, [$LIBPTHREAD `python-config --libs`])
+ KDE_TRY_LINK_PYTHON(m_and_thread_and_db_special, [$LIBPTHREAD -lm -ldb -lutil], [],
+ [AC_MSG_WARN([it seems, Python depends on another library.
+ Pleae use \"make LIBPYTHON='-lpython$version -lotherlib'\" to fix this
diff --git a/app-office/koffice/koffice-1.1.1.ebuild b/app-office/koffice/koffice-1.1.1.ebuild
index aaf51d262b5d..4c01bb3dcffc 100644
--- a/app-office/koffice/koffice-1.1.1.ebuild
+++ b/app-office/koffice/koffice-1.1.1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2000 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
# Authors Dan Armak <danarmak@gentoo.org>, Bart Verwilst <verwilst@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.1.1.ebuild,v 1.1 2001/12/18 12:42:18 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.1.1.ebuild,v 1.2 2001/12/18 19:52:48 danarmak Exp $
. /usr/portage/eclass/inherit.eclass || die
inherit kde-base || die
@@ -25,11 +25,12 @@ DEPEND="$DEPEND
src_unpack() {
base_src_unpack all patch
- kde-objprelink-patch
+ #kde-objprelink-patch
}
src_compile() {
-
+
+ myconf="$myconf --enable-all"
kde_src_compile myconf configure
cd ${S}
make LIBPYTHON="`python-config --libs`"