Fix tests: give dictd group write permission to tests directory, thank Ferris McCormick for report in bug #244246

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-openvz.git-777e816 i686

3 files changed, 27 insertions, 13 deletions

diff --git a/app-text/dictd/ChangeLog b/app-text/dictd/ChangeLog
index 2ad266ff44e2..fc47e28c19ab 100644
--- a/app-text/dictd/ChangeLog
+++ b/app-text/dictd/ChangeLog
@@ -1,6 +1,10 @@
 # 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.42 2008/09/14 08:59:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/ChangeLog,v 1.43 2008/10/25 22:10:35 pva Exp $
+
+  25 Oct 2008; Peter Volkov <pva@gentoo.org> dictd-1.10.11-r2.ebuild:
+  Fix tests: give dictd group write permission to tests directory, thank
+  Ferris McCormick for report in bug #244246
 
 *dictd-1.10.11-r2 (14 Sep 2008)
 
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index d9a970ec6a76..18cd0959b917 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -23,9 +23,9 @@ AUX dictd-1.10.11-dictl-translit.patch 637 RMD160 51f720f44143d9207e5b4c92583495
 DIST dictd-1.10.11.tar.gz 696755 RMD160 829a71325d59210023b420ffe89cd5477d354cdb SHA1 7d37969424dfef19fa4975b876a0fab4e26fed8c SHA256 a5730cb0c67582d115057b409a6e75d903f56595a6690a7d435e22ae22857899
 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 2645 RMD160 a9df393ff47c8738602b50d04182d8a64bbfba7a SHA1 e8150027d7eb7964b14687e95c0d9a3cb6ea595e SHA256 0a4b96b6761883fcd1de09a0f012822b03f0e34fe5b449c0f15d01240845bcbb
+EBUILD dictd-1.10.11-r2.ebuild 2948 RMD160 ff30f12f2d84b2d09cd94f6d2e22b5fc1e745741 SHA1 e1d410901f8424cbe88fbf269397432b25d04e45 SHA256 89f3a4ad933f4efd10d9a6379e816c7521451fce54eb2143fdf4f9bd104e0d67
 EBUILD dictd-1.10.11.ebuild 2381 RMD160 4d158a3b1df02630050573a6c8768c3e079c4764 SHA1 bf49db4b16064d90eaf6449cbd113559d3bc4f74 SHA256 b3163f371227d192e8b17969125049c631ab2bbffbca619ccf84445d6ed36b99
 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 7833 RMD160 abef0fd993c45202df2acce63c09b5f4e5321101 SHA1 23725cd5887e63ad1cf8a28af7ad6f88dbc05e1a SHA256 53575e012562e82fa6efa896ec64f01d4a8368f7dd1af983a559e3fd0674ff08
+MISC ChangeLog 8022 RMD160 89a4bca2c42f5d5a3a74548ee080157df7cc8315 SHA1 55114e971d283a3b8767814682ff66f5ed7f8269 SHA256 0bd514e73ca33afab32b338a8a61938d7d86b0fe6f8419b9592cd6d9e8f05138
 MISC metadata.xml 162 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 SHA1 0d9e341c4b61e23adc1f3806989a0236b83257a0 SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22
diff --git a/app-text/dictd/dictd-1.10.11-r2.ebuild b/app-text/dictd/dictd-1.10.11-r2.ebuild
index a8d31e880175..8a49a0be6d16 100644
--- a/app-text/dictd/dictd-1.10.11-r2.ebuild
+++ b/app-text/dictd/dictd-1.10.11-r2.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-r2.ebuild,v 1.1 2008/09/14 08:59:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.10.11-r2.ebuild,v 1.2 2008/10/25 22:10:35 pva Exp $
 
 inherit eutils
 
@@ -31,12 +31,22 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/dictd-1.10.11-colorit-nopp-fix.patch
-	epatch "${FILESDIR}"/dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch
-	epatch "${FILESDIR}"/dictd-1.10.11-dictd.8-man.patch
-	epatch "${FILESDIR}"/dictd-1.10.11-dictl-konwert.patch
-	epatch "${FILESDIR}"/dictd-1.10.11-dictd.c-alen-init.patch
-	epatch "${FILESDIR}"/dictd-1.10.11-dictl-translit.patch
+	epatch "${FILESDIR}/dictd-1.10.11-colorit-nopp-fix.patch"
+	epatch "${FILESDIR}/dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch"
+	epatch "${FILESDIR}/dictd-1.10.11-dictd.8-man.patch"
+	epatch "${FILESDIR}/dictd-1.10.11-dictl-konwert.patch"
+	epatch "${FILESDIR}/dictd-1.10.11-dictd.c-alen-init.patch"
+	epatch "${FILESDIR}/dictd-1.10.11-dictl-translit.patch"
+}
+
+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"
+	fi
+	emake test || die
 }
 
 src_compile() {
@@ -63,12 +73,12 @@ src_install() {
 	# conf files.
 	insinto /etc/dict
 	for f in dict.conf dictd.conf site.info colorit.conf; do
-		doins "${FILESDIR}"/1.10.11/${f} || die "failed to install ${f}"
+		doins "${FILESDIR}/1.10.11/${f}" || die "failed to install ${f}"
 	done
 
 	# startups for dictd
-	newinitd "${FILESDIR}"/1.10.11/dictd.initd dictd || die "failed to install dictd.initd"
-	newconfd "${FILESDIR}"/1.10.11/dictd.confd dictd || die "failed to install dictd.confd"
+	newinitd "${FILESDIR}/1.10.11/dictd.initd" dictd || die "failed to install dictd.initd"
+	newconfd "${FILESDIR}/1.10.11/dictd.confd" dictd || die "failed to install dictd.confd"
 }
 
 pkg_postinst() {