gentoo resync : 19.04.2018

8 files changed, 5 insertions, 258 deletions

diff --git a/media-sound/mpfc/Manifest b/media-sound/mpfc/Manifest
index def659fcbd0b..0deae611edc3 100644
--- a/media-sound/mpfc/Manifest
+++ b/media-sound/mpfc/Manifest
@@ -1,12 +1,5 @@
-AUX mpfc-1.3.7-INT_MAX.patch 499 BLAKE2B 6d9ad976af764bab981f888366261d6bee4e5f94ee0ec494587993be50664e2aa86e691bf4d90ecfab506903194f9db825b2884100664cfbf6a6330d536c79a3 SHA512 29ab9d5f5f2198011bac008f05bbc870191246721896ed8f30c112b46e4dd7be1bc61afa457f907ff98e4bb2da7bdc610448af7e75d0d3570b142bffb51d1911
-AUX mpfc-1.3.7-asneeded.patch 1236 BLAKE2B 71ed6c202f372f769402362bfa5ea4cd357b2b57cf0fd9df357a0f536b747b22ed67fd1407f5cb3b0baa0341838e1fdc527bd654d6e1d685ae0718821af99deb SHA512 7455fe7d8c6549669af94357fa4275152ffd63638b04bf327219cb76afedd4d687d10371720508b76a006437b7207b7653ea18400f662fbe8afae3a4158bc52e
-AUX mpfc-1.3.7-libdir.patch 4081 BLAKE2B 1a789a45db7c274f8933a4a032705b831ab87706e6868ba6dc6e7699a098491adb66e349c666758db2436f6cac5f0a1c0dc77f4b475408db77efd60208f6d199 SHA512 97245e787dd1521cf82c33e7da0842ad2cc46737b9b624d76cdb45c2e4b2ae4f2f38afe64b11142e7330abec69dcf0aa2d3b4af2e523ef03a94ab061b3018673
-AUX mpfc-1.3.7-mathlib.patch 705 BLAKE2B 9e070f7b7388b110a9ad926b4a2cd857808ec2ca5f9e66f473070abaab2dc3f0415885d17089b0dced463b6913a07aaffdc66cf925022519209ea63e223c13a7 SHA512 7bbe651309b8424eaa525b49f6da90ebae89dfca38dca075e9f40f9606bf51955942ecf9c958ea9183ac84a91bbe4c3249e733707578e67abc4673e298dbb8aa
 AUX mpfc-1.3.8.1-fix-underlinking.patch 960 BLAKE2B 5eee0cea45c470b6837120cd89fd9dc180a5f295c5fcaa08a640009c51b37c3397e0f2f9755dc1baf7ac1af0f6003895368a333f1b8304b5fa096bb7a99a5e84 SHA512 117c49a7893c95b8b7e592aba76afd4f05f076b88db303a4fcb0efdaad351008bd91d88d06f278586920907c54801df49c7101c8dc2e41475038244cefd6a480
 AUX mpfc-1.3.8.1-qa-implicit-declarations.patch 4938 BLAKE2B 117d2f5aa9290aa49b65bd8cf085fe30068ccdd558a8c18a5e6b94ebd27eeb07924aeb2f0735499cce7d520b5fa86cc69f6f49580d197979162837b4c906f107 SHA512 afd61c08964b237124316a7cad4cecef29d8c269c6e2d0c645d81272167e9f7de2b3c1ef33e2877e1b5f2c0a4021bf2e548a04976142c22e889a6cf769807233
