version bump, thanks to: José Romildo Malaquias <romildo@uber.com.br> in bug #36638

19 files changed, 37 insertions, 275 deletions

diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index 35cfc999b23f..42f666e8f0a6 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -1,26 +1,16 @@
-MD5 b601c97cf1de09b0be4ce55148f56467 dictd-1.5.5-r6.ebuild 1293
-MD5 a0dbbfb78cf8d2b85763f095b222a917 dictd-1.9.7.ebuild 1589
-MD5 06c0726502723c1784064ea4cd16a67c ChangeLog 1540
+MD5 09176f81b92c8db94403ecdd82f9510f dictd-1.9.7.ebuild 1491
+MD5 8c1bbce25f0e7492f129d4793b7613b0 ChangeLog 2273
+MD5 268b44b571788ac515271d3ed8ffccfb dictd-1.8.0.ebuild 1447
 MD5 7182349beb0e6f90f1d2c46cc8c5a3bc files/digest-dictd-1.8.0 63
 MD5 def86af861f23f0199d39fc99a4ff882 files/digest-dictd-1.9.7 63
-MD5 9aac19f201e5a765d5ff77a0a5ffedd3 files/digest-dictd-1.5.5-r6 63
 MD5 a97d38377255fef9ec22c3bf4c23fd6b files/dictd-1.8.0-gcc33-multiline-string-fix.patch 542
-MD5 857f4af138c519ec6f066c52b27df293 files/1.5.5-r2/svc-dictd 1809
-MD5 33b467f10a606af7fa36782d67b67616 files/1.5.5-r2/dictd.conf 569
-MD5 b8cabf913876e544d919c7f20ff8db9e files/1.5.5-r2/site.info 235
-MD5 fb72f7d8c55f84b1b37bbc8d33a8e55a files/1.5.5-r2/dict.conf 243
-MD5 b6d425a0998260d9f7cc4b3cd2f4b001 files/1.5.5-r2/dictd-run 133
-MD5 33b467f10a606af7fa36782d67b67616 files/1.5.5-r3/dictd.conf 569
-MD5 b8cabf913876e544d919c7f20ff8db9e files/1.5.5-r3/site.info 235
-MD5 fb72f7d8c55f84b1b37bbc8d33a8e55a files/1.5.5-r3/dict.conf 243
-MD5 3e75b61f1d7c0e55f2304d8113de6dda files/1.5.5-r3/rc.dictd 1757
-MD5 33b467f10a606af7fa36782d67b67616 files/1.5.5-r6/dictd.conf 569
-MD5 2063896920a5b204d6d5f7090786db73 files/1.5.5-r6/dictd.confd 135
-MD5 b8cabf913876e544d919c7f20ff8db9e files/1.5.5-r6/site.info 235
-MD5 fb72f7d8c55f84b1b37bbc8d33a8e55a files/1.5.5-r6/dict.conf 243
-MD5 f3df708a583c2090f9af24c67ba77174 files/1.5.5-r6/dictd.rc6 1784
 MD5 61b7f562737345d8466d23e05f378d38 files/1.8.0/dictd 1777
 MD5 33b467f10a606af7fa36782d67b67616 files/1.8.0/dictd.conf 569
 MD5 2063896920a5b204d6d5f7090786db73 files/1.8.0/dictd.confd 135
 MD5 b8cabf913876e544d919c7f20ff8db9e files/1.8.0/site.info 235
 MD5 fb72f7d8c55f84b1b37bbc8d33a8e55a files/1.8.0/dict.conf 243
+MD5 47ff8725db14bf9c5c9c660525d8cc08 files/1.9.7/dictd 1778
+MD5 33b467f10a606af7fa36782d67b67616 files/1.9.7/dictd.conf 569
+MD5 2063896920a5b204d6d5f7090786db73 files/1.9.7/dictd.confd 135
+MD5 b8cabf913876e544d919c7f20ff8db9e files/1.9.7/site.info 235
+MD5 fb72f7d8c55f84b1b37bbc8d33a8e55a files/1.9.7/dict.conf 243
diff --git a/app-text/dictd/dictd-1.8.0.ebuild b/app-text/dictd/dictd-1.8.0.ebuild
index dea8dab0e797..e4c70b0db193 100644
--- a/app-text/dictd/dictd-1.8.0.ebuild
+++ b/app-text/dictd/dictd-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.8.0.ebuild,v 1.10 2003/12/17 03:44:28 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.8.0.ebuild,v 1.11 2003/12/29 09:18:56 seemant Exp $
 
 inherit gnuconfig
 
