reinit the tree, so we can have metadata

7 files changed, 352 insertions, 0 deletions

diff --git a/media-sound/mp3blaster/Manifest b/media-sound/mp3blaster/Manifest
new file mode 100644
index 000000000000..7706dfc4d252
--- /dev/null
+++ b/media-sound/mp3blaster/Manifest
@@ -0,0 +1,11 @@
+AUX mp3blaster-3.2.5-fix-build-system.patch 2785 SHA256 b8318c80c4d54e838dc4aba1116d1cc31514f54dd2e6a48262df0fc696d6b41a SHA512 307796e8967b942f1b8133c271eb2a4a24ac9ce3ef2d3ed144197d615ba801198b4af115439f4306c5b84c5c3b7b4025475ed1dbae992d2731f646636ce8df8f WHIRLPOOL dd059aad6df1da82d8bd3dd82d906ec42c34613703941a9278c02cff61ba2a8fbdad94b8d8eaac46b674b1deca54ef6a9261cbb4b7ef1d5ae05bf8614956e22e
+AUX mp3blaster-3.2.5-fix-c++14.patch 1206 SHA256 27e6a194539c25ce5f41e9cfa4bb07cafc059fe6610de576ebcb75c4ce4c743d SHA512 cf0fe93ad0e6a75a58a855aae87222de923709a775552138ad95754ced9812a62c3a1cdc4d7091e1b727c0425cec40d223a9533ad4a735efed24d5a62db4e8e4 WHIRLPOOL 7ae4faa050aca0eb619cb5e3233c7506ba08fa570c5627b8cf82bc77f53e8100c2bf3d474e978fb7cd221b935b03e0383793c8d5f95448822a651c393953b4c1
+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 SHA256 ef44b4b9dd428cc53e9f97456d3b30fe4048b300a07b3275b879bb72451c21ac SHA512 70a0f736b34b33819ae3a28b8e17dd7445c6b3a8ba0b05f35880d10d34d9649e4bfd664079022b0af0ee4eba3c1ca9a2ea1107931936506b3b16f68120a2113a WHIRLPOOL a7dc77f1f5ac46d12acebde2b62c857799c85f1aac98f49e49d984b09e17c0b0e4936a0025b14da7585597b0273292890cbb174aaee5437be8de056fec456bc8
+EBUILD mp3blaster-3.2.5-r2.ebuild 1643 SHA256 a62615c04e0ce4381be324e1bcf812c13d42dabb7f3fe85ae4ab8fce899f2745 SHA512 52587b78745e4253c6d43a42238dfcab79c0807dde7feab13ea3cb01900b07213dbd6eef020aa35de891db05381afd9c64abeba3954bdad0845496ea24628471 WHIRLPOOL 1e599d300365ee9011fd46bbf0fc3ac9df9449bae645bca0c6d924433d51657fc5c465a915552672ff32d4b84030efd1cf79f736f1fde229da0e65e4f580fc1f
+EBUILD mp3blaster-3.2.6.ebuild 1571 SHA256 a9fc5dfe6fa0eaed802d9d7c310539792e40873858051fb3c04f4ef6a546ec3d SHA512 1dc8938a83d81f41916e625fd3842935b8db68ae8961e5db42b33e92adde571d3b845313c578338486c9bb6b1bf2354f060580b24fc690fca098e90eb6c8b615 WHIRLPOOL 5d0157edaa30bb7fe6cb134ec1f1c1b0ee7569f75f10e21769d269b2fd24478a2b9b72393ad4939e460964b9d822885367b59086da915db02d5e889c7bc2844a
+MISC ChangeLog 2665 SHA256 74403c3822735e7a0a2ca825f1395423e3b2c886a7c0ad40a42ecaa90eda7975 SHA512 b48a91ee8781e052c9f406e3ddfab14a4a11cd80a1db99670ae2c03d394bccfd9c7b7204f382b8e52a7cb95dbd6578ee723bc668616be16ceac581b8b269f31d WHIRLPOOL 9db8f4d90e0254be27ee84dc372c250961f94d73ce605ce2fc8dfe80568e7f9efedfe604b7a6ff73eaa5591cc32ce4ff0e49b3856492143f04ec00f53bff5797
+MISC ChangeLog-2015 8308 SHA256 e3a3ad043d654e2c03a08cd5454c4fa6dc183a2aceaeb4e93de4b4c88e20b4dc SHA512 5623907d9824e694eeaaf2910c0f3c837745f53b2f751573978ae0d2aa33d32eb320a616c4f9166f35cb64ed44f8c231f74be51986d14d8effe2c98ccf3486cc WHIRLPOOL 0b5c91f15838d06a565e26d57a3923962c67fbfd2989814f6120ec98230f03c97b71ffe296df2cfe12b8fceb426687aca3707f922ab640c94b30d06d36097e79
+MISC metadata.xml 432 SHA256 694e6b73b6c12ad1b7c2a5069a43b7c0f393d3b099ca89fca181a3bd44850846 SHA512 e59462dc17d0e050f0876eb74334ddb5c980900a8b4268c281f92e30545a7cf7a3589dc1961640cba9a01d3ce01ec210904dd7033e42d9b3d237740f6820f375 WHIRLPOOL f968017b9a88a08d1dcce5e049814cfd6331d9f885f21f3d248f862592e9cce664b646871ae8ee161997880f0a09c1f6bf94a3dde747fdb0cf1b69cc25411784
diff --git a/media-sound/mp3blaster/files/mp3blaster-3.2.5-fix-build-system.patch b/media-sound/mp3blaster/files/mp3blaster-3.2.5-fix-build-system.patch
new file mode 100644
index 000000000000..6e6b86fcf04c
--- /dev/null
+++ b/media-sound/mp3blaster/files/mp3blaster-3.2.5-fix-build-system.patch
@@ -0,0 +1,94 @@
+Fix broken handling of ncurses by relying on pkg-config
+instead of broken detection.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=559210
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,7 +9,7 @@
+ 	CXXFLAGS="-O2 -Wall -W -fno-strength-reduce"
+ fi
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+@@ -17,6 +17,7 @@
+ AC_PROG_LN_S
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+@@ -26,7 +27,7 @@
+ AC_PROG_GCC_TRADITIONAL
+ AC_CHECK_FUNCS(strdup strstr)
+ 
+-AC_LANG_CPLUSPLUS
++AC_PROG_CXX
+ 
+ #For FreeBSD, look in /usr/local/(lib,include) first, since ncurses4
+ #must be installed as an add-on on these systems in /usr/local
+@@ -233,55 +234,12 @@
+ REQ_CURSES=1
+ 
+ if test "$WANT_CURSES" = "1" ; then
+-	AC_CHECK_LIB(curses,main,HAVE_LIBCURSES=1)
+-	AC_CHECK_LIB(ncurses,main,HAVE_LIBNCURSES=1)
+-	AC_CHECK_HEADER(curses.h,HAVE_CURSES_H=1,HAVE_CURSES_H=0)
+-	AC_CHECK_HEADER(ncurses/ncurses.h,HAVE_NCURSES_NCURSES_H=1)
+-	AC_CHECK_HEADER(ncurses/curses.h,HAVE_NCURSES_CURSES_H=1)
+-	AC_CHECK_HEADER(ncurses.h,HAVE_NCURSES_H=1)
+-
+-	if test "$FORCECURSES" = "1" ; then
+-		if test "$HAVE_LIBCURSES" = 0 -o "$HAVE_CURSES_H" = 0; then
+-			AC_MSG_ERROR([you forced using curses instead of ncurses, but lib/include cannot be found])
+-		fi
+-		AC_DEFINE_UNQUOTED(NCURSES_HEADER, [<curses.h>],
+-			[Which headerfile to include for ncurses support])
+-		NCURSES_LIBS="-lcurses"
+-		AC_SUBST(NCURSES_LIBS)
+-	else
+-		HAVE_CURSES="yes"
+-		if test "$HAVE_LIBNCURSES" = 1 ; then
+-			NCURSES_LIBS="-lncurses"
+-		elif test "$HAVE_LIBCURSES" = 1 ; then
+-			NCURSES_LIBS="-lcurses"
+-		else
+-			HAVE_CURSES="no"
+-		fi
+-
+-		#header(s) found?
+-		HAVE_CURSES_HEADER=1
+-		if test "$HAVE_NCURSES_NCURSES_H" = "1" ; then
+-			NCURSES_HEADER="<ncurses/ncurses.h>"
+-		elif test "$HAVE_NCURSES_CURSES_H" = "1" ; then
+-			NCURSES_HEADER="<ncurses/curses.h>"
+-		elif test "$HAVE_NCURSES_H" = "1" ; then
+-			NCURSES_HEADER="<ncurses.h>"
+-		elif test "$HAVE_CURSES_H" = "1" ; then
+-			NCURSES_HEADER="<curses.h>"
+-		else
+-			HAVE_CURSES_HEADER=0
+-		fi
+-
+-		if test "$HAVE_CURSES_HEADER" = "0" ; then HAVE_CURSES="no" ; fi
+-
+-		if test "$HAVE_CURSES" = "yes" ; then
+-			AC_SUBST(NCURSES_LIBS)
+-			AC_DEFINE_UNQUOTED(NCURSES_HEADER, $NCURSES_HEADER,
+-				[Which headerfile to include for ncurses support])
+-		elif test "$REQ_CURSES" = "1" ; then
+-			AC_MSG_ERROR([could not find (n)curses libs or includes, which are required])
+-		fi
+-	fi #FORCECURSES
++	PKG_CHECK_MODULES([NCURSES], [ncurses])
++	HAVE_CURSES="yes"
++	HAVE_CURSES_HEADER=1
++	NCURSES_HEADER="<ncurses.h>"
++	AC_DEFINE_UNQUOTED(NCURSES_HEADER, $NCURSES_HEADER,
++		[Which headerfile to include for ncurses support])
+ fi
+ 
+ #Sound output devices.
diff --git a/media-sound/mp3blaster/files/mp3blaster-3.2.5-fix-c++14.patch b/media-sound/mp3blaster/files/mp3blaster-3.2.5-fix-c++14.patch
new file mode 100644
index 000000000000..bf732e7b1161
--- /dev/null
+++ b/media-sound/mp3blaster/files/mp3blaster-3.2.5-fix-c++14.patch
@@ -0,0 +1,39 @@
+Fix -Wnarrowing failures in C++14 mode
+See also: https://bugs.gentoo.org/show_bug.cgi?id=600158
+
+--- a/mpegsound/huffmantable.cc
++++ b/mpegsound/huffmantable.cc
+@@ -550,11 +550,11 @@
+ 
+ const HUFFMANCODETABLE Mpegtoraw::ht[HTN]=
+ {
+-  { 0, 0-1, 0-1, 0,  0, htd33},
++  { 0, (unsigned int)0-1, (unsigned int)0-1, 0,  0, htd33},
+   { 1, 2-1, 2-1, 0,  7,htd01},
+   { 2, 3-1, 3-1, 0, 17,htd02},
+   { 3, 3-1, 3-1, 0, 17,htd03},
+-  { 4, 0-1, 0-1, 0,  0, htd33},
++  { 4, (unsigned int)0-1, (unsigned int)0-1, 0,  0, htd33},
+   { 5, 4-1, 4-1, 0, 31,htd05},
+   { 6, 4-1, 4-1, 0, 31,htd06},
+   { 7, 6-1, 6-1, 0, 71,htd07},
+@@ -564,7 +564,7 @@
+   {11, 8-1, 8-1, 0,127,htd11},
+   {12, 8-1, 8-1, 0,127,htd12},
+   {13,16-1,16-1, 0,511,htd13},
+-  {14, 0-1, 0-1, 0,  0, htd33},
++  {14, (unsigned int)0-1, (unsigned int)0-1, 0,  0, htd33},
+   {15,16-1,16-1, 0,511,htd15},
+   {16,16-1,16-1, 1,511,htd16},
+   {17,16-1,16-1, 2,511,htd16},
+--- a/nmixer/nmixer.h
++++ b/nmixer/nmixer.h
+@@ -26,7 +26,7 @@
+ 
+ #define MIXER_DEVICE "/dev/mixer"
+ #define MYMIN(x, y) ((x) < (y) ? (x) : (y))
+-#define MYVERSION "<<NMixer "VERSION">>"
++#define MYVERSION "<<NMixer " VERSION ">>"
+ 
+ #define BOTH_CHANNELS 0x11
+ #define RIGHT_CHANNEL 0x10
diff --git a/media-sound/mp3blaster/metadata.xml b/media-sound/mp3blaster/metadata.xml
new file mode 100644
index 000000000000..f404c281e876
--- /dev/null
+++ b/media-sound/mp3blaster/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">mp3blaster</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild
new file mode 100644
index 000000000000..72aa2ae0f695
--- /dev/null
+++ b/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild
@@ -0,0 +1,61 @@
+# 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
new file mode 100644
index 000000000000..d4545c71cb49
--- /dev/null
+++ b/media-sound/mp3blaster/mp3blaster-3.2.5-r2.ebuild
@@ -0,0 +1,69 @@
+# 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
new file mode 100644
index 000000000000..fcd21a9f975e
--- /dev/null
+++ b/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
@@ -0,0 +1,64 @@
+# 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://www.mp3blaster.org/ http://mp3blaster.sourceforge.net/ https://github.com/stragulus/mp3blaster"
+SRC_URI="mirror://sourceforge/${PN}/${P}.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=(
+	"${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
+
+	# 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
+}