Version bump thanks to Alexander Orlenko (bug #320079). Respect LDFLAGS. Expose more configure options as USE flags.

(Portage version: 2.2_rc67/cvs/Linux i686)

4 files changed, 77 insertions, 4 deletions

diff --git a/net-proxy/tinyproxy/ChangeLog b/net-proxy/tinyproxy/ChangeLog
index aaa6ad541a7b..45f32753bc17 100644
--- a/net-proxy/tinyproxy/ChangeLog
+++ b/net-proxy/tinyproxy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/tinyproxy
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.13 2009/11/29 09:58:56 mrness Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.14 2010/05/26 18:03:30 jer Exp $
+
+*tinyproxy-1.8.1 (26 May 2010)
+
+  26 May 2010; Jeroen Roovers <jer@gentoo.org> +tinyproxy-1.8.1.ebuild,
+  +files/tinyproxy-1.8.1-ldflags.patch, metadata.xml:
+  Version bump thanks to Alexander Orlenko (bug #320079). Respect LDFLAGS.
+  Expose more configure options as USE flags.
 
 *tinyproxy-1.6.5 (29 Nov 2009)
 
diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.8.1-ldflags.patch b/net-proxy/tinyproxy/files/tinyproxy-1.8.1-ldflags.patch
new file mode 100644
index 000000000000..bc6f799d56e3
--- /dev/null
+++ b/net-proxy/tinyproxy/files/tinyproxy-1.8.1-ldflags.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2010-03-09 12:41:45.000000000 +0100
++++ configure.ac	2010-05-17 23:07:39.000000000 +0200
+@@ -222,7 +222,7 @@
+     CFLAGS="-DNDEBUG $CFLAGS"
+ fi
+ 
+-LDFLAGS="-Wl,-z,defs"
++LDFLAGS="$LDFLAGS -Wl,-z,defs"
+ 
+ dnl
+ dnl Make sure we can actually handle the "--with-*" and "--enable-*" stuff.
diff --git a/net-proxy/tinyproxy/metadata.xml b/net-proxy/tinyproxy/metadata.xml
index 2c9461c4a0be..c0a47fd442b1 100644
--- a/net-proxy/tinyproxy/metadata.xml
+++ b/net-proxy/tinyproxy/metadata.xml
@@ -4,8 +4,11 @@
 <herd>net-proxy</herd>
 <longdescription>A lightweight HTTP/SSL proxy</longdescription>
 <use>
-	<flag name='transparent-proxy'>Enables support for transparent
-		proxies</flag>
 	<flag name='http-via-header'>Add Via field to HTTP headers</flag>
+	<flag name='filter-proxy'>Enable filtering of domains/URLS</flag>
+	<flag name='reverse-proxy'>Enable reverse proxying</flag>
+	<flag name='transparent-proxy'>Enable transparent proxying</flag>
+	<flag name='upstream-proxy'>Enable upstream proxying</flag>
+	<flag name='xtinyproxy-header'>Include the X-Tinyproxy header</flag>
 </use>
 </pkgmetadata>
diff --git a/net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild b/net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild
new file mode 100644
index 000000000000..94ce198a9e35
--- /dev/null
+++ b/net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild
@@ -0,0 +1,52 @@
+# 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.1 2010/05/26 18:03:30 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 reverse-proxy transparent-proxy
+	+upstream-proxy +xtinyproxy-header"
+
+DEPEND="app-text/asciidoc"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	eautoreconf
+}
+src_configure() {
+	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
+	make DESTDIR="${D}" install || die "install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	mv "${D}/usr/share/tinyproxy" "${D}/usr/share/doc/${PF}/html"
+
+	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)."
+}