Remove obsolete versions. Version bump. Install HTML documentation.

Package-Manager: portage-2.1.2.12

13 files changed, 35 insertions, 461 deletions

diff --git a/net-proxy/polipo/ChangeLog b/net-proxy/polipo/ChangeLog
index 8bae46274fe4..f75c34e50bac 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.23 2007/09/02 20:42:38 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v 1.24 2007/11/02 15:38:54 mrness Exp $
+
+*polipo-1.0.3 (02 Nov 2007)
+
+  02 Nov 2007; Alin Năstac <mrness@gentoo.org>
+  -files/polipo-0.9.12-gentoo.patch, -files/polipo-0.9.12-printf-ptr.patch,
+  -files/polipo-0.9.12.initd, -files/polipo-1.0.0-gentoo.patch,
+  -polipo-0.9.12-r1.ebuild, -polipo-1.0.0.ebuild, -polipo-1.0.1.ebuild,
+  +polipo-1.0.3.ebuild:
+  Remove obsolete versions. Version bump. Install HTML documentation.
 
   02 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
   polipo-1.0.2-r1.ebuild:
diff --git a/net-proxy/polipo/Manifest b/net-proxy/polipo/Manifest
index 92b7f2c4caf1..20217c6d8fdd 100644
--- a/net-proxy/polipo/Manifest
+++ b/net-proxy/polipo/Manifest
@@ -5,22 +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.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
-SHA256 78c6e77234a03cd8878f5358959a7a43bc5eb6980c95cb5d87f43a95fd83d646 files/polipo-0.9.12-gentoo.patch 1752
-AUX polipo-0.9.12-printf-ptr.patch 6058 RMD160 221044b859a1342953c74d447b2fb5bdbbac8462 SHA1 5f75691822d0d7a2fe0d702fdb84aee4abdf4efd SHA256 b083f6af703c1a65f3f3a1362e90df975f5e7866555a7f092c28a70bea9a1b4b
-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 234 RMD160 463895559a9d28d38bc11064cdab7882a56128e6 SHA1 59a70f72fdb01f381199f566c3146d7810273363 SHA256 cab7448361658d34593822893688df11d6f02f8b2927dbbbbe84642b335575d0
 MD5 e5ef4a8d1d756db7687c7bafe3e846f3 files/polipo.crond 234
 RMD160 463895559a9d28d38bc11064cdab7882a56128e6 files/polipo.crond 234
@@ -29,50 +13,34 @@ AUX polipo.initd 1357 RMD160 f07a38b41e627665025b1f1102de7c8ab11e89f0 SHA1 492d5
 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
-DIST polipo-1.0.0.tar.gz 176618 RMD160 c054f47afc807857945824315976dbe54304a6ea SHA1 c6910ef207eff1c1765af0b76f28d2fb3a011742 SHA256 0a00d7009fd4c501daa916c354036f3cbd5533c25c7b0efce6b7176fb4ae80ba
-DIST polipo-1.0.1.tar.gz 176927 RMD160 0e53342a0c9f5bfaf59c061d657b4186ff8e7984 SHA1 b190ac3c3a8fcae266c643877e890bb8a1f17aed SHA256 5d4fa70e0ba43a2c60bf46383e452854c0f556b77394a3cee6b94db1dcb40701
 DIST polipo-1.0.2.tar.gz 177584 RMD160 7e934fb7a8ffd62627fe93661fecbcec74285f80 SHA1 2097a2b3733229010621d4ecdc3f57e3cbf95d16 SHA256 796c5fec2276029e3f1ac6c6fc5abddf35eb24f10cb8b2dba04f91923ca8b0b0
