[patch] Update the plugin ebuilds

0002-Update-vdr-channelscan-and-vdr-reelchannelscan-to-us.patch (text/plain), 12.09 KB, created by Michał Górny on 2010-08-06 07:31:22 UTC

From 67494c5ff1ed318ef5c05dd087af633dc595b9b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[e-mail]>
Date: Tue, 27 Jul 2010 19:01:37 +0200
Subject: [PATCH 2/2] Update vdr-channelscan and vdr-reelchannelscan to use vdr-transponder-lists.

---
 media-plugins/vdr-channelscan/Manifest             |   13 +-----
 ....1.0.ebuild => vdr-channelscan-0.1.0-r1.ebuild} |   12 +----
 media-plugins/vdr-reelchannelscan/Manifest         |   15 +------
 .../vdr-reelchannelscan-0.3.3.ebuild               |   42 ------------------
 .../vdr-reelchannelscan-0.4.3-r2.ebuild            |   46 --------------------
 ....ebuild => vdr-reelchannelscan-0.4.3-r4.ebuild} |    4 +-
 6 files changed, 8 insertions(+), 124 deletions(-)
 rename media-plugins/vdr-channelscan/{vdr-channelscan-0.1.0.ebuild => vdr-channelscan-0.1.0-r1.ebuild} (83%)
 delete mode 100644 media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.3.3.ebuild
 delete mode 100644 media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r2.ebuild
 rename media-plugins/vdr-reelchannelscan/{vdr-reelchannelscan-0.4.3-r3.ebuild => vdr-reelchannelscan-0.4.3-r4.ebuild} (94%)

diff --git a/media-plugins/vdr-channelscan/Manifest b/media-plugins/vdr-channelscan/Manifest
index 321cce8..7a4e40a 100644
--- a/media-plugins/vdr-channelscan/Manifest
+++ b/media-plugins/vdr-channelscan/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX vdr-channelscan-0.1.0-gcc4.diff 545 RMD160 9d6cb85b5c6014243ad043927c87237cf18845e4 SHA1 3a214bcd889e83d25d84045d1cfc298f49951030 SHA256 77eef7eb4de93952da460ec334a46eb9886c3fb0d7769bb853ec5fd37c04b95d
 AUX vdr-channelscan-0.1.0-shared-data.diff 3922 RMD160 e8889c7daf399bf60b1184d5a9cdb98c1d06182a SHA1 240667219b58098012ab3cbb25da7a78ae0a30b7 SHA256 0f2e4c6198d19d3c3191ae68c381a86cc362de418d74a66b91d60246e0ffa21e
 AUX vdr-channelscan-0.1.0-show-only-basename.diff 881 RMD160 6f1c7e4477fd324bf50b0c55b11d341b2f65e325 SHA1 a4600681503ecbb932fa4e7bcfe76853e560750d SHA256 7ec4e190a25f9f31b98dea8f06056d44698d7a8f8e519e0af02918159dd0a454
@@ -8,14 +5,6 @@ AUX vdr-channelscan-0.1.0-vdr-1.5.10.diff 1440 RMD160 5bbce45dfd0dda8847af066251
 AUX vdr-channelscan-0.1.0-vdr-1.7.x.diff 751 RMD160 4e6738d64384f50c1e780ea24ae964cc474c3206 SHA1 68b7a33404ae46ba3c9ee3ad82afff6fea4cbfdf SHA256 6e17c8de8fdb5f5ac5fde263fbfb880df8b50a506cd34384f2d1f4a94f085a6f
 AUX vdr-channelscan-0.1.0_gcc-4.3.x.diff 496 RMD160 b20132c8d4a3c713d71b8dafb23998250b04c3fa SHA1 ae443d48e008e4a964ba9a3cad9160c78646b815 SHA256 a532daee19f9e63c929059196e98709a373ab86548d002242f73004512306fa9
 DIST vdr-channelscan-0.1.0.tgz 48928 RMD160 d5dabd8aa7b82ace69be5e72ed9e914b0987b7fd SHA1 f6b5f34f671200cc3f4571166375cc5f26e3b5f7 SHA256 13b9398e2c9d449cf6f8a3c7c07416d0ecae7b2e6f5102978b341d3db5b1a0ab
