cleanup

28 files changed, 88 insertions, 429 deletions

diff --git a/app-text/dictd-devils/dictd-devils-0.ebuild b/app-text/dictd-devils/dictd-devils-0.ebuild
deleted file mode 100644
index 752bf4dfabfd..000000000000
--- a/app-text/dictd-devils/dictd-devils-0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-devils/dictd-devils-0.ebuild,v 1.3 2002/04/27 08:32:43 seemant Exp $
-
-MY_P=devils-dict-pre
-S=${WORKDIR}
-DESCRIPTION=""
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${MY_P}.tar.gz"
-HOMEPAGE="http://www.dict.org"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-src_install () {
-	dodir /usr/lib/dict
-	insinto /usr/lib/dict
-	doins devils.dict.dz
-	doins devils.index
-}
-
-pkg_postinst() {
-    if [ -f /etc/dict/dictd.conf ]; then
-        cat >> /etc/dict/dictd.conf << __EOF__
-        database devils { data "/usr/lib/dict/devils.dict.dz"
-                  index "/usr/lib/dict/devils.index" }
-__EOF__
-    fi
-}
-
-pkg_postrm() {
-    if [ -f /etc/dict/dictd.conf ]; then
-        cat /etc/dict/dictd.conf | sed -e '/devils/d' > /etc/dict/dictd.conf.$$
-        mv /etc/dict/dictd.conf.$$ /etc/dict/dictd.conf
-    fi
-}
-
-# vim: ai et sw=4 ts=4
diff --git a/app-text/dictd-devils/files/digest-dictd-devils-0 b/app-text/dictd-devils/files/digest-dictd-devils-0
deleted file mode 100644
index adb24fc8ea30..000000000000
--- a/app-text/dictd-devils/files/digest-dictd-devils-0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5fa37007d2309908ebfc3e6412150e17 devils-dict-pre.tar.gz 175823
diff --git a/app-text/dictd-elements/dictd-elements-2000.22.07-r1.ebuild b/app-text/dictd-elements/dictd-elements-2000.22.07-r1.ebuild
index c5366e6160c1..132660c7c2d2 100644
--- a/app-text/dictd-elements/dictd-elements-2000.22.07-r1.ebuild
+++ b/app-text/dictd-elements/dictd-elements-2000.22.07-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-elements/dictd-elements-2000.22.07-r1.ebuild,v 1.2 2002/04/27 08:33:53 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-elements/dictd-elements-2000.22.07-r1.ebuild,v 1.3 2002/04/27 08:40:20 seemant Exp $
 
-MY_P=${PN}-20001107-pre
+MY_P=elements-20001107-pre
 S=${WORKDIR}
 DESCRIPTION=""
 SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${MY_P}.tar.gz"
diff --git a/app-text/dictd-foldoc/dictd-foldoc-2001.03.13-r1.ebuild b/app-text/dictd-foldoc/dictd-foldoc-2001.03.13-r1.ebuild
index 7db035c2d6ca..08e5702bec90 100644
--- a/app-text/dictd-foldoc/dictd-foldoc-2001.03.13-r1.ebuild
+++ b/app-text/dictd-foldoc/dictd-foldoc-2001.03.13-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-foldoc/dictd-foldoc-2001.03.13-r1.ebuild,v 1.2 2002/04/27 08:35:02 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-foldoc/dictd-foldoc-2001.03.13-r1.ebuild,v 1.3 2002/04/27 08:39:30 seemant Exp $
 
-MY_P=${PN}-20010313.tar.gz
+MY_P=foldoc-20010313
 S=${WORKDIR}
 DESCRIPTION=""
 SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${MY_P}.tar.gz"
