Version bump.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

7 files changed, 63 insertions, 209 deletions

diff --git a/net-proxy/privoxy/ChangeLog b/net-proxy/privoxy/ChangeLog
index 00649930b398..6c2851fd0fed 100644
--- a/net-proxy/privoxy/ChangeLog
+++ b/net-proxy/privoxy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/privoxy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.54 2009/09/27 14:32:51 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.55 2009/10/22 21:32:10 mrness Exp $
+
+*privoxy-3.0.15_beta (22 Oct 2009)
+
+  22 Oct 2009; Alin Năstac <mrness@gentoo.org> -privoxy-3.0.10.ebuild,
+  -privoxy-3.0.11.ebuild, -privoxy-3.0.11-r1.ebuild,
+  -files/privoxy-3.0.11-gentoo.patch, -files/privoxy-3.0.11-timeout.patch,
+  +privoxy-3.0.15_beta.ebuild, +files/privoxy-3.0.15_beta-gentoo.patch:
+  Version bump.
 
   27 Sep 2009; Brent Baude <ranger@gentoo.org> privoxy-3.0.12.ebuild:
   Marking privoxy-3.0.12 ppc64 for bug 277487
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index b3b15042b00a..46a10ff0e73e 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -1,21 +1,27 @@
-AUX privoxy-3.0.11-gentoo.patch 2779 RMD160 ecf39b26d63e5c98a7f961348c5526ee910cea89 SHA1 aba3d1788b323c6ef3a3002e669f3208fc414bad SHA256 b8fe11ad45493d000016e40b68d1fbf7e7f3c0eb8ca98b996dbb35b2c2ec7cb2
-AUX privoxy-3.0.11-timeout.patch 517 RMD160 2ed00ea0a1e960ec2fc492b0287e3aca34263e43 SHA1 d930c53707721a3799f5fd37caa92f1b60ce69f5 SHA256 e850c9cbb97b73ada94fb9d0126eea57cf67048910a74e348289dafe41378f9b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX privoxy-3.0.12-gentoo.patch 2779 RMD160 2f9a1f4eb703143e0da6458fe21b09f852c7b2b7 SHA1 b6ce0960bd95018ea61e688d1fddda7f56df73cd SHA256 ef1810f5ac2aa62e335b2b92fe8c9edcbf0226846f934205801db788ef483021
 AUX privoxy-3.0.13_beta-gentoo.patch 2755 RMD160 8bb264d4bda79d4bbdd51ba6ad19c3658f73fdc9 SHA1 71dfa42eb615d46bf3f76a5039dc8e320dbbd3a4 SHA256 11087191877a8b291720b9d6b98fbb95429f7a329520e5e30cda3aa079923cdb
 AUX privoxy-3.0.14_beta-gentoo.patch 2755 RMD160 58bf5b51bab977bc325e9ddcb73115d752d68e46 SHA1 63437841699b1f7f2d27399ceedf8091195220ce SHA256 e50e7f378053064832015347bfcc4ee7a5236518bd3b2f1ca817bd59e7a441c7
+AUX privoxy-3.0.15_beta-gentoo.patch 2753 RMD160 9b0cd1d3f1897e71553dfc725977ca5ca9bd2fec SHA1 4e4b088e6a774b279df08fad1fb858e095165501 SHA256 d9ac1eb768a5dab19f93e40f048e0621d2f9cbbf181042d9588222496331e23e
 AUX privoxy.initd 745 RMD160 42a6a3399293098eaa6d00d8aa5974ecaa66ae89 SHA1 edcc340c1751d3f3193b138cc2ce1cacf49b4b89 SHA256 224496b498b4f692ae3316a95b5c7c8b6230dcd5fee0ca163956a7acde243de9
 AUX privoxy.logrotate 191 RMD160 0619507db8b0ad5bdd3d0a390807e52da4afca3f SHA1 78e91faf72b5541cb98467b99f5be1d93fff014c SHA256 a14373c8a26aab32f6f025c11a5521d7923ce900d00b31aa61da9f3979e3bb2e
