version bump, solving bugs #139486 and #143496, removing old version.

(Portage version: 2.1.1_rc1-r7)
 (Unsigned Manifest commit)

5 files changed, 20 insertions, 117 deletions

diff --git a/net-proxy/ziproxy/Manifest b/net-proxy/ziproxy/Manifest
index 1e263f4107fc..ad42dd49dd31 100644
--- a/net-proxy/ziproxy/Manifest
+++ b/net-proxy/ziproxy/Manifest
@@ -6,35 +6,35 @@ AUX ziproxy-2.0.initd 702 RMD160 59c8219c1d796d7066776afbb18b95bafcf9e3fc SHA1 d
 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
-RMD160 4de3d4059efdc7af774a2892930f713b82fa4324 files/ziproxy.initd 762
-SHA256 651b22af7b0a2a7d8ef9d643e98b3a5242cc964c8d9bffab1ef4d4268ddc078b files/ziproxy.initd 762
-DIST ziproxy-1.5.2.tar.bz2 121104
+AUX ziproxy-2.1.confd 642 RMD160 322d077e966d6d40cf09953b79eca608276a2f07 SHA1 89f66b41e3e1c840b75c48be22d8d14a03a1ae19 SHA256 a01f10aaceb1216f44b37a5e27f58bc332347a4a6f7bef92f4e7342d72692433
+MD5 aac9672c4bda0f351890d67216523d38 files/ziproxy-2.1.confd 642
+RMD160 322d077e966d6d40cf09953b79eca608276a2f07 files/ziproxy-2.1.confd 642
+SHA256 a01f10aaceb1216f44b37a5e27f58bc332347a4a6f7bef92f4e7342d72692433 files/ziproxy-2.1.confd 642
+AUX ziproxy-2.1.initd 703 RMD160 d69ee9f77f560e5d7da70b71fefff815802a907c SHA1 4562312fe2e90620118ae5108eccabad49fa4074 SHA256 54ce5889dcdbb695796d12f9d42859e21d3cda5298e6ac1fcbc9a882ed0f83aa
+MD5 475d4dd7c4effea9c8d3671798e19ead files/ziproxy-2.1.initd 703
+RMD160 d69ee9f77f560e5d7da70b71fefff815802a907c files/ziproxy-2.1.initd 703
+SHA256 54ce5889dcdbb695796d12f9d42859e21d3cda5298e6ac1fcbc9a882ed0f83aa files/ziproxy-2.1.initd 703
 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
-RMD160 7943f24d1ced87426a18487f1693047ba542000e ziproxy-1.5.2.ebuild 1637
-SHA256 7a642d3e0decff104488e18e07d76e6ce95e414a20d0f917e87f10e893ae905b ziproxy-1.5.2.ebuild 1637
+DIST ziproxy-2.1.1.tar.bz2 134973 RMD160 ce115c3d9cf9b3fbd20fef51e3485df8445ec331 SHA1 e421c77df823c7fb8c67ab116f0403507c3271ac SHA256 35b5dd9d06eae54e3e3ce5696a5646f6d1b7dfd15f50ca63598e8e599d3a5fd9
 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
+EBUILD ziproxy-2.1.1.ebuild 1865 RMD160 1df87fed6948a062f98fbc20c9c73024754b97e2 SHA1 9741f8dcfd6d4301266c434745ddf20f898fde21 SHA256 df62f3bc1f603a0fa275101c0cf5b2cfc9a9a907ee2fdbd252944f0e543765a2
+MD5 3855ac49e90720d36767d6dac91ae581 ziproxy-2.1.1.ebuild 1865
+RMD160 1df87fed6948a062f98fbc20c9c73024754b97e2 ziproxy-2.1.1.ebuild 1865
+SHA256 df62f3bc1f603a0fa275101c0cf5b2cfc9a9a907ee2fdbd252944f0e543765a2 ziproxy-2.1.1.ebuild 1865
+MISC ChangeLog 1300 RMD160 d07db5cbccd5c97f3e04dbd5acb7bb419f8a8bee SHA1 a960acd748058b5274cfb612701903588b83c130 SHA256 cde289ee0f31870ee7a8027a97c901e2abc56a99b84d777bd8f90fe70436b465
+MD5 316f62286a543fc273f6cdde245659e1 ChangeLog 1300
+RMD160 d07db5cbccd5c97f3e04dbd5acb7bb419f8a8bee ChangeLog 1300
+SHA256 cde289ee0f31870ee7a8027a97c901e2abc56a99b84d777bd8f90fe70436b465 ChangeLog 1300
 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