diff --git a/app-text/dictd-foldoc/dictd-foldoc-2001.03.13.ebuild b/app-text/dictd-foldoc/dictd-foldoc-2001.03.13.ebuild
deleted file mode 100644
index c09ff3d5d0e1..000000000000
--- a/app-text/dictd-foldoc/dictd-foldoc-2001.03.13.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-foldoc/dictd-foldoc-2001.03.13.ebuild,v 1.2 2001/04/24 22:58:35 michael Exp $
-
-#P=
-A=foldoc-20010313.tar.gz
-S=${WORKDIR}
-DESCRIPTION=""
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${A}"
-HOMEPAGE="http://www.dict.org"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-src_install () {
-	dodir /usr/lib/dict
-	insinto /usr/lib/dict
-	doins foldoc.dict.dz
-	doins foldoc.index
-}
-
-pkg_postinst() {
-if [ -f /etc/dict/dictd.conf ]; then
-cat >> /etc/dict/dictd.conf << __EOF__
-database foldoc { data "/usr/lib/dict/foldoc.dict.dz"
-                  index "/usr/lib/dict/foldoc.index" }
-__EOF__
-fi
-}
-
-pkg_postrm() {
-if [ -f /etc/dict/dictd.conf ]; then
-  cat /etc/dict/dictd.conf | sed -e '/foldoc/d' > /etc/dict/dictd.conf.$$
-  mv /etc/dict/dictd.conf.$$ /etc/dict/dictd.conf
-fi
-}
-
-
-# vim: ai et sw=4 ts=4
diff --git a/app-text/dictd-foldoc/files/digest-dictd-foldoc-2001.03.13 b/app-text/dictd-foldoc/files/digest-dictd-foldoc-2001.03.13
deleted file mode 100644
index 237914a59d48..000000000000
--- a/app-text/dictd-foldoc/files/digest-dictd-foldoc-2001.03.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e0d94a1a84d45fc7ae17c3b2ffb276d5 foldoc-20010313.tar.gz 2166599
diff --git a/app-text/dictd-gazetteer/dictd-gazetteer-1.2-r1.ebuild b/app-text/dictd-gazetteer/dictd-gazetteer-1.2-r1.ebuild
index 484b70e0c656..a355095c033a 100644
--- a/app-text/dictd-gazetteer/dictd-gazetteer-1.2-r1.ebuild
+++ b/app-text/dictd-gazetteer/dictd-gazetteer-1.2-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-gazetteer/dictd-gazetteer-1.2-r1.ebuild,v 1.1 2001/06/09 19:22:43 michael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-gazetteer/dictd-gazetteer-1.2-r1.ebuild,v 1.2 2002/04/27 08:41:43 seemant Exp $
 
-#P=
-A=dict-gazetteer-1.2-pre.tar.gz
+MY_P=dict-gazetteer-${PV}-pre
 S=${WORKDIR}
 DESCRIPTION=""
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${A}"
+SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${MY_P}.tar.gz"
 HOMEPAGE="http://www.dict.org"
 
 DEPEND=">=app-text/dictd-1.5.5"
diff --git a/app-text/dictd-gazetteer/dictd-gazetteer-1.2.ebuild b/app-text/dictd-gazetteer/dictd-gazetteer-1.2.ebuild
deleted file mode 100644
index 673f1b12b1b3..000000000000
--- a/app-text/dictd-gazetteer/dictd-gazetteer-1.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-gazetteer/dictd-gazetteer-1.2.ebuild,v 1.2 2001/04/24 22:58:35 michael Exp $
-
-#P=
-A=dict-gazetteer-1.2-pre.tar.gz
-S=${WORKDIR}
-DESCRIPTION=""
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${A}"
-HOMEPAGE="http://www.dict.org"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-src_install () {
-	dodir /usr/lib/dict
-	insinto /usr/lib/dict
-	doins gazetteer.dict.dz
-	doins gazetteer.index
-}
-
-pkg_postinst() {
-if [ -f /etc/dict/dictd.conf ]; then
-cat >> /etc/dict/dictd.conf << __EOF__
-database gazetteer { data "/usr/lib/dict/gazetteer.dict.dz"
-                     index "/usr/lib/dict/gazetteer.index" }
-__EOF__
-fi
-}
-
-pkg_postrm() {
-if [ -f /etc/dict/dictd.conf ]; then
-  cat /etc/dict/dictd.conf | sed -e '/gazetteer/d' > /etc/dict/dictd.conf.$$
-  mv /etc/dict/dictd.conf.$$ /etc/dict/dictd.conf
-fi
-}
-
-
-# vim: ai et sw=4 ts=4
diff --git a/app-text/dictd-gazetteer/files/digest-dictd-gazetteer-1.2 b/app-text/dictd-gazetteer/files/digest-dictd-gazetteer-1.2
deleted file mode 100644
index 3fde055eacc6..000000000000
--- a/app-text/dictd-gazetteer/files/digest-dictd-gazetteer-1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d67cd81e90bc98e738c19693a97ab9e2 dict-gazetteer-1.2-pre.tar.gz 2209944
diff --git a/app-text/dictd-jargon/dictd-jargon-4.2.3-r1.ebuild b/app-text/dictd-jargon/dictd-jargon-4.2.3-r1.ebuild
index 6a6f63d9b84b..83d0b7bd99ef 100644
--- a/app-text/dictd-jargon/dictd-jargon-4.2.3-r1.ebuild
+++ b/app-text/dictd-jargon/dictd-jargon-4.2.3-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-jargon/dictd-jargon-4.2.3-r1.ebuild,v 1.1 2001/06/09 19:22:43 michael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-jargon/dictd-jargon-4.2.3-r1.ebuild,v 1.2 2002/04/27 08:44:05 seemant Exp $
 
