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

(Portage version: 2.1.9.22/cvs/Linux x86_64)

5 files changed, 15 insertions, 13 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/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}