Version bump. Inherit user, not eutils.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 36 insertions, 51 deletions

diff --git a/net-proxy/wwwoffle/ChangeLog b/net-proxy/wwwoffle/ChangeLog
index 7e4c41536599..dddba1a1fcf7 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.50 2012/04/06 22:00:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/ChangeLog,v 1.51 2012/08/01 19:49:05 jer Exp $
+
+*wwwoffle-2.9h (01 Aug 2012)
+
+  01 Aug 2012; Jeroen Roovers <jer@gentoo.org> -wwwoffle-2.9d.ebuild,
+  wwwoffle-2.9e.ebuild, +wwwoffle-2.9h.ebuild:
+  Version bump. Inherit user, not eutils.
 
   06 Apr 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #63588
diff --git a/net-proxy/wwwoffle/Manifest b/net-proxy/wwwoffle/Manifest
index 8e5b14732b83..cd658823e10c 100644
--- a/net-proxy/wwwoffle/Manifest
+++ b/net-proxy/wwwoffle/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX wwwoffle-online.confd 426 RMD160 2f6e76dcbb9d0d2d7159f8ee86ffe3426414cbb0 SHA1 b5f74da31da73dd9cfe797ee1778d667230c572a SHA256 43782eff21a0e064b36fe9bf4ef56a8f93a4b9c6e7b30d8266c656a59e89b19d
-AUX wwwoffle-online.initd 696 RMD160 6603e96b4d83aacbc769e179b386a95ec64330c8 SHA1 0cb125c9f65cfa5e65715e15039fd5e0a151f103 SHA256 caea4a37d676a7190d215fa36fcf41bc812eea8dd0cf0f30d8f71b98bef4d5f4
-AUX wwwoffle.initd 539 RMD160 f5f0c39adabadbdd74108d455a5b910ce66d92ea SHA1 54347804aca2ece13eb33a18c064a443f5b5b6bf SHA256 346b3d93113ed56096e8a052e62c3410eeb0936fe08842d64de0bdf0905e2db0
-DIST wwwoffle-2.9d.tgz 1097304 RMD160 8d14d3ccdb86aec4693b1a624cef8c9460e33ee0 SHA1 3713a58272833cbc34f4c567f1301bc3994c3c7f SHA256 abf0d224380133c73411ee0c304b94e85da71f498cbf1021e80f40ac4c853ad3
-DIST wwwoffle-2.9e.tgz 1092951 RMD160 84fd553ef72d72ce4e7604b98674ae4cfabd2c49 SHA1 f0361b1f2e8dcd182b74e7b933c3f7fd77f28906 SHA256 462b1cf7a3633404e988ab0569cb8f0012a187b654019a25175fde7cd051153f
-EBUILD wwwoffle-2.9d.ebuild 4169 RMD160 04d86e731e9c5f472b63e7c14fdae470df84c7f1 SHA1 e71b890a93dc4735b2b43ef333b9aec790891b41 SHA256 c3ce910f8c8de5baf8ab5f4d272cfec0fbcc3604ffc76e6b5a7ca2aa0f3c3cd3
-EBUILD wwwoffle-2.9e.ebuild 4139 RMD160 651b82b1da7ed7e6242c594f3cceb9fdf47f41d3 SHA1 49246003f8a16efb538380bd348cdbf195640a86 SHA256 091780172b044aa09ca05ad07409be6d8b7e167c2b79e2d9146a95bf4655a35f
-MISC ChangeLog 12031 RMD160 a0e692557adeaada6bd15f22cf230d218d9e0a47 SHA1 55ebdc7033cd4d3089a7759d0ea5716948fe7a06 SHA256 a658a95d5404fb60cd861dceeb4fff69b6a617e4585cdc9a2d4757cec515b8dd
-MISC metadata.xml 407 RMD160 a15ed01388a1b16495340200bfa14249dd0ba2ce SHA1 aed86a0b63f16d1faecec5d08e759269bfcded4c SHA256 f41d64fc3323c59edb100c55c6ab20c0540fa00826c5ae94f24e94d8b18ca6c9
+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
+EBUILD wwwoffle-2.9h.ebuild 3461 SHA256 0a56a940882cc772553dd09525a8722652fc7952848df72c5656bea772b711e5 SHA512 2e6b3397944c8b94d442c29db0ba68652fe834c3f66beb7602d0d739460a431c936d013adb286be4ebd4918ebf7f4683d910951c5febd2a69026950a1dd166ca WHIRLPOOL a120a3a8a7e1763b81dfa023f3a0df36f53eff28a8062c1caa80b83a53f1e673a6f691726456c030fd5d8a5b4f1f1343de6c212795e594427298a3b5c56454f5
+MISC ChangeLog 12219 SHA256 d69f48811a0cf2c1624a9b36a43cd52f40a503cbfc2cae2a4fdc707aed99e358 SHA512 ac7cfcd9faece8d9d75a908ef53dd019c46077713d70c9a4649aa9acdbd122dbfe05e5e260d09e88adf8337fc496531235edf1f2e1afcc6b7b379350e4a96edf WHIRLPOOL 4624e83ef7515ff9b797a9bec96dabe3d7538e94fcc3b15f3d38428a9fed68a38a57c2de3b554441ee17ddcd28dda72bb140380e5f491ff675195664109c7130
+MISC metadata.xml 407 SHA256 f41d64fc3323c59edb100c55c6ab20c0540fa00826c5ae94f24e94d8b18ca6c9 SHA512 cdba8ce424ff2323dc602200adcd09a5a60c820ed83e949cf545f545e4519331dd00e28d373159da1eac7becbfa1d6a7abde2453b2a31de789d4e3827f57e810 WHIRLPOOL e51f52a1900d00f561709abe5e014c2f1b4ffb4f6c3f814d0865ee4434d58ee0e71c01041fc7f0155393a0646e4bef940982ef0f75e2c0a5c9073b5dd6c15c00
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9/Z5UACgkQCaWpQKGI+9QqNACfY0vnADwwEy0eT8YA0qq8GMx4
-0GsAn1cGc1wvt4tF2LtZ1KMdgy89YI6G
-=MNzt
+iEYEAREIAAYFAlAZiDYACgkQVWmRsqeSphPF7ACdGjnfrbMbgvfEU7ik/4gZqo0/
+paoAn0pN8Wmg1cUndaLtD1/LuDOVL37V
+=PY2c
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild b/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild
index afa14e894cc3..987bd0bf9959 100644
--- a/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild
+++ b/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 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.5 2009/11/18 18:45:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild,v 1.6 2012/08/01 19:49:05 jer Exp $
 
 EAPI="2"
 
