6 files changed, 80 insertions, 24 deletions
diff --git a/app-text/catdoc/ChangeLog b/app-text/catdoc/ChangeLog
index 87b2d380edbe..ee5cfb4d2c70 100644
--- a/app-text/catdoc/ChangeLog
+++ b/app-text/catdoc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/catdoc
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v 1.9 2005/07/16 19:17:35 josejx Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v 1.10 2006/02/09 21:51:43 nattfodd Exp $
+
+*catdoc-0.94.1 (09 Feb 2006)
+
+  09 Feb 2006; Alexandre Buisse <nattfodd@gentoo.org> catdoc-0.93.3.ebuild,
+  catdoc-0.93.4.ebuild, +catdoc-0.94.1.ebuild:
+  Bump to 0.94.1 (closing bug #122296). Also removed COPYING and INSTALL from
+  all existing ebuilds and updated homepage.
 
   16 Jul 2005; Joseph Jezak <josejx@gentoo.org> catdoc-0.93.3.ebuild:
   Accidently marked ppc instead of ~ppc.
diff --git a/app-text/catdoc/Manifest b/app-text/catdoc/Manifest
index 23ee35f81eb0..ed17ef02ae56 100644
--- a/app-text/catdoc/Manifest
+++ b/app-text/catdoc/Manifest
@@ -1,16 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f91d35312bd49dd578c204e899520477 ChangeLog 1020
-MD5 29be17ce906a6dcc14914b8fefc51020 catdoc-0.93.4.ebuild 887
-MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 f2623db0236bbcea8510ae51bd45de56 catdoc-0.93.3.ebuild 887
+MD5 c8ec8d24729b1309b55e7b48f2dffa9e ChangeLog 1276
+RMD160 63193d1b3cfe58f5481b1f6f2537ff7f865aadbd ChangeLog 1276
+SHA256 e944c9aa894e962ebf310b5b1d50cbe5b7c72251c570efe59e362312ce703784 ChangeLog 1276
+MD5 0a4227a6dfd5cbf7a90ac3cd1758537c catdoc-0.93.3.ebuild 876
+RMD160 2b1aae4cb00cf10dd3918e5302cf26b548c660ab catdoc-0.93.3.ebuild 876
+SHA256 8dfb0d6419c79ba89a254048dd59532cf70085b3988b039a1d7a31436c892a35 catdoc-0.93.3.ebuild 876
+MD5 c07635015f15e3a77f96189b1ad9c111 catdoc-0.93.4.ebuild 876
+RMD160 0f659fd9df290b26f109e844a4246f76dc8571ee catdoc-0.93.4.ebuild 876
+SHA256 f4d272eba5cdcfe15973921b4ca36f98fab772e1fc6a933c44f0b11e1f70068a catdoc-0.93.4.ebuild 876
+MD5 c07635015f15e3a77f96189b1ad9c111 catdoc-0.94.1.ebuild 876
+RMD160 0f659fd9df290b26f109e844a4246f76dc8571ee catdoc-0.94.1.ebuild 876
+SHA256 f4d272eba5cdcfe15973921b4ca36f98fab772e1fc6a933c44f0b11e1f70068a catdoc-0.94.1.ebuild 876
 MD5 60451dd724fa0edf679f65a182b9e2ac files/digest-catdoc-0.93.3 65
+RMD160 99a27cb386e7f565feca87be876a613110161438 files/digest-catdoc-0.93.3 65
+SHA256 aff28cf2c9f869e9a6996a9c50106d4b713c111bcc1767137bc6ed880e959083 files/digest-catdoc-0.93.3 65
 MD5 5c619ae22412c8c0983c9e9328fd78d9 files/digest-catdoc-0.93.4 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC2V1ccsIHjyDViGQRAmADAJ9NBIPw1XB3bWUipGntJK7kmMW3iwCgwWI2
-TmFHv9mlHx57OaDLoGl/gQc=
-=hdVF
------END PGP SIGNATURE-----
+RMD160 b8aae6f59e877b4d532e5548c9fff962d0137d8c files/digest-catdoc-0.93.4 65
+SHA256 60fde18bc775af21b10caef3bb57f67ae21ee194d3ae4747d8c1da6bf12a7e24 files/digest-catdoc-0.93.4 65
+MD5 94430430dc4fdde97ecf5e984df29895 files/digest-catdoc-0.94.1 241
+RMD160 1d29b17fc6b1cc9507e787fcd6c96ed1721a74c0 files/digest-catdoc-0.94.1 241
+SHA256 6d1d559595fac26298bc8e983ae76f65ea145bc1cb480cbcb30c3599dd169bf8 files/digest-catdoc-0.94.1 241
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
+SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
diff --git a/app-text/catdoc/catdoc-0.93.3.ebuild b/app-text/catdoc/catdoc-0.93.3.ebuild
index ea4466efe07f..a49aa25abb0f 100644
--- a/app-text/catdoc/catdoc-0.93.3.ebuild
+++ b/app-text/catdoc/catdoc-0.93.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.93.3.ebuild,v 1.7 2005/07/16 19:17:35 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.93.3.ebuild,v 1.8 2006/02/09 21:51:43 nattfodd Exp $
 
 DESCRIPTION="A convertor for Microsoft Word, Excel and RTF Files to text"
-HOMEPAGE="http://www.45.free.net/~vitus/ice/catdoc/"
+HOMEPAGE="http://www.45.free.net/~vitus/software/catdoc/"
 SRC_URI="ftp://ftp.45.free.net/pub/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~ppc x86"
 
 DEPEND="tcltk? ( >=dev-lang/tk-8.1 )"
 
-DOCS="CODING.STD COPYING CREDITS INSTALL NEWS README TODO"
+DOCS="CODING.STD CREDITS NEWS README TODO"
 
 src_compile() {
 
diff --git a/app-text/catdoc/catdoc-0.93.4.ebuild b/app-text/catdoc/catdoc-0.93.4.ebuild
index 3cdde0b868a7..9cce5927d86f 100644
--- a/app-text/catdoc/catdoc-0.93.4.ebuild
+++ b/app-text/catdoc/catdoc-0.93.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.93.4.ebuild,v 1.2 2005/05/14 00:57:32 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.93.4.ebuild,v 1.3 2006/02/09 21:51:43 nattfodd Exp $
 
 DESCRIPTION="A convertor for Microsoft Word, Excel and RTF Files to text"
-HOMEPAGE="http://www.45.free.net/~vitus/ice/catdoc/"
+HOMEPAGE="http://www.45.free.net/~vitus/software/catdoc/"
 SRC_URI="ftp://ftp.45.free.net/pub/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
@@ -13,7 +13,7 @@ KEYWORDS="~x86 ~amd64 ~ppc"
 
 DEPEND="tcltk? ( >=dev-lang/tk-8.1 )"
 
-DOCS="CODING.STD COPYING CREDITS INSTALL NEWS README TODO"
+DOCS="CODING.STD CREDITS NEWS README TODO"
 
 src_compile() {
 
diff --git a/app-text/catdoc/catdoc-0.94.1.ebuild b/app-text/catdoc/catdoc-0.94.1.ebuild
new file mode 100644
index 000000000000..e8b18ba85024
--- /dev/null
+++ b/app-text/catdoc/catdoc-0.94.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.1.ebuild,v 1.1 2006/02/09 21:51:43 nattfodd Exp $
+
+DESCRIPTION="A convertor for Microsoft Word, Excel and RTF Files to text"
+HOMEPAGE="http://www.45.free.net/~vitus/software/catdoc/"
+SRC_URI="ftp://ftp.45.free.net/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+IUSE="tcltk"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+
+DEPEND="tcltk? ( >=dev-lang/tk-8.1 )"
+
+DOCS="CODING.STD CREDITS NEWS README TODO"
+
+src_compile() {
+
+	local myconf="--with-install-root=${D}"
+
+	use tcltk \
+		&& myconf="${myconf} --with-wish=/usr/bin/wish" \
+		|| myconf="${myconf} --disable-wordview"
+
+	econf ${myconf} || die
+	emake LIB_DIR=/usr/share/catdoc || die
+
+}
+
+src_install() {
+
+	make mandir=/usr/share/man/man1 install || die
+	dodoc ${DOCS}
+
+}
+
+
diff --git a/app-text/catdoc/files/digest-catdoc-0.94.1 b/app-text/catdoc/files/digest-catdoc-0.94.1
new file mode 100644
index 000000000000..26f768c17328
--- /dev/null
+++ b/app-text/catdoc/files/digest-catdoc-0.94.1
@@ -0,0 +1,3 @@
+MD5 0c845321ff18b4ed26f0dd1a2812937b catdoc-0.94.1.tar.gz 167329
+RMD160 8de5450cfe672068de77d2d3096e3fa60aa73360 catdoc-0.94.1.tar.gz 167329
+SHA256 8a0f74a803368537462c4233dc78153debb93db95e24dae357e6ca211129b58b catdoc-0.94.1.tar.gz 167329