cleanup for bug 391093; eapi=4, fix for >=vdr-1.7.27 i18n handling, stable amd64 x86

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

4 files changed, 23 insertions, 34 deletions

diff --git a/media-plugins/vdr-avards/ChangeLog b/media-plugins/vdr-avards/ChangeLog
index ae5661f06818..b63ac2b671b8 100644
--- a/media-plugins/vdr-avards/ChangeLog
+++ b/media-plugins/vdr-avards/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-avards
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-avards/ChangeLog,v 1.14 2011/09/15 12:18:40 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-avards/ChangeLog,v 1.15 2012/04/19 15:59:59 hd_brummy Exp $
+
+  19 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-avards-0.2.2.ebuild, vdr-avards-0.2.4.ebuild:
+  cleanup for bug 391093; eapi=4, fix for >=vdr-1.7.27 i18n handling, stable
+  amd64 x86
 
   15 Sep 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
   -vdr-avards-0.2.3.ebuild:
diff --git a/media-plugins/vdr-avards/Manifest b/media-plugins/vdr-avards/Manifest
index 9fb4fae49489..c4861cf51f87 100644
--- a/media-plugins/vdr-avards/Manifest
+++ b/media-plugins/vdr-avards/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-DIST vdr-avards-0.2.2.tar.bz2 24753 RMD160 a37b7d2ae2af244870f9818fc8a169c1763e112d SHA1 97f79adcd05a20ef9c96f7ab2efdac45ee4f925f SHA256 f9281653c4a93125ed8bf09daaa6cd50d8aa7af1e4af4ac32cae881c2ce455cb
 DIST vdr-avards-0.2.4.tar.bz2 24865 RMD160 cfd5f4d7bf0b8410183a26f5dc897e940d8ad43d SHA1 0caf4abc4171c5e017a432401216b41543d2e374 SHA256 a1d053ad04b20e787ba53cb7a896205c0adf8e2cbf952e58cd23e9fb1fdb6566
-EBUILD vdr-avards-0.2.2.ebuild 568 RMD160 fc216727e4b5197e35fd7383894e89d48b52e606 SHA1 15c34f4d908ce8ed0323122638e09ddfd96244e7 SHA256 97f1b94e3dadafff38f4a285f8d56cedc4e5a524181d307abcf63c7eaa4b3b4a
-EBUILD vdr-avards-0.2.4.ebuild 795 RMD160 e00785e3586aed9d66e6617e52e7f7b33de3137e SHA1 7d12dea067062d4e6e2403dd23f028b9771d3c04 SHA256 20e48b74d19d180c2a57085ae861507828470fd1a58b43bf44872c5fd8cfdd3a
-MISC ChangeLog 2211 RMD160 88e1e26cbdb744f6acb5350652bc9c243c149612 SHA1 53df57bc73da51079f1bb19dd00d453859ae9fab SHA256 5c4c38961a6139fe7e80e7917d1a025c50f426a0110e0e0d25798c200903f339
+EBUILD vdr-avards-0.2.4.ebuild 960 RMD160 ac60899222e50cb003e9cd0db369343723baaf80 SHA1 105b3251170244a6e82d71d2f28f784f02162a3d SHA256 13089029392a21611af4e973345e049d046d5bfa6700a3782b1f0ff3a78985eb
+MISC ChangeLog 2409 RMD160 82da32468cbd89f7e0cda6e03b3b39abe0bc0fb2 SHA1 fad056752e1fee6c7a0b66fc3fd6baf0d3653c1a SHA256 ccc4d6eade5d7bbce07327a296a5ed21649fda3a87e51bf547ad1940f0c2ed15
 MISC metadata.xml 258 RMD160 3978316b72989b0150dd21a2ba1f2449a158ebc9 SHA1 4ed083cc2156c1d9ea22136d69bcdd9da3d758b9 SHA256 1d6292676863287cee09b69ba35f3ea7546ed6718a3fea1d326deae735dadf64
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iF4EAREIAAYFAk5x7VgACgkQXkR9YqOcLPF6WQD7BScP50LcxJDjzWGBCwXMs3UQ
-PCwD778AdsuSlL2EbGkBAJ14u0sQLXljCd6Q/MCldI43Yd8utiR8R0iRKvniSaKD
-=xE69
+iD8DBQFPkDkudn07HTTCgIoRAmoTAJ9rff55vg3YeLwZ5OpR4gLYGaxoWQCfbMFi
+l8mY9PxJpTmI5BvCZezCli4=
+=ImpW
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-avards/vdr-avards-0.2.2.ebuild b/media-plugins/vdr-avards/vdr-avards-0.2.2.ebuild
deleted file mode 100644
index 5f8619750b16..000000000000
--- a/media-plugins/vdr-avards/vdr-avards-0.2.2.ebuild
+++ /dev/null
@@ -1,19 +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-avards/vdr-avards-0.2.2.ebuild,v 1.3 2011/01/28 17:23:43 hd_brummy Exp $
-
-EAPI="3"
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR Plugin:  Automatic Video Aspect Ratio Detection and Signaling"
-HOMEPAGE="http://firefly.vdr-developer.org/avards/"
-SRC_URI="http://firefly.vdr-developer.org/avards/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.4.6"
-RDEPEND="${DEPEND}"
diff --git a/media-plugins/vdr-avards/vdr-avards-0.2.4.ebuild b/media-plugins/vdr-avards/vdr-avards-0.2.4.ebuild
index cec144fde244..8f2ab5eaba5a 100644
--- a/media-plugins/vdr-avards/vdr-avards-0.2.4.ebuild
+++ b/media-plugins/vdr-avards/vdr-avards-0.2.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-avards/vdr-avards-0.2.4.ebuild,v 1.1 2011/09/15 11:15:57 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-avards/vdr-avards-0.2.4.ebuild,v 1.2 2012/04/19 15:59:59 hd_brummy Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit vdr-plugin
 
@@ -12,7 +12,7 @@ SRC_URI="http://firefly.vdr-developer.org/avards/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.6.0"
@@ -26,4 +26,8 @@ src_prepare() {
 	if ! has_version ">=media-video/vdr-1.7.13"; then
 		sed -i "s:-include \$(VDRDIR)/Make.global:#-include \$(VDRDIR)/Make.global:" Makefile
 	fi
+
+	# fix deprecated i18n handling >=vdr-1.7.27
+	sed -i "s:i18n.o::" Makefile || die "sed makefile faild"
+	sed -i "s:extern://extern:" i18n.h || die "sed i18n.h failed"
 }