Cleanup ebuild, use REQUIRED_USE, always install docs, improve init script so that now it actually works.

Package-Manager: portage-2.2.0_alpha176/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

4 files changed, 138 insertions, 6 deletions

diff --git a/net-proxy/tinyproxy/ChangeLog b/net-proxy/tinyproxy/ChangeLog
index ec924237a56b..a51c6f5edb26 100644
--- a/net-proxy/tinyproxy/ChangeLog
+++ b/net-proxy/tinyproxy/ChangeLog
@@ -1,7 +1,14 @@
 
+*tinyproxy-1.8.3-r1 (29 May 2013)
+
+  29 May 2013; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/tinyproxy-1.8.3.initd, +tinyproxy-1.8.3-r1.ebuild:
+  Cleanup ebuild, use REQUIRED_USE, always install docs, improve init script so
+  that now it actually works.
+
 # ChangeLog for net-proxy/tinyproxy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.40 2013/04/24 17:47:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.41 2013/05/29 17:48:35 flameeyes Exp $
 
   24 Apr 2013; Jeroen Roovers <jer@gentoo.org> tinyproxy-1.8.3.ebuild:
   Disable silent make rules. Fix building with automake-1.13.
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index 1fbf16adbdfa..435486c7fea8 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -4,14 +4,20 @@ Hash: SHA256
 AUX tinyproxy-1.8.1-ldflags.patch 306 SHA256 ab1377eb43902c44c44f29f82968f45852e33cd11345b20a24145e57492c1388 SHA512 d9daf50c1fcd2237ec59e7701adce76ba09347193439a1940c24e942600ab10bfc192e6c30a3fbcc3e1194f52b7aaab2fe5ef69468c01041f1a9d5fc6deacc8b WHIRLPOOL 0c0d9a5da91fc064c9b8a11d45f80bb15a106770939ed1b85ad173a9155319c53c9f01dc459095743d497543ca29fab4f654a9dea8dad30d6568972c2268b12b
 AUX tinyproxy-1.8.1-minimal.patch 109 SHA256 c2ee0a0cd073f00b7ea37eff078f84eb790bf7bb478e79fad5b1731aaec8f5dc SHA512 56126f4e315dfade7983a9961ab3a30687e5fb575d9fd0964f081cb1e4be718f54b3999f69f769832717ebae1dd832aaff5e60289b465976b2f95325af48d79d WHIRLPOOL 21d98b7c45c30771917959c2603e8e5690c2e8e28e62286d3eef2b9b2e56dea43d963a2997280a24ddefd647e597c840498792a9cfc2aa2f4b7d741912e792ce
 AUX tinyproxy-1.8.2.initd 1061 SHA256 0dfef44ab70710f75ce50d265a145afb3a88ca129776154eab93f17e8e56ca32 SHA512 758eaf0adc2fb787ea8d8aa61627dabf0c6266b583f55b08097b90a7fea250ff6762d8bb298e63ac7ef712f338f6d223a2d0817474ece6000638ff72aea286ae WHIRLPOOL 88f532f18c071e6d00c5821be5e7d57d1f3426df36a80a8a7fcf20893d6e1815f950ab169fd2560d8b95a8315173189b9e4b300566113e50f9281735fe4be754
+AUX tinyproxy-1.8.3.initd 984 SHA256 c52848f594e38ce60695252a66bdb9961b36b1a71f392d99503341d8c45831d6 SHA512 92bc638b1bf688ae1590dc08943740a58554400c55f547d8e4856a932970bb04cb1fec93dfd0b11ffebcec96d37d19456541ed002e625fadb5c877b44ec30cea WHIRLPOOL 28d3676c2042c26942e4e555ced2ea009717931be500486392aa5cc6b1205d77c301c5e3854a97f2507c40a3864bd582c7a20fbb640be79436771424397d270d
 DIST tinyproxy-1.8.3.tar.bz2 202430 SHA256 be559b54eb4772a703ad35239d1cb59d32f7cf8a739966742622d57df88b896e SHA512 69f1262b39d37f44a42621a0d25985632cdb790c8d9b49335a49a68c0f5237b97b111252856cba119895ac066770645560d2d7cd2de31f02103fa55fb4b3290c WHIRLPOOL f423b49e7cef6c98f69070e0598f4447cf8333cfc9e253dd6c459541922e5b2ed5c7604dc2e3f3de61a616d6381ff83df1625a8ad40a83d32d44f633ac98447c
