Remove old version. Stable on x86. Sanitize the ebuild code.

Package-Manager: portage-2.0.54

6 files changed, 25 insertions, 110 deletions

diff --git a/net-proxy/polipo/ChangeLog b/net-proxy/polipo/ChangeLog
index f263416d6876..19f6ac55f555 100644
--- a/net-proxy/polipo/ChangeLog
+++ b/net-proxy/polipo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/polipo
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v 1.4 2005/12/06 22:33:16 mrness Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v 1.5 2006/03/06 20:57:45 mrness Exp $
+
+  06 Mar 2006; Alin Nastac <mrness@gentoo.org>
+  -files/polipo-0.9.8-gentoo.patch, -polipo-0.9.8.ebuild,
+  polipo-0.9.9.ebuild:
+  Remove old version. Stable on x86.
 
 *polipo-0.9.9 (06 Dec 2005)
 
diff --git a/net-proxy/polipo/Manifest b/net-proxy/polipo/Manifest
index 1318c5a2a3a7..265def80f01d 100644
--- a/net-proxy/polipo/Manifest
+++ b/net-proxy/polipo/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 80ea6f1cd64efa5d69b458f320750d9b polipo-0.9.8.ebuild 1326
-MD5 8ec55401bd1839c4740107078bc5d7cc polipo-0.9.9.ebuild 1330
-MD5 e254e914184ae89b30d1adc451ee5185 ChangeLog 823
-MD5 c3de0bbc117c44cd0aad81e19a01094c metadata.xml 294
-MD5 15a13f10a2c408c2e448d0db6fe8d382 files/digest-polipo-0.9.8 64
-MD5 fc5f3d9392c55073aa7e3b2d90400d07 files/digest-polipo-0.9.9 64
+MD5 97922359a669c20cf66538cf0596e9fa ChangeLog 989
 MD5 fdf9f12df918b0d2623ebe825a1aa705 files/config 167
+MD5 fc5f3d9392c55073aa7e3b2d90400d07 files/digest-polipo-0.9.9 64
 MD5 724b03f126855d18954fa668c67d6c72 files/polipo-0.9.9-gentoo.patch 935
-MD5 0fd77c27b055734f263f462304ab3a45 files/polipo-0.9.8-gentoo.patch 935
 MD5 70dea09e9d7e630836c05c4e32b9a1cc files/polipo.crond 76
 MD5 5fb40a3a7fab1ebaffdc988b47d00646 files/polipo.initd 767
+MD5 c3de0bbc117c44cd0aad81e19a01094c metadata.xml 294
+MD5 d5e9bfc66d90c79dba03ed409607e9ed polipo-0.9.9.ebuild 1327
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFDlhHGNSP4Vda7IdsRAs1rAJ0Zf1jdwYLhFRNktnTxYzomOa7uqgCfc5uD
-UjDqLBzkJ0dhg7XiQRR8GGk=
-=FXQY
+iD8DBQFEDKJVjG8pv1lIUX4RAqGsAKC/N60VAFuRaOYuGb5nczpQpldZYACgiBYR
+c0j1FyQC7kTwk8lpJcU0gPc=
+=Ea9/
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/polipo/files/digest-polipo-0.9.8 b/net-proxy/polipo/files/digest-polipo-0.9.8
deleted file mode 100644
index 0ed95f54de0c..000000000000
--- a/net-proxy/polipo/files/digest-polipo-0.9.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1a2c7bd7710197daee1c26ce5175edbf polipo-0.9.8.tar.gz 148275
diff --git a/net-proxy/polipo/files/polipo-0.9.8-gentoo.patch b/net-proxy/polipo/files/polipo-0.9.8-gentoo.patch
deleted file mode 100644
index 2f02b52232f6..000000000000
--- a/net-proxy/polipo/files/polipo-0.9.8-gentoo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nru polipo-0.9.8.orig/Makefile polipo-0.9.8/Makefile
---- polipo-0.9.8.orig/Makefile	2004-06-29 00:30:07.000000000 +0300
-+++ polipo-0.9.8/Makefile	2005-03-26 14:29:21.448931408 +0200
-@@ -80,11 +80,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.8.orig/polipo.h polipo-0.9.8/polipo.h
---- polipo-0.9.8.orig/polipo.h	2005-01-20 01:45:03.000000000 +0200
-+++ polipo-0.9.8/polipo.h	2005-03-26 14:30:20.303984080 +0200
-@@ -61,7 +61,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.8.ebuild b/net-proxy/polipo/polipo-0.9.8.ebuild
deleted file mode 100644
index 42dba033f417..000000000000
--- a/net-proxy/polipo/polipo-0.9.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-0.9.8.ebuild,v 1.3 2005/09/12 01:34:28 metalgod 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/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	sys-apps/texinfo"
-RDEPEND="${DEPEND}
-	app-admin/sudo"
-
-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
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/polipo.initd polipo
-	insinto /etc/polipo ; doins ${FILESDIR}/config
-	insinto /etc/cron.daily ; newins ${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.9.ebuild b/net-proxy/polipo/polipo-0.9.9.ebuild
index 070c666ba3b5..f755ed7afd8c 100644
--- a/net-proxy/polipo/polipo-0.9.9.ebuild
+++ b/net-proxy/polipo/polipo-0.9.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-0.9.9.ebuild,v 1.1 2005/12/06 22:33:16 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-0.9.9.ebuild,v 1.2 2006/03/06 20:57:45 mrness Exp $
 
 inherit eutils
 
@@ -10,11 +10,10 @@ SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
-DEPEND="virtual/libc
-	sys-apps/texinfo"
+DEPEND="sys-apps/texinfo"
 RDEPEND="${DEPEND}
 	app-admin/sudo"
 
@@ -26,7 +25,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 }
 
 src_compile() {
@@ -36,12 +35,12 @@ src_compile() {
 src_install() {
 	einstall "PREFIX=/usr" "TARGET=${D}" || die "install failed"
 	mv polipo.man polipo.1
-	doman ${S}/polipo.1
-	doinfo ${S}/polipo.info
+	doman "${S}/polipo.1"
+	doinfo "${S}/polipo.info"
 
-	exeinto /etc/init.d ; newexe ${FILESDIR}/polipo.initd polipo
-	insinto /etc/polipo ; doins ${FILESDIR}/config
-	insinto /etc/cron.daily ; newins ${FILESDIR}/polipo.crond polipo.sh
+	exeinto /etc/init.d ; newexe "${FILESDIR}/polipo.initd" polipo
+	insinto /etc/polipo ; doins "${FILESDIR}/config"
+	insinto /etc/cron.daily ; newins "${FILESDIR}/polipo.crond" polipo.sh
 
 	diropts -m0750 -o polipo -g polipo
 	dodir /var/cache/polipo