Fixes bug #143657. Thanks to Sawk for noticing.

Package-Manager: portage-2.1-r2

4 files changed, 28 insertions, 17 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index fbd68720157d..8422851fa05a 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.159 2006/08/23 16:30:07 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.160 2006/08/25 19:55:42 deathwing00 Exp $
+
+  25 Aug 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
+  k3b-1.0_pre1.ebuild:
+  Added dependency check: If the 'encode' USE flag is enabled,
+  media-video/transcode is checked to be compiled with dvdread. Fixes bug
+  #143657.
 
 *k3b-0.12.17 (23 Aug 2006)
 
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 5cbfc15e59ca..9265976077dd 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -2,7 +2,7 @@ DIST k3b-0.12.14.tar.bz2 4096391 RMD160 fc06fce15d7f4140de9810257c46a217f022caf9
 DIST k3b-0.12.15.tar.bz2 4000389 RMD160 9d0ff14b394153d97ef61fcf7b46894ec5d3d511 SHA1 4f2768f6473032fbf6cde2d13b1c2729b7e91e3f SHA256 5e6cb62f38dcb17c5296e53df89d7bb709f0d336b6a41db9be1b464d4638f32a
 DIST k3b-0.12.16.tar.bz2 4004784 RMD160 b4b64924096581bcb0c3432f99f0e27ffe0aca79 SHA1 875ebae1e5bc4ef0f186c1025087ed8005c10248 SHA256 bc686f6e596df32f2c305a1f4948ceddbbfb067045e6b9b314af615319d11fe6
 DIST k3b-0.12.17.tar.bz2 4008650 RMD160 bb791d7d003285f6623229eae213cf224fd3a128 SHA1 ae23be594b6e2c116fd4c2af8cefb438423d1285 SHA256 067ef9d621bed9a1c385c201b13810f11305edf03a7da0793cb059bb578700b7
-DIST k3b-1.0pre1.tar.bz2 3797033 RMD160 cb418b84ffa63351e00e25d896dc746893247736 SHA1 d336e456a19f4f741b1460a7816a09acef338165 SHA256 a4c690bb757629833c182780840c670745f44ea9f7f7a03b221a67ea36396de1
+DIST k3b-1.0pre1.tar.bz2 3797891 RMD160 ac5866e3d79c464307390f8ea0c733e73342d33b SHA1 19084065a8c9fd2056b8aa7155319faa61069933 SHA256 686320b0bf836c277b685fc2edfd19f9f5875615fa4f19509a617dd5d6c113ed
 DIST k3b-i18n-0.12.14.tar.bz2 4744451 RMD160 489d650e223a5dfca7d36318dc08d3a6a1854547 SHA1 92f7ee7105cf216a7c01fbf673bca7f282c8380b SHA256 fa3a94b8631eee6d48d796749d51f949a563a1e97b7386a0cc8c1f6ef76a20c4
 DIST k3b-i18n-0.12.15.tar.bz2 4683857 RMD160 053ed2acadb3fb627ce02e73dc63c825840c5e90 SHA1 0e3ecc7c79def1b50d72d09ceca4af2c603466d1 SHA256 39f4a3278875792d7eba0cddaab15e6c04b411e673d20babda0fc82df62f60fd
 DIST k3b-i18n-0.12.16.tar.bz2 5020555 RMD160 de87783da39d82981fc7bed731cf8031afb70501 SHA1 1b8fedd7b4b16e8704ad1ad934d621e59f40c9cd SHA256 6cb9466878f2386e3b30347b013405322f2306f48d037e527febf6aca56b1ff5
@@ -23,14 +23,14 @@ EBUILD k3b-0.12.17.ebuild 3212 RMD160 c4161dea1c0e2e5f0ea10a8e33f78ef93a23c758 S
 MD5 ea4284d270ad45e577af7c67af0944e9 k3b-0.12.17.ebuild 3212
 RMD160 c4161dea1c0e2e5f0ea10a8e33f78ef93a23c758 k3b-0.12.17.ebuild 3212
 SHA256 1fde16a4183a3feb3a21bb8f716827684cc29abbb4a0d9e6b7a58f0c13c5a7aa k3b-0.12.17.ebuild 3212
