Disabled tests on bid-endian architectures, bug #244246, updated init script to make it more steady, bug #245593 thank Erik Hahn for report and fix.

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.26-openvz.git-35f41f1 i686

9 files changed, 30 insertions, 150 deletions

diff --git a/app-text/dictd/ChangeLog b/app-text/dictd/ChangeLog
index bc42703ad39d..4c8caaaa2a1e 100644
--- a/app-text/dictd/ChangeLog
+++ b/app-text/dictd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/dictd
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/ChangeLog,v 1.48 2008/11/03 22:33:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/ChangeLog,v 1.49 2008/11/08 18:36:21 pva Exp $
+
+  08 Nov 2008; Peter Volkov <pva@gentoo.org> -files/1.10.9/dict.conf,
+  -files/1.10.9/dictd, -files/1.10.9/dictd.conf, -files/1.10.9/dictd.confd,
+  -files/1.10.9/site.info, files/1.10.11/dictd.initd,
+  dictd-1.10.11-r3.ebuild:
+  Disabled tests on bid-endian architectures, bug #244246, updated init
+  script to make it more steady, bug #245593 thank Erik Hahn for report and
+  fix.
 
   03 Nov 2008; Markus Meier <maekke@gentoo.org> dictd-1.10.11-r3.ebuild:
   amd64/x86 stable, bug #244246
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index d4507d829209..d32fc533110e 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.10.11/colorit.conf 848 RMD160 cebf4cd68e62ee6218bb39f88c655d3bacaa3c25 SHA1 47f9188eee886463c13c853831d073d1711c0392 SHA256 54969fbc6e782013c086e3055f0fa1989ddeb71f5b87e94205d82cefee657d8f
 AUX 1.10.11/dict.conf 243 RMD160 5adc267e57f7a4e526d2b6d7ef43ed712d1e6a19 SHA1 acaad0d56fc7fa4f3cc48152ad13cbba265c8faa SHA256 278b6986ebbfe74396a9e287d94a2d8128a83d511df84f02093058081aa12d57
 AUX 1.10.11/dictd.conf 563 RMD160 18b435b7ef4ca3a8da6f38706965857bc1d0e28e SHA1 839fbbb050069cd4600e0cf18580e4b6ae64c43c SHA256 06f1c42afd56a98a736cc252f0271889030d8b57754bc4054905e318508d5e37
 AUX 1.10.11/dictd.confd 204 RMD160 5f8e7e3d62691046beb21db7a589933c9087c2a0 SHA1 b89dde0caae092eb6f232d323f21fe7b43d23d0f SHA256 988c5f8e391519119c456af8cd308c1f323b4701aefff3d662944e3d3499a25a
-AUX 1.10.11/dictd.initd 1972 RMD160 01d7ffcd6deab75249eb817134f62cef3aef6f04 SHA1 4a7ba444c5e190a293388a42c3dddc457d39c6f0 SHA256 bac733de796c710e9474ff3f460664f6d416277c37c00b06068cb22b1fa1fdfd
+AUX 1.10.11/dictd.initd 2079 RMD160 cccabf4471907be68a7a43fe2a7aa704ad1ebb33 SHA1 eba116dc66e812ac6e74e2113d0422117a6a89f5 SHA256 f3d6a6bbe34411f19bee071e97c41997148029e8147d7e9842dfb0101fe2e9cb
 AUX 1.10.11/site.info 235 RMD160 3bee51beb2ad856a6de1941764158f558c124733 SHA1 5de46179c02e3cf7a6f5360e5399b089db30878d SHA256 cb55e7aaedef73665996f015a07e97e45cd3771775e291d798bf163b0052c0a2
-AUX 1.10.9/dict.conf 243 RMD160 5adc267e57f7a4e526d2b6d7ef43ed712d1e6a19 SHA1 acaad0d56fc7fa4f3cc48152ad13cbba265c8faa SHA256 278b6986ebbfe74396a9e287d94a2d8128a83d511df84f02093058081aa12d57
-AUX 1.10.9/dictd 1841 RMD160 53e45ab00f48e6064b21deec906d7ae0aa31fe02 SHA1 fab59d4456ffe4d13e0006364c78994e8f716fa3 SHA256 af89ca3e18800ff6c0889d363061617578e2dfdad0bdce7585edf91ec194ff60
-AUX 1.10.9/dictd.conf 582 RMD160 40e0724067b6e51c70c3a57cad31016d4f9c4055 SHA1 2d0aeb8c0bdb1653080c1c2689fe10e0a70e0dc5 SHA256 3c3bd8186c94cf15759927a9baf98813d4ebe1b38b809894fe15a8dfad2d91dc
-AUX 1.10.9/dictd.confd 370 RMD160 91711286732ed4ff0461ff87d56a19e8c5cf4494 SHA1 80246a38bedc5fb1b2b7db71803eaa650be6937c SHA256 165d4a8a96d70b878d397a2f011d0521e46ac16781a63751a1e0b84791d52565
-AUX 1.10.9/site.info 235 RMD160 3bee51beb2ad856a6de1941764158f558c124733 SHA1 5de46179c02e3cf7a6f5360e5399b089db30878d SHA256 cb55e7aaedef73665996f015a07e97e45cd3771775e291d798bf163b0052c0a2
 AUX 1.9.11-r1/dict.conf 243 RMD160 5adc267e57f7a4e526d2b6d7ef43ed712d1e6a19 SHA1 acaad0d56fc7fa4f3cc48152ad13cbba265c8faa SHA256 278b6986ebbfe74396a9e287d94a2d8128a83d511df84f02093058081aa12d57
 AUX 1.9.11-r1/dictd 1764 RMD160 30ba15cec4d7e1ea775979e978c654b09520faf6 SHA1 79eba7d9a7b02e486ff6fa12c54d71fc18e55c3d SHA256 2c0f48f96362302b66c9e5ac823114db366608a4f0079a3a62a1fc9c581f43c1
 AUX 1.9.11-r1/dictd.conf 569 RMD160 e34f2bdb7e72d13392563c302f379485c0ddb9cb SHA1 b42419bcf3d94c66c86cfb827384b0f770f0951e SHA256 8fd62c0d1863c003cdfda0bff4a7d411bcd3fdd2d71c78570336aff86af6d571
