version bump, solving bug #139135.

Package-Manager: portage-2.1.1_pre2-r1

6 files changed, 156 insertions, 14 deletions

diff --git a/net-proxy/ziproxy/ChangeLog b/net-proxy/ziproxy/ChangeLog
index bce2817c0121..16dfedcf0270 100644
--- a/net-proxy/ziproxy/ChangeLog
+++ b/net-proxy/ziproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/ziproxy
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.4 2006/03/06 22:58:33 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.5 2006/07/04 17:33:10 sbriesen Exp $
+
+*ziproxy-2.0.0 (04 Jul 2006)
+
+  04 Jul 2006; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/ziproxy-2.0.confd, +files/ziproxy-2.0.initd, +ziproxy-2.0.0.ebuild:
+  version bump, solving bug #139135.
 
   06 Mar 2006; Alin Nastac <mrness@gentoo.org> -ziproxy-1.5.1.ebuild:
   Remove old version.
diff --git a/net-proxy/ziproxy/Manifest b/net-proxy/ziproxy/Manifest
index 2bb986d52ec0..1e263f4107fc 100644
--- a/net-proxy/ziproxy/Manifest
+++ b/net-proxy/ziproxy/Manifest
@@ -1,16 +1,40 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6684731f6effe93a0c17049659d183da ChangeLog 794
-MD5 3146d0dcfb49988761d4fcd2c666caf6 files/digest-ziproxy-1.5.2 66
+AUX ziproxy-2.0.confd 383 RMD160 dcb11fe617a0ba44a5a2eaa8bf48539ac96cf8c3 SHA1 b31125d9a5e4ef34eaca4e3a558693ff7af57cfb SHA256 2d2e741a51b0998505a0d7fb8afc73ab07997b30575e30e822a6bf527aa7512f
+MD5 bf2aeda2f379ac8d231981a4a6fe0ae7 files/ziproxy-2.0.confd 383
+RMD160 dcb11fe617a0ba44a5a2eaa8bf48539ac96cf8c3 files/ziproxy-2.0.confd 383
+SHA256 2d2e741a51b0998505a0d7fb8afc73ab07997b30575e30e822a6bf527aa7512f files/ziproxy-2.0.confd 383
+AUX ziproxy-2.0.initd 702 RMD160 59c8219c1d796d7066776afbb18b95bafcf9e3fc SHA1 d200d1851b89a39808dab004a27d7f08dfeaf66b SHA256 6b8e704b2d56f60e2485da15d345579a420232e7f69fcb3057463b5d7d6036e6
+MD5 db05f13450cd2d1e455b55fe57029fab files/ziproxy-2.0.initd 702
+RMD160 59c8219c1d796d7066776afbb18b95bafcf9e3fc files/ziproxy-2.0.initd 702
+SHA256 6b8e704b2d56f60e2485da15d345579a420232e7f69fcb3057463b5d7d6036e6 files/ziproxy-2.0.initd 702
+AUX ziproxy.confd 384 RMD160 df2d02bc35795edc4695ce580f83edac96e178f0 SHA1 82906a132a9f4e625e6894d3280905e7e7682c17 SHA256 2931531c9485fa02ddecbb87f1d071f2076ac56339af559798f60cf112aceff0
 MD5 007b66959e3f4d9ec2759e2fbfba370a files/ziproxy.confd 384
+RMD160 df2d02bc35795edc4695ce580f83edac96e178f0 files/ziproxy.confd 384
+SHA256 2931531c9485fa02ddecbb87f1d071f2076ac56339af559798f60cf112aceff0 files/ziproxy.confd 384
+AUX ziproxy.initd 762 RMD160 4de3d4059efdc7af774a2892930f713b82fa4324 SHA1 7128e1e5bd67a7396e4293fdcbbaa506d20b98d3 SHA256 651b22af7b0a2a7d8ef9d643e98b3a5242cc964c8d9bffab1ef4d4268ddc078b
 MD5 71e0da62940b75aeeddf33c1b056d72c files/ziproxy.initd 762
