fixed missing init scripts/etc; closing bug #29688. marked stable for amd64.

9 files changed, 177 insertions, 2 deletions

diff --git a/app-text/dictd/ChangeLog b/app-text/dictd/ChangeLog
index 4d73a10f8f3b..3eb9a531514b 100644
--- a/app-text/dictd/ChangeLog
+++ b/app-text/dictd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/dictd
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/ChangeLog,v 1.10 2004/01/15 23:38:45 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/ChangeLog,v 1.11 2004/02/09 07:13:59 absinthe Exp $
+
+  09 Feb 2004; Dylan Carlson <absinthe@gentoo.org> files/1.9.11-r1/dict.conf,
+  files/1.9.11-r1/dictd, files/1.9.11-r1/dictd.conf,
+  files/1.9.11-r1/dictd.confd, files/1.9.11-r1/site.info:
+  fixed missing init scripts/etc; closing bug #29688.  marked stable for amd64.
 
 *dictd-1.9.11 (15 Jan 2004)
 
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index 5c835a751c36..8d40116c955f 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -1,12 +1,19 @@
-MD5 f28cbd1768537e2df7b872c63fe9950b ChangeLog 2477
+MD5 1997f3b8aded1910c5a023d7c52a4376 ChangeLog 2748
 MD5 268b44b571788ac515271d3ed8ffccfb dictd-1.8.0.ebuild 1447
 MD5 a73ebf96fb540fd06503fc7b07914c07 dictd-1.9.11.ebuild 1268
 MD5 1b0698d976f48dd2eabb7997b712d6f5 dictd-1.9.7.ebuild 1518
 MD5 eb03775ece62e57725480e782cd84ee8 metadata.xml 162
+MD5 02967ed92cb48453ef84b758808ac1a5 dictd-1.9.11-r1.ebuild 1271
 MD5 a97d38377255fef9ec22c3bf4c23fd6b files/dictd-1.8.0-gcc33-multiline-string-fix.patch 542
 MD5 7182349beb0e6f90f1d2c46cc8c5a3bc files/digest-dictd-1.8.0 63
 MD5 acfe9cbde6329db158f6a1b458be342c files/digest-dictd-1.9.11 64
 MD5 def86af861f23f0199d39fc99a4ff882 files/digest-dictd-1.9.7 63
+MD5 acfe9cbde6329db158f6a1b458be342c files/digest-dictd-1.9.11-r1 64
+MD5 fb72f7d8c55f84b1b37bbc8d33a8e55a files/1.9.11-r1/dict.conf 243
+MD5 c13d171b89bcf25d5bdc8dc3b63c192f files/1.9.11-r1/dictd 1783
+MD5 33b467f10a606af7fa36782d67b67616 files/1.9.11-r1/dictd.conf 569
+MD5 2063896920a5b204d6d5f7090786db73 files/1.9.11-r1/dictd.confd 135
+MD5 b8cabf913876e544d919c7f20ff8db9e files/1.9.11-r1/site.info 235
 MD5 fb72f7d8c55f84b1b37bbc8d33a8e55a files/1.8.0/dict.conf 243
 MD5 61b7f562737345d8466d23e05f378d38 files/1.8.0/dictd 1777
 MD5 33b467f10a606af7fa36782d67b67616 files/1.8.0/dictd.conf 569
