Depend on virtual/ffmpeg.

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

3 files changed, 27 insertions, 21 deletions

diff --git a/media-tv/xdtv/ChangeLog b/media-tv/xdtv/ChangeLog
index a9feb3d14eaf..8d7ec372f334 100644
--- a/media-tv/xdtv/ChangeLog
+++ b/media-tv/xdtv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-tv/xdtv
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.58 2011/02/26 19:18:41 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.59 2011/05/15 15:26:01 scarabeus Exp $
+
+  15 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> xdtv-2.4.0.ebuild:
+  Depend on virtual/ffmpeg.
 
   26 Feb 2011; Kevin McCarthy <signals@gentoo.org> xdtv-2.4.0.ebuild:
   Updated depends from media-libs/jpeg to virtual/jpeg
diff --git a/media-tv/xdtv/Manifest b/media-tv/xdtv/Manifest
index bd630b9e1fdd..0051475a8b2a 100644
--- a/media-tv/xdtv/Manifest
+++ b/media-tv/xdtv/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xdtv-2.4.0-ffmpeg.patch 4069 RMD160 fa0c1c926cabf65bd4996e53f1f85fc81e709546 SHA1 bdfc8db21546ba188f5b781e743f671d305fa5f5 SHA256 a8126adac7bb8506bfd8daf2327bc805f3884a87b3d87c5f0f988a885e9b86d8
 AUX xdtv-2.4.0-ffmpegheaders.patch 2190 RMD160 de2ddecba8f12679cacfb34e2cba1b298526bf18 SHA1 92499141c69871d35c96aae5660dfa8e19325ee2 SHA256 1de4e96244f9369fc66c7c36757520a24e3d38bf8177ad91a03191338e608d06
 AUX xdtv-2.4.0-lavc.patch 1189 RMD160 8941548c06769208e2bcd7649dd513003f4e5cd9 SHA1 841d930a12f2dda70dfef06bf7b869aeb221358c SHA256 555940aae37c3e48ac3efb4811c4e6b40c72a41804f1922ab6a3119e343ae469
@@ -35,6 +38,13 @@ DIST libxdtv-theme-carbone-pl-2.4.0.tar.gz 401274 RMD160 85ba970817f56ae6a8048a2
 DIST libxdtv-theme-carbone-ru-2.4.0.tar.gz 392266 RMD160 89e6ec29609b9f999957eed80fb37d9bc9124c09 SHA1 fd0d60a9e4ffa4ad507866f06c702bf7be9c891e SHA256 2384c1c5b55b9eb1e2c1a46b44d8c268949a32d6dca9440f8f2f636dd7c17e72
 DIST libxdtv-theme-carbone-sv-2.4.0.tar.gz 395548 RMD160 389ba6ef7d47ff871069152da44268b72172774c SHA1 95e3b17e441d217abc590d5c35556d25d0745f3a SHA256 f1e76a35ca16f911cb8a8cb67bdb530d50b4a2360e2a9fc5db138baf72551930
 DIST xdtv-2.4.0.tar.gz 3230154 RMD160 b481a4d65b3fe34d4790f4e0851919588974fa90 SHA1 5176111f781c54b1374093855a407f89639b31ad SHA256 54d36552284f17aadc4b7455aed91d5efdbbba64827e369b3d8a80ec00543c3e
-EBUILD xdtv-2.4.0.ebuild 5525 RMD160 bc49a45f77e1d44a40503dc160acdffd5d18dd11 SHA1 5a5c2d64c0bab7372feb088a0203f58a68b21666 SHA256 7712d81a14f80538cc088bce71dbbaa08a7ba854d55e42e257b3a5311a27c3fc
-MISC ChangeLog 9394 RMD160 6bdd5325567f8e2ca66f2fdaef6646e6bddd8b45 SHA1 dcc05aab4ebf8042274941dcd4733d389f22652b SHA256 acd0fde2fc2a3ca9b0cbd76e236ee7a52e5874b863eb1e0e7af5584ff2148fa1
+EBUILD xdtv-2.4.0.ebuild 5214 RMD160 df51d1f554fc18505127a3ad75dc3ffb572ce9e2 SHA1 db34c60057c249af52693bedd7bc829c33922b6d SHA256 0d6f2070480b585134ba92e48eab2319f7ce56e83bdaeb016db98602e8e6ba6a
+MISC ChangeLog 9499 RMD160 d3f73ddae541af2f5be9dbfac57e960ab3bcef9a SHA1 0847ce885fc4b849b47fcf6be2d736f6cbd7e6ed SHA256 ba902f9ef753881f2314ae804d13db2c72680bfc8867290f0f2fe3764267a07a
 MISC metadata.xml 597 RMD160 ed30da83ed3a6862ca013482334f1cee7999cb53 SHA1 3cd968c01ad397f250e59ac43b1cb4a4dea33415 SHA256 920ff2b569a749b1ff4307c6f4f3ee1dd8cffc7ab3724531f6e1a6e0ed78e84f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3P8JUACgkQHB6c3gNBRYffqQCffTCiqkHcw743hZ4pVxZPNSvQ
