Remove obsolete versions. Version bump (#182258).

Package-Manager: portage-2.1.2.7

12 files changed, 117 insertions, 163 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/Manifest b/net-proxy/polipo/Manifest
index e79e321f84d8..438d7d688dab 100644
--- a/net-proxy/polipo/Manifest
+++ b/net-proxy/polipo/Manifest
@@ -5,14 +5,6 @@ AUX config 167 RMD160 c277cb5c2a60d11ce7eeee781a335f1f475e9287 SHA1 b0ed88a7494f
 MD5 fdf9f12df918b0d2623ebe825a1aa705 files/config 167
 RMD160 c277cb5c2a60d11ce7eeee781a335f1f475e9287 files/config 167
 SHA256 3b600497508790390eb5413cc53ab04bfe8b083324472732b11847acddc91bda files/config 167
-AUX polipo-0.9.10-gentoo.patch 943 RMD160 96e21553e90fd38b6890b860a167bbebb2d63e23 SHA1 2042f0d893bff4cfdc8c1f4c670e551079716503 SHA256 1f79ac81cad86ce351d787550f49e9558679d28891e589e5860ca9eae91b2b4f
-MD5 e90e2010f36c3babd1d593cff571d8fc files/polipo-0.9.10-gentoo.patch 943
-RMD160 96e21553e90fd38b6890b860a167bbebb2d63e23 files/polipo-0.9.10-gentoo.patch 943
-SHA256 1f79ac81cad86ce351d787550f49e9558679d28891e589e5860ca9eae91b2b4f files/polipo-0.9.10-gentoo.patch 943
-AUX polipo-0.9.11-gentoo.patch 1752 RMD160 ed5cb9d38e18836db74e415490b0ab2ad7464025 SHA1 8da9f29e13f8a3297703d67710f7d415f852e181 SHA256 f5a22e9f239d89292a1a89292e6edc6036059526aa49a132830f2316c8d19228
-MD5 daa8163c7e2f18cfd8e500b54449b9fd files/polipo-0.9.11-gentoo.patch 1752
-RMD160 ed5cb9d38e18836db74e415490b0ab2ad7464025 files/polipo-0.9.11-gentoo.patch 1752
-SHA256 f5a22e9f239d89292a1a89292e6edc6036059526aa49a132830f2316c8d19228 files/polipo-0.9.11-gentoo.patch 1752
 AUX polipo-0.9.12-gentoo.patch 1752 RMD160 c95a805956ea7a2bc7ba9d0e568293e5ca78e4ea SHA1 ad85f2fdbead8e7d48b91822b42f17ad1c0b9903 SHA256 78c6e77234a03cd8878f5358959a7a43bc5eb6980c95cb5d87f43a95fd83d646
 MD5 e3e1dbf17d8b19f00ef41e6d8936efae files/polipo-0.9.12-gentoo.patch 1752
 RMD160 c95a805956ea7a2bc7ba9d0e568293e5ca78e4ea files/polipo-0.9.12-gentoo.patch 1752
@@ -21,50 +13,50 @@ AUX polipo-0.9.12-printf-ptr.patch 6058 RMD160 221044b859a1342953c74d447b2fb5bdb
 MD5 b63a71574b4bacb7b34a1e2418cc57b4 files/polipo-0.9.12-printf-ptr.patch 6058
 RMD160 221044b859a1342953c74d447b2fb5bdbbac8462 files/polipo-0.9.12-printf-ptr.patch 6058
 SHA256 b083f6af703c1a65f3f3a1362e90df975f5e7866555a7f092c28a70bea9a1b4b files/polipo-0.9.12-printf-ptr.patch 6058
+AUX polipo-0.9.12.initd 1354 RMD160 dedb7e12f684fe399a9dfe7203c48f06e650eb91 SHA1 9eb1735562b456a6d1f201caf401401594d6c562 SHA256 f7742e2c128788c77b6cdae72bd769454d235ccb81288a7364f1d1c4968cb180
+MD5 02d052d848f5bc97278ad30fd879516e files/polipo-0.9.12.initd 1354
+RMD160 dedb7e12f684fe399a9dfe7203c48f06e650eb91 files/polipo-0.9.12.initd 1354
+SHA256 f7742e2c128788c77b6cdae72bd769454d235ccb81288a7364f1d1c4968cb180 files/polipo-0.9.12.initd 1354
+AUX polipo-1.0.0-gentoo.patch 935 RMD160 9b39340d4472b89754f559fd5be8c4cb9cc1d63f SHA1 654b0aa25407e995c51b9713a6ae3f93a09f5244 SHA256 0411edd9b67e018cf6c09e16a4679e3f267b6a20e8346e46d7703519a7e1c3d1
+MD5 d99809efa658960128ee87fa1cb2c27e files/polipo-1.0.0-gentoo.patch 935
+RMD160 9b39340d4472b89754f559fd5be8c4cb9cc1d63f files/polipo-1.0.0-gentoo.patch 935
+SHA256 0411edd9b67e018cf6c09e16a4679e3f267b6a20e8346e46d7703519a7e1c3d1 files/polipo-1.0.0-gentoo.patch 935
 AUX polipo.crond 183 RMD160 aab536081352e9a16ddae9e2fba3e6c25ce687d0 SHA1 3fba7a15f51914f31b7c7c167f9cfba245ef1572 SHA256 2eb703bd3f4cdc7a616675ed3c924437e5ba594ac2037b3ae6292a410fac4b20
 MD5 44118bc5871d8a061e1ab1907b1c0065 files/polipo.crond 183
 RMD160 aab536081352e9a16ddae9e2fba3e6c25ce687d0 files/polipo.crond 183
 SHA256 2eb703bd3f4cdc7a616675ed3c924437e5ba594ac2037b3ae6292a410fac4b20 files/polipo.crond 183
-AUX polipo.initd 1355 RMD160 879ec0f69c0f2b749b711d474d60e8ce78bbd5a2 SHA1 9ad17ff42f9bed692ca0b8d90ff77a669b6add7c SHA256 6218b0ddcc91e4986f87425d97cd0fc86e2011609b4ea60716d434d1758fac8d
-MD5 cba925181945a6b2fd1289800e7081d8 files/polipo.initd 1355
-RMD160 879ec0f69c0f2b749b711d474d60e8ce78bbd5a2 files/polipo.initd 1355
-SHA256 6218b0ddcc91e4986f87425d97cd0fc86e2011609b4ea60716d434d1758fac8d files/polipo.initd 1355
-DIST polipo-0.9.10.tar.gz 149303 RMD160 f1905444490ef8775dc8894addcd07087f5c9c07 SHA1 53efc84764535ff7ffe7ce457daa95aa182a6c7d SHA256 fe25ba6e39186c96278b8cb6803a04438ad2dc838bea704f163bbae86ecabd9d
-DIST polipo-0.9.11.tar.gz 149330 RMD160 c2e5d2fe591d026e96b32a7b4b2693c6ca2e9b1a SHA1 fd1f77d3bdc5a5636f566b04f86a286ee802685d SHA256 6f7c9ca5b61aeaa926a8ea2f307ed98b35d2fc6249be20b4092d9c97124d8abc
+AUX polipo.initd 1357 RMD160 f07a38b41e627665025b1f1102de7c8ab11e89f0 SHA1 492d5a612211023d1bc52a218ae5f49541c7cd20 SHA256 b66110d4cb0feb35323d004f5a9a2efe5e81c87847927bd96135d21505aca021
+MD5 ff9f18cb46b9cdf54e9ef9c64c6a4944 files/polipo.initd 1357
+RMD160 f07a38b41e627665025b1f1102de7c8ab11e89f0 files/polipo.initd 1357
+SHA256 b66110d4cb0feb35323d004f5a9a2efe5e81c87847927bd96135d21505aca021 files/polipo.initd 1357
 DIST polipo-0.9.12.tar.gz 149370 RMD160 09b52dc68e0a1100e697199ff3cda1ba482a650f SHA1 f56d25584e6d84e219238df75aab0f3a6bfd8e4a SHA256 6b42de207937d3b13184aab3de2c3a6b9ab0ede92c340b19305f668e191cf205
-EBUILD polipo-0.9.10.ebuild 1270 RMD160 afc111075e6e4a4993eec86bc72c263ba512dcd9 SHA1 1f92f44ee19bba9a7d2e2a7856ca4f74d348edc5 SHA256 93628b23b7cde406b68baa9fab2008763f89c11a1c0a397b1fe25f8a717e5d2d
-MD5 a310b793c5d7a133c7850413ff847d30 polipo-0.9.10.ebuild 1270
-RMD160 afc111075e6e4a4993eec86bc72c263ba512dcd9 polipo-0.9.10.ebuild 1270
-SHA256 93628b23b7cde406b68baa9fab2008763f89c11a1c0a397b1fe25f8a717e5d2d polipo-0.9.10.ebuild 1270
-EBUILD polipo-0.9.11.ebuild 1271 RMD160 4f4fad31b508a64a8d063332a9ed7d25711f1de6 SHA1 66d8db7b4eff2fa52e34e8a854f14e31b493c029 SHA256 26f99052e603163af6e7007530c214319bdb8386b6304dffcad161ce1e6032a9
-MD5 519e387dec6238c356b23e4ae77edd96 polipo-0.9.11.ebuild 1271
-RMD160 4f4fad31b508a64a8d063332a9ed7d25711f1de6 polipo-0.9.11.ebuild 1271
-SHA256 26f99052e603163af6e7007530c214319bdb8386b6304dffcad161ce1e6032a9 polipo-0.9.11.ebuild 1271
-EBUILD polipo-0.9.12-r1.ebuild 1318 RMD160 78373b1c5099430f6886ff02dce513dcbee47079 SHA1 0a023ca38ad06e5c85a4ddb164f6e1476b760b18 SHA256 11a74528069f3ceb3c358dc4cad6fe2f2b1cba581c447d7ee045fc66cc710156
-MD5 340a054072660a3aba7614e7e40ce419 polipo-0.9.12-r1.ebuild 1318
-RMD160 78373b1c5099430f6886ff02dce513dcbee47079 polipo-0.9.12-r1.ebuild 1318
-SHA256 11a74528069f3ceb3c358dc4cad6fe2f2b1cba581c447d7ee045fc66cc710156 polipo-0.9.12-r1.ebuild 1318
-MISC ChangeLog 2896 RMD160 fde778a672ac1b5e673c759e5a75c2a40eee7488 SHA1 676505bf4f9d7a10c8cd74f5695f82674e6f775b SHA256 8340775de8004196f83146483b63f4c33495c795a641123d20c3bfbcebf03bf6
-MD5 6efcb218404362cd1342298fde16f17b ChangeLog 2896
-RMD160 fde778a672ac1b5e673c759e5a75c2a40eee7488 ChangeLog 2896
-SHA256 8340775de8004196f83146483b63f4c33495c795a641123d20c3bfbcebf03bf6 ChangeLog 2896
+DIST polipo-1.0.0.tar.gz 176618 RMD160 c054f47afc807857945824315976dbe54304a6ea SHA1 c6910ef207eff1c1765af0b76f28d2fb3a011742 SHA256 0a00d7009fd4c501daa916c354036f3cbd5533c25c7b0efce6b7176fb4ae80ba
+EBUILD polipo-0.9.12-r1.ebuild 1327 RMD160 3d175b1dd78643c4df7a9909ed01d388c06876ab SHA1 ee864900921d7eb9dfdb91c511ab5d97b6b075c9 SHA256 7a6da6ab4ce91a875e8806b57fd2348a648ceed8436492f8b5c504f33618715c
+MD5 d1b79bd5df79de8de9e551e56fe6ac8f polipo-0.9.12-r1.ebuild 1327
+RMD160 3d175b1dd78643c4df7a9909ed01d388c06876ab polipo-0.9.12-r1.ebuild 1327
+SHA256 7a6da6ab4ce91a875e8806b57fd2348a648ceed8436492f8b5c504f33618715c polipo-0.9.12-r1.ebuild 1327
+EBUILD polipo-1.0.0.ebuild 1274 RMD160 40bbb8ea3ad939162f2a31623bf8db057381139e SHA1 e303137c888e8d96330644811d0a7ae6e0dab650 SHA256 fdf915a4a80ef43d267ec46a6d82b9dda141f5b3188ec8bca86ef96e63dbb60f
+MD5 8c0d075dec4a275acf607c99f0cbec71 polipo-1.0.0.ebuild 1274
+RMD160 40bbb8ea3ad939162f2a31623bf8db057381139e polipo-1.0.0.ebuild 1274
+SHA256 fdf915a4a80ef43d267ec46a6d82b9dda141f5b3188ec8bca86ef96e63dbb60f polipo-1.0.0.ebuild 1274
+MISC ChangeLog 3281 RMD160 f353002a9b010cdf30626aa7e41c58a8a1c3fe66 SHA1 8a8b1c4f857a4be1e746191167ca5ec7be883c99 SHA256 3c53f9032283e53fbf2c1cc1a6e16f072470e46563d4d06dd5e8f7b3e0c7a9ca
+MD5 11c78389a52bf5714f26aa9f32b35abc ChangeLog 3281
+RMD160 f353002a9b010cdf30626aa7e41c58a8a1c3fe66 ChangeLog 3281
+SHA256 3c53f9032283e53fbf2c1cc1a6e16f072470e46563d4d06dd5e8f7b3e0c7a9ca ChangeLog 3281
 MISC metadata.xml 294 RMD160 9030115eb77480c879cc1b05acf92e90c9825330 SHA1 05e93a9bb94da1af1f7ac486d280d82dc68664fc SHA256 86f147ccac4c6a157b8e94ac26c69c07db91b435bb0ec703a332c17c1f3d1c1a
 MD5 c3de0bbc117c44cd0aad81e19a01094c metadata.xml 294
 RMD160 9030115eb77480c879cc1b05acf92e90c9825330 metadata.xml 294
 SHA256 86f147ccac4c6a157b8e94ac26c69c07db91b435bb0ec703a332c17c1f3d1c1a metadata.xml 294
-MD5 5a8d1c87d6f224a0a7676e9eb839e3ba files/digest-polipo-0.9.10 241
-RMD160 6d7c4e44cfc94d15715def9b04d7a801354f2a0e files/digest-polipo-0.9.10 241
-SHA256 1dea0e604eb8b6623a4fd3cf1cd0822582c10029cde62267b12d50d443d2198b files/digest-polipo-0.9.10 241
-MD5 2a6f4554a7059cee04852b6d7676ddfb files/digest-polipo-0.9.11 241
-RMD160 45f3066ab18f9d4cf90f655ee7d12b2ddff68206 files/digest-polipo-0.9.11 241
-SHA256 0c43968ada89e2bd577fd689fb5b59a6e2401b3b1950c2b458f066103bdf4838 files/digest-polipo-0.9.11 241
 MD5 426a97e1a5550638d42556c0a3e7b4a6 files/digest-polipo-0.9.12-r1 241
 RMD160 3f0f8a533bf11f4b607d1d569c589f1fed03def3 files/digest-polipo-0.9.12-r1 241
 SHA256 691e07e562193f2e16566c092e4ea07d4cfe99f0173add29634a292df1a52777 files/digest-polipo-0.9.12-r1 241
+MD5 6880b40065a5e570cb5643de98278c56 files/digest-polipo-1.0.0 238
+RMD160 258f6a37ab5adb6ee1558802712615fe3c1bd0a5 files/digest-polipo-1.0.0 238
+SHA256 aee19f522bbc59ae01945da6a3946aad51031e90bbccb08f7c62b01eac4581f8 files/digest-polipo-1.0.0 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGM8j4V3J2n04EauwRAondAJ4wSaTpRNVyXWAeCR9L7q7l0oMYtACg0evZ
-tyYIVdCUB0UJqmk9AfdWio8=
-=ckS7
+iD8DBQFGdNwHJnxX6mF440QRAsQAAJ9tBpq8XU5ltIi8ZzgldXqzhSr4MwCgvSTz
+dnYGZRbCUxLTlQyfeFqodCE=
+=Em2N
 -----END PGP SIGNATURE-----
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() {