From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 558DD1382C5 for ; Thu, 26 Apr 2018 03:32:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A532E0880; Thu, 26 Apr 2018 03:32:12 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D27DBE0880 for ; Thu, 26 Apr 2018 03:32:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31309335C7C for ; Thu, 26 Apr 2018 03:32:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 395582A2 for ; Thu, 26 Apr 2018 03:32:07 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1524713373.a8a1687050b0b1ee1b5a4f55208bd81bb558ac16.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/, media-libs/libmygpo-qt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libmygpo-qt/Manifest media-libs/libmygpo-qt/files/libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild X-VCS-Directories: media-libs/libmygpo-qt/ media-libs/libmygpo-qt/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a8a1687050b0b1ee1b5a4f55208bd81bb558ac16 X-VCS-Branch: master Date: Thu, 26 Apr 2018 03:32:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c46098f0-09d4-4a36-9aae-cfcda43f6e13 X-Archives-Hash: bb21939c6bc1f7f35cb4239f69e424f3 commit: a8a1687050b0b1ee1b5a4f55208bd81bb558ac16 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 25 19:40:39 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 26 03:29:33 2018 +0000 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..00000000000 --- 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..00000000000 --- 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 the GNU General Public License v2 - -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} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/gpodder/libmygpo-qt.git" - inherit git-r3 -else - 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="+qt4 qt5 test" - -REQUIRED_USE="|| ( qt4 qt5 )" - -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? ( - 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() { - 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 -}