-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
-EBUILD polipo-1.0.1.ebuild 1128 RMD160 4df7728c6bda1b65320e53e4e5c063dc6f3280e5 SHA1 a216b7a2dba21084d44c3e25498454e835f3c98c SHA256 8cc1baf1c8c69f51df3a68f4d17d8ae4dbe839d37f524fb1902f27a79f7cf316
-MD5 e88120feed0fd133c8ea81b408692ad3 polipo-1.0.1.ebuild 1128
-RMD160 4df7728c6bda1b65320e53e4e5c063dc6f3280e5 polipo-1.0.1.ebuild 1128
-SHA256 8cc1baf1c8c69f51df3a68f4d17d8ae4dbe839d37f524fb1902f27a79f7cf316 polipo-1.0.1.ebuild 1128
+DIST polipo-1.0.3.tar.gz 180349 RMD160 297b67d302ce12e85f7f3c4b29a2dd79379edbdd SHA1 9cc780b9d8b0ad09b6ebbd71a87194f3373f1fae SHA256 85ace9fba0c6339384b0f4ef815565d4d63f3ba40991d34ed7e26bbbcdbde09d
 EBUILD polipo-1.0.2-r1.ebuild 1170 RMD160 fa1c40ca0ce61107e4790644ba3a1d16f2f2bcb6 SHA1 92d39ea4514e3d86201d00600d8ecf9ca98fcb73 SHA256 e6b2e1e9932dc133933162c9bb368fadae6fef852dd490658c77f6efcc533b74
 MD5 cf89ca25043a75fd26007aee4414507b polipo-1.0.2-r1.ebuild 1170
 RMD160 fa1c40ca0ce61107e4790644ba3a1d16f2f2bcb6 polipo-1.0.2-r1.ebuild 1170
 SHA256 e6b2e1e9932dc133933162c9bb368fadae6fef852dd490658c77f6efcc533b74 polipo-1.0.2-r1.ebuild 1170
-MISC ChangeLog 4083 RMD160 0ffc4d4b34625fd7fbac6a511c481d168f8142a3 SHA1 4a60768c56fa464c0a259d4b791a667fba56c605 SHA256 6b2eee00f04d52f1efcc71c9ba514092442d46bb58939422dbf3c034fbcb9ec0
-MD5 26b270296023390566170ddf41e9a1be ChangeLog 4083
-RMD160 0ffc4d4b34625fd7fbac6a511c481d168f8142a3 ChangeLog 4083
-SHA256 6b2eee00f04d52f1efcc71c9ba514092442d46bb58939422dbf3c034fbcb9ec0 ChangeLog 4083
+EBUILD polipo-1.0.3.ebuild 1208 RMD160 6cb19080a0510610e141b233524a3f62db6683a2 SHA1 39f23b53502af8df59deaaaee9165f826c3b32ab SHA256 08797c87c3e74608fabda188219fae6f0e9b799b4192e318d7a79e6e8e11ad02
+MD5 a87dd51b250fb904d4f0879679b3ad76 polipo-1.0.3.ebuild 1208
+RMD160 6cb19080a0510610e141b233524a3f62db6683a2 polipo-1.0.3.ebuild 1208
+SHA256 08797c87c3e74608fabda188219fae6f0e9b799b4192e318d7a79e6e8e11ad02 polipo-1.0.3.ebuild 1208
+MISC ChangeLog 4468 RMD160 ee6dae5d4e48c6f3caf7dab34348d3bbce31d788 SHA1 86f1e90734b5cf0a1019828d8aa3e7a68e5f1fca SHA256 1b167d574b60579a55df8eec3b997fc369b62fe980a713408a707aebb22bb394
+MD5 024560a531f6b830f68b5f0da250a20e ChangeLog 4468
+RMD160 ee6dae5d4e48c6f3caf7dab34348d3bbce31d788 ChangeLog 4468
+SHA256 1b167d574b60579a55df8eec3b997fc369b62fe980a713408a707aebb22bb394 ChangeLog 4468
 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 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
-MD5 a1922519863e59204cf55821b6cda8b3 files/digest-polipo-1.0.1 238
-RMD160 504b40db8152ba49ff58716c10512c2b06e03f7a files/digest-polipo-1.0.1 238
-SHA256 bb7b7fbd7746ac3a80505678147ab6f4e78eae7b38b09da142522ab29aabc221 files/digest-polipo-1.0.1 238
 MD5 62fc575773a71bf5a49c8de5991c3e9a files/digest-polipo-1.0.2-r1 238
 RMD160 df962c47b5f5acea9bfa735927f104dd76e18d22 files/digest-polipo-1.0.2-r1 238
 SHA256 23837a34374b0865455923750929518d6abf97d491189d6b2d775d8763769eec files/digest-polipo-1.0.2-r1 238