-#P=
-A=jargon_4.2.3.tar.gz
+MY_P=${PN/dictd-/}_${PV}
 S=${WORKDIR}
 DESCRIPTION="Jargon lexicon"
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${A}"
+SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${MY_P}.tar.gz"
 HOMEPAGE="http://www.dict.org"
 
 DEPEND=">=app-text/dictd-1.5.5"
diff --git a/app-text/dictd-jargon/dictd-jargon-4.2.3.ebuild b/app-text/dictd-jargon/dictd-jargon-4.2.3.ebuild
deleted file mode 100644
index 078669a1e1b7..000000000000
--- a/app-text/dictd-jargon/dictd-jargon-4.2.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-jargon/dictd-jargon-4.2.3.ebuild,v 1.2 2001/04/24 22:58:35 michael Exp $
-
-#P=
-A=jargon_4.2.3.tar.gz
-S=${WORKDIR}
-DESCRIPTION="Jargon lexicon"
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${A}"
-HOMEPAGE="http://www.dict.org"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-src_install () {
-	dodoc README
-	dodir /usr/lib/dict
-	insinto /usr/lib/dict
-	doins jargon.dict.dz
-	doins jargon.index
-}
-
-pkg_postinst() {
-if [ -f /etc/dict/dictd.conf ]; then
-cat >> /etc/dict/dictd.conf << __EOF__
-database jargon { data "/usr/lib/dict/jargon.dict.dz"
-                  index "/usr/lib/dict/jargon.index" }
-__EOF__
-fi
-}
-
-pkg_postrm() {
-if [ -f /etc/dict/dictd.conf ]; then
-  cat /etc/dict/dictd.conf | sed -e '/jargon/d' > /etc/dict/dictd.conf.$$
-  mv /etc/dict/dictd.conf.$$ /etc/dict/dictd.conf
-fi
-}
-
-
-# vim: ai et sw=4 ts=4
diff --git a/app-text/dictd-jargon/files/digest-dictd-jargon-4.2.3 b/app-text/dictd-jargon/files/digest-dictd-jargon-4.2.3
deleted file mode 100644
index b5c87b5d0dda..000000000000
--- a/app-text/dictd-jargon/files/digest-dictd-jargon-4.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0dc7e5824131d33c8d3e66728fe34f1e jargon_4.2.3.tar.gz 650370
diff --git a/app-text/dictd-misc/dictd-misc-1.5b-r1.ebuild b/app-text/dictd-misc/dictd-misc-1.5b-r1.ebuild
index 52b7f67bd3b4..abe41c085b7b 100644
--- a/app-text/dictd-misc/dictd-misc-1.5b-r1.ebuild
+++ b/app-text/dictd-misc/dictd-misc-1.5b-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-misc/dictd-misc-1.5b-r1.ebuild,v 1.1 2001/06/09 19:22:43 michael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-misc/dictd-misc-1.5b-r1.ebuild,v 1.2 2002/04/27 08:45:57 seemant Exp $
 