+EBUILD tinyproxy-1.8.3-r1.ebuild 1930 SHA256 75e882e4330d0c2ae785614bbfb5df697bc5be3b9cffc6d511e93f0554ecefcd SHA512 1d3d6d7be00da03ceb9d8fcb5091881c7e869e4cd9ee2e1a5ab7bebf7614186c8d609c890ad4fe48cd088f00764ad159ddb1b2a3277a25cab28dce5523f715f9 WHIRLPOOL 2831b83b25dadb86d5387a2508d2512bb5c657d2bfc59bdd1d9ad8a7ebfc5e8781f94f0e7602ca449d4d204b33764abaff36cf0499c1ec0a8351e54766fe12ed
 EBUILD tinyproxy-1.8.3.ebuild 2010 SHA256 548134e3ddf78e35a4b9bdb24adce3b7ba99f392a6fe75aca16954f753053175 SHA512 742142381d5739a08e1a38bfda0a9538fff5c735dcea3d277461831759efdeec2ff550af38eaca3bfce3dc83fe3804a0fca1757b07e95077171e3faacbee9157 WHIRLPOOL 21dd38747b955a501789a5b6a106c74aec8a4b321b0cba24dfbb1235cad132a651947945eb8cd4d1df3872c62aa7c116aad695fbbb8f711f4700c93590a251ae