-EBUILD vdr-channelscan-0.1.0.ebuild 1102 RMD160 77a1439deadcb6854a87f8f1984030da9d71b13d SHA1 f667a349d48b189f0645c023fa12fba3d11e759c SHA256 2ae370631a0a7730ce1d4a4d4e60f4444755e43d423400424ff7bcc3968d56a0
+EBUILD vdr-channelscan-0.1.0-r1.ebuild 1008 RMD160 23c57dfcc0cfce2f57ece8929a2989d42e440ba2 SHA1 7fecc7cf72dbb0cf63601e011b20af9188964831 SHA256 830b6a1f4df31c42bc2301ddaf3067ad190690cd110ca0636938c20c7d4911a2
 MISC ChangeLog 2207 RMD160 58f6c5336177ddfe3d1fdb9e3641d88e785f2497 SHA1 6ddf13323b497d992e59a90ab0efeaf9f2c9e1aa SHA256 9d2d57857e364dc2c4bda7ae16b0f83698a5ec4bd78c12594572f5a797fdfd1e
 MISC metadata.xml 309 RMD160 2564df04af9eead2fe189df8286f0d005570353a SHA1 71c4e367ebc6e1bce1311c0e6fbdf5f773f75256 SHA256 25af13f1c33d3a0935e1d3c71c5db29bc069f2692cd50e053a5215e70940a231
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by [e-mail]
-
-iD8DBQFJY72Sdn07HTTCgIoRAuQ7AJwJUWCKj07/WQ72jP76HuOIY8xqeQCdF+hI
-XA9Mp08ZDHFkGr7YoEEDFno=
-=TsFu
------END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild b/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0-r1.ebuild
similarity index 83%
rename from media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild
rename to media-plugins/vdr-channelscan/vdr-channelscan-0.1.0-r1.ebuild
index 3a5dc03..90b6907 100644
--- a/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild
+++ b/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild,v 1.5 2009/01/06 20:22:30 hd_brummy Exp $
 