-#P=
-A=dict-misc-1.5b-pre.tar.gz
+MY_P=${P/dictd/dict}-pre
 S=${WORKDIR}
 DESCRIPTION=""
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${A}"
+SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${MY_P}.tar.gz"
 HOMEPAGE="http://www.dict.org"
 
 DEPEND=">=app-text/dictd-1.5.5"
diff --git a/app-text/dictd-misc/dictd-misc-1.5b.ebuild b/app-text/dictd-misc/dictd-misc-1.5b.ebuild
deleted file mode 100644
index f208f55e5a48..000000000000
--- a/app-text/dictd-misc/dictd-misc-1.5b.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-misc/dictd-misc-1.5b.ebuild,v 1.2 2001/04/24 22:58:35 michael Exp $
-
-#P=
-A=dict-misc-1.5b-pre.tar.gz
-S=${WORKDIR}
-DESCRIPTION=""
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${A}"
-HOMEPAGE="http://www.dict.org"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-src_install () {
-	dodir /usr/lib/dict
-	insinto /usr/lib/dict
-	doins easton.dict.dz
-	doins easton.index
-	doins hitchcock.dict.dz
-	doins hitchcock.index
-	doins world95.dict.dz
-	doins world95.index
-}
-
-pkg_postinst() {
-if [ -f /etc/dict/dictd.conf ]; then
-cat >> /etc/dict/dictd.conf << __EOF__
-database easton  { data "/usr/lib/dict/easton.dict.dz"
-                   index "/usr/lib/dict/easton.index" }
-database hitchcock  { data "/usr/lib/dict/hitchcock.dict.dz"
-                      index "/usr/lib/dict/hitchcock.index" }
-database worl95  { data "/usr/lib/dict/world95.dict.dz"
-                   index "/usr/lib/dict/world95.index" }
-__EOF__
-fi
-}
-
-pkg_postrm() {
-if [ -f /etc/dict/dictd.conf ]; then
-  cat /etc/dict/dictd.conf | sed -e '/easton/d' -e '/hitchcock/d' \
-     -e '/world95/d' > /etc/dict/dictd.conf.$$
-  mv /etc/dict/dictd.conf.$$ /etc/dict/dictd.conf
-fi
-}
-
-
-# vim: ai et sw=4 ts=4
diff --git a/app-text/dictd-misc/files/digest-dictd-misc-1.5b b/app-text/dictd-misc/files/digest-dictd-misc-1.5b
deleted file mode 100644
index 88850835c39e..000000000000
--- a/app-text/dictd-misc/files/digest-dictd-misc-1.5b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 84445acccaa120288a6bda0d251d5a92 dict-misc-1.5b-pre.tar.gz 2167909
diff --git a/app-text/dictd-vera/dictd-vera-1.7-r1.ebuild b/app-text/dictd-vera/dictd-vera-1.7-r1.ebuild
index 3e2ace5049f5..f89f1bfae08a 100644
--- a/app-text/dictd-vera/dictd-vera-1.7-r1.ebuild
+++ b/app-text/dictd-vera/dictd-vera-1.7-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-vera/dictd-vera-1.7-r1.ebuild,v 1.1 2001/06/09 19:22:43 michael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-vera/dictd-vera-1.7-r1.ebuild,v 1.2 2002/04/27 08:47:03 seemant Exp $
 
-#P=
-A=vera_1.7.tar.gz
+MY_P=vera_${PV}
 S=${WORKDIR}
 DESCRIPTION=""
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${A}"
+SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${MY_P}.tar.gz"
 HOMEPAGE="http://www.dict.org"
 
 DEPEND=">=app-text/dictd-1.5.5"
