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

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 52 insertions, 31 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/Manifest b/net-proxy/ziproxy/Manifest
index 619e1982f64c..a24b0889aee9 100644
--- a/net-proxy/ziproxy/Manifest
+++ b/net-proxy/ziproxy/Manifest
@@ -1,29 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX ziproxy-3.1.3-libpng15.patch 454 SHA256 c3dac3a0384efa1c5704cb06c24bcda06a5d6ee67f498440abe935aeb24184d0 SHA512 ce943088d71e8dbac8bd256cc44165e3ea5b51dee2356d51e4b3d417ed1f1df82208e2d34940fcc74fb0b559f49d1c8e0ddbe2a3223813d03cbc8a50de7576f3 WHIRLPOOL 633ada336e0c342dcf6ef4350a2fbf8fc1517a2b6fc4d6ad4a8e84d03e2b9192fd46b5b690c12233cf6437118bad64341fb6ade5f06091133d23ed090807c9e0
 AUX ziproxy.confd 650 SHA256 dad7db324941944a35c87d4e061a004f5d9638ea24f139bc9bad80a51e0e8d78 SHA512 77d730705c652c59acbd20c10d06801427cc3736ef3f9e06771fcadb0470599b3f6b84bd6e4d35c10e90927077e35e0547051b638a4bbafe4a596c38aa1af0eb WHIRLPOOL 1300e3a97f7069d868bf11a4caca39948c02862eacce6bf5e8d92dbc87bc5de6278c87a2023986973cb585cbd5a494ad256dec53aaa1b79b14a360e79f61d0ad
 AUX ziproxy.initd 706 SHA256 f143de97458b3373ba7b177fc19109ba8730354240e9ab5b3f5fe6192103d099 SHA512 f6c5465ac79ee8081dee5a3699e46bcc7f4ce7a44fb4befb0be557efc834990250415fb9f5cb6a940e73aa8db43a20f49e5e1b7fd31a77bed52d65eae21ffa0a WHIRLPOOL aaefa7c1e1ec14fd7cfd8cafd80c42737b1b5e791009f9ec0169f48e81d74ecdaf9c4a22da81e4b7bbf0ccbdc70f4eb81a2d5ea8ee1b74400792f9cc21826d5b
