Fix ebuild permission and path problems for bug #134758.

Package-Manager: portage-2.1.2_rc4-r4

diff --git a/media-sound/mserv/ChangeLog b/media-sound/mserv/ChangeLog
index fe1b639a65b0c0bce796f9901977212148e79f48..d9d736f47d50a284fc64d84a7253bf3524943dea 100644 (file)
--- a/media-sound/mserv/ChangeLog
+++ b/media-sound/mserv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/mserv
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mserv/ChangeLog,v 1.17 2006/05/30 04:23:49 weeve Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mserv/ChangeLog,v 1.18 2007/01/04 02:45:56 dirtyepic Exp $
+
+  04 Jan 2007; Ryan Hill <dirtyepic@gentoo.org> mserv-0.35-r1.ebuild:
+  Fix ebuild permission and path problems for bug #134758.
 
   30 May 2006; Jason Wever <weeve@gentoo.org> mserv-0.35-r1.ebuild:
   Stable on SPARC wrt bug #134758.

diff --git a/media-sound/mserv/Manifest b/media-sound/mserv/Manifest
index 9e216315c9b4c700340df8b983573fc5e7376298..56001a9a6474e68b7b9b1efa67a1a4ddb8c6165c 100644 (file)
--- a/media-sound/mserv/Manifest
+++ b/media-sound/mserv/Manifest
@@ -27,18 +27,18 @@ MD5 a823115f64db37b88b25a3689b0f9e19 files/mserv-0.35-webacl 39
 RMD160 72792ebc26a8412bd42c0e7b65d62c6f497b605e files/mserv-0.35-webacl 39
 SHA256 3f84ac32ee5eca5b13565a915ba736620f788a7cb031dbf8741b44d99551faa8 files/mserv-0.35-webacl 39
 DIST mserv-0.35.tar.gz 280299 RMD160 0665c1b1807da675486b58013715b737b8de606e SHA1 850835946e4d5a0deccdd22a18f30170c0a7b57c SHA256 7072ffbea66fd17e1ee0ab81de57eac612cbcb25587931602db85536158dd442
-EBUILD mserv-0.35-r1.ebuild 2587 RMD160 465e80f16060f23632c64aa5898bc0a908bf2148 SHA1 e8257a7942e1984d954955e7d2971e2dfdd1aeb5 SHA256 bebd8593e76f912269b2eb4be0d1871da280a3d3868c13bd0f41e29d57b2061f
-MD5 33ede556d91c8c9642cc68fc7d012ec1 mserv-0.35-r1.ebuild 2587
-RMD160 465e80f16060f23632c64aa5898bc0a908bf2148 mserv-0.35-r1.ebuild 2587
-SHA256 bebd8593e76f912269b2eb4be0d1871da280a3d3868c13bd0f41e29d57b2061f mserv-0.35-r1.ebuild 2587
+EBUILD mserv-0.35-r1.ebuild 2703 RMD160 ac4fa6888387727ae044fde8558eaf2fd0bfdc8d SHA1 ba643095ab4796af91c76b3d0e0017019b678ab4 SHA256 f9702ae5755d981e8ce38551695bda3cfd7318a7911f7a07f605815175e2ee11
+MD5 24f07fbc15cb59c9f3896494fbc49031 mserv-0.35-r1.ebuild 2703
+RMD160 ac4fa6888387727ae044fde8558eaf2fd0bfdc8d mserv-0.35-r1.ebuild 2703
+SHA256 f9702ae5755d981e8ce38551695bda3cfd7318a7911f7a07f605815175e2ee11 mserv-0.35-r1.ebuild 2703
 EBUILD mserv-0.35.ebuild 2565 RMD160 21430ae7c20d0a70685ac9c5d5bb71bceff3e16d SHA1 4447f8dffe2e5df55652d9c68badcce6777f0bbd SHA256 124c1704509e61bfaf481ed68c76581ce091ffd095cb39308d9eef691e0cae7b
 MD5 ec98a53b8bd38d4042f4716e6e6a19b9 mserv-0.35.ebuild 2565
 RMD160 21430ae7c20d0a70685ac9c5d5bb71bceff3e16d mserv-0.35.ebuild 2565
 SHA256 124c1704509e61bfaf481ed68c76581ce091ffd095cb39308d9eef691e0cae7b mserv-0.35.ebuild 2565
-MISC ChangeLog 2179 RMD160 a1ba6662140ad1ee57dc0bb37dac5154640c971d SHA1 2b805180228aacf19c3c480ead6d526550006668 SHA256 c21135d4fc4dc1abfa0a855494db6b366b0253c23963768fb3ecbc1e6500bb70
-MD5 7c316793e6ff898ebd95f2c298e4fc18 ChangeLog 2179
-RMD160 a1ba6662140ad1ee57dc0bb37dac5154640c971d ChangeLog 2179
-SHA256 c21135d4fc4dc1abfa0a855494db6b366b0253c23963768fb3ecbc1e6500bb70 ChangeLog 2179
+MISC ChangeLog 2313 RMD160 78606b8b932f3a0f2fd97b29e8cd8abb4a59590d SHA1 c1f16fe5ea18653b4350772f418e73937c2480b6 SHA256 fb7d1a71181c520ed96056fed87f7d4a4d809b234c3859c0ff0bc3f43f6dc0c5
+MD5 a4a66e4f2ed346763c29dd6353800bb3 ChangeLog 2313
+RMD160 78606b8b932f3a0f2fd97b29e8cd8abb4a59590d ChangeLog 2313
+SHA256 fb7d1a71181c520ed96056fed87f7d4a4d809b234c3859c0ff0bc3f43f6dc0c5 ChangeLog 2313
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158

diff --git a/media-sound/mserv/mserv-0.35-r1.ebuild b/media-sound/mserv/mserv-0.35-r1.ebuild
index 9b394239a677870ccfa6f1b334984d34306380de..a94a7f4a995e20ab90022c65b4918a4c8b788a29 100644 (file)
--- a/media-sound/mserv/mserv-0.35-r1.ebuild
+++ b/media-sound/mserv/mserv-0.35-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mserv/mserv-0.35-r1.ebuild,v 1.5 2006/05/30 04:23:49 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mserv/mserv-0.35-r1.ebuild,v 1.6 2007/01/04 02:45:56 dirtyepic Exp $
 
 inherit webapp eutils toolchain-funcs
 
@@ -59,10 +59,15 @@ src_install() {
        cp webclient/*.cgi ${D}/${MY_CGIBINDIR}/${PN}
        cp webclient/*.gif webclient/index.html ${D}/${MY_HTDOCSDIR}
 
+       webapp_src_install
+
        # Configuration files
        insopts -o mserv -g mserv -m0644
        insinto /etc/mserv
        fowners mserv:mserv /etc/mserv
+       newins ${FILESDIR}/${P}-config config
+       newins ${FILESDIR}/${P}-webacl webacl
+       newins ${FILESDIR}/${P}-acl acl
        insinto ${MY_HOSTROOTDIR}/${PN}
        fowners mserv:mserv ${MY_HOSTROOTDIR}/${PN}
        newins ${FILESDIR}/${P}-config config
@@ -86,7 +91,6 @@ src_install() {
        dodir /var/spool/mserv
        touch ${D}var/spool/mserv/player.out
        fowners mserv:mserv /var/spool/mserv /var/spool/mserv/player.out
-       webapp_src_install
 }
 
 pkg_postinst() {