diff --git a/app-text/dictd-vera/dictd-vera-1.7.ebuild b/app-text/dictd-vera/dictd-vera-1.7.ebuild
deleted file mode 100644
index 9ca3ca8bcbaa..000000000000
--- a/app-text/dictd-vera/dictd-vera-1.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-vera/dictd-vera-1.7.ebuild,v 1.2 2001/04/24 22:58:35 michael Exp $
-
-#P=
-A=vera_1.7.tar.gz
-S=${WORKDIR}
-DESCRIPTION=""
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${A}"
-HOMEPAGE="http://www.dict.org"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-src_install () {
-	dodir /usr/lib/dict
-	insinto /usr/lib/dict
-	doins vera.dict
-	doins vera.index
-}
-
-pkg_postinst() {
-if [ -f /etc/dict/dictd.conf ]; then
-cat >> /etc/dict/dictd.conf << __EOF__
-database vera  { data "/usr/lib/dict/vera.dict"
-                 index "/usr/lib/dict/vera.index" }
-__EOF__
-fi
-}
-
-pkg_postrm() {
-if [ -f /etc/dict/dictd.conf ]; then
-  cat /etc/dict/dictd.conf | sed -e '/vera/d' > /etc/dict/dictd.conf.$$
-  mv /etc/dict/dictd.conf.$$ /etc/dict/dictd.conf
-fi
-}
-
-
-# vim: ai et sw=4 ts=4
diff --git a/app-text/dictd-vera/files/digest-dictd-vera-1.7 b/app-text/dictd-vera/files/digest-dictd-vera-1.7
deleted file mode 100644
index 7740f553d22f..000000000000
--- a/app-text/dictd-vera/files/digest-dictd-vera-1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c2168e23b32fb695a728c913b052e3c2 vera_1.7.tar.gz 196508
diff --git a/app-text/dictd-web1913/dictd-web1913-1.4-r1.ebuild b/app-text/dictd-web1913/dictd-web1913-1.4-r1.ebuild
index f39624338b2c..b93d2d222faa 100644
--- a/app-text/dictd-web1913/dictd-web1913-1.4-r1.ebuild
+++ b/app-text/dictd-web1913/dictd-web1913-1.4-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-web1913/dictd-web1913-1.4-r1.ebuild,v 1.1 2001/06/09 19:22:43 michael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-web1913/dictd-web1913-1.4-r1.ebuild,v 1.2 2002/04/27 08:48:17 seemant Exp $
 
-#P=
-A=dict-web1913-1.4-pre.tar.gz
+MY_P=${P/td/t}-pre
 S=${WORKDIR}
 DESCRIPTION=""
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${A}"
+SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${MY_P}.tar.gz"
 HOMEPAGE="http://www.dict.org"
 
 DEPEND=">=app-text/dictd-1.5.5"
diff --git a/app-text/dictd-web1913/dictd-web1913-1.4.ebuild b/app-text/dictd-web1913/dictd-web1913-1.4.ebuild
deleted file mode 100644
index 29dd840b087f..000000000000
--- a/app-text/dictd-web1913/dictd-web1913-1.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-web1913/dictd-web1913-1.4.ebuild,v 1.2 2001/04/24 22:58:35 michael Exp $
-
-#P=
-A=dict-web1913-1.4-pre.tar.gz
-S=${WORKDIR}
-DESCRIPTION=""
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${A}"
-HOMEPAGE="http://www.dict.org"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-src_install () {
-	dodir /usr/lib/dict
-	insinto /usr/lib/dict
-	doins web1913.dict.dz
-	doins web1913.index
-}
-
-pkg_postinst() {
-if [ -f /etc/dict/dictd.conf ]; then
-cat >> /etc/dict/dictd.conf << __EOF__
-database web1913  { data "/usr/lib/dict/web1913.dict.dz"
-                    index "/usr/lib/dict/web1913.index" }
-__EOF__
-fi
-}
-
-pkg_postrm() {
-if [ -f /etc/dict/dictd.conf ]; then
-  cat /etc/dict/dictd.conf | sed -e '/web1913/d' > /etc/dict/dictd.conf.$$
-  mv /etc/dict/dictd.conf.$$ /etc/dict/dictd.conf
-fi
-}
-
-
-# vim: ai et sw=4 ts=4
diff --git a/app-text/dictd-web1913/files/digest-dictd-web1913-1.4 b/app-text/dictd-web1913/files/digest-dictd-web1913-1.4
deleted file mode 100644
index 9f297a91b47e..000000000000
--- a/app-text/dictd-web1913/files/digest-dictd-web1913-1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 63a8d25ace68dff135185a8c96dd5f3c dict-web1913-1.4-pre.tar.gz 13147422
diff --git a/app-text/dictd-wn/dictd-wn-1.5-r1.ebuild b/app-text/dictd-wn/dictd-wn-1.5-r1.ebuild
index 5f62e8cff183..f6851dcbd6e3 100644
--- a/app-text/dictd-wn/dictd-wn-1.5-r1.ebuild
+++ b/app-text/dictd-wn/dictd-wn-1.5-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-wn/dictd-wn-1.5-r1.ebuild,v 1.1 2001/06/09 19:22:43 michael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-wn/dictd-wn-1.5-r1.ebuild,v 1.2 2002/04/27 08:49:16 seemant Exp $
 
