cleanup; fixed wrt bug 414183

Package-Manager: portage-2.2.1/cvs/Linux i686
Manifest-Sign-Key: 0x34C2808A

4 files changed, 31 insertions, 99 deletions

diff --git a/media-plugins/vdr-weatherng/ChangeLog b/media-plugins/vdr-weatherng/ChangeLog
index 6cdce40113f9..908970e9d614 100644
--- a/media-plugins/vdr-weatherng/ChangeLog
+++ b/media-plugins/vdr-weatherng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-weatherng
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/ChangeLog,v 1.25 2009/10/30 19:50:06 hd_brummy Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/ChangeLog,v 1.26 2014/01/08 19:18:09 hd_brummy Exp $
+
+  08 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-weatherng-0.0.8_pre3.ebuild, vdr-weatherng-0.0.8_pre3-r1.ebuild:
+  cleanup; fixed wrt bug 414183
 
   30 Oct 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-weatherng-0.0.8_pre3.ebuild, vdr-weatherng-0.0.8_pre3-r1.ebuild:
diff --git a/media-plugins/vdr-weatherng/Manifest b/media-plugins/vdr-weatherng/Manifest
index d0efc72e2cf5..99518a8a14a1 100644
--- a/media-plugins/vdr-weatherng/Manifest
+++ b/media-plugins/vdr-weatherng/Manifest
@@ -1,23 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX confd-0.0.8 1704 RMD160 f34f8fd44021f762746bf2dc3a945e752553a38e SHA1 9e4838e19cc85e54fde4851c10a68a12edb24a89 SHA256 89ed602dd600188e01e1858cfa2c3c1fc0c99c6e07e21ee7dab7b8fc50e34821
-AUX rc-addon-0.0.8.sh 594 RMD160 75274355f27fc7ed42b0fcf5def1dfd1bb3d1232 SHA1 827d08bb351febfe040c5a883b4975caf28c1b1a SHA256 04c528e97b82b145a82c4f5351aa3dfecddee47a212cc480163baa55d252da8d
-AUX vdr-weatherng-0.0.8_pre3-dxr3.diff 526 RMD160 6a61ea5da3f0183f2360fe20b637bc91571ee916 SHA1 911e0c6acf191a3eccd9c56230f9aac41d0f4a7c SHA256 10e5820e34058157be8b9702f6a5d01aa86051694a9f6a1f8a678bce22f41c49
-AUX vdr-weatherng-0.0.8_pre3-gcc43.patch 438 RMD160 278111fa77dee3f26dd1186dcc7355a829bf21ca SHA1 fff911795af59d92fbf3b3369e8e4d12f93dd55b SHA256 ca9ef5d723df1145a56bb98a2d82aef7a5d02fdab9eea07376a48a5582bd5077
-AUX vdr-weatherng-0.0.8_pre3-gentoo.diff 3300 RMD160 d2019261e5d39c879a6b2c9ea1edce38ff248eb4 SHA1 9c3480268ecadb0d80c53f0f72e8322256f2f2d9 SHA256 0a5e8dae398fc6685bec2e6734feb19549e570999eaf0459d06d607f972bed46
-AUX vdr-weatherng-0.0.8_pre3-i18n-fix.diff 726 RMD160 642cd03deeebbbbcdb61a5fe3dcf25f39606cfaa SHA1 042b35fecd71e203dd1d7b3bff63b3746efb58fd SHA256 6ec4720c79c2105f088f745c4b1b8513fd37a6bb26203a48db7dd5afb58a9ac5
-AUX vdr-weatherng-0.0.8_pre3-timeout.diff 1160 RMD160 111b401d975f42ef0998e41e89ce669b5cf38e4f SHA1 b57051a40a1ef514ca40702b3a3df3b8d72b5d21 SHA256 5060f4085b875215945674ab03457e3d241e13086489e7ea1bea4de1045a0639
-DIST vdr-weatherng-0.0.8-pre3.tgz 177242 RMD160 b33c6d98c6bc8eca5c41dca6995e3f70285d70dc SHA1 6221d185c3ba43ffe1396ae0db98cf21e36879a6 SHA256 e9edd9ae745ce45274a436f29a0f3a408cd4d218dc9d16e19e4a25e39be2bd0b
-EBUILD vdr-weatherng-0.0.8_pre3-r1.ebuild 1947 RMD160 ee5bcb956d7c0d43b4482498bc838f402afec981 SHA1 d3096c15b8ab8f945fc4953f7a48c54fbd01bc4c SHA256 3deb272c5b508909a4a95a7e045bc03845512c2a464b5088ab60102bae34c341
-EBUILD vdr-weatherng-0.0.8_pre3.ebuild 1812 RMD160 6cde710bc2dbd08f76a1f9ff576fda3d3d690846 SHA1 a938d038f1c3a67ac0e47a45a544324caf1f1fc2 SHA256 eece6336866537144a6ba1d60ae07afcd85d958a4e4438161fd91373817deaae
-MISC ChangeLog 4471 RMD160 eac8a5d94c579660e2b0383503a817d7c847c5b6 SHA1 375ad36dc5ca602d0f59c9120208ce9aa5c396e1 SHA256 4095fcae8128515956f8e659a007af79dc4c5c32d4ae2f695e646d5e7977e03c
-MISC metadata.xml 470 RMD160 820df9c1e340c84feac26e0ba184b3344aceb7dd SHA1 a58f863766d430ea5e94e19187678e4d9d492ceb SHA256 0b6b4736226a44e9d1d59a77e0c5abd5ff3ad7076b8211d68883efb119656967
+AUX confd-0.0.8 1704 SHA256 89ed602dd600188e01e1858cfa2c3c1fc0c99c6e07e21ee7dab7b8fc50e34821 SHA512 d05fd2db14299ae1f7e435e9de975bd829760ec105a734c15a68442243baf8f450fa7d5af3e03f88546508be8c17448e31e7d4aa6ea21252653ccf9b25965fc4 WHIRLPOOL f2a26b5ebfa23870be072347078c242740c4cd619e5733c1ea13942337767734293911ffc05b314e58a6daa47c54de75f4df2055b87ba7c48418ce1ec533d30e
+AUX rc-addon-0.0.8.sh 594 SHA256 04c528e97b82b145a82c4f5351aa3dfecddee47a212cc480163baa55d252da8d SHA512 dc71ebdc6ff6e36a3cb15b507451a4a1edbf103a3c29c50cd31763388d24f9574da94d3cc5444f0c08a9113d2a9575003b02326d32a6dd86a044fbcd7b89663a WHIRLPOOL 19fca931ddf8848944a44e75f55a9039b7905451483f5acb981c1dda054f71bbaa0132588dc2594d48ba8b6fa5c6e953f48e2ed7228f08a506349be32d4afedc
+AUX vdr-weatherng-0.0.8_pre3-dxr3.diff 526 SHA256 10e5820e34058157be8b9702f6a5d01aa86051694a9f6a1f8a678bce22f41c49 SHA512 df6e1e649753049d94c4b61b98201f62a71f589157384f3eddf5188ecb8a5aedb825f29a4ee2badf3a39e1bedbf7a8eab19a3221f11d404d6492470e39b7a9bf WHIRLPOOL 3361353c4d9fbef079f19e5ee4e20fa9291a44ebc6ba8f2a2b445a4b7b7db764bbceb9c5e4d7a43d41ec4c17034fb3b7aa7dfe3257b068eec7fe3f9dbb0bb5d7
+AUX vdr-weatherng-0.0.8_pre3-gcc43.patch 438 SHA256 ca9ef5d723df1145a56bb98a2d82aef7a5d02fdab9eea07376a48a5582bd5077 SHA512 b28b8784e0bf144a337cf6fa7576eddcd7c867d8207c2dab0079fc25f43ee4d5592b8f82b667d94bfd985f7e53f8a3fd511bde383139ab1ef0c391e7aaf9b178 WHIRLPOOL 93a1dad69cba2dc6b4e8c473915ba15633fc31140bf0c2588189bd786f226a68824725192113e07cd67bc68f22d53a95fd3b34b2631c848a68188d3b3d761bf0
+AUX vdr-weatherng-0.0.8_pre3-gentoo.diff 3300 SHA256 0a5e8dae398fc6685bec2e6734feb19549e570999eaf0459d06d607f972bed46 SHA512 6f061aca114325ddcb3efcaf562381181a28ad169a16d23755b9243765e205ca8d39c990f21ccc0030d439c79d48da74722bf1988a79444ba5ad8697605de0a0 WHIRLPOOL 899cc6cb8c948a9b29fbb1bc75254ec50337d5558226fae31c5295e56be56ab6c8059aa4960509f87e92e612e6a6d9fa884fff9e3ddb3d5a6609f5ac2756fb3a
+AUX vdr-weatherng-0.0.8_pre3-i18n-fix.diff 726 SHA256 6ec4720c79c2105f088f745c4b1b8513fd37a6bb26203a48db7dd5afb58a9ac5 SHA512 7d7cf0576a5562cbc3e46ec0539ad1a4a09b87d9518065de7535c4d0561db8d4f072eb55c6d935e3db28060d6e64c30ba44c466ac191fc9da2494badb5331355 WHIRLPOOL 6de7293fef1f5c8c8a93d02bed1d0973109c925ab6f6d5db4fd96c5b45164cb6b44c9e1d6db2c9d9b8f70a5ed57080231e571cb1ab8085b2b602bbf5d9d2c70e
+AUX vdr-weatherng-0.0.8_pre3-timeout.diff 1160 SHA256 5060f4085b875215945674ab03457e3d241e13086489e7ea1bea4de1045a0639 SHA512 94448a0dd298de27092c15d25bc708f0ad17833812b47bd367069754545a52c7928080801eab2e91faa2fabdeb5c6edfbc9674874af509daae6f03badfb0afeb WHIRLPOOL f6ce39056d0189530d4ad69aa07c740b6390006e34490846fb8dc59083123bb639b07f519b691d6471391e29b5c2bfeda012afc96db1f99faf5fee15bee2e628
+DIST vdr-weatherng-0.0.8-pre3.tgz 177242 SHA256 e9edd9ae745ce45274a436f29a0f3a408cd4d218dc9d16e19e4a25e39be2bd0b SHA512 065ee8ac99ce706fe16d3a6e45ac302d6f75c2cddacf8ba0c591a2ca7720278a219735a7a14e486e5b44c113d064d9c8d348322a129fab99d373cfcef0a14172 WHIRLPOOL b80276d4e75317bfe71b2d764f27cbf46e71a8eda37246d33ea9f98773c5e9d58bb3ddcc88751945ba1af6896984353496b21aa42ec07574109907e2e111cb79
+EBUILD vdr-weatherng-0.0.8_pre3-r1.ebuild 1993 SHA256 ef666bea90c49007030cef5f0b8451074b864a4dad6fa5cf69f94c746d728c43 SHA512 fe8b89f704f47ba9eb70ff8a32a9ff0ae453f2010594e4db2c257729324c7c27f4578572ad1d58b21056cd148fd7b50c895931b120f14f8f3a2cf7393ea4982c WHIRLPOOL 5459ef2e203c2b58c0a083bc2ead77a49ceae6f1d54b79c522b891a3f4602389a29c40c6749ca4d55020e76d6f0a491ba222c96c6afe9fa1068885200dc69a18
+MISC ChangeLog 4631 SHA256 51964756936cd5c63f784562c0a4fdf8b4cc9ddcfe7f1ce7fe26474bacffeb51 SHA512 2d57a3ce5037d499738c01abfe756c23e9144212487d39fec35dec0bed727593b79c8aca50309c67a80cf9d271b2ab5f5a223113e1949e136bb17e80068c0485 WHIRLPOOL 2aa200b8ddaa68bb8e0821a37f4ad6ce1ffc28c45784675e35de7e5ec5e946a45438fe06fd509ac5cac6a24b00afe636564d550c3885fd6bd31c7ccc478fbf4a
+MISC metadata.xml 470 SHA256 0b6b4736226a44e9d1d59a77e0c5abd5ff3ad7076b8211d68883efb119656967 SHA512 927ebb20b0e19273aeaf42ff5f1f59120c385a32bd18b8c0915c716a671f0b6bfa5b791b31bc020c2c7464dd007647d227eb4c12177300f83096b87f33d185fe WHIRLPOOL cc1c8e7d4ed77e33b47b42155b2e40fecae1fee83568dd74eb78de97365ee954aa7e82e4f268f06735d839dfd6e84360ac396ea58c630d127dd20d31eb353c9a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFK60Nsdn07HTTCgIoRAiIVAJ4ulX5SGmQR46ccFpVUsMzM+SAKeACdERL9
-QzqkIqrl6bsFRsqIBo2/TSo=
-=bKGB
+iD8DBQFSzaSRdn07HTTCgIoRCAfoAJkBdobEB4gFmY97iQ/w/+fzqFty2ACfY7nr
+S7oFoQlaI/9kMj0PTL2UGKo=
+=O0ts
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3-r1.ebuild b/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3-r1.ebuild
index d63391fc8bf4..1c4beb217617 100644
--- a/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3-r1.ebuild
+++ b/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3-r1.ebuild,v 1.2 2009/10/30 19:50:06 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3-r1.ebuild,v 1.3 2014/01/08 19:18:09 hd_brummy Exp $
 
