Fixed na_icons flag to be conditioned by na_dd flag.

Package-Manager: portage-2.1.1_pre2-r2

3 files changed, 23 insertions, 13 deletions

diff --git a/media-tv/xmltv/ChangeLog b/media-tv/xmltv/ChangeLog
index 2275ca75297f..38e16b123e23 100644
--- a/media-tv/xmltv/ChangeLog
+++ b/media-tv/xmltv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-tv/xmltv
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/ChangeLog,v 1.55 2006/07/03 09:14:30 mattepiu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/ChangeLog,v 1.56 2006/07/05 16:46:59 mattepiu Exp $
+
+  05 Jul 2006; Matteo Azzali <mattepiu@gentoo.org> xmltv-0.5.44.ebuild:
+  Corrected na_icons flag to be conditioned by na_dd flag.
 
   03 Jul 2006; Matteo Azzali <mattepiu@gentoo.org> xmltv-0.5.44.ebuild:
   Fixed XML::Write dependancy, bug #138838 , thanks to Pierre Cassimans
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index 606ed8b6cfef..2727be63d3f0 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -23,14 +23,14 @@ EBUILD xmltv-0.5.43-r4.ebuild 5246 RMD160 fb4d8a6a4eb858a6c56661abe4db069b4eb55a
 MD5 cf1091551a3d1b3336ed647ec526a843 xmltv-0.5.43-r4.ebuild 5246
 RMD160 fb4d8a6a4eb858a6c56661abe4db069b4eb55a6f xmltv-0.5.43-r4.ebuild 5246
 SHA256 f0970bafdbb9b911d66a03a9357bc931e12bd6e1da6f5adfdc063312920547e9 xmltv-0.5.43-r4.ebuild 5246
-EBUILD xmltv-0.5.44.ebuild 5269 RMD160 b32cfd082769410b56f811f3ff48570c31a73eae SHA1 b9cbea938f2495a605fde56025428ebe2484f268 SHA256 550863cc3fb5492864e9a820a34bae9de9740dffc8e8dd46927ba9c70cc46f7a
-MD5 8a174a62e119d6b55ff476057847c404 xmltv-0.5.44.ebuild 5269
-RMD160 b32cfd082769410b56f811f3ff48570c31a73eae xmltv-0.5.44.ebuild 5269
-SHA256 550863cc3fb5492864e9a820a34bae9de9740dffc8e8dd46927ba9c70cc46f7a xmltv-0.5.44.ebuild 5269
-MISC ChangeLog 11300 RMD160 038b5b95c464363b8ec9ee5f459fb3b023f42898 SHA1 7a69aea0ba2ad0aaae5776de71ddeaf43641d0f4 SHA256 b84733c5583f31aff27062f2afea522abc953f45d038306ace23a39629d22f27
-MD5 8bc4d3f2bbcb604fd32e4c2293e1f7cf ChangeLog 11300
-RMD160 038b5b95c464363b8ec9ee5f459fb3b023f42898 ChangeLog 11300
-SHA256 b84733c5583f31aff27062f2afea522abc953f45d038306ace23a39629d22f27 ChangeLog 11300
+EBUILD xmltv-0.5.44.ebuild 5494 RMD160 7137888cdc309c0be5a91fa2d930bc0e6cd47e7f SHA1 81d9951afb671a40d5d8afeed7eb109c58afec98 SHA256 a95ab977b946c20b262f9995fd68118cc0939eb9fa3f49464e9be37a06932b00
+MD5 265351ff87a61675e9d1cbb4a8966035 xmltv-0.5.44.ebuild 5494
+RMD160 7137888cdc309c0be5a91fa2d930bc0e6cd47e7f xmltv-0.5.44.ebuild 5494
+SHA256 a95ab977b946c20b262f9995fd68118cc0939eb9fa3f49464e9be37a06932b00 xmltv-0.5.44.ebuild 5494
+MISC ChangeLog 11432 RMD160 5f9ca315e0f2e1152d455d4672396606cf30af07 SHA1 2958cc57e4baa175328c2be4e66619ebbbeb2948 SHA256 6362caa84868a46059a6903038da56232ac67cd9980043dfc7eacd2af05d841e
+MD5 93f21c57235714bf2fc03dff840e6baf ChangeLog 11432
+RMD160 5f9ca315e0f2e1152d455d4672396606cf30af07 ChangeLog 11432
+SHA256 6362caa84868a46059a6903038da56232ac67cd9980043dfc7eacd2af05d841e ChangeLog 11432
 MISC metadata.xml 253 RMD160 5ef8864f145f7593d909731ad87eeffa4b00dcc7 SHA1 a4e8c0ac9ef9fbe6e4d82ef5131047bb4e187dcc SHA256 8dcec70903c8e22a3a3ff3ba1e2ae5c508d58fe0662ceb53279ae94766b445c4
 MD5 b403bbd8eaf2e42d9653fca6855d3996 metadata.xml 253
 RMD160 5ef8864f145f7593d909731ad87eeffa4b00dcc7 metadata.xml 253
diff --git a/media-tv/xmltv/xmltv-0.5.44.ebuild b/media-tv/xmltv/xmltv-0.5.44.ebuild
index 3139566d193e..3869a7bd68f8 100644
--- a/media-tv/xmltv/xmltv-0.5.44.ebuild
+++ b/media-tv/xmltv/xmltv-0.5.44.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/xmltv-0.5.44.ebuild,v 1.3 2006/07/03 09:14:30 mattepiu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/xmltv-0.5.44.ebuild,v 1.4 2006/07/05 16:46:59 mattepiu Exp $
 
 inherit eutils perl-module
 
@@ -47,7 +47,7 @@ RDEPEND=">=dev-perl/libwww-perl-5.65
 
 DEPEND="${RDEPEND}
 	>=sys-apps/portage-2.0.50-r1
-	na_dd? ( dev-perl/HTML-TableExtract >=dev-perl/WWW-Mechanize-1.02 )
+	na_dd? ( na_icons? ( dev-perl/HTML-TableExtract >=dev-perl/WWW-Mechanize-1.02 ) )
 	de_tvtoday? ( >=dev-perl/HTML-Parser-3.34 dev-perl/HTML-Tree )
 	dk? ( dev-perl/HTML-Tree )
 	es? ( dev-perl/HTML-Tree )
@@ -92,7 +92,7 @@ make_config() {
 	# Enable North America using DataDirect
 	use na_dd && echo "yes" || echo "no"
 	# Enable North America channel icons
-	use na_icons  && echo "yes" || echo "no"
+	use na_icons  && use na_dd && echo "yes" || echo "no"
 	# Enable Finland
 	use fi  && echo "yes" || echo "no"
 	# Enable Spain
@@ -170,5 +170,12 @@ pkg_postinst() {
 		einfo "To use tv_pick_cgi, please link it from /usr/bin/tv_pick_cgi"
 		einfo "to where the ScriptAlias directive is configured."
 	fi
+	if use na_icons ; then
+		if use na_dd ; then
+			einfo "na_icons set for na_dd grabber user."
+		else
+			einfo "na_icons works only when na_dd is set, "
+			einfo "otherwise it does nothing."
+		fi
+	fi
 }
-