[gentoo-commits] repo/gentoo:master commit in: profiles/, media-sound/xmms2-scrobbler/files/, media-sound/xmms2-scrobbler/

[Sergei Trofimovich]

commit:     7ab548d97606a06b7e40855a33a179b809f74947
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 30 10:15:15 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jul 30 10:18:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab548d9

media-sound/xmms2-scrobbler: drop masked package

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 media-sound/xmms2-scrobbler/Manifest               |  1 -
 .../files/xmms2-scrobbler-0.4.0-gcc-7.patch        |  6 ---
 .../files/xmms2-scrobbler-0.4.0-ld-order.patch     | 30 --------------
 .../files/xmms2-scrobbler-0.4.0-ldflags.patch      | 17 --------
 .../files/xmms2-scrobbler-0.4.0-libs.patch         | 17 --------
 .../files/xmms2-scrobbler-0.4.0-no-XPTR.patch      | 12 ------
 media-sound/xmms2-scrobbler/metadata.xml           | 14 -------
 .../xmms2-scrobbler-0.4.0-r1.ebuild                | 47 ----------------------
 profiles/package.mask                              |  4 --
 9 files changed, 148 deletions(-)

diff --git a/media-sound/xmms2-scrobbler/Manifest b/media-sound/xmms2-scrobbler/Manifest
deleted file mode 100644
index 66a2b910f86..00000000000
--- a/media-sound/xmms2-scrobbler/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xmms2-scrobbler-0.4.0.tar.gz 19831 BLAKE2B 84194a2359b825c5571637e4d875003262235f8bce550ffeb54a123c53b1aeee49b7fd21c5549903e24348869abba96ba9b7e78cade4dc44dcbb798f4604d8fa SHA512 2df20693479413a18e487f16e87f0a711866221dcbc8f96c970be55aac2c495fcb84e9e3ea754473c747d33d5d1ef54823f6a050d5054581454f956c86f6236b

diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-gcc-7.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-gcc-7.patch
deleted file mode 100644
index 6cc9686b616..00000000000
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-gcc-7.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- a/src/submission.c
-+++ b/src/submission.c
-@@ -24,2 +24,3 @@
- #include <stdlib.h>
-+#include <stdio.h>
- #include "submission.h"

diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ld-order.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ld-order.patch
deleted file mode 100644
index f252edaa56a..00000000000
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ld-order.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 096ee717070bdde9c1adc29f02fcb537920daca9
-Author: Sergei Trofimovich <slyfox@g.o>
-Date:   Sat Mar 3 20:24:21 2012 +0300
-
-    Makefile: set proper link order for libraries
-    
-    '-Wl,--as-needed' enforces libraries to go in proper dependency order:
-    
-        $ x86_64-pc-linux-gnu-gcc -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu -Wl,--hash-style=gnu `pkg-config xmms2-client --libs` `pkg-config libcurl --libs` src/xmms2-scrobbler.o src/list.o src/queue.o src/strbuf.o src/md5.o src/submission.o -o bin/xmms2-scrobbler
-        src/xmms2-scrobbler.o: In function `save_profile_submissions_queue':
-        xmms2-scrobbler.c:(.text+0x281): undefined reference to `xmmsc_userconfdir_get'
-        src/xmms2-scrobbler.o: In function `load_config':
-        xmms2-scrobbler.c:(.text+0x3e2): undefined reference to `xmmsc_userconfdir_get'
-        src/xmms2-scrobbler.o: In function `maybe_submit_to_profile':
-        xmms2-scrobbler.c:(.text+0x7e3): undefined reference to `xmmsc_medialib_get_info'
-        xmms2-scrobbler.c:(.text+0x7f7): undefined reference to `xmmsc_result_notifier_set'
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@g.o>
-
---- a/Makefile
-+++ b/Makefile
-@@ -36,7 +36,7 @@ install: $(BINARY)
- 	install -m 755 $(BINARY) $(DESTDIR)$(PREFIX)/bin
- 
- $(BINARY): $(OBJECTS) bin
--	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@ $(LIBS)
-+	$(QUIET_LINK)$(CC) $(OBJECTS) -o $@ $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) $(LIBS)
- 
- src/%.o : src/%.c
- 	$(QUIET_CC)$(CC) $(CFLAGS) $(XMMS_CFLAGS) $(CURL_CFLAGS) $(ENDIAN_CFLAGS) -o $@ -c $<

diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ldflags.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ldflags.patch
deleted file mode 100644
index 33f188cc8a9..00000000000
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ldflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-commit 8b97319c1a03acecc21b5608516859daaf5bca75
-Author: James Le Cuirot <chewi@××××××××××××××.uk>
-Date:   Fri Mar 26 20:10:54 2010 +0100
-
-    Fixed the build if the --as-needed linker option is enabled.
-
---- a/Makefile
-+++ b/Makefile
-@@ -35,7 +35,7 @@ install: $(BINARY)
- 	install -m 755 $(BINARY) $(DESTDIR)$(PREFIX)/bin
- 
- $(BINARY): $(OBJECTS) bin
--	$(QUIET_LINK)$(CC) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) $(OBJECTS) -o $@
-+	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@
- 
- src/%.o : src/%.c
- 	$(QUIET_CC)$(CC) $(CFLAGS) $(XMMS_CFLAGS) $(CURL_CFLAGS) $(ENDIAN_CFLAGS) -o $@ -c $<

diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-libs.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-libs.patch
deleted file mode 100644
index 7f8f417b7a5..00000000000
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-libs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,5 @@
- CFLAGS += -std=gnu99 -Wall -Wwrite-strings -pthread
-+LIBS = -lrt -lpthread
- ENDIAN_CFLAGS=
- PREFIX ?= /usr/local
- 
-@@ -35,7 +36,7 @@ install: $(BINARY)
- 	install -m 755 $(BINARY) $(DESTDIR)$(PREFIX)/bin
- 
- $(BINARY): $(OBJECTS) bin
--	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@
-+	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@ $(LIBS)
- 
- src/%.o : src/%.c
- 	$(QUIET_CC)$(CC) $(CFLAGS) $(XMMS_CFLAGS) $(CURL_CFLAGS) $(ENDIAN_CFLAGS) -o $@ -c $<

diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-no-XPTR.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-no-XPTR.patch
deleted file mode 100644
index bb25361a4e4..00000000000
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-no-XPTR.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/xmms2-scrobbler.c
-+++ b/src/xmms2-scrobbler.c
-@@ -534,3 +534,3 @@ on_medialib_get_info2 (xmmsv_t *val, void *udata)
- {
--	bool reset_current_id = XPOINTER_TO_INT (udata);
-+	bool reset_current_id = (bool)(uintptr_t)(udata);
- 
-@@ -572,3 +572,3 @@ maybe_submit_to_profile (bool reset_current_id)
- 	                           on_medialib_get_info2,
--	                           XINT_TO_POINTER (reset_current_id));
-+	                           (void*)(uintptr_t)(reset_current_id));
- 	xmmsc_result_unref (mediainfo_result);

diff --git a/media-sound/xmms2-scrobbler/metadata.xml b/media-sound/xmms2-scrobbler/metadata.xml
deleted file mode 100644
index dbb50391915..00000000000
--- a/media-sound/xmms2-scrobbler/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@g.o</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
-	<longdescription>
-		XMMS2-Scrobbler is a client for XMMS2 that feeds information about the songs
-		you played to last.fm, formerly known as AudioScrobbler.
-		XMMS2-Scrobbler supports "multi-scrobbling", i.e. it can talk to more than
-		one AudioScrobbler server.
-	</longdescription>
-</pkgmetadata>

diff --git a/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild b/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild
deleted file mode 100644
index 365cdbe757a..00000000000
--- a/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="XMMS2 AudioScrobbler client"
-HOMEPAGE="https://code-monkey.de/pages/xmms2-scrobbler"
-SRC_URI="ftp://ftp.code-monkey.de/pub/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-sound/xmms2
-	net-misc/curl"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ldflags.patch
-	"${FILESDIR}"/${P}-libs.patch
-	"${FILESDIR}"/${P}-ld-order.patch
-	"${FILESDIR}"/${P}-gcc-7.patch
-	"${FILESDIR}"/${P}-no-XPTR.patch
-)
-
-src_compile() {
-	emake CC="$(tc-getCC)" VERBOSE=1
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-	dodoc README AUTHORS
-}
-
-pkg_postinst() {
-	einfo "xmms2-scrobbler will fail to start until you create a configfile"
-	einfo ""
-	einfo "mkdir -p ~/.config/xmms2/clients/xmms2-scrobbler/lastfm"
-	einfo "echo 'user: foo' >> ~/.config/xmms2/clients/xmms2-scrobbler/lastfm/config"
-	einfo "echo 'password: bar' >> ~/.config/xmms2/clients/xmms2-scrobbler/lastfm/config"
-	einfo "echo 'handshake_url: http://post.audioscrobbler.com' >> ~/.config/xmms2/clients/xmms2-scrobbler/lastfm/config"
-	einfo ""
-	einfo "More info and configuration-options can be found in xmms2-scrobbler's README file"
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 4ef8a901569..60450e6e590 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -357,10 +357,6 @@ dev-ruby/source_map
 # Masked for removal in 30 days. bug #800097.
 x11-plugins/purple-mattermost
 
-# Sergei Trofimovich <slyfox@g.o> (2021-07-02)
-# Masked for removal in 30 days.
-media-sound/xmms2-scrobbler
-
 # David Seifert <soap@g.o> (2021-07-01)
 # Berkeley DB slots that are long past EOL by Oracle,
 # maintenance burden, and no real path forward by Oracle.