@@ -28,15 +20,8 @@ DIST dictd-1.10.11.tar.gz 696755 RMD160 829a71325d59210023b420ffe89cd5477d354cdb
 DIST dictd-1.9.11.tar.gz 695037 RMD160 05a96cc450fbf6f28b3d953fa8982b6b865f27da SHA1 04cfab51c9644b32e1011d213f127a7cb28b32df SHA256 950ab4d82678c2edc17bcddde1ea89be8d47f6c91aee2b765c6caf3d9458eb71
 DIST dictd-1.9.14.tar.gz 749577 RMD160 7e97124f0ccbff5a1190e50943d144854a5c82bd SHA1 bb20ce6ac112742998a0083f6d7d96b95203c84d SHA256 9f7fb75996047f837261a60085e930aae813f6decb68745602ba3d6f0563d708
 EBUILD dictd-1.10.11-r2.ebuild 2950 RMD160 9acb46753db2002d957d1dd4944d9b878714cdc6 SHA1 ae479a5267bef63feffe24dbe45ff7b616b3b537 SHA256 f5ca52567d9096e6bbe4b579a1e2f2db71f0bd8ecab47e913e515c9dec7a1b0e
-EBUILD dictd-1.10.11-r3.ebuild 3113 RMD160 4a33e4c9331fb08ea2c496da99d010c6afa3e342 SHA1 f18a666cc7955cfbdf7632050cc710d3e55c4530 SHA256 fd321ef9fd1924ee268f05ba87918131685674cebecb3f2aad81a937b2c17f81
+EBUILD dictd-1.10.11-r3.ebuild 3253 RMD160 1c5070430aa46498da4cd60b8f0d699040aa5ce1 SHA1 6b0799abc45f14c833222882fa7b2da9d4311a06 SHA256 8b7dc7bd526e09370b4b01fc0b3c70bc7793ce67e06057c2e21a9fe30968406f
 EBUILD dictd-1.9.11-r1.ebuild 1216 RMD160 f229a030c647f1436613ecd163ab2b027cc20397 SHA1 1b4a63a1e9738127196569add730c8d0e892cbfc SHA256 a4883457eec96f38c4d49df49ada2bbfc11faa903feee40a11748da4d335bc80
 EBUILD dictd-1.9.14.ebuild 1226 RMD160 5e9551ed61d1cfa7ea09fe12ef22408599230584 SHA1 267fab851770f877fd48b989d2934e98801ff76f SHA256 37ea9118b0bfb5bf38d846eb359437f6898205086dbdcebc9ec3f5de57ae2b6e
-MISC ChangeLog 8870 RMD160 3e8d1b575b86187a5ba0b1a3b3a3463c0cd58f5b SHA1 ae4c54b2ac316c0fdc6b094546114804e2299836 SHA256 c92ae3291ae06c27b8a16567b1c10fddca8fcb899253cb6d1ff8a9d077966ca2
+MISC ChangeLog 9250 RMD160 ec1719d9e8c6b577a13230e228695777fb718e3d SHA1 e15184fc2acbace5ca145139b5d2ff64dda7ac7b SHA256 cb92036657b65102e5bacdfcb410fb11d759af08467b756d59dcfc82dba74fc4
 MISC metadata.xml 441 RMD160 f87ec33f5dd676dc8bb1a907ef63e2a553cc61cd SHA1 d5c072ccc0b4534417e47597c3fecdba3dedf563 SHA256 271007859ca1ce4c94076aa6e0f1cfa10d9c382ed8776209490544816ad32930
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkPfIMACgkQkKaRLQcq0GLwFQCfXLaY2bX+Wom48Eh5ysPvJcpi
-bHsAoINsRSk2mkyhzhOlEOMcv5dNKWDb
-=Hp6R
------END PGP SIGNATURE-----
diff --git a/app-text/dictd/dictd-1.10.11-r3.ebuild b/app-text/dictd/dictd-1.10.11-r3.ebuild
index 50bf48fa792b..d9bbf63406ed 100644
--- a/app-text/dictd/dictd-1.10.11-r3.ebuild
+++ b/app-text/dictd/dictd-1.10.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.10.11-r3.ebuild,v 1.3 2008/11/03 22:33:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.10.11-r3.ebuild,v 1.4 2008/11/08 18:36:21 pva Exp $
 
 inherit eutils autotools
 
