Use EPREFIX/EROOT, bug #321309

Package-Manager: portage-2.2.01.19941-prefix/cvs/Darwin i386

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index da952b814482949739ba9530a27eb50e1c42b849..df9448008b1016b1e221989244b21ef499b48598 100644 (file)
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.323 2011/12/14 17:21:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.324 2011/12/15 19:15:05 grobian Exp $
+
+  15 Dec 2011; Fabian Groffen <grobian@gentoo.org> wireshark-1.6.4.ebuild:
+  Use EPREFIX/EROOT, bug #321309
 
   14 Dec 2011; Agostino Sarubbo <ago@gentoo.org> wireshark-1.6.4.ebuild:
   Stable for AMD64, wrt security bug #389255

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index d4358440e54de98da5b745ae0c4dd72c7cec3d45..20993d4b2d13d2121f9e0802083ed390a44063a6 100644 (file)
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX wireshark-1.6.4-build.patch 396 RMD160 fa909e374c80f0c637a459750d305cd636e7e18a SHA1 825cb721d7d30cfdec5f53e0b38fa7ee8891ec20 SHA256 8648c0eda8fd4393d4b0513c4d6673d0568b7341f920e55e7ebe7391d1e3b430
 AUX wireshark-1.6.4-doc-build.patch 501 RMD160 65ea45bc7014c5f0bb556b3c964c45d2b0d2f582 SHA1 ea7c00ed98613581791c7c9e53f009efee5e6c08 SHA256 2ae9ad7ce2ceb1b7a2430ae71d04cdb4f9173d74e0d67667965226d8f43d1945
@@ -8,17 +8,13 @@ DIST wireshark-1.6.2.tar.bz2 21408664 RMD160 e343d9bb5600b236dea708bb68ecad805a9
 DIST wireshark-1.6.4.tar.bz2 21464517 RMD160 9437c416a5963aee1c049c0275bdfd3edd7488e8 SHA1 8abd7681e8c05841b7cf31d5dc83c1092c54e79f SHA256 7f98191f53d375f020312a99a9747ff3b846ac4029af4027fc883f685fabef5d
 EBUILD wireshark-1.4.9.ebuild 6308 RMD160 1cc754917fc9fa2b67dcde05296c031c5b3dbc58 SHA1 40233e735c52457737c555fe196ac92a9b5780de SHA256 d968bdf0343ff49a3809dfc995233ce612662bc0903afa641b3e4fb9bf18d1f5
 EBUILD wireshark-1.6.2.ebuild 6315 RMD160 7bd88e4d7009dee6cc65d2e2a0ccb7411804f49e SHA1 c24b9b04671fb26c508185997ff11ca2a10ac4b4 SHA256 1eee0327c11708795aaac2af165f31bb0ee8039a1698b58ecf07f421f6551a1d
-EBUILD wireshark-1.6.4.ebuild 6485 RMD160 7fb660970ff93ccb2460d84709828c0de6224d53 SHA1 be76b600c00e615662880b4cc1567857a120dab5 SHA256 ad3ae578e5b3a623f1d5d126a120024a13a115686ed52201ba75fa4e7c9a6f04
-MISC ChangeLog 47191 RMD160 8ac8e8cc228e848148eb5ed386547970a3ea6051 SHA1 de1ba29c68e7c879bee1b7528382f951ddd630aa SHA256 aafa7343480296585848799823df136de0c1a2f6f5a79b69ae448511c570efd4
+EBUILD wireshark-1.6.4.ebuild 6502 RMD160 ee61c13ba4e7f958e4b58257634b38ac8d3238f2 SHA1 342727f4e47e067b7081f440d0b0cce3e960562d SHA256 b3ee30627f2f8fb3f4b4bf206f9c28d56b244f143310a14d06b723cb3934e8ef
+MISC ChangeLog 47304 RMD160 e0dce3ed13b809d2d2e24fb9c46e2ffe491c8930 SHA1 c64bf80b6a44dbbad4f79fb34a8d97b17bcf4f23 SHA256 ac651703205a33c60a80475a178e584fed8816919ba05ebd65adaf2b2a120df4
 MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iQEcBAEBCgAGBQJO6NspAAoJEOTDgjZ80txdgN8IAITSgJ51KZ9vmCRz3jlcou3t
-f0afimDXqFgsx2Dx+5RgPjZGD8+pWj9TISKPbIB27OxbB8Q2l9dXelr9w6UhJ8Zt
-k6GVs/cAPQleFMFZFdQdcQncssNj45A7fR9CtBH/u/u3GzEOvD1jY45jG6sf3mS8
-Dappi0PxTHf5Ins9hthWwKkvdbRGGkXJXTKbAvjrDOZeBSRJzt75M5Q2ljk06XkS
-HU5JfMYX9glQkMlDpo6kfYexo49On5iHxoisZ2C9s9ba5+lyAEIU+JXz8Pw96pK/
-QkEgcr6Y9DyBWmsuSc1sle9IDZuyYgCDOvwfgYKFMZ/vwA/fAEnm1JP7SDdosw8=
-=5fqa
+iEYEARECAAYFAk7qRz4ACgkQX3X2B8XHTomFOACgnn1XQL6YeFh+Bmmam+/tSoNF
+zTcAoKUIfLwPXmqs7sG521l+n5spT4qb
+=qD1k
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/wireshark/wireshark-1.6.4.ebuild b/net-analyzer/wireshark/wireshark-1.6.4.ebuild
index 2b7f6007e399eb59589d5699cd769a7e74fc3cb6..0e776aa27e502c1d31682adea5f3f30ab32d804b 100644 (file)
--- a/net-analyzer/wireshark/wireshark-1.6.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.4.ebuild,v 1.4 2011/12/14 17:21:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.4.ebuild,v 1.5 2011/12/15 19:15:05 grobian Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -167,7 +167,7 @@ src_configure() {
                $(use_with pcap dumpcap-group wireshark) \
                $(use pcap && use_enable caps setcap-install) \
                $(use pcap && use_enable !caps setuid-install) \
-               --sysconfdir=/etc/wireshark \
+               --sysconfdir="${EPREFIX}"/etc/wireshark \
                --disable-extra-gcc-checks \
                ${myconf}
 }
@@ -208,7 +208,7 @@ src_install() {
 
 pkg_postinst() {
        if use caps && use pcap; then
-               fcaps 0:wireshark 550 cap_net_raw,cap_net_admin "${ROOT}"/usr/bin/dumpcap
+               fcaps 0:wireshark 550 cap_net_raw,cap_net_admin "${EROOT}"/usr/bin/dumpcap
        fi
        echo
        ewarn "NOTE: To run wireshark as normal user you have to add yourself to"