Fix bash script announcing itself as needing /bin/sh

Package-Manager: portage-2.1.6.6/cvs/Linux 2.6.27-gentoo-r1 i686

3 files changed, 96 insertions, 6 deletions

diff --git a/media-plugins/vdr-weatherng/ChangeLog b/media-plugins/vdr-weatherng/ChangeLog
index 5c0c4eba5f44..8a32306447f3 100644
--- a/media-plugins/vdr-weatherng/ChangeLog
+++ b/media-plugins/vdr-weatherng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-weatherng
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/ChangeLog,v 1.23 2008/08/01 19:59:04 cardoe Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/ChangeLog,v 1.24 2009/01/20 15:39:35 zzam Exp $
+
+*vdr-weatherng-0.0.8_pre3-r1 (20 Jan 2009)
+
+  20 Jan 2009; Matthias Schwarzott <zzam@gentoo.org>
+  +vdr-weatherng-0.0.8_pre3-r1.ebuild:
+  Fix bash script announcing itself as needing /bin/sh
 
   01 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/media-plugins/vdr-weatherng/Manifest b/media-plugins/vdr-weatherng/Manifest
index af36fa66fa8f..12a02e0acf28 100644
--- a/media-plugins/vdr-weatherng/Manifest
+++ b/media-plugins/vdr-weatherng/Manifest
@@ -9,13 +9,14 @@ AUX vdr-weatherng-0.0.8_pre3-gentoo.diff 3300 RMD160 d2019261e5d39c879a6b2c9ea1e
 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 2136 RMD160 06d18e4989fb74f87606ffd8570b179537d50efd SHA1 c4e72bc20cc463b1b1dee51cd28ed37ec2925e94 SHA256 bbd7ae489eae91cc46ef22ad9b351db0845a1bc4060980b5840e0ba5d0f32564
 EBUILD vdr-weatherng-0.0.8_pre3.ebuild 2006 RMD160 9b43d712915511ddbcb46a5e227abf12456b5e71 SHA1 273fbd56faf256e9c90da62e148a76c8f9491adc SHA256 40302afe3bbd5c19152995d801ecae83d0f03bb3f6c4eb8662059f01d401fb96
-MISC ChangeLog 4131 RMD160 a69da3d35e6a23ab73b194aa2af9c9b41eddde39 SHA1 1877cce32e4bbaa924e59adae37ee9179d820d14 SHA256 19d3fd35c47b6902ce7d75913a93eb032fabdfd1ea182a11294270cf0864d91c
+MISC ChangeLog 4321 RMD160 e44e2e198e758967d2b40ec39ec786bca0d3b9eb SHA1 7af7219ecad1e9c8e2b1bdfeeeb03586324bf055 SHA256 2b630b98075e94716ed8b7e9ee8dff9e15a2bcb1b55d89cf37596bfb88713d3d
 MISC metadata.xml 470 RMD160 820df9c1e340c84feac26e0ba184b3344aceb7dd SHA1 a58f863766d430ea5e94e19187678e4d9d492ceb SHA256 0b6b4736226a44e9d1d59a77e0c5abd5ff3ad7076b8211d68883efb119656967
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiTaw0ACgkQoeSe8B0zEfx4ZACfR88Y1pIuhGNKv/QBsFlHQWsv
-V+0An2dY+hfYzIVVxH8KEN9FzKX2Qt0U
-=UDwl
+iEYEARECAAYFAkl18D0ACgkQt2vP6XvVdOfi/wCfTCijdnbN6Z4aPWNUtSoA6eeG
+tqkAoJ1GkSU5SJYmDQZUPdKJ5v8+dyHN
+=t1U5
 -----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
new file mode 100644
index 000000000000..0368fd5d4af8
--- /dev/null
+++ b/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3-r1.ebuild
@@ -0,0 +1,83 @@
+# 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-r1.ebuild,v 1.1 2009/01/20 15:39:35 zzam Exp $
+
+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="~amd64 ~x86"
+IUSE="dxr3"
+
+DEPEND="media-libs/imlib2
+	>=media-video/vdr-1.3.34"
+
+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")
+
+pkg_setup() {
+	vdr-plugin_pkg_setup
+
+	if ! built_with_use media-libs/imlib2 jpeg gif ; then
+		echo
+		eerror "Please recompile media-libs/imlib2 with"
+		eerror "USE=\"jpeg gif\""
+		die "media-libs/imlib2 need jpeg and gif support"
+	fi
+}
+
+src_unpack() {
+	vdr-plugin_src_unpack
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-gentoo.diff"
+	epatch "${FILESDIR}/${P}-timeout.diff"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+
+	use dxr3 && epatch "${FILESDIR}/${P}-dxr3.diff"
+
+	# /bin/sh is not necessaryly bash, so explicitly use /bin/bash
+	sed -e 's#/bin/sh#/bin/bash#' -i examples/weatherng.sh
+}
+
+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
+}