@@ -44,13 +44,18 @@ src_unpack() {
 }
 
 src_test() {
-	if ! hasq userpriv "${FEATURES}"; then
-		# If dictd is run as root user (-userpriv) it drops its privileges to
-		# dictd user and group. Give dictd group write access to test directory.
-		chown :dictd "${WORKDIR}" "${S}/test"
-		chmod 770 "${WORKDIR}" "${S}/test"
+	if use ppc || use ppc64; then
+		ewarn "Tests are known to fail on big-endian systems (ppc, ppc64)"
+		ewarn "Skipping tests."
+	else
+		if ! hasq userpriv "${FEATURES}"; then
+			# If dictd is run as root user (-userpriv) it drops its privileges to
+			# dictd user and group. Give dictd group write access to test directory.
+			chown :dictd "${WORKDIR}" "${S}/test"
+			chmod 770 "${WORKDIR}" "${S}/test"
+		fi
+		emake test || die
 	fi
-	emake test || die
 }
 
 src_compile() {
diff --git a/app-text/dictd/files/1.10.11/dictd.initd b/app-text/dictd/files/1.10.11/dictd.initd
index 53e491fbe731..6bf1b1c218af 100644
--- a/app-text/dictd/files/1.10.11/dictd.initd
+++ b/app-text/dictd/files/1.10.11/dictd.initd
@@ -1,7 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/files/1.10.11/dictd.initd,v 1.2 2008/09/14 08:59:45 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/files/1.10.11/dictd.initd,v 1.3 2008/11/08 18:36:21 pva Exp $
+
+DICTD_PID="/var/run/dictd.pid"
 
 prepconfig() {
 	local TMPCONF INDEXFILES CNT DNAME DICT
@@ -61,12 +63,13 @@ depend() {
 start() {
 	prepconfig || return 1
 	ebegin "Starting dictd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/dictd -- ${DICTD_OPTS}
+	start-stop-daemon --start --quiet --pidfile ${DICTD_PID} --exec \
+			/usr/sbin/dictd -- --pid-file ${DICTD_PID} ${DICTD_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping dictd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/dictd
+	start-stop-daemon --stop --quiet --pidfile ${DICTD_PID} --exec /usr/sbin/dictd
 	eend $?
 }
diff --git a/app-text/dictd/files/1.10.9/dict.conf b/app-text/dictd/files/1.10.9/dict.conf
deleted file mode 100644
index e06c3d296ec3..000000000000
--- a/app-text/dictd/files/1.10.9/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.10.9/dictd b/app-text/dictd/files/1.10.9/dictd
deleted file mode 100644
index dfb4499eae02..000000000000
--- a/app-text/dictd/files/1.10.9/dictd
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/files/1.10.9/dictd,v 1.2 2007/09/02 12:16:07 philantrop 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}
-	if [ -n "${DICTDCONF_MOD}" ]; then
-		chmod ${DICTDCONF_MOD} ${DICTDCONF}
-	fi
-	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.10.9/dictd.conf b/app-text/dictd/files/1.10.9/dictd.conf
deleted file mode 100644
index 2f9426675dda..000000000000
--- a/app-text/dictd/files/1.10.9/dictd.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# dictd configuration file.
-# whipped up by michael conrad tilstra <michael@gentoo.org>
-
-global {
-	# 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.10.9/dictd.confd b/app-text/dictd/files/1.10.9/dictd.confd
deleted file mode 100644
index ce35be86ac17..000000000000
--- a/app-text/dictd/files/1.10.9/dictd.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Config file for /etc/init.d/dictd
-
-# Should you have problems starting dictd in an UTF-8 locale, add an appropriate
-# --locale switch to EARGS, e. g. "--locale=en_US.utf8"
-EARGS="-s "
-DICTDCONF=/etc/dict/dictd.conf
-# Set DICTDCONF_MOD if you have a custom umask. cf. bug 90657 on bugs.gentoo.org 
-DICTDCONF_MOD=""
-DLIBDIR=/usr/lib/dict
-TMPCONF=/etc/dict/dictd.conf.$$
diff --git a/app-text/dictd/files/1.10.9/site.info b/app-text/dictd/files/1.10.9/site.info
deleted file mode 100644
index 23bfdeb61102..000000000000
--- a/app-text/dictd/files/1.10.9/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.
-