app-admin/webalizer: Replace built_with_use by use dependency, explicitly assign RDEPEND

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

6 files changed, 20 insertions, 18 deletions

diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog
index 57aca93a162f..f9795fee7f18 100644
--- a/app-admin/webalizer/ChangeLog
+++ b/app-admin/webalizer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/webalizer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.79 2010/10/28 03:05:21 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.80 2010/10/28 03:14:50 sping Exp $
+
+  28 Oct 2010; Sebastian Pipping <sping@gentoo.org>
+  webalizer-2.01.10-r15.ebuild, webalizer-2.01.10-r16.ebuild,
+  webalizer-2.01.10-r17.ebuild, webalizer-2.21.02.ebuild:
+  Replace built_with_use by use dependency, explicitly assign RDEPEND
 
   28 Oct 2010; Sebastian Pipping <sping@gentoo.org>
   webalizer-2.01.10-r15.ebuild, webalizer-2.01.10-r16.ebuild,
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index 832925f5d2fa..8f3c3a5b10b1 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -10,9 +10,9 @@ DIST webalizer-2.01-10-RB21-patch.tar.gz 585340 RMD160 bfd020cf078342ebc5b660793
 DIST webalizer-2.01-10-src.tar.bz2 252664 RMD160 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20 SHA1 fbf6ad78fc2b0189d065e661dc02a781e858b31a SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262
 DIST webalizer-2.21-02-src.tar.bz2 304926 RMD160 c7d48acf6e2c1fedfd04eac30214a76db7c84aee SHA1 b637ebf1eb459e03c052c24d7da3e5f0794e2230 SHA256 f2663d67f5820644a0b1c0b7dee4a5c764d829166fa28d5880442c28886729d9
 DIST webalizer.conf.gz 8986 RMD160 61751fa52c4e4bc29a8c3ba5956daf0a45138ec5 SHA1 557406236b10630fb213b12ef30c810a76eac6e5 SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71
-EBUILD webalizer-2.01.10-r15.ebuild 4230 RMD160 9b9ea976eca6672a18234a1c6e091c0951798035 SHA1 e3b34b4b4be018f4f8f029ee0467f9e52b4bff07 SHA256 e17054e275857b400ea6ddc5a57192d937d03d0d202721296ff1eed338a39f4e
-EBUILD webalizer-2.01.10-r16.ebuild 3838 RMD160 bf52119ee1a5437194af6da04c99969f4c3bae58 SHA1 d26670aa8ae0f477b65197e0be7a97429c50b9e9 SHA256 50c1adc23a9501574f9ea05cb23d3d898ec564ab5cb20f204721c6d93cf289d1
-EBUILD webalizer-2.01.10-r17.ebuild 3998 RMD160 ab1f99b5283d8bcb67aa0c62969bec7182ed8bf0 SHA1 aa864c41688bbad1abb0742c54a8fa98e4109f69 SHA256 d2a48f96476c5c90b9ea0a4b855fb00776fd2e4c0481ff83a0285c44ab251b90
-EBUILD webalizer-2.21.02.ebuild 3230 RMD160 58fa2abfec6ab10d9bf5763b32a06e3fb2e7d3f2 SHA1 7ebef95f2e565ad018899b22012191a3e9ee87a7 SHA256 551b608b646fb5d3dd5d006ffc10e9e7692f0fc7fb75d154d4d74829cdcd3397
-MISC ChangeLog 11744 RMD160 02841505ced108c413b019449e362cce90f035dc SHA1 91c451a37db0b520a6720462e66bed620f530c89 SHA256 6e73d8297b2eb438906aff17b0a0f4b95cad6400895dc63ec69dfaff60b1f8bb
+EBUILD webalizer-2.01.10-r15.ebuild 4021 RMD160 3061d35ddf40d62eecb7208318d7cb1ad684ceb0 SHA1 8358f7400d914e467cc01fee709a0ab7599a744d SHA256 14356cbf50d6eb89f77af925d463314ecb4011b165c75bbf4befd7b48723f30d
+EBUILD webalizer-2.01.10-r16.ebuild 3858 RMD160 b4338a434025291ec610f3a5b120dd21ac7e3f53 SHA1 e26dc25eb409d9c68714990d6c2aac117beca823 SHA256 97148211aa9e43e466241d6142b18ab16c3a42c83ca61ae8d478ef0e3ec15834
+EBUILD webalizer-2.01.10-r17.ebuild 4018 RMD160 d61333ae4dab87e3a988b317f4ce0daa43fe49fe SHA1 66b37ba2b9c51202d3cba57cf52eece03f3be53f SHA256 244ec94a4d23351838832a5dd28c289ffd4789994875fb40bd732ffaa99e6d00
+EBUILD webalizer-2.21.02.ebuild 3250 RMD160 88f8f6245b1e1dbcd0f90b9eae7f028ffa2a1ec7 SHA1 1ad9a00429aff7b4b300a3d123015a4a5dc88c1c SHA256 455f0bbcf1d58105507d03061a670dcc326f292e46a35f2d82795ec2316442af
+MISC ChangeLog 11987 RMD160 b7f787585542ee0f7bf3399a20a856a9d49346d3 SHA1 2d344113000a0df88482270c0642725e8b576ada SHA256 107605a0d2b5c651f166b6b1a06c320323c5e04c570111197b00add3893015de
 MISC metadata.xml 233 RMD160 d096fc5efa30bb590a552300fdf51486f8990348 SHA1 935edd183d9e6436eccdcdf0275147b524f8b52f SHA256 508e864fe9eca5b8405c2d52503c5a4ed3c432bac41391cdefb1c79ec57ce7b9
