Version bump.

Migrate to EAPI 2.
Install files in /opt/squirm directory.
(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 72 insertions, 2 deletions

diff --git a/net-proxy/squirm/ChangeLog b/net-proxy/squirm/ChangeLog
index 66f366b949c7..39550dafa696 100644
--- a/net-proxy/squirm/ChangeLog
+++ b/net-proxy/squirm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/squirm
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squirm/ChangeLog,v 1.6 2008/10/12 08:05:06 mrness Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squirm/ChangeLog,v 1.7 2009/06/20 13:15:30 mrness Exp $
+
+*squirm-1.26 (20 Jun 2009)
+
+  20 Jun 2009; Alin Năstac <mrness@gentoo.org>
+  +files/squirm-1.26-gentoo.patch, +squirm-1.26.ebuild:
+  Version bump. Migrate to EAPI 2. Install files in /opt/squirm directory.
 
   12 Oct 2008; Alin Năstac <mrness@gentoo.org> squirm-1.23.ebuild:
   Remove squid run-time dependency (#241212).
diff --git a/net-proxy/squirm/files/squirm-1.26-gentoo.patch b/net-proxy/squirm/files/squirm-1.26-gentoo.patch
new file mode 100644
index 000000000000..b1109bafd23e
--- /dev/null
+++ b/net-proxy/squirm/files/squirm-1.26-gentoo.patch
@@ -0,0 +1,34 @@
+diff -Nru squirm-1.26.orig/Makefile squirm-1.26/Makefile
+--- squirm-1.26.orig/Makefile	2005-08-19 09:31:06.000000000 +0200
++++ squirm-1.26/Makefile	2009-06-20 14:58:18.000000000 +0200
+@@ -1,7 +1,7 @@
+ # $Id: squirm-1.26-gentoo.patch,v 1.1 2009/06/20 13:15:30 mrness Exp $
+ 
+ # The path to install squirm under
+-PREFIX=/usr/local/squirm
++PREFIX=/opt/squirm
+ 
+ # The username that squid runs as (see cache_effective_user in squid.conf)
+ USER=squid    
+@@ -29,10 +29,10 @@
+ CC=gcc
+ 
+ 
+-OPTIMISATION=-O3
++OPTIMISATION=-g
+ BINARIES = squirm
+ 
+-CFLAGS = -O3 -Wall -funroll-loops -DPREFIX=\"$(PREFIX)\"
++CFLAGS=-g -DPREFIX=\"$(PREFIX)\"
+ #CFLAGS = -Wall -g -DPREFIX=\"$(PREFIX)\"
+ #CFLAGS = -Wall -g -DDEBUG
+ 
+@@ -45,7 +45,7 @@
+ 			install -m 750 -o $(USER) -g $(GROUP) -d $(PREFIX)/logs
+ 			install -m 660 -c -o root -g $(GROUP) squirm.conf.dist squirm.patterns.dist \
+ 			$(PREFIX)/etc
+-			install -m 755 -o root -g $(ROOT_GROUP) --strip squirm $(PREFIX)/bin
++			install -m 755 -o root -g $(ROOT_GROUP)  squirm $(PREFIX)/bin
+ 
+ squirm.o:	squirm.c $(HFILES)
+ 			$(CC) -c squirm.c 	$(CFLAGS)
diff --git a/net-proxy/squirm/squirm-1.26.ebuild b/net-proxy/squirm/squirm-1.26.ebuild
new file mode 100644
index 000000000000..9199c4db1406
--- /dev/null
+++ b/net-proxy/squirm/squirm-1.26.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squirm/squirm-1.26.ebuild,v 1.1 2009/06/20 13:15:30 mrness Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="A redirector for Squid"
+HOMEPAGE="http://squirm.foote.com.au"
+SRC_URI="http://squirm.foote.com.au/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_install() {
+	emake PREFIX="${D}/opt/squirm" install || die "emake install failed"
+}
+
+pkg_postinst() {
+	einfo "To enable squirm, add the following lines to /etc/squid/squid.conf:"
+	einfo "    url_rewrite_program /opt/squirm/bin/squirm"
+	einfo "    url_rewrite_children 10"
+}