Added mysql support.

5 files changed, 15 insertions, 75 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index b58ca07f4674..862c8367da47 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.39 2004/12/12 23:18:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.40 2004/12/13 11:02:43 eradicator Exp $
+
+  13 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -amarok-1.2_beta1.ebuild, amarok-1.2_beta2.ebuild:
+  Added mysql support.
 
 *amarok-1.2_beta2 (12 Dec 2004)
 
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 8f70fdfe119d..6bad61503399 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,13 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b041652a2676f4ab7136e64aa604f108 ChangeLog 5655
+MD5 bea729dea4f2f9fa3e276518a5bdeb83 ChangeLog 5789
 MD5 c1b0a4ad7dffff86cdf6b4e2782b0c45 amarok-1.1.1.ebuild 1525
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 877c421a3c3847598b870d5f2889e3f8 amarok-1.2_beta1.ebuild 1551
 MD5 abbaf6509841c49f6394928d1faea57f amarok-1.0.2.ebuild 1166
-MD5 c74ab1de1abacb56708fb88aae692bdf amarok-1.2_beta2.ebuild 1551
-MD5 f3ee5f78e59957e9b40ad6eb82cf9f03 files/digest-amarok-1.2_beta1 70
+MD5 4d7b48d1b3755110778461241cd08762 amarok-1.2_beta2.ebuild 1605
 MD5 ab9e82aabb62859495632f83d21aaf1f files/digest-amarok-1.2_beta2 70
 MD5 33697f318e63c60a1ec8082330eece7f files/digest-amarok-1.1.1 66
 MD5 23390f7810deeaf8ffd367ff06c8d075 files/amarok-1.0-cjk.diff 1455
@@ -16,7 +14,7 @@ MD5 167a3a9a42477903579be25096b8eaab files/digest-amarok-1.0.2 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBvNI3ArHZZzCEUG0RAvprAJsFKmrWyOCX9WZLXTe8NpJ/bWC1/wCeMmOo
-C2kHEhJYqUrm4rojybam8mM=
-=cJa5
+iD8DBQFBvXb7ArHZZzCEUG0RAsWPAJwI2Mc9iaqYmVd4jKI4MnhQIIWFPACeMJ1i
+PYS6qP3w2kgWKSlo/+LcEZk=
+=Pf4E
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.2_beta1.ebuild b/media-sound/amarok/amarok-1.2_beta1.ebuild
deleted file mode 100644
index 46d479b444c1..000000000000
--- a/media-sound/amarok/amarok-1.2_beta1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2_beta1.ebuild,v 1.4 2004/12/04 21:39:01 eradicator Exp $
-
-IUSE="noamazon cjk xmms opengl xine arts gstreamer"
-
-inherit kde eutils
-
-MY_P="${P/_beta/-beta}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="amaroK is a media player for KDE"
-HOMEPAGE="http://amarok.kde.org/"
-SRC_URI="mirror://sourceforge/amarok/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc -sparc ~x86"
-
-#	Not yet released:
-#	">=media-libs/libvisual-0.2.0
-DEPEND=">=kde-base/kdemultimedia-3.2
-	arts? ( >=kde-base/arts-1.2 )
-	opengl? ( virtual/opengl )
-	xmms? ( >=media-sound/xmms-1.2 )
-	xine? ( >=media-libs/xine-lib-1_rc4 )
-	>=media-libs/tunepimp-0.3.0
-	>=dev-util/pkgconfig-0.9.0
-	>=media-libs/taglib-1.3
-	>=kde-base/kdelibs-3.2
-	>=x11-libs/qt-3.3
-	gstreamer? ( >=media-libs/gst-plugins-0.8.1
-	             >=media-plugins/gst-plugins-mad-0.8.1 )"
-
-need-kde 3.2
-
-src_unpack() {
-	if  use !xine && use !arts
-	then
-		die "You must enable either aRts or Xine"
-	fi
-
-	kde_src_unpack
-	#CJK mp3 tag fix
-	use cjk && epatch ${FILESDIR}/amarok-1.0-cjk-a.diff
-}
-
-src_compile() {
-	PREFIX="`kde-config --prefix`"
-
-	myconf="`use_with arts` `use_with xine` `use_with gstreamer`"
-	myconf="${myconf} `use_with opengl` `use_enable !noamazon amazon`"
-
-	kde_src_compile myconf configure make || die
-}
-
-pkg_postinst() {
-	if use gstreamer; then
-		ewarn "Gstreamer support in ${P} is known to be unstable (see bug #66902)"
-	fi
-}
diff --git a/media-sound/amarok/amarok-1.2_beta2.ebuild b/media-sound/amarok/amarok-1.2_beta2.ebuild
index 8d10489e9ce3..5322374e578d 100644
--- a/media-sound/amarok/amarok-1.2_beta2.ebuild
+++ b/media-sound/amarok/amarok-1.2_beta2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2_beta2.ebuild,v 1.1 2004/12/12 23:18:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2_beta2.ebuild,v 1.2 2004/12/13 11:02:43 eradicator Exp $
 
-IUSE="noamazon cjk xmms opengl xine arts gstreamer"
+IUSE="noamazon cjk xmms opengl xine arts gstreamer mysql"
 
 inherit kde eutils
 
@@ -31,7 +31,8 @@ DEPEND=">=kde-base/kdemultimedia-3.2
 	>=kde-base/kdelibs-3.2
 	>=x11-libs/qt-3.3
 	gstreamer? ( >=media-libs/gst-plugins-0.8.1
-	             >=media-plugins/gst-plugins-mad-0.8.1 )"
+	             >=media-plugins/gst-plugins-mad-0.8.1 )
+	mysql? ( >=dev-db/mysql-3 )"
 
 need-kde 3.2
 
@@ -49,7 +50,7 @@ src_unpack() {
 src_compile() {
 	PREFIX="`kde-config --prefix`"
 
-	myconf="`use_with arts` `use_with xine` `use_with gstreamer`"
+	myconf="`use_with arts` `use_with xine` `use_with gstreamer` `use_enable mysql`"
 	myconf="${myconf} `use_with opengl` `use_enable !noamazon amazon`"
 
 	kde_src_compile myconf configure make || die
diff --git a/media-sound/amarok/files/digest-amarok-1.2_beta1 b/media-sound/amarok/files/digest-amarok-1.2_beta1
deleted file mode 100644
index c1fdb931b7fa..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.2_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4477bf2c90f3afe4ae343f07978e59a5 amarok-1.2-beta1.tar.bz2 3554832