-inherit eutils
+inherit user
 
 DESCRIPTION="Web caching proxy suitable for non-permanent Internet connections"
 SRC_URI="http://www.gedanken.demon.co.uk/download-wwwoffle/${P}.tgz"
diff --git a/net-proxy/wwwoffle/wwwoffle-2.9d.ebuild b/net-proxy/wwwoffle/wwwoffle-2.9h.ebuild
index 2c18cd30de83..d7d235712995 100644
--- a/net-proxy/wwwoffle/wwwoffle-2.9d.ebuild
+++ b/net-proxy/wwwoffle/wwwoffle-2.9h.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9d.ebuild,v 1.7 2008/07/24 17:45:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9h.ebuild,v 1.1 2012/08/01 19:49:05 jer Exp $
 
-inherit eutils
+EAPI=4
+inherit 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"
@@ -21,28 +22,26 @@ DEPEND="dev-lang/perl
 
 # Unsure whether to depend on >=www-misc/htdig-3.1.6-r4 or not
 
-src_unpack() {
-	unpack ${A}
-
-	sed -i -e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' \
-		"${S}/cache/Makefile.in"
+src_prepare() {
+	sed -i cache/Makefile.in \
+		-e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' \
+		|| die
 }
 
-src_compile() {
+src_configure() {
 	econf $(use_with zlib) \
 		$(use_with gnutls) \
 		$(use_with ipv6) || die "econf failed"
-	emake || die "emake failed"
 }
 
 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}
 	dodir /usr/share/doc
-	mv "${D}/usr/doc/wwwoffle" "${D}/usr/share/doc/${PF}"
+	mv "${D}/usr/doc/${PN}" "${D}/usr/share/doc/${PF}"
 	rmdir "${D}/usr/doc"
 
 	# install the wwwoffled init script
@@ -81,18 +80,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() {
@@ -115,12 +102,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
 }