* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2015-08-12 20:05 Johannes Huber
0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2015-08-12 20:05 UTC (permalink / raw
To: gentoo-commits
commit: 3aba238b46e2b3f942f1e5347d2d19130745716c
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 20:07:30 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 20:07:30 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aba238b
media-sound/amarok: Drop Nepomuk support
Package-Manager: portage-2.2.20.1
media-sound/amarok/amarok-2.8.0-r3.ebuild | 11 +++++------
media-sound/amarok/metadata.xml | 1 -
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/media-sound/amarok/amarok-2.8.0-r3.ebuild b/media-sound/amarok/amarok-2.8.0-r3.ebuild
index ee3035b..25553b3 100644
--- a/media-sound/amarok/amarok-2.8.0-r3.ebuild
+++ b/media-sound/amarok/amarok-2.8.0-r3.ebuild
@@ -29,7 +29,7 @@ fi
LICENSE="GPL-2"
SLOT="4"
-IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp nepomuk ofa opengl test +utils"
+IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
if [[ ${KDE_BUILD_TYPE} == live ]]; then
RESTRICT="test"
@@ -38,7 +38,7 @@ fi
# ipod requires gdk enabled and also gtk compiled in libgpod
COMMONDEPEND="
app-crypt/qca:2[qt4(+)]
- $(add_kdebase_dep kdelibs 'nepomuk?,opengl?' 4.8.4)
+ $(add_kdebase_dep kdelibs 'opengl?' 4.8.4)
$(add_kdeapps_dep kdebase-kioslaves)
>=media-libs/taglib-1.7[asf,mp4]
>=media-libs/taglib-extras-1.0.1
@@ -58,13 +58,12 @@ COMMONDEPEND="
mp3tunes? (
dev-libs/glib:2
dev-libs/libxml2
- dev-libs/openssl
+ dev-libs/openssl:0
net-libs/loudmouth
net-misc/curl
>=dev-qt/qtcore-4.8.4:4[glib]
)
mtp? ( >=media-libs/libmtp-1.0.0 )
- nepomuk? ( >=kde-base/nepomuk-core-4.9.0 )
ofa? ( >=media-libs/libofa-0.9.0 )
opengl? ( virtual/opengl )
"
@@ -92,14 +91,14 @@ src_configure() {
-DWITH_PLAYER=ON
-DWITH_Libgcrypt=OFF
-DWITH_SPECTRUM_ANALYZER=OFF
+ -DWITH_NepomukCore=OFF
+ -DWITH_Soprano=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 nepomuk)
- $(cmake-utils_use_with nepomuk Soprano)
$(cmake-utils_use_with ofa LibOFA)
$(cmake-utils_use_with utils UTILITIES)
)
diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index e4da6b0..c964fd8 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -18,7 +18,6 @@
<flag name="mp3tunes">Enable mp3tunes integration</flag>
<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp
</flag>
- <flag name="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</flag>
<flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
fingerprints (used by MusicBrainz)
</flag>
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2015-12-31 9:17 Michael Palimaka
0 siblings, 0 replies; 21+ messages in thread
From: Michael Palimaka @ 2015-12-31 9:17 UTC (permalink / raw
To: gentoo-commits
commit: aa59a26c82c4fc7b3bd03c0fa3417448180764c4
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 09:12:39 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 09:16:59 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa59a26c
media-sound/amarok: add missing media-libs/liblastfm USE dependency
Package-Manager: portage-2.2.26
media-sound/amarok/amarok-2.8.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-sound/amarok/amarok-2.8.0-r3.ebuild b/media-sound/amarok/amarok-2.8.0-r3.ebuild
index 5efde9f..ea7dcdf 100644
--- a/media-sound/amarok/amarok-2.8.0-r3.ebuild
+++ b/media-sound/amarok/amarok-2.8.0-r3.ebuild
@@ -54,7 +54,7 @@ COMMONDEPEND="
$(add_kdeapps_dep audiocd-kio)
)
ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
- lastfm? ( >=media-libs/liblastfm-1.0.3 )
+ lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] )
mp3tunes? (
dev-libs/glib:2
dev-libs/libxml2
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2016-04-19 21:24 Ian Stakenvicius
0 siblings, 0 replies; 21+ messages in thread
From: Ian Stakenvicius @ 2016-04-19 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 845ddfd06ad86a9246ff15d2162e578c807e964e
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 21:24:28 2016 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 21:24:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=845ddfd0
media-sound/amarok: fix <pkg/> references in metadata.xml
Package-Manager: portage-2.2.26
media-sound/amarok/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index ae4558b..6ebc711 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -27,7 +27,7 @@
<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 name="utils">Build the utils - old media-sound/amarok-utils
</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2016-05-18 21:50 Johannes Huber
0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2016-05-18 21:50 UTC (permalink / raw
To: gentoo-commits
commit: aa69109f4831e71ffdecf8b82ad8e58405b3de0d
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 21:50:34 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed May 18 21:50:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa69109f
media-sound/amarok: Remvoe 2.8.90-r1
Package-Manager: portage-2.3.0_rc1
media-sound/amarok/amarok-2.8.90-r1.ebuild | 132 -----------------------------
1 file changed, 132 deletions(-)
diff --git a/media-sound/amarok/amarok-2.8.90-r1.ebuild b/media-sound/amarok/amarok-2.8.90-r1.ebuild
deleted file mode 100644
index 3012de2..0000000
--- a/media-sound/amarok/amarok-2.8.90-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl hu it ja
-lt lv nb nl pa pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin
-sv tr uk zh_CN zh_TW"
-KDE_REQUIRED="never"
-KDE_HANDBOOK="optional"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit flag-o-matic kde4-base pax-utils
-
-DESCRIPTION="Advanced audio player based on KDE framework"
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
- KEYWORDS="~amd64 ~ppc ~x86"
-else
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
-
-if [[ ${KDE_BUILD_TYPE} == live ]]; then
- RESTRICT="test"
-fi
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
- app-crypt/qca:2[qt4(+)]
- $(add_kdebase_dep kdelibs 'opengl?' 4.8.4)
- $(add_kdeapps_dep kdebase-kioslaves)
- >=media-libs/taglib-1.7[asf,mp4]
- >=media-libs/taglib-extras-1.0.1
- sys-libs/zlib
- >=virtual/mysql-5.1[embedded?]
- >=dev-qt/qtcore-4.8:4
- >=dev-qt/qtdbus-4.8:4
- >=dev-qt/qtscript-4.8:4
- >=x11-libs/qtscriptgenerator-0.1.0
- cdda? (
- $(add_kdeapps_dep libkcddb)
- $(add_kdeapps_dep libkcompactdisc)
- $(add_kdeapps_dep audiocd-kio)
- )
- ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
- lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] )
- mp3tunes? (
- dev-libs/glib:2
- dev-libs/libxml2
- dev-libs/openssl:0
- net-libs/loudmouth
- net-misc/curl
- >=dev-qt/qtcore-4.8.4:4[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
- test? ( dev-cpp/gmock )
-"
-RDEPEND="${COMMONDEPEND}
- !media-sound/amarok-utils
- $(add_kdeapps_dep phonon-kde)
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.8.0-taglib110.patch"
- "${FILESDIR}/${P}-mysql-embedded.patch"
- "${FILESDIR}/${P}-mysqld-rpath.patch"
-)
-
-src_configure() {
- # Append minimal-toc cflag for ppc64, see bug 280552 and 292707
- use ppc64 && append-flags -mminimal-toc
-
- local mycmakeargs=(
- -DWITH_PLAYER=ON
- -DWITH_Libgcrypt=OFF
- -DWITH_SPECTRUM_ANALYZER=OFF
- -DWITH_NepomukCore=OFF
- -DWITH_Soprano=OFF
- -DWITH_MYSQL_EMBEDDED=$(usex embedded)
- -DWITH_IPOD=$(usex ipod)
- -DWITH_GDKPixBuf=$(usex ipod)
- -DWITH_LibLastFm=$(usex lastfm)
- -DWITH_MP3Tunes=$(usex mp3tunes)
- -DWITH_Mtp=$(usex mtp)
- -DWITH_LibOFA=$(usex ofa)
- -DWITH_UTILITIES=$(usex utils)
- )
-
- # bug 581554: add libmysqld location for rpath patch
- use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" )
-
- kde4-base_src_configure
-}
-
-src_install() {
- kde4-base_src_install
-
- # bug 481592
- pax-mark m "${ED}"/usr/bin/amarok
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- 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
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2016-07-07 17:52 Michael Palimaka
0 siblings, 0 replies; 21+ messages in thread
From: Michael Palimaka @ 2016-07-07 17:52 UTC (permalink / raw
To: gentoo-commits
commit: ae3831a3081180ae92e8d8219863ed7fdbbd67a7
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 6 17:48:56 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jul 7 17:52:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae3831a3
media-sound/amarok: drop ~ppc keyword
Package-Manager: portage-2.3.0
media-sound/amarok/amarok-2.8.0-r3.ebuild | 4 ++--
media-sound/amarok/amarok-2.8.90-r2.ebuild | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-sound/amarok/amarok-2.8.0-r3.ebuild b/media-sound/amarok/amarok-2.8.0-r3.ebuild
index abbf232..aaabc54 100644
--- a/media-sound/amarok/amarok-2.8.0-r3.ebuild
+++ b/media-sound/amarok/amarok-2.8.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -22,7 +22,7 @@ if [[ ${PV} != *9999* ]]; then
else
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
fi
- KEYWORDS="amd64 ~ppc x86"
+ KEYWORDS="amd64 x86"
else
KEYWORDS=""
fi
diff --git a/media-sound/amarok/amarok-2.8.90-r2.ebuild b/media-sound/amarok/amarok-2.8.90-r2.ebuild
index 03a5e12..fc82432 100644
--- a/media-sound/amarok/amarok-2.8.90-r2.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r2.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Advanced audio player based on KDE framework"
HOMEPAGE="http://amarok.kde.org/"
if [[ ${PV} != *9999* ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
- KEYWORDS="~amd64 ~ppc ~x86"
+ KEYWORDS="~amd64 ~x86"
else
KEYWORDS=""
fi
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2016-07-21 9:40 Michael Palimaka
0 siblings, 0 replies; 21+ messages in thread
From: Michael Palimaka @ 2016-07-21 9:40 UTC (permalink / raw
To: gentoo-commits
commit: 175ece2df942eb2af9cb2c2aaffe6a4327a406a9
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 09:40:11 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 09:40:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=175ece2d
media-sound/amarok: >=media-libs/taglib-1.11 dropped asf and mp4 USE flags
Package-Manager: portage-2.3.0
media-sound/amarok/amarok-2.8.0-r3.ebuild | 2 +-
media-sound/amarok/amarok-2.8.90-r2.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-sound/amarok/amarok-2.8.0-r3.ebuild b/media-sound/amarok/amarok-2.8.0-r3.ebuild
index aaabc54..b34681a 100644
--- a/media-sound/amarok/amarok-2.8.0-r3.ebuild
+++ b/media-sound/amarok/amarok-2.8.0-r3.ebuild
@@ -40,7 +40,7 @@ COMMONDEPEND="
app-crypt/qca:2[qt4(+)]
$(add_kdebase_dep kdelibs 'opengl?' 4.8.4)
$(add_kdeapps_dep kdebase-kioslaves)
- >=media-libs/taglib-1.7[asf,mp4]
+ >=media-libs/taglib-1.7[asf(+),mp4(+)]
>=media-libs/taglib-extras-1.0.1
sys-libs/zlib
>=virtual/mysql-5.1[embedded?]
diff --git a/media-sound/amarok/amarok-2.8.90-r2.ebuild b/media-sound/amarok/amarok-2.8.90-r2.ebuild
index fc82432..1433d77 100644
--- a/media-sound/amarok/amarok-2.8.90-r2.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r2.ebuild
@@ -35,7 +35,7 @@ COMMONDEPEND="
app-crypt/qca:2[qt4(+)]
$(add_kdebase_dep kdelibs 'opengl?' 4.8.4)
$(add_kdeapps_dep kdebase-kioslaves)
- >=media-libs/taglib-1.7[asf,mp4]
+ >=media-libs/taglib-1.7[asf(+),mp4(+)]
>=media-libs/taglib-extras-1.0.1
sys-libs/zlib
>=virtual/mysql-5.1[embedded?]
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2017-02-24 13:20 Agostino Sarubbo
0 siblings, 0 replies; 21+ messages in thread
From: Agostino Sarubbo @ 2017-02-24 13:20 UTC (permalink / raw
To: gentoo-commits
commit: cb512d4fc3a943575b3d073d9ffc7e1dfb7e3453
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 13:20:26 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 13:20:26 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb512d4f
media-sound/amarok: amd64 stable wrt bug #610488
Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-sound/amarok/amarok-2.8.90-r2.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-sound/amarok/amarok-2.8.90-r2.ebuild b/media-sound/amarok/amarok-2.8.90-r2.ebuild
index 40177e6153..fa40d38035 100644
--- a/media-sound/amarok/amarok-2.8.90-r2.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,9 +18,9 @@ DESCRIPTION="Advanced audio player based on KDE framework"
HOMEPAGE="http://amarok.kde.org/"
if [[ ${PV} != *9999* ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
else
- KEYWORDS=""
+ KEYWORDS="amd64"
fi
LICENSE="GPL-2"
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2017-02-24 13:38 Agostino Sarubbo
0 siblings, 0 replies; 21+ messages in thread
From: Agostino Sarubbo @ 2017-02-24 13:38 UTC (permalink / raw
To: gentoo-commits
commit: 46f5d47a71663cf4f5f826f8b5956a1ca5f88d84
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 13:37:49 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 13:37:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f5d47a
media-sound/amarok: x86 stable wrt bug #610488
Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-sound/amarok/amarok-2.8.90-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-sound/amarok/amarok-2.8.90-r2.ebuild b/media-sound/amarok/amarok-2.8.90-r2.ebuild
index fa40d38035..c90ab95cd3 100644
--- a/media-sound/amarok/amarok-2.8.90-r2.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r2.ebuild
@@ -18,9 +18,9 @@ DESCRIPTION="Advanced audio player based on KDE framework"
HOMEPAGE="http://amarok.kde.org/"
if [[ ${PV} != *9999* ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
else
- KEYWORDS="amd64"
+ KEYWORDS="amd64 x86"
fi
LICENSE="GPL-2"
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2017-06-28 13:19 Agostino Sarubbo
0 siblings, 0 replies; 21+ messages in thread
From: Agostino Sarubbo @ 2017-06-28 13:19 UTC (permalink / raw
To: gentoo-commits
commit: 61e84e459c7278cde6aebd680ead95e805813c00
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 13:18:19 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 13:18:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61e84e45
media-sound/amarok: amd64 stable wrt bug #622684
Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-sound/amarok/amarok-2.8.90-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-sound/amarok/amarok-2.8.90-r3.ebuild b/media-sound/amarok/amarok-2.8.90-r3.ebuild
index 1f996a480a6..199019fd08c 100644
--- a/media-sound/amarok/amarok-2.8.90-r3.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r3.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Advanced audio player based on KDE framework"
HOMEPAGE="http://amarok.kde.org/"
if [[ ${PV} != *9999* ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
LICENSE="GPL-2"
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2017-06-30 11:10 Agostino Sarubbo
0 siblings, 0 replies; 21+ messages in thread
From: Agostino Sarubbo @ 2017-06-30 11:10 UTC (permalink / raw
To: gentoo-commits
commit: ba6f7c7f98dc58ca3a43fb392be8b9e8c5c425ff
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 30 11:07:49 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 11:07:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba6f7c7f
media-sound/amarok: x86 stable wrt bug #622684
Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-sound/amarok/amarok-2.8.90-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-sound/amarok/amarok-2.8.90-r3.ebuild b/media-sound/amarok/amarok-2.8.90-r3.ebuild
index 199019fd08c..3d287faaca8 100644
--- a/media-sound/amarok/amarok-2.8.90-r3.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r3.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Advanced audio player based on KDE framework"
HOMEPAGE="http://amarok.kde.org/"
if [[ ${PV} != *9999* ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="GPL-2"
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2017-06-30 17:27 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-06-30 17:27 UTC (permalink / raw
To: gentoo-commits
commit: dd5fdb08a31661779afbe0c6ad3ddf99c026c332
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 17:03:40 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 17:26:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd5fdb08
media-sound/amarok: Drop old
Gentoo-bug: 622684
Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --force
media-sound/amarok/Manifest | 1 -
media-sound/amarok/amarok-2.8.0-r3.ebuild | 138 -----------------------------
media-sound/amarok/amarok-2.8.90-r2.ebuild | 135 ----------------------------
3 files changed, 274 deletions(-)
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 164d0d3c5cb..81273e9657d 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,2 +1 @@
-DIST amarok-2.8.0.tar.bz2 39950028 SHA256 f4b89b28f217a6d947e55fb0890de22fad8c404794c6beeb2dcaf2711b4f8ec6 SHA512 09f7f675f1223d36fb9df2f8c88923c6616524e022ad83b12bcb770dfbf60cb6b191e4035633f2ea2eee5fb7b38e6d5092cf69fe222ef9c3f3c46ba8f157a62d WHIRLPOOL 108cfd95d65e74f28f85a846f605bc349e5b2962b7f9a357415225f3e48ff87148d7f50a642665cc3c809bb2cb4c22f339ad049cdeb4659bb7c0a48e798833ad
DIST amarok-2.8.90.tar.xz 48890580 SHA256 b057369ab70d192b669ee6c2c11e9e7d4140663f6a60d6175ef0bb56b4bef9a7 SHA512 1ff5f43100dbe027c8676946a4e82e914927b03ac0bb9e95bfc7e9e03fcc1cad81d9ea2a343bc4f644a025242e224ea9ae3cae7423d68b0b3c68f346922537fc WHIRLPOOL 22da35ea61dcda04d882f4c0da7327cab10edf50140b3ae891738d10e1b9e5062eb541e35e817fd04a7f0284eb085b5ccf3edfa20438b764a9ce3615de35ca8c
diff --git a/media-sound/amarok/amarok-2.8.0-r3.ebuild b/media-sound/amarok/amarok-2.8.0-r3.ebuild
deleted file mode 100644
index 0a5d5cef805..00000000000
--- a/media-sound/amarok/amarok-2.8.0-r3.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl hu it ja
-lt lv nb nl pa pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin
-sv tr uk zh_CN zh_TW"
-KDE_REQUIRED="never"
-KDE_HANDBOOK="optional"
-KDE_MINIMAL="4.13.1"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-WEBKIT_REQUIRED="always"
-inherit flag-o-matic kde4-base pax-utils
-
-DESCRIPTION="Advanced audio player based on KDE framework"
-HOMEPAGE="https://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
- if [[ $PV == *[6-9][0-9]* ]]; then
- SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
- else
- SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
- fi
- KEYWORDS="amd64 x86"
-else
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
-
-if [[ ${KDE_BUILD_TYPE} == live ]]; then
- RESTRICT="test"
-fi
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
- app-crypt/qca:2[qt4(+)]
- kde-frameworks/kdelibs:4[opengl?]
- $(add_kdeapps_dep kdebase-kioslaves)
- >=media-libs/taglib-1.7[asf(+),mp4(+)]
- >=media-libs/taglib-extras-1.0.1
- sys-libs/zlib
- >=virtual/mysql-5.1[embedded?]
- >=dev-qt/qtcore-4.8:4
- >=dev-qt/qtdbus-4.8:4
- >=dev-qt/qtscript-4.8:4
- >=x11-libs/qtscriptgenerator-0.1.0
- cdda? (
- $(add_kdeapps_dep libkcddb)
- $(add_kdeapps_dep libkcompactdisc)
- $(add_kdeapps_dep audiocd-kio)
- )
- ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
- lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] )
- mp3tunes? (
- dev-libs/glib:2
- dev-libs/libxml2
- dev-libs/openssl:0
- net-libs/loudmouth
- net-misc/curl
- >=dev-qt/qtcore-4.8.4:4[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
- test? ( dev-cpp/gmock )
-"
-RDEPEND="${COMMONDEPEND}
- !media-sound/amarok-utils
- || ( kde-apps/phonon-kde:4
- $(add_kdeapps_dep phonon-kde) )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-gmock-1.7.patch"
- "${FILESDIR}/${P}-mysqld-rpath.patch"
- "${FILESDIR}/${P}-taglib110.patch"
-)
-
-src_configure() {
- # Append minimal-toc cflag for ppc64, see bug 280552 and 292707
- use ppc64 && append-flags -mminimal-toc
-
- local mycmakeargs=(
- -DWITH_PLAYER=ON
- -DWITH_Libgcrypt=OFF
- -DWITH_SPECTRUM_ANALYZER=OFF
- -DWITH_NepomukCore=OFF
- -DWITH_Soprano=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)
- $(cmake-utils_use_with utils UTILITIES)
- )
-
- # Add libmysqld location for rpath patch; bug 508824
- use embedded && mycmakeargs+=(-DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql")
-
- kde4-base_src_configure
-}
-
-src_install() {
- kde4-base_src_install
-
- # bug 481592
- pax-mark m "${ED}"/usr/bin/amarok
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- 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 https://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
-}
diff --git a/media-sound/amarok/amarok-2.8.90-r2.ebuild b/media-sound/amarok/amarok-2.8.90-r2.ebuild
deleted file mode 100644
index baae7f4d2f0..00000000000
--- a/media-sound/amarok/amarok-2.8.90-r2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl hu it ja
-lt lv nb nl pa pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin
-sv tr uk zh_CN zh_TW"
-KDE_REQUIRED="never"
-KDE_HANDBOOK="optional"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-WEBKIT_REQUIRED="always"
-inherit flag-o-matic kde4-base pax-utils
-
-DESCRIPTION="Advanced audio player based on KDE framework"
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
- KEYWORDS="amd64 x86"
-else
- KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
-
-if [[ ${KDE_BUILD_TYPE} == live ]]; then
- RESTRICT="test"
-fi
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
- app-crypt/qca:2[qt4(+)]
- kde-frameworks/kdelibs:4[opengl?]
- $(add_kdeapps_dep kdebase-kioslaves)
- >=media-libs/taglib-1.7[asf(+),mp4(+)]
- >=media-libs/taglib-extras-1.0.1
- sys-libs/zlib
- >=virtual/mysql-5.1[embedded?]
- >=dev-qt/qtcore-4.8:4
- >=dev-qt/qtdbus-4.8:4
- >=dev-qt/qtscript-4.8:4
- >=x11-libs/qtscriptgenerator-0.1.0
- cdda? (
- $(add_kdeapps_dep libkcddb)
- $(add_kdeapps_dep libkcompactdisc)
- $(add_kdeapps_dep audiocd-kio)
- )
- ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
- lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] )
- mp3tunes? (
- dev-libs/glib:2
- dev-libs/libxml2
- dev-libs/openssl:0
- net-libs/loudmouth
- net-misc/curl
- >=dev-qt/qtcore-4.8.4:4[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
- test? ( dev-cpp/gmock )
-"
-RDEPEND="${COMMONDEPEND}
- !media-sound/amarok-utils
- $(add_kdeapps_dep phonon-kde)
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.8.0-taglib110.patch"
- "${FILESDIR}/${P}-mysql-embedded.patch"
- "${FILESDIR}/${P}-mysqld-rpath.patch"
- "${FILESDIR}/${P}-scriptconsole.patch"
- "${FILESDIR}/${P}-gcc6.patch"
- "${FILESDIR}/${P}-ffmpeg3.patch"
-)
-
-src_configure() {
- # Append minimal-toc cflag for ppc64, see bug 280552 and 292707
- use ppc64 && append-flags -mminimal-toc
-
- local mycmakeargs=(
- -DWITH_PLAYER=ON
- -DWITH_Libgcrypt=OFF
- -DWITH_SPECTRUM_ANALYZER=OFF
- -DWITH_NepomukCore=OFF
- -DWITH_Soprano=OFF
- -DWITH_MYSQL_EMBEDDED=$(usex embedded)
- -DWITH_IPOD=$(usex ipod)
- -DWITH_GDKPixBuf=$(usex ipod)
- -DWITH_LibLastFm=$(usex lastfm)
- -DWITH_MP3Tunes=$(usex mp3tunes)
- -DWITH_Mtp=$(usex mtp)
- -DWITH_LibOFA=$(usex ofa)
- -DWITH_UTILITIES=$(usex utils)
- )
-
- # bug 581554: add libmysqld location for rpath patch
- use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" )
-
- kde4-base_src_configure
-}
-
-src_install() {
- kde4-base_src_install
-
- # bug 481592
- pax-mark m "${ED}"/usr/bin/amarok
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- 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
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2017-08-12 14:31 Michael Palimaka
0 siblings, 0 replies; 21+ messages in thread
From: Michael Palimaka @ 2017-08-12 14:31 UTC (permalink / raw
To: gentoo-commits
commit: b3563a3c2c70cb16c53befbcae2215a2bad0ca94
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 12 14:22:50 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Aug 12 14:31:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3563a3c
media-sound/amarok: use HTTPS
Package-Manager: Portage-2.3.6, Repoman-2.3.3
media-sound/amarok/amarok-2.8.90-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-sound/amarok/amarok-2.8.90-r3.ebuild b/media-sound/amarok/amarok-2.8.90-r3.ebuild
index 3d287faaca8..8f8dd6810d7 100644
--- a/media-sound/amarok/amarok-2.8.90-r3.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r3.ebuild
@@ -13,7 +13,7 @@ VIRTUALDBUS_TEST="true"
inherit flag-o-matic kde4-base pax-utils
DESCRIPTION="Advanced audio player based on KDE framework"
-HOMEPAGE="http://amarok.kde.org/"
+HOMEPAGE="https://amarok.kde.org/"
if [[ ${PV} != *9999* ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
KEYWORDS="amd64 x86"
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2017-08-17 18:58 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-08-17 18:58 UTC (permalink / raw
To: gentoo-commits
commit: 4ab56a9125cc9da06894eea41c799fa6af093a30
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 6 23:17:08 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 18:58:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab56a91
media-sound/amarok: DEPEND on kdelibs[plasma], add SQL_REQUIRED="always"
Package-Manager: Portage-2.3.6, Repoman-2.3.3
media-sound/amarok/amarok-2.8.90-r3.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-sound/amarok/amarok-2.8.90-r3.ebuild b/media-sound/amarok/amarok-2.8.90-r3.ebuild
index 8f8dd6810d7..8e0f55d7b5e 100644
--- a/media-sound/amarok/amarok-2.8.90-r3.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r3.ebuild
@@ -8,6 +8,7 @@ lt lv nb nl pa pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin
sv tr uk zh_CN zh_TW"
KDE_REQUIRED="never"
KDE_HANDBOOK="optional"
+SQL_REQUIRED="always"
VIRTUALX_REQUIRED="test"
VIRTUALDBUS_TEST="true"
inherit flag-o-matic kde4-base pax-utils
@@ -30,7 +31,7 @@ fi
# ipod requires gdk enabled and also gtk compiled in libgpod
COMMONDEPEND="
app-crypt/qca:2[qt4(+)]
- kde-frameworks/kdelibs:4[opengl?]
+ kde-frameworks/kdelibs:4[opengl?,plasma(+)]
$(add_kdeapps_dep kdebase-kioslaves)
>=media-libs/taglib-1.7[asf(+),mp4(+)]
>=media-libs/taglib-extras-1.0.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2017-08-27 9:35 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-08-27 9:35 UTC (permalink / raw
To: gentoo-commits
commit: 254d86078e18ac2c6a4548701bb00fda7bfec966
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 09:29:54 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 09:35:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=254d8607
media-sound/amarok: Drop USE=cdda
Seems it always was a no-op at build time.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
media-sound/amarok/amarok-2.8.90-r3.ebuild | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/media-sound/amarok/amarok-2.8.90-r3.ebuild b/media-sound/amarok/amarok-2.8.90-r3.ebuild
index 8e0f55d7b5e..9165fb8d31e 100644
--- a/media-sound/amarok/amarok-2.8.90-r3.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r3.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="GPL-2"
SLOT="4"
-IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
+IUSE="debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
if [[ ${KDE_BUILD_TYPE} == live ]]; then
RESTRICT+=" test"
@@ -41,20 +41,15 @@ COMMONDEPEND="
>=dev-qt/qtdbus-4.8:4
>=dev-qt/qtscript-4.8:4
>=x11-libs/qtscriptgenerator-0.1.0
- cdda? (
- $(add_kdeapps_dep libkcddb)
- $(add_kdeapps_dep libkcompactdisc)
- $(add_kdeapps_dep audiocd-kio)
- )
ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] )
mp3tunes? (
dev-libs/glib:2
dev-libs/libxml2
dev-libs/openssl:0
+ >=dev-qt/qtcore-4.8.4:4[glib]
net-libs/loudmouth
net-misc/curl
- >=dev-qt/qtcore-4.8.4:4[glib]
)
mtp? ( >=media-libs/libmtp-1.0.0 )
ofa? ( >=media-libs/libofa-0.9.0 )
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2017-12-03 17:20 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-12-03 17:20 UTC (permalink / raw
To: gentoo-commits
commit: d9f7604f7ff97bb7d512042c5fc130c0d039f788
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 3 17:14:22 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 3 17:14:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9f7604f
media-sound/amarok: Drop KDE_LINGUAS
Package-Manager: Portage-2.3.16, Repoman-2.3.6
media-sound/amarok/amarok-2.8.90-r4.ebuild | 133 +++++++++++++++++++++++++++++
1 file changed, 133 insertions(+)
diff --git a/media-sound/amarok/amarok-2.8.90-r4.ebuild b/media-sound/amarok/amarok-2.8.90-r4.ebuild
new file mode 100644
index 00000000000..59abced5c7c
--- /dev/null
+++ b/media-sound/amarok/amarok-2.8.90-r4.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_REQUIRED="never"
+KDE_HANDBOOK="optional"
+SQL_REQUIRED="always"
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit flag-o-matic kde4-base pax-utils
+
+DESCRIPTION="Advanced audio player based on KDE framework"
+HOMEPAGE="https://amarok.kde.org/"
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+ KEYWORDS="amd64 x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
+
+if [[ ${KDE_BUILD_TYPE} == live ]]; then
+ RESTRICT+=" test"
+fi
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+COMMONDEPEND="
+ $(add_kdeapps_dep kdebase-kioslaves)
+ app-crypt/qca:2[qt4]
+ >=dev-qt/qtcore-4.8:4
+ >=dev-qt/qtdbus-4.8:4
+ >=dev-qt/qtscript-4.8:4
+ >=kde-frameworks/kdelibs-4.14.37:4[opengl?,plasma]
+ >=media-libs/taglib-1.7[asf(+),mp4(+)]
+ >=media-libs/taglib-extras-1.0.1
+ sys-libs/zlib
+ >=virtual/mysql-5.1[embedded?]
+ >=x11-libs/qtscriptgenerator-0.1.0
+ ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+ lastfm? ( >=media-libs/liblastfm-1.0.3[qt4] )
+ mp3tunes? (
+ dev-libs/glib:2
+ dev-libs/libxml2
+ dev-libs/openssl:0
+ >=dev-qt/qtcore-4.8.4:4[glib]
+ net-libs/loudmouth
+ net-misc/curl
+ )
+ mtp? ( >=media-libs/libmtp-1.0.0 )
+ ofa? ( >=media-libs/libofa-0.9.0 )
+ opengl? ( virtual/opengl )
+"
+DEPEND="${COMMONDEPEND}
+ dev-util/automoc
+ virtual/pkgconfig
+ test? ( dev-cpp/gmock )
+"
+RDEPEND="${COMMONDEPEND}
+ !media-sound/amarok-utils
+ $(add_kdeapps_dep phonon-kde)
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.8.0-taglib110.patch"
+ "${FILESDIR}/${P}-mysql-embedded.patch"
+ "${FILESDIR}/${P}-mysqld-rpath.patch"
+ "${FILESDIR}/${P}-scriptconsole.patch"
+ "${FILESDIR}/${P}-gcc6.patch"
+ "${FILESDIR}/${P}-ffmpeg3.patch"
+ "${FILESDIR}/${P}-no-webkit.patch"
+)
+
+src_prepare() {
+ kde4-base_src_prepare
+
+ # requires qtwebkit
+ sed -i -e "s/wikipedia,//" data/amarok_homerc || die
+}
+
+src_configure() {
+ # Append minimal-toc cflag for ppc64, see bug 280552 and 292707
+ use ppc64 && append-flags -mminimal-toc
+
+ local mycmakeargs=(
+ -DWITH_PLAYER=ON
+ -DWITH_Libgcrypt=OFF
+ -DWITH_SPECTRUM_ANALYZER=OFF
+ -DWITH_NepomukCore=OFF
+ -DWITH_Soprano=OFF
+ -DWITH_MYSQL_EMBEDDED=$(usex embedded)
+ -DWITH_IPOD=$(usex ipod)
+ -DWITH_GDKPixBuf=$(usex ipod)
+ -DWITH_LibLastFm=$(usex lastfm)
+ -DWITH_MP3Tunes=$(usex mp3tunes)
+ -DWITH_Mtp=$(usex mtp)
+ -DWITH_LibOFA=$(usex ofa)
+ -DWITH_UTILITIES=$(usex utils)
+ )
+
+ # bug 581554: add libmysqld location for rpath patch
+ use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" )
+
+ kde4-base_src_configure
+}
+
+src_install() {
+ kde4-base_src_install
+
+ # bug 481592
+ pax-mark m "${ED}"/usr/bin/amarok
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+
+ 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
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2017-12-03 17:20 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-12-03 17:20 UTC (permalink / raw
To: gentoo-commits
commit: bfa8c870248106c33dca8629328d36979420cf9e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 3 17:14:58 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 3 17:14:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfa8c870
media-sound/amarok: Drop old
Package-Manager: Portage-2.3.16, Repoman-2.3.6
media-sound/amarok/amarok-2.8.90-r3.ebuild | 136 -----------------------------
1 file changed, 136 deletions(-)
diff --git a/media-sound/amarok/amarok-2.8.90-r3.ebuild b/media-sound/amarok/amarok-2.8.90-r3.ebuild
deleted file mode 100644
index 9165fb8d31e..00000000000
--- a/media-sound/amarok/amarok-2.8.90-r3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl hu it ja
-lt lv nb nl pa pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin
-sv tr uk zh_CN zh_TW"
-KDE_REQUIRED="never"
-KDE_HANDBOOK="optional"
-SQL_REQUIRED="always"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit flag-o-matic kde4-base pax-utils
-
-DESCRIPTION="Advanced audio player based on KDE framework"
-HOMEPAGE="https://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
- KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
-
-if [[ ${KDE_BUILD_TYPE} == live ]]; then
- RESTRICT+=" test"
-fi
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
- app-crypt/qca:2[qt4(+)]
- kde-frameworks/kdelibs:4[opengl?,plasma(+)]
- $(add_kdeapps_dep kdebase-kioslaves)
- >=media-libs/taglib-1.7[asf(+),mp4(+)]
- >=media-libs/taglib-extras-1.0.1
- sys-libs/zlib
- >=virtual/mysql-5.1[embedded?]
- >=dev-qt/qtcore-4.8:4
- >=dev-qt/qtdbus-4.8:4
- >=dev-qt/qtscript-4.8:4
- >=x11-libs/qtscriptgenerator-0.1.0
- ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
- lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] )
- mp3tunes? (
- dev-libs/glib:2
- dev-libs/libxml2
- dev-libs/openssl:0
- >=dev-qt/qtcore-4.8.4:4[glib]
- net-libs/loudmouth
- net-misc/curl
- )
- mtp? ( >=media-libs/libmtp-1.0.0 )
- ofa? ( >=media-libs/libofa-0.9.0 )
- opengl? ( virtual/opengl )
-"
-DEPEND="${COMMONDEPEND}
- dev-util/automoc
- virtual/pkgconfig
- test? ( dev-cpp/gmock )
-"
-RDEPEND="${COMMONDEPEND}
- !media-sound/amarok-utils
- $(add_kdeapps_dep phonon-kde)
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.8.0-taglib110.patch"
- "${FILESDIR}/${P}-mysql-embedded.patch"
- "${FILESDIR}/${P}-mysqld-rpath.patch"
- "${FILESDIR}/${P}-scriptconsole.patch"
- "${FILESDIR}/${P}-gcc6.patch"
- "${FILESDIR}/${P}-ffmpeg3.patch"
- "${FILESDIR}/${P}-no-webkit.patch"
-)
-
-src_prepare() {
- kde4-base_src_prepare
-
- # requires qtwebkit
- sed -i -e "s/wikipedia,//" data/amarok_homerc || die
-}
-
-src_configure() {
- # Append minimal-toc cflag for ppc64, see bug 280552 and 292707
- use ppc64 && append-flags -mminimal-toc
-
- local mycmakeargs=(
- -DWITH_PLAYER=ON
- -DWITH_Libgcrypt=OFF
- -DWITH_SPECTRUM_ANALYZER=OFF
- -DWITH_NepomukCore=OFF
- -DWITH_Soprano=OFF
- -DWITH_MYSQL_EMBEDDED=$(usex embedded)
- -DWITH_IPOD=$(usex ipod)
- -DWITH_GDKPixBuf=$(usex ipod)
- -DWITH_LibLastFm=$(usex lastfm)
- -DWITH_MP3Tunes=$(usex mp3tunes)
- -DWITH_Mtp=$(usex mtp)
- -DWITH_LibOFA=$(usex ofa)
- -DWITH_UTILITIES=$(usex utils)
- )
-
- # bug 581554: add libmysqld location for rpath patch
- use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" )
-
- kde4-base_src_configure
-}
-
-src_install() {
- kde4-base_src_install
-
- # bug 481592
- pax-mark m "${ED}"/usr/bin/amarok
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- 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
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2017-12-03 23:04 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-12-03 23:04 UTC (permalink / raw
To: gentoo-commits
commit: 9f322bb49c87779bd26d0acc79716cb3b0263da2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 3 23:01:04 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 3 23:03:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f322bb4
media-sound/amarok: Drop bogus USE=opengl
Not used at all since -DWITH_SPECTRUM_ANALYZER=OFF.
Package-Manager: Portage-2.3.16, Repoman-2.3.6
media-sound/amarok/Manifest | 2 +-
media-sound/amarok/amarok-2.8.90-r4.ebuild | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 81273e9657d..48cb29a3906 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1 +1 @@
-DIST amarok-2.8.90.tar.xz 48890580 SHA256 b057369ab70d192b669ee6c2c11e9e7d4140663f6a60d6175ef0bb56b4bef9a7 SHA512 1ff5f43100dbe027c8676946a4e82e914927b03ac0bb9e95bfc7e9e03fcc1cad81d9ea2a343bc4f644a025242e224ea9ae3cae7423d68b0b3c68f346922537fc WHIRLPOOL 22da35ea61dcda04d882f4c0da7327cab10edf50140b3ae891738d10e1b9e5062eb541e35e817fd04a7f0284eb085b5ccf3edfa20438b764a9ce3615de35ca8c
+DIST amarok-2.8.90.tar.xz 48890580 BLAKE2B 81367b491237abd7a6201d94ea39412a7a69867553c688d9c691749102ac8eb6e59ab5ff17d3b74718211e4975e1daacb15ef3bc1bc35d82954de890213eb544 SHA512 1ff5f43100dbe027c8676946a4e82e914927b03ac0bb9e95bfc7e9e03fcc1cad81d9ea2a343bc4f644a025242e224ea9ae3cae7423d68b0b3c68f346922537fc
diff --git a/media-sound/amarok/amarok-2.8.90-r4.ebuild b/media-sound/amarok/amarok-2.8.90-r4.ebuild
index 59abced5c7c..4ea07c89b53 100644
--- a/media-sound/amarok/amarok-2.8.90-r4.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r4.ebuild
@@ -19,7 +19,7 @@ fi
LICENSE="GPL-2"
SLOT="4"
-IUSE="debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
+IUSE="debug +embedded ipod lastfm mp3tunes mtp ofa test +utils"
if [[ ${KDE_BUILD_TYPE} == live ]]; then
RESTRICT+=" test"
@@ -32,7 +32,7 @@ COMMONDEPEND="
>=dev-qt/qtcore-4.8:4
>=dev-qt/qtdbus-4.8:4
>=dev-qt/qtscript-4.8:4
- >=kde-frameworks/kdelibs-4.14.37:4[opengl?,plasma]
+ >=kde-frameworks/kdelibs-4.14.37:4[plasma]
>=media-libs/taglib-1.7[asf(+),mp4(+)]
>=media-libs/taglib-extras-1.0.1
sys-libs/zlib
@@ -50,7 +50,6 @@ COMMONDEPEND="
)
mtp? ( >=media-libs/libmtp-1.0.0 )
ofa? ( >=media-libs/libofa-0.9.0 )
- opengl? ( virtual/opengl )
"
DEPEND="${COMMONDEPEND}
dev-util/automoc
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2017-12-04 12:29 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-12-04 12:29 UTC (permalink / raw
To: gentoo-commits
commit: d84b8b4ffb993c6d4e1816964b237dd48300e06e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 4 12:21:36 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 4 12:29:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d84b8b4f
media-sound/amarok: Fix cmake warnings
Cosmetics, basically.
Package-Manager: Portage-2.3.13, Repoman-2.3.4
media-sound/amarok/amarok-2.8.90-r5.ebuild | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/media-sound/amarok/amarok-2.8.90-r5.ebuild b/media-sound/amarok/amarok-2.8.90-r5.ebuild
index 4ea07c89b53..6243ec7ac44 100644
--- a/media-sound/amarok/amarok-2.8.90-r5.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r5.ebuild
@@ -76,6 +76,14 @@ src_prepare() {
# requires qtwebkit
sed -i -e "s/wikipedia,//" data/amarok_homerc || die
+
+ sed -i -e "/macro_log_feature.*QT_QTOPENGL_FOUND/d" \
+ CMakeLists.txt \
+ || die "failed to remove QT_QTOPENGL detection"
+
+ sed -i -e "/if/ s/QT_QTOPENGL_FOUND/FALSE/" \
+ src/context/applets/CMakeLists.txt \
+ || die "failed to sed out QT_QTOPENGL_FOUND"
}
src_configure() {
@@ -84,13 +92,10 @@ src_configure() {
local mycmakeargs=(
-DWITH_PLAYER=ON
- -DWITH_Libgcrypt=OFF
- -DWITH_SPECTRUM_ANALYZER=OFF
-DWITH_NepomukCore=OFF
-DWITH_Soprano=OFF
-DWITH_MYSQL_EMBEDDED=$(usex embedded)
-DWITH_IPOD=$(usex ipod)
- -DWITH_GDKPixBuf=$(usex ipod)
-DWITH_LibLastFm=$(usex lastfm)
-DWITH_MP3Tunes=$(usex mp3tunes)
-DWITH_Mtp=$(usex mtp)
@@ -98,6 +103,9 @@ src_configure() {
-DWITH_UTILITIES=$(usex utils)
)
+ use ipod && mycmakeargs+=( DWITH_GDKPixBuf=ON )
+ use mp3tunes && mycmakeargs+=( -DWITH_Libgcrypt=OFF )
+
# bug 581554: add libmysqld location for rpath patch
use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" )
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2017-12-04 12:29 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-12-04 12:29 UTC (permalink / raw
To: gentoo-commits
commit: 14e3890ce25c94da9c5d2a5964a2f372612a7a73
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 4 12:20:50 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 4 12:29:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14e3890c
media-sound/amarok: Copy -r4 to -r5 fixes build...
Stranger things. The same ebuild simply fails to build as -r4.
Bug: https://bugs.gentoo.org/639736
Package-Manager: Portage-2.3.13, Repoman-2.3.4
media-sound/amarok/amarok-2.8.90-r5.ebuild | 132 +++++++++++++++++++++++++++++
1 file changed, 132 insertions(+)
diff --git a/media-sound/amarok/amarok-2.8.90-r5.ebuild b/media-sound/amarok/amarok-2.8.90-r5.ebuild
new file mode 100644
index 00000000000..4ea07c89b53
--- /dev/null
+++ b/media-sound/amarok/amarok-2.8.90-r5.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_REQUIRED="never"
+KDE_HANDBOOK="optional"
+SQL_REQUIRED="always"
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit flag-o-matic kde4-base pax-utils
+
+DESCRIPTION="Advanced audio player based on KDE framework"
+HOMEPAGE="https://amarok.kde.org/"
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+ KEYWORDS="amd64 x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="debug +embedded ipod lastfm mp3tunes mtp ofa test +utils"
+
+if [[ ${KDE_BUILD_TYPE} == live ]]; then
+ RESTRICT+=" test"
+fi
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+COMMONDEPEND="
+ $(add_kdeapps_dep kdebase-kioslaves)
+ app-crypt/qca:2[qt4]
+ >=dev-qt/qtcore-4.8:4
+ >=dev-qt/qtdbus-4.8:4
+ >=dev-qt/qtscript-4.8:4
+ >=kde-frameworks/kdelibs-4.14.37:4[plasma]
+ >=media-libs/taglib-1.7[asf(+),mp4(+)]
+ >=media-libs/taglib-extras-1.0.1
+ sys-libs/zlib
+ >=virtual/mysql-5.1[embedded?]
+ >=x11-libs/qtscriptgenerator-0.1.0
+ ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+ lastfm? ( >=media-libs/liblastfm-1.0.3[qt4] )
+ mp3tunes? (
+ dev-libs/glib:2
+ dev-libs/libxml2
+ dev-libs/openssl:0
+ >=dev-qt/qtcore-4.8.4:4[glib]
+ net-libs/loudmouth
+ net-misc/curl
+ )
+ mtp? ( >=media-libs/libmtp-1.0.0 )
+ ofa? ( >=media-libs/libofa-0.9.0 )
+"
+DEPEND="${COMMONDEPEND}
+ dev-util/automoc
+ virtual/pkgconfig
+ test? ( dev-cpp/gmock )
+"
+RDEPEND="${COMMONDEPEND}
+ !media-sound/amarok-utils
+ $(add_kdeapps_dep phonon-kde)
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.8.0-taglib110.patch"
+ "${FILESDIR}/${P}-mysql-embedded.patch"
+ "${FILESDIR}/${P}-mysqld-rpath.patch"
+ "${FILESDIR}/${P}-scriptconsole.patch"
+ "${FILESDIR}/${P}-gcc6.patch"
+ "${FILESDIR}/${P}-ffmpeg3.patch"
+ "${FILESDIR}/${P}-no-webkit.patch"
+)
+
+src_prepare() {
+ kde4-base_src_prepare
+
+ # requires qtwebkit
+ sed -i -e "s/wikipedia,//" data/amarok_homerc || die
+}
+
+src_configure() {
+ # Append minimal-toc cflag for ppc64, see bug 280552 and 292707
+ use ppc64 && append-flags -mminimal-toc
+
+ local mycmakeargs=(
+ -DWITH_PLAYER=ON
+ -DWITH_Libgcrypt=OFF
+ -DWITH_SPECTRUM_ANALYZER=OFF
+ -DWITH_NepomukCore=OFF
+ -DWITH_Soprano=OFF
+ -DWITH_MYSQL_EMBEDDED=$(usex embedded)
+ -DWITH_IPOD=$(usex ipod)
+ -DWITH_GDKPixBuf=$(usex ipod)
+ -DWITH_LibLastFm=$(usex lastfm)
+ -DWITH_MP3Tunes=$(usex mp3tunes)
+ -DWITH_Mtp=$(usex mtp)
+ -DWITH_LibOFA=$(usex ofa)
+ -DWITH_UTILITIES=$(usex utils)
+ )
+
+ # bug 581554: add libmysqld location for rpath patch
+ use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" )
+
+ kde4-base_src_configure
+}
+
+src_install() {
+ kde4-base_src_install
+
+ # bug 481592
+ pax-mark m "${ED}"/usr/bin/amarok
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+
+ 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
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2017-12-09 21:28 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-12-09 21:28 UTC (permalink / raw
To: gentoo-commits
commit: b3e5c28c145f7d089be2829f48e39567328ca6f0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 21:28:23 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 9 21:28:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3e5c28c
media-sound/amarok: Drop mysteriously broken -r4
Package-Manager: Portage-2.3.17, Repoman-2.3.6
media-sound/amarok/amarok-2.8.90-r4.ebuild | 132 -----------------------------
1 file changed, 132 deletions(-)
diff --git a/media-sound/amarok/amarok-2.8.90-r4.ebuild b/media-sound/amarok/amarok-2.8.90-r4.ebuild
deleted file mode 100644
index 4ea07c89b53..00000000000
--- a/media-sound/amarok/amarok-2.8.90-r4.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_REQUIRED="never"
-KDE_HANDBOOK="optional"
-SQL_REQUIRED="always"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit flag-o-matic kde4-base pax-utils
-
-DESCRIPTION="Advanced audio player based on KDE framework"
-HOMEPAGE="https://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
- KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="debug +embedded ipod lastfm mp3tunes mtp ofa test +utils"
-
-if [[ ${KDE_BUILD_TYPE} == live ]]; then
- RESTRICT+=" test"
-fi
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
- $(add_kdeapps_dep kdebase-kioslaves)
- app-crypt/qca:2[qt4]
- >=dev-qt/qtcore-4.8:4
- >=dev-qt/qtdbus-4.8:4
- >=dev-qt/qtscript-4.8:4
- >=kde-frameworks/kdelibs-4.14.37:4[plasma]
- >=media-libs/taglib-1.7[asf(+),mp4(+)]
- >=media-libs/taglib-extras-1.0.1
- sys-libs/zlib
- >=virtual/mysql-5.1[embedded?]
- >=x11-libs/qtscriptgenerator-0.1.0
- ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
- lastfm? ( >=media-libs/liblastfm-1.0.3[qt4] )
- mp3tunes? (
- dev-libs/glib:2
- dev-libs/libxml2
- dev-libs/openssl:0
- >=dev-qt/qtcore-4.8.4:4[glib]
- net-libs/loudmouth
- net-misc/curl
- )
- mtp? ( >=media-libs/libmtp-1.0.0 )
- ofa? ( >=media-libs/libofa-0.9.0 )
-"
-DEPEND="${COMMONDEPEND}
- dev-util/automoc
- virtual/pkgconfig
- test? ( dev-cpp/gmock )
-"
-RDEPEND="${COMMONDEPEND}
- !media-sound/amarok-utils
- $(add_kdeapps_dep phonon-kde)
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.8.0-taglib110.patch"
- "${FILESDIR}/${P}-mysql-embedded.patch"
- "${FILESDIR}/${P}-mysqld-rpath.patch"
- "${FILESDIR}/${P}-scriptconsole.patch"
- "${FILESDIR}/${P}-gcc6.patch"
- "${FILESDIR}/${P}-ffmpeg3.patch"
- "${FILESDIR}/${P}-no-webkit.patch"
-)
-
-src_prepare() {
- kde4-base_src_prepare
-
- # requires qtwebkit
- sed -i -e "s/wikipedia,//" data/amarok_homerc || die
-}
-
-src_configure() {
- # Append minimal-toc cflag for ppc64, see bug 280552 and 292707
- use ppc64 && append-flags -mminimal-toc
-
- local mycmakeargs=(
- -DWITH_PLAYER=ON
- -DWITH_Libgcrypt=OFF
- -DWITH_SPECTRUM_ANALYZER=OFF
- -DWITH_NepomukCore=OFF
- -DWITH_Soprano=OFF
- -DWITH_MYSQL_EMBEDDED=$(usex embedded)
- -DWITH_IPOD=$(usex ipod)
- -DWITH_GDKPixBuf=$(usex ipod)
- -DWITH_LibLastFm=$(usex lastfm)
- -DWITH_MP3Tunes=$(usex mp3tunes)
- -DWITH_Mtp=$(usex mtp)
- -DWITH_LibOFA=$(usex ofa)
- -DWITH_UTILITIES=$(usex utils)
- )
-
- # bug 581554: add libmysqld location for rpath patch
- use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" )
-
- kde4-base_src_configure
-}
-
-src_install() {
- kde4-base_src_install
-
- # bug 481592
- pax-mark m "${ED}"/usr/bin/amarok
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- 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
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/
@ 2017-12-14 8:32 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-12-14 8:32 UTC (permalink / raw
To: gentoo-commits
commit: c4e522aa3d9ce868636ab72a933ca89dc265e14e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 08:19:49 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 08:32:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4e522aa
media-sound/amarok: pkg_postinst: Fix MySQL config link
Package-Manager: Portage-2.3.13, Repoman-2.3.4
media-sound/amarok/amarok-2.8.90-r5.ebuild | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/media-sound/amarok/amarok-2.8.90-r5.ebuild b/media-sound/amarok/amarok-2.8.90-r5.ebuild
index 6243ec7ac44..ee89cf93d54 100644
--- a/media-sound/amarok/amarok-2.8.90-r5.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r5.ebuild
@@ -123,18 +123,15 @@ pkg_postinst() {
kde4-base_pkg_postinst
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 "Please read https://community.kde.org/Amarok/Community/MySQL 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
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
}
^ permalink raw reply related [flat|nested] 21+ messages in thread
end of thread, other threads:[~2017-12-14 8:32 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-19 21:24 [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/ Ian Stakenvicius
-- strict thread matches above, loose matches on Subject: below --
2017-12-14 8:32 Andreas Sturmlechner
2017-12-09 21:28 Andreas Sturmlechner
2017-12-04 12:29 Andreas Sturmlechner
2017-12-04 12:29 Andreas Sturmlechner
2017-12-03 23:04 Andreas Sturmlechner
2017-12-03 17:20 Andreas Sturmlechner
2017-12-03 17:20 Andreas Sturmlechner
2017-08-27 9:35 Andreas Sturmlechner
2017-08-17 18:58 Andreas Sturmlechner
2017-08-12 14:31 Michael Palimaka
2017-06-30 17:27 Andreas Sturmlechner
2017-06-30 11:10 Agostino Sarubbo
2017-06-28 13:19 Agostino Sarubbo
2017-02-24 13:38 Agostino Sarubbo
2017-02-24 13:20 Agostino Sarubbo
2016-07-21 9:40 Michael Palimaka
2016-07-07 17:52 Michael Palimaka
2016-05-18 21:50 Johannes Huber
2015-12-31 9:17 Michael Palimaka
2015-08-12 20:05 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox