Nowadays sqlite3 should be pretty much stable, so use it external again. (both 1.4.6 pre-release snapshot and live svn).

Package-Manager: portage-2.1.2.9

6 files changed, 165 insertions, 18 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index e816493eb521..1d3fef7c920e 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.219 2007/06/14 13:30:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.220 2007/06/14 14:01:56 flameeyes Exp $
+
+*amarok-1.4.9999-r1 (14 Jun 2007)
+*amarok-1.4.6_pre20070608-r1 (14 Jun 2007)
+
+  14 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +amarok-1.4.6_pre20070608-r1.ebuild, -amarok-1.4.9999.ebuild,
+  +amarok-1.4.9999-r1.ebuild:
+  Nowadays sqlite3 should be pretty much stable, so use it external again.
+  (both 1.4.6 pre-release snapshot and live svn).
 
 *amarok-1.4.9999 (14 Jun 2007)
 
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index fa876c3fc2c2..dbd1d62c1ed7 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -23,18 +23,22 @@ EBUILD amarok-1.4.5-r2.ebuild 2841 RMD160 ef6f04be2d8d46d53cc4f6862c5b82ed3888ce
 MD5 8fe3013afaf86cfa9af703a14d149728 amarok-1.4.5-r2.ebuild 2841
 RMD160 ef6f04be2d8d46d53cc4f6862c5b82ed3888ce9f amarok-1.4.5-r2.ebuild 2841
 SHA256 4d404a37233107074b951537020f50b92d457ba6f0424dbb93e7160d7a09b7a7 amarok-1.4.5-r2.ebuild 2841
+EBUILD amarok-1.4.6_pre20070608-r1.ebuild 3325 RMD160 eb4371f4e760455b7eb59ad897c2d922c6736d78 SHA1 e06921cdc59f50679388b9a5ea9e72a75eb3dec7 SHA256 8a84cd4a7932cccda61b6153e768d2a92b430a57c582eb8a33abd817075bbc3e
+MD5 3f7045b4533692a586bd55c80bdfe091 amarok-1.4.6_pre20070608-r1.ebuild 3325
+RMD160 eb4371f4e760455b7eb59ad897c2d922c6736d78 amarok-1.4.6_pre20070608-r1.ebuild 3325
+SHA256 8a84cd4a7932cccda61b6153e768d2a92b430a57c582eb8a33abd817075bbc3e amarok-1.4.6_pre20070608-r1.ebuild 3325
 EBUILD amarok-1.4.6_pre20070608.ebuild 2883 RMD160 ff4a08be19282623c5c2a4ad889ff53613b2e528 SHA1 ade4ff18c3c3e531340987d18df9835e73e71ed4 SHA256 2e220403b5d4ffd064a4d497ad0bb3d4f57d3c2d742200c1e7cd208282bcdf3b
 MD5 fc514e75cf319d34748b282989e92e12 amarok-1.4.6_pre20070608.ebuild 2883
 RMD160 ff4a08be19282623c5c2a4ad889ff53613b2e528 amarok-1.4.6_pre20070608.ebuild 2883
 SHA256 2e220403b5d4ffd064a4d497ad0bb3d4f57d3c2d742200c1e7cd208282bcdf3b amarok-1.4.6_pre20070608.ebuild 2883
