Remove obsolete versions. Version bump (#182258).

(Portage version: 2.1.2.7)

11 files changed, 85 insertions, 123 deletions

diff --git a/net-proxy/polipo/ChangeLog b/net-proxy/polipo/ChangeLog
index ee9cb224d6b0..fb8cfbc8a8f7 100644
--- a/net-proxy/polipo/ChangeLog
+++ b/net-proxy/polipo/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-proxy/polipo
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v 1.16 2007/04/28 22:21:36 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v 1.17 2007/06/17 07:00:10 mrness Exp $
+
+*polipo-1.0.0 (17 Jun 2007)
+
+  17 Jun 2007; Alin Năstac <mrness@gentoo.org>
+  -files/polipo-0.9.10-gentoo.patch, -files/polipo-0.9.11-gentoo.patch,
+  +files/polipo-0.9.12.initd, +files/polipo-1.0.0-gentoo.patch,
+  files/polipo.initd, -polipo-0.9.10.ebuild, -polipo-0.9.11.ebuild,
+  polipo-0.9.12-r1.ebuild, +polipo-1.0.0.ebuild:
+  Remove obsolete versions. Version bump (#182258).
 
   28 Apr 2007; Torsten Veller <tove@gentoo.org> polipo-0.9.10.ebuild,
   polipo-0.9.11.ebuild, polipo-0.9.12-r1.ebuild:
diff --git a/net-proxy/polipo/files/digest-polipo-0.9.10 b/net-proxy/polipo/files/digest-polipo-0.9.10
deleted file mode 100644
index cca18be725cb..000000000000
--- a/net-proxy/polipo/files/digest-polipo-0.9.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 257b2a2e0e435b40a614318e0f2a2099 polipo-0.9.10.tar.gz 149303
-RMD160 f1905444490ef8775dc8894addcd07087f5c9c07 polipo-0.9.10.tar.gz 149303
-SHA256 fe25ba6e39186c96278b8cb6803a04438ad2dc838bea704f163bbae86ecabd9d polipo-0.9.10.tar.gz 149303
diff --git a/net-proxy/polipo/files/digest-polipo-0.9.11 b/net-proxy/polipo/files/digest-polipo-0.9.11
deleted file mode 100644
index 2bae372592bc..000000000000
--- a/net-proxy/polipo/files/digest-polipo-0.9.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 860f8f5e34be010379aa693e5224f84e polipo-0.9.11.tar.gz 149330
-RMD160 c2e5d2fe591d026e96b32a7b4b2693c6ca2e9b1a polipo-0.9.11.tar.gz 149330
-SHA256 6f7c9ca5b61aeaa926a8ea2f307ed98b35d2fc6249be20b4092d9c97124d8abc polipo-0.9.11.tar.gz 149330
diff --git a/net-proxy/polipo/files/digest-polipo-1.0.0 b/net-proxy/polipo/files/digest-polipo-1.0.0
new file mode 100644
index 000000000000..e09b8d26e3cb
--- /dev/null
+++ b/net-proxy/polipo/files/digest-polipo-1.0.0
@@ -0,0 +1,3 @@
+MD5 e9db1fadbce47b8664351d14510bd5c9 polipo-1.0.0.tar.gz 176618
+RMD160 c054f47afc807857945824315976dbe54304a6ea polipo-1.0.0.tar.gz 176618
+SHA256 0a00d7009fd4c501daa916c354036f3cbd5533c25c7b0efce6b7176fb4ae80ba polipo-1.0.0.tar.gz 176618
diff --git a/net-proxy/polipo/files/polipo-0.9.11-gentoo.patch b/net-proxy/polipo/files/polipo-0.9.11-gentoo.patch
deleted file mode 100644
index 432f94eb3e87..000000000000
--- a/net-proxy/polipo/files/polipo-0.9.11-gentoo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Nru polipo-0.9.11.orig/Makefile polipo-0.9.11/Makefile
---- polipo-0.9.11.orig/Makefile	2006-12-07 21:08:41.000000000 +0200
-+++ polipo-0.9.11/Makefile	2007-01-15 13:41:44.000000000 +0200
-@@ -82,11 +82,6 @@
- 	cp -f localindex.html $(TARGET)$(LOCAL_ROOT)/index.html
- 
- install.man: all
--	mkdir -p $(TARGET)$(MANDIR)/man1
--	mkdir -p $(TARGET)$(INFODIR)
--	cp -f polipo.man $(TARGET)$(MANDIR)/man1/polipo.1
--	cp polipo.info $(TARGET)$(INFODIR)/
--	install-info --info-dir=$(INFODIR) polipo.info
- 
- 
- polipo.info: polipo.texi
-diff -Nru polipo-0.9.11.orig/polipo.h polipo-0.9.11/polipo.h
---- polipo-0.9.11.orig/polipo.h	2006-12-07 21:08:41.000000000 +0200
-+++ polipo-0.9.11/polipo.h	2007-01-15 13:41:44.000000000 +0200
-@@ -62,7 +62,9 @@
- #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
- /* nothing */
- #elif defined(__GNUC__)
-+#ifndef inline
- #define inline __inline
-+#endif
- #if  (__GNUC__ >= 3)
- #define restrict __restrict
- #else
-diff -Nru polipo-0.9.11.orig/server.c polipo-0.9.11/server.c
---- polipo-0.9.11.orig/server.c	2006-12-07 21:08:41.000000000 +0200
-+++ polipo-0.9.11/server.c	2007-01-15 13:46:44.000000000 +0200
-@@ -1832,10 +1832,10 @@
-     } else if(code < 400 && 
-               (content_range.from >= 0 || content_range.to >= 0 || 
-                content_range.full_length >= 0)) {
--        do_log(L_ERROR, "Range without partial content.\n");
--        httpServerAbort(connection, 1, 502,
--                        internAtom("Range without partial content"));
--        goto fail;
-+        do_log(L_WARN, "Range without partial content.\n");
-+        content_range.from = -1;
-+        content_range.to = -1;
-+        content_range.full_length = -1;
-     } else if(code != 304 && code != 412) {
-         full_len = len;
-     }
diff --git a/net-proxy/polipo/files/polipo-0.9.12.initd b/net-proxy/polipo/files/polipo-0.9.12.initd
new file mode 100644
index 000000000000..b6cb0e7359ea
--- /dev/null
+++ b/net-proxy/polipo/files/polipo-0.9.12.initd
@@ -0,0 +1,56 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/files/polipo-0.9.12.initd,v 1.1 2007/06/17 07:00:10 mrness Exp $
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	polipo -v | (
+		local retvalue=0
+		local name value desc
+		while read name value desc ; do
+			case ${name} in
+				configFile)
+					if [[ "${value}" == "(none)" ]]; then
+						eerror "Unable to read configuration file /etc/polipo/config"
+						retvalue=1
+					fi
+					;;
+				daemonise)
+					if [[ "${value}" != "false" ]]; then
+						eerror "Configuration option not supported by this init script: ${name}=${value}"
+						retvalue=1
+					fi
+					;;
+				pidFile)
+					if [[ "${value}" != "(none)" ]]; then
+						eerror "Configuration option not supported by this init script: ${name}=${value}"
+						retvalue=1
+					fi
+					;;
+			esac
+		done
+		return ${retvalue}
+	)
+	[[ ${PIPESTATUS[0]} == 0 && ${PIPESTATUS[1]} == 0 ]]
+	return $?
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting Polipo HTTP proxy"
+	start-stop-daemon --start --chuid polipo \
+		--background --pidfile /var/run/polipo.pid --make-pidfile \
+			--exec /usr/bin/polipo
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Polipo HTTP proxy"
+	start-stop-daemon --stop --pidfile /var/run/polipo.pid
+	eend $?
+}
diff --git a/net-proxy/polipo/files/polipo-0.9.10-gentoo.patch b/net-proxy/polipo/files/polipo-1.0.0-gentoo.patch
index 864b6932f7a9..ddb68a70e9bb 100644
--- a/net-proxy/polipo/files/polipo-0.9.10-gentoo.patch
+++ b/net-proxy/polipo/files/polipo-1.0.0-gentoo.patch
@@ -1,7 +1,7 @@
-diff -Nru polipo-0.9.10.orig/Makefile polipo-0.9.10/Makefile
---- polipo-0.9.10.orig/Makefile	2006-09-02 17:33:44.000000000 +0000
-+++ polipo-0.9.10/Makefile	2006-10-09 07:18:58.000000000 +0000
-@@ -82,11 +82,6 @@
+diff -Nru polipo-1.0.0.orig/Makefile polipo-1.0.0/Makefile
+--- polipo-1.0.0.orig/Makefile	2007-03-06 21:29:05.000000000 +0200
++++ polipo-1.0.0/Makefile	2007-06-17 09:43:17.000000000 +0300
+@@ -97,11 +97,6 @@
  	cp -f localindex.html $(TARGET)$(LOCAL_ROOT)/index.html
  
  install.man: all
