From: Johannes Huber Date: Thu, 6 Apr 2017 19:36:47 +0000 (+0200) Subject: media-libs/libechonest: Remove last-rited pkg X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8c83524fa3bd94055963cfb155c61b3656426bd9;p=gentoo.git media-libs/libechonest: Remove last-rited pkg --- diff --git a/media-libs/libechonest/Manifest b/media-libs/libechonest/Manifest deleted file mode 100644 index b640a5a0bee7..000000000000 --- a/media-libs/libechonest/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST libechonest-2.0.2.tar.bz2 82005 SHA256 e0d9b3fe7bf5fff0ce8d0f182c4cac8ea3b478c57be21549fc57da69c1a3088c SHA512 fb8baf396206cc567ae880c3f19191bd5a723820a8a8f7ea96f1065cea88c213b46ec9f7688838353331bdac105893c4e9ea118e5b17cdda313dce5ba810a1fb WHIRLPOOL d1bfd6059c5e648e190bf4ba9ddb5a3bdaeca8af346c34dc0f0177f3f05314b491f37bba2ad05944e6ff9b4ddd88e7042a089c9ecb370e75b61b6b405aa5e8d7 -DIST libechonest-2.2.0.tar.bz2 84242 SHA256 f2c043a3564bc9c5a4556a80737d1440519ced583feaa62f7afa362e35e81ee0 SHA512 482df30a7a139b14da28d752cff405267bae8af448014857aa5151c08312bcb1144039dc962c85d1613d013446eede8b97efca970801262a240a5f790e95d48e WHIRLPOOL d836f14163168f455311ed30ded1cd860311913693de41f24d6416419128487f6568fd4b8f9e52cb02ffe72b2418c46d2ffb55cab7f432b6a861dc295a99347c -DIST libechonest-2.3.0.tar.bz2 87798 SHA256 79983ba72fbf9b112ebfb329b96b60eddf25d719ebe34eb70de01aa106ae2b44 SHA512 c6c01b463e9d3c5ab7178454d2341e61e4f4f184e0082cf4d0ea13a95752dbff2d3dee4bdc3aa2480265db6677611c9d9228c83da322242d23f5e67a7f0ee0f3 WHIRLPOOL 421257e75aea2a4a6b5d092fe5e579bc4759c8d51a59cc6e1587936c080bf6601fb30cad303f86f6a599ab4f3584abef6b2cea0fc1802f0f4f59bfae749ce6d8 -DIST libechonest-2.3.1.tar.bz2 87729 SHA256 56756545fd1cb3d9067479f52215b6157c1ced2bc82b895e72fdcd9bebb47889 SHA512 6d4c3571680657d01516e1fa5c55478a25931a825801b06b7bdd6d16715fe2a72385bd8e74be95e15b8fd2521f8b9f7bde5c2afe73a7bbc1faeba9fadd80d2f3 WHIRLPOOL 003b799295075f07310666d3352fb1dfd8704608d5595dd1962e31c3f1946af96c3fe28d4e7aa5e6ad75b77c9ed4eb803c5eeb00019007a18a30f37dc6ddb296 diff --git a/media-libs/libechonest/files/libechonest-2.0.1-Werror.patch b/media-libs/libechonest/files/libechonest-2.0.1-Werror.patch deleted file mode 100644 index af8b1b9a814f..000000000000 --- a/media-libs/libechonest/files/libechonest-2.0.1-Werror.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Julian Ospald -Date: Thu Dec 27 22:58:59 UTC 2012 -Subject: build system - - only enable Werror for development - ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -5,6 +5,10 @@ - - cmake_minimum_required( VERSION 2.6 ) - -+# options -+option(WERROR "enable -Werror for development" OFF) -+option(ECHONEST_BUILD_TESTS "Build all unit tests" ON) -+ - set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" ) - -@@ -32,8 +36,12 @@ - endif() - - # disable -Werror on ARM since Qt containers cause a lot of alignment warnings -- if ( NOT CMAKE_SYSTEM_PROCESSOR MATCHES "arm" ) -- add_definitions( -Werror ) -+ if (WERROR) -+ if ( NOT CMAKE_SYSTEM_PROCESSOR MATCHES "arm" ) -+ add_definitions( -Werror ) -+ else() -+ message( STATUS "-Werror breaks this package on ARM, disabled!" ) -+ endif() - endif() - - # to be added: -@@ -48,8 +56,6 @@ - endif(MSVC) - - --option(ECHONEST_BUILD_TESTS "Build all unit tests" ON) -- - if(ECHONEST_BUILD_TESTS) - enable_testing() - endif(ECHONEST_BUILD_TESTS) diff --git a/media-libs/libechonest/files/libechonest-2.2.0-always_use_QJSON_LIBRARIES.patch b/media-libs/libechonest/files/libechonest-2.2.0-always_use_QJSON_LIBRARIES.patch deleted file mode 100644 index 9edd035979c7..000000000000 --- a/media-libs/libechonest/files/libechonest-2.2.0-always_use_QJSON_LIBRARIES.patch +++ /dev/null @@ -1,23 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=503656#c4 -http://github.com/lfranchi/libechonest/pull/14 - ---- src/CMakeLists.txt -+++ src/CMakeLists.txt -@@ -40,16 +40,8 @@ - - QT_WRAP_CPP( ${LIBECHONEST_H} ) - --SET( OS_SPECIFIC_LINK_LIBRARIES "" ) --IF( APPLE OR MINGW ) -- SET( OS_SPECIFIC_LINK_LIBRARIES ${QJSON_LIBRARIES} ) --ELSE( APPLE OR MINGW ) -- SET( OS_SPECIFIC_LINK_LIBRARIES ${QJSON_LDFLAGS} ) --ENDIF( APPLE OR MINGW ) -- -- - add_library( echonest SHARED ${LIBECHONEST_SRC} ) --target_link_libraries( echonest ${OS_SPECIFIC_LINK_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ) -+target_link_libraries( echonest ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QJSON_LIBRARIES} ) - set_target_properties( echonest PROPERTIES VERSION ${ECHONEST_LIB_VERSION} SOVERSION ${ECHONEST_LIB_VERSION_SONAME} ) - qt5_use_modules( echonest Core Network Xml ) - install( TARGETS echonest RUNTIME DESTINATION bin diff --git a/media-libs/libechonest/files/libechonest-2.3.1-Don-t-double-encode-on-Qt4.patch b/media-libs/libechonest/files/libechonest-2.3.1-Don-t-double-encode-on-Qt4.patch deleted file mode 100644 index 1a7b93b90245..000000000000 --- a/media-libs/libechonest/files/libechonest-2.3.1-Don-t-double-encode-on-Qt4.patch +++ /dev/null @@ -1,78 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=581844 -https://github.com/lfranchi/libechonest/issues/27 - -From 009514f65044823ef29045397d4b58dd04d09977 Mon Sep 17 00:00:00 2001 -From: Leo Franchi -Date: Mon, 18 May 2015 22:08:31 -0400 -Subject: [PATCH 1/2] Don't double-encode on Qt4 - -Fixes issue #27 ---- - src/Util.cpp | 4 +++- - tests/PlaylistTest.cpp | 22 ++++++++++++++++++++++ - tests/PlaylistTest.h | 1 + - 3 files changed, 26 insertions(+), 1 deletion(-) - -diff --git a/src/Util.cpp b/src/Util.cpp -index 8401e8c..595435b 100644 ---- a/src/Util.cpp -+++ b/src/Util.cpp -@@ -150,7 +150,9 @@ void Echonest::urlAddQueryItem(QUrl& url, const QString& key, const QString& val - urlQuery.addQueryItem( key, value ); - url.setQuery( urlQuery ); - #else -- url.addQueryItem( key, value ); -+ // We assume here that the key and values, though QStrings, are actually latin1 and not UTF-8. -+ // That is, they've already gone through playlistParamToString(). This is terrible. -+ url.addEncodedQueryItem( key.toLatin1(), value.toLatin1() ); - #endif - } - -diff --git a/tests/PlaylistTest.cpp b/tests/PlaylistTest.cpp -index 6f7c606..2ec7eb2 100644 ---- a/tests/PlaylistTest.cpp -+++ b/tests/PlaylistTest.cpp -@@ -201,6 +201,28 @@ void PlaylistTest::testStaticXSPF() - } - - -+void PlaylistTest::testStaticWithSpecialChars() -+{ -+ DynamicPlaylist::PlaylistParams p; -+ p.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Artist, QString::fromUtf8( "Björk" ) ) ); -+ p.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::ArtistRadioType ) ); -+ p.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Results, 10 ) ); -+ -+ QNetworkReply* reply = DynamicPlaylist::staticPlaylist( p ); -+ -+ QVERIFY( reply->url().toEncoded() == "http://developer.echonest.com/api/v4/playlist/static?api_key=JGJCRKWLXLBZIFAZB&format=xml&artist=Bj%C3%B6rk&type=artist-radio&results=10" ); -+ -+ QEventLoop loop; -+ loop.connect( reply, SIGNAL(finished()), SLOT(quit()) ); -+ loop.exec(); -+ SongList songs = DynamicPlaylist::parseStaticPlaylist( reply ); -+ -+ QVERIFY( songs.size() == 10 ); -+ Q_FOREACH( const Song& song, songs ) -+ QVERIFY( !song.id().isEmpty() ); -+ -+} -+ - void PlaylistTest::testDynamic1() - { - DynamicPlaylist::PlaylistParams p; -diff --git a/tests/PlaylistTest.h b/tests/PlaylistTest.h -index 9d75c05..71c21d6 100644 ---- a/tests/PlaylistTest.h -+++ b/tests/PlaylistTest.h -@@ -30,6 +30,7 @@ private slots: - void testStaticArtistYears(); - void testStaticWithSongType(); - void testStaticXSPF(); -+ void testStaticWithSpecialChars(); - void testDynamic1(); - void testDynamic2(); - void testNewDynamicAPI(); --- -2.7.4 - diff --git a/media-libs/libechonest/libechonest-2.0.2.ebuild b/media-libs/libechonest/libechonest-2.0.2.ebuild deleted file mode 100644 index f543b14271b4..000000000000 --- a/media-libs/libechonest/libechonest-2.0.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit cmake-utils - -DESCRIPTION="A library for communicating with The Echo Nest" -HOMEPAGE="https://projects.kde.org/projects/playground/libs/libechonest" -SRC_URI="http://files.lfranchi.com/${P}.tar.bz2 - http://pwsp.cleinias.com/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RESTRICT="test" # Networking required - -RDEPEND=">=dev-libs/qjson-0.5 - dev-qt/qtcore:4" -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-qt/qttest:4" - -PATCHES=( "${FILESDIR}"/${PN}-2.0.1-Werror.patch ) - -DOCS=( AUTHORS README TODO ) diff --git a/media-libs/libechonest/libechonest-2.2.0-r1.ebuild b/media-libs/libechonest/libechonest-2.2.0-r1.ebuild deleted file mode 100644 index 84692501ffeb..000000000000 --- a/media-libs/libechonest/libechonest-2.2.0-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit cmake-utils - -DESCRIPTION="A library for communicating with The Echo Nest" -HOMEPAGE="https://projects.kde.org/projects/playground/libs/libechonest" -SRC_URI="http://files.lfranchi.com/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0/2.2" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RESTRICT="test" # Networking required - -RDEPEND=">=dev-libs/qjson-0.5 - dev-qt/qtcore:4" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( AUTHORS README TODO ) - -PATCHES=( "${FILESDIR}"/${P}-always_use_QJSON_LIBRARIES.patch ) - -src_prepare() { - cmake-utils_src_prepare - sed -i -e '/find_package/s/QtTest//' CMakeLists.txt || die #507086 -} - -src_configure() { - local mycmakeargs=( - -DECHONEST_BUILD_TESTS=OFF - ) - cmake-utils_src_configure -} diff --git a/media-libs/libechonest/libechonest-2.3.0.ebuild b/media-libs/libechonest/libechonest-2.3.0.ebuild deleted file mode 100644 index 20e514fd9677..000000000000 --- a/media-libs/libechonest/libechonest-2.3.0.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit cmake-utils multibuild - -DESCRIPTION="A library for communicating with The Echo Nest" -HOMEPAGE="https://projects.kde.org/projects/playground/libs/libechonest" -SRC_URI="http://files.lfranchi.com/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0/2.3" -KEYWORDS="~amd64 ~x86" -IUSE="+qt4 qt5" - -RESTRICT="test" # Networking required - -RDEPEND=" - qt4? ( - dev-libs/qjson[qt4(+)] - dev-qt/qtcore:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( AUTHORS README TODO ) - -pkg_setup() { - MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) -} - -src_configure() { - myconfigure() { - local mycmakeargs=( - -DECHONEST_BUILD_TESTS=OFF - ) - - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then - mycmakeargs+=(-DBUILD_WITH_QT4=ON) - fi - - if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then - mycmakeargs+=(-DBUILD_WITH_QT4=OFF) - fi - - cmake-utils_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant cmake-utils_src_compile -} - -src_test() { - multibuild_foreach_variant cmake-utils_src_test -} - -src_install() { - multibuild_foreach_variant cmake-utils_src_install -} diff --git a/media-libs/libechonest/libechonest-2.3.1-r1.ebuild b/media-libs/libechonest/libechonest-2.3.1-r1.ebuild deleted file mode 100644 index 2415d6b5d2d8..000000000000 --- a/media-libs/libechonest/libechonest-2.3.1-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils multibuild - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="git://github.com/lfranchi/libechonest.git" - inherit git-r3 -else - SRC_URI="http://files.lfranchi.com/${P}.tar.bz2" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="A library for communicating with The Echo Nest" -HOMEPAGE="https://projects.kde.org/projects/playground/libs/libechonest" - -LICENSE="GPL-2" -SLOT="0/2.3" -IUSE="+qt4 qt5" - -REQUIRED_USE="|| ( qt4 qt5 )" - -RESTRICT="test" # Networking required - -RDEPEND=" - qt4? ( - >=dev-libs/qjson-0.5[qt4(+)] - dev-qt/qtcore:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - dev-qt/qtxml:5 - ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -DOCS=( AUTHORS README TODO ) - -PATCHES=( "${FILESDIR}"/${P}-Don-t-double-encode-on-Qt4.patch ) - -pkg_setup() { - MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) -} - -src_configure() { - myconfigure() { - local mycmakeargs=( - -DECHONEST_BUILD_TESTS=OFF - ) - - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then - mycmakeargs+=(-DBUILD_WITH_QT4=ON) - fi - - if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then - mycmakeargs+=(-DBUILD_WITH_QT4=OFF) - fi - - cmake-utils_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant cmake-utils_src_compile -} - -src_test() { - multibuild_foreach_variant cmake-utils_src_test -} - -src_install() { - multibuild_foreach_variant cmake-utils_src_install -} diff --git a/media-libs/libechonest/libechonest-2.3.1.ebuild b/media-libs/libechonest/libechonest-2.3.1.ebuild deleted file mode 100644 index 16794933ab31..000000000000 --- a/media-libs/libechonest/libechonest-2.3.1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit cmake-utils multibuild - -DESCRIPTION="A library for communicating with The Echo Nest" -HOMEPAGE="https://projects.kde.org/projects/playground/libs/libechonest" -SRC_URI="http://files.lfranchi.com/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0/2.3" -KEYWORDS="~amd64 ~x86" -IUSE="+qt4 qt5" - -REQUIRED_USE="|| ( qt4 qt5 )" - -RESTRICT="test" # Networking required - -RDEPEND=" - qt4? ( - dev-libs/qjson[qt4(+)] - dev-qt/qtcore:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( AUTHORS README TODO ) - -pkg_setup() { - MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) -} - -src_configure() { - myconfigure() { - local mycmakeargs=( - -DECHONEST_BUILD_TESTS=OFF - ) - - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then - mycmakeargs+=(-DBUILD_WITH_QT4=ON) - fi - - if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then - mycmakeargs+=(-DBUILD_WITH_QT4=OFF) - fi - - cmake-utils_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant cmake-utils_src_compile -} - -src_test() { - multibuild_foreach_variant cmake-utils_src_test -} - -src_install() { - multibuild_foreach_variant cmake-utils_src_install -} diff --git a/media-libs/libechonest/libechonest-9999.ebuild b/media-libs/libechonest/libechonest-9999.ebuild deleted file mode 100644 index cc3733b1c482..000000000000 --- a/media-libs/libechonest/libechonest-9999.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils multibuild - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="git://github.com/lfranchi/libechonest.git" - inherit git-r3 -else - SRC_URI="http://files.lfranchi.com/${P}.tar.bz2" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="A library for communicating with The Echo Nest" -HOMEPAGE="https://projects.kde.org/projects/playground/libs/libechonest" - -LICENSE="GPL-2" -SLOT="0/2.3" -IUSE="+qt4 qt5" - -REQUIRED_USE="|| ( qt4 qt5 )" - -RESTRICT="test" # Networking required - -RDEPEND=" - qt4? ( - >=dev-libs/qjson-0.5[qt4(+)] - dev-qt/qtcore:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - dev-qt/qtxml:5 - ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -DOCS=( AUTHORS README TODO ) - -pkg_setup() { - MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) -} - -src_configure() { - myconfigure() { - local mycmakeargs=( - -DECHONEST_BUILD_TESTS=OFF - ) - - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then - mycmakeargs+=(-DBUILD_WITH_QT4=ON) - fi - - if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then - mycmakeargs+=(-DBUILD_WITH_QT4=OFF) - fi - - cmake-utils_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant cmake-utils_src_compile -} - -src_test() { - multibuild_foreach_variant cmake-utils_src_test -} - -src_install() { - multibuild_foreach_variant cmake-utils_src_install -} diff --git a/media-libs/libechonest/metadata.xml b/media-libs/libechonest/metadata.xml deleted file mode 100644 index b44b57cebc5f..000000000000 --- a/media-libs/libechonest/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - sound@gentoo.org - Gentoo Sound project - -