-EBUILD amarok-1.4.9999.ebuild 2933 RMD160 9a09d8f5c45086b3de41438400637166c954fbac SHA1 5e5de9be63e2740aea5d19791919a302d9a72a68 SHA256 27b58c49177ebf7f901221610f9fca8313d12a3865f0842a01d919a4dabe7d77
-MD5 699554d63cf2fab1bfef93cbe1cfc330 amarok-1.4.9999.ebuild 2933
-RMD160 9a09d8f5c45086b3de41438400637166c954fbac amarok-1.4.9999.ebuild 2933
-SHA256 27b58c49177ebf7f901221610f9fca8313d12a3865f0842a01d919a4dabe7d77 amarok-1.4.9999.ebuild 2933
-MISC ChangeLog 36395 RMD160 d66641762d14965a3147f9de395726b62adf5ce4 SHA1 cdab9bee19104b5ec0ccc20e37aa4616080bbe37 SHA256 b3d5ab35ea5e2809b7382cb1a9a4dc0857da5cc78f71ea2cc4bc2be957873ea4
-MD5 b5ee4e742dd02ece0667473d2d28bc4a ChangeLog 36395
-RMD160 d66641762d14965a3147f9de395726b62adf5ce4 ChangeLog 36395
-SHA256 b3d5ab35ea5e2809b7382cb1a9a4dc0857da5cc78f71ea2cc4bc2be957873ea4 ChangeLog 36395
+EBUILD amarok-1.4.9999-r1.ebuild 3375 RMD160 759a68cdc7d0a00aeb2eb16e422f1d940aad52ba SHA1 9bdfda8d0c17b0158d8db9c68b54863703b75e10 SHA256 a1aaf719c4561b83104725b3b6d8f79dc383f8b9c8b62b73ef700c287eadc16f
+MD5 fee67bf93fba0727cb83ba0dc55714ea amarok-1.4.9999-r1.ebuild 3375
+RMD160 759a68cdc7d0a00aeb2eb16e422f1d940aad52ba amarok-1.4.9999-r1.ebuild 3375
+SHA256 a1aaf719c4561b83104725b3b6d8f79dc383f8b9c8b62b73ef700c287eadc16f amarok-1.4.9999-r1.ebuild 3375
+MISC ChangeLog 36746 RMD160 d7d33cedd47b7446c39d5cf074467871cfb2e9aa SHA1 5aaaacea614a236826f3bab95de7e4d48e120343 SHA256 0551f02a0e17c2efeaff0c0f29750632d9c300d566374643542b6ee65a618eea
+MD5 8f5b99db18fb46e9538058f2e1d83d02 ChangeLog 36746
+RMD160 d7d33cedd47b7446c39d5cf074467871cfb2e9aa ChangeLog 36746
+SHA256 0551f02a0e17c2efeaff0c0f29750632d9c300d566374643542b6ee65a618eea ChangeLog 36746
 MISC metadata.xml 278 RMD160 69d1ffb637c604d94508afaf7428a9483f6ee881 SHA1 003ec39d3802862e92547cfd058de6a86a2696d4 SHA256 6ab2a5bf2864cdb1536513678c8f93fb81dc0c55c4ba26b585a97e281f5c4a75
 MD5 56c49c4a013438dddcf7405055d39ff8 metadata.xml 278
 RMD160 69d1ffb637c604d94508afaf7428a9483f6ee881 metadata.xml 278
