Make the ebuild work properly with KDE 3.5 (#107018). Enable akode support.

Package-Manager: portage-2.0.51.22-r2

3 files changed, 20 insertions, 28 deletions

diff --git a/kde-base/juk/ChangeLog b/kde-base/juk/ChangeLog
index 8d6a837fff72..9a9c69a40a65 100644
--- a/kde-base/juk/ChangeLog
+++ b/kde-base/juk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/juk
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.21 2005/09/24 13:00:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.22 2005/09/24 13:37:51 greg_g Exp $
+
+  24 Sep 2005; Gregorio Guidi <greg_g@gentoo.org> juk-3.5_beta1.ebuild:
+  Make the ebuild work properly with KDE 3.5 (#107018). Enable akode support.
 
   24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> -juk-3.5_alpha1.ebuild:
   Removed 3.5_alpha1.
diff --git a/kde-base/juk/Manifest b/kde-base/juk/Manifest
index 7066bae3d36d..3d22349b6c05 100644
--- a/kde-base/juk/Manifest
+++ b/kde-base/juk/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d61fd42602c19dba1e32d47afea84a7a ChangeLog 3087
-MD5 ec445dac6f93f19d62a5ea6cce9087dc juk-3.4.1.ebuild 1084
-MD5 806d236558f3c5b1ae57b3233f0fb433 juk-3.5_beta1.ebuild 1250
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 c09895421ac78df6763954d95d2a0321 juk-3.5_beta1.ebuild 1186
 MD5 6839233323dd9b1caded4608bb0d7446 juk-3.4.2.ebuild 1274
-MD5 6ef14ede3bcaf690710f9cec75d93c80 juk-3.5_alpha1.ebuild 1251
-MD5 4084bf1456b3b8809bda2e919b1df867 files/digest-juk-3.5_alpha1 74
+MD5 6f82d3a62a73974f3a070d8811969003 ChangeLog 3335
+MD5 ec445dac6f93f19d62a5ea6cce9087dc juk-3.4.1.ebuild 1084
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-juk-3.4.1 227
+MD5 453075362e3201c7f44fea430afec5d5 files/digest-juk-3.4.2 308
 MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-juk-3.5_beta1 74
 MD5 4fdb0ffd65dc5bbcb439ea875a4f1ba6 files/configure-fix-kdemultimedia-juk.patch 4482
-MD5 453075362e3201c7f44fea430afec5d5 files/digest-juk-3.4.2 308
-MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-juk-3.4.1 227
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDMuv9j5H05b2HAEkRAqjaAJ9croPK0+x4gq7t5QCUlw790fg4dgCgkryC
-B+w8tafFEcNvwtpn36zGD5U=
-=baII
------END PGP SIGNATURE-----
diff --git a/kde-base/juk/juk-3.5_beta1.ebuild b/kde-base/juk/juk-3.5_beta1.ebuild
index b55bdf3c1c1b..4762ec53f9d5 100644
--- a/kde-base/juk/juk-3.5_beta1.ebuild
+++ b/kde-base/juk/juk-3.5_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-3.5_beta1.ebuild,v 1.1 2005/09/22 17:37:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-3.5_beta1.ebuild,v 1.2 2005/09/24 13:37:51 greg_g Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -12,11 +12,11 @@ KEYWORDS="~amd64"
 IUSE="flac gstreamer mp3 vorbis musicbrainz"
 
 DEPEND="media-libs/taglib
+	media-libs/akode
 	musicbrainz? ( 	media-libs/tunepimp
 			media-libs/musicbrainz )
 	gstreamer? ( >=media-libs/gstreamer-0.8
-	             >=media-libs/gst-plugins-0.8 )
-	$(deprange $PV $MAXKDEVER kde-base/akode)"
+	             >=media-libs/gst-plugins-0.8 )"
 
 RDEPEND="${DEPEND}
 	gstreamer? ( mp3? ( >=media-plugins/gst-plugins-mad-0.8 )
@@ -24,13 +24,7 @@ RDEPEND="${DEPEND}
 				  >=media-plugins/gst-plugins-vorbis-0.8 )
 		     flac? ( >=media-plugins/gst-plugins-flac-0.8 ) )"
 
-PATCHES="$FILESDIR/configure-fix-kdemultimedia-juk.patch"
-myconf="$myconf $(use_with gstreamer) $(use_with musicbrainz)"
-
-KMCOPYLIB="
-	libakode akode/lib/"
-KMEXTRACTONLY="arts/configure.in.in
-	akode/lib/"
+KMEXTRACTONLY="arts/configure.in.in"
 
 pkg_setup() {
 	if ! useq arts && ! useq gstreamer; then
@@ -38,3 +32,10 @@ pkg_setup() {
 		die
 	fi
 }
+
+src_compile() {
+	local myconf="--with-akode $(use_with gstreamer)
+	              $(use_with musicbrainz)"
+
+	kde-meta_src_compile
+}