-DIST privoxy-3.0.10-stable-src.tar.gz 1957465 RMD160 91c8d56b71a5c606554bf509827197d689d8fc10 SHA1 0ce51a8dc938fe6412daa7f6edf159b98fd66d54 SHA256 3d9f9f56482012ddab396caf73f4c401746a4eeebd6c763b04f6108e48a9094f
-DIST privoxy-3.0.11-stable-src.tar.gz 2050049 RMD160 2d867cd8132e13fa137db74f59db8ecb9e7a843e SHA1 e9f41412b78ea5f3b1cd8ca6a651ee5801837a9f SHA256 cd1a3d2be048cba26ba70b4896709d8a0d2d2bbc0adca4b5a260319674098926
 DIST privoxy-3.0.12-ipv6-1.diff.gz 11835 RMD160 c555a591f3f5498238b0dcd4ba999a0e7a2288a5 SHA1 40e97eb4cf71ca1ed56272fb5984303dc5c9e468 SHA256 655dac4342f732cb2eabb416383a5d4cdae36dec23577cc7117811689a1088a4
 DIST privoxy-3.0.12-stable-src.tar.gz 1811124 RMD160 32509b897e073f1cc100b8a4a157d19a219b51cd SHA1 1118d6a7b4980f26c9ad0902c0e6af5aaaf1a640 SHA256 c910da7fdd51dc197b7cd6695555c7dd0124b8fc44cb03d1fc645d72438dcf9a
 DIST privoxy-3.0.13-beta-src.tar.gz 1658445 RMD160 f5438caef675ae37cadb141133b0e082339a6628 SHA1 45547a116dd4c99239c98a6365e1d4a81c1adb2f SHA256 dacdd5d7f79ad7af67ea3d04c04e490ea1d896cfedd5456ce70ca02ecf220edb
 DIST privoxy-3.0.14-beta-src.tar.gz 1651226 RMD160 1d4188b8549b09a1c09544ad0036c98784897fbd SHA1 ea2fdf98a5dbad368158187aa19f525997166529 SHA256 8aaff8c354e873795673ca582756bcae5a1c3e630d971e1a3f610bc6219d3a11
-EBUILD privoxy-3.0.10.ebuild 2040 RMD160 531ff25e224dffad4c25480bdeddd2b14e224598 SHA1 62fdc9e63e04f133a4e56cdb5c35f1cb96ae985e SHA256 30ab6b401d2c424f579e1d9d5a1a7598bf81ffdcb51f6634adaf8f1edb05da7a
-EBUILD privoxy-3.0.11-r1.ebuild 1714 RMD160 ee79382bd82a62b39ffc65aadea098fd2946d675 SHA1 ea33ec43bc3debbb39efcb15d964ec1b789b2971 SHA256 6ff77c36cf133ac7649148b3f1ac0394836a53cd6cc9db10785c4a42a6ce8c50
-EBUILD privoxy-3.0.11.ebuild 1630 RMD160 c6722bccb514c3d2f2c1a457312a6cac76e5f6e5 SHA1 7df0dc8b8c1f94830e3a75ac444b6f409b5b85c2 SHA256 3ff39faccf51ca8e3719c90eeb76c34394be7aef6acf978809872346749cd76a
+DIST privoxy-3.0.15-beta-src.tar.gz 1632703 RMD160 3bf6effa2ea5ae5b5edd26b0ac167cbbf372dc03 SHA1 9931e519e57e43179db6e1f368141381e95a8055 SHA256 736b3022b9a09fe387317b82ff23eb38c534ac5c4f098a8eb976e0fe34a95270
 EBUILD privoxy-3.0.12.ebuild 1735 RMD160 14ea9339ce71c228519cc68220c1f73892dd24a7 SHA1 9c103ac1680b2979ec99f1bcaaf7da244f69c594 SHA256 b858f92285600756d0f254ea58b792117a0e22fbdd29896bf78baf4b0e8684e4
 EBUILD privoxy-3.0.13_beta.ebuild 1711 RMD160 a0ceaa72ef3d97bbee12bb7b844d18172151050e SHA1 e0dd73f02b664d40c064fc548f8493673d42ba31 SHA256 116954d9023413ad04227de6d9777b83aa46a1de8c9b2815b4c6037b2c708668
 EBUILD privoxy-3.0.14_beta.ebuild 1711 RMD160 e5f52ba3bf36cba2b086bc4656521b0657e44e84 SHA1 d3a42d8d8228be6b48b00e04efdcb80e892c6aa4 SHA256 e1266ffdfebd8aabc76e0f02c10fd14cb04cc427de1648924cfd933cc008c544
