[gentoo-commits] gentoo-x86 commit in media-sound/amarok: amarok-2.5.0-r4.ebuild metadata.xml amarok-2.5.0-r3.ebuild amarok-2.5.90-r1.ebuild ChangeLog

[Jorge Manuel B. S. Vicetto (jmbsvicetto)]

jmbsvicetto    12/07/08 15:10:40

  Modified:             metadata.xml amarok-2.5.0-r3.ebuild ChangeLog
  Added:                amarok-2.5.0-r4.ebuild amarok-2.5.90-r1.ebuild
  Log:
  [media-sound/amarok-2.5.0-r3] Fix whitespace.
  [media-sound/amarok-2.5.0-r4] revision bump to add the patch to fix clipped context view - bug 424261.
  [media-sound/amarok-2.5.90-r1] Move from the overlay the 2.6.0-beta1 - bug 419509.
  
  (Portage version: 2.2.0_alpha115/cvs/Linux x86_64)

Revision  Changes    Path
1.31                 media-sound/amarok/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/metadata.xml?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/metadata.xml?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/metadata.xml?r1=1.30&r2=1.31

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/metadata.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- metadata.xml	26 May 2012 15:22:19 -0000	1.30
+++ metadata.xml	8 Jul 2012 15:10:40 -0000	1.31
@@ -1,35 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
-  <herd>sound</herd>
-  <maintainer>
-    <email>jmbsvicetto@g.o</email>
-    <name>Jorge Manuel B. S. Vicetto</name>
-  </maintainer>
-  <use>
-    <flag name="daap">
-      Enable the scripts for music sharing through DAAP. This flag adds
-      dependencies on <pkg>www-servers/mongrel</pkg> to allow sharing of
-      the Amarok music collection through DAAP protocol. Please note
-      that turning this flag off has no effect on DAAP browsing.
-    </flag>
-    <flag name="embedded">                                                                                                          
-      Use libmysqld, MySQL embedded server library.                                                                           
-      Try disabling this if you encounter -PIC related in amarok,                                                             
-      it will make amarok rely only on standalone MySQL server.                                                               
-    </flag>
-    <flag name="lastfm">
-      Enable Last.fm streaming services support through
-      <pkg>media-libs/liblastfm</pkg>
-    </flag>
-    <flag name="mp3tunes">Enable mp3tunes integration</flag>
-    <flag name="ofa">
-      Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
-      fingerprints (used by MusicBrainz)
-    </flag>
+<herd>kde</herd>
+<herd>sound</herd>
+<maintainer>
+	<email>jmbsvicetto@g.o</email>
+	<name>Jorge Manuel B. S. Vicetto</name>
+</maintainer>
+<use>
+	<flag name="daap">
+		Enable the scripts for music sharing through DAAP. This flag adds
+		dependencies on <pkg>www-servers/mongrel</pkg> to allow sharing of
+		the Amarok music collection through DAAP protocol. Please note
+		that turning this flag off has no effect on DAAP browsing.
+	</flag>
+	<flag name="embedded">
+		Use libmysqld, MySQL embedded server library.
+		Try disabling this if you encounter -PIC related in amarok,
+		it will make amarok rely only on standalone MySQL server.
+	</flag>
+	<flag name="lastfm">
+		Enable Last.fm streaming services support through
+		<pkg>media-libs/liblastfm</pkg>
+	</flag>
+	<flag name="mp3tunes">Enable mp3tunes integration</flag>
+	<flag name="mtp">
+		Enable support for libMTP (Plays4Sure) devices access through libmtp
+	</flag>
+	<flag name="ofa">
+		Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
+		fingerprints (used by MusicBrainz)
+	</flag>
 	<flag name="utils">
-      Build the utils - old <pkg>media-sound/amarok-utils</pkg>
-    </flag>
-  </use>
+		Build the utils - old <pkg>media-sound/amarok-utils</pkg>
+	</flag>
+</use>
 </pkgmetadata>



1.5                  media-sound/amarok/amarok-2.5.0-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.5.0-r3.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.5.0-r3.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.5.0-r3.ebuild?r1=1.4&r2=1.5

Index: amarok-2.5.0-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.5.0-r3.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- amarok-2.5.0-r3.ebuild	8 Jul 2012 13:53:38 -0000	1.4
+++ amarok-2.5.0-r3.ebuild	8 Jul 2012 15:10:40 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.5.0-r3.ebuild,v 1.4 2012/07/08 13:53:38 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.5.0-r3.ebuild,v 1.5 2012/07/08 15:10:40 jmbsvicetto Exp $
 
 EAPI=4
 
@@ -47,7 +47,7 @@
 		|| (
 			$(add_kdebase_dep kdemultimedia-kioslaves)
 			$(add_kdebase_dep audiocd-kio)
-			)
+		)
 	)
 	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
 	lastfm? ( =media-libs/liblastfm-0.3* )