-EBUILD k3b-1.0_pre1.ebuild 3421 RMD160 98a1f19234d564d764ca10fd87824db07f1df991 SHA1 4519b97510306db9017495875b50bfd2a23a01ad SHA256 2eb228a7e523d92c6fd9bdf592ecea6b3cd00e518601f326a88deec67a553224
-MD5 2eaf8731b1633173a3ea85fd2926e721 k3b-1.0_pre1.ebuild 3421
-RMD160 98a1f19234d564d764ca10fd87824db07f1df991 k3b-1.0_pre1.ebuild 3421
-SHA256 2eb228a7e523d92c6fd9bdf592ecea6b3cd00e518601f326a88deec67a553224 k3b-1.0_pre1.ebuild 3421
-MISC ChangeLog 22393 RMD160 7816507ba1d378227b8b38db3ef23784c4e46091 SHA1 1789cf7d05f263752f73ec548bf655d85054e0ee SHA256 bc10ec958ed9f0820db178c563940d04e45af4a70ed688698db1e9dcc0360314
-MD5 4b9b318021bb31083a6e4f59f9b319ce ChangeLog 22393
-RMD160 7816507ba1d378227b8b38db3ef23784c4e46091 ChangeLog 22393
-SHA256 bc10ec958ed9f0820db178c563940d04e45af4a70ed688698db1e9dcc0360314 ChangeLog 22393
+EBUILD k3b-1.0_pre1.ebuild 3724 RMD160 4160c5d8eb09d8c5d2d154725227eeaa03ae6de1 SHA1 cc3740fcc622d75b00e2fa13375f321378c85948 SHA256 93c023c9dae64f73d0e3a971790e84474d45d9b1395c04ab173cba744454885a
+MD5 b51eab12fb8bc25ae34c3ad7b820e378 k3b-1.0_pre1.ebuild 3724
+RMD160 4160c5d8eb09d8c5d2d154725227eeaa03ae6de1 k3b-1.0_pre1.ebuild 3724
+SHA256 93c023c9dae64f73d0e3a971790e84474d45d9b1395c04ab173cba744454885a k3b-1.0_pre1.ebuild 3724
+MISC ChangeLog 22629 RMD160 0d413f3f7787bf69ed25fc7de126373b538e2107 SHA1 b321128d376c97486ef7ad289fb62123b318ef6d SHA256 626151ab1328e81be8e3937ee247c7b6d07aca958f9b308a03a2c81affeaa53a
+MD5 69733d8391b1b58f912ee1ff6908ce3d ChangeLog 22629
+RMD160 0d413f3f7787bf69ed25fc7de126373b538e2107 ChangeLog 22629
+SHA256 626151ab1328e81be8e3937ee247c7b6d07aca958f9b308a03a2c81affeaa53a ChangeLog 22629
 MISC metadata.xml 183 RMD160 dfdbe8a9663c05a4c6ab7aaf0e1d5b35ac030e2f SHA1 44581aca775d8ca4854c53861174b6147da706b4 SHA256 d004a7535807ea599189a046ac582ca032a91f868bbcf4b72195773dfaf15462
 MD5 6cac9f56ab7373612097cef824badcf7 metadata.xml 183
 RMD160 dfdbe8a9663c05a4c6ab7aaf0e1d5b35ac030e2f metadata.xml 183
@@ -47,6 +47,6 @@ SHA256 450db71276fcfc7b61a81eb62d7247bd0f50004ea1897ff89c29a1fa77e13215 files/di
 MD5 7eaef0434ae25555a255b8aed579cabe files/digest-k3b-0.12.17 497
 RMD160 8a4873ae69903c958e5e0b75f73d6713e20fd0cf files/digest-k3b-0.12.17 497
 SHA256 8a5728ab9f0d6e61ebd95fba006b5da987c550b44fdaf988046dc7404bcdf816 files/digest-k3b-0.12.17 497
-MD5 ed986efe8cf7975d141f079bc9dc031c files/digest-k3b-1.0_pre1 241
-RMD160 0664d707ba86bcb415d1564fd3d2681c5374d8bc files/digest-k3b-1.0_pre1 241
-SHA256 f112144e576ef81d747448350e8c6c457802e0a6dde83337d69983e21ee85791 files/digest-k3b-1.0_pre1 241
+MD5 7e39c50bee50014231b6467c9195609b files/digest-k3b-1.0_pre1 241
+RMD160 dcbb4a459c0380884ef17e892b425ef9af878748 files/digest-k3b-1.0_pre1 241
+SHA256 a391a1aae9365f6d0aafeb79773bfe9a9c32e166a82406e7f2aee01d0d7c8007 files/digest-k3b-1.0_pre1 241
diff --git a/app-cdr/k3b/files/digest-k3b-1.0_pre1 b/app-cdr/k3b/files/digest-k3b-1.0_pre1
index 6a195837b71d..b17862427f6a 100644
--- a/app-cdr/k3b/files/digest-k3b-1.0_pre1
+++ b/app-cdr/k3b/files/digest-k3b-1.0_pre1
@@ -1,3 +1,3 @@
-MD5 6abafc955bd7678bf951276b498f30d9 k3b-1.0pre1.tar.bz2 3797033
-RMD160 cb418b84ffa63351e00e25d896dc746893247736 k3b-1.0pre1.tar.bz2 3797033
-SHA256 a4c690bb757629833c182780840c670745f44ea9f7f7a03b221a67ea36396de1 k3b-1.0pre1.tar.bz2 3797033
+MD5 3741f0c991bd32f82d5caf52d18584c0 k3b-1.0pre1.tar.bz2 3797891
+RMD160 ac5866e3d79c464307390f8ea0c733e73342d33b k3b-1.0pre1.tar.bz2 3797891
+SHA256 686320b0bf836c277b685fc2edfd19f9f5875615fa4f19509a617dd5d6c113ed k3b-1.0pre1.tar.bz2 3797891
diff --git a/app-cdr/k3b/k3b-1.0_pre1.ebuild b/app-cdr/k3b/k3b-1.0_pre1.ebuild
index fa7f4495ffcd..c2d5b5f32949 100644
--- a/app-cdr/k3b/k3b-1.0_pre1.ebuild
+++ b/app-cdr/k3b/k3b-1.0_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0_pre1.ebuild,v 1.1 2006/08/11 19:05:28 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0_pre1.ebuild,v 1.2 2006/08/25 19:55:42 deathwing00 Exp $
 
 inherit kde eutils
 
@@ -64,6 +64,11 @@ pkg_setup() {
 		eerror "but sys-apps/dbus is not built with Qt3 support."
 		die "rebuild sys-apps/dbus with the qt3 useflag"
 	fi
+	if use encode && ! built_with_use media-video/transcode dvdread; then
+		eerror "You are trying to compile ${CATEGORY}/${PF} with the \"encode\"	USE flag enabled,"
+		eerror "but media-video/transcode is not built with dvdread support."
+		die "rebuild media-video/transcode with the dvdread useflag"
+	fi
 
 	kde_pkg_setup
 }