@@ -8,20 +8,12 @@ DESCRIPTION="Dictionary Client/Server for the DICT protocol"
 HOMEPAGE="http://www.dict.org/"
 SRC_URI="ftp://ftp.dict.org/pub/dict/${P}.tar.gz"
 
-LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc ~sparc ia64 ppc64"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc ~alpha ~hppa ~mips ~arm  ia64 ppc64"
 
 DEPEND="virtual/glibc"
 
-src_unpack() {
-	unpack ${A}
-
-	# Patch to fix a gcc-3.3.x multi-line string issue.
-	# Closes Bug #29227
-	epatch ${FILESDIR}/${P}-gcc33-multiline-string-fix.patch
-}
-
 src_compile() {
 
 	# Update config.sub and config.guess so dictd understands the sparc architecture
diff --git a/app-text/dictd/dictd-1.5.5-r6.ebuild b/app-text/dictd/dictd-1.9.7.ebuild
index 2e02f4177bed..5374b2286795 100644
--- a/app-text/dictd/dictd-1.5.5-r6.ebuild
+++ b/app-text/dictd/dictd-1.9.7.ebuild
@@ -1,20 +1,27 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.5.5-r6.ebuild,v 1.12 2003/09/08 06:18:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.9.7.ebuild,v 1.1 2003/12/29 09:18:56 seemant Exp $
+
+inherit gnuconfig
 
 DESCRIPTION="Dictionary Client/Server for the DICT protocol"
 HOMEPAGE="http://www.dict.org/"
 SRC_URI="ftp://ftp.dict.org/pub/dict/${P}.tar.gz"
 
-LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc ppc"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~amd64 ~ia64 ~ppc64"
 
-DEPEND="virtual/glibc
-	sys-devel/gcc"
+DEPEND="virtual/glibc"
 
 src_compile() {
-	econf --with-etcdir=/etc/dict || die
+
+	# Update config.sub and config.guess so dictd understands the sparc architecture
+	gnuconfig_update
+
+	econf \
+		--with-cflags="${CFLAGS}" \
+		--with-etcdir=/etc/dict || die
 	make || die
 }
 
@@ -25,25 +32,29 @@ src_install() {
 	dodir /usr/share/man/man1
 	dodir /usr/share/man/man8
 
-	#Now install it.
-	make prefix=${D}/usr man1_prefix=${D}/usr/share/man/man1 \
-				man8_prefix=${D}/usr/share/man/man8 conf=${D}/etc/dict install || die
+	# Now install it.
+	make \
+		prefix=${D}/usr \
+		man1_prefix=${D}/usr/share/man/man1 \
+		man8_prefix=${D}/usr/share/man/man8 \
+		conf=${D}/etc/dict \
+		install || die
 
-	#Install docs
+	# Install docs
 	dodoc README TODO COPYING ChangeLog ANNOUNCE
 	dodoc doc/dicf.ms doc/rfc.ms doc/rfc.sh doc/rfc2229.txt
 	dodoc doc/security.doc doc/toc.ms
 
-	#conf files.
+	# conf files.
 	dodir /etc/dict
 	insinto /etc/dict
 	doins ${FILESDIR}/${PVR}/dict.conf
 	doins ${FILESDIR}/${PVR}/dictd.conf
 	doins ${FILESDIR}/${PVR}/site.info
 
-	#startups for dictd
+	# startups for dictd
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/${PVR}/dictd.rc6 dictd
+	newexe ${FILESDIR}/${PVR}/dictd dictd
 	insinto /etc/conf.d
 	newins ${FILESDIR}/${PVR}/dictd.confd dictd
 }
diff --git a/app-text/dictd/files/1.5.5-r2/dictd-run b/app-text/dictd/files/1.5.5-r2/dictd-run
deleted file mode 100755
index 94572da5456a..000000000000
--- a/app-text/dictd/files/1.5.5-r2/dictd-run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-# We abuse some debugging features here to get the desired behavior
-exec dictd -s -d nodetach < /dev/null > /dev/null 2>&1
diff --git a/app-text/dictd/files/1.5.5-r2/svc-dictd b/app-text/dictd/files/1.5.5-r2/svc-dictd
deleted file mode 100755
index 3a21ac5e43ad..000000000000
--- a/app-text/dictd/files/1.5.5-r2/svc-dictd
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-#RCUPDATE:3 4:75:This line is required for script management
-
-. /etc/rc.d/config/functions
-
-SERVICE=dictd
-opts="start stop"
-
-
-DICTDCONF=/etc/dict/dictd.conf
-TMPCONF=/etc/dict/dictd.conf.$$
-prepconfig() {
-	if [ ! -e ${DICTDCONF} ]
-	then
-		eerror "dictd not started.  Config file not found."
-		exit 1
-	fi
-	# if no dictionaries, skip startup.
-
-# The new way of doing this is to scan /usr/lib/dict and tweek the conf
-	DLIBDIR=/usr/lib/dict 
-
-	einfo "Scanning for dictionaries..."
-	if [ ! -d "${DLIBDIR}" ]; then
-		eerror "${DLIBDIR} doesn't exist, no dictionaries found."
-		exit 1
-	fi
-	pushd ${DLIBDIR} >/dev/null
-	INDEXFILES=`ls *.index`
-	if [ -z "$INDEXFILES" ]; then
-		eerror "No dictionaries installed."
-		exit 1
-	fi
-
-	cat $DICTDCONF | sed -e '/^#LASTLINE/,$d' > $TMPCONF
-	echo "#LASTLINE" >> $TMPCONF
-
-	CNT=0
-	for i in $INDEXFILES
-	do
-		DNAME=`echo $i | awk -F . '{print $1;}'`
-		#two possible names for a matching dictionary, check which is there.
-		if [ -f ${DNAME}.dict.dz ]; then
-			DICT=${DNAME}.dict.dz
-		elif [ -f ${DNAME}.dict ];then
-			DICT=${DNAME}.dict
-		else
-			einfo "Index $i has no matching dictionaray..."
-		fi
-
-		#ok, go an index, and a dixtionary, append.
-		echo "database $DNAME { data \"${DLIBDIR}/${DICT}\"" >> $TMPCONF
-		echo "         index \"${DLIBDIR}/$i\" }" >> $TMPCONF
-
-		CNT=`expr $CNT + 1`
-	done
-	popd >/dev/null
-	mv ${TMPCONF} ${DICTDCONF}
-	einfo "Done, $CNT dictionary indexes found."
-}
-
-start() {
-    ebegin "Starting supervised ${SERVICE}"
-    prepconfig
-	ln -sf ../services/${SERVICE} ${SVCDIR}/control/${SERVICE}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping supervised ${SERVICE}"
-   	if [ -e ${SVCDIR}/control/${SERVICE} ]
-	then
-		/usr/bin/svc -dx ${SVCDIR}/control/${SERVICE}
-		rm ${SVCDIR}/control/${SERVICE}
-	fi
-	eend $?
-}
-
-doservice ${@}
-
-#vim:sw=4:ts=4:ai
diff --git a/app-text/dictd/files/1.5.5-r3/dict.conf b/app-text/dictd/files/1.5.5-r3/dict.conf
deleted file mode 100644
index e06c3d296ec3..000000000000
--- a/app-text/dictd/files/1.5.5-r3/dict.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# This is the configuration file for dict.
-# Usually all you will ever need here is the server keywords.
-# Refer to the dict manpage for other options.
-# It will only check the second server if the first fails
-server localhost
-server dict.org
diff --git a/app-text/dictd/files/1.5.5-r3/dictd.conf b/app-text/dictd/files/1.5.5-r3/dictd.conf
deleted file mode 100644
index 4cded974f973..000000000000
--- a/app-text/dictd/files/1.5.5-r3/dictd.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# dictd configuration file.
-# whipped up by michael conrad tilstra <michael@gentoo.org>
-
-# Informational message
-site site.info
-
-# who's allowed.  You might want to change this.
-access {
-  allow *
-}
-
-# Dictionaries are listed below.
-# The initrc script scans /usr/lib/dict and adds all of the dictionaries
-# it finds here.  
-# 
-# The initrc script will delete everything after the the last line and
-# replace it with what it finds.  So add all of your things above.
-# 
-# If this is a problem for people, contact me and
-# we can work out a different method.
-#
-#LASTLINE
diff --git a/app-text/dictd/files/1.5.5-r3/rc.dictd b/app-text/dictd/files/1.5.5-r3/rc.dictd
deleted file mode 100644
index cd932537045b..000000000000
--- a/app-text/dictd/files/1.5.5-r3/rc.dictd
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-#RCUPDATE:3 4:75:This line is required for script management
-
-. /etc/rc.d/config/functions
-
-SERVICE=dictd
-opts="start stop"
-
-EXEC=/usr/sbin/dictd
-EARGS="-s "
-
-DICTDCONF=/etc/dict/dictd.conf
-TMPCONF=/etc/dict/dictd.conf.$$
-prepconfig() {
-	if [ ! -e ${DICTDCONF} ]
-	then
-		eerror "dictd not started.  Config file not found."
-		exit 1
-	fi
-	# if no dictionaries, skip startup.
-
-# The new way of doing this is to scan /usr/lib/dict and tweek the conf
-	DLIBDIR=/usr/lib/dict 
-
-	einfo "Scanning for dictionaries..."
-	if [ ! -d "${DLIBDIR}" ]; then
-		eerror "${DLIBDIR} doesn't exist, no dictionaries found."
-		exit 1
-	fi
-	pushd ${DLIBDIR} >/dev/null
-	INDEXFILES=`ls *.index`
-	if [ -z "$INDEXFILES" ]; then
-		eerror "No dictionaries installed."
-		exit 1
-	fi
-
-	cat $DICTDCONF | sed -e '/^#LASTLINE/,$d' > $TMPCONF
-	echo "#LASTLINE" >> $TMPCONF
-
-	CNT=0
-	for i in $INDEXFILES
-	do
-		DNAME=`echo $i | awk -F . '{print $1;}'`
-		#two possible names for a matching dictionary, check which is there.
-		if [ -f ${DNAME}.dict.dz ]; then
-			DICT=${DNAME}.dict.dz
-		elif [ -f ${DNAME}.dict ];then
-			DICT=${DNAME}.dict
-		else
-			einfo "Index $i has no matching dictionaray..."
-		fi
-
-		#ok, go an index, and a dixtionary, append.
-		echo "database $DNAME { data \"${DLIBDIR}/${DICT}\"" >> $TMPCONF
-		echo "         index \"${DLIBDIR}/$i\" }" >> $TMPCONF
-
-		CNT=`expr $CNT + 1`
-	done
-	popd >/dev/null
-	mv ${TMPCONF} ${DICTDCONF}
-	einfo "Done, $CNT dictionary indexes found."
-}
-
-start() {
-    ebegin "Starting ${SERVICE}"
-    prepconfig
-    start-stop-daemon --start --quiet --exec $EXEC -- $EARGS
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping ${SERVICE}"
-    start-stop-daemon --stop --quiet --name ${SERVICE} --exec $EXEC
-    eend $?
-}
-
-doservice ${@}
-
-#vim:sw=4:ts=4:ai
diff --git a/app-text/dictd/files/1.5.5-r3/site.info b/app-text/dictd/files/1.5.5-r3/site.info
deleted file mode 100644
index 23bfdeb61102..000000000000
--- a/app-text/dictd/files/1.5.5-r3/site.info
+++ /dev/null
@@ -1,6 +0,0 @@
-Welcome to your dictionary server dictd!
-
-This is an example site information file.  It should contain information
-about any restricted databases and how users can obtain access.  If may
-also contain other random data as you see fit.
-
diff --git a/app-text/dictd/files/1.5.5-r6/dict.conf b/app-text/dictd/files/1.5.5-r6/dict.conf
deleted file mode 100644
index e06c3d296ec3..000000000000
--- a/app-text/dictd/files/1.5.5-r6/dict.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# This is the configuration file for dict.
-# Usually all you will ever need here is the server keywords.
-# Refer to the dict manpage for other options.
-# It will only check the second server if the first fails
-server localhost
-server dict.org
diff --git a/app-text/dictd/files/1.5.5-r6/dictd.conf b/app-text/dictd/files/1.5.5-r6/dictd.conf
deleted file mode 100644
index 4cded974f973..000000000000
--- a/app-text/dictd/files/1.5.5-r6/dictd.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# dictd configuration file.
-# whipped up by michael conrad tilstra <michael@gentoo.org>
-
-# Informational message
-site site.info
-
-# who's allowed.  You might want to change this.
-access {
-  allow *
-}
-
-# Dictionaries are listed below.
-# The initrc script scans /usr/lib/dict and adds all of the dictionaries
-# it finds here.  
-# 
-# The initrc script will delete everything after the the last line and
-# replace it with what it finds.  So add all of your things above.
-# 
-# If this is a problem for people, contact me and
-# we can work out a different method.
-#
-#LASTLINE
diff --git a/app-text/dictd/files/1.5.5-r6/site.info b/app-text/dictd/files/1.5.5-r6/site.info
deleted file mode 100644
index 23bfdeb61102..000000000000
--- a/app-text/dictd/files/1.5.5-r6/site.info
+++ /dev/null
@@ -1,6 +0,0 @@
-Welcome to your dictionary server dictd!
-
-This is an example site information file.  It should contain information
-about any restricted databases and how users can obtain access.  If may
-also contain other random data as you see fit.
-
diff --git a/app-text/dictd/files/1.5.5-r2/dict.conf b/app-text/dictd/files/1.9.7/dict.conf
index e06c3d296ec3..e06c3d296ec3 100644
--- a/app-text/dictd/files/1.5.5-r2/dict.conf
+++ b/app-text/dictd/files/1.9.7/dict.conf
diff --git a/app-text/dictd/files/1.5.5-r6/dictd.rc6 b/app-text/dictd/files/1.9.7/dictd
index 731664d79529..17407fcedaa2 100644
--- a/app-text/dictd/files/1.5.5-r6/dictd.rc6
+++ b/app-text/dictd/files/1.9.7/dictd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/files/1.5.5-r6/dictd.rc6,v 1.5 2003/02/14 22:39:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/files/1.9.7/dictd,v 1.1 2003/12/29 09:18:57 seemant Exp $
 
 # NB: Config is in /etc/conf.d/dictd
 
diff --git a/app-text/dictd/files/1.5.5-r2/dictd.conf b/app-text/dictd/files/1.9.7/dictd.conf
index 4cded974f973..4cded974f973 100644
--- a/app-text/dictd/files/1.5.5-r2/dictd.conf
+++ b/app-text/dictd/files/1.9.7/dictd.conf
diff --git a/app-text/dictd/files/1.5.5-r6/dictd.confd b/app-text/dictd/files/1.9.7/dictd.confd
index 91b9d43884bc..91b9d43884bc 100644
--- a/app-text/dictd/files/1.5.5-r6/dictd.confd
+++ b/app-text/dictd/files/1.9.7/dictd.confd
diff --git a/app-text/dictd/files/1.5.5-r2/site.info b/app-text/dictd/files/1.9.7/site.info
index 23bfdeb61102..23bfdeb61102 100644
--- a/app-text/dictd/files/1.5.5-r2/site.info
+++ b/app-text/dictd/files/1.9.7/site.info
diff --git a/app-text/dictd/files/digest-dictd-1.5.5-r6 b/app-text/dictd/files/digest-dictd-1.5.5-r6
deleted file mode 100644
index 236c02b860cd..000000000000
--- a/app-text/dictd/files/digest-dictd-1.5.5-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 67307b6e5d0337f354b275c377506c63 dictd-1.5.5.tar.gz 531110
diff --git a/app-text/dictd/files/digest-dictd-1.9.7 b/app-text/dictd/files/digest-dictd-1.9.7
new file mode 100644
index 000000000000..1c393208ea39
--- /dev/null
+++ b/app-text/dictd/files/digest-dictd-1.9.7
@@ -0,0 +1 @@
+MD5 baa8f18dd0373e7053658be99d40d5db dictd-1.9.7.tar.gz 665250