-AUX mpfc-gcc4.patch 475 BLAKE2B b45c0c674cca9d8cc78fb3e5e0926f35eb1e2f88daf2780d3487091d7d0d57940ad24e3cb0f3fabb2f78c0de83580ede111f18a8d886ef01e6285a3036ddc1f4 SHA512 25369112b269b1bd4022a3d48c154fe59f7bc02a69ae78e274ae3325df4e6462d1e7f6a3784dd4786d3950d80fadb643bcb7084e980a23c801bf6db3b7af5271
-DIST mpfc-1.3.7.tar.gz 869364 BLAKE2B 4ce61a80efad417c138b51ae1b994a2db64ed0ed07e5d0af47d69569edb1f2f8fed6a653ac18ef5c10bf2cdc83f21ded71947614c43fe9a79efeee5c9f27da81 SHA512 bef536c639a4d2422d0e04ca9aa6c18cee28e4936349ec796a4a25dd069fe0a7996c0d32b18b29b25f5acfa11e4fd4fe78becfe447d6726574bc320041fdf3d6
 DIST mpfc-1.3.8.1.tar.gz 1042027 BLAKE2B 2d0e1991397930d8251db4c766705b769e24adf518d963bc56bba92f3aaf9deeedca2331e6fbeab609d4fd0dc49a69a35f3180149b7f35c0d94795e6be22ff59 SHA512 071e12ea784a8610aa6621f5afa1c6ba1e2a3ffe0deac8175b8b43b4446f0c54ff049fd8321aff7551766fe4561a974e39bbf93e30b353b25e27673ea9584573
-EBUILD mpfc-1.3.7-r1.ebuild 1218 BLAKE2B 1baf1abcf29ef1bb549bae11e9142b45d94472b3537bbc728c3bfbd5f0dfcfebb43a5805be8f5de9e334e71048cc82602e4bea9751933cbe05058112cfb588f3 SHA512 ccb9d1ea5dd52c4579a21f5a427ee3179a49d93a318982409a2c081f734976c76111b2600c87896ab0b42f1adc3e8d1e734d134f1aa959cce4acec9dc9bc48fa
-EBUILD mpfc-1.3.8.1-r2.ebuild 1137 BLAKE2B 2927f31392c5f6c32cc9f9636f0c1db5bd74f2fb014e8e05abf2ec25e39637a0e626652b364a212099e24f94b11249996196439211fb16e502eac177bc4b5a15 SHA512 3be5513f85958b9911102319c742659ec0acc0ecc694827b3c78fd7a61a5f704eed693a2460cbb8bff53dc4ef896c053e5128aec587f52b4126f67aec55b1c6b
+EBUILD mpfc-1.3.8.1-r2.ebuild 1173 BLAKE2B 9337f49219eeea0cc1084cd025076ad5656a9921ecf3b89b7c253cfb0b036952a165ca9c8ad786522cc30de00fb05f008b782f3aa0afad5b685b339fa18c32b7 SHA512 a378f57a19825b2898de853b1396429c1dfff1ec3894353a835783e71b222ede8918361e587f910f48942b5b124426c02ceeef0fa1a7838de3fc8d607c3c46e9
 MISC metadata.xml 413 BLAKE2B 5ce36b2246ccdaa78683c2964ffb56a1f88956ef6bba4d5582840febeae3d55612a2ec1291b43d6016983763daf23aa7ae325b0a923080a469e520b258d74a1b SHA512 fd972a9e503642f833b6c08bfc662bec020bb9e88959e433e6c20ef582c2b05edd248d2b652cf2b884097fae888ab29413b41efa731399cffb261a10e6435b3a
