gentoo resync : 28.04.2018

6 files changed, 3 insertions, 143 deletions

diff --git a/media-sound/qtscrobbler/Manifest b/media-sound/qtscrobbler/Manifest
index 65daed0ead21..22f734fe173f 100644
--- a/media-sound/qtscrobbler/Manifest
+++ b/media-sound/qtscrobbler/Manifest
@@ -1,8 +1,4 @@
-AUX qtscrobbler-0.10-Makefile.patch 1359 BLAKE2B d5470ce7341b1765e345b13f97056f13bc556498e9b748b2b1a9f847c900c84680f570588bb5c1b6600195c45deae01d85d93bc98ab51fddbfa222e88bd43668 SHA512 13c6256dc3121fad8b52e479a4700c807229dd8b29f4d8f79492df9e1c2e06e9d28ab50cbccc73a706f2ec3cbd9be7ffc2274bc015862afa4ea1297a73a6d004
-AUX qtscrobbler-0.10-free.patch 623 BLAKE2B 0ae65ab0d6ae115b34cdfeffbe634269896e11e91e92155c627fda0f88dbb630255f67087949c3fe825ee5ccbd472ce701fa856b2648e8b044f26879634ba346 SHA512 42d4093e033883fd2dda4313a2c731d418fbbf6ae70a2d79003622f917791560eedf9ea185029bca25416b34ac51bbc1b7e78bb597a33d89b92e6abab89f4226
 AUX qtscrobbler-0.11_pre20130123-qt5.patch 5444 BLAKE2B 5e8ef860627e3f8a1b5c6d7a845d4b71c2ae473a42c1fd9619d9a6a270b50e7214bec232c51faf918d4d220490ea1273e016280e56c3d4b06075fcb9feb528bd SHA512 716dc1d84d1eddcec15ec4b87c0c7454acda58ebb94ed5e7a1f5a79ec0a04d473c6dc9e7eb6649986346743cf8a673bdc25e714c221fefd0f05e0925a0f5b0c3
-DIST qtscrob-0.10.tar.bz2 132507 BLAKE2B 168bc3747bb48e7c5fedbaeb66cf12c4d7230fb240fb9b034b576f739ef55c497cdb6d8383bace8a00ad54890882134598777acc826d8ced195488b932123e92 SHA512 d743976ef26c4f61402187930ac2cfba71bc4d7079e1166bdb34115196c99d3e0093a4df06d4b0eda24ab4f0f6fcce840812fd2d1dff847dc905adc9a74127c5
 DIST qtscrobbler-0.11_pre20130123.zip 298519 BLAKE2B 36d3c3fdf59aa7fd9127c0200b03a6427f6fa27cb40e144f10041a25ba977e40fc5f63547596cf93f797d94e741a4a159c5e1aa48f8742d7738d1c113b22aae8 SHA512 24de4a45d4b31fb3c544b963b97b8716b8472a0dfde1bd2fd6bf101785f22ef07ff34fcd9ce7028fe231b215538bb8e4c3248c234feb870a3adeb4c0b259d646
