new aspell unmasked as well as apps which can make use of it

50 files changed, 395 insertions, 526 deletions

diff --git a/app-i18n/aspell-de/ChangeLog b/app-i18n/aspell-de/ChangeLog
index fbc2bc9f84f5..778698ab3fe1 100644
--- a/app-i18n/aspell-de/ChangeLog
+++ b/app-i18n/aspell-de/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/aspell-de
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-de/ChangeLog,v 1.4 2002/08/23 13:45:35 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-de/ChangeLog,v 1.5 2002/09/03 10:48:03 seemant Exp $
+
+*aspell-de-0.50.2 (03 Sep 2002)
+
+  03 Sep 2002; Seemant Kulleen <seemant@gentoo.org> aspell-de-0.50.2.ebuild
+  files/digest-aspell-de-0.50.2 :
+
+  Version bump to bugfix release.
 
 *aspell-de-0.50.1 (23 Aug 2002)
 
diff --git a/app-i18n/aspell-de/aspell-de-0.50.2.ebuild b/app-i18n/aspell-de/aspell-de-0.50.2.ebuild
new file mode 100644
index 000000000000..ad88c0337ab1
--- /dev/null
+++ b/app-i18n/aspell-de/aspell-de-0.50.2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-de/aspell-de-0.50.2.ebuild,v 1.1 2002/09/03 10:48:03 seemant Exp $
+
+ASPELL_LANG="German and Swiss-German"
+
+inherit aspell-dict
+
+LICENSE="GPL-2"
diff --git a/app-i18n/aspell-de/aspell-de-20011124.ebuild b/app-i18n/aspell-de/aspell-de-20011124.ebuild
deleted file mode 100644
index b429edd0a740..000000000000
--- a/app-i18n/aspell-de/aspell-de-20011124.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-de/aspell-de-20011124.ebuild,v 1.1 2002/07/11 13:21:52 seemant Exp $
-
-MY_P=igerman98-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A german dictionary for ispell"
-SRC_URI="http://www.suse.de/~bjacke/igerman98/dict/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.suse.de/~bjacke/igerman98/"
-
-DEPEND="app-text/aspell app-text/ispell"
-RDEPEND="app-text/aspell"
-
-SLOT="0"
-LICENSE="GPL"
-KEYWORDS="x86"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s:^ASPELL.*:ASPELL = aspell --data-dir=./aspell:" \
-		Makefile.orig > Makefile
-	ln -s /usr/share/aspell/iso8859-1.dat aspell
-}
-
-src_compile() {
-
-	make aspell || die
-
-}
-
-src_install () {
-
-	dodir /usr/share/pspell
-	echo "/usr/lib/aspell/german" > ${D}/usr/share/pspell/de-aspell.pwli
-
-	insinto /usr/share/aspell
-	doins aspell/german*.dat
-	insinto /usr/lib/aspell
-	doins german
- 
-	dodoc Documentation/*
-
-}
-
diff --git a/app-i18n/aspell-de/files/digest-aspell-de-0.50.2 b/app-i18n/aspell-de/files/digest-aspell-de-0.50.2
new file mode 100644
index 000000000000..401449d8a1b8
--- /dev/null
+++ b/app-i18n/aspell-de/files/digest-aspell-de-0.50.2
@@ -0,0 +1 @@
+MD5 204a9737ff0110fb8c7d284bd7200f7d aspell-de-0.50-2.tar.bz2 304820
diff --git a/app-i18n/aspell-de/files/digest-aspell-de-20011124 b/app-i18n/aspell-de/files/digest-aspell-de-20011124
deleted file mode 100644
index 65d7d849551a..000000000000
--- a/app-i18n/aspell-de/files/digest-aspell-de-20011124
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c1eb62963d28ca423e2666e838de0b96 igerman98-20011124.tar.bz2 294508
diff --git a/app-i18n/aspell-en/ChangeLog b/app-i18n/aspell-en/ChangeLog
index 2d54429db9e0..887ad8940aa8 100644
--- a/app-i18n/aspell-en/ChangeLog
+++ b/app-i18n/aspell-en/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/aspell-en
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-en/ChangeLog,v 1.5 2002/08/23 13:41:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-en/ChangeLog,v 1.6 2002/09/03 10:48:03 seemant Exp $
+
+*aspell-en-0.50.2 (03 Sep 2002)
+
+  03 Sep 2002; Seemant Kulleen <seemant@gentoo.org> aspell-en-0.50.2.ebuild
+  files/digest-aspell-en-0.50.2 :
+
+  Version bump to bugfix release.
 
 *aspell-en-0.50.1 (23 Aug 2002)
 
diff --git a/app-i18n/aspell-en/aspell-en-0.1.0.11.ebuild b/app-i18n/aspell-en/aspell-en-0.50.2.ebuild
index 198ab46cbf2c..06a342d37822 100644
--- a/app-i18n/aspell-en/aspell-en-0.1.0.11.ebuild
+++ b/app-i18n/aspell-en/aspell-en-0.50.2.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-en/aspell-en-0.1.0.11.ebuild,v 1.1 2002/08/16 01:22:59 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-en/aspell-en-0.50.2.ebuild,v 1.1 2002/09/03 10:48:03 seemant Exp $
 
-ASPELL_LANG="English (US, British, Canadian) Language"
+ASPELL_LANG="English (US, British, Canadian)"
+
+LICENSE="as-is public-domain"
 
 inherit aspell-dict
diff --git a/app-i18n/aspell-en/files/digest-aspell-en-0.1.0.11 b/app-i18n/aspell-en/files/digest-aspell-en-0.1.0.11
deleted file mode 100644
index 2016d8765ba0..000000000000
--- a/app-i18n/aspell-en/files/digest-aspell-en-0.1.0.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fa670b19f197911ddc30d942ffbd91bd aspell-en-0.1-0.11.tar.bz2 167920
diff --git a/app-i18n/aspell-en/files/digest-aspell-en-0.50.2 b/app-i18n/aspell-en/files/digest-aspell-en-0.50.2
new file mode 100644
index 000000000000..a9cee252b723
--- /dev/null
+++ b/app-i18n/aspell-en/files/digest-aspell-en-0.50.2
@@ -0,0 +1 @@
+MD5 9cee7464f9e6e2eae42443048cd3c855 aspell-en-0.50-2.tar.bz2 168348
diff --git a/app-i18n/aspell-es/ChangeLog b/app-i18n/aspell-es/ChangeLog
index e86e3c89a4e3..15f936539cb4 100644
--- a/app-i18n/aspell-es/ChangeLog
+++ b/app-i18n/aspell-es/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/aspell-es
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-es/ChangeLog,v 1.3 2002/08/15 08:42:17 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-es/ChangeLog,v 1.4 2002/09/03 10:48:03 seemant Exp $
+
+*aspell-0.50.2 (03 Sep 2002)
+
+  03 Sep 2002; Seemant Kulleen <seemant@gentoo.org> aspell-0.50.2.ebuild
+  files/digest-aspell-0.50.2 :
+
+  Bad me forgot the ChangeLog entry for 0.50.1.  This is the bugfix update
+  to that.
 
 *aspell-0.0.0.10 (15 Aug 2002)
 
diff --git a/app-i18n/aspell-es/aspell-es-0.0.3.ebuild b/app-i18n/aspell-es/aspell-es-0.0.3.ebuild
deleted file mode 100644
index a22458c1ad0e..000000000000
--- a/app-i18n/aspell-es/aspell-es-0.0.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-es/aspell-es-0.0.3.ebuild,v 1.3 2002/08/14 14:30:49 seemant Exp $
-
-MY_P="aspell-es-0.0-3"
-DESCRIPTION="The Spanish aspell dict"
-HOMEPAGE="http://aspell.sourceforge.net"
-
-SLOT="0"
-KEYWORDS="x86"
-LICENSE="GPL-2"
-
-DEPEND="app-text/aspell"
-
-SRC_URI="http://aspell.sourceforge.net/${MY_P}.tar.bz2"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	./configure 
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-}
diff --git a/app-i18n/aspell-es/aspell-es-0.0.0.10.ebuild b/app-i18n/aspell-es/aspell-es-0.50.2.ebuild
index 3b49f9bc7dd7..5429a3b20008 100644
--- a/app-i18n/aspell-es/aspell-es-0.0.0.10.ebuild
+++ b/app-i18n/aspell-es/aspell-es-0.50.2.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-es/aspell-es-0.0.0.10.ebuild,v 1.1 2002/08/15 08:42:17 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-es/aspell-es-0.50.2.ebuild,v 1.1 2002/09/03 10:48:03 seemant Exp $
 
-ASPELL_LANG="Spanish Language"
+ASPELL_LANG="Spanish"
+
+LICENSE="GPL-2"
 
 inherit aspell-dict
diff --git a/app-i18n/aspell-es/files/digest-aspell-es-0.0.0.10 b/app-i18n/aspell-es/files/digest-aspell-es-0.0.0.10
deleted file mode 100644
index 6811948ed435..000000000000
--- a/app-i18n/aspell-es/files/digest-aspell-es-0.0.0.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 46c2fa4b364a211c6d613d3aed88a1da aspell-es-0.0-0.10.tar.bz2 157869
diff --git a/app-i18n/aspell-es/files/digest-aspell-es-0.0.3 b/app-i18n/aspell-es/files/digest-aspell-es-0.0.3
deleted file mode 100644
index 4761c0f29f43..000000000000
--- a/app-i18n/aspell-es/files/digest-aspell-es-0.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2689f43543ad9dcd898241388164f300 aspell-es-0.0-3.tar.bz2 158100
diff --git a/app-i18n/aspell-es/files/digest-aspell-es-0.50.2 b/app-i18n/aspell-es/files/digest-aspell-es-0.50.2
new file mode 100644
index 000000000000..82d1014147f7
--- /dev/null
+++ b/app-i18n/aspell-es/files/digest-aspell-es-0.50.2
@@ -0,0 +1 @@
+MD5 4a8583e9ef9f4aed03f5a7fe09d40060 aspell-es-0.50-2.tar.bz2 157809
diff --git a/app-i18n/aspell-fr/ChangeLog b/app-i18n/aspell-fr/ChangeLog
index 9e75aac82399..f37d48d4f2b0 100644
--- a/app-i18n/aspell-fr/ChangeLog
+++ b/app-i18n/aspell-fr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/aspell-fr
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-fr/ChangeLog,v 1.2 2002/08/23 14:00:51 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-fr/ChangeLog,v 1.3 2002/09/03 10:48:03 seemant Exp $
+
+*aspell-fr-0.50.2 (03 Sep 2002)
+
+  03 Sep 2002; Seemant Kulleen <seemant@gentoo.org> aspell-fr-0.50.2.ebuild
+  files/digest-aspell-0.50.2 :
+
+  Version bump to bugfix release.
 
 *aspell-fr-0.50.1 (23 Aug 2002)
 
diff --git a/app-i18n/aspell-fr/aspell-fr-0.1.3.ebuild b/app-i18n/aspell-fr/aspell-fr-0.1.3.ebuild
deleted file mode 100644
index 6b1a88b8dd04..000000000000
--- a/app-i18n/aspell-fr/aspell-fr-0.1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-fr/aspell-fr-0.1.3.ebuild,v 1.1 2002/07/13 02:17:35 seemant Exp $
-
-MY_P=${P/.3/-3}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Aspell French Word List Package"
-HOMEPAGE="http://aspell.sourceforge.net"
-SRC_URI="http://aspell.sourceforge.net/${MY_P}.tar.bz2"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="app-text/aspell"
-
-src_compile() {
-	./configure 
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc README COPYING Copyright
-}
diff --git a/app-i18n/aspell-fr/aspell-fr-0.50.2.ebuild b/app-i18n/aspell-fr/aspell-fr-0.50.2.ebuild
new file mode 100644
index 000000000000..7d21fb304226
--- /dev/null
+++ b/app-i18n/aspell-fr/aspell-fr-0.50.2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-fr/aspell-fr-0.50.2.ebuild,v 1.1 2002/09/03 10:48:03 seemant Exp $
+
+ASPELL_LANG="French"
+
+LICENSE="GPL-2"
+
+inherit aspell-dict
diff --git a/app-i18n/aspell-fr/files/digest-aspell-fr-0.1.3 b/app-i18n/aspell-fr/files/digest-aspell-fr-0.1.3
deleted file mode 100644
index 6ec63dc2bf94..000000000000
--- a/app-i18n/aspell-fr/files/digest-aspell-fr-0.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 856d4c4502abfb434c96a2193b42fb80 aspell-fr-0.1-3.tar.bz2 283302
diff --git a/app-i18n/aspell-fr/files/digest-aspell-fr-0.50.2 b/app-i18n/aspell-fr/files/digest-aspell-fr-0.50.2
new file mode 100644
index 000000000000..bfacd4c8bbab
--- /dev/null
+++ b/app-i18n/aspell-fr/files/digest-aspell-fr-0.50.2
@@ -0,0 +1 @@
+MD5 10da01938ec743b16e1dbf0d9abaffbf aspell-fr-0.50-2.tar.bz2 283146
diff --git a/app-i18n/aspell-nl/ChangeLog b/app-i18n/aspell-nl/ChangeLog
index 572f2596bc2b..ed4802be554c 100644
--- a/app-i18n/aspell-nl/ChangeLog
+++ b/app-i18n/aspell-nl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/aspell-nl
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-nl/ChangeLog,v 1.4 2002/08/23 14:00:51 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-nl/ChangeLog,v 1.5 2002/09/03 10:48:03 seemant Exp $
+
+*aspell-nl-0.50.2 (03 Sep 2002)
+
+  03 Sep 2002; Seemant Kulleen <seemant@gentoo.org> aspell-nl-0.50.2.ebuild
+  files/digest-aspell-0.50.2 :
+
+  Version bump to bugfix release.
 
 *aspell-nl-0.50.1 (23 Aug 2002)
 
diff --git a/app-i18n/aspell-nl/aspell-nl-0.0.3.ebuild b/app-i18n/aspell-nl/aspell-nl-0.0.3.ebuild
deleted file mode 100644
index c386122f36b3..000000000000
--- a/app-i18n/aspell-nl/aspell-nl-0.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-nl/aspell-nl-0.0.3.ebuild,v 1.1 2002/07/12 16:43:51 seemant Exp $
-
-MY_P=${PN}-${PV/.3/-3}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Dutch dictionary for aspell"
-HOMEPAGE="http://tinf2.vub.ac.be/~dvermeir/software/dv/nl-aspell/index.html"
-SRC_URI="http://aspell.sourceforge.net/${MY_P}.tar.bz2"
-
-DEPEND="app-text/aspell"
-RDEPEND="app-text/aspell"
-
-LICENSE="aspell-nl"
-SLOT="0"
-KEYWORDS="x86"
-
-src_compile() {
-	./configure || die
-	emake || die
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		install || die
-
-	dodoc Copyright README doc/nl-spelling.txt
-	dohtml doc/index.html
-}
diff --git a/app-i18n/aspell-nl/aspell-nl-0.50.2.ebuild b/app-i18n/aspell-nl/aspell-nl-0.50.2.ebuild
new file mode 100644
index 000000000000..ce4c1100cfb9
--- /dev/null
+++ b/app-i18n/aspell-nl/aspell-nl-0.50.2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/aspell-nl/aspell-nl-0.50.2.ebuild,v 1.1 2002/09/03 10:48:03 seemant Exp $
+
+ASPELL_LANG="Dutch"
+
+LICENSE="freedist"
+
+inherit aspell-dict
diff --git a/app-i18n/aspell-nl/files/digest-aspell-nl-0.0.3 b/app-i18n/aspell-nl/files/digest-aspell-nl-0.0.3
deleted file mode 100644
index df149938d4ce..000000000000
--- a/app-i18n/aspell-nl/files/digest-aspell-nl-0.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 67f56fc57c6ea3794a66e4df3650d6f3 aspell-nl-0.0-3.tar.bz2 428532
diff --git a/app-i18n/aspell-nl/files/digest-aspell-nl-0.50.2 b/app-i18n/aspell-nl/files/digest-aspell-nl-0.50.2
new file mode 100644
index 000000000000..921b3388a283
--- /dev/null
+++ b/app-i18n/aspell-nl/files/digest-aspell-nl-0.50.2
@@ -0,0 +1 @@
+MD5 c3ef9fd7dc4c47d816eee9ef5149c76a aspell-nl-0.50-2.tar.bz2 428365
diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index b01174a153a5..49ccca5fcce3 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,15 +1,14 @@
 # ChangeLog for app-office/abiword
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.14 2002/08/23 15:45:02 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.15 2002/09/03 10:48:03 seemant Exp $
 
-*abiword-1.0.2-r1 (23 Aug 2002)
+*abiword-1.0.2-r1 (02 Sep 2002)
 
-  23 Aug 2002; Seemant Kulleen <seemant@gentoo.org> abiword-1.0.2-r1.ebuild
+  02 Sep 2002; Seemant Kulleen <seemant@gentoo.org> abiword-1.0.2-r1.ebuild
   files/digest-abiword-1.0.2-r1 :
 
-  Compile against the new modified pspell-ispell stuff.  Basically, that
-  stuff is still pspell-ispell, but compiled against the new aspell (which
-  contains pspell).
+  Compile against the new aspell.  Thanks to dom the abiword project lead
+  (dom on #abiword at irc.gnome.org).
 
 *abiword-1.0.2 (??)
 
diff --git a/app-office/abiword/abiword-1.0.2-r1.ebuild b/app-office/abiword/abiword-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..117cfcd9c8dd
--- /dev/null
+++ b/app-office/abiword/abiword-1.0.2-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.0.2-r1.ebuild,v 1.3 2002/09/03 10:48:03 seemant Exp $
+
+S=${WORKDIR}/${P}/abi
+DESCRIPTION="Text processor"
+SRC_URI="http://download.sourceforge.net/abiword/abiword-${PV}.tar.gz"
+HOMEPAGE="http://www.abisource.com"
+KEYWORDS="x86 ppc"
+LICENSE="GPL-2"
+SLOT="0"
+DEPEND="virtual/x11
+	media-libs/libpng
+	>=dev-libs/libunicode-0.4-r1
+	=x11-libs/gtk+-1.2*
+	jpeg?  ( >=media-libs/jpeg-6b-r2 )
+	perl?  ( >=sys-devel/perl-5.6 )
+	xml2?  ( >=dev-libs/libxml2-2.4.10 )
+	spell? ( >=app-text/aspell-0.50 )
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
+	         >=gnome-extra/gal-0.13-r1 
+	         >=gnome-base/bonobo-1.0.9-r1 )"
+
+
+fix_perl_env() {
+	# new configure scripts is a bit broken
+	export PERL_ARCHLIB="`(perl -V:installarchlib | sed -e "s/\(.*=\|'\|;\)//g\")`"
+	export PERL_LIB="`(perl -V:installprivlib | sed -e "s/\(.*=\|'\|;\)//g\")`"
+	export POD2MAN_EXE="`which pod2man`"
+	export SITE_LIB="`(perl -V:sitelib | sed -e "s/\(.*=\|'\|;\)//g\")`"
+	export SITE_ARCHLIB="`(perl -V:sitearch | sed -e "s/\(.*=\|'\|;\)//g\")`"
+}
+
+src_unpack() {
+
+	unpack ${A}
+
+	use perl && ( \
+		fix_perl_env
+
+		# Fix perl stuff install outside sandbox, as well as a bug in 
+		# Abiword's build system (Abiword.3pm did not install, and
+		# the '.packlist' was not generated properly) -- Azarah (25/02/2002).
+		cd ${S}/src/bindings/perl
+		cp GNUmakefile.am GNUmakefile.am.orig
+		sed -e "s:PERL_ARCHLIB = @PERL_ARCHLIB@:PERL_ARCHLIB = ${PERL_ARCHLIB}:" \
+			-e "s:PERL_LIB = @PERL_LIB@:PERL_LIB = ${PERL_LIB}:" \
+			-e "s:POD2MAN_EXE = @POD2MAN_EXE@:POD2MAN_EXE = ${POD2MAN_EXE}:" \
+			-e "s:SITE_LIB = @SITE_LIB@:SITE_LIB = ${SITE_LIB}:" \
+			-e "s:SITE_ARCHLIB = @SITE_ARCHLIB@:SITE_ARCHLIB = ${SITE_ARCHLIB}:" \
+			-e 's:write $(SITE_ARCHLIB)/auto:write $(PERLDEST)/$(SITE_ARCHLIB)/auto:g' \
+			-e 's:blib/lib $(SITE_LIB):blib/lib $(PERLDEST)/$(SITE_LIB):g' \
+			-e 's:blib/arch $(SITE_ARCHLIB):blib/arch $(PERLDEST)/$(SITE_ARCHLIB):g' \
+			-e 's:blib/bin /usr/bin:blib/bin $(PERLDEST)/usr/bin:g' \
+			-e 's:blib/script /usr/bin:blib/script $(PERLDEST)/usr/bin:g' \
+			-e 's:blib/man1 /usr/share/man/man1:blib/man1 $(PERLDEST)/usr/share/man/man1:g' \
+			-e 's:blib/man3 /usr/share/man/man3:blib/man3 $(PERLDEST)/usr/share/man/man3:g' \
+			-e 's:mkpath $(PERL_ARCHLIB):mkpath $(PERLDEST)/$(PERL_ARCHLIB):g' \
+			-e 's:$(PERL_ARCHLIB)/perllocal.pod:$(PERLDEST)/$(PERL_ARCHLIB)/perllocal.pod.new:' \
+			GNUmakefile.am.orig >GNUmakefile.am || die
+		mkdir -p blib/{arch,bin,lib,man1,man3,script}
+		cd ${S}
+	)
+
+	# Fix configure.ac file to make it use the new aspell-0.50 instead of
+	# pspell-ispell as before.  MUCH thanks to dom, the abiword project
+	# lead.
+
+	cd ${S}
+	cp configure.ac configure.ac.orig
+	sed "s:-lpspell -lpspell-modules:-laspell:" \
+		configure.ac.orig > configure.ac
+
+	# clear invalid symlinks
+	rm -f ac-helpers/{install-sh,mkinstalldirs,missing}
+}
+
+src_compile() {
+
+	local myconf
+
+	use gnome \
+		&& myconf="${myconf} --with-gnome --enable-gnome" \
+		&& export ABI_OPT_BONOBO=1
+
+	use perl \
+		&& myconf="${myconf} --enable-scripting"
+	
+	use spell \
+		&& myconf="${myconf} --with-pspell"
+
+	use xml2 \
+		&& myconf="${myconf} --with-libxml2"
+
+	use jpeg \
+		&& myconf="${myconf} --with-libjpeg"
+	
+	use nls \
+		&& myconf="${myconf} --enable-bidi"
+
+	./autogen.sh
+	
+	echo
+	echo "*************************************************"
+	echo "* Ignore above ERROR as it does not cause build *"
+	echo "* to fail.                                      *"
+	echo "*************************************************"
+	echo
+
+	CFLAGS="${CFLAGS} `gdk-pixbuf-config --cflags`"
+	
+	econf \
+		--enable-extra-optimization \
+		${myconf} || die
+
+	# Doesn't work with -j 4 (hallski)
+	make UNIX_CAN_BUILD_STATIC=0 \
+		OPTIMIZER="${CFLAGS}" || die
+}
+
+src_install() {
+
+	dodir /usr/{bin,lib}
+
+	einstall PERLDEST=${D} || die
+	
+	dosed "s:${D}::g" /usr/bin/AbiWord
+	
+	rm -f ${D}/usr/bin/abiword
+	dosym /usr/bin/AbiWord /usr/bin/abiword
+
+	dodoc BUILD COPYING *.txt, *.TXT
+
+	# Install icon and .desktop for menu entry
+	use gnome && ( \
+		insinto /usr/share/pixmaps
+		newins ${WORKDIR}/${P}/abidistfiles/icons/abiword_48.png AbiWord.png
+		insinto /usr/share/gnome/apps/Applications
+		doins ${FILESDIR}/AbiWord.desktop
+	)
+}
+
+pkg_postinst() {
+
+	# Appending installation info
+	local perlver="`perl -v | grep -e "This is perl" | cut -d ' ' -f 4`"
+	perlver=${perlver/v/}
+	local perlarch="`perl -V | grep -e " archname" | cut -d '=' -f 4`"
+	if [ -f /usr/lib/perl5/${perlver}/${perlarch}/perllocal.pod.new ] ; then
+		sed -e "s:5.6.0:${perlver}:g" \
+			/usr/lib/perl5/${perlver}/${perlarch}/perllocal.pod.new \
+			>> /usr/lib/perl5/${perlver}/${perlarch}/perllocal.pod
+		rm -rf /usr/lib/perl5/${perlver}/${perlarch}/perllocal.pod.new
+	fi
+}
+
diff --git a/app-office/abiword/files/digest-abiword-1.0.2-r1 b/app-office/abiword/files/digest-abiword-1.0.2-r1
new file mode 100644
index 000000000000..7d7fee995eeb
--- /dev/null
+++ b/app-office/abiword/files/digest-abiword-1.0.2-r1
@@ -0,0 +1 @@
+MD5 35c5ac5c08798238a9d63ee17d5de793 abiword-1.0.2.tar.gz 15642705
diff --git a/app-text/aspell/ChangeLog b/app-text/aspell/ChangeLog
index c434ecbfc822..ab1792017a7a 100644
--- a/app-text/aspell/ChangeLog
+++ b/app-text/aspell/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/aspell
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.11 2002/08/23 12:51:05 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.12 2002/09/03 10:48:03 seemant Exp $
+
+*aspell-0.50.1 (03 Sep 2002)
+
+  03 Sep 2002; Seemant Kulleen <seemant@gentoo.org> aspell-0.50.1.ebuild
+  files/digest-aspell-0.50.1 :
+
+  Version bump to newest bugfix release which, among other things, allows
+  for user's custom optimisation flags again.
 
 *aspell-0.50 (23 Aug 2002)
 
diff --git a/app-text/aspell/aspell-0.33.7.1-r1.ebuild b/app-text/aspell/aspell-0.33.7.1-r1.ebuild
deleted file mode 100644
index c7cb94bae050..000000000000
--- a/app-text/aspell/aspell-0.33.7.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.33.7.1-r1.ebuild,v 1.11 2002/08/16 02:42:01 murphy Exp $
-
-inherit libtool
-
-MY_P=${PN}-.33.7.1
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A spell checker replacement for ispell"
-SRC_URI="http://download.sourceforge.net/aspell/${MY_P}.tar.gz mirror://sourceforge/aspell/aspell-.33-fix2.diff"
-HOMEPAGE="http://aspell.sourceforge.net"
-
-DEPEND=">=app-text/pspell-0.12
-	>=sys-libs/ncurses-5.2"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
-
-#
-# These flags a reset here because too much optimisation can cause aspell's
-# compilation process to break.  Moreover, these must be set before ./configure
-# otherwise it breaks again.  A very fragile build process, really.
-#
-CXXFLAGS="-O3"
-CFLAGS=${CXXFLAGS}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	cd ${S}
-	patch -p0 < ${DISTDIR}/aspell-.33-fix2.diff
-}
-
-src_compile() {
-	# 
-	# These two lines are here again to prevent breaking the compilation
-	#
-	elibtoolize
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc/aspell \
-		--host=${CHOST} \
-		--enable-doc-dir=/usr/share/doc/${P} || die
-	
-	emake || die
-
-}
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-	cd ${D}/usr/share/doc/${P}
-	dohtml -r man-html
-	docinto text
-	dodoc man-text
-	cd ${S}
-	
-	dodoc README* TODO
-
-}
-
diff --git a/app-text/aspell/aspell-0.33.7.1-r2.ebuild b/app-text/aspell/aspell-0.33.7.1-r2.ebuild
deleted file mode 100644
index 4d38bd3b1403..000000000000
--- a/app-text/aspell/aspell-0.33.7.1-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.33.7.1-r2.ebuild,v 1.4 2002/08/16 02:42:01 murphy Exp $
-
-inherit libtool
-
-MY_P=${PN}-.33.7.1
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A spell checker replacement for ispell"
-SRC_URI="http://download.sourceforge.net/aspell/${MY_P}.tar.gz mirror://sourceforge/aspell/aspell-.33-fix2.diff"
-HOMEPAGE="http://aspell.sourceforge.net"
-
-DEPEND=">=app-text/pspell-0.12
-	>=sys-libs/ncurses-5.2"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
-
-#
-# These flags a reset here because too much optimisation can cause aspell's
-# compilation process to break.  Moreover, these must be set before ./configure
-# otherwise it breaks again.  A very fragile build process, really.
-#
-CXXFLAGS="-O3"
-CFLAGS=${CXXFLAGS}
-
-# needed to compile
-
-pkg_setup() {
-	if [ -e /lib/libc-2.2.5.so ] && [ `gcc -dumpversion` == "2.95.3" ]; then
-		if [ ! -f /etc/aspell/aspell.conf ]; then
-			mkdir -p /etc/aspell
-			touch /etc/aspell/aspell.conf
-		fi
-		if [ ! -f /root/.aspell.conf ]; then
-			touch /root/.aspell.conf
-		fi
-	fi
-}
-
-src_unpack() {
-
-	unpack ${MY_P}.tar.gz
-	cd ${S}
-	patch -p0 < ${DISTDIR}/aspell-.33-fix2.diff
-}
-
-src_compile() {
-	# 
-	# These two lines are here again to prevent breaking the compilation
-	#
-	elibtoolize
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc/aspell \
-		--host=${CHOST} \
-		--enable-doc-dir=/usr/share/doc/${P} || die
-	
-	# cp data/Makefile data/Makefile.orig
-	# sed 's:aspell --lang=english:& --dict-dir=.:' \
-	# 	data/Makefile.orig > data/Makefile
-	
-	emake || die
-
-}
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-	cd ${D}/usr/share/doc/${P}
-	dohtml -r man-html
-	docinto text
-	dodoc man-text
-	cd ${S}
-	
-	dodoc README* TODO
-
-}
-
diff --git a/app-text/aspell/aspell-0.50.1.ebuild b/app-text/aspell/aspell-0.50.1.ebuild
new file mode 100644
index 000000000000..29ae180d419c
--- /dev/null
+++ b/app-text/aspell/aspell-0.50.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.50.1.ebuild,v 1.1 2002/09/03 10:48:03 seemant Exp $
+
+inherit libtool
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A spell checker replacement for ispell"
+SRC_URI="ftp://ftp.gnu.org/gnu/aspell/${P}.tar.gz"
+HOMEPAGE="http://aspell.net/"
+
+DEPEND=">=sys-libs/ncurses-5.2"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="x86 ppc sparc sparc64"
+
+#
+# These flags a reset here because too much optimisation can cause aspell's
+# compilation process to break.  Moreover, these must be set before ./configure
+# otherwise it breaks again.  A very fragile build process, really.
+#
+#CXXFLAGS="-O2"
+#CFLAGS=${CXXFLAGS}
+
+src_compile() {
+	elibtoolize
+
+	econf \
+		--disable-static \
+		--sysconfdir=/etc/aspell \
+		--enable-docdir=/usr/share/doc/${PF} || die
+	
+	emake || die
+
+}
+
+src_install () {
+
+	make DESTDIR=${D} install || die
+	cd ${D}/usr/share/doc/${P}
+	dohtml -r man-html
+	rm -rf man-html
+	docinto text
+	dodoc man-text
+	rm -rf man-text
+	cd ${S}
+	
+	dodoc README* TODO
+
+	cd examples
+	make clean || die
+	cd ${S}
+	
+	docinto examples
+	dodoc examples/*
+
+}
+
+pkg_postinst() {
+
+	einfo "You will need to install a dictionary now.  Please choose an"
+	einfo "aspell-<LANG> dictionary from the app-i18n category"
+	einfo "After installing an aspell dictionary for your language(s),"
+	einfo "You may use the aspell-import utility to import your personal"
+	einfo "dictionaries from ispell, pspell and the older aspell"
+}
diff --git a/app-text/aspell/files/digest-aspell-0.33.7.1-r1 b/app-text/aspell/files/digest-aspell-0.33.7.1-r1
deleted file mode 100644
index a04a7baf0f1c..000000000000
--- a/app-text/aspell/files/digest-aspell-0.33.7.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5a975196883a139e6759701633021955 aspell-.33.7.1.tar.gz 1647417
-MD5 f8f66e0b5c5869ab8f864d62529ed0cf aspell-.33-fix2.diff 1421
diff --git a/app-text/aspell/files/digest-aspell-0.33.7.1-r2 b/app-text/aspell/files/digest-aspell-0.33.7.1-r2
deleted file mode 100644
index a04a7baf0f1c..000000000000
--- a/app-text/aspell/files/digest-aspell-0.33.7.1-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5a975196883a139e6759701633021955 aspell-.33.7.1.tar.gz 1647417
-MD5 f8f66e0b5c5869ab8f864d62529ed0cf aspell-.33-fix2.diff 1421
diff --git a/app-text/aspell/files/digest-aspell-0.50.1 b/app-text/aspell/files/digest-aspell-0.50.1
new file mode 100644
index 000000000000..6c718a7f03ad
--- /dev/null
+++ b/app-text/aspell/files/digest-aspell-0.50.1
@@ -0,0 +1 @@
+MD5 16b3fa4965e03847b4bb629ec83ed3d9 aspell-0.50.1.tar.gz 920995
diff --git a/app-text/pspell-ispell/ChangeLog b/app-text/pspell-ispell/ChangeLog
deleted file mode 100644
index 850c711b82a2..000000000000
--- a/app-text/pspell-ispell/ChangeLog
+++ /dev/null
@@ -1,19 +0,0 @@
-# ChangeLog for app-text/pspell-ispell
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/pspell-ispell/ChangeLog,v 1.1 2002/04/02 23:45:38 azarah Exp $
-
-*pspell-ispell-0.12-r1 (3 Apr 2002)
-
-  3 Apr 2002; M.Schlemmer <azarah@gentoo.org> :
-
-  Libtoolize.
-
-*pspell-ispell-0.12 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/app-text/pspell-ispell/files/digest-pspell-ispell-0.12-r1 b/app-text/pspell-ispell/files/digest-pspell-ispell-0.12-r1
deleted file mode 100644
index a3e0d5a14f7d..000000000000
--- a/app-text/pspell-ispell/files/digest-pspell-ispell-0.12-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7329d4122b302057a18d3a55d8d1f64c pspell-ispell-.12.tar.gz 137279
diff --git a/app-text/pspell-ispell/pspell-ispell-0.12-r1.ebuild b/app-text/pspell-ispell/pspell-ispell-0.12-r1.ebuild
deleted file mode 100644
index 941765405ad3..000000000000
--- a/app-text/pspell-ispell/pspell-ispell-0.12-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-text/pspell-ispell/pspell-ispell-0.12-r1.ebuild,v 1.7 2002/08/18 06:41:41 gerk Exp $
-
-inherit libtool
-
-#Remove '-ispell' from name for download subdirectory
-MYPN=${PN/-ispell//}
-
-#Remove leading zero from version number
-MYPV=${PV#0}
-
-S=${WORKDIR}/${PN}-${MYPV}
-DESCRIPTION="Ispell module for pspell"
-SRC_URI="mirror://sourceforge/${MYPN}/${PN}-${MYPV}.tar.gz"
-HOMEPAGE="http://pspell.sourceforge.net"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
-
-DEPEND=">=app-text/pspell-0.12.2-r2
-	>=app-text/ispell-3.2.06-r1"
-
-
-src_compile() {
-
-	elibtoolize
-
-	./configure \
-		--disable-static \
-		--prefix=/usr \
-		--enable-doc-dir=/usr/share/doc/${PF} \
-		--host=${CHOST} || die "./configure failed"
-		
-	emake || die "Parallel Make Failed"
-}
-
-src_install () {
-
-	make DESTDIR=${D} install || die "Installation Failed"
-    
-	dodoc README
-}
diff --git a/app-text/pspell/ChangeLog b/app-text/pspell/ChangeLog
deleted file mode 100644
index d5159808bbeb..000000000000
--- a/app-text/pspell/ChangeLog
+++ /dev/null
@@ -1,38 +0,0 @@
-# ChangeLog for app-text/pspell
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/pspell/ChangeLog,v 1.6 2002/08/23 15:43:51 seemant Exp $
-
-*pspell-0.12.2-r4 (23 Aug 2002)
-
-  23 Aug 2002; Seemant Kulleen <seemant@gentoo.org> pspell-0.12.2-r4.ebuild
-  files/digest-pspell-0.12.2-r4 :
-
-  Added dependency upon new aspell.  Now, this installs just the old stuff
-  and into a separate set of places, so as not to clobber.
-
-*pspell-0.12.2-r3 (19 Jun 2002)
-
-  06 Aug 2002; Mark Guertin <gerk@gentoo.org> :
-  Added ppc to keywords
-
-  19 Jun 2002; Seemant Kulleen <seemant@gentoo.org> pspell-0.12.2-r3.ebuild
-  files/digest-pspell-0.12.2-r3 :
-
-  elibtoolized -- now it works again when sylpheed-claws needs it.  Fixes
-  bug #3810 by mtzanidakis@freemail.gr (Manolis Tzanidakis)
-
-*pspell-0.12.2-r2 (3 Apr 2002)
-
-  3 Apr 2002; M.Schlemmer <azarah@gentoo.org> :
-
-  Libtoolize.
-
-*pspell-0.11.2 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/app-text/pspell/files/digest-pspell-0.12.2-r3 b/app-text/pspell/files/digest-pspell-0.12.2-r3
deleted file mode 100644
index e75fdd207d2a..000000000000
--- a/app-text/pspell/files/digest-pspell-0.12.2-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cfd3816b2372932a1b71c0ce4e9f881e pspell-.12.2.tar.gz 434193
diff --git a/app-text/pspell/files/digest-pspell-0.12.2-r4 b/app-text/pspell/files/digest-pspell-0.12.2-r4
deleted file mode 100644
index e75fdd207d2a..000000000000
--- a/app-text/pspell/files/digest-pspell-0.12.2-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cfd3816b2372932a1b71c0ce4e9f881e pspell-.12.2.tar.gz 434193
diff --git a/app-text/pspell/pspell-0.12.2-r3.ebuild b/app-text/pspell/pspell-0.12.2-r3.ebuild
deleted file mode 100644
index f7cbcbcdfa06..000000000000
--- a/app-text/pspell/pspell-0.12.2-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-text/pspell/pspell-0.12.2-r3.ebuild,v 1.6 2002/08/23 15:43:51 seemant Exp $
-
-inherit libtool
-
-#Remove leading zero from version number
-MYPV=${PV#0}
-S=${WORKDIR}/${PN}-${MYPV}
-DESCRIPTION="A spell checker frontend for aspell and ispell"
-SRC_URI="http://telia.dl.sf.net/${PN}/${PN}-${MYPV}.tar.gz" #2481
-HOMEPAGE="http://pspell.sourceforge.net"
-
-DEPEND=">=sys-devel/libtool-1.4.1-r4"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
-
-src_compile() {
-
-	elibtoolize
-	
-	econf \
-		--enable-doc-dir=/usr/share/doc/${PF} \
-		--enable-ltdl \
-		|| die "./configure failed"
-		
-	emake || die "Parallel Make Failed"
-}
-
-src_install () {
-
-	make \
-		DESTDIR=${D} \
-		install || die "Installation Failed"
-    
-	dodoc README*
-    
-	cd ${D}/usr/share/doc/${PF}
-	mv man-html html
-	mv man-text txt
-}
diff --git a/app-text/pspell/pspell-0.12.2-r4.ebuild b/app-text/pspell/pspell-0.12.2-r4.ebuild
deleted file mode 100644
index 668e6dd332e2..000000000000
--- a/app-text/pspell/pspell-0.12.2-r4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-text/pspell/pspell-0.12.2-r4.ebuild,v 1.1 2002/08/23 15:43:51 seemant Exp $
-
-inherit libtool
-
-#Remove leading zero from version number
-MYPV=${PV#0}
-S=${WORKDIR}/${PN}-${MYPV}
-DESCRIPTION="A spell checker frontend for aspell and ispell"
-SRC_URI="http://telia.dl.sf.net/${PN}/${PN}-${MYPV}.tar.gz" #2481
-HOMEPAGE="http://pspell.sourceforge.net"
-
-DEPEND=">=app-text/aspell-0.50"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
-
-src_compile() {
-
-	elibtoolize
-	econf \
-		--libdir=/usr/lib/pspell \
-		--enable-doc-dir=/usr/share/doc/${PF} \
-		--enable-ltdl \
-		|| die "./configure failed"
-		
-	emake || die "Parallel Make Failed"
-}
-
-src_install () {
-
-	make \
-		DESTDIR=${D} \
-		install || die "Installation Failed"
-
-	#remove things which are installed by aspell
- 	rm -f ${D}/usr/bin/pspell-config
-	rm -f ${D}/usr/include/pspell/pspell.h
-	dodoc README*
-    
-	cd ${D}/usr/share/doc/${PF}
-	mv man-html html
-	mv man-text txt
-}
diff --git a/dev-libs/librep/files/digest-librep-0.16.1 b/dev-libs/librep/files/digest-librep-0.16.1
new file mode 100644
index 000000000000..a81488aeb402
--- /dev/null
+++ b/dev-libs/librep/files/digest-librep-0.16.1
@@ -0,0 +1 @@
+MD5 1390f0e62a8ec832e6096813d4c7ac4a librep-0.16.1.tar.gz 913250
diff --git a/eclass/commonbox.eclass b/eclass/commonbox.eclass
index d08f302e15b0..a625fdf2fa90 100644
--- a/eclass/commonbox.eclass
+++ b/eclass/commonbox.eclass
@@ -1,7 +1,7 @@
 # Copyright 2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
 # Author: Seemant Kulleen <seemant@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/commonbox.eclass,v 1.6 2002/07/29 17:34:12 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/commonbox.eclass,v 1.7 2002/09/03 10:48:03 seemant Exp $
 
 # The commonbox eclass is designed to allow easier installation of the box
 # window managers such as blackbox and fluxbox and commonbox
@@ -12,7 +12,7 @@
 ECLASS=commonbox
 INHERITED="$INHERITED $ECLASS"
 
-EXPORT_FUNCTIONS commonify src_compile src_install pkg_postinst
+EXPORT_FUNCTIONS src_compile src_install pkg_postinst
 
 DEPEND="x11-misc/commonbox-utils
 	x11-themes/commonbox-styles"
@@ -23,21 +23,28 @@ PROVIDE="virtual/blackbox"
 myconf=""
 mydoc=""
 MYBIN=""
+commonise=1
 
-commonbox_commonify() {
+commonify() {
 	cd ${S}
 
 	cp Makefile Makefile.orig
 	sed -e "s:\(SUBDIRS = \).*:\1doc nls src:" \
 		Makefile.orig > Makefile
+}
 
+commondoc() {
 	cd ${S}/doc
 
 	cp Makefile Makefile.orig
 	sed -e "s:bsetroot.1::" \
 		-e "s:bsetbg.1::" \
 		Makefile.orig > Makefile
+	
+	cd ${S}
+}
 
+sharedir() {
 	cd ${S}/src
 	cp Makefile Makefile.orig
 #	sed -e 's:$(pkgdatadir)/menu:\\"/usr/share/commonbox/menu\\":' \
@@ -68,7 +75,13 @@ commonbox_src_compile() {
 		--datadir=/usr/share/commonbox \
 		${myconf} || die
 	
-	commonify || die
+	if [ ! -z $commonise ] 
+	then
+		commonify || die
+	fi
+	commondoc || die
+	sharedir || die
+
 	emake \
 		pkgdatadir="/usr/share/commonbox" || die
 }
diff --git a/media-plugins/xmms-aalsa/xmms-aalsa-0.5.4-r3.ebuild b/media-plugins/xmms-aalsa/xmms-aalsa-0.5.4-r3.ebuild
index 27147aa63bde..765fa701f5d7 100644
--- a/media-plugins/xmms-aalsa/xmms-aalsa-0.5.4-r3.ebuild
+++ b/media-plugins/xmms-aalsa/xmms-aalsa-0.5.4-r3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-aalsa/xmms-aalsa-0.5.4-r3.ebuild,v 1.1 2002/08/30 08:35:31 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-aalsa/xmms-aalsa-0.5.4-r3.ebuild,v 1.2 2002/09/03 10:48:03 seemant Exp $
+
+#inherit alsa-check
 
 MY_P=${PN}_${PV}
 S=${WORKDIR}/${MY_P}
@@ -14,6 +16,16 @@ KEYWORDS="x86"
 DEPEND=">=media-sound/xmms-1.2.5-r1 \
 	=media-libs/alsa-lib-0.5*"
 
+ALSA_REQD=0.5
+
+pkg_preinst() {
+	einfo "blah"
+}
+
+pkg_setup() {
+	einfo "hello"
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/media-video/avi4xmms/avi4xmms-0.1-r2.ebuild b/media-video/avi4xmms/avi4xmms-0.1-r2.ebuild
index 4ce5dfd90bb1..598bd35adbae 100644
--- a/media-video/avi4xmms/avi4xmms-0.1-r2.ebuild
+++ b/media-video/avi4xmms/avi4xmms-0.1-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/avi4xmms/avi4xmms-0.1-r2.ebuild,v 1.1 2002/08/23 12:36:13 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avi4xmms/avi4xmms-0.1-r2.ebuild,v 1.2 2002/09/03 10:48:03 seemant Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="A plugin for XMMS to play AVI/DivX/ASF movies"
 SRC_URI=""
 HOMEPAGE="http://sourceforge.net/projects/my-xmms-plugs/"
 
-RDEPEND="media-video/avi-xmms"
+RDEPEND="media-plugins/avi-xmms"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/profiles/package.mask b/profiles/package.mask
index 4d6813fd7707..438cdc3dc920 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -276,19 +276,6 @@ net-www/apache2
 # new package, masked for testing
 net-mail/pinepgp
 
-# <seemant@gentoo.org> (13 Aug 2002)
-# masked for testing.  PLEASE TEST
->=app-text/aspell-0.50_pre20020730
-=app-text/gnome-spell-0.4.1-r3
-app-i18n/aspell-en
-=app-i18n/aspell-es-0.50.1
-=app-i18n/aspell-fr-0.50.1
-=app-i18n/aspell-nl-0.50.1
-=app-text/pspell-0.12.2-r4
-=app-office/abiword-1.0.2-r1
-=app-text/gtkspell-2.0.0-r1
-
-
 # <styx@gentoo.org> (13 Aug 2002)
 # masked for b0rkage, removing them soon
 <dev-util/glimmer-1.2.1-r3
diff --git a/x11-wm/openbox/openbox-2.0.0.ebuild b/x11-wm/openbox/openbox-2.0.0.ebuild
index 1a841b28a1a5..2ab9839a39ac 100644
--- a/x11-wm/openbox/openbox-2.0.0.ebuild
+++ b/x11-wm/openbox/openbox-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-2.0.0.ebuild,v 1.1 2002/08/17 05:29:09 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-2.0.0.ebuild,v 1.2 2002/09/03 10:48:03 seemant Exp $
 
 inherit commonbox
 
@@ -15,10 +15,38 @@ KEYWORDS="x86 sparc sparc64"
 
 MYBIN="${PN}"
 mydoc="CHANGE* TODO LICENSE data/README*"
-myconf="--program-suffix=-dev --enable-xinerama"
+myconf="--enable-xinerama"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	cp Makefile.am Makefile.am.orig
+	sed 's/data //' Makefile.am.orig > Makefile.am
+
+	cd ${S}/util
+	cp Makefile.am Makefile.am.orig
+	sed -e 's/bsetbg//' \
+		-e 's/bsetroot//' \
+		Makefile.am.orig > Makefile.am
+}
+
+
 
 src_compile() {
 
 	${S}/bootstrap
+
+	commonise=""
 	commonbox_src_compile
 }
+
+src_install() {
+
+	commonbox_src_install
+	mv ${D}/usr/bin/openbox ${D}/usr/bin/openbox-dev
+	mv ${D}/usr/share/man/man1/openbox.1.gz \
+		{D}/usr/share/man/man1/openbox-dev.1.gz
+
+}
diff --git a/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1-r2.ebuild b/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1-r2.ebuild
index a36d46c73f38..5dc9add92fd6 100644
--- a/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1-r2.ebuild
+++ b/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1-r2.ebuild
@@ -1,5 +1,8 @@
 # Copyright 2001 theLeaf sprl/bvba
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1-r2.ebuild,v 1.5 2002/08/14 15:45:39 murphy Exp $
+# Distributed under the terms of the GNU General Public License, v2.
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1-r2.ebuild,v 1.6 2002/09/03 10:48:03 seemant Exp $
+
+inherit libtool
 
 MY_P=${P/-merlin/}
 S=${WORKDIR}/${MY_P}
@@ -35,9 +38,7 @@ src_unpack() {
 	cd ${S}/src
 	patch -p1 < ${FILESDIR}/x.c.patch-merlin-1.0.2 || die
 
-	#update libtool for "relink" bug fix
-	libtoolize --copy --force
-	aclocal
+	elibtoolize
 }
 
 
@@ -45,24 +46,21 @@ src_compile() {
 
   	local myconf
 	
-	use esd	\
-		&& myconf="--with-esd"	\
+	use esd \
+		&& myconf="--with-esd" \
 		|| myconf="--without-esd"
 	
-	use gnome	\
-		&& myconf="${myconf} --with-gnome-prefix=/usr --enable-gnome-widgets --enable-capplet"	\
+	use gnome \
+		&& myconf="${myconf} --with-gnome-prefix=/usr --enable-gnome-widgets --enable-capplet" \
 		|| myconf="${myconf} --disable-gnome-widgets --disable-capplet"
 	
 	use nls || myconf="${myconf} --disable-linguas"
 
-	use gtk || use gnome 	\
-		&& myconf="${myconf} --with-gdk-pixbuf"	\
+	use gtk || use gnome \
+		&& myconf="${myconf} --with-gdk-pixbuf" \
 		|| myconf="${myconf} --without-gdk-pixbuf"
 
-	./configure	\
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
+	econf \
 		--libexecdir=/usr/lib \
 		--with-audiofile \
 		${myconf} || die