+MD5 b4849100f93781749f5d499459c67677 files/digest-ziproxy-2.1.1 244
+RMD160 e46061674b991bc24fd0031ae37a559143802153 files/digest-ziproxy-2.1.1 244
+SHA256 11cacdb3c3ad15ad70a610ea2338d9a0e61bb61520c55a0667a75141559519c9 files/digest-ziproxy-2.1.1 244
diff --git a/net-proxy/ziproxy/files/digest-ziproxy-1.5.2 b/net-proxy/ziproxy/files/digest-ziproxy-1.5.2
deleted file mode 100644
index f329c4a66405..000000000000
--- a/net-proxy/ziproxy/files/digest-ziproxy-1.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c5bd73687f4376bd5cf68f3e2fe13367 ziproxy-1.5.2.tar.bz2 121104
diff --git a/net-proxy/ziproxy/files/ziproxy.confd b/net-proxy/ziproxy/files/ziproxy.confd
deleted file mode 100644
index e110cc0d1709..000000000000
--- a/net-proxy/ziproxy/files/ziproxy.confd
+++ /dev/null
@@ -1,14 +0,0 @@
-# configuraton file for /etc/init.d/ziproxy
-
-# location of the ziproxy config file
-#
-#CONFIG="/etc/ziproxy.conf"
-
-# following 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>"
-
-# Change to this username/uid before starting the process.
-RUNAS="nobody:nogroup"
diff --git a/net-proxy/ziproxy/files/ziproxy.initd b/net-proxy/ziproxy/files/ziproxy.initd
deleted file mode 100644
index 8b7b2a4a959a..000000000000
--- a/net-proxy/ziproxy/files/ziproxy.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/files/ziproxy.initd,v 1.2 2005/10/08 16:38:58 sbriesen Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	local OPT="" EXTRA=""
-	ebegin "Starting ziproxy"
-	[ -n "${CONFIG}" ] && OPT="-c ${CONFIG}" || OPT="-c /etc/ziproxy.conf"
-	[ -n "${ONLYFROM}" ] && OPT="${OPT} -f ${ONLYFROM}"
-	[ -n "${RUNAS}" ] && EXTRA="--chuid ${RUNAS}"
-	start-stop-daemon --quiet --start --background ${EXTRA} \
-		--make-pidfile --pidfile /var/run/ziproxy.pid \
-		--exec /usr/bin/netd -- ${OPT}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ziproxy"
-	start-stop-daemon --stop --quiet --pidfile /var/run/ziproxy.pid
-	eend $?
-}
diff --git a/net-proxy/ziproxy/ziproxy-1.5.2.ebuild b/net-proxy/ziproxy/ziproxy-1.5.2.ebuild
deleted file mode 100644
index 1311cfeb83f3..000000000000
--- a/net-proxy/ziproxy/ziproxy-1.5.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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-1.5.2.ebuild,v 1.1 2006/01/09 23:21:24 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"
-DEPEND="dev-libs/confuse
-	media-libs/giflib
-	media-libs/libpng
-	media-libs/jpeg
-	sys-libs/zlib
-	jpeg2k? ( media-libs/jasper )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# fix sample xinetd config filee
-	sed -i -e "s:/home/juro/bin/:/usr/bin/:g" \
-		-e "s:/home/juro/ziproxy/:/etc/:g" \
-		-e "s:\(disable.*=\).*:\1 yes:g" etc/xinetd.d/ziproxy
-
-	# fix sample config file
-	sed -i -e "s:/usr/local/bin/:/usr/bin/:g" \
-		-e "s:/var/ziproxy/:/var/lib/ziproxy/:g" \
-		-e "s:\(LogFile.*=.*\"\)\(.*\"\):\1/var/log/ziproxy_\2:g" etc/ziproxy.conf
-}
-
-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
-	use jpeg2k && dodoc JPEG2000.txt
-	insinto /etc
-	doins etc/ziproxy.conf
-	insinto /etc/xinetd.d
-	doins etc/xinetd.d/ziproxy
-	insinto /var/lib/ziproxy/error
-	doins var/ziproxy/error/*.html
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-}