Version bump, drop old, fix init.d script (#517560 by slick)

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 43 insertions, 11 deletions

diff --git a/net-proxy/ziproxy/ChangeLog b/net-proxy/ziproxy/ChangeLog
index 336e669791ce..42a2b4e41f6d 100644
--- a/net-proxy/ziproxy/ChangeLog
+++ b/net-proxy/ziproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/ziproxy
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.33 2015/01/07 14:05:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.34 2015/06/20 10:18:15 pacho Exp $
+
+*ziproxy-3.3.1 (20 Jun 2015)
+
+  20 Jun 2015; Pacho Ramos <pacho@gentoo.org> +files/ziproxy.initd-r1,
+  +ziproxy-3.3.1.ebuild, -ziproxy-3.3.0.ebuild:
+  Version bump, drop old, fix init.d script (#517560 by slick)
 
   07 Jan 2015; Pacho Ramos <pacho@gentoo.org> -ziproxy-3.1.3.ebuild,
   metadata.xml:
diff --git a/net-proxy/ziproxy/files/ziproxy.initd-r1 b/net-proxy/ziproxy/files/ziproxy.initd-r1
new file mode 100644
index 000000000000..1f9409cc316a
--- /dev/null
+++ b/net-proxy/ziproxy/files/ziproxy.initd-r1
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/files/ziproxy.initd-r1,v 1.1 2015/06/20 10:18:15 pacho Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	local OPT="-d"
+	ebegin "Starting ${SVCNAME}"
+
+	[ -n "${CONFIG}"   ] && OPT="${OPT} -c ${CONFIG}"
+	[ -n "${ONLYFROM}" ] && OPT="${OPT} -f ${ONLYFROM}"
+
+	start-stop-daemon --start \
+		--exec /usr/sbin/ziproxy -- ${OPT} -u ziproxy -g ziproxy -p /var/run/${SVCNAME}.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid
+	eend $?
+}
diff --git a/net-proxy/ziproxy/ziproxy-3.3.0.ebuild b/net-proxy/ziproxy/ziproxy-3.3.1.ebuild
index 988bddfeb0bf..ce6ab488b92b 100644
--- a/net-proxy/ziproxy/ziproxy-3.3.0.ebuild
+++ b/net-proxy/ziproxy/ziproxy-3.3.1.ebuild
@@ -1,31 +1,31 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-3.3.0.ebuild,v 1.1 2013/01/08 16:19:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-3.3.1.ebuild,v 1.1 2015/06/20 10:18:15 pacho Exp $
 
-EAPI=4
+EAPI=5
 inherit user
 
 DESCRIPTION="A forwarding, non-caching, compressing web proxy server"
 HOMEPAGE="http://ziproxy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="jpeg2k sasl xinetd"
 
-DEPEND="
+RDEPEND="
 	media-libs/giflib
-	media-libs/libpng
+	media-libs/libpng:0=
 	virtual/jpeg
 	sys-libs/zlib
 	jpeg2k? ( media-libs/jasper )
 	sasl? ( dev-libs/cyrus-sasl )
-"
-RDEPEND="
-	${DEPEND}
 	xinetd? ( virtual/inetd )
 "
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+"
 
 pkg_setup() {
 	enewgroup ziproxy
@@ -62,7 +62,7 @@ src_install() {
 
 	dobin src/tools/ziproxy_genhtml_stats.sh
 
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 
 	dodoc ChangeLog CREDITS README README.tools