[gentoo-commits] repo/gentoo:master commit in: media-sound/qtscrobbler/files/, media-sound/qtscrobbler/

[Andreas Sturmlechner]

commit:     dbee56a770dc191feeacad4d2d999ec5b8ce2379
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 19:34:48 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 03:29:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbee56a7

media-sound/qtscrobbler: Drop old Qt4-based

Bug: https://bugs.gentoo.org/641922
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-sound/qtscrobbler/Manifest                   |  1 -
 .../files/qtscrobbler-0.10-Makefile.patch          | 46 --------------
 .../qtscrobbler/files/qtscrobbler-0.10-free.patch  | 16 -----
 media-sound/qtscrobbler/metadata.xml               |  3 -
 media-sound/qtscrobbler/qtscrobbler-0.10.ebuild    | 71 ----------------------
 5 files changed, 137 deletions(-)

diff --git a/media-sound/qtscrobbler/Manifest b/media-sound/qtscrobbler/Manifest
index 6dcf57b924a..282a1a2e861 100644
--- a/media-sound/qtscrobbler/Manifest
+++ b/media-sound/qtscrobbler/Manifest
@@ -1,2 +1 @@
-DIST qtscrob-0.10.tar.bz2 132507 BLAKE2B 168bc3747bb48e7c5fedbaeb66cf12c4d7230fb240fb9b034b576f739ef55c497cdb6d8383bace8a00ad54890882134598777acc826d8ced195488b932123e92 SHA512 d743976ef26c4f61402187930ac2cfba71bc4d7079e1166bdb34115196c99d3e0093a4df06d4b0eda24ab4f0f6fcce840812fd2d1dff847dc905adc9a74127c5
 DIST qtscrobbler-0.11_pre20130123.zip 298519 BLAKE2B 36d3c3fdf59aa7fd9127c0200b03a6427f6fa27cb40e144f10041a25ba977e40fc5f63547596cf93f797d94e741a4a159c5e1aa48f8742d7738d1c113b22aae8 SHA512 24de4a45d4b31fb3c544b963b97b8716b8472a0dfde1bd2fd6bf101785f22ef07ff34fcd9ce7028fe231b215538bb8e4c3248c234feb870a3adeb4c0b259d646

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 0558b72c9bf..00000000000
--- 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 d6802751f0e..00000000000
--- 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 2ef2af033cb..ad4d7db42b1 100644
--- a/media-sound/qtscrobbler/metadata.xml
+++ b/media-sound/qtscrobbler/metadata.xml
@@ -5,9 +5,6 @@
     <email>sound@g.o</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 c03b41f39d2..00000000000
--- 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; }