Version bump.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 58 insertions, 39 deletions

diff --git a/net-proxy/wwwoffle/ChangeLog b/net-proxy/wwwoffle/ChangeLog
index 9a09cf4e22db..905e562a61d3 100644
--- a/net-proxy/wwwoffle/ChangeLog
+++ b/net-proxy/wwwoffle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/wwwoffle
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/ChangeLog,v 1.56 2012/12/29 14:25:49 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/ChangeLog,v 1.57 2013/01/08 18:31:52 jer Exp $
+
+*wwwoffle-2.9i (08 Jan 2013)
+
+  08 Jan 2013; Jeroen Roovers <jer@gentoo.org> -wwwoffle-2.9e.ebuild,
+  +wwwoffle-2.9i.ebuild, +files/wwwoffle-2.9i-define.patch:
+  Version bump.
 
   29 Dec 2012; Agostino Sarubbo <ago@gentoo.org> wwwoffle-2.9h.ebuild:
   Stable for sparc, wrt bug #441498
diff --git a/net-proxy/wwwoffle/Manifest b/net-proxy/wwwoffle/Manifest
index a30e5518448b..9dbe399115bb 100644
--- a/net-proxy/wwwoffle/Manifest
+++ b/net-proxy/wwwoffle/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX wwwoffle-2.9i-define.patch 336 SHA256 65575f9a93e59a9b7ceb1a724ebeb0bff0a1fefafdebfff5810882d1d4c36060 SHA512 cc59994bb94fd137214fbed66de76ae49e52b6798a603d4204c35007a38fdbe67e85d1c204f04eea2da2052027a821d0890aa33fd7ab02fed571f9f1f17990b9 WHIRLPOOL 5b495cbbebd7a8103b328622aa3d9d2681630d647545f26c38f3b137a8b3b637c765d8725c6b9247d45a757163cdad27d8c2753cc59026d141bddc46bd1d0ac2
 AUX wwwoffle-online.confd 426 SHA256 43782eff21a0e064b36fe9bf4ef56a8f93a4b9c6e7b30d8266c656a59e89b19d SHA512 92301dbdb96ea0c9b3b528b41b6484ba3a676cf110b1a670ebe1e957fa658ec0334cb5b259efa234cd54bb81f1299a32ece3d5afbd790843aa3ba4eed0750c0a WHIRLPOOL f1d32c84346f6ec0d094525f2a4b58c00c951a928cf5e832eb8fa68817583d47a68b5583d9ea858de7e20f12c4e756c9acb86c8cb974d1db2eb134416058986f
 AUX wwwoffle-online.initd 696 SHA256 caea4a37d676a7190d215fa36fcf41bc812eea8dd0cf0f30d8f71b98bef4d5f4 SHA512 8695b274abde642a6791f9a525d0ac56993a1a2330fadf6477f2ad92dfb00f64c1969644341758b8a4ad5773da48154aad6cc1966b1ba802226349112da2f4c5 WHIRLPOOL 90f05584ffab76cad0f2f1ae6859b322c018c7aa3bd543e1de2a32c7e040ef68bcc2b97a9fab986038764adc4c62884dbb660685f5750ce5d54ad6e2048e8b08
 AUX wwwoffle.initd 539 SHA256 346b3d93113ed56096e8a052e62c3410eeb0936fe08842d64de0bdf0905e2db0 SHA512 1338654f8dfec3232f538a7037111ac5eaef2f6cc9e271bc6a0945e89803014b091c11c49faa4a285b0a311cbb1b44b3994338fddbca78c8c3db44799b7ba2dd WHIRLPOOL 1768591644fdb4cc7ea00c56f7262c861781c9f8feca4053fa6ed8c4b6cba157f4f26f882b1095b9f21958d62d170360f9f96d7e20c05c56ee80ee7d7617e633
-DIST wwwoffle-2.9e.tgz 1092951 SHA256 462b1cf7a3633404e988ab0569cb8f0012a187b654019a25175fde7cd051153f SHA512 62d33cc9c8dd02f3aad576702b939b376f6ac4d60f865b814a90fd70ef545c385a6721bc33b14ddbd2fa57b1284dbdf66ced0e2b40ccc845ceb970a010798630 WHIRLPOOL 8b2fab99be9f6473efb47357163e9d22ac305e5756d0c7823854e849dc7b105b93392fe2581d887619cb6539124ae0bedc2f1adf9d0d545426b89d36a80eb71d
 DIST wwwoffle-2.9h.tgz 1095150 SHA256 fb2c9a5bdffdc13426d67dba1a5290f2e1b6ce85c00219a6e42230aa60696b42 SHA512 8aadcf95ecc7748c70d86718400a3a63f6fa9576dd6fca3aa76409358b12ab708ea60feda684248135312af8bd4ff6372f31e097eae1e4042d81f280cf35d334 WHIRLPOOL 490f21af11cc645c5947118853ec5e79756f1d73c30855bf4bce13fceda87aabc26a7dd44c9c32b7d93349e8be55ba609282ccae1dbb3dd90d9121fbe93f9ce3
