fixed patch failure, bug 423451; vdr-plugin-2.eclass

Package-Manager: portage-2.1.10.11/cvs/Linux i686

5 files changed, 23 insertions, 44 deletions

diff --git a/media-plugins/vdr-cinebars/ChangeLog b/media-plugins/vdr-cinebars/ChangeLog
index 40591b06deee..123a28928b4c 100644
--- a/media-plugins/vdr-cinebars/ChangeLog
+++ b/media-plugins/vdr-cinebars/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-cinebars
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cinebars/ChangeLog,v 1.6 2012/02/07 22:09:17 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cinebars/ChangeLog,v 1.7 2012/06/30 16:36:51 hd_brummy Exp $
+
+  30 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-cinebars-0.0.3a.ebuild, vdr-cinebars-0.0.5.ebuild,
+  files/vdr-cinebars-0.0.5_makefile.diff:
+  fixed patch failure, bug 423451; vdr-plugin-2.eclass
 
   07 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-cinebars-0.0.5.ebuild, +files/vdr-cinebars-0.0.5_makefile.diff:
diff --git a/media-plugins/vdr-cinebars/Manifest b/media-plugins/vdr-cinebars/Manifest
index 27e372054089..4adaf8575b2d 100644
--- a/media-plugins/vdr-cinebars/Manifest
+++ b/media-plugins/vdr-cinebars/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX vdr-cinebars-0.0.5_makefile.diff 667 RMD160 2d5968e5c2e2a1263e6ed42f70743d502986f688 SHA1 23f3f14789fd5ca4dce44cb766d129b3dc8c11db SHA256 37e7acff29a5e08e1e368453387542aa35cb526fb6b1e87f856bca7e57030da7
-DIST vdr-cinebars-0.0.3a.tgz 11837 RMD160 950e75755accf7b0c11d7a8052d19612b22e614c SHA1 8cff651c0012cac1ac8b8c4ca4a247c18ead9102 SHA256 3e1632e5630ca35aa1b0da476ba022c420884dc41975efeb3e16bd3ba39158cd
+AUX vdr-cinebars-0.0.5_makefile.diff 552 RMD160 ccf79a4387a7cf2887246015ab881b33dbd6cf55 SHA1 c267a21ad5393b0f2585eae730a60271038c03b6 SHA256 aff6005cb09c0fb435fcbfac5765e59e0a4322e6593790d5f1f6b21f04fc278d
 DIST vdr-cinebars-0.0.5.tgz 13253 RMD160 d49720c9ccfa8b42e243838257805f7f5cde8659 SHA1 49c9b17f3297d89125f7290b43f392f3dfb5af95 SHA256 d83f626cf7df916f5ea7193e022af2d7d82745a1a766fd132f21525cba912815
-EBUILD vdr-cinebars-0.0.3a.ebuild 530 RMD160 c066911a686425f98925d9ef78863134d300a975 SHA1 65f1617bc7c7eea347f37a5ce50fe3de7e565ca6 SHA256 5c28339d98d3c36e27da50308799daf0af727fc41e29c8232e4524ed4973f341
-EBUILD vdr-cinebars-0.0.5.ebuild 578 RMD160 c6b599ff9bfb1108c0dde22dadfdb1e452049a9d SHA1 511aa19b527b8d68fe820944f8355afe438b48a8 SHA256 937849a55d297971dacac9cdf02f68f87196d8bd9109f32a2460d378d9513d84
-MISC ChangeLog 1059 RMD160 1046b06ff05d56a73796b2e6df9de875c6706adf SHA1 9b222063f0b18975bbd9aaf030bebb46c315d8b8 SHA256 063c7468bac620aba36d94a9232fcebce2b93cd0c57c90e4f77af38ddf4dc89e
+EBUILD vdr-cinebars-0.0.5.ebuild 579 RMD160 0ec87a20047bfd76e04a13ccfeb2809af897987b SHA1 8aee687c6f5f58ddd05f62619a915dcdc531b6f2 SHA256 e6af3d9c0b1a8e773fe8fed56078bcf9125523d8bbd0e4bd2117aae712990225
+MISC ChangeLog 1270 RMD160 13d4202b381614deaff83af91ee8db5aba9f8391 SHA1 53216d82072189aaa4c7508d0b8f2cf27a3a48d0 SHA256 26e16e05e798f7534c8cb779b0ef6bde0e904ef10b2307567b470009749beef6
 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
 
