Version bump wrt #198437, thanks to Christian Faulhammer for reporting.

(Portage version: 2.1.4.4)

4 files changed, 19 insertions, 117 deletions

diff --git a/media-sound/alsaplayer/ChangeLog b/media-sound/alsaplayer/ChangeLog
index 6b55f2b57d5b..e25ed3291325 100644
--- a/media-sound/alsaplayer/ChangeLog
+++ b/media-sound/alsaplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/alsaplayer
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.65 2007/10/13 17:43:30 dirtyepic Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.66 2008/03/01 12:01:27 drac Exp $
+
+*alsaplayer-0.99.80 (01 Mar 2008)
+
+  01 Mar 2008; Samuli Suominen <drac@gentoo.org>
+  -files/alsaplayer-0.99.80_rc3-glib.patch, -alsaplayer-0.99.80_rc3.ebuild,
+  -alsaplayer-0.99.80_rc4.ebuild, +alsaplayer-0.99.80.ebuild:
+  Version bump wrt #198437, thanks to Christian Faulhammer for reporting.
 
   13 Oct 2007; Ryan Hill <dirtyepic@gentoo.org> metadata.xml:
   Remove me from metadata.
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.80_rc4.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.80.ebuild
index 84f7aab88de9..4cb2a0286cc2 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.80_rc4.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.80.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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_rc4.ebuild,v 1.1 2007/10/10 17:06:54 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.80.ebuild,v 1.1 2008/03/01 12:01:27 drac Exp $
 
-inherit eutils autotools versionator
-
-MY_PV="$(replace_version_separator _ -)"
+inherit autotools eutils
 
 DESCRIPTION="A heavily multi-threaded pluggable audio player."
-HOMEPAGE="http://www.alsaplayer.org/"
-SRC_URI="http://www.alsaplayer.org/${PN}-${MY_PV}.tar.bz2"
+HOMEPAGE="http://www.alsaplayer.org"
+SRC_URI="http://www.${PN}.org/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -34,30 +32,25 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	doc? ( app-doc/doxygen )"
 
-S="${WORKDIR}"/${PN}-${MY_PV}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.99.80_rc3-flags.patch
+	epatch "${FILESDIR}"/${P}_rc3-flags.patch
 	eautoreconf
 }
 
+
 src_compile() {
 	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 esd && ! use jack && ! use nas && ! use	sparc; then
+	if ! use alsa && ! use oss && ! use esd && ! use jack && ! use nas; then
 		ewarn "You've disabled alsa, oss, esd, jack and nas. Enabling oss for you."
 		myconf="${myconf} --enable-oss"
 	fi
 
-	if use ogg && use flac && has_version "<media-libs/flac-1.1.3"; then
-		myconf="${myconf} --enable-oggflac"
-	fi
-
 	econf --disable-gtk --disable-sgi \
 		$(use_enable audiofile) \
 		$(use_enable esd) \
@@ -76,12 +69,11 @@ src_compile() {
 		--disable-dependency-tracking \
 		${myconf}
 
-	emake || die "emake failed."
+	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/wishlist.txt
+	dodoc AUTHORS ChangeLog README TODO docs/*.txt
 }
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.80_rc3.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.80_rc3.ebuild
deleted file mode 100644
index 371c0d3c7300..000000000000
--- a/media-sound/alsaplayer/alsaplayer-0.99.80_rc3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2007 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_rc3.ebuild,v 1.3 2007/10/08 13:27:41 drac Exp $
-
-inherit eutils autotools versionator
-
-MY_PV="$(replace_version_separator _ -)"
-
-DESCRIPTION="A heavily multi-threaded pluggable audio player."
-HOMEPAGE="http://www.alsaplayer.org/"
-SRC_URI="http://www.alsaplayer.org/${PN}-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
-IUSE="alsa audiofile doc esd flac gtk jack mikmod nas ogg opengl oss vorbis xosd"
-
-RDEPEND="media-libs/libsndfile
-	media-libs/libmad
-	gtk? ( >=x11-libs/gtk+-2.8 )
-	alsa? ( media-libs/alsa-lib )
-	audiofile? ( media-libs/audiofile )
-	esd? ( media-sound/esound )
-	flac? ( media-libs/flac )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.80 )
-	mikmod? ( >=media-libs/libmikmod-3.1.10 )
-	nas? ( media-libs/nas )
-	ogg? ( media-libs/libogg )
-	opengl? ( virtual/opengl )
-	vorbis? ( media-libs/libvorbis )
-	xosd? ( x11-libs/xosd )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-glib.patch
-	epatch "${FILESDIR}"/${P}-flags.patch
-	eautoreconf
-}
-
-src_compile() {
-	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 esd && ! use jack && ! use nas && ! use	sparc; then
-		ewarn "You've disabled alsa, oss, esd, jack and nas. Enabling oss for you."
-		myconf="${myconf} --enable-oss"
-	fi
-
-	if use ogg && use flac; then
-		myconf="${myconf} --enable-oggflac"
-	fi
-
-	econf --disable-gtk --disable-sgi \
-		$(use_enable audiofile) \
-		$(use_enable esd) \
-		$(use_enable flac) \
-		$(use_enable gtk gtk2) \
-		$(use_enable jack) \
-		$(use_enable mikmod) \
-		$(use_enable nas) \
-		$(use_enable opengl) \
-		$(use_enable oss) \
-		$(use_enable sparc) \
-		$(use_enable vorbis oggvorbis) \
-		$(use_enable alsa) \
-		--disable-dependency-tracking \
-		${myconf}
-
-	emake || 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/wishlist.txt
-}
diff --git a/media-sound/alsaplayer/files/alsaplayer-0.99.80_rc3-glib.patch b/media-sound/alsaplayer/files/alsaplayer-0.99.80_rc3-glib.patch
deleted file mode 100644
index 01f9622d2be2..000000000000
--- a/media-sound/alsaplayer/files/alsaplayer-0.99.80_rc3-glib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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:58:08.000000000 +0300
-@@ -62,7 +62,6 @@
- AM_PROG_LIBTOOL
- AM_PROG_CC_C_O
- AC_PROG_MAKE_SET
--AM_PATH_GLIB(1.2.6, have_glib=yes, have_glib=no)
- AM_PATH_LIBMIKMOD(3.1.7, have_mikmod=yes, have_mikmod=no)
- AM_PATH_OGG(have_ogg=yes, have_ogg=no)
- AM_PATH_VORBIS(have_vorbis=yes, have_vorbis=no)