-EAPI="2"
+EAPI=5
 
-inherit vdr-plugin eutils
+inherit vdr-plugin-2
 
 MY_PV="${PV/_/-}"
 MY_P="${PN}-${MY_PV}"
@@ -30,8 +30,7 @@ VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.0.8.sh"
 PATCHES=("${FILESDIR}/${P}-i18n-fix.diff")
 
 src_prepare() {
-	vdr-plugin_src_prepare
-#	cd "${S}"
+	vdr-plugin-2_src_prepare
 
 	epatch "${FILESDIR}/${P}-gentoo.diff"
 	epatch "${FILESDIR}/${P}-timeout.diff"
@@ -41,10 +40,12 @@ src_prepare() {
 
 	# /bin/sh is not necessaryly bash, so explicitly use /bin/bash
 	sed -e 's#/bin/sh#/bin/bash#' -i examples/weatherng.sh
+
+	sed -i weatherng.c -e "s:RegisterI18n:n://RegisterI18n:"
 }
 
 src_install() {
-	vdr-plugin_src_install
+	vdr-plugin-2_src_install
 
 	insinto /usr/share/vdr/weatherng/images
 	doins "${S}"/images/*.png
@@ -58,7 +59,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	vdr-plugin_pkg_postinst
+	vdr-plugin-2_pkg_postinst
 
 	echo
 	elog "To display the weather for your location"
diff --git a/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3.ebuild b/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3.ebuild
deleted file mode 100644
index 4ac78c4626ee..000000000000
--- a/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3.ebuild,v 1.11 2009/10/30 19:50:06 hd_brummy Exp $
-
-EAPI="2"
-
-inherit vdr-plugin eutils
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="VDR plugin: show weather for specified place"
-HOMEPAGE="http://www.vdr.glaserei-franz.de/vdrplugins.htm"
-SRC_URI="mirror://vdrfiles/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2 stardock-images"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE="dxr3"
-
-DEPEND="media-libs/imlib2[jpeg,gif]
-	>=media-video/vdr-1.3.34"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/weatherng-${MY_PV}"
-
-VDR_CONFD_FILE="${FILESDIR}/confd-0.0.8"
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.0.8.sh"
-
-PATCHES=("${FILESDIR}/${P}-i18n-fix.diff")
-
-src_prepare() {
-	vdr-plugin_src_prepare
-
-	epatch "${FILESDIR}/${P}-gentoo.diff"
-	epatch "${FILESDIR}/${P}-timeout.diff"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-
-	use dxr3 && epatch "${FILESDIR}/${P}-dxr3.diff"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /usr/share/vdr/weatherng/images
-	doins "${S}"/images/*.png
-
-	diropts -m0755 -ovdr -gvdr
-	dodir /var/vdr/${VDRPLUGIN}
-
-	insinto  /var/vdr/${VDRPLUGIN}
-	insopts -m755 -ovdr -gvdr
-	doins "${S}"/examples/weatherng.sh
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	echo
-	elog "To display the weather for your location"
-	elog "you have to find out its ID on weather.com"
-	elog
-	elog "Go to http://uk.weather.com/search/drilldown/ and search for your city (i.e. Herne)"
-	elog "in the list of results click on the right one and then look at its URL"
-	elog
-	elog "It contains a code for your city"
-	elog "For Herne this is GMXX0056"
-	elog
-	elog "Now you have to enter this code in /etc/conf.d/vdr.weatherng WEATHERNG_STATIONID(x)"
-	echo
-}