Cleaned ebuild and small fixes, thanks to Anders Hellgren, bug #95166.

Package-Manager: portage-2.1

3 files changed, 24 insertions, 47 deletions

diff --git a/media-tv/xmltv/ChangeLog b/media-tv/xmltv/ChangeLog
index 74865fffa192..8e5ef48eb72f 100644
--- a/media-tv/xmltv/ChangeLog
+++ b/media-tv/xmltv/ChangeLog
@@ -1,6 +1,10 @@
 # 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.47 2006/06/07 10:13:47 mattepiu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/ChangeLog,v 1.48 2006/06/11 10:01:59 mattepiu Exp $
+
+  11 Jun 2006; Matteo Azzali <mattepiu@gentoo.org> xmltv-0.5.43-r4.ebuild:
+  Cleaned the ebuild and use of the perl-module functions, thanks to
+  Anders Hellgren, bug #95166.
 
   07 Jun 2006; <matte@gentoo.org> xmltv-0.5.43-r4.ebuild:
   removed na_dd special MethodMaker dep as per bug #95166.
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index f10f48106faa..2ef2a222e69d 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -18,14 +18,14 @@ EBUILD xmltv-0.5.39.ebuild 7549 RMD160 9decd18936e71fe8345e7513a1f124b7504af8c2
 MD5 6d5f3ce2fc2d0ed83fa2f84680575126 xmltv-0.5.39.ebuild 7549
 RMD160 9decd18936e71fe8345e7513a1f124b7504af8c2 xmltv-0.5.39.ebuild 7549
 SHA256 541fd04c67c6b1cf25555afa356b6a8f58d804334e232935e6c89061d0be81d2 xmltv-0.5.39.ebuild 7549
-EBUILD xmltv-0.5.43-r4.ebuild 6211 RMD160 3fa1d2af68c03d741c582a1cfcb5dcac19b629c7 SHA1 b9d95307c2596fe05c3a7d2aaf26f6e81a0a10dd SHA256 e2149651f5b81032ef6d8dbbd9e2a5922be370601cb97434219b8f83b4c59ab1
-MD5 2e2373f4c3254f3397d325dd33a64ec3 xmltv-0.5.43-r4.ebuild 6211
-RMD160 3fa1d2af68c03d741c582a1cfcb5dcac19b629c7 xmltv-0.5.43-r4.ebuild 6211
-SHA256 e2149651f5b81032ef6d8dbbd9e2a5922be370601cb97434219b8f83b4c59ab1 xmltv-0.5.43-r4.ebuild 6211
-MISC ChangeLog 10440 RMD160 a44ffbc3175c2d0ed6c00353d3f11f71a3016130 SHA1 3fe855a19118e092e0a8a56bdeb22f9f455390e3 SHA256 dfd40112376c7993c3b058a7f83f71baf4e9bb2fbd6f4241690b2056177d999f
-MD5 a635299d31dbb8971d6ba9cbac0227bf ChangeLog 10440
-RMD160 a44ffbc3175c2d0ed6c00353d3f11f71a3016130 ChangeLog 10440
-SHA256 dfd40112376c7993c3b058a7f83f71baf4e9bb2fbd6f4241690b2056177d999f ChangeLog 10440
+EBUILD xmltv-0.5.43-r4.ebuild 5157 RMD160 1ababadcb858bff9e967219719b5d58bdd356d90 SHA1 504002f18d5dbe299d7ec1d2c82b9c00c40cf0f5 SHA256 f8c759cc8343cf68dedfce0788f1daadf3e47c338b6e40ac3216c13fac582835
+MD5 3a9dca37763ea0ce5e95fd43b1f6ed62 xmltv-0.5.43-r4.ebuild 5157
+RMD160 1ababadcb858bff9e967219719b5d58bdd356d90 xmltv-0.5.43-r4.ebuild 5157
+SHA256 f8c759cc8343cf68dedfce0788f1daadf3e47c338b6e40ac3216c13fac582835 xmltv-0.5.43-r4.ebuild 5157
+MISC ChangeLog 10616 RMD160 51503aab5adbfab9e6fd15f41e567663459966b9 SHA1 2d14c2d1d0ce05f91a975eed791cf960d999491c SHA256 61cbb653e5ecf95ae8217301feb5c287fa5e45dae64fde6d59e760d5a63e7e80
+MD5 821ec61e55b1f92c3a376f2a2dcaa1bf ChangeLog 10616
+RMD160 51503aab5adbfab9e6fd15f41e567663459966b9 ChangeLog 10616
+SHA256 61cbb653e5ecf95ae8217301feb5c287fa5e45dae64fde6d59e760d5a63e7e80 ChangeLog 10616
 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.43-r4.ebuild b/media-tv/xmltv/xmltv-0.5.43-r4.ebuild
