[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/
commit: c7e05289e545c212584279036b658cbeab60e392 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 28 09:51:17 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 28 12:26:14 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7e05289 media-libs/libmygpo-qt: Switch to cmake.eclass, EAPI-7 bump Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild | 12 +++- media-libs/libmygpo-qt/libmygpo-qt-.ebuild | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild index cda56925c14..336d3d38225 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils +inherit cmake DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"; @@ -21,12 +21,14 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" +BDEPEND=" + virtual/pkgconfig +" RDEPEND=" dev-qt/qtcore:5 dev-qt/qtnetwork:5 " DEPEND="${RDEPEND} - virtual/pkgconfig test? ( dev-qt/qttest:5 ) " @@ -38,7 +40,7 @@ src_configure() { -DMYGPO_BUILD_TESTS=$(usex test) ) - cmake-utils_src_configure + cmake_src_configure } src_test() { @@ -47,5 +49,5 @@ src_test() { -E "(JsonCreatorTest-test)" ) - cmake-utils_src_test + cmake_src_test } diff --git a/media-libs/libmygpo-qt/libmygpo-qt-.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-.ebuild index 55b84538167..ce97b231929 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then inherit git-r3 else SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi LICENSE="LGPL-2.1"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/
commit: 655d9c0aecd141512eebe126c6c01103e4c9221f Author: Sergei Trofimovich gentoo org> AuthorDate: Tue Feb 16 08:18:42 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Tue Feb 16 08:18:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=655d9c0a media-libs/libmygpo-qt: keyworded 1.1.0 for ppc64 keyworded wrt bug #770127 Package-Manager: Portage-3.0.14, Repoman-3.0.2 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Sergei Trofimovich gentoo.org> media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild index d8ce4b379fe..cda56925c14 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then inherit git-r3 else SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" + KEYWORDS="amd64 ~arm64 ~ppc64 x86" fi LICENSE="LGPL-2.1"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/
commit: 9ad0bc731ba0db072b86a9d9b040d072933a6d15 Author: Roy Bamford gentoo org> AuthorDate: Mon Dec 7 16:48:54 2020 + Commit: Sam James gentoo org> CommitDate: Mon Dec 7 18:48:36 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ad0bc73 media-libs/libmygpo-qt: added ~arm64 Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Roy Bamford gentoo.org> Signed-off-by: Sam James gentoo.org> media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild index a133bbbcecb..d8ce4b379fe 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then inherit git-r3 else SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 x86" + KEYWORDS="amd64 ~arm64 x86" fi LICENSE="LGPL-2.1"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/
commit: b13b93cf25db189ea65b043929e2d23a47b1f450 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 28 23:14:29 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 28 23:45:21 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b13b93cf media-libs/libmygpo-qt: EAPI-7 bump Package-Manager: Portage-2.3.65, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/libmygpo-qt/libmygpo-qt-.ebuild | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/media-libs/libmygpo-qt/libmygpo-qt-.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-.ebuild index bbdf31f17c5..0074f5e52b9 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit cmake-utils @@ -20,12 +20,14 @@ LICENSE="LGPL-2.1" SLOT="0" IUSE="test" +BDEPEND=" + virtual/pkgconfig +" RDEPEND=" dev-qt/qtcore:5 dev-qt/qtnetwork:5 " DEPEND="${RDEPEND} - virtual/pkgconfig test? ( dev-qt/qttest:5 ) "
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/, media-libs/libmygpo-qt/files/
commit: a8a1687050b0b1ee1b5a4f55208bd81bb558ac16 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 25 19:40:39 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 26 03:29:33 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8a16870 media-libs/libmygpo-qt: Drop old Package-Manager: Portage-2.3.31, Repoman-2.3.9 media-libs/libmygpo-qt/Manifest| 1 - ...ygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch | 26 --- media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild| 83 -- 3 files changed, 110 deletions(-) diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest index 3a120c98593..a99f9c103b4 100644 --- a/media-libs/libmygpo-qt/Manifest +++ b/media-libs/libmygpo-qt/Manifest @@ -1,2 +1 @@ -DIST libmygpo-qt-1.0.9.tar.gz 65153 BLAKE2B 67ad1530eccabb7fc76f9aaec19714716ee1e55888c02a0c8ca2efb7549929c00fbe86d066c7cd310f6203db27374b70306e737b49eb254eb53b8a1aa6364f45 SHA512 c7920841310c7b971d305e38586238e081c80a449a1b442e668d2b07ada5d6ff626e697db905a83d7b12a06127f975a9b02af13d8d3e1ebee04d407b4d4b48b6 DIST libmygpo-qt-1.1.0.tar.gz 64959 BLAKE2B 85c8eebe036b5755ce6c765c2c19796532dcebbef1a7342a0f47b84ba7466de87334fd85f844c9f3f6ecf87352d8a5ba523480f1550b4928c67a3f0fe12ea902 SHA512 a24243a98b8e3544127b09e5c678d692e11ad0ad7ee8427e71b0d7cfd9455d068e4445bcd4d8d5ba94d8c0ef1b8f42390b544585ef258b5ec175546ee7bcd86a diff --git a/media-libs/libmygpo-qt/files/libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch b/media-libs/libmygpo-qt/files/libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch deleted file mode 100644 index 0d3dd764d8f..000 --- a/media-libs/libmygpo-qt/files/libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix the failure of JsonCreatorTest due to mistake in expected string. -The patch is submitted to upstream: https://github.com/gpodder/libmygpo-qt/pull/10 - -From: Golubev Alexander -Date: Tue, 20 Sep 2016 15:33:30 +0400 - - tests/JsonCreatorTest.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/JsonCreatorTest.cpp b/tests/JsonCreatorTest.cpp -index b15b006..feb03d5 100644 a/tests/JsonCreatorTest.cpp -+++ b/tests/JsonCreatorTest.cpp -@@ -133,7 +133,7 @@ void JsonCreatorTest::testEpisodeActionListToJSON() - - output = JsonCreator::episodeActionListToJSON(episodeActions); - QString outString2 = QString::fromLatin1( output ).replace( QLatin1String(" "), QLatin1String("") ); -- QString expected2( QLatin1String( "[{\"action\":\"download\",\"device\":\"device1\",\"episode\":\"http://episode.url\",\"podcast\":\"http://podcast.url\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"delete\",\"device\":\"device3\",\"episode\":\"http://episode2.url\",\"podcast\":\"http://podcast2.url\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"new\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1920-01-01T12:01:02\"; },{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":123,\"started\":10,\"timestamp\":\"1998-01-01T00:01:02\",\"total\":321},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":10,\"timestamp\":\"1 998-01-01T00:01:02\"}]" ) ); -+ QString expected2( QLatin1String( "[{\"action\":\"download\",\"device\":\"device1\",\"episode\":\"http://episode.url\",\"podcast\":\"http://podcast.url\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"delete\",\"device\":\"device3\",\"episode\":\"http://episode2.url\",\"podcast\":\"http://podcast2.url\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"new\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":123,\"started\":10,\"timestamp\":\"1998-01-01T00:01:02\",\"total\":321},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":10,\"timestamp\":\"19 98-01-01T00:01:02\"}]" ) ); - - QCOMPARE(outString2, expected2 ); - } --- -2.7.4 - diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild deleted file mode 100644 index a276eeb094d..000 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of t
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/
commit: 3025706c95e13ce5ce72530e98e17967d7791889 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Apr 25 19:26:55 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Apr 25 19:26:55 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3025706c media-libs/libmygpo-qt: x86 stable (bug #650692) Package-Manager: Portage-2.3.31, Repoman-2.3.9 media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild index c15e441151e..5aae16cca56 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then inherit git-r3 else SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~x86" + KEYWORDS="amd64 x86" fi LICENSE="LGPL-2.1"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/files/, media-libs/libmygpo-qt/
commit: 5fb9f7dcc80a4c3e292a11271a99a7d14e635a5d Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 25 14:38:27 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Apr 25 14:44:20 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fb9f7dc media-libs/libmygpo-qt: 1.1.0 version bump Same as we have with 1.1.0_pre20180401, but disabling failing test. Package-Manager: Portage-2.3.31, Repoman-2.3.9 media-libs/libmygpo-qt/Manifest| 1 + .../files/libmygpo-qt-1.1.0-qt-5.11b3.patch| 136 + media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild| 50 3 files changed, 187 insertions(+) diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest index 1e3435cbea5..811410b283d 100644 --- a/media-libs/libmygpo-qt/Manifest +++ b/media-libs/libmygpo-qt/Manifest @@ -1,2 +1,3 @@ DIST libmygpo-qt-1.0.9.tar.gz 65153 BLAKE2B 67ad1530eccabb7fc76f9aaec19714716ee1e55888c02a0c8ca2efb7549929c00fbe86d066c7cd310f6203db27374b70306e737b49eb254eb53b8a1aa6364f45 SHA512 c7920841310c7b971d305e38586238e081c80a449a1b442e668d2b07ada5d6ff626e697db905a83d7b12a06127f975a9b02af13d8d3e1ebee04d407b4d4b48b6 +DIST libmygpo-qt-1.1.0.tar.gz 64959 BLAKE2B 85c8eebe036b5755ce6c765c2c19796532dcebbef1a7342a0f47b84ba7466de87334fd85f844c9f3f6ecf87352d8a5ba523480f1550b4928c67a3f0fe12ea902 SHA512 a24243a98b8e3544127b09e5c678d692e11ad0ad7ee8427e71b0d7cfd9455d068e4445bcd4d8d5ba94d8c0ef1b8f42390b544585ef258b5ec175546ee7bcd86a DIST libmygpo-qt-1.1.0_pre20180401.tar.gz 64989 BLAKE2B dde55657b6ac391aa64756b40cc0e1152a33ab2c77e7ce8efe1d7731f6485ef7199ac45b41d4eb5df1c2ed86f8e7b86e831f7683f3966574550bd9ea355a8ccd SHA512 3a06d1e40843d460bafba4db166bfcb2f706f906e7d239506bb80ecbc5607c438914d2920f35d65d544596f07d3ed6fbd5e19bd01e5a3a70131aa6d795e3d193 diff --git a/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0-qt-5.11b3.patch b/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0-qt-5.11b3.patch new file mode 100644 index 000..77c1c74f42d --- /dev/null +++ b/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0-qt-5.11b3.patch @@ -0,0 +1,136 @@ +From 0d76d960727018bddf04c6cc89552af69aaa7e55 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 15 Apr 2018 22:20:34 +0200 +Subject: [PATCH 1/2] Add missing Qt5Network, Qt5Test, make BUILD_WITH_QT4 more + strict + +--- + CMakeLists.txt | 22 +++--- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2a1f652..eb006d9 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -5,25 +5,25 @@ project( libmygpo-qt ) + set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" ) + +-option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4 no matter if Qt5 was found" OFF) ++option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4" OFF) + + if( NOT BUILD_WITH_QT4 ) +-find_package(Qt5Core QUIET) +-if( Qt5Core_DIR ) +-set(MYGPO_QT_VERSION_SUFFIX 5) +- +-macro(qt_wrap_cpp) +-qt5_wrap_cpp(${ARGN}) +-endmacro() ++if( MYGPO_BUILD_TESTS ) ++find_package(Qt5 REQUIRED COMPONENTS Core Network Test CONFIG) ++else() ++find_package(Qt5 REQUIRED COMPONENTS Core Network CONFIG) + endif() ++set(MYGPO_QT_VERSION_SUFFIX 5) ++ ++macro(qt_wrap_cpp) ++qt5_wrap_cpp(${ARGN}) ++endmacro() + + # pkg-config names of QtCore and QtNetwork are Qt5Core and Qt5Network for + # Qt5 + set(MYGPO_QT_MAJOR_VERSION "5") + set(MYGPO_QT4_QJSON_DEP "") +-endif() +- +-if( NOT Qt5Core_DIR ) ++else() + message(STATUS "Could not find Qt5, searching for Qt4 instead...") + message(STATUS "Qt4 Support is deprecated, building with Qt4 is no longer officially supported") + if( MYGPO_BUILD_TESTS ) +-- +2.17.0 + + +From 1b53767b988b339aac8b353327a1542b2a0c0610 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 15 Apr 2018 22:29:33 +0200 +Subject: [PATCH 2/2] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) + +--- + CMakeLists.txt | 3 --- + src/CMakeLists.txt | 8 ++-- + tests/CMakeLists.txt | 12 +--- + 3 files changed, 15 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eb006d9..fa4b0cb 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -34,9 +34,6 @@ else() + set( QT_DONT_USE_QTGUI TRUE ) + include( ${QT_USE_FILE} ) + +-macro(qt5_use_modules) +-endmacro() +- + macro(qt_wrap_cpp) + qt4_wrap_cpp(${ARGN}) + endmacro() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 802125b..253e81e 100644 +--- a/src/CMakeLists.txt b/src/CMakeLists.txt +@@ -79,9 +79,13 @@ QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${LIBMYGPO_QT_MOC_H} ) + + add_library( ${MYGPO_QT_TARGET_NAME} SHARED ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC_SRC} )
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/files/, media-libs/libmygpo-qt/
commit: 25b64d52901a2182afb4f5983a188485aa400d7e Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 25 14:41:38 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Apr 25 14:44:36 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25b64d52 media-libs/libmygpo-qt: Drop obsolete snapshot Package-Manager: Portage-2.3.31, Repoman-2.3.9 media-libs/libmygpo-qt/Manifest| 1 - .../libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch | 131 - .../libmygpo-qt-1.1.0_pre20180401.ebuild | 42 --- 3 files changed, 174 deletions(-) diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest index 811410b283d..3a120c98593 100644 --- a/media-libs/libmygpo-qt/Manifest +++ b/media-libs/libmygpo-qt/Manifest @@ -1,3 +1,2 @@ DIST libmygpo-qt-1.0.9.tar.gz 65153 BLAKE2B 67ad1530eccabb7fc76f9aaec19714716ee1e55888c02a0c8ca2efb7549929c00fbe86d066c7cd310f6203db27374b70306e737b49eb254eb53b8a1aa6364f45 SHA512 c7920841310c7b971d305e38586238e081c80a449a1b442e668d2b07ada5d6ff626e697db905a83d7b12a06127f975a9b02af13d8d3e1ebee04d407b4d4b48b6 DIST libmygpo-qt-1.1.0.tar.gz 64959 BLAKE2B 85c8eebe036b5755ce6c765c2c19796532dcebbef1a7342a0f47b84ba7466de87334fd85f844c9f3f6ecf87352d8a5ba523480f1550b4928c67a3f0fe12ea902 SHA512 a24243a98b8e3544127b09e5c678d692e11ad0ad7ee8427e71b0d7cfd9455d068e4445bcd4d8d5ba94d8c0ef1b8f42390b544585ef258b5ec175546ee7bcd86a -DIST libmygpo-qt-1.1.0_pre20180401.tar.gz 64989 BLAKE2B dde55657b6ac391aa64756b40cc0e1152a33ab2c77e7ce8efe1d7731f6485ef7199ac45b41d4eb5df1c2ed86f8e7b86e831f7683f3966574550bd9ea355a8ccd SHA512 3a06d1e40843d460bafba4db166bfcb2f706f906e7d239506bb80ecbc5607c438914d2920f35d65d544596f07d3ed6fbd5e19bd01e5a3a70131aa6d795e3d193 diff --git a/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch b/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch deleted file mode 100644 index 2b10ae4d7bd..000 --- a/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch +++ /dev/null @@ -1,131 +0,0 @@ -From e5128384620014bca2cd9d1b5f31c405818e1a74 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 15 Apr 2018 22:20:34 +0200 -Subject: [PATCH 1/2] Add missing Qt5Network, make BUILD_WITH_QT4 more strict - - CMakeLists.txt | 18 +++--- - 1 file changed, 7 insertions(+), 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2a1f652..85d46fd 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,25 +5,21 @@ project( libmygpo-qt ) - set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" ) - --option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4 no matter if Qt5 was found" OFF) -+option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4" OFF) - - if( NOT BUILD_WITH_QT4 ) --find_package(Qt5Core QUIET) --if( Qt5Core_DIR ) --set(MYGPO_QT_VERSION_SUFFIX 5) -+find_package(Qt5 CONFIG REQUIRED Core Network) -+set(MYGPO_QT_VERSION_SUFFIX 5) - --macro(qt_wrap_cpp) --qt5_wrap_cpp(${ARGN}) --endmacro() --endif() -+macro(qt_wrap_cpp) -+qt5_wrap_cpp(${ARGN}) -+endmacro() - - # pkg-config names of QtCore and QtNetwork are Qt5Core and Qt5Network for - # Qt5 - set(MYGPO_QT_MAJOR_VERSION "5") - set(MYGPO_QT4_QJSON_DEP "") --endif() -- --if( NOT Qt5Core_DIR ) -+else() - message(STATUS "Could not find Qt5, searching for Qt4 instead...") - message(STATUS "Qt4 Support is deprecated, building with Qt4 is no longer officially supported") - if( MYGPO_BUILD_TESTS ) --- -2.17.0 - - -From 1cadc5d15d0de4dd2d7d08069a421337547031d2 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 15 Apr 2018 22:29:33 +0200 -Subject: [PATCH 2/2] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) - - CMakeLists.txt | 3 --- - src/CMakeLists.txt | 8 ++-- - tests/CMakeLists.txt | 12 +--- - 3 files changed, 15 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 85d46fd..d6b3a15 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,9 +30,6 @@ else() - set( QT_DONT_USE_QTGUI TRUE ) - include( ${QT_USE_FILE} ) - --macro(qt5_use_modules) --endmacro() -- - macro(qt_wrap_cpp) - qt4_wrap_cpp(${ARGN}) - endmacro() -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 802125b..253e81e 100644 a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -79,9 +79,13 @@ QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${LIBMYGPO_QT_MOC_H} ) - - add_library( ${MYGPO_QT_TARGET_NAME} SHARED ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC_SRC} ) - --target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QJSON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ) - set_target_properties( ${MYGPO_QT_TARGET_NAME} PROPER
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/
commit: 30383335168e3ab54ea3bb65d762e60807004618 Author: Aaron Bauman gentoo org> AuthorDate: Wed Apr 25 11:44:58 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Wed Apr 25 11:47:57 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30383335 media-libs/libmygpo-qt: amd64 stable wrt bug #650692 Bug: https://bugs.gentoo.org/650692 Package-Manager: Portage-2.3.31, Repoman-2.3.9 media-libs/libmygpo-qt/libmygpo-qt-1.1.0_pre20180401.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0_pre20180401.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0_pre20180401.ebuild index 7f7d18f3bf0..df98109e9f3 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0_pre20180401.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0_pre20180401.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then inherit git-r3 else SRC_URI="https://github.com/gpodder/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi LICENSE="LGPL-2.1"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/files/, media-libs/libmygpo-qt/
commit: 54c7b1e1d3369711978a47c48305df5150ed96d8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 15 20:35:05 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 15 20:52:07 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54c7b1e1 media-libs/libmygpo-qt: Add 1.1.0_pre20180401 (build w/ Qt 5.11_beta3) Package-Manager: Portage-2.3.28, Repoman-2.3.9 media-libs/libmygpo-qt/Manifest| 1 + .../libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch | 131 + .../libmygpo-qt-1.1.0_pre20180401.ebuild | 42 +++ 3 files changed, 174 insertions(+) diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest index 99b5408916d..e7cb9c89b95 100644 --- a/media-libs/libmygpo-qt/Manifest +++ b/media-libs/libmygpo-qt/Manifest @@ -1,2 +1,3 @@ DIST libmygpo-qt-1.0.9.tar.gz 65153 BLAKE2B 67ad1530eccabb7fc76f9aaec19714716ee1e55888c02a0c8ca2efb7549929c00fbe86d066c7cd310f6203db27374b70306e737b49eb254eb53b8a1aa6364f45 SHA512 c7920841310c7b971d305e38586238e081c80a449a1b442e668d2b07ada5d6ff626e697db905a83d7b12a06127f975a9b02af13d8d3e1ebee04d407b4d4b48b6 DIST libmygpo-qt-1.0.9_p20180307.tar.gz 65245 BLAKE2B 16fe3a9659a53c907979156b14ef55a413d1ee856ea6653bc140b39342db721f10b26c3f8ee5fe6be69793f93dbea4acf11eb2589b1c9a9e9bb4e153c0d0fbd8 SHA512 a09f4f2b9f5dda0f23b15b9670c0f1fe76c8a54677633db18b2980a89e2821b494b0ab1d7f97ab973d8ea3f2e2dea49d4010dad7184800582b0dc503dece7897 +DIST libmygpo-qt-1.1.0_pre20180401.tar.gz 64989 BLAKE2B dde55657b6ac391aa64756b40cc0e1152a33ab2c77e7ce8efe1d7731f6485ef7199ac45b41d4eb5df1c2ed86f8e7b86e831f7683f3966574550bd9ea355a8ccd SHA512 3a06d1e40843d460bafba4db166bfcb2f706f906e7d239506bb80ecbc5607c438914d2920f35d65d544596f07d3ed6fbd5e19bd01e5a3a70131aa6d795e3d193 diff --git a/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch b/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch new file mode 100644 index 000..2b10ae4d7bd --- /dev/null +++ b/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch @@ -0,0 +1,131 @@ +From e5128384620014bca2cd9d1b5f31c405818e1a74 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 15 Apr 2018 22:20:34 +0200 +Subject: [PATCH 1/2] Add missing Qt5Network, make BUILD_WITH_QT4 more strict + +--- + CMakeLists.txt | 18 +++--- + 1 file changed, 7 insertions(+), 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2a1f652..85d46fd 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -5,25 +5,21 @@ project( libmygpo-qt ) + set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" ) + +-option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4 no matter if Qt5 was found" OFF) ++option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4" OFF) + + if( NOT BUILD_WITH_QT4 ) +-find_package(Qt5Core QUIET) +-if( Qt5Core_DIR ) +-set(MYGPO_QT_VERSION_SUFFIX 5) ++find_package(Qt5 CONFIG REQUIRED Core Network) ++set(MYGPO_QT_VERSION_SUFFIX 5) + +-macro(qt_wrap_cpp) +-qt5_wrap_cpp(${ARGN}) +-endmacro() +-endif() ++macro(qt_wrap_cpp) ++qt5_wrap_cpp(${ARGN}) ++endmacro() + + # pkg-config names of QtCore and QtNetwork are Qt5Core and Qt5Network for + # Qt5 + set(MYGPO_QT_MAJOR_VERSION "5") + set(MYGPO_QT4_QJSON_DEP "") +-endif() +- +-if( NOT Qt5Core_DIR ) ++else() + message(STATUS "Could not find Qt5, searching for Qt4 instead...") + message(STATUS "Qt4 Support is deprecated, building with Qt4 is no longer officially supported") + if( MYGPO_BUILD_TESTS ) +-- +2.17.0 + + +From 1cadc5d15d0de4dd2d7d08069a421337547031d2 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 15 Apr 2018 22:29:33 +0200 +Subject: [PATCH 2/2] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) + +--- + CMakeLists.txt | 3 --- + src/CMakeLists.txt | 8 ++-- + tests/CMakeLists.txt | 12 +--- + 3 files changed, 15 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 85d46fd..d6b3a15 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -30,9 +30,6 @@ else() + set( QT_DONT_USE_QTGUI TRUE ) + include( ${QT_USE_FILE} ) + +-macro(qt5_use_modules) +-endmacro() +- + macro(qt_wrap_cpp) + qt4_wrap_cpp(${ARGN}) + endmacro() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 802125b..253e81e 100644 +--- a/src/CMakeLists.txt b/src/CMakeLists.txt +@@ -79,9 +79,13 @@ QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${LIBMYGPO_QT_MOC_H} ) + + add_library( ${MYGPO_QT_TARGET_NAME} SHARED ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC_SRC} ) + +-target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QJSON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ) + set_target_properties(
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/
commit: 1cfd4e4302f54e22915a0b7ecc23985a554a9e3c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 15 20:40:55 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 15 20:52:07 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cfd4e43 media-libs/libmygpo-qt: Drop old Package-Manager: Portage-2.3.28, Repoman-2.3.9 media-libs/libmygpo-qt/Manifest| 1 - .../libmygpo-qt/libmygpo-qt-1.0.9_p20180307.ebuild | 40 -- 2 files changed, 41 deletions(-) diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest index e7cb9c89b95..1e3435cbea5 100644 --- a/media-libs/libmygpo-qt/Manifest +++ b/media-libs/libmygpo-qt/Manifest @@ -1,3 +1,2 @@ DIST libmygpo-qt-1.0.9.tar.gz 65153 BLAKE2B 67ad1530eccabb7fc76f9aaec19714716ee1e55888c02a0c8ca2efb7549929c00fbe86d066c7cd310f6203db27374b70306e737b49eb254eb53b8a1aa6364f45 SHA512 c7920841310c7b971d305e38586238e081c80a449a1b442e668d2b07ada5d6ff626e697db905a83d7b12a06127f975a9b02af13d8d3e1ebee04d407b4d4b48b6 -DIST libmygpo-qt-1.0.9_p20180307.tar.gz 65245 BLAKE2B 16fe3a9659a53c907979156b14ef55a413d1ee856ea6653bc140b39342db721f10b26c3f8ee5fe6be69793f93dbea4acf11eb2589b1c9a9e9bb4e153c0d0fbd8 SHA512 a09f4f2b9f5dda0f23b15b9670c0f1fe76c8a54677633db18b2980a89e2821b494b0ab1d7f97ab973d8ea3f2e2dea49d4010dad7184800582b0dc503dece7897 DIST libmygpo-qt-1.1.0_pre20180401.tar.gz 64989 BLAKE2B dde55657b6ac391aa64756b40cc0e1152a33ab2c77e7ce8efe1d7731f6485ef7199ac45b41d4eb5df1c2ed86f8e7b86e831f7683f3966574550bd9ea355a8ccd SHA512 3a06d1e40843d460bafba4db166bfcb2f706f906e7d239506bb80ecbc5607c438914d2920f35d65d544596f07d3ed6fbd5e19bd01e5a3a70131aa6d795e3d193 diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9_p20180307.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9_p20180307.ebuild deleted file mode 100644 index f528099bacf..000 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9_p20180307.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -COMMIT=28c492b6b789ba1c3c292995a52fe4e456268182 -inherit cmake-utils vcs-snapshot - -DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" -HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"; - -if [[ ${PV} == ** ]]; then - EGIT_REPO_URI="https://github.com/gpodder/libmygpo-qt.git"; - inherit git-r3 -else - SRC_URI="https://github.com/gpodder/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="test" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 -" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-qt/qttest:5 ) -" - -src_configure() { - local mycmakeargs=( - -DBUILD_WITH_QT4=OFF - -DMYGPO_BUILD_TESTS=$(usex test) - ) - - cmake-utils_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/
commit: 2e8d96cca6fd0902a13b03c61c09115aabd90214 Author: Jonas Stein gentoo org> AuthorDate: Thu Apr 12 21:06:53 2018 + Commit: Jonas Stein gentoo org> CommitDate: Thu Apr 12 21:06:53 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e8d96cc media-libs/libmygpo-qt: Retire maintainer Proxied maintainer retired due to inactivity. Bug: https://bugs.gentoo.org/632888 Package-Manager: Portage-2.3.28, Repoman-2.3.9 media-libs/libmygpo-qt/metadata.xml | 8 1 file changed, 8 deletions(-) diff --git a/media-libs/libmygpo-qt/metadata.xml b/media-libs/libmygpo-qt/metadata.xml index 116d49b1fbb..18f9a0a6af1 100644 --- a/media-libs/libmygpo-qt/metadata.xml +++ b/media-libs/libmygpo-qt/metadata.xml @@ -1,14 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> - -fatz...@gmail.com -Alexander Golubev - - -proxy-ma...@gentoo.org -Proxy Maintainers - so...@gentoo.org Gentoo Sound project
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/
commit: 96a193835c5436dd9fc192be3436e0b818dc2632 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 22 18:16:41 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 22 18:38:01 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96a19383 media-libs/libmygpo-qt: Drop USE=qt4,qt5 and multibuild Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-libs/libmygpo-qt/libmygpo-qt-.ebuild | 67 +- 1 file changed, 12 insertions(+), 55 deletions(-) diff --git a/media-libs/libmygpo-qt/libmygpo-qt-.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-.ebuild index 6a6e0b5b0b2..bbdf31f17c5 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils multibuild + +inherit cmake-utils DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"; @@ -17,66 +18,22 @@ fi LICENSE="LGPL-2.1" SLOT="0" -IUSE="+qt4 qt5 test" - -REQUIRED_USE="|| ( qt4 qt5 )" +IUSE="test" RDEPEND=" - qt4? ( - >=dev-libs/qjson-0.5[qt4(+)] - dev-qt/qtcore:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - ) + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 " DEPEND="${RDEPEND} virtual/pkgconfig - test? ( - qt4? ( dev-qt/qttest:4 ) - qt5? ( dev-qt/qttest:5 ) - ) + test? ( dev-qt/qttest:5 ) " -DOCS=( AUTHORS README ) - -pkg_setup() { - MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) - if use qt5; then - ewarn "Please note that Qt5 support is still experimental." - ewarn "If you find anything to not work with Qt5, please report a bug." - fi -} - src_configure() { - myconfigure() { - local mycmakeargs=( - -DMYGPO_BUILD_TESTS=$(usex test) - ) - - 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 -} + local mycmakeargs=( + -DBUILD_WITH_QT4=OFF + -DMYGPO_BUILD_TESTS=$(usex test) + ) -src_install() { - multibuild_foreach_variant cmake-utils_src_install + cmake-utils_src_configure }
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/
commit: 2cb85ac8f8874d0357cff253f4731fc68ecac8de Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 22 18:23:32 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 22 18:38:02 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cb85ac8 media-libs/libmygpo-qt: Add 1.0.9_p20180307 snapshot Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-libs/libmygpo-qt/Manifest| 1 + .../libmygpo-qt/libmygpo-qt-1.0.9_p20180307.ebuild | 40 ++ 2 files changed, 41 insertions(+) diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest index 6772d0feb66..99b5408916d 100644 --- a/media-libs/libmygpo-qt/Manifest +++ b/media-libs/libmygpo-qt/Manifest @@ -1 +1,2 @@ DIST libmygpo-qt-1.0.9.tar.gz 65153 BLAKE2B 67ad1530eccabb7fc76f9aaec19714716ee1e55888c02a0c8ca2efb7549929c00fbe86d066c7cd310f6203db27374b70306e737b49eb254eb53b8a1aa6364f45 SHA512 c7920841310c7b971d305e38586238e081c80a449a1b442e668d2b07ada5d6ff626e697db905a83d7b12a06127f975a9b02af13d8d3e1ebee04d407b4d4b48b6 +DIST libmygpo-qt-1.0.9_p20180307.tar.gz 65245 BLAKE2B 16fe3a9659a53c907979156b14ef55a413d1ee856ea6653bc140b39342db721f10b26c3f8ee5fe6be69793f93dbea4acf11eb2589b1c9a9e9bb4e153c0d0fbd8 SHA512 a09f4f2b9f5dda0f23b15b9670c0f1fe76c8a54677633db18b2980a89e2821b494b0ab1d7f97ab973d8ea3f2e2dea49d4010dad7184800582b0dc503dece7897 diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9_p20180307.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9_p20180307.ebuild new file mode 100644 index 000..f528099bacf --- /dev/null +++ b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9_p20180307.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +COMMIT=28c492b6b789ba1c3c292995a52fe4e456268182 +inherit cmake-utils vcs-snapshot + +DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" +HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"; + +if [[ ${PV} == ** ]]; then + EGIT_REPO_URI="https://github.com/gpodder/libmygpo-qt.git"; + inherit git-r3 +else + SRC_URI="https://github.com/gpodder/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="test" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 +" +DEPEND="${RDEPEND} + virtual/pkgconfig + test? ( dev-qt/qttest:5 ) +" + +src_configure() { + local mycmakeargs=( + -DBUILD_WITH_QT4=OFF + -DMYGPO_BUILD_TESTS=$(usex test) + ) + + cmake-utils_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/
commit: d3aa6207be79aeae23cbc1d155dfef6d6a55eab2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Dec 8 16:59:53 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Dec 8 18:30:40 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3aa6207 media-libs/libmygpo-qt: Drop old Package-Manager: Portage-2.3.17, Repoman-2.3.6 media-libs/libmygpo-qt/Manifest| 2 - media-libs/libmygpo-qt/libmygpo-qt-1.0.7-r1.ebuild | 45 -- media-libs/libmygpo-qt/libmygpo-qt-1.0.7.ebuild| 30 --- media-libs/libmygpo-qt/libmygpo-qt-1.0.8.ebuild| 45 -- 4 files changed, 122 deletions(-) diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest index 756fb143e63..f234e9f7465 100644 --- a/media-libs/libmygpo-qt/Manifest +++ b/media-libs/libmygpo-qt/Manifest @@ -1,3 +1 @@ -DIST libmygpo-qt-1.0.7.tar.gz 62703 SHA256 43b9c00ae2c206ac64cf725918024b3d0927bbde880196a016f2ee329bac50fd SHA512 b1aad4daa32a41173d060f026245074ff2d11b9747447cb97cea9e3b93ea42e9ce89f67d4ed6396ed2b087db1f149e12543fb0a5d897e74a359c3115a418b45b WHIRLPOOL 5d7bbcf724677bc326060d4c8f79ca32caa240b830acdf2bcf0f213f6712dc2082fd1d6ad711edd23addd72e7553fdce1f2f1726cc0f8694ed9d4c4e04ae -DIST libmygpo-qt-1.0.8.tar.gz 65064 SHA256 a0133b9d1850140a85d045d5a5db568735d19d62cd2f415e56e8b96689e2ce2e SHA512 1681b37387f7c18b74acbe5babd0ed435b289e87bca16e8c9ac7de53ff16012a82ed091cb77fd8c7972d470a71f38d1c9ab7c5f1e1bfe69db74f6fdc8d8a9bc8 WHIRLPOOL 51f7a503dfd4a893857d35b53010cecb9d278e9f4ab6424e07fbe3bc4d6c124eb7d36fcf1b437ea5349312ae21862a91189dc8da9cae5f763717d94ed2f1725a DIST libmygpo-qt-1.0.9.tar.gz 65153 SHA256 65f477d8240aa3d173733bcf491d52663388f4aee0141184374a70f3ecb64ee0 SHA512 c7920841310c7b971d305e38586238e081c80a449a1b442e668d2b07ada5d6ff626e697db905a83d7b12a06127f975a9b02af13d8d3e1ebee04d407b4d4b48b6 WHIRLPOOL 9400de811157696c4cd2d274f05e00b2ad2323115f1e78e07c6859c312315f39181b1d41fd82f4bffa9d7ed10c97db57bffbca6c8007b455980c06de0855635a diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.7-r1.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.7-r1.ebuild deleted file mode 100644 index c4feab6fe2d..000 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.0.7-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit cmake-utils - -DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" -HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"; - -if [[ ${PV} == ** ]]; then - EGIT_REPO_URI="https://github.com/gpodder/libmygpo-qt.git"; - KEYWORDS="" - SRC_URI="" - inherit git-2 -else - KEYWORDS="amd64 x86" - SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="test" - -RDEPEND="dev-qt/qtcore:4 - >=dev-libs/qjson-0.5" -DEPEND="${RDEPEND} - dev-qt/qttest:4 - virtual/pkgconfig - test? ( dev-qt/qttest:4 )" - -DOCS=( AUTHORS README ) - -src_prepare() { - cmake-utils_src_prepare - if ! use test ; then - sed -i -e '/find_package/s/QtTest//' CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use test MYGPO_BUILD_TESTS) - ) - cmake-utils_src_configure -} diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.7.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.7.ebuild deleted file mode 100644 index 12525dabbcc..000 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.0.7.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit cmake-utils - -DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" -HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"; - -if [[ ${PV} == ** ]]; then - EGIT_REPO_URI="https://github.com/gpodder/libmygpo-qt.git"; - KEYWORDS="" - SRC_URI="" - inherit git-2 -else - KEYWORDS="amd64 x86" - SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="" - -RDEPEND="dev-qt/qtcore:4 - >=dev-libs/qjson-0.5" -DEPEND="${RDEPEND} - dev-qt/qttest:4 - virtual/pkgconfig" - -DOCS=( AUTHORS README ) diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.8.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.8.ebuild deleted file mode 100644 index a58221b01f8..000 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.0.8.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit cmake-utils - -DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" -HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"; - -if [[ ${PV} ==
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/
commit: 84a2cab73671509af8538ba8913d2d02b3cf2b65 Author: Aaron Bauman gentoo org> AuthorDate: Tue Dec 27 09:46:02 2016 + Commit: Aaron Bauman gentoo org> CommitDate: Tue Dec 27 09:48:30 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84a2cab7 media-libs/libmygpo-qt: amd64 stable wrt bug #588812 media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild index 5b6b821..c6f9666 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then inherit git-r3 else SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi LICENSE="LGPL-2.1"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/
commit: cd82781cf798c237b750e0e34de965c3d04b3cab Author: Alexander Golubev gmail com> AuthorDate: Sat Sep 17 19:39:30 2016 + Commit: Lars Wendler gentoo org> CommitDate: Mon Dec 26 16:09:02 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd82781c media-sound/libmygpo: version bump 1.0.9 Gentoo bug: 594118 Also this one removes some legacy code from live one. Closes: https://github.com/gentoo/gentoo/pull/2350 media-libs/libmygpo-qt/Manifest| 1 + .../{libmygpo-qt-.ebuild => libmygpo-qt-1.0.9.ebuild} | 10 +- media-libs/libmygpo-qt/libmygpo-qt-.ebuild | 10 +- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest index 1499b1e..756fb14 100644 --- a/media-libs/libmygpo-qt/Manifest +++ b/media-libs/libmygpo-qt/Manifest @@ -1,2 +1,3 @@ DIST libmygpo-qt-1.0.7.tar.gz 62703 SHA256 43b9c00ae2c206ac64cf725918024b3d0927bbde880196a016f2ee329bac50fd SHA512 b1aad4daa32a41173d060f026245074ff2d11b9747447cb97cea9e3b93ea42e9ce89f67d4ed6396ed2b087db1f149e12543fb0a5d897e74a359c3115a418b45b WHIRLPOOL 5d7bbcf724677bc326060d4c8f79ca32caa240b830acdf2bcf0f213f6712dc2082fd1d6ad711edd23addd72e7553fdce1f2f1726cc0f8694ed9d4c4e04ae DIST libmygpo-qt-1.0.8.tar.gz 65064 SHA256 a0133b9d1850140a85d045d5a5db568735d19d62cd2f415e56e8b96689e2ce2e SHA512 1681b37387f7c18b74acbe5babd0ed435b289e87bca16e8c9ac7de53ff16012a82ed091cb77fd8c7972d470a71f38d1c9ab7c5f1e1bfe69db74f6fdc8d8a9bc8 WHIRLPOOL 51f7a503dfd4a893857d35b53010cecb9d278e9f4ab6424e07fbe3bc4d6c124eb7d36fcf1b437ea5349312ae21862a91189dc8da9cae5f763717d94ed2f1725a +DIST libmygpo-qt-1.0.9.tar.gz 65153 SHA256 65f477d8240aa3d173733bcf491d52663388f4aee0141184374a70f3ecb64ee0 SHA512 c7920841310c7b971d305e38586238e081c80a449a1b442e668d2b07ada5d6ff626e697db905a83d7b12a06127f975a9b02af13d8d3e1ebee04d407b4d4b48b6 WHIRLPOOL 9400de811157696c4cd2d274f05e00b2ad2323115f1e78e07c6859c312315f39181b1d41fd82f4bffa9d7ed10c97db57bffbca6c8007b455980c06de0855635a diff --git a/media-libs/libmygpo-qt/libmygpo-qt-.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild similarity index 80% copy from media-libs/libmygpo-qt/libmygpo-qt-.ebuild copy to media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild index b7f2c45..af69ab2 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -25,19 +25,11 @@ IUSE="test" RDEPEND="dev-qt/qtcore:4 >=dev-libs/qjson-0.5" DEPEND="${RDEPEND} - dev-qt/qttest:4 virtual/pkgconfig test? ( dev-qt/qttest:4 )" DOCS=( AUTHORS README ) -src_prepare() { - cmake-utils_src_prepare - if ! use test ; then - sed -i -e '/find_package/s/QtTest//' CMakeLists.txt || die - fi -} - src_configure() { local mycmakeargs=( $(cmake-utils_use test MYGPO_BUILD_TESTS) diff --git a/media-libs/libmygpo-qt/libmygpo-qt-.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-.ebuild index b7f2c45..af69ab2 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -25,19 +25,11 @@ IUSE="test" RDEPEND="dev-qt/qtcore:4 >=dev-libs/qjson-0.5" DEPEND="${RDEPEND} - dev-qt/qttest:4 virtual/pkgconfig test? ( dev-qt/qttest:4 )" DOCS=( AUTHORS README ) -src_prepare() { - cmake-utils_src_prepare - if ! use test ; then - sed -i -e '/find_package/s/QtTest//' CMakeLists.txt || die - fi -} - src_configure() { local mycmakeargs=( $(cmake-utils_use test MYGPO_BUILD_TESTS)
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/
commit: cb1561af213ad8ee69240210c2924c20fb6b83b9 Author: Alexander Golubev gmail com> AuthorDate: Tue Sep 20 16:13:13 2016 + Commit: Lars Wendler gentoo org> CommitDate: Mon Dec 26 16:09:03 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb1561af media-libs/libmygpo-qt: change the maintainer Gentoo Bug: 594122 Closes: https://github.com/gentoo/gentoo/pull/2350 media-libs/libmygpo-qt/metadata.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media-libs/libmygpo-qt/metadata.xml b/media-libs/libmygpo-qt/metadata.xml index 7e75bab..116d49b 100644 --- a/media-libs/libmygpo-qt/metadata.xml +++ b/media-libs/libmygpo-qt/metadata.xml @@ -2,7 +2,8 @@ http://www.gentoo.org/dtd/metadata.dtd";> -nik...@gmx.us +fatz...@gmail.com +Alexander Golubev proxy-ma...@gentoo.org
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/, media-libs/libmygpo-qt/files/
commit: 78b2bc8b7904db6bb967faad47981c058e90b60a Author: Alexander Golubev gmail com> AuthorDate: Tue Sep 20 15:08:21 2016 + Commit: Lars Wendler gentoo org> CommitDate: Mon Dec 26 16:09:02 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b2bc8b media-libs/libmygpo-qt: fix test failure Closes: https://github.com/gentoo/gentoo/pull/2350 ...ygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch | 26 ++ media-libs/libmygpo-qt/libmygpo-qt-1.0.8.ebuild| 1 + media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild| 1 + 3 files changed, 28 insertions(+) diff --git a/media-libs/libmygpo-qt/files/libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch b/media-libs/libmygpo-qt/files/libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch new file mode 100644 index ..0d3dd76 --- /dev/null +++ b/media-libs/libmygpo-qt/files/libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch @@ -0,0 +1,26 @@ +Fix the failure of JsonCreatorTest due to mistake in expected string. +The patch is submitted to upstream: https://github.com/gpodder/libmygpo-qt/pull/10 + +From: Golubev Alexander +Date: Tue, 20 Sep 2016 15:33:30 +0400 + +--- + tests/JsonCreatorTest.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/JsonCreatorTest.cpp b/tests/JsonCreatorTest.cpp +index b15b006..feb03d5 100644 +--- a/tests/JsonCreatorTest.cpp b/tests/JsonCreatorTest.cpp +@@ -133,7 +133,7 @@ void JsonCreatorTest::testEpisodeActionListToJSON() + + output = JsonCreator::episodeActionListToJSON(episodeActions); + QString outString2 = QString::fromLatin1( output ).replace( QLatin1String(" "), QLatin1String("") ); +- QString expected2( QLatin1String( "[{\"action\":\"download\",\"device\":\"device1\",\"episode\":\"http://episode.url\",\"podcast\":\"http://podcast.url\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"delete\",\"device\":\"device3\",\"episode\":\"http://episode2.url\",\"podcast\":\"http://podcast2.url\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"new\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1920-01-01T12:01:02\"; },{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":123,\"started\":10,\"timestamp\":\"1998-01-01T00:01:02\",\"total\":321},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":10,\"timestamp\":\"1 998-01-01T00:01:02\"}]" ) ); ++ QString expected2( QLatin1String( "[{\"action\":\"download\",\"device\":\"device1\",\"episode\":\"http://episode.url\",\"podcast\":\"http://podcast.url\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"delete\",\"device\":\"device3\",\"episode\":\"http://episode2.url\",\"podcast\":\"http://podcast2.url\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"new\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":123,\"started\":10,\"timestamp\":\"1998-01-01T00:01:02\",\"total\":321},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":10,\"timestamp\":\"19 98-01-01T00:01:02\"}]" ) ); + + QCOMPARE(outString2, expected2 ); + } +-- +2.7.4 + diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.8.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.8.ebuild index 55d0b4a..cbe9687 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.0.8.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-1.0.8.ebuild @@ -29,6 +29,7 @@ DEPEND="${RDEPEND} test? ( dev-qt/qttest:4 )" DOCS=( AUTHORS README ) +PATCHES=( ${FILESDIR}/${P}-fix-JsonCreatorTest-failure.patch ) src_prepare() { cmake-utils_src_prepare diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild index af69ab2..cf7ac6c 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild @@ -29,6 +29,7 @@ DEPEND="${RDEPEND} test? ( dev-qt/qttest:4 )" DOCS=( AUTHORS README ) +PATCHES=( ${FILESDIR}/${PN}-1.0.8-fix-JsonCreatorTest-failure.patch ) src_configure() { local mycmakeargs=(
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/
commit: e29d93b85d758c74c4f8e90e52f051747dd33ea0 Author: Alexander Golubev gmail com> AuthorDate: Tue Sep 20 16:11:32 2016 + Commit: Lars Wendler gentoo org> CommitDate: Mon Dec 26 16:09:03 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e29d93b8 media-libs/libmygpo-qt: add Qt5 support Gentoo Bug: 562588 Closes: https://github.com/gentoo/gentoo/pull/2350 media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild | 73 - media-libs/libmygpo-qt/libmygpo-qt-.ebuild | 73 - 2 files changed, 118 insertions(+), 28 deletions(-) diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild index cf7ac6c..5b6b821 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild @@ -2,38 +2,83 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit cmake-utils +EAPI=6 +inherit cmake-utils multibuild DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"; if [[ ${PV} == ** ]]; then EGIT_REPO_URI="https://github.com/gpodder/libmygpo-qt.git"; - KEYWORDS="" - SRC_URI="" - inherit git-2 + inherit git-r3 else - KEYWORDS="~amd64 ~x86" SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" fi LICENSE="LGPL-2.1" SLOT="0" -IUSE="test" +IUSE="+qt4 qt5 test" + +REQUIRED_USE="|| ( qt4 qt5 )" -RDEPEND="dev-qt/qtcore:4 - >=dev-libs/qjson-0.5" +RDEPEND=" + qt4? ( + >=dev-libs/qjson-0.5[qt4(+)] + dev-qt/qtcore:4 + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + ) +" DEPEND="${RDEPEND} virtual/pkgconfig - test? ( dev-qt/qttest:4 )" + test? ( + qt4? ( dev-qt/qttest:4 ) + qt5? ( dev-qt/qttest:5 ) + ) +" DOCS=( AUTHORS README ) PATCHES=( ${FILESDIR}/${PN}-1.0.8-fix-JsonCreatorTest-failure.patch ) +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) + if use qt5; then + ewarn "Please note that Qt5 support is still experimental." + ewarn "If you find anything to not work with Qt5, please report a bug." + fi +} + src_configure() { - local mycmakeargs=( - $(cmake-utils_use test MYGPO_BUILD_TESTS) - ) - cmake-utils_src_configure + myconfigure() { + local mycmakeargs=( + -DMYGPO_BUILD_TESTS=$(usex test) + ) + + 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/libmygpo-qt/libmygpo-qt-.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-.ebuild index af69ab2..60f6697 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-.ebuild @@ -2,37 +2,82 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit cmake-utils +EAPI=6 +inherit cmake-utils multibuild DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"; if [[ ${PV} == ** ]]; then EGIT_REPO_URI="https://github.com/gpodder/libmygpo-qt.git"; - KEYWORDS="" - SRC_URI="" - inherit git-2 + inherit git-r3 else - KEYWORDS="~amd64 ~x86" SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" fi LICENSE="LGPL-2.1" SLOT="0" -IUSE="test" +IUSE="+qt4 qt5 test" + +REQUIRED_USE="|| ( qt4 qt5 )" -RDEPEND="dev-qt/qtcore:4 - >=dev-libs/qjson-0.5" +RDEPEND=" + qt4? ( + >=dev-libs/qjson-0.5[qt4(+)] + dev-qt/qtcore:4 + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + ) +" DEPEND="${RDEPEND} virtual/pkgconfig - test? ( dev-qt/qttest:4 )" + test? ( + qt4? ( dev-qt/qttest:4 ) + qt5? ( dev-qt/qttest:5 ) + ) +" DOCS=( AUTHORS README ) +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) + if use qt5; then + ewarn "Please note that Qt5 support is still experimental." +
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/
commit: 773d097098ed2526d47b682ca92bc814097c4fad Author: Lars Wendler gentoo org> AuthorDate: Wed Jan 13 17:00:49 2016 + Commit: Lars Wendler gentoo org> CommitDate: Wed Jan 13 17:20:55 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=773d0970 media-libs/libmygpo-qt: Bump to version 1.0.8 Package-Manager: portage-2.2.26 Signed-off-by: Lars Wendler gentoo.org> media-libs/libmygpo-qt/Manifest | 1 + media-libs/libmygpo-qt/libmygpo-qt-1.0.8.ebuild | 45 + 2 files changed, 46 insertions(+) diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest index 2cd8ed9..1499b1e 100644 --- a/media-libs/libmygpo-qt/Manifest +++ b/media-libs/libmygpo-qt/Manifest @@ -1 +1,2 @@ DIST libmygpo-qt-1.0.7.tar.gz 62703 SHA256 43b9c00ae2c206ac64cf725918024b3d0927bbde880196a016f2ee329bac50fd SHA512 b1aad4daa32a41173d060f026245074ff2d11b9747447cb97cea9e3b93ea42e9ce89f67d4ed6396ed2b087db1f149e12543fb0a5d897e74a359c3115a418b45b WHIRLPOOL 5d7bbcf724677bc326060d4c8f79ca32caa240b830acdf2bcf0f213f6712dc2082fd1d6ad711edd23addd72e7553fdce1f2f1726cc0f8694ed9d4c4e04ae +DIST libmygpo-qt-1.0.8.tar.gz 65064 SHA256 a0133b9d1850140a85d045d5a5db568735d19d62cd2f415e56e8b96689e2ce2e SHA512 1681b37387f7c18b74acbe5babd0ed435b289e87bca16e8c9ac7de53ff16012a82ed091cb77fd8c7972d470a71f38d1c9ab7c5f1e1bfe69db74f6fdc8d8a9bc8 WHIRLPOOL 51f7a503dfd4a893857d35b53010cecb9d278e9f4ab6424e07fbe3bc4d6c124eb7d36fcf1b437ea5349312ae21862a91189dc8da9cae5f763717d94ed2f1725a diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.8.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.8.ebuild new file mode 100644 index 000..55d0b4a --- /dev/null +++ b/media-libs/libmygpo-qt/libmygpo-qt-1.0.8.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit cmake-utils + +DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" +HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"; + +if [[ ${PV} == ** ]]; then + EGIT_REPO_URI="https://github.com/gpodder/libmygpo-qt.git"; + KEYWORDS="" + SRC_URI="" + inherit git-2 +else + KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="test" + +RDEPEND="dev-qt/qtcore:4 + >=dev-libs/qjson-0.5" +DEPEND="${RDEPEND} + virtual/pkgconfig + test? ( dev-qt/qttest:4 )" + +DOCS=( AUTHORS README ) + +src_prepare() { + cmake-utils_src_prepare + if ! use test ; then + sed -i -e '/find_package/s/QtTest//' CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use test MYGPO_BUILD_TESTS) + ) + cmake-utils_src_configure +}