diff --git a/app-admin/webalizer/webalizer-2.01.10-r15.ebuild b/app-admin/webalizer/webalizer-2.01.10-r15.ebuild
index 4cff09842dea..f704b3f41715 100644
--- a/app-admin/webalizer/webalizer-2.01.10-r15.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild,v 1.12 2010/10/28 03:05:21 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild,v 1.13 2010/10/28 03:14:50 sping Exp $
 
 EAPI="2"
 
@@ -32,19 +32,13 @@ IUSE="apache2 geoip nls xtended"
 DEPEND=">=sys-libs/db-4.2
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/libpng-1.2
-	>=media-libs/gd-1.8.3
+	>=media-libs/gd-1.8.3[png]
 	geoip? ( dev-libs/geoip )"
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	webapp_pkg_setup
 
-	# prevents "undefined reference" errors... see bug #65163
-	if ! built_with_use media-libs/gd png; then
-		ewarn "media-libs/gd must be built with png for this package"
-		ewarn "to function."
-		die "recompile gd with USE=\"png\""
-	fi
-
 	# USE=nls has no real meaning if LINGUAS isn't set
 	if use nls && [ -z "${LINGUAS}" ]; then
 		ewarn "you must set LINGUAS in /etc/make.conf"
diff --git a/app-admin/webalizer/webalizer-2.01.10-r16.ebuild b/app-admin/webalizer/webalizer-2.01.10-r16.ebuild
index c95d0da272df..24c3f07adc5b 100644
--- a/app-admin/webalizer/webalizer-2.01.10-r16.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r16.ebuild,v 1.3 2010/10/28 03:05:21 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r16.ebuild,v 1.4 2010/10/28 03:14:50 sping Exp $
 
 EAPI="2"
 
@@ -35,6 +35,7 @@ DEPEND=">=sys-libs/db-4.2
 	>=media-libs/libpng-1.2
 	>=media-libs/gd-1.8.3
 	geoip? ( dev-libs/geoip )"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MY_P}
 
diff --git a/app-admin/webalizer/webalizer-2.01.10-r17.ebuild b/app-admin/webalizer/webalizer-2.01.10-r17.ebuild
index 4baa3e8b63cd..3d4aaf7fe6e6 100644
--- a/app-admin/webalizer/webalizer-2.01.10-r17.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r17.ebuild,v 1.4 2010/10/28 03:05:21 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r17.ebuild,v 1.5 2010/10/28 03:14:50 sping Exp $
 
 EAPI="2"
 
@@ -35,6 +35,7 @@ DEPEND=">=sys-libs/db-4.2
 	>=media-libs/libpng-1.2
 	>=media-libs/gd-1.8.3
 	geoip? ( dev-libs/geoip )"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MY_P}
 
diff --git a/app-admin/webalizer/webalizer-2.21.02.ebuild b/app-admin/webalizer/webalizer-2.21.02.ebuild
index 4e0380397b27..00b44cf7f733 100644
--- a/app-admin/webalizer/webalizer-2.21.02.ebuild
+++ b/app-admin/webalizer/webalizer-2.21.02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.21.02.ebuild,v 1.2 2010/05/23 04:33:07 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.21.02.ebuild,v 1.3 2010/10/28 03:14:50 sping Exp $
 
 # uses webapp.eclass to create directories with right permissions
 # probably slight overkill but works well
@@ -29,6 +29,7 @@ DEPEND=">=sys-libs/db-4.2
 	>=media-libs/libpng-1.2
 	>=media-libs/gd-1.8.3
 	dev-libs/geoip"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MY_P}