diff --git a/media-sound/mpfc/files/mpfc-1.3.7-INT_MAX.patch b/media-sound/mpfc/files/mpfc-1.3.7-INT_MAX.patch
deleted file mode 100644
index 8bca2f380366..000000000000
--- a/media-sound/mpfc/files/mpfc-1.3.7-INT_MAX.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/input/audiocd/audiocd.c
-+++ plugins/input/audiocd/audiocd.c
-@@ -21,6 +21,7 @@
-  */
- 
- #include <stdio.h>
-+#include <limits.h> /* cdrom.h and INT_MAX */
- #include <linux/cdrom.h>
- #include <errno.h>
- #include <string.h>
---- plugins/input/audiocd/audiocd.h
-+++ plugins/input/audiocd/audiocd.h
-@@ -23,6 +23,7 @@
- #ifndef __SG_MPFC_AUDIOCD_H__
- #define __SG_MPFC_AUDIOCD_H__
- 
-+#include <limits.h> /* cdrom.h and INT_MAX */
- #include <linux/cdrom.h>
- #include "types.h"
- #include "logger.h"
diff --git a/media-sound/mpfc/files/mpfc-1.3.7-asneeded.patch b/media-sound/mpfc/files/mpfc-1.3.7-asneeded.patch
deleted file mode 100644
index d681e8784f74..000000000000
--- a/media-sound/mpfc/files/mpfc-1.3.7-asneeded.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: mpfc-1.3.7/libmpfc/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/libmpfc/Makefile.am
-+++ mpfc-1.3.7/libmpfc/Makefile.am
-@@ -18,6 +18,6 @@ libmpfc_la_SOURCES = cfg.c charset.c fil
- 					 song_info.c string.c vfs.c logger.c cfg_rcfile.c \
- 					 plugin.c plugin_general.c command.c \
- 					 $(libmpfchdr_HEADERS)
--libmpfc_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@ 
-+libmpfc_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@ @DL_LIBS@
- INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
- localedir = $(datadir)/locale
-Index: mpfc-1.3.7/src/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/src/Makefile.am
-+++ mpfc-1.3.7/src/Makefile.am
-@@ -13,6 +13,7 @@ localedir = $(datadir)/locale
- DEFS = -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"$(libdir)\" \
- 	   -DSYSCONFDIR=\"$(sysconfdir)\" @DEFS@
- INCLUDES = -I$(top_builddir)/libmpfcwnd/
--mpfc_LDADD = @COMMON_LIBS@ @PTHREAD_LIBS@ @DL_LIBS@ @MATH_LIBS@ \
-+mpfc_LDADD =  \
- 			 $(top_builddir)/libmpfc/libmpfc.la \
--			 $(top_builddir)/libmpfcwnd/libmpfcwnd.la
-+			 $(top_builddir)/libmpfcwnd/libmpfcwnd.la \
-+                         @COMMON_LIBS@ @PTHREAD_LIBS@ @DL_LIBS@ @MATH_LIBS@
diff --git a/media-sound/mpfc/files/mpfc-1.3.7-libdir.patch b/media-sound/mpfc/files/mpfc-1.3.7-libdir.patch
deleted file mode 100644
index 52a318463154..000000000000
--- a/media-sound/mpfc/files/mpfc-1.3.7-libdir.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Index: mpfc-1.3.7/libmpfc/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/libmpfc/Makefile.am
-+++ mpfc-1.3.7/libmpfc/Makefile.am
-@@ -1,7 +1,5 @@
- lib_LTLIBRARIES = libmpfc.la
- 
--libdir = $(prefix)/lib/
--
- libmpfchdrdir = $(prefix)/include/mpfc
- libmpfchdr_HEADERS = ../mpfc-config.h ../src/types.h ../src/cfg.h \
- 					 ../src/charset.h \
-Index: mpfc-1.3.7/libmpfcwnd/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/libmpfcwnd/Makefile.am
-+++ mpfc-1.3.7/libmpfcwnd/Makefile.am
-@@ -1,5 +1,4 @@
- lib_LTLIBRARIES = libmpfcwnd.la
--libdir = $(prefix)/lib/
- libmpfcwndhdrdir = $(prefix)/include/mpfc/libmpfcwnd
- libmpfcwndhdr_HEADERS = wnd.h wnd_print.h wnd_msg.h wnd_kbd.h \
- 						wnd_def_handlers.h wnd_root.h wnd_mouse.h wnd_types.h \
-Index: mpfc-1.3.7/plugins/input/audiocd/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/plugins/input/audiocd/Makefile.am
-+++ mpfc-1.3.7/plugins/input/audiocd/Makefile.am
-@@ -1,6 +1,6 @@
--lib_LTLIBRARIES = libaudiocd.la
-+plugin_LTLIBRARIES = libaudiocd.la
- 
--libdir = $(prefix)/lib/mpfc/input
-+plugindir = $(libdir)/mpfc/input
- 
- libaudiocd_la_SOURCES = audiocd.c audiocd.h cddb.c cddb.h
- libaudiocd_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@
-Index: mpfc-1.3.7/plugins/input/mp3/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/plugins/input/mp3/Makefile.am
-+++ mpfc-1.3.7/plugins/input/mp3/Makefile.am
-@@ -1,6 +1,6 @@
--lib_LTLIBRARIES = libmp3.la
-+plugin_LTLIBRARIES = libmp3.la
- 
--libdir = $(prefix)/lib/mpfc/input
-+plugindir = $(libdir)/mpfc/input
- 
- libmp3_la_SOURCES = mp3.c mp3.h 
- INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
-Index: mpfc-1.3.7/plugins/input/ogg/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/plugins/input/ogg/Makefile.am
-+++ mpfc-1.3.7/plugins/input/ogg/Makefile.am
-@@ -1,6 +1,6 @@
--lib_LTLIBRARIES = libogg_vorbis.la
-+plugin_LTLIBRARIES = libogg_vorbis.la
- 
--libdir = $(prefix)/lib/mpfc/input
-+plugindir = $(libdir)/mpfc/input
- 
- libogg_vorbis_la_SOURCES = ogg.c vcedit.c vcedit.h
- INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
-Index: mpfc-1.3.7/plugins/input/wav/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/plugins/input/wav/Makefile.am
-+++ mpfc-1.3.7/plugins/input/wav/Makefile.am
-@@ -1,6 +1,6 @@
--lib_LTLIBRARIES = libwav.la
-+plugin_LTLIBRARIES = libwav.la
- 
--libdir = $(prefix)/lib/mpfc/input
-+plugindir = $(libdir)/mpfc/input
- 
- libwav_la_SOURCES = wav.c wav.h
- libwav_la_LIBADD = @COMMON_LIBS@
-Index: mpfc-1.3.7/plugins/output/alsa/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/plugins/output/alsa/Makefile.am
-+++ mpfc-1.3.7/plugins/output/alsa/Makefile.am
-@@ -1,6 +1,6 @@
--lib_LTLIBRARIES = libalsa.la
-+plugin_LTLIBRARIES = libalsa.la
- 
--libdir = $(prefix)/lib/mpfc/output
-+plugindir = $(libdir)/mpfc/output
- 
- libalsa_la_SOURCES = alsa.c
- INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
-Index: mpfc-1.3.7/plugins/output/disk_writer/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/plugins/output/disk_writer/Makefile.am
-+++ mpfc-1.3.7/plugins/output/disk_writer/Makefile.am
-@@ -1,6 +1,6 @@
--lib_LTLIBRARIES = libdisk_writer.la
-+plugin_LTLIBRARIES = libdisk_writer.la
- 
--libdir = $(prefix)/lib/mpfc/output
-+plugindir = $(libdir)/mpfc/output
- 
- libdisk_writer_la_SOURCES = writer.c
- libdisk_writer_la_LIBADD = @COMMON_LIBS@
-Index: mpfc-1.3.7/plugins/output/oss/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/plugins/output/oss/Makefile.am
-+++ mpfc-1.3.7/plugins/output/oss/Makefile.am
-@@ -1,6 +1,6 @@
--lib_LTLIBRARIES = liboss.la
-+plugin_LTLIBRARIES = liboss.la
- 
--libdir = $(prefix)/lib/mpfc/output
-+plugindir = $(libdir)/mpfc/output
- 
- liboss_la_SOURCES = oss.c
- liboss_la_LIBADD = @COMMON_LIBS@
diff --git a/media-sound/mpfc/files/mpfc-1.3.7-mathlib.patch b/media-sound/mpfc/files/mpfc-1.3.7-mathlib.patch
deleted file mode 100644
index 09471407398b..000000000000
--- a/media-sound/mpfc/files/mpfc-1.3.7-mathlib.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: mpfc-1.3.7/configure.in
-===================================================================
---- mpfc-1.3.7.orig/configure.in
-+++ mpfc-1.3.7/configure.in
-@@ -66,7 +66,6 @@ LIBS=$LIBS_save
- AC_ARG_ENABLE(mp3, 
- [	--disable-mp3		Disable mp3 input plugin [default=enabled]],,
- 		enable_mp3="yes")
--if test "x$enable_mp3" = xyes; then
- 	# Check for math lib
- 	LIBS_save=$LIBS
- 	AC_CHECK_HEADERS([math.h],,[AC_MSG_ERROR(*** Can't find math header ***)])
-@@ -75,6 +74,7 @@ if test "x$enable_mp3" = xyes; then
- 	AC_SUBST(MATH_LIBS)
- 	LIBS=$LIBS_save
- 
-+if test "x$enable_mp3" = xyes; then
- 	# Check for libmad
- 	LIBS_save=$LIBS
- 	AC_CHECK_HEADERS([mad.h],,[AC_MSG_ERROR(*** Can't find libmad header ***)])
diff --git a/media-sound/mpfc/files/mpfc-gcc4.patch b/media-sound/mpfc/files/mpfc-gcc4.patch
deleted file mode 100644
index 5cb1efb6834b..000000000000
--- a/media-sound/mpfc/files/mpfc-gcc4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mpfc-1.3.7/plugins/input/audiocd/audiocd.c.old	2006-11-05 21:13:25.000000000 +0100
-+++ mpfc-1.3.7/plugins/input/audiocd/audiocd.c	2006-11-05 21:13:35.000000000 +0100
-@@ -60,8 +60,8 @@
- /* Tracks information array */
- struct acd_trk_info_t acd_tracks_info[ACD_MAX_TRACKS];
- int acd_num_tracks = 0;
--static int acd_cur_track = -1;
--static bool_t acd_info_read = FALSE;
-+int acd_cur_track = -1;
-+bool_t acd_info_read = FALSE;
- 
- /* Current time */
- static int acd_time = 0;
diff --git a/media-sound/mpfc/mpfc-1.3.7-r1.ebuild b/media-sound/mpfc/mpfc-1.3.7-r1.ebuild
deleted file mode 100644
index 9dc80425d13e..000000000000
--- a/media-sound/mpfc/mpfc-1.3.7-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="Music Player For Console"
-HOMEPAGE="http://mpfc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="alsa gpm mad vorbis oss wav cdda nls"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	mad? ( media-libs/libmad )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e 's:../src/file.h ../src/file.h:../src/file.h:' \
-		libmpfc/Makefile.am || die #335449
-
-	epatch "${FILESDIR}"/${P}-libdir.patch \
-		"${FILESDIR}"/${PN}-gcc4.patch \
-		"${FILESDIR}"/${P}-mathlib.patch \
-		"${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-INT_MAX.patch
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable alsa) \
-		$(use_enable gpm) \
-		$(use_enable mad mp3) \
-		$(use_enable vorbis ogg) \
-		$(use_enable oss) \
-		$(use_enable wav) \
-		$(use_enable cdda audiocd) \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	insinto /etc
-	doins mpfcrc || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild b/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
index 1c9f36d00895..0d64bd78bc89 100644
--- a/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
+++ b/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Music Player For Console"
 HOMEPAGE="http://mpfc.sourceforge.net/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="alsa cdda flac gpm mad nls oss static-libs vorbis wav"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 )
@@ -53,5 +53,6 @@ src_install() {
 	insinto /etc
 	doins mpfcrc
 
-	prune_libtool_files --all
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
 }