ebuild clean up

14 files changed, 7 insertions, 404 deletions

diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index 9d66b20fd82f..dcdc08c1f874 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.141 2005/12/20 17:25:39 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.142 2005/12/20 19:23:58 carlo Exp $
+
+  20 Dec 2005; Carsten Lohrke <carlo@gentoo.org>
+  -files/koffice_1_3_xpdf_buffer_overflow.diff, -koffice-1.3.5-r2.ebuild,
+  -koffice-1.3.5-r3.ebuild, -koffice-1.4.1.ebuild, -koffice-1.4.1-r1.ebuild,
+  -koffice-1.4.2.ebuild, -koffice-1.4.2-r5.ebuild:
+  clean up
 
 *koffice-1.4.2-r7 (20 Dec 2005)
 *koffice-1.4.2-r6 (20 Dec 2005)
diff --git a/app-office/koffice/files/digest-koffice-1.3.5-r2 b/app-office/koffice/files/digest-koffice-1.3.5-r2
deleted file mode 100644
index 4835c6338154..000000000000
--- a/app-office/koffice/files/digest-koffice-1.3.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dbc7e76c86647709a3e74f57c0fcf7f5 koffice-1.3.5.tar.bz2 10778584
diff --git a/app-office/koffice/files/digest-koffice-1.3.5-r3 b/app-office/koffice/files/digest-koffice-1.3.5-r3
deleted file mode 100644
index 5405ead6b8f9..000000000000
--- a/app-office/koffice/files/digest-koffice-1.3.5-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 dbc7e76c86647709a3e74f57c0fcf7f5 koffice-1.3.5.tar.bz2 10778584
-MD5 71a1baa8244dbcc1bfc2bd3c3e3dd40f post-koffice-1.3.5-rtfimport.diff 8620
diff --git a/app-office/koffice/files/digest-koffice-1.4.1 b/app-office/koffice/files/digest-koffice-1.4.1
deleted file mode 100644
index 47d9bab5c838..000000000000
--- a/app-office/koffice/files/digest-koffice-1.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 91a7b68757addc5934c5a8209a4926d5 koffice-1.4.1.tar.bz2 19364338
diff --git a/app-office/koffice/files/digest-koffice-1.4.1-r1 b/app-office/koffice/files/digest-koffice-1.4.1-r1
deleted file mode 100644
index 6a96a65f5dd7..000000000000
--- a/app-office/koffice/files/digest-koffice-1.4.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 91a7b68757addc5934c5a8209a4926d5 koffice-1.4.1.tar.bz2 19364338
-MD5 9f77b327119fd1db0752dab785e2a975 post-koffice-1.4.1-rtfimport.diff 8614
diff --git a/app-office/koffice/files/digest-koffice-1.4.2 b/app-office/koffice/files/digest-koffice-1.4.2
deleted file mode 100644
index a054824ae545..000000000000
--- a/app-office/koffice/files/digest-koffice-1.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852
diff --git a/app-office/koffice/files/digest-koffice-1.4.2-r5 b/app-office/koffice/files/digest-koffice-1.4.2-r5
deleted file mode 100644
index a054824ae545..000000000000
--- a/app-office/koffice/files/digest-koffice-1.4.2-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852
diff --git a/app-office/koffice/files/koffice_1_3_xpdf_buffer_overflow.diff b/app-office/koffice/files/koffice_1_3_xpdf_buffer_overflow.diff
deleted file mode 100644
index dfcc74d0ac12..000000000000
--- a/app-office/koffice/files/koffice_1_3_xpdf_buffer_overflow.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Gfx.cc,v
-retrieving revision 1.3
-retrieving revision 1.3.2.1
-diff -u -r1.3 -r1.3.2.1
---- filters/kword/pdf/xpdf/xpdf/Gfx.cc	2003/01/25 23:17:44	1.3
-+++ filters/kword/pdf/xpdf/xpdf/Gfx.cc	2004/12/22 12:07:12	1.3.2.1
-@@ -2379,7 +2379,9 @@
-     haveMask = gFalse;
-     dict->lookup("Mask", &maskObj);
-     if (maskObj.isArray()) {
--      for (i = 0; i < maskObj.arrayGetLength(); ++i) {
-+      for (i = 0;
-+	   i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
-+	   ++i) {
- 	maskObj.arrayGet(i, &obj1);
- 	maskColors[i] = obj1.getInt();
- 	obj1.free();
-===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/GfxState.cc,v
-retrieving revision 1.3
-retrieving revision 1.3.2.2
-diff -u -r1.3 -r1.3.2.2
---- filters/kword/pdf/xpdf/xpdf/GfxState.cc	2003/01/25 23:17:44	1.3
-+++ filters/kword/pdf/xpdf/xpdf/GfxState.cc	2004/12/22 13:50:53	1.3.2.2
-@@ -682,6 +682,11 @@
-   }
-   nCompsA = obj2.getInt();
-   obj2.free();
-+  if (nCompsA > gfxColorMaxComps) {
-+    error(-1, "ICCBased color space with too many (%d > %d) components",
-+	  nCompsA, gfxColorMaxComps);
-+    nCompsA = gfxColorMaxComps;
-+  }
-   if (dict->lookup("Alternate", &obj2)->isNull() ||
-       !(altA = GfxColorSpace::parse(&obj2))) {
-     switch (nCompsA) {
-@@ -1023,6 +1028,11 @@
-     goto err2;
-   }
-   nCompsA = obj1.arrayGetLength();
-+  if (nCompsA > gfxColorMaxComps) {
-+    error(-1, "DeviceN color space with too many (%d > %d) components",
-+        nCompsA, gfxColorMaxComps);
-+    nCompsA = gfxColorMaxComps;
-+  }
-   for (i = 0; i < nCompsA; ++i) {
-     if (!obj1.arrayGet(i, &obj2)->isName()) {
-       error(-1, "Bad DeviceN color space (names)");
diff --git a/app-office/koffice/koffice-1.3.5-r2.ebuild b/app-office/koffice/koffice-1.3.5-r2.ebuild
deleted file mode 100644
index cbb857c2fcd9..000000000000
--- a/app-office/koffice/koffice-1.3.5-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.5-r2.ebuild,v 1.7 2005/01/29 14:48:52 motaboy Exp $
-
-inherit kde kde-functions eutils
-
-# TODO : mysql support
-# other refs from configure: jasper, qt-docs, doxygen, libxml2, libxslt, freetype, fontconfig, qt being built with sql support (???)
-
-DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 amd64 ppc sparc alpha ppc64"
-
-IUSE=""
-SLOT="0"
-# add blockers on split packages derived from this one
-for x in $(get-child-packages ${CATEGORY}/${PN}); do
-	DEPEND="${DEPEND} !${x}"
-	RDEPEND="${RDEPEND} !${x}"
-done
-
-DEPEND="${DEPEND}
-	>=dev-lang/python-2.2.1
-	>=media-libs/libart_lgpl-2.3.9
-	>=media-gfx/imagemagick-5.4.5
-	>=app-text/wv2-0.1.8
-	dev-util/pkgconfig"
-need-kde 3.1
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/koffice_1_3_xpdf_buffer_overflow.diff
-	epatch ${FILESDIR}/CAN-2005-0064.patch
-}
-src_compile() {
-	export LIBPYTHON="`python-config --libs`"
-	kde_src_compile
-}
diff --git a/app-office/koffice/koffice-1.3.5-r3.ebuild b/app-office/koffice/koffice-1.3.5-r3.ebuild
deleted file mode 100644
index a7f83251d374..000000000000
--- a/app-office/koffice/koffice-1.3.5-r3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.5-r3.ebuild,v 1.2 2005/10/11 15:11:17 greg_g Exp $
-
-inherit kde kde-functions eutils
-
-# TODO : mysql support
-# other refs from configure: jasper, qt-docs, doxygen, libxml2, libxslt, freetype, fontconfig, qt being built with sql support (???)
-
-DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2
-	mirror://kde/security_patches/post-koffice-1.3.5-rtfimport.diff"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE=""
-SLOT="0"
-# add blockers on split packages derived from this one
-for x in $(get-child-packages ${CATEGORY}/${PN}); do
-	DEPEND="${DEPEND} !${x}"
-	RDEPEND="${RDEPEND} !${x}"
-done
-
-DEPEND="${DEPEND}
-	>=dev-lang/python-2.2.1
-	>=media-libs/libart_lgpl-2.3.9
-	>=media-gfx/imagemagick-5.4.5
-	>=app-text/wv2-0.1.8
-	dev-util/pkgconfig"
-need-kde 3.1
-
-PATCHES="${FILESDIR}/koffice_1_3_xpdf_buffer_overflow.diff
-	${FILESDIR}/CAN-2005-0064.patch
-	${DISTDIR}/post-koffice-1.3.5-rtfimport.diff"
-
-src_compile() {
-	export LIBPYTHON="`python-config --libs`"
-	kde_src_compile
-}
diff --git a/app-office/koffice/koffice-1.4.1-r1.ebuild b/app-office/koffice/koffice-1.4.1-r1.ebuild
deleted file mode 100644
index d9f2440dfd64..000000000000
--- a/app-office/koffice/koffice-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.4.1-r1.ebuild,v 1.8 2005/10/13 19:17:59 ranger Exp $
-
-inherit kde
-
-DESCRIPTION="An integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2
-	mirror://kde/security_patches/post-koffice-1.4.1-rtfimport.diff"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="doc javascript mysql postgres"
-
-RDEPEND=">=media-gfx/imagemagick-5.5.2
-	>=app-text/wv2-0.1.9
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	media-libs/libart_lgpl
-	dev-libs/libxml2
-	dev-libs/libxslt
-	sys-libs/readline
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-libs/libpqxx )
-	dev-lang/python
-	>=media-libs/lcms-1.12
-	javascript? ( kde-base/kjsembed )
-	!dev-db/kexi"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig"
-
-# add blockers on split packages derived from this one
-for x in $(get-child-packages ${CATEGORY}/${PN}); do
-	DEPEND="${DEPEND} !${x}"
-	RDEPEND="${RDEPEND} !${x}"
-done
-
-need-kde 3.3
-
-# TODO: kword sql plugin needs Qt compiled with sql support
-# the dependency on python is needed for scripting support in kexi
-# and for kivio/kiviopart/kiviosdk.
-
-src_unpack() {
-	kde_src_unpack
-
-	# Fix RTF import buffer overflow. Applied in 1.4.2.
-	epatch "${DISTDIR}/post-koffice-1.4.1-rtfimport.diff"
-}
-
-src_compile() {
-	local myconf="$(use_enable mysql) $(use_enable postgres pgsql)"
-
-	kde_src_compile
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde_src_install
-	if use doc; then
-		make DESTDIR="${D}" install-apidox || die
-	fi
-
-	dodoc changes-*
-}
diff --git a/app-office/koffice/koffice-1.4.1.ebuild b/app-office/koffice/koffice-1.4.1.ebuild
deleted file mode 100644
index 2b1eef726989..000000000000
--- a/app-office/koffice/koffice-1.4.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.4.1.ebuild,v 1.5 2005/09/03 15:52:24 hansmi Exp $
-
-inherit kde
-
-DESCRIPTION="An integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
-IUSE="doc javascript mysql postgres"
-
-RDEPEND=">=media-gfx/imagemagick-5.5.2
-	>=app-text/wv2-0.1.9
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	media-libs/libart_lgpl
-	dev-libs/libxml2
-	dev-libs/libxslt
-	sys-libs/readline
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-libs/libpqxx )
-	dev-lang/python
-	>=media-libs/lcms-1.12
-	javascript? ( kde-base/kjsembed )
-	!dev-db/kexi"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig"
-
-# add blockers on split packages derived from this one
-for x in $(get-child-packages ${CATEGORY}/${PN}); do
-	DEPEND="${DEPEND} !${x}"
-	RDEPEND="${RDEPEND} !${x}"
-done
-
-need-kde 3.3
-
-# TODO: kword sql plugin needs Qt compiled with sql support
-# the dependency on python is needed for scripting support in kexi
-# and for kivio/kiviopart/kiviosdk.
-
-src_compile() {
-	local myconf="$(use_enable mysql) $(use_enable postgres pgsql)"
-
-	kde_src_compile
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde_src_install
-	if use doc; then
-		make DESTDIR="${D}" install-apidox || die
-	fi
-
-	dodoc changes-*
-}
diff --git a/app-office/koffice/koffice-1.4.2-r5.ebuild b/app-office/koffice/koffice-1.4.2-r5.ebuild
deleted file mode 100644
index bb8973d7362d..000000000000
--- a/app-office/koffice/koffice-1.4.2-r5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.4.2-r5.ebuild,v 1.1 2005/12/09 20:49:43 carlo Exp $
-
-inherit kde
-
-DESCRIPTION="An integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc javascript mysql postgres"
-
-RDEPEND=">=media-gfx/imagemagick-5.5.2
-	>=app-text/wv2-0.1.9
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	media-libs/libart_lgpl
-	dev-libs/libxml2
-	dev-libs/libxslt
-	sys-libs/readline
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-libs/libpqxx )
-	dev-lang/python
-	>=media-libs/lcms-1.12
-	javascript? ( kde-base/kjsembed )
-	>=app-text/libwpd-0.8.2"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig"
-
-# add blockers on split packages derived from this one
-for x in $(get-child-packages ${CATEGORY}/${PN}); do
-	DEPEND="${DEPEND} !${x}"
-	RDEPEND="${RDEPEND} !${x}"
-done
-
-need-kde 3.3
-
-# TODO: kword sql plugin needs Qt compiled with sql support
-# the dependency on python is needed for scripting support in kexi
-# and for kivio/kiviopart/kiviosdk.
-
-PATCHES="${FILESDIR}/kspread-1.4.2-gcc41.patch
-	${FILESDIR}/kexi-1.4.2-gcc41.patch
-	${FILESDIR}/post-1.3-koffice-CAN-2005-3193.diff"
-
-src_compile() {
-	local myconf="$(use_enable mysql) $(use_enable postgres pgsql)"
-
-	kde_src_compile
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde_src_install
-	if use doc; then
-		make DESTDIR="${D}" install-apidox || die
-	fi
-
-	dodoc changes-*
-}
diff --git a/app-office/koffice/koffice-1.4.2.ebuild b/app-office/koffice/koffice-1.4.2.ebuild
deleted file mode 100644
index 50961d941298..000000000000
--- a/app-office/koffice/koffice-1.4.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.4.2.ebuild,v 1.8 2005/11/30 06:42:17 halcy0n Exp $
-
-inherit kde
-
-DESCRIPTION="An integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 sparc x86"
-IUSE="doc javascript mysql postgres"
-
-RDEPEND=">=media-gfx/imagemagick-5.5.2
-	>=app-text/wv2-0.1.9
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	media-libs/libart_lgpl
-	dev-libs/libxml2
-	dev-libs/libxslt
-	sys-libs/readline
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-libs/libpqxx )
-	dev-lang/python
-	>=media-libs/lcms-1.12
-	javascript? ( kde-base/kjsembed )
-	!dev-db/kexi"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig"
-
-# add blockers on split packages derived from this one
-for x in $(get-child-packages ${CATEGORY}/${PN}); do
-	DEPEND="${DEPEND} !${x}"
-	RDEPEND="${RDEPEND} !${x}"
-done
-
-need-kde 3.3
-
-# TODO: kword sql plugin needs Qt compiled with sql support
-# the dependency on python is needed for scripting support in kexi
-# and for kivio/kiviopart/kiviosdk.
-
-src_compile() {
-	local myconf="$(use_enable mysql) $(use_enable postgres pgsql)"
-
-	kde_src_compile
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde_src_install
-	if use doc; then
-		make DESTDIR="${D}" install-apidox || die
-	fi
-
-	dodoc changes-*
-}