-#P=
-A=dict-wn-1.5-pre.tar.gz
+MY_P=${P/td/t}-pre
 S=${WORKDIR}
 DESCRIPTION=""
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${A}"
+SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${MY_P}.tar.gz"
 HOMEPAGE="http://www.dict.org"
 
 DEPEND=">=app-text/dictd-1.5.5"
diff --git a/app-text/dictd-wn/dictd-wn-1.5.ebuild b/app-text/dictd-wn/dictd-wn-1.5.ebuild
deleted file mode 100644
index 7081fb16f21c..000000000000
--- a/app-text/dictd-wn/dictd-wn-1.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-wn/dictd-wn-1.5.ebuild,v 1.2 2001/04/24 22:58:35 michael Exp $
-
-#P=
-A=dict-wn-1.5-pre.tar.gz
-S=${WORKDIR}
-DESCRIPTION=""
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${A}"
-HOMEPAGE="http://www.dict.org"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-src_install () {
-	dodir /usr/lib/dict
-	insinto /usr/lib/dict
-	doins wn.dict.dz
-	doins wn.index
-}
-
-pkg_postinst() {
-if [ -f /etc/dict/dictd.conf ]; then
-cat >> /etc/dict/dictd.conf << __EOF__
-database wn  { data "/usr/lib/dict/wn.dict.dz"
-               index "/usr/lib/dict/wn.index" }
-__EOF__
-fi
-}
-
-pkg_postrm() {
-if [ -f /etc/dict/dictd.conf ]; then
-  cat /etc/dict/dictd.conf | sed -e '/wn.dict/d' -e '/wn.index/d' \
-       > /etc/dict/dictd.conf.$$
-  mv /etc/dict/dictd.conf.$$ /etc/dict/dictd.conf
-fi
-}
-
-
-# vim: ai et sw=4 ts=4
diff --git a/app-text/dictd-wn/files/digest-dictd-wn-1.5 b/app-text/dictd-wn/files/digest-dictd-wn-1.5
deleted file mode 100644
index 28ac93decb51..000000000000
--- a/app-text/dictd-wn/files/digest-dictd-wn-1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1f6ae6284018044dbd9e3c5fae914f32 dict-wn-1.5-pre.tar.gz 8464107
diff --git a/app-text/docbook2X/docbook2X-0.6.1.ebuild b/app-text/docbook2X/docbook2X-0.6.1.ebuild
index 3d9004927c2b..edc8e3888544 100644
--- a/app-text/docbook2X/docbook2X-0.6.1.ebuild
+++ b/app-text/docbook2X/docbook2X-0.6.1.ebuild
@@ -1,37 +1,34 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/docbook2X-0.6.1.ebuild,v 1.5 2001/10/06 17:22:51 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/docbook2X-0.6.1.ebuild,v 1.6 2002/04/27 08:50:11 seemant Exp $
 
-#P=
-A=${P}.tar.gz
 S=${WORKDIR}/${PN}
 DESCRIPTION="Tolls to convert docbook to man and info"
-SRC_URI="http://download.sourceforge.net/docbook2x/${A}"
+SRC_URI="http://download.sourceforge.net/docbook2x/${P}.tar.gz"
 HOMEPAGE="http://docbook2x.sourceforge.net"
 
 RDEPEND=">=dev-perl/XML-Writer-0.4