1.429                media-sound/amarok/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/ChangeLog?rev=1.429&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/ChangeLog?rev=1.429&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/ChangeLog?r1=1.428&r2=1.429

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -r1.428 -r1.429
--- ChangeLog	8 Jul 2012 13:53:38 -0000	1.428
+++ ChangeLog	8 Jul 2012 15:10:40 -0000	1.429
@@ -1,6 +1,18 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.428 2012/07/08 13:53:38 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.429 2012/07/08 15:10:40 jmbsvicetto Exp $
+
+*amarok-2.5.90-r1 (08 Jul 2012)
+*amarok-2.5.0-r4 (08 Jul 2012)
+
+  08 Jul 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
+  +amarok-2.5.0-r4.ebuild, +amarok-2.5.90-r1.ebuild,
+  +files/amarok-2.5.0-fix-context-view-on-startup.patch, amarok-2.5.0-r3.ebuild,
+  metadata.xml:
+  [media-sound/amarok-2.5.0-r3] Fix whitespace. [media-sound/amarok-2.5.0-r4]
+  revision bump to add the patch to fix clipped context view - bug 424261.
+  [media-sound/amarok-2.5.90-r1] Move from the overlay the 2.6.0-beta1 - bug
+  419509.
 
   08 Jul 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
   amarok-2.4.3-r1.ebuild, amarok-2.5.0-r3.ebuild:



1.1                  media-sound/amarok/amarok-2.5.0-r4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.5.0-r4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.5.0-r4.ebuild?rev=1.1&content-type=text/plain

Index: amarok-2.5.0-r4.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.5.0-r4.ebuild,v 1.1 2012/07/08 15:10:40 jmbsvicetto Exp $

EAPI=4

KDE_LINGUAS="af ar ast be bg bs ca ca@valencia cs csb da de el en_GB eo es et
eu fa fi fr ga gl he hr hu is it ja km ko ku lt lv mai ml ms nb nds ne nl nn
oc pa pl pt pt_BR ro ru se si sk sl sq sr sr@ijekavian sr@ijekavianlatin
sr@Latn sv tg th tr ug uk wa zh_CN zh_TW"
KDE_SCM="git"
KDE_REQUIRED="never"
inherit flag-o-matic kde4-base

DESCRIPTION="Advanced audio player based on KDE framework."
HOMEPAGE="http://amarok.kde.org/"
if [[ ${PV} != *9999* ]]; then
	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
else
	KEYWORDS=""
fi

LICENSE="GPL-2"
SLOT="4"
IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils"

# Tests require gmock - http://code.google.com/p/gmock/
# It's not in the tree yet
RESTRICT="test"

# ipod requires gdk enabled and also gtk compiled in libgpod
COMMONDEPEND="
	app-crypt/qca:2
	>=app-misc/strigi-0.5.7
	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
	$(add_kdebase_dep kdebase-kioslaves)
	>=media-libs/taglib-1.6.1[asf,mp4]
	>=media-libs/taglib-extras-1.0.1
	sys-libs/zlib
	>=virtual/mysql-5.1[embedded?]
	x11-libs/qt-core
	x11-libs/qt-dbus
	x11-libs/qt-script
	>=x11-libs/qtscriptgenerator-0.1.0
	cdda? (
		$(add_kdebase_dep libkcddb)
		$(add_kdebase_dep libkcompactdisc)
		|| (
			$(add_kdebase_dep audiocd-kio)
			$(add_kdebase_dep kdemultimedia-kioslaves)
		)
	)
	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
	lastfm? ( =media-libs/liblastfm-0.3* )
	mp3tunes? (
		dev-libs/glib:2
		dev-libs/libxml2
		dev-libs/openssl
		net-libs/loudmouth
		net-misc/curl
		x11-libs/qt-core[glib]
	)
	mtp? ( >=media-libs/libmtp-1.0.0 )
	ofa? ( >=media-libs/libofa-0.9.0 )
	opengl? ( virtual/opengl )
"
DEPEND="${COMMONDEPEND}
	dev-util/automoc
	virtual/pkgconfig
"
RDEPEND="${COMMONDEPEND}
	!media-sound/amarok-utils
	$(add_kdebase_dep phonon-kde)
"

PATCHES=(
	"${FILESDIR}/${PN}-2.5.0-kde48.patch"
	"${FILESDIR}/${PN}-2.5.0-qtdebug.patch"
	"${FILESDIR}/${PN}-2.5.0-fix-context-view-on-startup.patch"
)

src_configure() {
	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
	use ppc64 && append-flags -mminimal-toc
	local mycmakeargs

	# Mygpo-qt not yet in portage, add IUSE when available
	mycmakeargs=(
		-DWITH_PLAYER=ON
		-DWITH_Libgcrypt=OFF
		-DWITH_Mygpo-qt=OFF
		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
		$(cmake-utils_use_with ipod)
		$(cmake-utils_use_with ipod Gdk)
		$(cmake-utils_use_with lastfm LibLastFm)
		$(cmake-utils_use_with mtp)
		$(cmake-utils_use_with mp3tunes MP3Tunes)
		$(cmake-utils_use_with ofa LibOFA)
	)

	mycmakeargs+=(
		$(cmake-utils_use_with utils UTILITIES)
	)

	# $(cmake-utils_use_with semantic-desktop Nepomuk)
	# $(cmake-utils_use_with semantic-desktop Soprano)

	kde4-base_src_configure
}