-iD8DBQFPMaEXdn07HTTCgIoRAibPAJ45IQAaxnoFZ62zs01zDjU76UC0VQCfZ5yc
-U21nrbi6XcO7QU2GragVpW4=
-=7qlo
+iD8DBQFP7ystdn07HTTCgIoRAvSiAKCj3M1QhQFM/TKe7ay5sJXp8bQldwCgltZf
+6OO44ELA31ybS0LEBJlHvFQ=
+=YwAi
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-cinebars/files/vdr-cinebars-0.0.5_makefile.diff b/media-plugins/vdr-cinebars/files/vdr-cinebars-0.0.5_makefile.diff
index d01c2fe85eab..75e2870f8149 100644
--- a/media-plugins/vdr-cinebars/files/vdr-cinebars-0.0.5_makefile.diff
+++ b/media-plugins/vdr-cinebars/files/vdr-cinebars-0.0.5_makefile.diff
@@ -1,25 +1,21 @@
-Joerg Bornkessel <hd_brummy@gentoo.org> 2012.01.07
-Fix Makefile for compile on multicore CPU
-
 diff -Naur cinebars-0.0.5.orig/Makefile cinebars-0.0.5/Makefile
---- cinebars-0.0.5.orig/Makefile    2012-02-07 23:19:00.000000000 +0100
-+++ cinebars-0.0.5/Makefile 2012-02-07 23:19:31.000000000 +0100
+--- cinebars-0.0.5.orig/Makefile	2012-06-30 18:27:52.000000000 +0200
++++ cinebars-0.0.5/Makefile	2012-06-30 18:29:25.000000000 +0200
 @@ -49,13 +49,13 @@
  
  ### The object files (add further files here):
  OBJS = $(PLUGIN).o
 -ifneq ($(VERS157),1)
-+#ifneq ($(VERS157),1)
- OBJS += i18n.o
+-OBJS += i18n.o
 -endif
++#ifneq ($(VERS157),1)
++#OBJS += i18n.o
 +#endif
  
  ### The main target:
--all: libvdr-$(PLUGIN).so
--   if [ $(VERS157) = 1 ]; then make i18n; fi
-+all: libvdr-$(PLUGIN).so i18n
-+#  if [ $(VERS157) = 1 ]; then make i18n; fi
+ all: libvdr-$(PLUGIN).so
+-	if [ $(VERS157) = 1 ]; then make i18n; fi
++#	if [ $(VERS157) = 1 ]; then make i18n; fi
  
  ### Implicit rules:
  %.o: %.c
-
diff --git a/media-plugins/vdr-cinebars/vdr-cinebars-0.0.3a.ebuild b/media-plugins/vdr-cinebars/vdr-cinebars-0.0.3a.ebuild
deleted file mode 100644
index 1ea7454204f1..000000000000
--- a/media-plugins/vdr-cinebars/vdr-cinebars-0.0.3a.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cinebars/vdr-cinebars-0.0.3a.ebuild,v 1.4 2011/01/28 21:21:24 mr_bones_ Exp $
-
-EAPI="3"
-
-inherit vdr-plugin
-
-IUSE=""
-SLOT="0"
-
-DESCRIPTION="vdr Plugin: Show black bars to hide station logo"
-HOMEPAGE="http://www.egal-vdr.de/plugins/"
-SRC_URI="http://www.egal-vdr.de/plugins/${P}.tgz"
-LICENSE="GPL-2"
-
-KEYWORDS="x86"
-
-DEPEND=">=media-video/vdr-1.3.32"
-RDEPEND="${DEPEND}"
diff --git a/media-plugins/vdr-cinebars/vdr-cinebars-0.0.5.ebuild b/media-plugins/vdr-cinebars/vdr-cinebars-0.0.5.ebuild
index 401e8727bb61..fa8512f7294b 100644
--- a/media-plugins/vdr-cinebars/vdr-cinebars-0.0.5.ebuild
+++ b/media-plugins/vdr-cinebars/vdr-cinebars-0.0.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cinebars/vdr-cinebars-0.0.5.ebuild,v 1.4 2012/02/07 22:09:17 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cinebars/vdr-cinebars-0.0.5.ebuild,v 1.5 2012/06/30 16:36:51 hd_brummy Exp $
 
 EAPI="4"
 
-inherit vdr-plugin
+inherit vdr-plugin-2
 
 DESCRIPTION="VDR Plugin: Show black bars to hide station logo"
 HOMEPAGE="http://www.egal-vdr.de/plugins/"
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND=">=media-video/vdr-1.3.32"
+DEPEND=">=media-video/vdr-1.6.0"
 RDEPEND="${DEPEND}"
 
 PATCHES=("${FILESDIR}/${P}_makefile.diff")