[gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/, media-libs/libmygpo-qt/files/

2018-04-25 Thread Andreas Sturmlechner
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/, media-libs/libmygpo-qt/files/

2016-12-26 Thread Lars Wendler
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=(