@@ -14,7 +14,8 @@ KEYWORDS="~x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.3.18"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	media-tv/vdr-transponder-lists"
 
 # access transponder-data under /usr/share/vdr/channelscan-transponders
 PATCHES=("${FILESDIR}/${P}-shared-data.diff"
@@ -30,10 +31,3 @@ src_unpack() {
 	has_version ">=media-video/vdr-1.7.0" && \
 	epatch "${FILESDIR}/${P}-vdr-1.7.x.diff"
 }
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /usr/share/vdr/channelscan-transponders
-	doins "${S}"/transponders/*.ini
-}
diff --git a/media-plugins/vdr-reelchannelscan/Manifest b/media-plugins/vdr-reelchannelscan/Manifest
index cb3eda9..7f0df8e 100644
--- a/media-plugins/vdr-reelchannelscan/Manifest
+++ b/media-plugins/vdr-reelchannelscan/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.4.3/default-source-if-no-channel-set.diff 609 RMD160 3e3feeff2a6a78e92bbe15de1b826939703085e9 SHA1 eeb2c43231c4caad75e9ab753ed24a992259df03 SHA256 30f99ee90b01cb6d75b04ef31ff5ffb0dc3fc3c34a652e2d7b9562ce94f6ac39
 AUX 0.4.3/device-numbering.diff 5380 RMD160 96026bc6966b314137c4ea450fc4befef9e82817 SHA1 d2e2b28fe37d065092be63ea7392c99f4c702185 SHA256 4febae127f5afd481867173d4bb65bea2013ec92c864a258019e70164a7d2561
 AUX 0.4.3/gcc-4.3.diff 386 RMD160 27c201b9eb64400ce41b634606bb641fb7af2979 SHA1 f871d9bff568c866c8d9fa34223bad2f21c35200 SHA256 155349719cec4156606664e01355575dbefa1d41650961da19c0fa2a35062594
@@ -8,17 +5,7 @@ AUX 0.4.3/gentoo.diff 463 RMD160 afcd1cdf38af25dd4207e7cd6509430f7c1287a5 SHA1 7
 AUX 0.4.3/i18n.diff 1700 RMD160 54d18c64d7b5b971a6d55552ddfe5b65819bb6c7 SHA1 5589777d0571f380a43d2ac98223415c728ce43c SHA256 15cdc77f53efd550494305d8ea5796299ac86c462dbb4879e4f1117d1bb49249
 AUX 0.4.3/series 98 RMD160 ac3d69ee779f0ed84f1febb95779abc070c9273c SHA1 8efc825b291dd4b6abd1d62524f73903176374bd SHA256 73e1fb803f10f2e54297b4f20d4dea0a558919f2dec095e073d98970a255c6ef
 AUX 0.4.3/vdr-1.5.10.diff 3705 RMD160 d6911b0e72133dbca228c6b08a550580766ebf33 SHA1 0578e6f53a378ec6b6cde3d6ff9223bd79d3cd1e SHA256 9c7d4710ffad4735c5d60841ae005aa652571b46de97001f4c65d06b01782a68
-DIST vdr-reelchannelscan-0.3.3.tgz 69313 RMD160 bcdb3327d610f27045e4cb0fc8d8bb82c1030fec SHA1 db24e7e35c70129b6e1aedf3e87f36bc8a9f624f SHA256 8ed4e17d456b881da1646f1963c189723f84351753460c96e8c3b56b3deab305
 DIST vdr-reelchannelscan-0.4.3.tgz 84785 RMD160 a498de279c406527a44295d9e6331de69606c390 SHA1 adf6db4991577e67421c181f71dad1a7d57d2f3b SHA256 d8ac8dd1f3792ef3d5ddf8a62de528dea3d8980becf658c6cc0887a5f67fe2f9
-EBUILD vdr-reelchannelscan-0.3.3.ebuild 1031 RMD160 4fe0135f0c39883fa8b146179e4c81d299c373f9 SHA1 933b8aa36fe677deccba7c09458196c8ab73bd8d SHA256 ab5c8c436475e6335992fed2a1750db14913386e904d9067f2c93c443d1803eb
-EBUILD vdr-reelchannelscan-0.4.3-r2.ebuild 1207 RMD160 6708b5ac406e74d2602315cbc1ec6e369a31bbb0 SHA1 b42f452109f1efee4909e28628e642ce3559d718 SHA256 d8ab7dd1ecf0bf9cb7150f359130c289f9f1700ee11e4df62a99994eae059335
-EBUILD vdr-reelchannelscan-0.4.3-r3.ebuild 1292 RMD160 0d072ac8300426b2d05a0aaa3d0347728b1be4e7 SHA1 75b9f22782c2a21964b4c8225c7244d6bf4d87db SHA256 bc1e22a1fe97507253c96235cf09f413ebd3e6d2f08ec2cf9a5612fb896c54f3
+EBUILD vdr-reelchannelscan-0.4.3-r4.ebuild 1353 RMD160 629676cb8afc7013573c5183818f75ebf46e3323 SHA1 f2c0cecbcf33c13c12dc205182a8515e44abbe03 SHA256 2ab21864a9b459ab7a0d57d1df2ad38fdc9d97e78f509a28c98321a44d821ec3
 MISC ChangeLog 3709 RMD160 a6bc5bd9053a1278a0371f9e3a711e807e4ee31e SHA1 57a9f0ac4065bb614968f95c913dcb5b5e2db704 SHA256 56ca53dbcd03d913d8828f6545941eb0fd7e2235aefbb031be9c9a810e83b126
 MISC metadata.xml 309 RMD160 2564df04af9eead2fe189df8286f0d005570353a SHA1 71c4e367ebc6e1bce1311c0e6fbdf5f773f75256 SHA256 25af13f1c33d3a0935e1d3c71c5db29bc069f2692cd50e053a5215e70940a231
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkZdC4ACgkQt2vP6XvVdOeMyQCgkfyB80CufVbKzrakX6a7cLsM
-H/cAnjp1E0NhgI1PlLM8gAzYMIMq3B+4
-=Kygl
------END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.3.3.ebuild b/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.3.3.ebuild
deleted file mode 100644
index 6356a94..0000000
--- a/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.3.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.3.3.ebuild,v 1.3 2007/11/21 09:45:11 zzam Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="vdr Plugin: Channel Scanner"
-HOMEPAGE="http://www.reel-multimedia.com"
-SRC_URI="http://www.reelbox.org/software/source/vdr-plugins/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.18"
-
-pkg_setup(){
-	vdr-plugin_pkg_setup
-
-	if ! grep -q scanning_on_receiving_device /usr/include/vdr/device.h; then
-		ewarn "your vdr needs to be patched to use vdr-channelscan"
-		die "unpatched vdr detected"
-	fi
-}
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	fix_vdr_libsi_include filter.h
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	cd "${S}"/transponders
-	insinto /usr/share/vdr/channelscan/transponders
-	doins *.tpl
-
-	insinto /etc/vdr/plugins
-	dosym /usr/share/vdr/channelscan/transponders /etc/vdr/plugins/transponders
-}
diff --git a/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r2.ebuild b/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r2.ebuild
deleted file mode 100644
index b5dd070..0000000
--- a/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r2.ebuild,v 1.5 2007/11/21 09:45:11 zzam Exp $
-
-inherit vdr-plugin eutils
-
-DESCRIPTION="vdr Plugin: Channel Scanner"
-HOMEPAGE="http://www.reel-multimedia.com"
-SRC_URI="mirror://gentoo/${P}.tgz
-	http://dev.gentoo.org/~zzam/distfiles/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.18"
-
-pkg_setup(){
-	vdr-plugin_pkg_setup
-
-	if ! grep -q scanning_on_receiving_device /usr/include/vdr/device.h; then
-		ewarn "your vdr needs to be patched to use vdr-channelscan"
-		die "unpatched vdr detected"
-	fi
-}
-
-src_unpack() {
-	vdr-plugin_src_unpack unpack
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}/default-source-if-no-channel-set.diff"
-	epatch "${FILESDIR}/${PV}/device-numbering.diff"
-	epatch "${FILESDIR}/${PV}/i18n.diff"
-	epatch "${FILESDIR}/${PV}/gentoo.diff"
-
-	fix_vdr_libsi_include filter.[ch]
-	vdr-plugin_src_unpack all_but_unpack
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	cd "${S}"/transponders
-	insinto /usr/share/vdr/reelchannelscan/transponders
-	doins *.tpl
-}
diff --git a/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r3.ebuild b/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r4.ebuild
similarity index 94%
rename from media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r3.ebuild
rename to media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r4.ebuild
index ced9be2..56f0c4c 100644
--- a/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r3.ebuild
+++ b/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r4.ebuild
@@ -15,6 +15,8 @@ KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.3.18"
+RDEPEND="${DEPEND}
+	media-tv/vdr-transponder-lists"
 
 pkg_setup(){
 	vdr-plugin_pkg_setup
@@ -44,5 +46,5 @@ src_install() {
 
 	cd "${S}"/transponders
 	insinto /usr/share/vdr/reelchannelscan/transponders
-	doins *.tpl
+	doins Sat.tpl || die
 }
-- 
1.7.2