+QUAAoLb0gh/ZiIrzR4WZpa5h6NNQQC+o
+=6Xqc
+-----END PGP SIGNATURE-----
diff --git a/media-tv/xdtv/xdtv-2.4.0.ebuild b/media-tv/xdtv/xdtv-2.4.0.ebuild
index 66920dd05d41..36a4a1ed9afd 100644
--- a/media-tv/xdtv/xdtv-2.4.0.ebuild
+++ b/media-tv/xdtv/xdtv-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.4.0.ebuild,v 1.11 2011/02/26 19:18:41 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.4.0.ebuild,v 1.12 2011/05/15 15:26:01 scarabeus Exp $
 
 inherit eutils multilib flag-o-matic toolchain-funcs autotools
 
@@ -53,7 +53,7 @@ COMMON_DEPEND="zvbi? ( >=media-libs/zvbi-0.2.4 )
 	x11-libs/libXv
 	x11-apps/xset
 	xinerama? ( x11-libs/libXinerama )
-	ffmpeg? ( media-video/ffmpeg )"
+	ffmpeg? ( virtual/ffmpeg )"
 
 DEPEND="${COMMON_DEPEND}
 	nls? ( sys-devel/gettext )
@@ -70,10 +70,6 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	schedule? ( sys-process/at )"
 
-# Make sure the assembler USE flags are unmasked on amd64
-# Remove this once default-linux/amd64/2006.1 is deprecated
-DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
-
 extension_iter() {
 	local my_a
 	for my_a in ${A} ; do
@@ -86,16 +82,18 @@ extension_iter() {
 
 extension_compile() {
 	einfo "Building ${1}"
-	cd "${WORKDIR}/${1}"
+	pushd "${WORKDIR}/${1}" > /dev/null
 
-	econf || die "econf failed"
-	emake CC=$(tc-getCC) || die "emake failed"
+	econf
+	emake CC=$(tc-getCC) || die
+	popd > /dev/null
 }
 
 extension_install() {
 	einfo "Installing ${1}"
-	cd "${WORKDIR}/${1}" \
-		&& emake DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/${PN}" install
+	pushd "${WORKDIR}/${1}" > /dev/null
+	emake DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/${PN}" install || die
+	popd > /dev/null
 }
 
 src_unpack() {
@@ -124,10 +122,6 @@ src_compile() {
 		ewarn "If you want a better GUI toolkit, enable either \"neXt\" or \"Xaw3d\" USE flags."
 	fi
 
-	has_version '<x11-base/xorg-x11-7.0' && \
-		appdefaultsdir="/etc/X11/app-defaults" || \
-		appdefaultsdir="/usr/share/X11/app-defaults"
-
 	econf ${xawconf} \
 		$(use_enable mmx) \
 		$(use_enable alsa) \
@@ -150,8 +144,7 @@ src_compile() {
 		--enable-pixmaps \
 		--disable-cpu-detection \
 		--disable-divx4linux \
-		--with-appdefaultsdir=${appdefaultsdir} \
-		|| die "Configuration failed."
+		--with-appdefaultsdir=${appdefaultsdir}
 
 	emake || die "Compilation failed."
 
@@ -169,7 +162,7 @@ src_install() {
 	# Install the icons in the hicolor theme
 	for dim in 48 32 16; do
 		insinto /usr/share/icons/hicolor/${dim}x${dim}/apps
-		newins "${S}/xdtv-${dim}.png" xdtv.png
+		newins "${S}/xdtv-${dim}.png" xdtv.png || die
 	done
 
 	# Install documentation