Use virtual/ffmpeg instead of media-video/ffmpeg. Fix usedep.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 17 insertions, 54 deletions

diff --git a/media-plugins/vdr-audiorecorder/ChangeLog b/media-plugins/vdr-audiorecorder/ChangeLog
index 0974f915e8ef..feb6f3686113 100644
--- a/media-plugins/vdr-audiorecorder/ChangeLog
+++ b/media-plugins/vdr-audiorecorder/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-audiorecorder
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/ChangeLog,v 1.13 2010/12/28 18:44:25 hd_brummy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/ChangeLog,v 1.14 2011/04/03 19:13:12 scarabeus Exp $
+
+  03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -vdr-audiorecorder-0.1.0_pre14.ebuild,
+  vdr-audiorecorder-0.1.0_pre14-r1.ebuild:
+  Use virtual/ffmpeg instead of media-video/ffmpeg. Fix usedep.
 
 *vdr-audiorecorder-0.1.0_pre14-r1 (28 Dec 2010)
 
diff --git a/media-plugins/vdr-audiorecorder/Manifest b/media-plugins/vdr-audiorecorder/Manifest
index b76ba12d61f3..0d9c59fb5fee 100644
--- a/media-plugins/vdr-audiorecorder/Manifest
+++ b/media-plugins/vdr-audiorecorder/Manifest
@@ -5,15 +5,13 @@ AUX confd 366 RMD160 a1ed9617f2d0022a478158992472536eabc3e40a SHA1 ab6296de955c7
 AUX rc-addon.sh 371 RMD160 aae201d98de8b91f38be9b4ea5ea7eee43e3b6a2 SHA1 3d42b741edb36c2f9b3d09fa3b12afcd598d427c SHA256 69e156962332b610270a02464cb3b2b164224a3da9741cfa14efdcfcedd2d282
 AUX vdr-audiorecorder-0.1.0_pre14-shared-tinyxml.diff 5274 RMD160 87833447f139fef55df12b50878ac2832fc403e9 SHA1 3c654679fb1ea5e5dcc1ed433c2f78a0de8e123d SHA256 c7d78ae65c8367b5a5f5876a79e1440c2a8f8732d7c0637398d91babcfa777f5
 DIST vdr-audiorecorder-0.1.0-pre14.tgz 101437 RMD160 ffac124c4e2d93ef94ba72485d938bf3bf2d6602 SHA1 20c4b766cbf7e169190e9297e3f1c25cb669d968 SHA256 18b0dfd023e5bda4785cab832478aae205ca02548b32de4458d628672d6fb8e9
-EBUILD vdr-audiorecorder-0.1.0_pre14-r1.ebuild 1283 RMD160 37ea13e9ee8a4d908d4ac2cdf1e54338a8fd6cad SHA1 7e51f09bb8064e9f9d487d0f366f187930378a12 SHA256 b545d4d96b08c7d4092b07132e2e766d8af8f28c0d435745da69eea5c9d75525
-EBUILD vdr-audiorecorder-0.1.0_pre14.ebuild 969 RMD160 f7868bdf0fca43456506ef8b2ed3b51429d65e80 SHA1 3972c5ca8b4a1cbb4f91d20cccda8979124ed3c5 SHA256 c981b65df151c4d0d26c9abb59adb1b077746cb6b4f497943097216ce8e091ce
-MISC ChangeLog 3266 RMD160 f24b5076d78a2825e82ef0969a0ab3a49dc0b9b9 SHA1 1c3673093f0cd6db2324434cc1ab3a65704209a2 SHA256 0d4d17c345b8b67d98978bdac031160325f84776915c5635906fcd56500c4a50
+EBUILD vdr-audiorecorder-0.1.0_pre14-r1.ebuild 1278 RMD160 77be04245ec3c622c4c7e68f59c5dd8e67fccd10 SHA1 98331297272690c026541cb6a84d8e6eb7b00573 SHA256 594ac2babcebabc228dabb9187e5a497e9a16c09e7eddeb5459866a185716d8d
+MISC ChangeLog 3470 RMD160 04816e9bf9b60596ff7400d83e647114b6afdda6 SHA1 1b6303e2457fcc0c3e8c69a986655ae4ffdb48fe SHA256 cb6720277e03344291dd895ba3a4c0001f27ad072149891e469142f2b002c6eb
 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
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iD8DBQFNGjA8dn07HTTCgIoRAtMvAKCXcaPIHeMrK6KqQJmSbs+zIKAyJACdFs2v
-MZDHl524HOLD7p7PZUPltbE=
-=u+sN
+iEYEARECAAYFAk2YxZAACgkQHB6c3gNBRYd7AACgmnZuDxAX3JWHp+VICsNYL5Qk
+fuMAoIzJXB1nEDJCspFwvs1oBL4FquGx
+=9aoo
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r1.ebuild b/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r1.ebuild
index 01e1e82414f9..1f8f816368af 100644
--- a/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r1.ebuild
+++ b/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r1.ebuild
@@ -1,8 +1,8 @@
-# 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-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r1.ebuild,v 1.1 2010/12/28 18:44:25 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r1.ebuild,v 1.2 2011/04/03 19:13:12 scarabeus Exp $
 
-EAPI="2"
+EAPI=3
 
 inherit vdr-plugin flag-o-matic
 
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P#vdr-}
 
 DEPEND=">=media-video/vdr-1.6.0
 		media-libs/taglib
-		>=media-video/ffmpeg-0.6[mp3]
+		virtual/ffmpeg[encode,mp3]
 		>=dev-libs/tinyxml-2.6.1[stl]"
 
 RDEPEND="${DEPEND}"
diff --git a/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14.ebuild b/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14.ebuild
deleted file mode 100644
index 29801a6c9781..000000000000
--- a/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14.ebuild
+++ /dev/null
@@ -1,40 +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-audiorecorder/vdr-audiorecorder-0.1.0_pre14.ebuild,v 1.1 2010/12/23 16:28:15 hd_brummy Exp $
-
-EAPI="2"
-
-inherit vdr-plugin flag-o-matic
-
-MY_P=${P/_pre/-pre}
-
-DESCRIPTION="VDR plugin: automatically record radio-channels and split it into tracks according to RadioText-Info"
-HOMEPAGE="http://www.a-land.de/audiorecorder/"
-SRC_URI="http://www.zulu-entertainment.de/files/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-S=${WORKDIR}/${MY_P#vdr-}
-
-DEPEND=">=media-video/vdr-1.6.0
-		media-libs/taglib
-		>=media-video/ffmpeg-0.4.9
-		"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	vdr-plugin_src_prepare
-
-	# UINT64_C is needed by ffmpeg headers
-	append-flags -D__STDC_CONSTANT_MACROS
-}
-
-src_install() {
-	vdr-plugin_src_install
-	keepdir /var/vdr/audiorecorder
-	chown -R vdr:vdr "${D}"/var/vdr
-}