-EBUILD wwwoffle-2.9e.ebuild 4133 SHA256 006623298dcf34293f4887d4e5c93c93bcc2e5aabbbb426850d89e0c4446cafb SHA512 c5ecdbd864b6e7fd611b946fb165733029c2f0fbca6a4f15e07958f6f76ab557de37443afc9da943bd7ebccf7886a71760819cb015f52d639c6686468b868f16 WHIRLPOOL 738780f1cdbfeb17f0d072e985b2b003e6c406c12881e091352df6f80ba92ea78f802124599d1bacf84af144f39b36121ab8e35049c303501d2ac35952dda42c
+DIST wwwoffle-2.9i.tgz 1113771 SHA256 e6341a4ec2631dc22fd5209c7e5ffe628a5832ad191d444c56aebc3837eed2ae SHA512 c9e9d67df9a0e40b584916857221a9a728f36a677cba28527f8c2febea1a23379d3b112d96723bf01ec1718a0897d8980715864ac7ef898b2585dd3f01d9a456 WHIRLPOOL 21e66a08e4da68e612a6cde4c1355cef46d2dfdce5cb8d0e3170709ee5abc2d5b3fb91d89581185f131995c38591cf98b25dfb2075f36099b6b2f183358d42e1
 EBUILD wwwoffle-2.9h.ebuild 3456 SHA256 6f86f11c65a5d8ede220ef9a9c651f1ec9061b4e507b6535cab5bd526b06431f SHA512 71f4eb56fe33eb0d8791a5df7ac20e02461491f74b69a0b2045886a1dd685cfc99c762691272388ae6aceff27701a6b81d25fdada4b1fc55cc7c84f822fb540d WHIRLPOOL b1cfce77e5a288664347a44d2d0c68c24f0d0b48e5492549a18006ad1c54224f7d2a396679d1613045e3ccbec70c37fe245cd10c535a9a3e019de43e223d553a
-MISC ChangeLog 12738 SHA256 7b742c425e867fdde7ebea96aeee3c3fdc3945190f6d45fe3b468e52eb1e3829 SHA512 7c514229671e1a96c563eba4ef696b959cbe3e8d5dd4417f7651cf17c2eb807b8bd25e5f3b68eed960ab9bbaaf9a893617b53cb75a5dc9bd86bfe831e78ee356 WHIRLPOOL bac58c44efdce3169219f253a55d050502fe50a029381e099ce195752a755982770ca64894e90888d73f255f560b6e88381d234aef8d71b732e00621c5cc207c
+EBUILD wwwoffle-2.9i.ebuild 3517 SHA256 28e0eb0c89928d65808378940a457da7205f3b2586bc32632df4f5ef5f37f285 SHA512 9bf000813a0a45e21396f1e102e6d6e1e9c81bdbefbd041487f579ded37756855ffcd7d253843f04605039a17d68360b58d7f31284dae42e0feea9f5d3d52827 WHIRLPOOL 054e66a1976388b507059d55cb3f60c27862b4df5c27401bbbc0af9fdda9018c2f2770864a90b5cda7de6ecfa2e56cdcddca13e286e40eb155064a17d2d5ed83
+MISC ChangeLog 12915 SHA256 afea4cc1394bec74c7306e23cf79f3ee667c2acc20d86e857802fbee0cb2d197 SHA512 d90f31189b378664128e204ab35ba541b313be338b695e213d6d0a2e49b3d709fa8dbbe01ae415f5f7999706e1fde5d2aad2b8348ae8a541cf0ea9dcde83cba8 WHIRLPOOL 6dae657de63e880611a9ae959542d2eb60eaed9d3b477b1fb602757cf01525f30191185503c265b78e68c64190d222beba894fe72ab3d927366f2d709a9eb0be
 MISC metadata.xml 407 SHA256 f41d64fc3323c59edb100c55c6ab20c0540fa00826c5ae94f24e94d8b18ca6c9 SHA512 cdba8ce424ff2323dc602200adcd09a5a60c820ed83e949cf545f545e4519331dd00e28d373159da1eac7becbfa1d6a7abde2453b2a31de789d4e3827f57e810 WHIRLPOOL e51f52a1900d00f561709abe5e014c2f1b4ffb4f6c3f814d0865ee4434d58ee0e71c01041fc7f0155393a0646e4bef940982ef0f75e2c0a5c9073b5dd6c15c00
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlDsZhsACgkQVWmRsqeSphMQpQCcDY90Yckcg7quXqiL8FDO+3AR
+MW4An1PnxDXJaOhFiO1io+KL1BZzlnGU
+=9NMl
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/wwwoffle/files/wwwoffle-2.9i-define.patch b/net-proxy/wwwoffle/files/wwwoffle-2.9i-define.patch
new file mode 100644
index 000000000000..3bcc10d761e6
--- /dev/null
+++ b/net-proxy/wwwoffle/files/wwwoffle-2.9i-define.patch
@@ -0,0 +1,20 @@
+--- a/src/wwwoffled.c
++++ b/src/wwwoffled.c
+@@ -15,6 +15,7 @@
+ 
+ #include "autoconfig.h"
+ 
++#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- a/src/cgi.c
++++ b/src/cgi.c
+@@ -16,6 +16,7 @@
+ 
+ #include "autoconfig.h"
+ 
++#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild b/net-proxy/wwwoffle/wwwoffle-2.9i.ebuild
index 987bd0bf9959..9185d29c5a93 100644
--- a/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild
+++ b/net-proxy/wwwoffle/wwwoffle-2.9i.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild,v 1.6 2012/08/01 19:49:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9i.ebuild,v 1.1 2013/01/08 18:31:54 jer Exp $
 
