From 5eb5685533370e49f221404023de5dc9add2990e Mon Sep 17 00:00:00 2001 From: Joerg Bornkessel Date: Mon, 17 Jan 2011 22:02:23 +0000 Subject: cleanup, minor ebuild fixes, stable x86 amd64 Package-Manager: portage-2.1.9.24/cvs/Linux i686 --- media-plugins/vdr-rotor/ChangeLog | 9 ++- media-plugins/vdr-rotor/Manifest | 15 ++-- .../files/vdr-rotor-0.1.4_vdr-1.5.10.diff | 86 ---------------------- media-plugins/vdr-rotor/vdr-rotor-0.1.4-r1.ebuild | 38 ---------- media-plugins/vdr-rotor/vdr-rotor-0.1.4.ebuild | 34 --------- media-plugins/vdr-rotor/vdr-rotor-0.1.5.ebuild | 12 +-- 6 files changed, 18 insertions(+), 176 deletions(-) delete mode 100644 media-plugins/vdr-rotor/files/vdr-rotor-0.1.4_vdr-1.5.10.diff delete mode 100644 media-plugins/vdr-rotor/vdr-rotor-0.1.4-r1.ebuild delete mode 100644 media-plugins/vdr-rotor/vdr-rotor-0.1.4.ebuild (limited to 'media-plugins/vdr-rotor') diff --git a/media-plugins/vdr-rotor/ChangeLog b/media-plugins/vdr-rotor/ChangeLog index 9ea6802be8f7..d11fc023b356 100644 --- a/media-plugins/vdr-rotor/ChangeLog +++ b/media-plugins/vdr-rotor/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/vdr-rotor -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rotor/ChangeLog,v 1.9 2010/12/01 14:54:17 hd_brummy Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rotor/ChangeLog,v 1.10 2011/01/17 22:02:23 hd_brummy Exp $ + + 17 Jan 2011; Joerg Bornkessel + -vdr-rotor-0.1.4.ebuild, -vdr-rotor-0.1.4-r1.ebuild, + -files/vdr-rotor-0.1.4_vdr-1.5.10.diff, vdr-rotor-0.1.5.ebuild: + cleanup, minor ebuild fixes, stable x86 amd64 01 Dec 2010; Joerg Bornkessel vdr-rotor-0.1.4.ebuild, vdr-rotor-0.1.5.ebuild, diff --git a/media-plugins/vdr-rotor/Manifest b/media-plugins/vdr-rotor/Manifest index 298fac3d1234..7fb91911f5ad 100644 --- a/media-plugins/vdr-rotor/Manifest +++ b/media-plugins/vdr-rotor/Manifest @@ -1,21 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX vdr-rotor-0.1.4_vdr-1.5.10.diff 4142 RMD160 f1fb29721fca68b1094d50ab59883df9902061c9 SHA1 79c827c0ccfe8254a2551528f6003ceb756c2e17 SHA256 5540695a98dc72b8e19f6a40bffed9e35660a5ce71aaf2f791489c07867f5255 AUX vdr-rotor-0.1.5_vdr-1.7.13.diff 1611 RMD160 b21d1f4752dc25a06f68ddb567abf24ef658a235 SHA1 b243a5589c73470446fb24e55f41c148b49b7194 SHA256 1607325c2c8a1f6c77f16dc861c7dd9897085aaf768b5aaac5d2b8ff0d8ac8e7 -DIST vdr-rotor-0.1.4-vdr1.5.7.tgz 39572 RMD160 8e541ea64bb0d1cd7e72ca42795bd1665ef30e95 SHA1 df6ca6d6ee5dc832cb919b157e997e74aac3fcd7 SHA256 aad69f61af21e9438ed9d7e65efdb7c60b2f1f4291c0583767b6e8e30d6669a2 -DIST vdr-rotor-0.1.4.tgz 34968 RMD160 7811c14da307383254c9e32639cf3b258372aede SHA1 b82ff493e39b0c4be4ab204df007f0130b9a648f SHA256 eadb0c241c310fca4af3e23cb1476d19744156b011bce4cc94a69f25706247fa DIST vdr-rotor-0.1.5.tgz 40027 RMD160 89806b83fe0d37e661401425890524b49fc7e49e SHA1 8da30583b3d5ff06422c7d3a522325af5de9ab68 SHA256 fa13b710a1d547d9df841b881c40c9fb301aaf969fca9e71f50360a9edfabab6 -EBUILD vdr-rotor-0.1.4-r1.ebuild 973 RMD160 f1775ebd87b04ded6ea6d861e9c0196076c3664b SHA1 59d2b7d1b7727cff3e4a6f34c9f56c26662a716c SHA256 f915bae8941ccc921d899daa6544655bf34edfe10322393e2e0a3e65c70077f2 -EBUILD vdr-rotor-0.1.4.ebuild 825 RMD160 aa1773fd83fecabb4a223a90dc6fddba83752dee SHA1 0ab4dff7d5ecca9c094ed30ecbc9be077a97af6f SHA256 239adaf26d21422ce213ddf5210d79cd0be92b9be9449cfba7e1103afac0c273 -EBUILD vdr-rotor-0.1.5.ebuild 923 RMD160 2c6fa616149bee33c547fbd2b21fa35f6602fca0 SHA1 7ad9f4ec2c9945b134c5c88df8032df8997d2db5 SHA256 5296e0568b43361f56551a72a17723e0dda2ec7ccc8a2cfa3efe5b40485eeff9 -MISC ChangeLog 1548 RMD160 9aa86a93c8c68de3c5ee26e0033710e76d8166eb SHA1 177b9b103d722ea09d866da6ba87adb3e12a1690 SHA256 8c6d3e5fedc8947f9e6aa8d174456c123595df109bf29075c2643278cca76419 +EBUILD vdr-rotor-0.1.5.ebuild 940 RMD160 c541a5dfadb8d5e5c04a791bce28a769f03c7ab7 SHA1 9d1f6bc5c4c676e2ebff9f8282103b8b32cfedcc SHA256 bb6cbaa15bd0c691c3e7fdb6f5e7c7b863cc3a6bd35492857a0e2596fbb3e2f6 +MISC ChangeLog 1774 RMD160 8b84487af9d1996728bee026fed8552cf17a39c4 SHA1 a65859c085b079ebeb447b755d6fc793d52ad84b SHA256 ba0182fc5deb5101e51d2a72c0ec962a0d10dcf11b5f48ac635ece820d757cc7 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) Comment: added by hd_brummy@gentoo.org -iD8DBQFM9mGwdn07HTTCgIoRAnMoAJ478RqPzkqWvnoi8jYS/0vKE/lI0gCfezha -1TS8hbY1g9fySeFmsqq6SLo= -=plJ0 +iD8DBQFNNLyEdn07HTTCgIoRAj+IAJ4zainjFv73YKrGCoY1K2uqsg+X1gCgmrba +FvIkRWcXd44p+MCHjId2Fgs= +=DuZc -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-rotor/files/vdr-rotor-0.1.4_vdr-1.5.10.diff b/media-plugins/vdr-rotor/files/vdr-rotor-0.1.4_vdr-1.5.10.diff deleted file mode 100644 index dbb996af7acf..000000000000 --- a/media-plugins/vdr-rotor/files/vdr-rotor-0.1.4_vdr-1.5.10.diff +++ /dev/null @@ -1,86 +0,0 @@ -diff -ur rotor-0.1.4/filter.c rotor-0.1.4_vdr-1.5.10/filter.c ---- rotor-0.1.4/filter.c 2007-10-14 11:37:13.000000000 +0200 -+++ rotor-0.1.4_vdr-1.5.10/filter.c 2007-10-15 22:56:43.000000000 +0200 -@@ -368,12 +368,15 @@ - int Ppid = pmt.getPCRPid(); - int Apids[MAXAPIDS + 1] = { 0 }; - int Dpids[MAXDPIDS + 1] = { 0 }; -+ int Spids[MAXDPIDS + 1] = { 0 }; - #if VDRVERSNUM >= 10332 - char ALangs[MAXAPIDS + 1][MAXLANGCODE2] = { "" }; - char DLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" }; -+ char SLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" }; - #else - char ALangs[MAXAPIDS + 1][4] = { "" }; - char DLangs[MAXDPIDS + 1][4] = { "" }; -+ char SLangs[MAXDPIDS + 1][4] = { "" }; - #endif - int Tpid = 0; - int NumApids = 0; -@@ -448,7 +451,7 @@ - delete d; - } - } -- Menu->SetPids(pmt.getServiceId(),Vpid, Vpid ? Ppid : 0, Apids, ALangs, Dpids, DLangs, Tpid); -+ Menu->SetPids(pmt.getServiceId(),Vpid, Vpid ? Ppid : 0, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid); - Menu->SetCaIds(pmt.getServiceId(),CaDescriptors->CaIds()); - Menu->SetCaDescriptors(pmt.getServiceId(),CaDescriptorHandler.AddCaDescriptors(CaDescriptors)); - } -diff -ur rotor-0.1.4/menu.c rotor-0.1.4_vdr-1.5.10/menu.c ---- rotor-0.1.4/menu.c 2007-10-14 11:37:12.000000000 +0200 -+++ rotor-0.1.4_vdr-1.5.10/menu.c 2007-10-15 22:55:27.000000000 +0200 -@@ -406,12 +406,15 @@ - channel->SetId(Channel[Num].Nid(),Channel[Num].Tid(),Channel[Num].Sid(),channel->Rid()); - int Apids[MAXAPIDS + 1] = { 0 }; - int Dpids[MAXDPIDS + 1] = { 0 }; -+ int Spids[MAXDPIDS + 1] = { 0 }; - #if VDRVERSNUM>=10332 - char ALangs[MAXAPIDS + 1][MAXLANGCODE2] = { "" }; - char DLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" }; -+ char SLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" }; - #else - char ALangs[MAXAPIDS + 1][4] = { "" }; - char DLangs[MAXDPIDS + 1][4] = { "" }; -+ char SLangs[MAXDPIDS + 1][4] = { "" }; - #endif - int CaIds[MAXCAIDS+1] = { 0 }; - for (int i=0; i<=MAXAPIDS; i++) -@@ -426,7 +429,7 @@ - } - for (int i=0; i<=MAXCAIDS; i++) - CaIds[i]=Channel[Num].Ca(i); -- channel->SetPids(Channel[Num].Vpid(),Channel[Num].Ppid(),Apids,ALangs,Dpids,DLangs,Channel[Num].Tpid()); -+ channel->SetPids(Channel[Num].Vpid(),Channel[Num].Ppid(),Apids,ALangs,Dpids,DLangs,Spids,SLangs,Channel[Num].Tpid()); - channel->SetCaIds(CaIds); - } - else -@@ -456,7 +459,7 @@ - } - - #if VDRVERSNUM>=10332 --void cMenuScan::SetPids(int Sid,int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int Tpid) -+void cMenuScan::SetPids(int Sid,int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid) - #else - void cMenuScan::SetPids(int Sid,int Vpid, int Ppid, int *Apids, char ALangs[][4], int *Dpids, char DLangs[][4], int Tpid) - #endif -@@ -464,7 +467,7 @@ - for (int i=0; i=media-video/vdr-1.5.10" ; then - epatch "${FILESDIR}/${P}_vdr-1.5.10.diff" - fi - - sed -i "${S}"/filter.c \ - -e "s:libsi/:vdr/libsi/:" -} diff --git a/media-plugins/vdr-rotor/vdr-rotor-0.1.4.ebuild b/media-plugins/vdr-rotor/vdr-rotor-0.1.4.ebuild deleted file mode 100644 index 570a3422b47a..000000000000 --- a/media-plugins/vdr-rotor/vdr-rotor-0.1.4.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rotor/vdr-rotor-0.1.4.ebuild,v 1.6 2010/12/01 14:54:17 hd_brummy Exp $ - -inherit vdr-plugin - -IUSE="" -SLOT="0" - -DESCRIPTION="VDR Plugin: Add support for dishes with rotation control engine" -HOMEPAGE="http://home.vrweb.de/~bergwinkl.thomas/" -SRC_URI="mirror://gentoo/${P}.tgz" -LICENSE="GPL-2" - -KEYWORDS="~x86" - -DEPEND=">=media-video/vdr-1.3.44" - -pkg_setup() { - vdr-plugin_pkg_setup - - elog "Checking for patched vdr" - if ! grep -q SendDiseqcCmd /usr/include/vdr/device.h; then - ewarn "You need to emerge vdr with use-flag rotor set!" - die "Unpatched vdr detected!" - fi -} - -src_unpack() { - vdr-plugin_src_unpack - - sed -i "${S}"/filter.c \ - -e "s:libsi/:vdr/libsi/:" -} diff --git a/media-plugins/vdr-rotor/vdr-rotor-0.1.5.ebuild b/media-plugins/vdr-rotor/vdr-rotor-0.1.5.ebuild index fc89df00f043..ec983ca3ad44 100644 --- a/media-plugins/vdr-rotor/vdr-rotor-0.1.5.ebuild +++ b/media-plugins/vdr-rotor/vdr-rotor-0.1.5.ebuild @@ -1,22 +1,22 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rotor/vdr-rotor-0.1.5.ebuild,v 1.2 2010/12/01 14:54:17 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rotor/vdr-rotor-0.1.5.ebuild,v 1.3 2011/01/17 22:02:23 hd_brummy Exp $ EAPI="2" inherit vdr-plugin -IUSE="" -SLOT="0" - DESCRIPTION="VDR Plugin: Add support for dishes with rotation control engine" HOMEPAGE="http://home.vrweb.de/~bergwinkl.thomas/" SRC_URI="http://home.vrweb.de/~bergwinkl.thomas/downro/${P}.tgz" LICENSE="GPL-2" -KEYWORDS="~x86 ~amd64" +KEYWORDS="x86 amd64" +SLOT="0" +IUSE="" DEPEND=">=media-video/vdr-1.6.0[rotor]" +RDEPEND="${DEPEND}" pkg_setup() { vdr-plugin_pkg_setup -- cgit v1.2.3-65-gdbad