gentoo resync : 01.12.2017

4 files changed, 2 insertions, 136 deletions

diff --git a/media-sound/mp3blaster/Manifest b/media-sound/mp3blaster/Manifest
index a6e29bcaf6a7..dd8ad3bb1414 100644
--- a/media-sound/mp3blaster/Manifest
+++ b/media-sound/mp3blaster/Manifest
@@ -1,9 +1,5 @@
 AUX mp3blaster-3.2.5-fix-build-system.patch 2785 BLAKE2B 85f48a92691a538f01cf36c472d9d94e41a45bc0556e50b5f0375ef31c5aa2d2a44356ab2d732e11c135fac1a58b9e5c4e69a218f2d65663ea098319ad6964a8 SHA512 307796e8967b942f1b8133c271eb2a4a24ac9ce3ef2d3ed144197d615ba801198b4af115439f4306c5b84c5c3b7b4025475ed1dbae992d2731f646636ce8df8f
 AUX mp3blaster-3.2.5-fix-c++14.patch 1206 BLAKE2B 2f007e1af876c70bab2202e628824a7b80ac1d1fddefb805849f7089d342690f4654e67829794bd17eea23c64a60b0a511dcc14d23987f577d69d57ce1d900bf SHA512 cf0fe93ad0e6a75a58a855aae87222de923709a775552138ad95754ced9812a62c3a1cdc4d7091e1b727c0425cec40d223a9533ad4a735efed24d5a62db4e8e4
-DIST mp3blaster-3.2.5.tar.gz 329407 SHA256 129115742c77362cc3508eb7782702cfb44af2463a5453e8d19ea68abccedc29 SHA512 53f623340b7a8e4be6cd973474fd5f23c623b6d1c667478dc0d4c7a1ef5758f4bbc09d9d0698d1539d8d1c3ef45301b447f3ed74f68586070a07a7f9fa8c353e WHIRLPOOL 96cdc3b6436dec282a5836c00e2151dd04f218175fdd2451fcfd45f70bced05dea0c8915cf1a817d24a9961fc8ab3d9c5b568a5ae67e23e2b1915604b2d7806e
 DIST mp3blaster-3.2.6.tar.gz 354019 SHA256 43d9f656367d16aaac163f93dc323e9843c3dd565401567edef3e1e72b9e1ee0 SHA512 eb977eb46b86449c6d433b1740aa08580e5b8f3d55d82d6f2623cd5fd103d73b7df127fb9ac650a21da61ad4948eb569a812e15d9adc9424d491fa625e198e0d WHIRLPOOL d617d9cf9dccd01cda71f31806ad9b5f4a02d94df29befb3d37408e9831c8883c8501050d453f242fe27066b6af47d0fb68242070217f781ca03cb19b3afbe2a