-EAPI="2"
-
-inherit user
+EAPI=4
+inherit eutils user
 
 DESCRIPTION="Web caching proxy suitable for non-permanent Internet connections"
 SRC_URI="http://www.gedanken.demon.co.uk/download-wwwoffle/${P}.tgz"
 HOMEPAGE="http://www.gedanken.demon.co.uk/wwwoffle"
 
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="gnutls ipv6 zlib"
@@ -24,25 +23,28 @@ DEPEND="dev-lang/perl
 # Unsure whether to depend on >=www-misc/htdig-3.1.6-r4 or not
 
 src_prepare() {
-	sed -i -e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' \
-		"${S}/cache/Makefile.in"
+	epatch "${FILESDIR}"/${PN}-2.9i-define.patch
+	sed -i cache/Makefile.in \
+		-e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' \
+		|| die
 }
 
 src_configure() {
-	econf $(use_with zlib) \
+	econf \
 		$(use_with gnutls) \
-		$(use_with ipv6) || die "econf failed"
+		$(use_with ipv6) \
+		$(use_with zlib)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 
 	# documentation fix
 	# del empty doc dirs
-	rmdir "${D}/usr/doc/${PN}"/{it,nl,ru}
+	rmdir "${D}/usr/doc/${PN}"/{it,nl,ru} || die
 	dodir /usr/share/doc
-	mv "${D}/usr/doc/wwwoffle" "${D}/usr/share/doc/${PF}"
-	rmdir "${D}/usr/doc"
+	mv "${D}/usr/doc/${PN}" "${D}/usr/share/doc/${PF}" || die
+	rmdir "${D}/usr/doc" || die
 
 	# install the wwwoffled init script
 	newinitd "${FILESDIR}/${PN}.initd" wwwoffled
@@ -80,18 +82,6 @@ pkg_preinst() {
 	sed -i -e 's/^[# \t]\(run-[gu]id[ \t]*=[ \t]*\)[a-zA-Z0-9]*[ \t]*$/ \1wwwoffle/g' \
 		"${D}/etc/wwwoffle/wwwoffle.conf"
 
-	# Stop the service if it is started
-	if [ "${ROOT}" = "/" ] ; then
-		source /etc/init.d/functions.sh
-		if [ -L "${svcdir}/started/wwwoffled" ]; then
-			einfo "The wwwoffled init script is running. I'll stop it, merge the new files and
-			restart the script."
-			/etc/init.d/wwwoffled stop
-			# Just to be sure...
-			start-stop-daemon --stop --quiet --name wwwoffled
-			touch "${T}/stopped"
-		fi
-	fi
 }
 
 pkg_postinst() {
@@ -114,12 +104,4 @@ pkg_postinst() {
 	einfo "This is for your own security. Otherwise wwwoffle is run as root which is relay bad if"
 	einfo "there is an exploit in this program that allows remote/local users to execute arbitary"
 	einfo "commands as the root user."
-
-	if [ -f "${ROOT}/etc/wwwoffle.conf" ]; then
-		ewarn "Configuration file is /etc/wwwoffle/wwwoffle.conf now"
-		ewarn "Suggest you move ${ROOT}etc/wwwoffle.conf"
-	fi
-
-	# if htdig - run script for full database index
-	# TODO
 }