-MISC ChangeLog 12452 RMD160 d738bd6b41e745dd6eed0533c79e6ca3242e0458 SHA1 a0a0251c06898520ed6ad81658514852dd0dd737 SHA256 1fe0ceeae6a848a7f419a5134df68966245f96037ace8cf80983065de64472b1
+EBUILD privoxy-3.0.15_beta.ebuild 1711 RMD160 e91f2d0cd659257611fa33a3f3d708641d67e740 SHA1 0e307336a3883006b23ffd1e87f18f95e40a674b SHA256 23edf9fd11024faed82d6cca8cd2b2b90638a8196c8d25697190964578125525
+MISC ChangeLog 12777 RMD160 18e2c1851cebefe2f1d5a549c8e593245d9b3f1d SHA1 2f5a2d5cc16142c982485addfa900a37cfab75a7 SHA256 1391757a475ed4111dc966b3dd4be1f28ede798e2b93129b5c67f65a2655f872
 MISC metadata.xml 291 RMD160 1e9cbadea15378b291cd003139d8fbdc8cf4595b SHA1 27e52a5679b01f661170e997bdc9578ef42a5d18 SHA256 694b05be02eb88162313a10a1e3e44acf89214381eab941a0ec497ab8925049c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrgz2UACgkQ9A5kJBGSrsso5gCfRk4aGghJ7IGM8xCtnOSLr/k4
