diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2011-12-16 22:18:28 +0000 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2011-12-16 22:18:28 +0000 |
| commit | 5e451b675bef08ee9634f57f9b1cffbffbb9b06c (patch) | |
| tree | f672653643d2f889e5e08cd7a3d6e74e98b7e2cd /net-proxy | |
| parent | Remove optipng dependency so optipng can be lastrited, bug 386851 (diff) | |
| download | gentoo-2-5e451b675bef08ee9634f57f9b1cffbffbb9b06c.tar.gz gentoo-2-5e451b675bef08ee9634f57f9b1cffbffbb9b06c.tar.bz2 gentoo-2-5e451b675bef08ee9634f57f9b1cffbffbb9b06c.zip | |
Inject EPREFIX, bug 389423
(Portage version: 2.1.10.36/cvs/Linux i686)
Diffstat (limited to 'net-proxy')
| -rw-r--r-- | net-proxy/dante/ChangeLog | 5 | ||||
| -rw-r--r-- | net-proxy/dante/dante-1.3.2.ebuild | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog index 3d8fae920b96..06972ae90643 100644 --- a/net-proxy/dante/ChangeLog +++ b/net-proxy/dante/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-proxy/dante # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.60 2011/10/04 20:14:21 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.61 2011/12/16 22:18:28 darkside Exp $ + + 16 Dec 2011; Jeremy Olexa <darkside@gentoo.org> dante-1.3.2.ebuild: + Inject EPREFIX, bug 389423 04 Oct 2011; Robin H. Johnson <robbat2@gentoo.org> files/dante-sockd-init: lsof shows files like /.sock{dshmem,slock}XXXXXXX being created by sockd, and diff --git a/net-proxy/dante/dante-1.3.2.ebuild b/net-proxy/dante/dante-1.3.2.ebuild index 7feaee792400..d864c6877340 100644 --- a/net-proxy/dante/dante-1.3.2.ebuild +++ b/net-proxy/dante/dante-1.3.2.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-proxy/dante/dante-1.3.2.ebuild,v 1.1 2011/08/04 16:33:12 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.3.2.ebuild,v 1.2 2011/12/16 22:18:28 darkside Exp $ EAPI="4" @@ -32,8 +32,8 @@ src_prepare() { "${FILESDIR}"/${PN}-1.3.1-flags.patch sed -i \ - -e 's:/etc/socks\.conf:/etc/socks/socks.conf:' \ - -e 's:/etc/sockd\.conf:/etc/socks/sockd.conf:' \ + -e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \ + -e 's:/etc/sockd\.conf:"${EPREFIX}"/etc/socks/sockd.conf:' \ doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \ || die eautoreconf @@ -41,8 +41,8 @@ src_prepare() { src_configure() { econf \ - --with-socks-conf=/etc/socks/socks.conf \ - --with-sockd-conf=/etc/socks/sockd.conf \ + --with-socks-conf="${EPREFIX}"/etc/socks/socks.conf \ + --with-sockd-conf="${EPREFIX}"/etc/socks/sockd.conf \ --without-upnp \ $(use_enable debug) \ $(use_with kerberos gssapi) \ @@ -57,7 +57,7 @@ src_install() { # default configuration files insinto /etc/socks doins "${FILESDIR}"/sock?.conf - pushd "${D}/etc/socks" > /dev/null + pushd "${ED}/etc/socks" > /dev/null use pam && epatch "${FILESDIR}/sockd.conf-with-pam.patch" use tcpd && epatch "${FILESDIR}/sockd.conf-with-libwrap.patch" popd > /dev/null |