@@ -13,10 +13,10 @@ diff -Nru polipo-0.9.10.orig/Makefile polipo-0.9.10/Makefile
  
  
  polipo.info: polipo.texi
-diff -Nru polipo-0.9.10.orig/polipo.h polipo-0.9.10/polipo.h
---- polipo-0.9.10.orig/polipo.h	2006-09-02 17:33:44.000000000 +0000
-+++ polipo-0.9.10/polipo.h	2006-10-09 07:16:39.000000000 +0000
-@@ -62,7 +62,9 @@
+diff -Nru polipo-1.0.0.orig/polipo.h polipo-1.0.0/polipo.h
+--- polipo-1.0.0.orig/polipo.h	2007-03-06 21:29:05.000000000 +0200
++++ polipo-1.0.0/polipo.h	2007-06-17 09:43:17.000000000 +0300
+@@ -65,7 +65,9 @@
  #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
  /* nothing */
  #elif defined(__GNUC__)
diff --git a/net-proxy/polipo/files/polipo.initd b/net-proxy/polipo/files/polipo.initd
index 8f2435677e37..de3532133ee4 100644
--- a/net-proxy/polipo/files/polipo.initd
+++ b/net-proxy/polipo/files/polipo.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/files/polipo.initd,v 1.3 2007/02/12 11:13:22 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/files/polipo.initd,v 1.4 2007/06/17 07:00:10 mrness Exp $
 
 depend() {
 	need net
@@ -9,9 +9,9 @@ depend() {
 
 checkconfig() {
 	polipo -v | (
-    		local retvalue=0
-    		local name value desc
-		while read name value desc ; do
+		local retvalue=0
+		local name type value desc
+		while read name type value desc ; do
 			case ${name} in
 				configFile)
 					if [[ "${value}" == "(none)" ]]; then
diff --git a/net-proxy/polipo/polipo-0.9.10.ebuild b/net-proxy/polipo/polipo-0.9.10.ebuild
deleted file mode 100644
index 6135c5770ecf..000000000000
--- a/net-proxy/polipo/polipo-0.9.10.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-0.9.10.ebuild,v 1.3 2007/04/28 22:21:36 tove Exp $
-
-inherit eutils
-
-DESCRIPTION="A caching web proxy"
-HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/polipo/"
-SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND="sys-apps/texinfo"
-
-pkg_setup() {
-	enewgroup polipo
-	enewuser polipo -1 -1 /var/cache/polipo polipo
-}
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-src_compile() {
-	emake "PREFIX=/usr" "CDEBUGFLAGS=${CFLAGS}" all || die "build failed"
-}
-
-src_install() {
-	einstall "PREFIX=/usr" "TARGET=${D}" || die "install failed"
-	mv polipo.man polipo.1
-	doman "${S}/polipo.1"
-	doinfo "${S}/polipo.info"
-
-	newinitd "${FILESDIR}/polipo.initd" polipo
-	insinto /etc/polipo ; doins "${FILESDIR}/config"
-	exeinto /etc/cron.daily ; newexe "${FILESDIR}/polipo.crond" polipo.sh
-
-	diropts -m0750 -o polipo -g polipo
-	dodir /var/cache/polipo
-}
-
-pkg_preinst() {
-	pkg_setup
-}
-
-pkg_postinst() {
-	einfo "Do not forget to read the manual."
-	einfo "Change the config file in /etc/polipo to suit your needs."
-}
diff --git a/net-proxy/polipo/polipo-0.9.12-r1.ebuild b/net-proxy/polipo/polipo-0.9.12-r1.ebuild
index a197545fc692..bdeed20a9002 100644
--- a/net-proxy/polipo/polipo-0.9.12-r1.ebuild
+++ b/net-proxy/polipo/polipo-0.9.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-0.9.12-r1.ebuild,v 1.3 2007/04/28 22:21:36 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-0.9.12-r1.ebuild,v 1.4 2007/06/17 07:00:10 mrness Exp $
 
 inherit eutils
 
@@ -37,7 +37,7 @@ src_install() {
 	doman "${S}/polipo.1"
 	doinfo "${S}/polipo.info"
 
-	newinitd "${FILESDIR}/polipo.initd" polipo
+	newinitd "${FILESDIR}/polipo-0.9.12.initd" polipo
 	insinto /etc/polipo ; doins "${FILESDIR}/config"
 	exeinto /etc/cron.daily ; newexe "${FILESDIR}/polipo.crond" polipo.sh
 
diff --git a/net-proxy/polipo/polipo-0.9.11.ebuild b/net-proxy/polipo/polipo-1.0.0.ebuild
index 89b52c2c9ae0..668d60cbc0e5 100644
--- a/net-proxy/polipo/polipo-0.9.11.ebuild
+++ b/net-proxy/polipo/polipo-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-0.9.11.ebuild,v 1.2 2007/04/28 22:21:36 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-1.0.0.ebuild,v 1.1 2007/06/17 07:00:10 mrness Exp $
 
 inherit eutils
 
@@ -41,7 +41,7 @@ src_install() {
 	exeinto /etc/cron.daily ; newexe "${FILESDIR}/polipo.crond" polipo.sh
 
 	diropts -m0750 -o polipo -g polipo
-	dodir /var/cache/polipo
+	keepdir /var/cache/polipo
 }
 
 pkg_preinst() {