Fix crapped eapi2 transition. Move to correct slot.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 27 insertions, 14 deletions

diff --git a/media-tv/kdetv/ChangeLog b/media-tv/kdetv/ChangeLog
index df34ff25d6fe..3907bd6542ae 100644
--- a/media-tv/kdetv/ChangeLog
+++ b/media-tv/kdetv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/kdetv
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/ChangeLog,v 1.39 2009/02/14 20:02:59 carlo Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/ChangeLog,v 1.40 2009/05/28 14:22:51 scarabeus Exp $
+
+*kdetv-0.8.9-r2 (28 May 2009)
+
+  28 May 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdetv-0.8.9-r1.ebuild, +kdetv-0.8.9-r2.ebuild:
+  Fix crapped eapi2 transition. Move to correct slot.
 
 *kdetv-0.8.9-r1 (14 Feb 2009)
 
diff --git a/media-tv/kdetv/Manifest b/media-tv/kdetv/Manifest
index da31c40b77f8..5f5b03f13860 100644
--- a/media-tv/kdetv/Manifest
+++ b/media-tv/kdetv/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kdetv-0.8.9-desktop-entry.diff 806 RMD160 c5cf7e852024b4880578f9120da672ee2edf2b82 SHA1 77e73f98c1c39341ee787038c1e031a52f332e85 SHA256 526f666253439bc012372b7a78961e7615ac05774e20eb9366b1824d66ba3b35
 AUX kdetv-0.8.9-xinerama.patch 1573 RMD160 eacb00a750f0d46bb28d22e258d3ce805b14196a SHA1 55f019c73ac3c5ee7347c54162e7d0e657d6af9a SHA256 5264345962d22ceb40103e66a5af84313aa8989efdcda767ffecc6fd92103154
 DIST kdetv-0.8.9.tar.bz2 1304743 RMD160 7068e483e1d5ae2e91454c60acdfbdeae018deee SHA1 321c1c4ce2772ed8602cb556eafc05ab762ea28d SHA256 c55c0187175af5686acc9f93082b08a665aec760d60ff0fa3ddd297670ad1e88
-EBUILD kdetv-0.8.9-r1.ebuild 1642 RMD160 713d65bfa73a1163bdd685772d376fd1124d538c SHA1 c5b601995367ad1efca46a79f2976d9c64b177e9 SHA256 d7d1e3b328ec20c9ba0af13f742d9b51fa7e55ad734139d95fe1cf90ecc03b3d
+EBUILD kdetv-0.8.9-r2.ebuild 1587 RMD160 7944e581b723f7d8781a764b1cc631fb65da61ce SHA1 4bf25c095728a6932f1f7bcf271292c53b72b8a8 SHA256 a6c03ebe758f8a038d7a9b28c2e54fb99352325cb12778ef242455f9959c8a93
 EBUILD kdetv-0.8.9.ebuild 1853 RMD160 c1f6142ce6da0d52d2e8f6c9066cd2ceb7215985 SHA1 a985a6f9004f907ac3b75954ff6f2482d12f681c SHA256 a0c492716e17af9d9ec7ac664d4f07aee1d97485cd58a09c6ab0398ce38dd477
-MISC ChangeLog 6011 RMD160 1986e9461c24355f12c0858f72e938b93554d2d6 SHA1 24c74a0339fd4c1a4e62b83c9ed65f98a89e50bb SHA256 3ce61215a822256380d85f4f418e67f9be960fe5d854c1e8996ae176da678e33
+MISC ChangeLog 6206 RMD160 376733807478af988ac6bb5bf26e390081a8463f SHA1 a98e13c9314ed7de9ccf439615191b9b5462abd1 SHA256 79fe824ab474d1e78e10b9ec8ca9ebefd03ab3ecc45c59556ae5613bdc47b740
 MISC metadata.xml 244 RMD160 7bddb4b6683ade6b0a2d663c874ea6bf146bb3c7 SHA1 1351e9ab9d57d274c2e2f74658d2f82e60a8fe89 SHA256 74e2a4a8f201b3f16c6b991c019bf1b6e04e93a5898b001fd0a3ccf340041e57
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoenkcACgkQHB6c3gNBRYfQEACgq3bveuXJff5THNwIzV1NcAus
+9lsAnixCqiVuOWg9Oc97vpLgL2onrL2Y
+=ZxvQ
+-----END PGP SIGNATURE-----
diff --git a/media-tv/kdetv/kdetv-0.8.9-r1.ebuild b/media-tv/kdetv/kdetv-0.8.9-r2.ebuild
index d0885ae0dc95..7bd91ebd3e22 100644
--- a/media-tv/kdetv/kdetv-0.8.9-r1.ebuild
+++ b/media-tv/kdetv/kdetv-0.8.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/kdetv-0.8.9-r1.ebuild,v 1.1 2009/02/14 20:02:59 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/kdetv-0.8.9-r2.ebuild,v 1.1 2009/05/28 14:22:51 scarabeus Exp $
 
 EAPI="2"
 
@@ -18,11 +18,13 @@ HOMEPAGE="http://www.kde-apps.org/content/show.php?content=11602"
 SRC_URI="http://dziegel.free.fr/releases/${P}.tar.bz2"
 LICENSE="GPL-2"
 
-SLOT="0"
+SLOT="3.5"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="lirc zvbi opengl"
 
-RDEPEND="zvbi? ( >=media-libs/zvbi-0.2.4 )
+RDEPEND="
+	!${CATEGORY}/${PN}:0
+	zvbi? ( >=media-libs/zvbi-0.2.4 )
 	lirc? ( app-misc/lirc )
 	opengl? ( virtual/opengl x11-libs/qt[opengl] )
 	media-libs/alsa-lib
@@ -48,12 +50,7 @@ PATCHES=(
 	"${FILESDIR}/kdetv-0.8.9-desktop-entry.diff"
 	)
 
-src_prepare() {
-	# ugly hack - override base_src_prepare, kde.eclass does patching
-	:
-}
-
-src_compile() {
+src_configure() {
 	local myconf="$(use_enable lirc kdetv-lirc)
 		$(use_with zvbi) $(use_with opengl gl)"
 	#Filtering the below on x86 and amd64 for bug #145754 and bug #153721
@@ -64,5 +61,5 @@ src_compile() {
 
 	rm -f "${S}"/configure
 
-	kde_src_compile
+	kde_src_configure
 }