-EBUILD qtscrobbler-0.10.ebuild 1403 BLAKE2B b3d9506261ad3564f472c8ab2c99576614b78b8e5d5990b941007e1ee40b98020c9dc482bd0e2f1d48d7606f07468474ae1a7bdd4b3fa414f2200c81d1c90dc8 SHA512 37d29012f2666a44ebb8ecca08b65d5563c9ca3bf7c6b0404315c989159af5ac2818b046f7ab8da674b329fff066361099ea6489ab71ce756f866a8679f8d6ff
-EBUILD qtscrobbler-0.11_pre20130123.ebuild 1252 BLAKE2B fceac0322c37322d68121758065c75a0cd2365f8f1ebfe065d6b3825f02c028e08b1470d98d8e58644c16236253377bc63cd25148739893e47c2358d7483ca35 SHA512 13ba696cdfa8a564144107a61af46ee764edbfdc8ec4e0cce22c21709771d0afe23a58905caf8fef1928fe6fad988912e0abae64133df67e922313e53d249955
-MISC metadata.xml 410 BLAKE2B c410c23c16a0ca646666e5eb4e6569661b340b90c0dd824cf43be35963aac14f099aaade7cb2f188ec4d9b9dbc75015ed9afc062a53be92060c775ac31f72140 SHA512 66998d7596e0dabf7b01af9fa59bd2b4b9d74b5cdd6e902ecbabf81683ff5f84ebf0d4d3dd876d19e510c886ceff741f9ebe163a5214c7f845f256b73601a401
+EBUILD qtscrobbler-0.11_pre20130123.ebuild 1251 BLAKE2B 094405e5dcd19615efde5fc392f5f42a0087e75e25f028ff3f45b5682afd50d1708cdb37bdcba8d48bdc20a93fccefe67d8fbc8fda5f640525109e0b84939985 SHA512 37b3d7419fb6dd0505f7cd2a64b42ae0b29503cb47ab0afbf54ffe9c5450b45c4a168b8d506d7ce1a3b563455a49d687dd12b4104f2748db676aff6a6b8b1ded
+MISC metadata.xml 340 BLAKE2B 350f5459a036f9c55c558bc8f7d9ab02a3b9045eeed136d8ef2963a19c9e3ca281dbff32ac8259333b625ca86ff66a8a747f6e5893baf643f5a1d7318303511d SHA512 67534a9d49ba6af88e23b14129c377309124be860237efbe926ba870f554aac980522cf7c791fe2075da689670994487631760c986a7b11834a2f2f9b48fc317
diff --git a/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch b/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch
deleted file mode 100644
index 0558b72c9bf5..000000000000
--- a/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/cli/Makefile
-+++ src/cli/Makefile
-@@ -1,4 +1,4 @@
--CC   = g++
-+CXX ?= g++
- mingw = false
- WINDRES =
- RES  =
-@@ -27,7 +27,7 @@
-     LINKOBJ  = scrobble-cli.o libscrobble.o md5.o ConvertUTF.o mtp.o $(RES)
- endif
- 
--CFLAGS = -Wall -O2 -g $(INCLUDE) $(CURL_FLAGS) $(MTP_FLAGS)
-+CXXFLAGS += -Wall $(INCLUDE) $(CURL_FLAGS) $(MTP_FLAGS)
- 
- .PHONY: all all-before all-after clean clean-custom
- 
-@@ -37,22 +37,22 @@
- 	rm -f *.o *~ *.d $(BIN) $(BIN).exe
- 
- $(BIN): $(OBJ)
--	$(CC) $(LINKOBJ) -o $(BIN) $(LIBS)
-+	$(CXX) $(LDFLAGS) $(LINKOBJ) -o $(BIN) $(LIBS)
- 
- scrobble-cli.o: scrobble-cli.cpp
--	$(CC) -c scrobble-cli.cpp -o scrobble-cli.o $(CFLAGS)
-+	$(CXX) -c scrobble-cli.cpp -o scrobble-cli.o $(CXXFLAGS)
- 
- libscrobble.o: ../lib/libscrobble.cpp
--	$(CC) -c ../lib/libscrobble.cpp -o libscrobble.o $(CFLAGS)
-+	$(CXX) -c ../lib/libscrobble.cpp -o libscrobble.o $(CXXFLAGS)
- 
- md5.o: ../lib/md5.c
--	$(CC) -c ../lib/md5.c -o md5.o $(CFLAGS)
-+	$(CXX) -c ../lib/md5.c -o md5.o $(CXXFLAGS)
- 
- ConvertUTF.o: ../lib/ConvertUTF.c
--	$(CC) -c ../lib/ConvertUTF.c -o ConvertUTF.o $(CFLAGS)
-+	$(CXX) -c ../lib/ConvertUTF.c -o ConvertUTF.o $(CXXFLAGS)
- 
- mtp.o: ../lib/mtp-libmtp.cpp
--	$(CC) -c ../lib/mtp-libmtp.cpp -o mtp.o $(CFLAGS)
-+	$(CXX) -c ../lib/mtp-libmtp.cpp -o mtp.o $(CXXFLAGS)
- 
- install:
- 	install -D -m 755 scrobble-cli -p $(DESTDIR)$(bindir)/scrobble-cli
diff --git a/media-sound/qtscrobbler/files/qtscrobbler-0.10-free.patch b/media-sound/qtscrobbler/files/qtscrobbler-0.10-free.patch
deleted file mode 100644
index d6802751f0e0..000000000000
--- a/media-sound/qtscrobbler/files/qtscrobbler-0.10-free.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-g++ -c ../lib/mtp-libmtp.cpp -o mtp.o -Wall -I../lib `curl-config --cflags` `pkg-config --cflags libmtp` -DHAVE_LIBMTP
-../lib/mtp-libmtp.cpp: In member function ‘void Scrobble::mtp_iterate(bool)’:
-../lib/mtp-libmtp.cpp:104:30: error: ‘free’ was not declared in this scope
-
-http://bugs.gentoo.org/405667
-
---- src/lib/mtp-libmtp.cpp
-+++ src/lib/mtp-libmtp.cpp
-@@ -16,6 +16,7 @@
-  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
-  ***************************************************************************/
- 
-+#include <cstdlib> /* free */
- #include <iostream>
- #include "libscrobble.h"
- 
diff --git a/media-sound/qtscrobbler/metadata.xml b/media-sound/qtscrobbler/metadata.xml
index 2ef2af033cb1..ad4d7db42b1a 100644
--- a/media-sound/qtscrobbler/metadata.xml
+++ b/media-sound/qtscrobbler/metadata.xml
@@ -5,9 +5,6 @@
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
   </maintainer>
-  <use>
-    <flag name="cli">Build commandline client</flag>
-  </use>
   <upstream>
     <remote-id type="sourceforge">qtscrob</remote-id>
   </upstream>
diff --git a/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild b/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild
deleted file mode 100644
index c03b41f39d2b..000000000000
--- a/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils gnome2-utils qt4-r2 toolchain-funcs
-
-MY_PN=qtscrob
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Updates a last.fm profile using information from a supported portable music player"
-HOMEPAGE="http://qtscrob.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli +qt4"
-
-RDEPEND=">=media-libs/libmtp-1.1.0
-	net-misc/curl
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-Makefile.patch \
-		"${FILESDIR}"/${P}-free.patch
-}
-
-src_configure() {
-	if use qt4; then
-		pushd src/qt >/dev/null
-		eqmake4 ${MY_PN}.pro
-		popd >/dev/null
-	fi
-}
-
-src_compile() {
-	if use cli; then
-		tc-export CXX
-		emake -C src/cli
-	fi
-
-	if use qt4; then
-		emake -C src/qt
-	fi
-}
-
-src_install() {
-	if use cli; then
-		newbin src/cli/scrobble-cli qtscrobbler-cli
-	fi
-
-	if use qt4; then
-		pushd src/qt >/dev/null
-		newbin qtscrob qtscrobbler
-		insinto /usr/share/icons/hicolor/128x128/apps
-		newins resources/icons/128.png qtscrobbler.png
-		make_desktop_entry qtscrobbler QtScrobbler
-		popd >/dev/null
-	fi
-
-	dodoc AUTHORS CHANGELOG README
-}
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
index da8847b4c40f..dc4f5ac6824a 100644
--- a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
+++ b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceforge.net/code-snapshots/git/q/qt/${MY_PN}/code.git/${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="