@@ -48,13 +52,16 @@ SHA256 2588dc180c448a480698e60949cbecff302cbd3a56db2e98120ceca137759bbd files/di
 MD5 d45f064675d97c6fcebe17f808c71d3f files/digest-amarok-1.4.6_pre20070608 283
 RMD160 fabe8743c2bc3eae581e8b38e42164b2b2806c9e files/digest-amarok-1.4.6_pre20070608 283
 SHA256 46ced2cedc764a9a2d96cfe6f96c3f634b8e10399dffcfda54b344c8e31fdf4e files/digest-amarok-1.4.6_pre20070608 283
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-amarok-1.4.9999 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-amarok-1.4.9999 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-amarok-1.4.9999 0
+MD5 d45f064675d97c6fcebe17f808c71d3f files/digest-amarok-1.4.6_pre20070608-r1 283
+RMD160 fabe8743c2bc3eae581e8b38e42164b2b2806c9e files/digest-amarok-1.4.6_pre20070608-r1 283
+SHA256 46ced2cedc764a9a2d96cfe6f96c3f634b8e10399dffcfda54b344c8e31fdf4e files/digest-amarok-1.4.6_pre20070608-r1 283
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-amarok-1.4.9999-r1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-amarok-1.4.9999-r1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-amarok-1.4.9999-r1 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGcUMaAiZjviIA2XgRAmT8AKCDsP9u6AKrQ2c+/sg9lmGAyd1b1gCeIMgs
-ERtgAk5xXka8OInW4YO37NI=
-=QpNY
+iD8DBQFGcUp6AiZjviIA2XgRAt+XAJ4jD7nIfBuLUxBmIY1/vpem4qzrfwCeLGrV
+68KHdhj5R8ALDNPgke3Oo2g=
+=1Cgo
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.4.6_pre20070608-r1.ebuild b/media-sound/amarok/amarok-1.4.6_pre20070608-r1.ebuild
new file mode 100644
index 000000000000..dcaa99fbf388
--- /dev/null
+++ b/media-sound/amarok/amarok-1.4.6_pre20070608-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.6_pre20070608-r1.ebuild,v 1.1 2007/06/14 14:01:56 flameeyes Exp $
+
+LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es et eu fa fi
+fr ga gl he hi hu id is it ja km ko ku lo lt mk ms nb nds nl nn pa pl
+pt pt_BR ro ru rw se sk sl sq sr sr@Latn ss sv ta tg th tr uk uz zh_CN
+zh_TW"
+LANGS_DOC="da de es et fr it nl pl pt pt_BR ru sv"
+
+USE_KEG_PACKAGING=1
+
+inherit kde eutils flag-o-matic
+
+PKG_SUFFIX=""
+
+if [[ ${P/_pre} == ${P} ]]; then
+	MY_P="${P/_/-}"
+	S="${WORKDIR}/${P/_/-}"
+
+	SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+fi
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="aac kde mysql noamazon opengl postgres
+visualization ipod ifp real njb mtp musicbrainz daap
+python"
+# kde: enables compilation of the konqueror sidebar plugin
+
+SQLITEVER="3.3.17"
+
+RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
+	>=media-libs/xine-lib-1.1.2_pre20060328-r8
+	>=media-libs/taglib-1.4
+	mysql? ( >=virtual/mysql-4.0 )
+	postgres? ( dev-db/libpq )
+	opengl? ( virtual/opengl )
+	visualization? ( media-libs/libsdl
+					 =media-plugins/libvisual-plugins-0.4* )
+	ipod? ( >=media-libs/libgpod-0.4.2 )
+	aac? ( media-libs/libmp4v2 )
+	ifp? ( media-libs/libifp )
+	real? ( media-video/realplayer )
+	njb? ( >=media-libs/libnjb-2.2.4 )
+	mtp? ( >=media-libs/libmtp-0.1.1 )
+	musicbrainz? ( media-libs/tunepimp )
+	=dev-lang/ruby-1.8*
+	>=dev-db/sqlite-${SQLITEVER}"
+
+DEPEND="${RDEPEND}"
+
+RDEPEND="${RDEPEND}
+	app-arch/unzip
+	python? ( dev-python/PyQt )
+	daap? ( www-servers/mongrel )"
+
+need-kde 3.3
+
+pkg_setup() {
+	if built_with_use ">=dev-db/sqlite-${SQLITEVER}" nothreadsafe; then
+		eerror "SQLite was built without thread safety."
+		eerror "Amarok requires thread safety enabled in SQLite."
+		eerror "Please rebuild >=dev-db/sqlite-${SQLITEVER} with the"
+		eerror "nothreadsafe USE flag disabled."
+		die "SQLite built with nothreadsafe USE flag."
+	fi
+}
+
+src_compile() {
+	# Extra, unsupported engines are forcefully disabled.
+	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
+				  $(use_with opengl) --without-xmms
+				  $(use_with visualization libvisual)
+				  $(use_enable !noamazon amazon)
+				  $(use_with ipod libgpod)
+				  $(use_with aac mp4v2)
+				  $(use_with ifp)
+				  $(use_with real helix)
+				  $(use_with njb libnjb)
+				  $(use_with mtp libmtp)
+				  $(use_with musicbrainz)
+				  $(use_with daap)
+				  --with-xine
+				  --without-mas
+				  --without-nmm
+				  --without-included-sqlite"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	# As much as I respect Ian, I'd rather leave Amarok to use mongrel
+	# from Portage, for security and policy reasons.
+	rm -rf "${D}"/usr/share/apps/amarok/ruby_lib/rbconfig \
+		"${D}"/usr/share/apps/amarok/ruby_lib/mongrel* \
+		"${D}"/usr/share/apps/amarok/ruby_lib/rubygems* \
+		"${D}"/usr/share/apps/amarok/ruby_lib/gem* \
+		"${D}"/usr/$(get_libdir)/ruby_lib
+
+	if ! use python; then
+		rm -r "${D}"/usr/share/apps/amarok/scripts/webcontrol \
+			|| die "Unable to remove webcontrol."
+	fi
+}
diff --git a/media-sound/amarok/amarok-1.4.9999.ebuild b/media-sound/amarok/amarok-1.4.9999-r1.ebuild
index 5c16a40209c3..b9a40fbffa62 100644
--- a/media-sound/amarok/amarok-1.4.9999.ebuild
+++ b/media-sound/amarok/amarok-1.4.9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.9999.ebuild,v 1.1 2007/06/14 13:30:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.9999-r1.ebuild,v 1.1 2007/06/14 14:01:56 flameeyes Exp $
 
 inherit kde subversion
 