-MISC ChangeLog 7553 SHA256 94baf9ade12f6ca865502c2e6d287155b37f06f1ca797cfee1f69e5538ab3652 SHA512 084eb181f708811731a2afcaff9282e79f7c150ece0a976b3130054121a5f5b936bb3287a8f4de53b1b3525c95211c725ec6d20f69c616c03c0461acc4905a31 WHIRLPOOL 6d6c4dc07fe678482b129fe03f0d729c6461a6325fd83132c06c9d2c0c5be9c3e2d1186903e5533386674eb4404cf6284c9eeb7b93646acd5e9b5017c4ce3bf8
+MISC ChangeLog 7821 SHA256 fda0d93c819710efbec05b1406c932aae918bae86848f9da8bc8711a8ff79c4a SHA512 7274d2591e4df63cb145af87199ec7563fe71ec03c8beaa3612078baf6a006952aaa2b8298f6834ea16aeea03e35993545a6bef6055a829449b26ddfa01ebbdb WHIRLPOOL fe113fc4aaae69fa3bd461ce91e2b81897796406654d1a714ab393e21860a2c3ab0d399bbfce3087958e05648d8149558e127f6d1bc85453d95fce3996df5e1c
 MISC metadata.xml 563 SHA256 63b326ce5e3bff142dc7b16631e44c60c4c0cfe8b0abac5a3545d5d2f5903c82 SHA512 17a7d6daa5078839088950ecb108ccae8336df44a94f07166940d63c6502d50177615c2c7227ced7d7ae43c34ff6984aa0d77c4301756ce76d1f1dee2b54ca48 WHIRLPOOL 5c382b5fd504088b464896c72655d5737338e98a3c8bec0450e97a7b95d96c29ad1aec9eaa88ff42d4a5134b1f7168ff6573cd38bab67bc004e34cbecf8c5a33
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlF4GpgACgkQVWmRsqeSphOThQCggN6aZUuUM1kPj6YfCNYyZS0+
-3RQAnRYxvjOKiYULFGyKR9FJEjykjs18
-=kqHw
+iQEcBAEBCAAGBQJRpj94AAoJEBzRPIrUMBNCUAIH/RY+qOJg4JJPNThDoI3mygWs
+EwGdgJ7Z/jIKDH1Aw2SbRQGlQK+HnSCl1RIZYGurnJoBQqEybvojgogDPJnxt2Io
+O/f6t3RVgPsMQ+UBfKPra3q66D7eB18MXQehRPSDZp2+rjxmJ7czvhbFyHEMX2uX
+zsTa3G+tF9xtYsiBHBox3EcVHxcbayCYt8Z9Uerp63bhj+g79nWTwgR5p+RpHd42
+vTpEk32RTGE95LvpbNwy4jDUOExuGQW6L/aJWD55vV2/A3Ol6aaAswERVzj91lsv
+QCZR3CLyV0gSA9l+KIV1SnKl8KNaSsaQpoPNppvM7TSQNV4E+z8siu5advNb/50=
+=8ODO
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.8.3.initd b/net-proxy/tinyproxy/files/tinyproxy-1.8.3.initd
new file mode 100644
index 000000000000..eed8f54d3d2e
--- /dev/null
+++ b/net-proxy/tinyproxy/files/tinyproxy-1.8.3.initd
@@ -0,0 +1,41 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/files/tinyproxy-1.8.3.initd,v 1.1 2013/05/29 17:48:35 flameeyes Exp $
+
+get_config() {
+    res=$(awk '$1 == "'$1'" { s=$2 } END { print s }' "$CONFFILE")
+
+    if [ "x$res" = "x" ]; then
+	echo "$2"
+    else
+	eval echo "$res"
+    fi
+}
+
+: ${CONFFILE:="/etc/${SVCNAME}.conf"}
+
+command=/usr/sbin/tinyproxy
+command_args="-c ${CONFFILE}"
+pidfile=$(get_config PidFile /var/run/tinyproxy/${SVCNAME}.pid)
+
+depend() {
+	config "$CONFFILE"
+
+	use dns
+
+	[ "$(get_config Syslog Off)" = "On" ] && \
+	    use logger
+}
+
+start_pre() {
+    piddir=$(dirname ${pidfile})
+
+    if [ "${piddir}" = "/var/run" ]; then
+	eerror "Please change your PidFile settings to be within the"
+	eerror "/var/run/tinyproxy directory"
+	eend 1
+    else
+	checkpath -d -o $(get_config User tinyproxy):$(get_config Group tinyproxy) ${piddir}
+    fi
+}
diff --git a/net-proxy/tinyproxy/tinyproxy-1.8.3-r1.ebuild b/net-proxy/tinyproxy/tinyproxy-1.8.3-r1.ebuild
new file mode 100644
index 000000000000..a42382b3d6ad
--- /dev/null
+++ b/net-proxy/tinyproxy/tinyproxy-1.8.3-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.8.3-r1.ebuild,v 1.1 2013/05/29 17:48:35 flameeyes Exp $
+
+EAPI=5
+inherit autotools eutils user
+
+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="test debug +filter-proxy minimal reverse-proxy
+	transparent-proxy +upstream-proxy +xtinyproxy-header"
+
+REQUIRED_USE="test? ( xtinyproxy-header )"
+
+DEPEND="
+	!minimal? ( app-text/asciidoc )
+"
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} "" "" "" ${PN}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.1-ldflags.patch
+	use minimal && epatch "${FILESDIR}/${PN}-1.8.1-minimal.patch"
+	sed -i \
+		-e "s|nobody|${PN}|g" \
+		-e 's|/var/run/|/run/|g' \
+		etc/${PN}.conf.in || die "sed failed"
+	sed -i \
+		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+		configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	if use minimal; then
+		ln -s /bin/true "${T}"/a2x
+		export PATH="${T}:${PATH}"
+	fi
+	econf \
+		$(use_enable debug) \
+		$(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) \
+		--disable-silent-rules \
+		--localstatedir=/var
+}
+
+src_test() {
+	# The make check target does not run the test suite
+	emake test
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	diropts -m0775 -o ${PN} -g ${PN}
+	keepdir /var/log/${PN}
+
+	newinitd "${FILESDIR}"/${PN}-1.8.3.initd tinyproxy
+}
+
+pkg_postinst() {
+	elog "For filtering domains and URLs, enable filter option in the configuration"
+	elog "file and add them to the filter file (one domain or URL per line)."
+}