diff --git a/app-text/dictd/dictd-1.9.11-r1.ebuild b/app-text/dictd/dictd-1.9.11-r1.ebuild
new file mode 100644
index 000000000000..9308926e598a
--- /dev/null
+++ b/app-text/dictd/dictd-1.9.11-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.9.11-r1.ebuild,v 1.1 2004/02/09 07:13:59 absinthe Exp $
+
+inherit gnuconfig
+
+DESCRIPTION="Dictionary Client/Server for the DICT protocol"
+HOMEPAGE="http://www.dict.org/"
+SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm amd64 ~ia64 ~ppc64"
+
+DEPEND="virtual/glibc"
+
+src_compile() {
+
+	# Update config.sub and config.guess so dictd understands the sparc architecture
+	gnuconfig_update
+
+	econf \
+		--with-cflags="${CFLAGS}" \
+		--sysconfdir=/etc/dict || die
+	make || die
+}
+
+src_install() {
+	# Now install it.
+	make DESTDIR=${D} install || die "install failed"
+
+	# 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.
+	dodir /etc/dict
+	insinto /etc/dict
+	doins ${FILESDIR}/${PVR}/dict.conf
+	doins ${FILESDIR}/${PVR}/dictd.conf
+	doins ${FILESDIR}/${PVR}/site.info
+
+	# startups for dictd
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/${PVR}/dictd dictd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/${PVR}/dictd.confd dictd
+}
diff --git a/app-text/dictd/files/1.9.11-r1/dict.conf b/app-text/dictd/files/1.9.11-r1/dict.conf
new file mode 100644
index 000000000000..e06c3d296ec3
--- /dev/null
+++ b/app-text/dictd/files/1.9.11-r1/dict.conf
@@ -0,0 +1,6 @@
+# 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.9.11-r1/dictd b/app-text/dictd/files/1.9.11-r1/dictd
new file mode 100644
index 000000000000..1072ab1cf847
--- /dev/null
+++ b/app-text/dictd/files/1.9.11-r1/dictd
@@ -0,0 +1,72 @@
+#!/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.9.11-r1/dictd,v 1.1 2004/02/09 07:13:59 absinthe Exp $
+
+# NB: Config is in /etc/conf.d/dictd
+
+
+prepconfig() {
+	if [ ! -e ${DICTDCONF} ]
+	then
+		eerror "dictd not started.  Config file not found."
+		return 1
+	fi
+	# if no dictionaries, skip startup.
+
+	# The new way of doing this is to scan /usr/lib/dict and tweek the conf
+	einfo "Scanning for dictionaries..."
+	if [ ! -d "${DLIBDIR}" ]; then
+		eerror "${DLIBDIR} doesn't exist, no dictionaries found."
+		return 1
+	fi
+	pushd ${DLIBDIR} >/dev/null
+	INDEXFILES=`ls *.index`
+	if [ -z "$INDEXFILES" ]; then
+		eerror "No dictionaries installed."
+		return 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."
+}
+
+depend() {
+	need localmount
+}
+
+start() {
+	ebegin "Starting dictd"
+	prepconfig || return 1
+	start-stop-daemon --start --quiet --exec /usr/sbin/dictd -- $EARGS
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping dictd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/dictd
+	eend $?
+}
diff --git a/app-text/dictd/files/1.9.11-r1/dictd.conf b/app-text/dictd/files/1.9.11-r1/dictd.conf
new file mode 100644
index 000000000000..4cded974f973
--- /dev/null
+++ b/app-text/dictd/files/1.9.11-r1/dictd.conf
@@ -0,0 +1,22 @@
+# 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.9.11-r1/dictd.confd b/app-text/dictd/files/1.9.11-r1/dictd.confd
new file mode 100644
index 000000000000..91b9d43884bc
--- /dev/null
+++ b/app-text/dictd/files/1.9.11-r1/dictd.confd
@@ -0,0 +1,7 @@
+# Config file for /etc/init.d/dictd
+
+EARGS="-s "
+DICTDCONF=/etc/dict/dictd.conf
+DLIBDIR=/usr/lib/dict
+TMPCONF=/etc/dict/dictd.conf.$$
+
diff --git a/app-text/dictd/files/1.9.11-r1/site.info b/app-text/dictd/files/1.9.11-r1/site.info
new file mode 100644
index 000000000000..23bfdeb61102
--- /dev/null
+++ b/app-text/dictd/files/1.9.11-r1/site.info
@@ -0,0 +1,6 @@
+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/digest-dictd-1.9.11-r1 b/app-text/dictd/files/digest-dictd-1.9.11-r1
new file mode 100644
index 000000000000..30694fec3ece
--- /dev/null
+++ b/app-text/dictd/files/digest-dictd-1.9.11-r1
@@ -0,0 +1 @@
+MD5 4d06aabf573c862fd29e409984f71a67 dictd-1.9.11.tar.gz 695037