+8nYAoJzaiSHRl8XOdLUJlDYkhRm+FcGL
+=yMIQ
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch b/net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch
deleted file mode 100644
index 0433e1d923ec..000000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- jcc.c	2009/03/08 14:19:23	1.231
-+++ jcc.c	2009/03/08 19:29:16	1.232
-@@ -2600,8 +2605,6 @@
-    struct timeval timeout;
- 
-    memset(buf, 0, sizeof(buf));
--   memset(&timeout, 0, sizeof(timeout));
--   timeout.tv_sec = csp->config->socket_timeout;
- 
-    http = csp->http;
- 
-@@ -2843,6 +2846,8 @@
-       }
- #endif  /* FEATURE_CONNECTION_KEEP_ALIVE */
- 
-+      timeout.tv_sec = csp->config->socket_timeout;
-+      timeout.tv_usec = 0;
-       n = select((int)maxfd+1, &rfds, NULL, NULL, &timeout);
- 
-       if (n == 0)
diff --git a/net-proxy/privoxy/files/privoxy-3.0.11-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.15_beta-gentoo.patch
index 3276c1f2ac7e..7792e1616453 100644
--- a/net-proxy/privoxy/files/privoxy-3.0.11-gentoo.patch
+++ b/net-proxy/privoxy/files/privoxy-3.0.15_beta-gentoo.patch
@@ -1,32 +1,6 @@
-diff -Nru privoxy-3.0.11-stable.orig/GNUmakefile.in privoxy-3.0.11-stable/GNUmakefile.in
---- privoxy-3.0.11-stable.orig/GNUmakefile.in	2009-02-08 18:35:48.000000000 +0000
-+++ privoxy-3.0.11-stable/GNUmakefile.in	2009-03-13 19:56:45.000000000 +0000
-@@ -1140,22 +1140,8 @@
- 	fi ;\
- 	$(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
- 	for i in $(CONFIGS); do \
--		if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
--			$(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
--			$(ECHO) Installing fresh $$i;\
- 			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
--		elif [ -s "$(CONF_DEST)/$$i" ]; then \
--			$(ECHO) Installing $$i as $$i.new ;\
--			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
--			NEW=1;\
--		else \
--			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
--		fi ;\
- 	done ;\
--	if [ -n "$$NEW" ]; then \
--		$(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
--		$(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\
--	fi ;\
- 	[ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \
- 		$(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\
- 		$(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
-diff -Nru privoxy-3.0.11-stable.orig/config privoxy-3.0.11-stable/config
---- privoxy-3.0.11-stable.orig/config	2009-02-19 17:26:26.000000000 +0000
-+++ privoxy-3.0.11-stable/config	2009-03-13 19:21:49.000000000 +0000
+diff -Nru privoxy-3.0.15-beta.orig/config privoxy-3.0.15-beta/config
+--- privoxy-3.0.15-beta.orig/config	2009-10-10 07:56:41.000000000 +0200
++++ privoxy-3.0.15-beta/config	2009-10-22 23:26:11.000000000 +0200
 @@ -267,7 +267,7 @@
  #
  #      No trailing "/", please.
@@ -54,9 +28,9 @@ diff -Nru privoxy-3.0.11-stable.orig/config privoxy-3.0.11-stable/config
  #
  #
  #  2.7. trustfile
-diff -Nru privoxy-3.0.11-stable.orig/default.action.master privoxy-3.0.11-stable/default.action.master
---- privoxy-3.0.11-stable.orig/default.action.master	2009-02-12 19:08:32.000000000 +0000
-+++ privoxy-3.0.11-stable/default.action.master	2009-03-13 19:22:01.000000000 +0000
+diff -Nru privoxy-3.0.15-beta.orig/default.action.master privoxy-3.0.15-beta/default.action.master
+--- privoxy-3.0.15-beta.orig/default.action.master	2009-10-02 20:07:22.000000000 +0200
++++ privoxy-3.0.15-beta/default.action.master	2009-10-22 23:26:11.000000000 +0200
 @@ -564,7 +564,7 @@
  { \
  +change-x-forwarded-for{block} \
@@ -84,3 +58,29 @@ diff -Nru privoxy-3.0.11-stable.orig/default.action.master privoxy-3.0.11-stable
  }
  standard.Advanced
  
+diff -Nru privoxy-3.0.15-beta.orig/GNUmakefile.in privoxy-3.0.15-beta/GNUmakefile.in
+--- privoxy-3.0.15-beta.orig/GNUmakefile.in	2009-09-26 19:21:01.000000000 +0200
++++ privoxy-3.0.15-beta/GNUmakefile.in	2009-10-22 23:26:11.000000000 +0200
+@@ -901,22 +901,8 @@
+ 	fi ;\
+ 	$(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
+ 	for i in $(CONFIGS); do \
+-		if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
+-			$(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
+-			$(ECHO) Installing fresh $$i;\
+ 			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
+-		elif [ -s "$(CONF_DEST)/$$i" ]; then \
+-			$(ECHO) Installing $$i as $$i.new ;\
+-			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
+-			NEW=1;\
+-		else \
+-			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
+-		fi ;\
+ 	done ;\
+-	if [ -n "$$NEW" ]; then \
+-		$(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
+-		$(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\
+-	fi ;\
+ 	[ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \
+ 		$(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\
+ 		$(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
diff --git a/net-proxy/privoxy/privoxy-3.0.10.ebuild b/net-proxy/privoxy/privoxy-3.0.10.ebuild
deleted file mode 100644
index 25d82790fad8..000000000000
--- a/net-proxy/privoxy/privoxy-3.0.10.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.10.ebuild,v 1.5 2008/11/13 00:31:37 ranger Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-
-inherit toolchain-funcs autotools
-
-HOMEPAGE="http://www.privoxy.org
-	http://sourceforge.net/projects/ijbswa/"
-DESCRIPTION="A web proxy with advanced filtering capabilities for protecting privacy against Internet junk"
-SRC_URI="mirror://sourceforge/ijbswa/${P/_/-}-stable-src.tar.gz"
-
-IUSE="selinux threads zlib"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-LICENSE="GPL-2"
-
-DEPEND="dev-libs/libpcre
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-privoxy )"
-
-S="${WORKDIR}/${P/_/-}-stable"
-
-pkg_setup() {
-	enewgroup privoxy
-	enewuser privoxy -1 -1 /etc/privoxy privoxy
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	sed -e 's:confdir .:confdir /etc/privoxy:' \
-		-e 's:logdir .:logdir /var/log/privoxy:' \
-		-e 's:logfile logfile:logfile privoxy.log:' \
-		-i config || die "sed failed."
-	sed -e 's:^\+set-image-blocker{pattern}:+set-image-blocker{blank}:' \
-		-i default.action.master || die "sed 2 failed."
-	eautoreconf || die "autoreconf failed"
-}
-
-src_compile() {
-	export CC=$(tc-getCC)
-	econf \
-		$(use_enable zlib) \
-		$(use_enable threads pthread) \
-		--enable-dynamic-pcre \
-		--with-user=privoxy \
-		--with-group=privoxy \
-		--sysconfdir=/etc/privoxy \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install () {
-	dosbin privoxy
-	newinitd "${FILESDIR}/privoxy.initd" privoxy
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/privoxy.logrotate" privoxy
-
-	insinto /etc/privoxy
-	doins default.action default.filter config standard.action trust user.action
-	insinto /etc/privoxy/templates
-	doins templates/*
-
-	doman privoxy.1
-	dodoc README AUTHORS doc/text/faq.txt ChangeLog
-	cd doc/webserver
-	dohtml -r developer-manual faq man-page user-manual
-
-	diropts -m 0750 -g privoxy -o privoxy
-	keepdir /var/log/privoxy
-}
diff --git a/net-proxy/privoxy/privoxy-3.0.11-r1.ebuild b/net-proxy/privoxy/privoxy-3.0.11-r1.ebuild
deleted file mode 100644
index 95bdc22bbf78..000000000000
--- a/net-proxy/privoxy/privoxy-3.0.11-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.11-r1.ebuild,v 1.1 2009/03/22 10:55:14 mrness Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs autotools
-
-HOMEPAGE="http://www.privoxy.org
-	http://sourceforge.net/projects/ijbswa/"
-DESCRIPTION="A web proxy with advanced filtering capabilities for protecting privacy against Internet junk"
-SRC_URI="mirror://sourceforge/ijbswa/${P/_/-}-stable-src.tar.gz"
-
-IUSE="selinux threads zlib"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-LICENSE="GPL-2"
-
-DEPEND="dev-libs/libpcre
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-privoxy )"
-
-S="${WORKDIR}/${P/_/-}-stable"
-
-pkg_setup() {
-	enewgroup privoxy
-	enewuser privoxy -1 -1 /etc/privoxy privoxy
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-timeout.patch # should be fixed in versions >= 3.0.12
-	# autoreconf needs to be called even if we don't modify any autotools source files
-	# See main makefile
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
-	export CC=$(tc-getCC)
-	econf \
-		$(use_enable zlib) \
-		$(use_enable threads pthread) \
-		--enable-dynamic-pcre \
-		--with-user=privoxy \
-		--with-group=privoxy \
-		--sysconfdir=/etc/privoxy \
-		--docdir=/usr/share/doc/${PF} \
-		|| die "econf failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}/privoxy.initd" privoxy
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/privoxy.logrotate" privoxy
-
-	diropts -m 0750 -g privoxy -o privoxy
-	keepdir /var/log/privoxy
-}
diff --git a/net-proxy/privoxy/privoxy-3.0.11.ebuild b/net-proxy/privoxy/privoxy-3.0.15_beta.ebuild
index 308dc86e98ff..574eff9971a6 100644
--- a/net-proxy/privoxy/privoxy-3.0.11.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.15_beta.ebuild
@@ -1,15 +1,19 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.11.ebuild,v 1.1 2009/03/13 20:00:28 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.15_beta.ebuild,v 1.1 2009/10/22 21:32:10 mrness Exp $
 
 EAPI="2"
 
 inherit eutils toolchain-funcs autotools
 
+[ "${PV##*_}" = "beta" ] &&
+	PRIVOXY_STATUS="beta" ||
+	PRIVOXY_STATUS="stable"
+
 HOMEPAGE="http://www.privoxy.org
 	http://sourceforge.net/projects/ijbswa/"
 DESCRIPTION="A web proxy with advanced filtering capabilities for protecting privacy against Internet junk"
-SRC_URI="mirror://sourceforge/ijbswa/${P/_/-}-stable-src.tar.gz"
+SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"
 
 IUSE="selinux threads zlib"
 SLOT="0"
@@ -21,17 +25,14 @@ DEPEND="dev-libs/libpcre
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-privoxy )"
 
-S="${WORKDIR}/${P/_/-}-stable"
+S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
 
 pkg_setup() {
 	enewgroup privoxy
 	enewuser privoxy -1 -1 /etc/privoxy privoxy
 }
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 	# autoreconf needs to be called even if we don't modify any autotools source files
 	# See main makefile