From a833e3f4a431b8eea751b7420e127787f9c92117 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 4 Dec 2017 12:06:33 +0000 Subject: gentoo resync : 04.12.2017 --- media-sound/amarok/Manifest | 4 +- media-sound/amarok/amarok-2.8.90-r3.ebuild | 136 ----------------------------- media-sound/amarok/amarok-2.8.90-r4.ebuild | 132 ++++++++++++++++++++++++++++ 3 files changed, 134 insertions(+), 138 deletions(-) delete mode 100644 media-sound/amarok/amarok-2.8.90-r3.ebuild create mode 100644 media-sound/amarok/amarok-2.8.90-r4.ebuild (limited to 'media-sound/amarok') diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest index 5f1eaabd6082..aae28f63a0d8 100644 --- a/media-sound/amarok/Manifest +++ b/media-sound/amarok/Manifest @@ -5,6 +5,6 @@ AUX amarok-2.8.90-mysql-embedded.patch 1224 BLAKE2B acc4b0abb2a7e000c76e0a07a109 AUX amarok-2.8.90-mysqld-rpath.patch 573 BLAKE2B d56b77592e73d624269b8611751f7595e05aad139e65357c004e748f7edf3f41af54c5e3c823904dd4e44c4c2f92c6fc8db0087856967cba699206143f05f9a0 SHA512 724ee90912883baa374bdf8ceca77e1d8ec809279f2254705624fb3966e8300ed02a0ddfc4613e8b9add2b7b20eed333619b3c1d1426e14e5f8ce60bdff39be5 AUX amarok-2.8.90-no-webkit.patch 1126 BLAKE2B 14b1fc1b3a5c20437896256a6692430934f351754c33b07c8eb61073c75577e70853834dc995474beb8b57464e04a66b143fafb405a451950a5add61f98f8620 SHA512 1c45e9d3f4d8cd9fe6adc1a10b78f7b439a0dddb09ccff399bc3ded62207d6862d61dd5bfaccceb7044f4740f59824a6c8eae34d2e9b2de9a400ffb3305a0707 AUX amarok-2.8.90-scriptconsole.patch 1272 BLAKE2B 7483f7d7cbe3351d0ccca3c593ec49641076755f38d3cfcabd426c321957fddae7855016d2ff0ecfccb03b6b8e21017c769bd1717bdcb961b3789877538942cc SHA512 3bc31284faa45c717342917f220f7ae078e1f6b0afd313bf8f2ba28b97badb4d56dafcc1a319655b2ae01dee37e09ff34978af95d1743105be8f118be2c61c9d -DIST amarok-2.8.90.tar.xz 48890580 SHA256 b057369ab70d192b669ee6c2c11e9e7d4140663f6a60d6175ef0bb56b4bef9a7 SHA512 1ff5f43100dbe027c8676946a4e82e914927b03ac0bb9e95bfc7e9e03fcc1cad81d9ea2a343bc4f644a025242e224ea9ae3cae7423d68b0b3c68f346922537fc WHIRLPOOL 22da35ea61dcda04d882f4c0da7327cab10edf50140b3ae891738d10e1b9e5062eb541e35e817fd04a7f0284eb085b5ccf3edfa20438b764a9ce3615de35ca8c -EBUILD amarok-2.8.90-r3.ebuild 3574 BLAKE2B cf88754088472335c20674252e6dbfba14c9c0a7455bc30d736acc2f910be242b2b7e7be5b9e27352461cc4f0dad47d9578214cf0887a0f2cf68ec1b28e598b0 SHA512 cbc17f61a90484f93ccb604ddb4928ac5de0036134cca4d3065d80d8a0c95aa64d9df638dd12d530be0460e96b22ecc91efb53e7e82687171bfd45e05fd984b7 +DIST amarok-2.8.90.tar.xz 48890580 BLAKE2B 81367b491237abd7a6201d94ea39412a7a69867553c688d9c691749102ac8eb6e59ab5ff17d3b74718211e4975e1daacb15ef3bc1bc35d82954de890213eb544 SHA512 1ff5f43100dbe027c8676946a4e82e914927b03ac0bb9e95bfc7e9e03fcc1cad81d9ea2a343bc4f644a025242e224ea9ae3cae7423d68b0b3c68f346922537fc +EBUILD amarok-2.8.90-r4.ebuild 3352 BLAKE2B cc0d968babc2bcb1fc440caa30438a1e86c25d5443a068aaba1cca653cf19330d3940c2aa3396894e1a9cedee29425b6f8003d20bfda03c3d48f775d2ce60e02 SHA512 dce046da09c14af58a7f63505516e9618a46577f861dd8c62a7144c42ef455123f032bc97742bbcdb2319deb5965f6f697e0b1b6899695cae6c6214c571721a9 MISC metadata.xml 1159 BLAKE2B b986025a8d81ead2cc821ebc5a9bc6f447d4356615127b1795b337068f0457c1a5ee15b380822ef7fcf5eea6f24ef9e48d93329df0947c500a519978db6b1b31 SHA512 0b4a4a1f388183923ce0d9f31bd622194165421c6db388fa4091b41aec8a343d6fb19c3bbac9dd288102bebf66c74df5ce81b14270dc954d8a68f7e0f76d318e 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 9165fb8d31e0..000000000000 --- 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 -} 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 000000000000..4ea07c89b53e --- /dev/null +++ b/media-sound/amarok/amarok-2.8.90-r4.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 +} -- cgit v1.2.3