Inherit user.eclass. Version bump.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 109 insertions, 21 deletions

diff --git a/net-proxy/ziproxy/ChangeLog b/net-proxy/ziproxy/ChangeLog
index 7bfc62b7366a..0fa5062d81c3 100644
--- a/net-proxy/ziproxy/ChangeLog
+++ b/net-proxy/ziproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/ziproxy
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.30 2011/10/01 15:24:14 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.31 2013/01/08 16:19:56 jer Exp $
+
+*ziproxy-3.3.0 (08 Jan 2013)
+
+  08 Jan 2013; Jeroen Roovers <jer@gentoo.org> ziproxy-3.1.3.ebuild,
+  +ziproxy-3.3.0.ebuild:
+  Inherit user.eclass. Version bump.
 
   01 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -ziproxy-2.7.2.ebuild,
   -files/ziproxy-2.7.2-libpng14.patch, -ziproxy-3.1.1.ebuild:
diff --git a/net-proxy/ziproxy/Manifest b/net-proxy/ziproxy/Manifest
index 9eac70c5a6ec..03b038352bb0 100644
--- a/net-proxy/ziproxy/Manifest
+++ b/net-proxy/ziproxy/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX ziproxy-3.1.3-libpng15.patch 454 RMD160 e9dd18a4168a557e6854180c030ea8f2c59ae442 SHA1 1323ea2216b848dcc2e52fa8f6c3422516b7f64c SHA256 c3dac3a0384efa1c5704cb06c24bcda06a5d6ee67f498440abe935aeb24184d0
-AUX ziproxy.confd 650 RMD160 1cbd1e13f3276399b89c94c0323fb8fa05c9c6af SHA1 12e7b4bf054e89de93c548be5c7fe000632c63b9 SHA256 dad7db324941944a35c87d4e061a004f5d9638ea24f139bc9bad80a51e0e8d78
-AUX ziproxy.initd 706 RMD160 b52b5b8f80bc402ff801723c4d9fb79f37935033 SHA1 66b467840480c94a7b551f4a92d1b2ab4752b199 SHA256 f143de97458b3373ba7b177fc19109ba8730354240e9ab5b3f5fe6192103d099
-DIST ziproxy-3.1.3.tar.bz2 261227 RMD160 3541c0e2adbf6ca3fed7b953c7d18f3747db956f SHA1 3fb107e7de6be7e184475bffb5ba1a199349c147 SHA256 d5cbb42de327c66c76b6332cb06ca294df8c5130481500c6e93788951211b7a2
-EBUILD ziproxy-3.1.3.ebuild 1895 RMD160 3f83baef6ec6ae683d944cb2be0d0120b02d6b41 SHA1 1678f0e271af3665f1a98cf8ed6fd4164ff102c7 SHA256 427845c701c6c68768e316f3fe41c42bce67264dbe6b903af1f1a1d576f373d3
-MISC ChangeLog 5283 RMD160 ca96f5ab2d459adf10f5b35226b00763a2b7f8bd SHA1 5daf8a9c2e03a092d40006043d6461efee8a9a56 SHA256 f24984abe11457b29908af2215a529c4025c43db2eafa52c92275b12c1f6d1a4
-MISC metadata.xml 534 RMD160 00f3e51718dbf971a2a828f9e465e3bedb0ee93e SHA1 7f1144f73a3502d77737e553424a421d986d57a9 SHA256 a07a0f1fef6f615ca4dd7d66321ef8e733faea0068218fcab034085d42236b68
+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.1.3.tar.bz2 261227 SHA256 d5cbb42de327c66c76b6332cb06ca294df8c5130481500c6e93788951211b7a2 SHA512 ae2db6894ee7092825ec6208786b24d7808000d19a9ca1923198f03ce148a7adbafdcb1af259ed9590292225b2bebc3809dca6dfd979d1d08f11a56284023138 WHIRLPOOL 9c9f8c6f774b769b606950b7a758dcb7f8126cac69e31f8e87cdbed3afc20eaca62fdc69bb6fa62e3c552a8baec34b22bbed9370f7d707548eaa993e680b01cc
+DIST ziproxy-3.3.0.tar.bz2 267258 SHA256 1f998ae3aef606c6d60db138a23ac331176300fe13fb2bbae25acbb42365e22d SHA512 ca892703feed7bded21ecd7c6fb20af5989214dd7f5025fabb0f283343d3ddb2fafdef45ac68c1bfc3d2139964508f1d70f9dbb6a5d1c1fc3226c942473ad814 WHIRLPOOL b9acd8b54708b3b8a4ef1dfe0cbc4f69ad320198634bbc7c9a2a2ed5173e530b00243a51650bddd9cc9dd642544e6437c797755c3deec2b70b3c593b0867c947
+EBUILD ziproxy-3.1.3.ebuild 1894 SHA256 b73be6f3400a10712393f6e0a6d86e1a692f14c2c68a38e6456c518d1ca18fbf SHA512 e954e23eab76f9623d1e9cd46c76e395c6789ba07e64e2f574585d4dbbb5da0c1e2f4c2419a60b54c06c2a87ac431ccdb11d2a28ac305d79c420ab95df5d67c6 WHIRLPOOL 6c5c891062ff4a2f8c5a4d971b84a168f9e613a7f073065eba81e8abf26d97c482b14d07dc2158ad1e8ac14b82598dcf040abe20014e0bbaf682d333608f03a4
+EBUILD ziproxy-3.3.0.ebuild 1809 SHA256 81485756b51b631dd0391a2e7f421fa646a10cd57f0e04299a8f081a268d6367 SHA512 89dcf726ea24b699e2bbd111f336a17f0c8f9b6c91d029ed64ad25a7f658dc10520e52ea7fee545a1e730558f4606372ece9b60795fd9a951961c69fd6d6df3c WHIRLPOOL 57804faa2c1c744517b248f2ded22bebff4cfc1466a3126e1b6a2ac7990d20acc91c85e47352c40e75c4be6a294ea2fe7d7e0da488fa1f181fa22395b3300574
+MISC ChangeLog 5439 SHA256 1dd220bce27367a58f5bb6e5f2ddf0a81643d6993d2a732867970e27db68cdb2 SHA512 bcf9aa1c52930a8fd5f96432466c4390fe815a371509ca32dbe3f891b76a90b4ae34a94ea60ed60f65176466f5588a0b507f5e7a86d8ad36f05bf6e479a25d30 WHIRLPOOL dfe0903bb7140c7c1d161e34cb29dc8fe26d57c13f63bfd3c6a69c070e5ed7f8a0fd9f9fade7739e4981eb653c7d5e4b9ab63bec9900dbc806673d4194d3a2e3
+MISC metadata.xml 534 SHA256 a07a0f1fef6f615ca4dd7d66321ef8e733faea0068218fcab034085d42236b68 SHA512 196bf637f69d09a08576bdaceac6e61bf2c51f4eb285f9f90348bee9bcfff6645183c901103ec5d37af5db2ec3c31b6d3cd66c0be04d949a9fc8515b2719cf72 WHIRLPOOL 164a85eb9c34fda78a90aece629614980e4b46023980bf4be7f46c8d6d9373c5229e6f381641741428f2a8f72bff6e21033544421bbae9b81575d559620e9e6b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOhzDEAAoJEEdUh39IaPFNK/YH/RMz94bBjWrxw/7aLD5hcxrk
-htFBIQyeJGjMVMZiWYXMVS/gwYJfFAaKsax6HGyazV6YdvckBQrkU8JgzjuvhDC/
-dk3yV7txiJp0ABHMXTAyijKWmO+AmMSngEl2dQDry+K2yII+fNmQGe7pliusEptZ
-wcRbgiMtMi+JsSc56/pUlN+Jj2/rxJ4Nvptrz+jlzhKiNdFX+IjivIsBczilMaUr
-9r1iXGp+I2Tv3WL2vDzLF9k7jL4cJ1o53Uz3Ab2s7C/zd/23nzYvms2pOF9hQU/O
-MbUOPb10niDMFkbBCg1dGxHp0fLAsBOQPzOHuREb202aqVG9WI74bfCXXo9u5Lk=
-=NmEV
+iEYEAREIAAYFAlDsRy0ACgkQVWmRsqeSphOpEgCfZGWNw7UYD1fn4gUZT9TcO6Fr
+mMYAn2S0UJH0dHfwKWRsiuzQBDE+d9DV
+=/RkP
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/ziproxy/ziproxy-3.1.3.ebuild b/net-proxy/ziproxy/ziproxy-3.1.3.ebuild
index 14300f2dd5ca..1a7d50901f38 100644
--- a/net-proxy/ziproxy/ziproxy-3.1.3.ebuild
+++ b/net-proxy/ziproxy/ziproxy-3.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-3.1.3.ebuild,v 1.3 2011/08/09 11:15:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-3.1.3.ebuild,v 1.4 2013/01/08 16:19:56 jer Exp $
 
 EAPI=4