-DIST mp3blaster_3.2.5-3.debian.tar.gz 11000 SHA256 e4d424aeccde6ccd219270f4e4f0bf8f70b97e13075447b6d6d069110ed092c9 SHA512 1d899c85c2a2e1326fac0f87c61ead82273a08c672aeab0929479d9aa10c6ae703bb63c1a6aec14c8f5b6a139089fa5228cf09db72ea5b114efb60a196bd4788 WHIRLPOOL 9c1c99d5a4f4e5060a9eae4e681f0df841d6932f34a12102a82d2e1f795d4db41fd3f15d6aa6a34d04d42259d73ba67f775b24a51df30779d4f4466ded40f69f
-EBUILD mp3blaster-3.2.5-r1.ebuild 1637 BLAKE2B cb35a41abee9e1da6a5902ac03051b4311fa62f46da2b7d232e357e34b06b6345701ea9e506ab2622493ba85bcada86b1d2ce21ee5e44854b10beca0c451476a SHA512 70a0f736b34b33819ae3a28b8e17dd7445c6b3a8ba0b05f35880d10d34d9649e4bfd664079022b0af0ee4eba3c1ca9a2ea1107931936506b3b16f68120a2113a
-EBUILD mp3blaster-3.2.5-r2.ebuild 1643 BLAKE2B ae657d37a2c423666e43cc0126ab7d7877266c4990dca5e01139f35d6085eb127d2d0214d3fd3e8579f594d68fe59ec4f3ab13e24738683fba12ac7359d7f632 SHA512 52587b78745e4253c6d43a42238dfcab79c0807dde7feab13ea3cb01900b07213dbd6eef020aa35de891db05381afd9c64abeba3954bdad0845496ea24628471
-EBUILD mp3blaster-3.2.6.ebuild 1565 BLAKE2B dd02b8332519b8229f28bd00aa4d54ad4c3925673ada0963e30315171b2e373f67e2b099f6c396e55a8415a650fe1a09f2c86d46289e9747459cbded4bff20ad SHA512 b7c4653c118f7b1617a2a38011dde1ed39b09d6ae13e694cf855eb303c0b9f9dfcaea993c95e9e63eaffcf39d96ababe41307b5959de415b2671df93a452a5db
+EBUILD mp3blaster-3.2.6.ebuild 1564 BLAKE2B 93bceb64fc0566e7ea2f54c30b6754be1454e280d0690a5f896350191edfb36dabad8fc6b816e4fb2c884056a7ca2d283faf05e562023f83f7e30e25089d3d82 SHA512 92c4ee037ea81b9a3b8a2a26afdf318a8961e2025898e235b13cf7025c7624fc03732937f0a56da09c4b74097d4b1e51a0d602da48536800882dcace31efb889
 MISC metadata.xml 432 BLAKE2B 61a314b3ec47b80456e1e82bcdb198e073188f7e2f7f75d2156c6826754dbf47748f552a8ecb08577527bdcf2f97739583dac6db5c5bb5f14e2e61e676a6ea0e SHA512 e59462dc17d0e050f0876eb74334ddb5c980900a8b4268c281f92e30545a7cf7a3589dc1961640cba9a01d3ce01ec210904dd7033e42d9b3d237740f6820f375
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild
deleted file mode 100644
index 72aa2ae0f695..000000000000
--- a/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Text console based program for playing audio files"
-HOMEPAGE="http://mp3blaster.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://debian/pool/main/m/${PN}/${PN}_${PV}-3.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="lirc oss sdl sid vorbis"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7
-	lirc? ( app-misc/lirc )
-	sdl? ( media-libs/libsdl )
-	sid? ( =media-libs/libsidplay-1* )
-	vorbis? ( >=media-libs/libvorbis-1 )"
-DEPEND="${RDEPEND}
-	x11-misc/imake
-	oss? ( virtual/os-headers )"
-
-REQUIRED_USE="|| ( oss sdl )"
-
-DOCS="AUTHORS BUGS ChangeLog CREDITS FAQ NEWS README TODO"
-
-src_prepare() {
-	EPATCH_SOURCE=${WORKDIR}/debian/patches EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
-	# file collision with media-sound/splay
-	sed -i -e 's:splay.1:splay_mp3blaster.1:' Makefile.in || die
-	mv -vf splay{,_mp3blaster}.1 || die
-}
-
-src_configure() {
-	# libpth and newthreads support are both broken
-	econf \
-		--disable-newthreads \
-		--without-pth \
-		--without-nas \
-		$(use_with lirc) \
-		$(use_with vorbis oggvorbis) \
-		$(use_with sid sidplay) \
-		--without-esd \
-		$(use_with sdl) \
-		$(use_with oss)
-}
-
-src_install() {
-	default
-
-	doman "${WORKDIR}"/debian/manpages/mp3tag.1
-
-	# relocate everything except commands.txt because it's used by src/main.cc
-	mv -vf "${ED}"usr/share/${PN}/{charmap,sample.*} "${ED}"usr/share/doc/${PF} || die
-
-	# file collision with media-sound/splay
-	mv -vf "${ED}"usr/bin/splay{,_mp3blaster} || die
-}
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.5-r2.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.5-r2.ebuild
deleted file mode 100644
index d4545c71cb49..000000000000
--- a/media-sound/mp3blaster/mp3blaster-3.2.5-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Text console based program for playing audio files"
-HOMEPAGE="http://mp3blaster.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://debian/pool/main/m/${PN}/${PN}_${PV}-3.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="lirc oss +sdl sid vorbis"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	lirc? ( app-misc/lirc )
-	sdl? ( media-libs/libsdl )
-	sid? ( media-libs/libsidplay:1 )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	x11-misc/imake
-	oss? ( virtual/os-headers )"
-
-REQUIRED_USE="|| ( oss sdl )"
-
-PATCHES=(
-	"${WORKDIR}"/debian/patches
-	"${FILESDIR}"/${PN}-3.2.5-fix-c++14.patch
-	"${FILESDIR}"/${PN}-3.2.5-fix-build-system.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# file collision with media-sound/splay
-	sed -i -e 's:splay.1:splay_mp3blaster.1:' Makefile.in || die
-	mv -vf splay{,_mp3blaster}.1 || die
-}
-
-src_configure() {
-	# libpth and newthreads support are both broken
-	econf \
-		--disable-newthreads \
-		--without-pth \
-		--without-nas \
-		$(use_with lirc) \
-		$(use_with vorbis oggvorbis) \
-		$(use_with sid sidplay) \
-		--without-esd \
-		$(use_with sdl) \
-		$(use_with oss)
-}
-
-src_install() {
-	default
-
-	doman "${WORKDIR}"/debian/manpages/mp3tag.1
-
-	# relocate everything except commands.txt because it's used by src/main.cc
-	mv -vf "${ED%/}"/usr/share/{${PN}/{charmap,sample.*},doc/${PF}} || die
-
-	# file collision with media-sound/splay
-	mv -vf "${ED%/}"/usr/bin/splay{,_mp3blaster} || die
-}
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
index 565272b311e6..cb697b8658f4 100644
--- a/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="lirc oss +sdl sid vorbis"
 
 RDEPEND="