+MD5 a8b2786ecd091661b79d1b6b1eead6b8 files/digest-polipo-1.0.3 238
+RMD160 1937cd9f6564a0a42101a879eedda11287e0e581 files/digest-polipo-1.0.3 238
+SHA256 04f7a209c2c160735361ebfa4fbeb4c712082455fcbc8720463145d9147fc751 files/digest-polipo-1.0.3 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFG2yBINQqtfCuFneMRAlbaAKCPdMQrVwEckjeVNG+dJqe/pX51DQCgjbdB
-1Z0RRA+OOj2UxUCmM89jlEc=
-=K7uV
+iD8DBQFHK0SfVSA5X31g7/gRAjefAJ9yLlSX94Jksu26dGkduUyKant5ZwCeLfaI
+9SC2+e/UG+5QLnsdNFjgU3U=
+=GTj5
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/polipo/files/digest-polipo-0.9.12-r1 b/net-proxy/polipo/files/digest-polipo-0.9.12-r1
deleted file mode 100644
index 45f975f7d814..000000000000
--- a/net-proxy/polipo/files/digest-polipo-0.9.12-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ce82913e3698de5d15465fb45dbafa11 polipo-0.9.12.tar.gz 149370
-RMD160 09b52dc68e0a1100e697199ff3cda1ba482a650f polipo-0.9.12.tar.gz 149370
-SHA256 6b42de207937d3b13184aab3de2c3a6b9ab0ede92c340b19305f668e191cf205 polipo-0.9.12.tar.gz 149370
diff --git a/net-proxy/polipo/files/digest-polipo-1.0.0 b/net-proxy/polipo/files/digest-polipo-1.0.0
deleted file mode 100644
index e09b8d26e3cb..000000000000
--- a/net-proxy/polipo/files/digest-polipo-1.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-polipo-1.0.1 b/net-proxy/polipo/files/digest-polipo-1.0.1
deleted file mode 100644
index b7995fd1819e..000000000000
--- a/net-proxy/polipo/files/digest-polipo-1.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e88b532bf1b85892e3cb3d2870b5b548 polipo-1.0.1.tar.gz 176927
-RMD160 0e53342a0c9f5bfaf59c061d657b4186ff8e7984 polipo-1.0.1.tar.gz 176927
-SHA256 5d4fa70e0ba43a2c60bf46383e452854c0f556b77394a3cee6b94db1dcb40701 polipo-1.0.1.tar.gz 176927
diff --git a/net-proxy/polipo/files/digest-polipo-1.0.3 b/net-proxy/polipo/files/digest-polipo-1.0.3
new file mode 100644
index 000000000000..57300bff2a86
--- /dev/null
+++ b/net-proxy/polipo/files/digest-polipo-1.0.3
@@ -0,0 +1,3 @@
+MD5 a0b00ca01541cf77ff3d725c27cf68bb polipo-1.0.3.tar.gz 180349
+RMD160 297b67d302ce12e85f7f3c4b29a2dd79379edbdd polipo-1.0.3.tar.gz 180349
+SHA256 85ace9fba0c6339384b0f4ef815565d4d63f3ba40991d34ed7e26bbbcdbde09d polipo-1.0.3.tar.gz 180349
diff --git a/net-proxy/polipo/files/polipo-0.9.12-gentoo.patch b/net-proxy/polipo/files/polipo-0.9.12-gentoo.patch
deleted file mode 100644
index bb16036168c5..000000000000
--- a/net-proxy/polipo/files/polipo-0.9.12-gentoo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Nru polipo-0.9.12.orig/Makefile polipo-0.9.12/Makefile
---- polipo-0.9.12.orig/Makefile	2007-02-06 23:17:39.000000000 +0200
-+++ polipo-0.9.12/Makefile	2007-02-08 11:32:00.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.12.orig/polipo.h polipo-0.9.12/polipo.h
---- polipo-0.9.12.orig/polipo.h	2007-02-06 23:17:39.000000000 +0200
-+++ polipo-0.9.12/polipo.h	2007-02-08 11:32:00.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.12.orig/server.c polipo-0.9.12/server.c
---- polipo-0.9.12.orig/server.c	2007-02-06 23:17:39.000000000 +0200
-+++ polipo-0.9.12/server.c	2007-02-08 11:32:00.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-printf-ptr.patch b/net-proxy/polipo/files/polipo-0.9.12-printf-ptr.patch
deleted file mode 100644
index bf7a582afa5a..000000000000
--- a/net-proxy/polipo/files/polipo-0.9.12-printf-ptr.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff -Nru polipo-0.9.12.orig/atom.c polipo-0.9.12/atom.c
---- polipo-0.9.12.orig/atom.c	2007-02-06 23:17:39.000000000 +0200
-+++ polipo-0.9.12/atom.c	2007-04-11 15:42:05.000000000 +0300
-@@ -72,7 +72,7 @@
-         atomHashTable[h] = atom;
-         used_atoms++;
-     }
--    do_log(D_ATOM_REFCOUNT, "A 0x%x %d++\n", (unsigned)atom, atom->refcount);
-+    do_log(D_ATOM_REFCOUNT, "A %p %d++\n", atom, atom->refcount);
-     atom->refcount++;
-     return atom;
- }
-@@ -132,7 +132,7 @@
-     if(atom == NULL)
-         return NULL;
- 
--    do_log(D_ATOM_REFCOUNT, "A 0x%x %d++\n", (unsigned)atom, atom->refcount);
-+    do_log(D_ATOM_REFCOUNT, "A %p %d++\n", atom, atom->refcount);
-     assert(atom->refcount >= 1 && atom->refcount < 50000);
-     atom->refcount++;
-     return atom;
-@@ -144,7 +144,7 @@
-     if(atom == NULL)
-         return;
- 
--    do_log(D_ATOM_REFCOUNT, "A 0x%x %d--\n", (unsigned)atom, atom->refcount);
-+    do_log(D_ATOM_REFCOUNT, "A %p %d--\n", atom, atom->refcount);
-     assert(atom->refcount >= 1 && atom->refcount < 50000);
- 
-     atom->refcount--;
-diff -Nru polipo-0.9.12.orig/client.c polipo-0.9.12/client.c
---- polipo-0.9.12.orig/client.c	2007-02-06 23:17:39.000000000 +0200
-+++ polipo-0.9.12/client.c	2007-04-11 15:46:42.000000000 +0300
-@@ -105,8 +105,8 @@
-     connection->fd = fd;
-     connection->timeout = timeout;
- 
--    do_log(D_CLIENT_CONN, "Accepted client connection 0x%x\n",
--           (unsigned)connection);
-+    do_log(D_CLIENT_CONN, "Accepted client connection %p\n",
-+           connection);
- 
-     connection->flags = CONN_READER;
- 
-@@ -236,8 +236,8 @@
-         return;
-     }
-     
--    do_log(D_CLIENT_CONN, "Closing client connection 0x%x\n",
--           (unsigned)connection);
-+    do_log(D_CLIENT_CONN, "Closing client connection %p\n",
-+           connection);
- 
-     if(connection->flags & CONN_READER) {
-         httpSetTimeout(connection, 10);
-@@ -1714,8 +1714,8 @@
- 
-     connection->offset = request->from;
-     httpSetTimeout(connection, 120);
--    do_log(D_CLIENT_DATA, "Serving on 0x%x for 0x%x: offset %d len %d\n",
--           (unsigned)connection, (unsigned)object,
-+    do_log(D_CLIENT_DATA, "Serving on %p for %p: offset %d len %d\n",
-+           connection, object,
-            connection->offset, len);
-     do_stream_h(IO_WRITE |
-                 (connection->te == TE_CHUNKED && len > 0 ? IO_CHUNKED : 0),
-@@ -1894,8 +1894,8 @@
-         if(len2 == 0) {
-             httpSetTimeout(connection, 120);
-             do_log(D_CLIENT_DATA, 
--                   "Serving on 0x%x for 0x%x: offset %d len %d\n",
--                   (unsigned)connection, (unsigned)object,
-+                   "Serving on %p for %p: offset %d len %d\n",
-+                   connection, object,
-                    connection->offset, len);
-             /* IO_NOTNOW in order to give other clients a chance to run. */
-             do_stream(IO_WRITE | IO_NOTNOW |
-@@ -1907,8 +1907,8 @@
-         } else {
-             httpSetTimeout(connection, 120);
-             do_log(D_CLIENT_DATA, 
--                   "Serving on 0x%x for 0x%x: offset %d len %d + %d\n",
--                   (unsigned)connection, (unsigned)object,
-+                   "Serving on %p for %p: offset %d len %d + %d\n",
-+                   connection, object,
-                    connection->offset, len, len2);
-             do_stream_2(IO_WRITE | IO_NOTNOW |
-                         (connection->te == TE_CHUNKED ? IO_CHUNKED : 0) |
-diff -Nru polipo-0.9.12.orig/http.c polipo-0.9.12/http.c
---- polipo-0.9.12.orig/http.c	2007-02-06 23:17:39.000000000 +0200
-+++ polipo-0.9.12/http.c	2007-04-11 15:44:58.000000000 +0300
-@@ -199,8 +199,8 @@
-         new = scheduleTimeEvent(secs, httpTimeoutHandler,
-                                 sizeof(connection), &connection);
-         if(!new) {
--            do_log(L_ERROR, "Couldn't schedule timeout for connection 0x%x\n",
--                   (unsigned)connection);
-+            do_log(L_ERROR, "Couldn't schedule timeout for connection %p\n",
-+                   connection);
-             return -1;
-         }
-     } else {
-diff -Nru polipo-0.9.12.orig/object.c polipo-0.9.12/object.c
---- polipo-0.9.12.orig/object.c	2007-02-06 23:17:39.000000000 +0200
-+++ polipo-0.9.12/object.c	2007-04-11 15:44:18.000000000 +0300
-@@ -268,7 +268,7 @@
- ObjectPtr
- retainObject(ObjectPtr object)
- {
--    do_log(D_REFCOUNT, "O 0x%x %d++\n", (unsigned)object, object->refcount);
-+    do_log(D_REFCOUNT, "O %p %d++\n", object, object->refcount);
-     object->refcount++;
-     return object;
- }
-@@ -276,7 +276,7 @@
- void
- releaseObject(ObjectPtr object)
- {
--    do_log(D_REFCOUNT, "O 0x%x %d--\n", (unsigned)object, object->refcount);
-+    do_log(D_REFCOUNT, "O %p %d--\n", object, object->refcount);
-     object->refcount--;
-     if(object->refcount == 0) {
-         assert(!object->handlers && !(object->flags & OBJECT_INPROGRESS));
-@@ -288,7 +288,7 @@
- void
- releaseNotifyObject(ObjectPtr object)
- {
--    do_log(D_REFCOUNT, "O 0x%x %d--\n", (unsigned)object, object->refcount);
-+    do_log(D_REFCOUNT, "O %p %d--\n", object, object->refcount);
-     object->refcount--;
-     if(object->refcount > 0) {
-         notifyObject(object);
-@@ -302,7 +302,7 @@
- void 
- lockChunk(ObjectPtr object, int i)
- {
--    do_log(D_LOCK, "Lock 0x%x[%d]: ", (unsigned)object, i);
-+    do_log(D_LOCK, "Lock %p[%d]: ", object, i);
-     assert(i >= 0);
-     if(i >= object->numchunks)
-         objectSetChunks(object, i + 1);
-@@ -313,7 +313,7 @@
- void 
- unlockChunk(ObjectPtr object, int i)
- {
--    do_log(D_LOCK, "Unlock 0x%x[%d]: ", (unsigned)object, i);
-+    do_log(D_LOCK, "Unlock %p[%d]: ", object, i);
-     assert(i >= 0 && i < object->numchunks);
-     assert(object->chunks[i].locked > 0);
-     object->chunks[i].locked--;
-@@ -467,8 +467,8 @@
- {
-     int rc;
- 
--    do_log(D_OBJECT_DATA, "Adding data to 0x%x (%d) at %d: %d bytes\n",
--           (unsigned)object, object->length, offset, len);
-+    do_log(D_OBJECT_DATA, "Adding data to %p (%d) at %d: %d bytes\n",
-+           object, object->length, offset, len);
- 
-     if(len == 0)
-         return 1;
diff --git a/net-proxy/polipo/files/polipo-0.9.12.initd b/net-proxy/polipo/files/polipo-0.9.12.initd
deleted file mode 100644
index b6cb0e7359ea..000000000000
--- a/net-proxy/polipo/files/polipo-0.9.12.initd
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/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-1.0.0-gentoo.patch b/net-proxy/polipo/files/polipo-1.0.0-gentoo.patch
deleted file mode 100644
index ddb68a70e9bb..000000000000
--- a/net-proxy/polipo/files/polipo-1.0.0-gentoo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
--	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-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__)
-+#ifndef inline
- #define inline __inline
-+#endif
- #if  (__GNUC__ >= 3)
- #define restrict __restrict
- #else
diff --git a/net-proxy/polipo/polipo-0.9.12-r1.ebuild b/net-proxy/polipo/polipo-0.9.12-r1.ebuild
deleted file mode 100644
index bdeed20a9002..000000000000
--- a/net-proxy/polipo/polipo-0.9.12-r1.ebuild
+++ /dev/null
@@ -1,55 +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.12-r1.ebuild,v 1.4 2007/06/17 07:00:10 mrness 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"
-	epatch "${FILESDIR}/${P}-printf-ptr.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-0.9.12.initd" polipo
-	insinto /etc/polipo ; doins "${FILESDIR}/config"
-	exeinto /etc/cron.daily ; newexe "${FILESDIR}/polipo.crond" polipo.sh
-
-	diropts -m0750 -o polipo -g polipo
-	keepdir /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-1.0.0.ebuild b/net-proxy/polipo/polipo-1.0.0.ebuild
deleted file mode 100644
index 668d60cbc0e5..000000000000
--- a/net-proxy/polipo/polipo-1.0.0.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-1.0.0.ebuild,v 1.1 2007/06/17 07:00:10 mrness 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
-	keepdir /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-1.0.1.ebuild b/net-proxy/polipo/polipo-1.0.3.ebuild
index 9f7b26237c3d..cc16aa36d166 100644
--- a/net-proxy/polipo/polipo-1.0.1.ebuild
+++ b/net-proxy/polipo/polipo-1.0.3.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-1.0.1.ebuild,v 1.1 2007/08/19 09:26:23 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-1.0.3.ebuild,v 1.1 2007/11/02 15:38:54 mrness Exp $
 
 inherit eutils
 
@@ -21,11 +21,11 @@ pkg_setup() {
 }
 
 src_compile() {
-	emake "PREFIX=/usr" "CDEBUGFLAGS=${CFLAGS}" all || die "build failed"
+	emake PREFIX=/usr "CDEBUGFLAGS=${CFLAGS}" all || die "build failed"
 }
 
 src_install() {
-	einstall "PREFIX=/usr" "TARGET=${D}" || die "install failed"
+	einstall PREFIX=/usr MANDIR=/usr/share/man INFODIR=/usr/share/info "TARGET=${D}" || die "install failed"
 
 	newinitd "${FILESDIR}/polipo.initd" polipo
 	insinto /etc/polipo ; doins "${FILESDIR}/config"
@@ -33,6 +33,9 @@ src_install() {
 
 	diropts -m0750 -o polipo -g polipo
 	keepdir /var/cache/polipo
+
+	dodoc CHANGES README
+	dohtml html/*
 }
 
 pkg_preinst() {