index 8b22bada88e2..3846477205e0 100644
--- a/media-tv/xmltv/xmltv-0.5.43-r4.ebuild
+++ b/media-tv/xmltv/xmltv-0.5.43-r4.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.43-r4.ebuild,v 1.3 2006/06/07 10:13:47 mattepiu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/xmltv-0.5.43-r4.ebuild,v 1.4 2006/06/11 10:01:59 mattepiu Exp $
 
 inherit eutils perl-module
 
@@ -14,46 +14,18 @@ KEYWORDS="~x86 ~ppc"
 PREFIX="/usr"
 
 # NOTE: you can customize the xmltv installation by
-#       defining USE FLAGS:
+#       defining USE FLAGS (custom ones in 
+#	/etc/portage/package.use for example).
 #
-#  huro        Alternate Hungarian and Romania grabber
-#  uk_rt:      Alternate Britain listings grabber
-#  uk_bleb:    Fast alternative grabber for the UK
-#  it:         Italy listings grabber
-#  il:         Israel listings grabber
-#  na_dd:      Alternate American listings grabber
-#  na_icons:   Downloads icons from Zap2IT (needs na_dd to work)
-#  fi:         Finland listings grabber
-#  es:         Spain listings grabber
-#  nl:         Netherlands listings grabber
-#  nl_wolf:    Alternate Netherlands listings grabber
-#  dk:         Denmark listings grabber
-#  jp:         Japan listings grabber
-#  de_tvtoday: Germany listings grabber
-#  se_swedb:   New grabber for Sweden
-#  fr:         France listings grabber
-#  br:         Brazil listings grabber
-#  brnet:      Brazil NET Cable listings grabber
-#  ch:         Switzerland listings grabber
-#  be:         Belgium and Luxemburg listings grabber
-#  is:         Iceland listings grabber
-#  no:         Norway listings grabber
-#  pt:         Portugal listings grabber
-#  za:         South Africa listings grabber
-#  ee:         Estonia listings grabber
-#  re:         Reunion Island listings grabber
+#	Do "equery u media-tv/xmltv" for the complete
+#	list of the flags you can set, with description.
 
 # EXAMPLES:
 # enable just North American grabber
-#   XMLTV_OPTS="tv_grab_na"
+#  in /etc/portage/package.use : media-tv/xmltv na_dd
 #
 # enable graphical front-end, Italy grabber
-#   XMLTV_OPTS="tv_check tv_grab_it"
-
-#for X in ${LANGS} ; do
-#        SRC_URI="${SRC_URI} linguas_${X/-/_}? ( mirror://gentoo/firefox-${X}-${PV}.xpi )"
-#done
-
+#  in /etc/portage/package.use : media-tv/xmltv tv_check it
 
 IUSE="br brnet ch uk_rt uk_bleb uk_be is it na_dd na_icons fi es ee il re nl nl_wolf huro dk jp de_tvtoday se_swedb fr no pt za tv_pick_cgi tv_check"
 
@@ -172,15 +144,16 @@ src_unpack() {
 
 src_compile() {
 	sed -i "s:\$VERSION = '${PV}':\$VERSION = '${PVR}':" Makefile.PL || die
-	make_config | perl Makefile.PL PREFIX=/usr
+	make_config | perl-module_src_compile
 }
 
 src_install() {
-	make
 	# actually make test should be unneede, but if non na grabbers
 	# start to not install remove comment below
 	# make test
-	make DESTDIR=${D} install
+	#make
+	#make DESTDIR=${D} install
+	perl-module_src_install
 
 	for i in `grep -rl "${D}" "${D}"` ; do
 		sed -e "s:${D}::g" -i "${i}"