-inherit autotools eutils
+inherit autotools eutils user
 
 DESCRIPTION="A forwarding, non-caching, compressing web proxy server"
 HOMEPAGE="http://ziproxy.sourceforge.net/"
diff --git a/net-proxy/ziproxy/ziproxy-3.3.0.ebuild b/net-proxy/ziproxy/ziproxy-3.3.0.ebuild
new file mode 100644
index 000000000000..988bddfeb0bf
--- /dev/null
+++ b/net-proxy/ziproxy/ziproxy-3.3.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2013 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 $
+
+EAPI=4
+inherit user
+
+DESCRIPTION="A forwarding, non-caching, compressing web proxy server"
+HOMEPAGE="http://ziproxy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="jpeg2k sasl xinetd"
+
+DEPEND="
+	media-libs/giflib
+	media-libs/libpng
+	virtual/jpeg
+	sys-libs/zlib
+	jpeg2k? ( media-libs/jasper )
+	sasl? ( dev-libs/cyrus-sasl )
+"
+RDEPEND="
+	${DEPEND}
+	xinetd? ( virtual/inetd )
+"
+
+pkg_setup() {
+	enewgroup ziproxy
+	enewuser ziproxy -1 -1 -1 ziproxy
+}
+
+src_prepare() {
+	# fix sample config file
+	sed -i \
+		-e "s:/var/ziproxy/:/var/lib/ziproxy/:g" \
+		-e "s:%j-%Y.log:/var/log/ziproxy/%j-%Y.log:g" \
+		etc/ziproxy/ziproxy.conf || die
+
+	# fix sample xinetd config
+	sed -i \
+		-e "s:/usr/bin/:/usr/sbin/:g" \
+		-e "s:\(.*port.*\):\1\n\ttype\t\t\t= UNLISTED:g" \
+		-e "s:root:ziproxy:g" \
+		etc/xinetd.d/ziproxy || die
+}
+
+src_configure() {
+	econf \
+		$(use_with jpeg2k jasper) \
+		$(use_with sasl sasl2) \
+		--with-cfgfile=/etc/ziproxy/ziproxy.conf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodir /usr/sbin
+	mv -vf "${D}"usr/{,s}bin/ziproxy || die
+
+	dobin src/tools/ziproxy_genhtml_stats.sh
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	dodoc ChangeLog CREDITS README README.tools
+	use jpeg2k && dodoc JPEG2000.txt
+
+	insinto /etc
+	doins -r etc/ziproxy
+
+	insinto /var/lib/ziproxy/error
+	doins var/ziproxy/error/*.html
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		doins etc/xinetd.d/ziproxy
+	fi
+
+	diropts -m0750 -o ziproxy -g ziproxy
+	keepdir /var/log/ziproxy
+}