pkg_postinst() {
	kde4-base_pkg_postinst

	if use daap; then
		echo
		elog "You have installed amarok with daap support."
		elog "You may be interested in installing www-servers/mongrel as well."
		echo
	fi

	if ! use embedded; then
		echo
		elog "You've disabled the amarok support for embedded mysql DBs."
		elog "You'll have to configure amarok to use an external db server."
		echo
		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
		elog "to configure the external db and migrate your data from the embedded database."
		echo

		if has_version "virtual/mysql[minimal]"; then
			elog "You built mysql with the minimal use flag, so it doesn't include the server."
			elog "You won't be able to use the local mysql installation to store your amarok collection."
			echo
		fi
	fi
}



1.1                  media-sound/amarok/amarok-2.5.90-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.5.90-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.5.90-r1.ebuild?rev=1.1&content-type=text/plain

Index: amarok-2.5.90-r1.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.5.90-r1.ebuild,v 1.1 2012/07/08 15:10:40 jmbsvicetto Exp $

EAPI=4

KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl pa
pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
KDE_SCM="git"
KDE_REQUIRED="never"
inherit flag-o-matic kde4-base

DESCRIPTION="Advanced audio player based on KDE framework."
HOMEPAGE="http://amarok.kde.org/"
if [[ ${PV} != *9999* ]]; then
	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
else
	KEYWORDS=""
fi

LICENSE="GPL-2"
SLOT="4"
IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils"

# Tests require gmock - http://code.google.com/p/gmock/
# It's not in the tree yet
RESTRICT="test"

# ipod requires gdk enabled and also gtk compiled in libgpod
COMMONDEPEND="
	app-crypt/qca:2
	>=app-misc/strigi-0.5.7
	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
	$(add_kdebase_dep kdebase-kioslaves)
	>=media-libs/taglib-1.6.1[asf,mp4]
	>=media-libs/taglib-extras-1.0.1
	sys-libs/zlib
	>=virtual/mysql-5.1[embedded?]
	x11-libs/qt-core
	x11-libs/qt-dbus
	x11-libs/qt-script
	>=x11-libs/qtscriptgenerator-0.1.0
	cdda? (
		$(add_kdebase_dep libkcddb)
		$(add_kdebase_dep libkcompactdisc)
		|| (
			$(add_kdebase_dep audiocd-kio)
			$(add_kdebase_dep kdemultimedia-kioslaves)
		)
	)
	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
	lastfm? ( =media-libs/liblastfm-0.3* )
	mp3tunes? (
		dev-libs/glib:2
		dev-libs/libxml2
		dev-libs/openssl
		net-libs/loudmouth
		net-misc/curl
		x11-libs/qt-core[glib]
	)
	mtp? ( >=media-libs/libmtp-1.0.0 )
	ofa? ( >=media-libs/libofa-0.9.0 )
	opengl? ( virtual/opengl )
"
DEPEND="${COMMONDEPEND}
	dev-util/automoc
	virtual/pkgconfig
"
RDEPEND="${COMMONDEPEND}
	!media-sound/amarok-utils
	$(add_kdebase_dep phonon-kde)
"

src_configure() {
	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
	use ppc64 && append-flags -mminimal-toc
	local mycmakeargs

	mycmakeargs=(
		-DWITH_PLAYER=ON
		-DWITH_Libgcrypt=OFF
		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
		$(cmake-utils_use_with ipod)
		$(cmake-utils_use_with ipod Gdk)
		$(cmake-utils_use_with lastfm LibLastFm)
		$(cmake-utils_use_with mtp)
		$(cmake-utils_use_with mp3tunes MP3Tunes)
		$(cmake-utils_use_with ofa LibOFA)
	)

	mycmakeargs+=(
		$(cmake-utils_use_with utils UTILITIES)
	)

	# $(cmake-utils_use_with semantic-desktop Nepomuk)
	# $(cmake-utils_use_with semantic-desktop Soprano)

	kde4-base_src_configure
}

pkg_postinst() {
	kde4-base_pkg_postinst

	if use daap; then
		echo
		elog "You have installed amarok with daap support."
		elog "You may be interested in installing www-servers/mongrel as well."
		echo
	fi

	if ! use embedded; then
		echo
		elog "You've disabled the amarok support for embedded mysql DBs."
		elog "You'll have to configure amarok to use an external db server."
		echo
		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
		elog "to configure the external db and migrate your data from the embedded database."
		echo

		if has_version "virtual/mysql[minimal]"; then
			elog "You built mysql with the minimal use flag, so it doesn't include the server."
			elog "You won't be able to use the local mysql installation to store your amarok collection."
			echo
		fi
	fi
}