cleanup

8 files changed, 24 insertions, 107 deletions

diff --git a/app-text/dictd-devils/dictd-devils-0-r1.ebuild b/app-text/dictd-devils/dictd-devils-0-r1.ebuild
index 1ed003f0906a..9690c579e69c 100644
--- a/app-text/dictd-devils/dictd-devils-0-r1.ebuild
+++ b/app-text/dictd-devils/dictd-devils-0-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-devils/dictd-devils-0-r1.ebuild,v 1.1 2001/06/09 19:22:43 michael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-devils/dictd-devils-0-r1.ebuild,v 1.2 2002/04/27 08:32:43 seemant Exp $
 
-#P=
-A=devils-dict-pre.tar.gz
+MY_P=devils-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-devils/dictd-devils-0.ebuild b/app-text/dictd-devils/dictd-devils-0.ebuild
index 942b6f7539b3..752bf4dfabfd 100644
--- a/app-text/dictd-devils/dictd-devils-0.ebuild
+++ b/app-text/dictd-devils/dictd-devils-0.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-devils/dictd-devils-0.ebuild,v 1.2 2001/04/24 22:58:35 michael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd-devils/dictd-devils-0.ebuild,v 1.3 2002/04/27 08:32:43 seemant Exp $
 
-#P=
-A=devils-dict-pre.tar.gz
+MY_P=devils-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"
@@ -20,19 +19,19 @@ src_install () {
 }
 
 pkg_postinst() {
-if [ -f /etc/dict/dictd.conf ]; then
-cat >> /etc/dict/dictd.conf << __EOF__
-database devils { data "/usr/lib/dict/devils.dict.dz"
+    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
+    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
+    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-elements/dictd-elements-2000.22.07-r1.ebuild b/app-text/dictd-elements/dictd-elements-2000.22.07-r1.ebuild
index 6d4248d8b8ec..c5366e6160c1 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,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-elements/dictd-elements-2000.22.07-r1.ebuild,v 1.1 2001/06/09 19:22:43 michael Exp $
+# $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 $
 
-#P=
-A=elements-20001107-pre.tar.gz
+MY_P=${PN}-20001107-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-elements/dictd-elements-2000.22.07.ebuild b/app-text/dictd-elements/dictd-elements-2000.22.07.ebuild
deleted file mode 100644
index 2ea6c0c519fc..000000000000
--- a/app-text/dictd-elements/dictd-elements-2000.22.07.ebuild
+++ /dev/null
@@ -1,38 +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-elements/dictd-elements-2000.22.07.ebuild,v 1.2 2001/04/24 22:58:35 michael Exp $
-
-#P=
-A=elements-20001107-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 elements.dict.dz
-	doins elements.index
-}
-
-pkg_postinst() {
-if [ -f /etc/dict/dictd.conf ]; then
-cat >> /etc/dict/dictd.conf << __EOF__
-database elements  { data "/usr/lib/dict/elements.dict.dz"
-                     index "/usr/lib/dict/elements.index" }
-__EOF__
-fi
-}
-
-pkg_postrm() {
-if [ -f /etc/dict/dictd.conf ]; then
-  cat /etc/dict/dictd.conf | sed -e '/elements/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-elements/files/digest-dictd-elements-2000.22.07 b/app-text/dictd-elements/files/digest-dictd-elements-2000.22.07
deleted file mode 100644
index 9d087b38e98c..000000000000
--- a/app-text/dictd-elements/files/digest-dictd-elements-2000.22.07
+++ /dev/null
@@ -1 +0,0 @@
-MD5 84f116609be2716134cdc08de3e8cb7a elements-20001107-pre.tar.gz 16934
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 82ea09a20aaf..7db035c2d6ca 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,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-foldoc/dictd-foldoc-2001.03.13-r1.ebuild,v 1.1 2001/06/09 19:22:43 michael Exp $
+# $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 $
 
-#P=
-A=foldoc-20010313.tar.gz
+MY_P=${PN}-20010313.tar.gz
 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-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