From 0fc2b39199ee898feb2b5cc40975016d728f7c22 Mon Sep 17 00:00:00 2001
From: Samuli Suominen <ssuominen@gentoo.org>
Date: Sat, 1 Mar 2008 12:01:27 +0000
Subject: [PATCH] Version bump wrt #198437, thanks to Christian Faulhammer for
 reporting. Package-Manager: portage-2.1.4.4

---
 media-sound/alsaplayer/ChangeLog              | 11 ++-
 media-sound/alsaplayer/Manifest               |  9 +-
 ...0_rc4.ebuild => alsaplayer-0.99.80.ebuild} | 28 +++---
 .../alsaplayer/alsaplayer-0.99.80_rc3.ebuild  | 86 -------------------
 .../files/alsaplayer-0.99.80_rc3-glib.patch   | 11 ---
 5 files changed, 22 insertions(+), 123 deletions(-)
 rename media-sound/alsaplayer/{alsaplayer-0.99.80_rc4.ebuild => alsaplayer-0.99.80.ebuild} (75%)
 delete mode 100644 media-sound/alsaplayer/alsaplayer-0.99.80_rc3.ebuild
 delete mode 100644 media-sound/alsaplayer/files/alsaplayer-0.99.80_rc3-glib.patch

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/Manifest b/media-sound/alsaplayer/Manifest
index 63584fdd11c3..eee78870caa6 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,8 +1,5 @@
 AUX alsaplayer-0.99.80_rc3-flags.patch 3905 RMD160 32e721a50403608816f356d07e6e1a3fe55cc860 SHA1 e6140d06da2289ff3c6d840a87fa42a5ea9fb7e6 SHA256 c760756aef8feb45ed455b4c57c6ff7f751e4609c7ef54c4bf82cb5fa1a16b6f
-AUX alsaplayer-0.99.80_rc3-glib.patch 510 RMD160 36bb54c02e156706689afc78200f8d1b8d52fd4c SHA1 e7361e467037c64695a3bfb97961bc3a657dd844 SHA256 105e1da9378c7d7e98e36cd4c40cdf024f5ff9b5f69c08952c339203db12dae1
-DIST alsaplayer-0.99.80-rc3.tar.bz2 804855 RMD160 c79fd29c0466f9c3897af01c058bea19ef096e6b SHA1 4f9e7722c592283040a9622683f042a26c3cf4ed SHA256 b66f1c1579d5053d9b06eddeae9252cb9c427e7e22512346bb7236c61ea23fe7
-DIST alsaplayer-0.99.80-rc4.tar.bz2 804362 RMD160 eae2617c7f027a5378c573b7cd4aa588ae3a7354 SHA1 47f5e76aaeb23f79bafcaeaa38379dc5a7c02ca4 SHA256 b4612938cf6889e1fb9c602cbf49175678be81e08e3d487447c7103b6e4c13b4
-EBUILD alsaplayer-0.99.80_rc3.ebuild 2319 RMD160 e28e3d0c386c49667dbcdc88c9e4eea85a2fae8b SHA1 de222a08a7879593794232acb682b4585bd46f46 SHA256 bd4a8c8cb747396aef4a65935ddceddecf0fe427c5f8d9f4ea74e7b09535055a
-EBUILD alsaplayer-0.99.80_rc4.ebuild 2404 RMD160 fcfd62fa94cfe30ad4a13627e8c1f47e954584b2 SHA1 c7cbfa39bbcb2051b360e8db38714c452213815e SHA256 bb3a9db650c351c1bf672bde6890936482b334420ddc279b486a3b291ae4ed57
-MISC ChangeLog 10899 RMD160 aa94600b41e01b1daddfd256053fe37e54bc2dea SHA1 181a0994e53cae1396431a78131d8df6150e71e3 SHA256 0c1a7500e3f8278ce0de6c6d1f7a70885278c68f2e077816c311c005a215ee51
+DIST alsaplayer-0.99.80.tar.bz2 805045 RMD160 41248dff120a01bf286c1616fa6b968ad6cdf16a SHA1 883d590b01371840024b5a8bf0fe95b464a2ccd1 SHA256 9020e2214d7c7a6a3a3f6a310538cfa6226eaeccb8c08de3b72d69d186d7cb83
+EBUILD alsaplayer-0.99.80.ebuild 2174 RMD160 335e390c0416ad2c45ae4bc8b6bc75ef8c098c80 SHA1 47dd0e83cad0e6d8bac404fc147aaba113c115bf SHA256 61de6fc0c3b743eb8207a518e35f32961ea9d691f553e102a9d48c49cccfd2aa
+MISC ChangeLog 11191 RMD160 af1a3d04dfc4f59d65a60739cc224de659f14582 SHA1 cbeac69d92a6c217fa5bd34be8ed23f05a155ddc SHA256 f44dbd52d8597eeae32aa7f8d7763f94452ca00c9b0cb7e68446390dc49d2171
 MISC metadata.xml 257 RMD160 677ed7ea57e4a0a5f0adbeddfa2c83c7cd66ea87 SHA1 0dd42935d9ae2aa2ab02fa15b2ee0531227a2c28 SHA256 3f686ab5cab442913ef74d24ed831d7e176464acd7f57daa8c67358e4715c87b
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.80_rc4.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.80.ebuild
similarity index 75%
rename from media-sound/alsaplayer/alsaplayer-0.99.80_rc4.ebuild
rename to 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)
-- 
2.26.2