-        >=dev-perl/XML-XSLT-0.31
+	>=dev-perl/XML-XSLT-0.31
 	>=dev-perl/SGMLSpm-1.03"
 	#>=dev-libs/libxslt-0.5.0"
 
 src_install () {
 
-    insinto /usr/lib/perl5/site_perl/5.6.1/XML/DOM
-    doins XML/DOM/Map.pm
-    insinto /usr/lib/perl5/site_perl/5.6.1/XML
-    doins XML/SGMLSpl.pm
-    insinto /usr/share/sgml/docbook/db2X-customization/common
-    doins xslt/common/*
-    insinto /usr/share/sgml/docbook/db2X-customization/lib
-    doins xslt/lib/*
-    insinto /usr/share/sgml/docbook/db2X-customization/texi
-    doins xslt/texi/*
-    insinto /usr/share/sgml/docbook/db2X-customization/dtd
-    doins dtd/Texi-XML 
-    exeinto /usr/bin
-    doexe docbook2man docbook2manxml docbook2texi docbook2texixml
-    doexe docbook2man-spec.pl docbook2texi-spec.pl texi_xml man_xml
-    doexe manpage_makelinks.pl
+	insinto /usr/lib/perl5/site_perl/5.6.1/XML/DOM
+	doins XML/DOM/Map.pm
+	insinto /usr/lib/perl5/site_perl/5.6.1/XML
+	doins XML/SGMLSpl.pm
+	insinto /usr/share/sgml/docbook/db2X-customization/common
+	doins xslt/common/*
+	insinto /usr/share/sgml/docbook/db2X-customization/lib
+	doins xslt/lib/*
+	insinto /usr/share/sgml/docbook/db2X-customization/texi
+	doins xslt/texi/*
+	insinto /usr/share/sgml/docbook/db2X-customization/dtd
+	doins dtd/Texi-XML 
+	exeinto /usr/bin
+	doexe docbook2man docbook2manxml docbook2texi docbook2texixml
+	doexe docbook2man-spec.pl docbook2texi-spec.pl texi_xml man_xml
+	doexe manpage_makelinks.pl
 }
-
diff --git a/app-text/duconv/duconv-1.1.ebuild b/app-text/duconv/duconv-1.1.ebuild
index ac168fcf195e..875b46132abb 100644
--- a/app-text/duconv/duconv-1.1.ebuild
+++ b/app-text/duconv/duconv-1.1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ulrich Eck
 # $Header: /home/cvsroot/gentoo-x86/app-misc/screen.ebuild,v 1.2 2001/04/21
 # 19:25 CST blutgens Exp $
 
-#P=
-A=${PN}.tgz
 S=${WORKDIR}/${P}
 DESCRIPTION=" small util that converts from dos<->unix"
 SRC_URI="http://people.freenet.de/tfaehr/${PN}.tgz"
@@ -13,20 +11,19 @@ HOMEPAGE="http://people.freenet.de/tfaehr/linux.htm"
 
 
 src_unpack() {
-    unpack ${A}
-    mv ${WORKDIR}/home/torsten/gcc/duconv ${WORKDIR}/${P}
-    rm -R ${WORKDIR}/home
+	unpack ${A}
+	mv ${WORKDIR}/home/torsten/gcc/duconv ${S}
+	rm -R ${WORKDIR}/home
 }
 
 src_compile() {
 
-    try make all
+	make all || die
 
 }
 
 src_install () {
-    exeinto /usr/bin
-    doexe ${PN}
-    doman duconv.1
+	exeinto /usr/bin
+	doexe ${PN}
+	doman duconv.1
 }
-
diff --git a/app-text/htmltidy/htmltidy-0.8.4.ebuild b/app-text/htmltidy/htmltidy-0.8.4.ebuild
index 7928e98f96ab..3781f5b61b3c 100644
--- a/app-text/htmltidy/htmltidy-0.8.4.ebuild
+++ b/app-text/htmltidy/htmltidy-0.8.4.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Chouser <chouser@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-0.8.4.ebuild,v 1.1 2002/01/12 06:45:55 chouser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-0.8.4.ebuild,v 1.2 2002/04/27 08:55:13 seemant Exp $
 
 # convert from normalized gentoo version number to htmltidy's wacky date thing
 month=(dmy jan feb mar apr may jun jul aug sep oct nov dec)
 parts=(${PV//./ })
 vers=$(printf "%d%s%02d" ${parts[2]} ${month[${parts[1]}]} ${parts[0]})
-P=tidy${vers}
-S=${WORKDIR}/${P}
+MY_P=tidy${vers}
+S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="fix mistakes and tidy up sloppy editing in HTML and XML"
-SRC_URI="http://prdownloads.sourceforge.net/tidy/${P}.tgz"
+SRC_URI="http://prdownloads.sourceforge.net/tidy/${MY_P}.tgz"
 HOMEPAGE="http://tidy.sourceforge.net/"
 DEPEND=""
 
diff --git a/app-text/latex2html/latex2html-2000.1b.ebuild b/app-text/latex2html/latex2html-2000.1b.ebuild
index 8f074d3b3972..55a7b8ba2e67 100644
--- a/app-text/latex2html/latex2html-2000.1b.ebuild
+++ b/app-text/latex2html/latex2html-2000.1b.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Michael Conrad Tilstra <tadpol@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/latex2html/latex2html-2000.1b.ebuild,v 1.2 2001/08/02 20:34:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/latex2html/latex2html-2000.1b.ebuild,v 1.3 2002/04/27 08:58:44 seemant Exp $
 
 #darn weird naming...
-P=latex2html-2K.1beta
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
+MY_P=${PN}-2K.1beta
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="LATEX2HTML is a convertor written in Perl that converts LATEX documents to HTML."
-SRC_URI="http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/${A}"
+SRC_URI="http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/${MY_P}.tar.gz"
 HOMEPAGE="http://www.latex2html.org"
 
 DEPEND="virtual/glibc"
@@ -20,33 +19,34 @@ RDEPEND="sys-devel/perl
 	"
 
 src_compile() {
-    try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST}
-    try make
-    try make check
-#    try make test
+	econf || die
+	make || die
+	make check || die
+#	make test || die
 }
 
 src_install () {
-    # modify cfgcache.pm
-    [ -f cfgcache.pm.backup ] && mv cfgcache.pm.backup cfgcache.pm
-    cat cfgcache.pm | sed -e "/BINDIR/s:/usr/bin:${D}usr/bin:" \
-                          -e "/LIBDIR/s:/usr/lib:${D}usr/lib:" \
-                          -e "/TEXPATH/s:/usr/share:${D}usr/share:" \
-                          -e '/MKTEXLSR/s:/usr/bin/mktexlsr::' > cfgcache.NEW
-    mv cfgcache.pm cfgcache.pm.backup
-    mv cfgcache.NEW cfgcache.pm
-    
-    dodir /usr/bin /usr/lib/latex2html /usr/share/texmf/tex/latex/html
-    try make install
-
-    cp cfgcache.pm.backup ${D}/usr/lib/latex2html/cfgcache.pm
-    #Install docs
-    dodoc BUGS Changes FAQ INSTALL LICENSE MANIFEST README TODO
+	# modify cfgcache.pm
+	[ -f cfgcache.pm.backup ] && mv cfgcache.pm.backup cfgcache.pm
+	cat cfgcache.pm | sed \
+        -e "/BINDIR/s:/usr/bin:${D}usr/bin:" \
+		-e "/LIBDIR/s:/usr/lib:${D}usr/lib:" \
+		-e "/TEXPATH/s:/usr/share:${D}usr/share:" \
+		-e '/MKTEXLSR/s:/usr/bin/mktexlsr::' > cfgcache.NEW
+	mv cfgcache.pm cfgcache.pm.backup
+	mv cfgcache.NEW cfgcache.pm
+	
+	dodir /usr/bin /usr/lib/latex2html /usr/share/texmf/tex/latex/html
+	make install || die
+
+	cp cfgcache.pm.backup ${D}/usr/lib/latex2html/cfgcache.pm
+	#Install docs
+	dodoc BUGS Changes FAQ INSTALL LICENSE MANIFEST README TODO
 }
 
 pkg_postinst() {
-    einfo "Running mktexlsr to rebuild ls-R database...."
-    mktexlsr
+	einfo "Running mktexlsr to rebuild ls-R database...."
+	mktexlsr
 }