-DIST ziproxy-3.3.0.tar.bz2 267258 SHA256 1f998ae3aef606c6d60db138a23ac331176300fe13fb2bbae25acbb42365e22d SHA512 ca892703feed7bded21ecd7c6fb20af5989214dd7f5025fabb0f283343d3ddb2fafdef45ac68c1bfc3d2139964508f1d70f9dbb6a5d1c1fc3226c942473ad814 WHIRLPOOL b9acd8b54708b3b8a4ef1dfe0cbc4f69ad320198634bbc7c9a2a2ed5173e530b00243a51650bddd9cc9dd642544e6437c797755c3deec2b70b3c593b0867c947
-EBUILD ziproxy-3.3.0.ebuild 1809 SHA256 81485756b51b631dd0391a2e7f421fa646a10cd57f0e04299a8f081a268d6367 SHA512 89dcf726ea24b699e2bbd111f336a17f0c8f9b6c91d029ed64ad25a7f658dc10520e52ea7fee545a1e730558f4606372ece9b60795fd9a951961c69fd6d6df3c WHIRLPOOL 57804faa2c1c744517b248f2ded22bebff4cfc1466a3126e1b6a2ac7990d20acc91c85e47352c40e75c4be6a294ea2fe7d7e0da488fa1f181fa22395b3300574
-MISC ChangeLog 5721 SHA256 add2029d84de17fd4a8d8f44df99eba5b2d2e153356a2693fa8e849e004b0312 SHA512 21d7a0d7b57e3e39ff468133beb57f74d2b5448d6e0208853fdadde4c21fd13eee8f38ed5d4b4cdf16f56399eeb539b986df5140eef2cb07d2f888751df79783 WHIRLPOOL 0577188127a2d135a96596a60d894ae313d5551df326c3cff1b11d1a1ad29a6b32929fa496d1cf7e374c11daf7c4ee0c502ed3369b6f4d170f08e21a3550cb56
+AUX ziproxy.initd-r1 671 SHA256 24c99e3515fe6d0c29996995730c1a30a6e6dbe5fb57f8a98d1a1e0b432988aa SHA512 80778b168cbbe12bb1fe8ecad9e055d1519357e3bd77b601ea6a929bb933b3e0b0ca7f2edc46c21df102bf875ea0d753723ffae034d6dac248b9145fd56fa400 WHIRLPOOL e3983f4cfad8e9fc7065a2d8babf902b55ec966356a95de13dac9338ba7fb975601fc4af8a40d2095820936f37bc4cc41d01b42ecfb7c0b77e0c9a7438ecba0a
+DIST ziproxy-3.3.1.tar.xz 205972 SHA256 358396f5b5c469be15b0c43cae9d40a183072d0b9a35621ed8ff22a0bedb2206 SHA512 bff87a63320e721091ccdcdbe409f59db7f7f681ee8b7f093f18f3c0391579a25b9a8daf6ccfea4d94384142247ce36cfaec68d294b2a23caa56ede436da2d87 WHIRLPOOL b57da63dd76fb39461c1ed9959fe022c662c2309a1735ac0e0bb517420c93682fcb7a72a7c1507c1cf689d051a2fd89748c776ae45a476b25dfa93c5e755c93e
+EBUILD ziproxy-3.3.1.ebuild 1834 SHA256 88baa23e3d0d385cf97790f0a4d11d6e4ba31e81809597e646608f06dc5ecac3 SHA512 4fa2dd34a8f586061acc45bc15f67e9b9495ed7634a73450b7206c30a5fd018c3ef0b858c18a406648e39c6dd95d00413f3e4d385fd617524756556064ec085f WHIRLPOOL e6995bf13f1c532001bee0ddfeb21091de81bc3d01a7e844e41530854ee86664a8f16a4be1ff9334da84bd5c64daca9a220e422f424dfc2885c13bf3163813e4
+MISC ChangeLog 5934 SHA256 5dfebe4e5b76036baf1ed0c870e08f21280128361de43681ecc774237ca38732 SHA512 e9f5e14e1a6e1ada46b1e8976b690ab55808ad9849f15928464761fd4a9dc031522e37b343303dfa5f867b8a36f94bac08f0bb5c8fed97b970bae91e77536889 WHIRLPOOL 44c53d6bded9102cd423ff471d86d8e00220f1907a38759f3c65850f421394d9e8c0c10ca2e2bb635095914a9d8bea68336969c5ca13805512e6a78b41b29375
 MISC metadata.xml 563 SHA256 572a1dc0b604d0858f44a9f82cb5ae3d11734cc5e34f4762cfe0d7cf741a8957 SHA512 933e7fe1ed3d37b35620661a39a6b8ed0f34d50ef50c28bce0ae93ffc96f8ffa123ab1f04810dc36f307cf675a94b3afc71a295153a7be5fa58c82b4ad4f9c7b WHIRLPOOL 2a76c58bfc4c3bd5bd7e90f0257fe93f8975659ab9d678fde9b471bb70441847d4487a5c1fa8fe65da239a0fe985ba102ef89b49e0c73a36d8fe5c320dc4072f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfxkFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi7xoQALHjFzHadZ+eaCp1XS/LwVtu
-nDYyi+n2J8VmcdkQzP8/BFm/UNDPwcU1E39OU6v+Z4Mqvt/k651BfnZLL4HN5LxC
-Ys4Y+9NYEYls212NA1ZBKoq3aPkcE2wm0Ecdmwwr8sDeCBLANE6FxA+J6BxSd+am
-nvfVKCu46T0we2oUFq3oCgiYrNxQOoB2bZvPecnmLQfzA/glhc5Xg1M78wfqXdXZ
-hUGgLjmcU5fNbr3COgg4mlYnR6+iMZxVXS18eNerJ3oFrhFQOMbcJ7+8D6XmBh0f
-AA6TOt2tI7pGCK4cKIbTODhBncWqzSxUOrlGYxkPbEGWpzQXk4zxfDiKNCN25CnF
-yANLSf5TwaRGQLtLjhkOq+Hskc8LCVpQVMcdFRu5FVoNBR3ez71ycD3iHftU51ei
-A9Xe4VLkgcJWWf7HoRRzeAWNijoXMDTqCh5Ie0LE5fUtBAuAjBlEa7ZjbNOyWQ8I
-P9rzu5ZVN58umMFvjcM+f4EEa9Jq6I1w0iJNO57QcmCEmyqrckTVmf52SKA8I6A6
-JTAURJBpMHM6cTU3kRjCsZxwYMCbAYBkp0o6keFeGkY2qGHbKIIZ84YaV6W1Suut
-hx8Ld7MYzSQRw1hsb6PKaGFB3706dgbgiVqOC/IzX6JM0U2AjotahiXEYT02IZF2
-TUMriHk9Ywdt+uyHqz6k
-=yGl7
+iEYEAREIAAYFAlWFPegACgkQCaWpQKGI+9SlvwCbBM/N+3/FzhG5macR9gOuSlqx
+D0sAoIg91E+obXIvaO2JwwYt3HmEACpu
+=OVuL
 -----END PGP SIGNATURE-----
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