@@ -21,6 +21,8 @@ visualization ipod ifp real njb mtp musicbrainz daap
 python"
 # kde: enables compilation of the konqueror sidebar plugin
 
+SQLITEVER="3.3.17"
+
 RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
 	>=media-libs/xine-lib-1.1.2_pre20060328-r8
 	>=media-libs/taglib-1.4
@@ -36,7 +38,8 @@ RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
 	njb? ( >=media-libs/libnjb-2.2.4 )
 	mtp? ( >=media-libs/libmtp-0.1.1 )
 	musicbrainz? ( media-libs/tunepimp )
-	=dev-lang/ruby-1.8*"
+	=dev-lang/ruby-1.8*
+	>=dev-db/sqlite-${SQLITEVER}"
 
 DEPEND="${RDEPEND}"
 
@@ -49,6 +52,16 @@ need-kde 3.3
 
 S="${WORKDIR}/${PN}"
 
+pkg_setup() {
+	if built_with_use ">=dev-db/sqlite-${SQLITEVER}" nothreadsafe; then
+		eerror "SQLite was built without thread safety."
+		eerror "Amarok requires thread safety enabled in SQLite."
+		eerror "Please rebuild >=dev-db/sqlite-${SQLITEVER} with the"
+		eerror "nothreadsafe USE flag disabled."
+		die "SQLite built with nothreadsafe USE flag."
+	fi
+}
+
 src_unpack() {
 	ESVN_UPDATE_CMD="svn update -N" \
 	ESVN_FETCH_CMD="svn checkout -N" \
@@ -81,7 +94,8 @@ src_compile() {
 				  $(use_with daap)
 				  --with-xine
 				  --without-mas
-				  --without-nmm"
+				  --without-nmm
+				  --without-included-sqlite"
 
 	kde_src_compile
 }
diff --git a/media-sound/amarok/files/digest-amarok-1.4.6_pre20070608-r1 b/media-sound/amarok/files/digest-amarok-1.4.6_pre20070608-r1
new file mode 100644
index 000000000000..20f746a6fa76
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.4.6_pre20070608-r1
@@ -0,0 +1,3 @@
+MD5 4da98b7cfeeb7c34f76146e89f76f7c4 amarok-1.4.6_pre20070608.tar.bz2 17956550
+RMD160 06a9296d548fe0d97dafc657ecc39125e8b4654a amarok-1.4.6_pre20070608.tar.bz2 17956550
+SHA256 7dbf7c67936b232c0962e93c3de546559bb63ab1d02c70e42cb07ba064451030 amarok-1.4.6_pre20070608.tar.bz2 17956550
diff --git a/media-sound/amarok/files/digest-amarok-1.4.9999 b/media-sound/amarok/files/digest-amarok-1.4.9999-r1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/media-sound/amarok/files/digest-amarok-1.4.9999
+++ b/media-sound/amarok/files/digest-amarok-1.4.9999-r1