Fix automake and autoconf wantages

6 files changed, 11 insertions, 43 deletions

diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index 4cac364e9eab..a16f94764928 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.39 2004/03/02 08:27:16 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.40 2004/04/16 01:15:25 caleb Exp $
+
+  15 Apr 2004; Caleb Tennis <caleb@gentoo.org> :
+  Fix automake and autoconf wantages
 
   26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> koffice-1.3.ebuild:
   Stable on sparc.
diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest
index 80bfbbe56dc2..c812b51963c0 100644
--- a/app-office/koffice/Manifest
+++ b/app-office/koffice/Manifest
@@ -1,9 +1,7 @@
-MD5 b489e4042d7275a592958232dde25004 koffice-1.2.1.ebuild 771
-MD5 525ca4234ab7b33a17450c21463c11f9 koffice-1.2.1-r1.ebuild 835
-MD5 a0b143726506cb6c6182b81b6f4e080d koffice-1.3.ebuild 975
-MD5 5b9ecf4124909442c8f7a5623e7786f1 ChangeLog 6143
+MD5 120c4bd3607671ff171305b15ce533c5 koffice-1.2.1-r1.ebuild 849
+MD5 71cb7d1837e52c28428d68695e40961b koffice-1.3.ebuild 938
+MD5 750cf2e1676d0f411d28881c507b37b8 ChangeLog 6231
 MD5 3567b0f5f53ad3a98e67fe21ecb23624 metadata.xml 225
 MD5 bd89862f0c15396ad54e30a1c9f2f5d9 files/koffice-1.2.1-kword-crashes.diff 3840
 MD5 65a32b814eb23f48f2392f1ae13ac167 files/digest-koffice-1.3 66
-MD5 75c9f696b717a82bf663b4c545be66d2 files/digest-koffice-1.2.1 67
 MD5 75c9f696b717a82bf663b4c545be66d2 files/digest-koffice-1.2.1-r1 67
diff --git a/app-office/koffice/files/digest-koffice-1.2.1 b/app-office/koffice/files/digest-koffice-1.2.1
deleted file mode 100644
index 107814748a96..000000000000
--- a/app-office/koffice/files/digest-koffice-1.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a73aa72b094ca7b7377f74a508e804e koffice-1.2.1.tar.bz2 9275595
diff --git a/app-office/koffice/koffice-1.2.1-r1.ebuild b/app-office/koffice/koffice-1.2.1-r1.ebuild
index a8044234e3fb..10722654fe01 100644
--- a/app-office/koffice/koffice-1.2.1-r1.ebuild
+++ b/app-office/koffice/koffice-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2.1-r1.ebuild,v 1.7 2004/01/15 03:59:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2.1-r1.ebuild,v 1.8 2004/04/16 01:15:25 caleb Exp $
 inherit kde-base flag-o-matic
 
 filter-flags "-fomit-frame-pointer"
@@ -23,7 +23,6 @@ PATCHES="$FILESDIR/${P}-kword-crashes.diff"
 
 export LIBPYTHON="`python-config --libs`"
 export LIBPYTHON="${LIBPYTHON//-L \/usr\/lib\/python2.2\/config}"
-
-need-automake 1.5
-need-autoconf 2.5
+export WANT_AUTOCONF_2_5=1
+export WANT_AUTOMAKE_1_5=1
 
diff --git a/app-office/koffice/koffice-1.2.1.ebuild b/app-office/koffice/koffice-1.2.1.ebuild
deleted file mode 100644
index 96bc2c4345bd..000000000000
--- a/app-office/koffice/koffice-1.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2.1.ebuild,v 1.4 2004/01/29 14:59:41 caleb Exp $
-
-inherit kde-base flag-o-matic
-
-filter-flags "-fomit-frame-pointer"
-
-need-kde 3
-
-DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-SRC_URI="mirror://kde/stable/$P/src/$P.tar.bz2"
-
-KEYWORDS="x86 ppc"
-
-DEPEND="$DEPEND
-	>=dev-lang/python-2.2.1
-	>=media-libs/libart_lgpl-2.3.9
-	>=media-gfx/imagemagick-5.4.5"
-
-export LIBPYTHON="`python-config --libs`"
-export LIBPYTHON="${LIBPYTHON//-L \/usr\/lib\/python2.2\/config}"
-
-need-automake 1.5
-need-autoconf 2.5
-
diff --git a/app-office/koffice/koffice-1.3.ebuild b/app-office/koffice/koffice-1.3.ebuild
index f26962707738..cacefc51fc64 100644
--- a/app-office/koffice/koffice-1.3.ebuild
+++ b/app-office/koffice/koffice-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.ebuild,v 1.4 2004/02/26 12:24:16 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.ebuild,v 1.5 2004/04/16 01:15:25 caleb Exp $
 inherit kde
 
 # TODO : mysql support
@@ -27,6 +27,3 @@ DEPEND="$DEPEND
 export LIBPYTHON="`python-config --libs`"
 #export LIBPYTHON="${LIBPYTHON//-L \/usr\/lib\/python2.2\/config}"
 
-need-automake 1.5
-need-autoconf 2.5
-