commit: 11b7949c20c54405763d8b5425da5cb1ad34f0e3 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Wed Apr 18 19:06:31 2018 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Wed Apr 18 19:07:11 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11b7949c
media-sound/mpfc: Remove old Closes: https://bugs.gentoo.org/648298 Package-Manager: Portage-2.3.30, Repoman-2.3.9 media-sound/mpfc/Manifest | 1 - media-sound/mpfc/files/mpfc-1.3.7-INT_MAX.patch | 20 ---- media-sound/mpfc/files/mpfc-1.3.7-asneeded.patch | 26 ------ media-sound/mpfc/files/mpfc-1.3.7-libdir.patch | 113 ----------------------- media-sound/mpfc/files/mpfc-1.3.7-mathlib.patch | 20 ---- media-sound/mpfc/files/mpfc-gcc4.patch | 13 --- media-sound/mpfc/mpfc-1.3.7-r1.ebuild | 55 ----------- 7 files changed, 248 deletions(-) diff --git a/media-sound/mpfc/Manifest b/media-sound/mpfc/Manifest index e3105eef53a..adbbd7aa1bc 100644 --- a/media-sound/mpfc/Manifest +++ b/media-sound/mpfc/Manifest @@ -1,2 +1 @@ -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 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 8bca2f38036..00000000000 --- 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 d681e8784f7..00000000000 --- 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 52a31846315..00000000000 --- 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 09471407398..00000000000 --- 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 5cb1efb6834..00000000000 --- 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 9dc80425d13..00000000000 --- 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 -}