-MD5 13eac033f7cb4d69bd27489ab828449a metadata.xml 513
+RMD160 4de3d4059efdc7af774a2892930f713b82fa4324 files/ziproxy.initd 762
+SHA256 651b22af7b0a2a7d8ef9d643e98b3a5242cc964c8d9bffab1ef4d4268ddc078b files/ziproxy.initd 762
+DIST ziproxy-1.5.2.tar.bz2 121104
+DIST ziproxy-2.0.0.tar.bz2 124371 RMD160 bf9e5b7c500f7c12328e690830f45dcc0cc1169a SHA1 e38fc9c12a78a018ec8082c0e4f217d15efa0752 SHA256 9c3d755bd8e384185c3715c32eaf17d49825dc4e23cc99fcc94270c77d7b22a3
+EBUILD ziproxy-1.5.2.ebuild 1637 RMD160 7943f24d1ced87426a18487f1693047ba542000e SHA1 acd39dd38cc5a85dd466553039875d0ffbd90302 SHA256 7a642d3e0decff104488e18e07d76e6ce95e414a20d0f917e87f10e893ae905b
 MD5 00d4b67a84956aa3b7286a5ab5c24022 ziproxy-1.5.2.ebuild 1637
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEDL6ljG8pv1lIUX4RAglwAJ911pCpHhs672IWGWaVIwczYkmiQgCfXnPR
-HtCdFbuiu7XJGu7Cj63q5/c=
-=i1Jy
------END PGP SIGNATURE-----
+RMD160 7943f24d1ced87426a18487f1693047ba542000e ziproxy-1.5.2.ebuild 1637
+SHA256 7a642d3e0decff104488e18e07d76e6ce95e414a20d0f917e87f10e893ae905b ziproxy-1.5.2.ebuild 1637
+EBUILD ziproxy-2.0.0.ebuild 1738 RMD160 a518b1018c5442ba096e23eb8e1473f087d4917f SHA1 2dc89a965db58059a41994e942dcaf101aec67fa SHA256 6174acb148321b6f6ac5dd5eedbb5628c3e4741b5dcff23ffc55acfe7f4b0a50
+MD5 f29ac679f5f7903629251e2306bc013a ziproxy-2.0.0.ebuild 1738
+RMD160 a518b1018c5442ba096e23eb8e1473f087d4917f ziproxy-2.0.0.ebuild 1738
+SHA256 6174acb148321b6f6ac5dd5eedbb5628c3e4741b5dcff23ffc55acfe7f4b0a50 ziproxy-2.0.0.ebuild 1738
+MISC ChangeLog 996 RMD160 f98e2b7c1e7b3adb36a2eae976be079283a2159c SHA1 630972c552e9926bf774e1ea3d2bc4d5a4f80065 SHA256 d3bf66382abf78bc019d5124d76a59b6218ed5e7260b39eb6418b9da81b5e5da
+MD5 de2712b36177bbbdbf26ae30fd4bcb5e ChangeLog 996
+RMD160 f98e2b7c1e7b3adb36a2eae976be079283a2159c ChangeLog 996
+SHA256 d3bf66382abf78bc019d5124d76a59b6218ed5e7260b39eb6418b9da81b5e5da ChangeLog 996
+MISC metadata.xml 513 RMD160 b107d66a1ba20b230598d2602f851dfbb8ba455b SHA1 586129e96f59e881bc2297180771b2dd9e664ff0 SHA256 07e6b452bd4451e9bdc7269eb44d61efe0945afbcd9757ce7ae707021e0335bc
+MD5 13eac033f7cb4d69bd27489ab828449a metadata.xml 513
+RMD160 b107d66a1ba20b230598d2602f851dfbb8ba455b metadata.xml 513
+SHA256 07e6b452bd4451e9bdc7269eb44d61efe0945afbcd9757ce7ae707021e0335bc metadata.xml 513
+MD5 3146d0dcfb49988761d4fcd2c666caf6 files/digest-ziproxy-1.5.2 66
+RMD160 60018537d10616a7168c0f7e8ea92efcac1c3a36 files/digest-ziproxy-1.5.2 66
+SHA256 e1309005065ccd869fde28e9d7f81557df19eb0964b7310a394ba89bb24e830f files/digest-ziproxy-1.5.2 66
+MD5 798e702f8d5d04d9af477b38d53d7256 files/digest-ziproxy-2.0.0 244
+RMD160 f6d1a2633fe4ce0969edd001ccfe65408229870a files/digest-ziproxy-2.0.0 244
+SHA256 77992b8aec1db86accbc0ed69a2986d2c245951becd1964af7fb714f807921d9 files/digest-ziproxy-2.0.0 244
diff --git a/net-proxy/ziproxy/files/digest-ziproxy-2.0.0 b/net-proxy/ziproxy/files/digest-ziproxy-2.0.0
new file mode 100644
index 000000000000..987441af98a7
--- /dev/null
+++ b/net-proxy/ziproxy/files/digest-ziproxy-2.0.0
@@ -0,0 +1,3 @@
+MD5 de9c66860b0f56e940eb92f0a7c867c9 ziproxy-2.0.0.tar.bz2 124371
+RMD160 bf9e5b7c500f7c12328e690830f45dcc0cc1169a ziproxy-2.0.0.tar.bz2 124371
+SHA256 9c3d755bd8e384185c3715c32eaf17d49825dc4e23cc99fcc94270c77d7b22a3 ziproxy-2.0.0.tar.bz2 124371
diff --git a/net-proxy/ziproxy/files/ziproxy-2.0.confd b/net-proxy/ziproxy/files/ziproxy-2.0.confd
new file mode 100644
index 000000000000..73417ca560c0
--- /dev/null
+++ b/net-proxy/ziproxy/files/ziproxy-2.0.confd
@@ -0,0 +1,12 @@
+# configuraton file for /etc/init.d/ziproxy
+
+# Full path to ziproxy.conf file (instead of default one).
+#
+#CONFIG="/etc/ziproxy.conf"
+
+# Limit incoming connections only from the specified address(es).
+# This option has the same meaning, but higher precedence as
+# "OnlyFrom=" option in configuration file. Uncomment it
+# if you want to set it.
+#
+#ONLYFROM="<IP.address or hostname>"
diff --git a/net-proxy/ziproxy/files/ziproxy-2.0.initd b/net-proxy/ziproxy/files/ziproxy-2.0.initd
new file mode 100644
index 000000000000..2a82e14eb78b
--- /dev/null
+++ b/net-proxy/ziproxy/files/ziproxy-2.0.initd
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/files/ziproxy-2.0.initd,v 1.1 2006/07/04 17:33:10 sbriesen Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	local OPT="-d"
+	ebegin "Starting ziproxy"
+
+	[ -n "${CONFIG}"   ] && OPT="${OPT} -c ${CONFIG}"
+	[ -n "${ONLYFROM}" ] && OPT="${OPT} -f ${ONLYFROM}"
+
+	start-stop-daemon --quiet --start --pidfile /var/run/ziproxy.pid \
+		--chuid ziproxy:ziproxy --exec /usr/bin/ziproxy -- ${OPT} > /var/run/ziproxy.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ziproxy"
+	start-stop-daemon --stop --quiet --pidfile /var/run/ziproxy.pid
+	eend $?
+}
diff --git a/net-proxy/ziproxy/ziproxy-2.0.0.ebuild b/net-proxy/ziproxy/ziproxy-2.0.0.ebuild
new file mode 100644
index 000000000000..1801a0a549e7
--- /dev/null
+++ b/net-proxy/ziproxy/ziproxy-2.0.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-2.0.0.ebuild,v 1.1 2006/07/04 17:33:10 sbriesen Exp $
+
+inherit eutils
+
+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 ~x86"
+IUSE="jpeg2k xinetd"
+
+DEPEND="dev-libs/confuse
+	media-libs/giflib
+	media-libs/libpng
+	media-libs/jpeg
+	sys-libs/zlib
+	jpeg2k? ( media-libs/jasper )
+	xinetd? ( virtual/inetd )"
+
+
+pkg_setup() {
+	enewgroup ziproxy
+	enewuser ziproxy -1 -1 -1 ziproxy
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# fix sample config file
+	sed -i -e "s:/usr/local/ziproxy/\(ziproxy.passwd\):/etc/\1:g" \
+		-e "s:/var/ziproxy/:/var/lib/ziproxy/:g" etc/ziproxy.conf
+
+	# fix sample xintd config
+	sed -i -e "s:root:ziproxy:g" etc/xinetd.d/ziproxy
+}
+
+src_compile() {
+	local myconf="--enable-shared-confuse --with-cfgfile=/etc/ziproxy.conf" # --enable-testprogs
+	use jpeg2k && myconf="${myconf} --with-jasper"  # use_with doesn't work
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc ChangeLog CREDITS README stats.awk
+	use jpeg2k && dodoc JPEG2000.txt
+
+	insinto /etc
+	doins etc/ziproxy.conf
+
+	insinto /var/lib/ziproxy/error
+	doins var/ziproxy/error/*.html
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		doins etc/xinetd.d/ziproxy
+	else
+		newinitd "${FILESDIR}/${PN}-${PV%.*}.initd" ${PN}
+		newconfd "${FILESDIR}/${PN}-${PV%.*}.confd" ${PN}
+	fi
+
+	diropts -m0750 -o ziproxy -g ziproxy
+	keepdir /var/log/ziproxy
+}