Fix various directory paths. Add tinyproxy user and make it own its directories. Fix configuration file location as used in initd script.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

3 files changed, 8 insertions, 62 deletions

diff --git a/net-proxy/tinyproxy/ChangeLog b/net-proxy/tinyproxy/ChangeLog
index 6957db3d954b..f910dbbb24ae 100644
--- a/net-proxy/tinyproxy/ChangeLog
+++ b/net-proxy/tinyproxy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/tinyproxy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.17 2010/06/03 22:30:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.18 2010/06/03 22:32:27 jer Exp $
+
+  03 Jun 2010; Jeroen Roovers <jer@gentoo.org> -tinyproxy-1.8.1.ebuild,
+  tinyproxy-1.8.1-r1.ebuild:
+  Fix various directory paths. Add tinyproxy user and make it own its
+  directories. Fix configuration file location as used in initd script.
 
 *tinyproxy-1.8.1-r1 (03 Jun 2010)
 
diff --git a/net-proxy/tinyproxy/tinyproxy-1.8.1-r1.ebuild b/net-proxy/tinyproxy/tinyproxy-1.8.1-r1.ebuild
index 10f0d0f91ee5..a7db4fa96a61 100644
--- a/net-proxy/tinyproxy/tinyproxy-1.8.1-r1.ebuild
+++ b/net-proxy/tinyproxy/tinyproxy-1.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.8.1-r1.ebuild,v 1.1 2010/06/03 22:30:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.8.1-r1.ebuild,v 1.2 2010/06/03 22:32:27 jer Exp $
 
 EAPI="2"
 
@@ -38,7 +38,7 @@ src_prepare() {
 
 src_configure() {
 	if use minimal; then
-		ln -s /bin/true ${T}/a2x
+		ln -s /bin/true "${T}"/a2x
 		export PATH="${T}:${PATH}"
 	fi
 	econf \
diff --git a/net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild b/net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild
deleted file mode 100644
index 4ffbdcb7074a..000000000000
--- a/net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild,v 1.5 2010/06/03 21:46:23 jer Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="A lightweight HTTP/SSL proxy"
-HOMEPAGE="http://www.banu.com/tinyproxy/"
-SRC_URI="http://www.banu.com/pub/${PN}/1.8/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="debug +filter-proxy minimal reverse-proxy transparent-proxy
-	+upstream-proxy +xtinyproxy-header"
-
-DEPEND="minimal? ( app-text/asciidoc )"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	use minimal && epatch "${FILESDIR}/${P}-minimal.patch"
-	eautoreconf
-}
-
-src_configure() {
-	if use minimal; then
-		ln -s /bin/true ${T}/a2x
-		export PATH="${T}:${PATH}"
-	fi
-	econf \
-		$(use_enable filter-proxy filter) \
-		$(use_enable reverse-proxy reverse) \
-		$(use_enable transparent-proxy transparent) \
-		$(use_enable upstream-proxy upstream) \
-		$(use_enable xtinyproxy-header xtinyproxy) \
-		$(use_enable debug) \
-		|| die "econf failed"
-}
-
-src_install() {
-	sed -i \
-		-e 's:mkdir $(datadir)/tinyproxy:mkdir -p $(DESTDIR)$(datadir)/tinyproxy:' \
-		Makefile
-	emake DESTDIR="${D}" install || die "install failed"
-
-	if ! use minimal; then
-		dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
-	fi
-
-	newinitd "${FILESDIR}/tinyproxy.initd" tinyproxy
-}
-
-pkg_postinst() {
-	einfo "For filtering domains and URLs, enable filter option in the configuration file"
-	einfo "and add them to the filter file (one domain or URL per line)."
-}