old

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

6 files changed, 9 insertions, 228 deletions

diff --git a/media-sound/alsaplayer/ChangeLog b/media-sound/alsaplayer/ChangeLog
index 6fcda659ef26..8ee6c931dc02 100644
--- a/media-sound/alsaplayer/ChangeLog
+++ b/media-sound/alsaplayer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/alsaplayer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.79 2012/01/21 16:22:02 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.80 2012/01/21 17:17:54 ssuominen Exp $
+
+  21 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -alsaplayer-0.99.80-r1.ebuild,
+  -files/alsaplayer-0.99.80-enable-libid3tag.patch,
+  -files/alsaplayer-0.99.80-glibc-2.10.patch,
+  -files/alsaplayer-0.99.80-missing_limits_h.patch,
+  -files/alsaplayer-0.99.80_rc3-flags.patch:
+  old
 
   21 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   alsaplayer-0.99.81.ebuild:
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.80-r1.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.80-r1.ebuild
deleted file mode 100644
index 2d5c1d9e6b83..000000000000
--- a/media-sound/alsaplayer/alsaplayer-0.99.80-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.80-r1.ebuild,v 1.8 2012/01/09 16:49:51 ssuominen Exp $
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="A heavily multi-threaded pluggable audio player."
-HOMEPAGE="http://www.alsaplayer.org"
-SRC_URI="http://www.${PN}.org/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~sparc x86"
-IUSE="alsa audiofile doc flac gtk id3tag jack mad nas nls ogg opengl oss vorbis xosd"
-# mikmod is disabled wrt #279344
-
-RDEPEND="media-libs/libsndfile
-	mad? ( media-libs/libmad )
-	id3tag? ( media-libs/libid3tag )
-	gtk? ( >=x11-libs/gtk+-2.8:2 )
-	alsa? ( media-libs/alsa-lib )
-	audiofile? ( media-libs/audiofile )
-	flac? ( media-libs/flac )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.80 )
-	nas? ( media-libs/nas )
-	ogg? ( media-libs/libogg )
-	opengl? ( virtual/opengl )
-	vorbis? ( media-libs/libvorbis )
-	xosd? ( x11-libs/xosd )"
-# media-libs/libmikmod
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}_rc3-flags.patch \
-		"${FILESDIR}"/${P}-missing_limits_h.patch \
-		"${FILESDIR}"/${P}-enable-libid3tag.patch \
-		"${FILESDIR}"/${P}-glibc-2.10.patch
-	eautoreconf
-}
-
-src_configure() {
-	use xosd || export ac_cv_lib_xosd_xosd_create="no"
-	use doc || export ac_cv_prog_HAVE_DOXYGEN="false"
-
-	local myconf
-
-	if ! use alsa && ! use oss && ! use jack && ! use nas; then
-		ewarn "You've disabled alsa, oss, esd, jack and nas. Enabling oss for you."
-		myconf="${myconf} --enable-oss"
-	fi
-
-	econf --disable-sgi \
-		$(use_enable audiofile) \
-		--disable-esd \
-		$(use_enable flac) \
-		$(use_enable gtk gtk2) \
-		$(use_enable id3tag) \
-		$(use_enable jack) \
-		--disable-mikmod \
-		$(use_enable nas) \
-		$(use_enable opengl) \
-		$(use_enable oss) \
-		$(use_enable vorbis oggvorbis) \
-		$(use_enable alsa) \
-		$(use_enable nls) \
-		$(use_enable mad) \
-		--disable-dependency-tracking \
-		${myconf}
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="${D}/usr/share/doc/${PF}" install \
-		|| die "emake install failed"
-	dodoc AUTHORS ChangeLog README TODO docs/*.txt
-	newicon interface/gtk2/pixmaps/logo.xpm ${PN}.xpm
-}
diff --git a/media-sound/alsaplayer/files/alsaplayer-0.99.80-enable-libid3tag.patch b/media-sound/alsaplayer/files/alsaplayer-0.99.80-enable-libid3tag.patch
deleted file mode 100644
index c29bba5054f3..000000000000
--- a/media-sound/alsaplayer/files/alsaplayer-0.99.80-enable-libid3tag.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- alsaplayer-0.99.80/configure.ac	2007-11-04 06:15:35.000000000 +1000
-+++ alsaplayer-0.99.80.new/configure.ac	2009-03-01 17:25:22.344483528 +1000
-@@ -292,6 +292,16 @@
- 
- AC_CHECK_LIB(id3tag, id3_file_open,
-      FLC_LDADD="$FLC_LDADD -lid3tag -lz"; use_libid3tag=yes; AC_DEFINE(HAVE_LIBID3TAG, 1, [Define if you have libid3tag library (-lid3tag)]), use_libid3tag=no)
-+AC_ARG_ENABLE(id3tag,
-+[  --enable-id3tag         Enable libid3tag support (default=yes)],
-+[if test "$enableval" = "no"
-+then
-+	if test "$use_libid3tag" = "yes"
-+	then
-+		use_libid3tag=no
-+	fi
-+fi])
-+
- 
- CFLAGS=$oldcflags
- 
diff --git a/media-sound/alsaplayer/files/alsaplayer-0.99.80-glibc-2.10.patch b/media-sound/alsaplayer/files/alsaplayer-0.99.80-glibc-2.10.patch
deleted file mode 100644
index 5887cbf850e2..000000000000
--- a/media-sound/alsaplayer/files/alsaplayer-0.99.80-glibc-2.10.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur alsaplayer-0.99.80.orig/input/flac/FlacPlugin.cpp alsaplayer-0.99.80/input/flac/FlacPlugin.cpp
---- alsaplayer-0.99.80.orig/input/flac/FlacPlugin.cpp	2007-10-29 23:00:16.000000000 +0200
-+++ alsaplayer-0.99.80/input/flac/FlacPlugin.cpp	2009-07-20 00:19:07.000000000 +0300
-@@ -239,7 +239,7 @@
-     else
-     {
- 	// use stream name
--	char * fname = strrchr (f->name ().c_str (), '/');
-+	const char * fname = strrchr (f->name ().c_str (), '/');
- 	if (fname)
- 	{
- 	    fname++;
-@@ -270,7 +270,7 @@
- 	if (strncmp(name, "http://", 7) == 0) {
- 		return 0.0;
- 	}
--	char *ext = strrchr(name, '.');
-+	const char *ext = strrchr(name, '.');
- 	if (!ext)
- 		return 0.0;
- 	ext++;
diff --git a/media-sound/alsaplayer/files/alsaplayer-0.99.80-missing_limits_h.patch b/media-sound/alsaplayer/files/alsaplayer-0.99.80-missing_limits_h.patch
deleted file mode 100644
index cc295918179f..000000000000
--- a/media-sound/alsaplayer/files/alsaplayer-0.99.80-missing_limits_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- app/ControlSocket.cpp.orig	2008-07-04 22:34:38.000000000 +0200
-+++ app/ControlSocket.cpp	2008-07-04 22:35:53.000000000 +0200
-@@ -28,6 +28,7 @@
- #include <sys/un.h>
- #include <csignal>
- #include <pwd.h>
-+#include <limits.h>
- #include "control.h"
- #include "message.h"
- #include "Playlist.h"
diff --git a/media-sound/alsaplayer/files/alsaplayer-0.99.80_rc3-flags.patch b/media-sound/alsaplayer/files/alsaplayer-0.99.80_rc3-flags.patch
deleted file mode 100644
index 65c6ec45a6c5..000000000000
--- a/media-sound/alsaplayer/files/alsaplayer-0.99.80_rc3-flags.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -ur alsaplayer-0.99.80-rc3.orig/app/Makefile.am alsaplayer-0.99.80-rc3/app/Makefile.am
---- alsaplayer-0.99.80-rc3.orig/app/Makefile.am	2007-06-23 18:27:28.000000000 +0300
-+++ alsaplayer-0.99.80-rc3/app/Makefile.am	2007-10-07 07:47:55.000000000 +0300
-@@ -29,8 +29,6 @@
- 
- AM_CXXFLAGS = $(COMMON_FLAGS)
- 
--AM_CFLAGS = $(CXXFLAGS)
--
- bin_PROGRAMS = alsaplayer
- 
- localedir = $(datadir)/locale
-diff -ur alsaplayer-0.99.80-rc3.orig/configure.ac alsaplayer-0.99.80-rc3/configure.ac
---- alsaplayer-0.99.80-rc3.orig/configure.ac	2007-09-05 22:55:29.000000000 +0300
-+++ alsaplayer-0.99.80-rc3/configure.ac	2007-10-07 07:49:09.000000000 +0300
-@@ -564,14 +564,14 @@
- 
- AC_MSG_CHECKING(for gcc optimization flags)
- old_cflags=$CFLAGS
--CFLAGS="$CFLAGS -O2 -fexpensive-optimizations -funroll-loops -finline-functions -ffast-math -Wall"
-+CFLAGS="$CFLAGS"
- AC_TRY_COMPILE([#include <stdio.h>],
- [ printf ("hello, world"); ],
--[ EXTRA_OPT_CFLAGS="-O2 -fexpensive-optimizations -funroll-loops -finline-functions -ffast-math -Wall"],[ EXTRA_OPT_CFLAGS=""])
-+[ EXTRA_OPT_CFLAGS="$CFLAGS"],[ EXTRA_OPT_CFLAGS=""])
- CFLAGS=$old_cflags
- AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
- 
--ARCH_CFLAGS="$EXTRA_OPT_CFLAGS $CFLAGS"
-+ARCH_CFLAGS="$EXTRA_OPT_CFLAGS"
- 
- if test "$ARCH_TYPE" = "i486" || test "$ARCH_TYPE" = "i586" || test "$ARCH_TYPE" = "i686"
- then
-diff -ur alsaplayer-0.99.80-rc3.orig/input/mad/Makefile.am alsaplayer-0.99.80-rc3/input/mad/Makefile.am
---- alsaplayer-0.99.80-rc3.orig/input/mad/Makefile.am	2007-07-18 00:07:37.000000000 +0300
-+++ alsaplayer-0.99.80-rc3/input/mad/Makefile.am	2007-10-07 07:49:28.000000000 +0300
-@@ -23,8 +23,6 @@
- 
- AM_CFLAGS = $(COMMON_CFLAGS)
- 
--AM_CXXFLAGS = $(CFLAGS)
--
- INCLUDES = -I$(ROOT_DIR)/app $(extra_cflags)
- 
- libmad_in_la_SOURCES = $(mad_insources)
-diff -ur alsaplayer-0.99.80-rc3.orig/interface/daemon/Makefile.am alsaplayer-0.99.80-rc3/interface/daemon/Makefile.am
---- alsaplayer-0.99.80-rc3.orig/interface/daemon/Makefile.am	2007-06-13 22:33:45.000000000 +0300
-+++ alsaplayer-0.99.80-rc3/interface/daemon/Makefile.am	2007-10-07 07:49:51.000000000 +0300
-@@ -10,8 +10,6 @@
- 		-D_REENTRANT -I$(top_builddir) -I$(top_srcdir)/alsaplayer \
- 		-DADDON_DIR=\"$(ADDON_DIR)\"
- 
--AM_CFLAGS = $(CXXFLAGS)
--
- libdir = $(ADDON_DIR)/interface
- 
- libdaemon_interface_la_LDFLAGS = $(daemon_interfaceldflags)
-diff -ur alsaplayer-0.99.80-rc3.orig/interface/gtk2/Makefile.am alsaplayer-0.99.80-rc3/interface/gtk2/Makefile.am
---- alsaplayer-0.99.80-rc3.orig/interface/gtk2/Makefile.am	2007-06-20 22:16:41.000000000 +0300
-+++ alsaplayer-0.99.80-rc3/interface/gtk2/Makefile.am	2007-10-07 07:50:28.000000000 +0300
-@@ -25,8 +25,6 @@
- 		@GTK2_CFLAGS@ $(COMMON_FLAGS) \
- 		-D_REENTRANT -DADDON_DIR=\"$(ADDON_DIR)\"
- 
--AM_CFLAGS = $(CXXFLAGS)
--
- libdir = $(ADDON_DIR)/interface
- 
- libgtk2_interface_la_LDFLAGS = $(gtk2_interfaceldflags)
-diff -ur alsaplayer-0.99.80-rc3.orig/interface/text/Makefile.am alsaplayer-0.99.80-rc3/interface/text/Makefile.am
---- alsaplayer-0.99.80-rc3.orig/interface/text/Makefile.am	2007-06-13 22:33:46.000000000 +0300
-+++ alsaplayer-0.99.80-rc3/interface/text/Makefile.am	2007-10-07 07:50:44.000000000 +0300
-@@ -10,8 +10,6 @@
- 		-D_REENTRANT -I$(top_builddir) -I$(top_srcdir)/alsaplayer \
- 		-DADDON_DIR=\"$(ADDON_DIR)\"
- 
--AM_CFLAGS = $(CXXFLAGS)
--
- libdir = $(ADDON_DIR)/interface
- 
- libtext_interface_la_LDFLAGS = $(text_interfaceldflags)
-diff -ur alsaplayer-0.99.80-rc3.orig/interface/xosd/Makefile.am alsaplayer-0.99.80-rc3/interface/xosd/Makefile.am
---- alsaplayer-0.99.80-rc3.orig/interface/xosd/Makefile.am	2007-06-13 22:33:51.000000000 +0300
-+++ alsaplayer-0.99.80-rc3/interface/xosd/Makefile.am	2007-10-07 07:50:59.000000000 +0300
-@@ -22,8 +22,6 @@
- 		-D_REENTRANT -I$(top_builddir) -I$(top_srcdir)/alsaplayer \
- 		-DADDON_DIR=\"$(ADDON_DIR)\"
- 
--AM_CFLAGS = $(CXXFLAGS)
--
- libdir = $(ADDON_DIR)/interface
- 
- libxosd_interface_la_LDFLAGS = $(xosd_interfaceldflags)