Version bump.

(Portage version: 2.1.5_rc4)

4 files changed, 76 insertions, 92 deletions

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index ad669d116dc5..a0350108058d 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpg123
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.153 2008/04/02 18:12:53 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.154 2008/04/17 18:32:22 drac Exp $
+
+*mpg123-1.4.1 (17 Apr 2008)
+
+  17 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  -files/0.67-no-faltivec.patch, -mpg123-0.67.ebuild, +mpg123-1.4.1.ebuild:
+  Version bump.
 
   02 Apr 2008; Tobias Klausmann <klausman@gentoo.org> mpg123-1.3.1.ebuild:
   Stable on alpha, bug #215024
diff --git a/media-sound/mpg123/files/0.67-no-faltivec.patch b/media-sound/mpg123/files/0.67-no-faltivec.patch
deleted file mode 100644
index 23af449477f5..000000000000
--- a/media-sound/mpg123/files/0.67-no-faltivec.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mpg123-0.67/configure.ac.orig	2007-10-21 16:07:05.000000000 +0100
-+++ mpg123-0.67/configure.ac	2007-10-21 16:07:24.000000000 +0100
-@@ -445,7 +445,7 @@
-     CFLAGS="$CFLAGS -DOPT_GENERIC -DREAL_IS_FIXED"
-   ;;
-   altivec)
--    CFLAGS="$CFLAGS -maltivec -faltivec -DREAL_IS_FLOAT -DOPT_ALTIVEC"
-+    CFLAGS="$CFLAGS -maltivec -DREAL_IS_FLOAT -DOPT_ALTIVEC"
-   ;;
-   i386) 
-     CFLAGS="$CFLAGS -DOPT_I386 -DREAL_IS_FLOAT"
diff --git a/media-sound/mpg123/mpg123-0.67.ebuild b/media-sound/mpg123/mpg123-0.67.ebuild
deleted file mode 100644
index c587fa3d4a89..000000000000
--- a/media-sound/mpg123/mpg123-0.67.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.67.ebuild,v 1.11 2008/02/25 14:02:36 drac Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3."
-HOMEPAGE="http://www.mpg123.org"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="3dnow 3dnowext alsa altivec esd jack mmx nas oss portaudio sdl sse"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	sdl? ( !alsa? ( !oss? ( media-libs/libsdl ) ) )
-	esd? ( !alsa? ( !oss? ( !sdl? ( media-sound/esound ) ) ) )
-	nas? ( !alsa? ( !oss? ( !sdl? ( !esd? ( media-libs/nas ) ) ) ) )
-	jack? ( !alsa? ( !oss? ( !sdl? ( !esd? ( !nas? ( media-sound/jack-audio-connection-kit ) ) ) ) ) )
-	portaudio? ( !alsa? ( !oss? ( !sdl? ( !esd? ( !nas? ( !jack? ( media-libs/portaudio ) ) ) ) ) ) )"
-DEPEND="${RDEPEND}"
-
-PROVIDE="virtual/mpg123"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}-no-faltivec.patch"
-	eautoreconf
-}
-
-src_compile() {
-	local audiodev
-	if use alsa; then
-		audiodev="alsa"
-	elif use oss; then
-		audiodev="oss"
-	elif use sdl; then
-		audiodev="sdl"
-	elif use esd; then
-		audiodev="esd"
-	elif use nas; then
-		audiodev="nas"
-	elif use jack; then
-		audiodev="jack"
-	elif use portaudio; then
-		audiodev="portaudio";
-	else audiodev="dummy"
-	fi
-
-	if use altivec; then
-		myconf="--with-cpu=altivec"
-	elif use 3dnowext; then
-		myconf="--with-cpu=3dnowext"
-	elif use 3dnow; then
-		myconf="--with-cpu=3dnow"
-	elif use sse; then
-		myconf="--with-cpu=sse"
-	elif use mmx; then
-		myconf="--with-cpu=mmx"
-	fi
-
-	elog "Compiling with ${audiodev} audio output."
-	elog "If that is not what you want, then select exactly ONE"
-	elog "of the following USE flags:"
-	elog "alsa oss sdl esd nas jack portaudio"
-	elog "and recompile ${PN}."
-
-	econf --with-optimization=0 \
-		--with-audio=${audiodev} \
-		${myconf} || die "econf failed."
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/media-sound/mpg123/mpg123-1.4.1.ebuild b/media-sound/mpg123/mpg123-1.4.1.ebuild
new file mode 100644
index 000000000000..c41f9ca44a09
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.4.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.4.1.ebuild,v 1.1 2008/04/17 18:32:22 drac Exp $
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3."
+HOMEPAGE="http://www.mpg123.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="3dnow 3dnowext alsa altivec arts esd jack mmx nas oss portaudio pulseaudio sdl sse"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	esd? ( media-sound/esound )
+	jack? ( media-sound/jack-audio-connection-kit )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl )
+	arts? ( kde-base/arts )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+PROVIDE="virtual/mpg123"
+
+src_unpack() {
+	unpack ${A}
+	sed -i -e 's:-faltivec::' "${S}"/configure || die "sed failed."
+}
+
+src_compile() {
+	local myaudio
+
+	use alsa && myaudio="${myaudio} alsa"
+	use esd && myaudio="${myaudio} esd"
+	use jack && myaudio="${myaudio} jack"
+	use nas && myaudio="${myaudio} nas"
+	use oss && myaudio="${myaudio} oss"
+	use portaudio && myaudio="${myaudio} portaudio"
+	use pulseaudio && myaudio="${myaudio} pulse"
+	use sdl && myaudio="${myaudio} sdl"
+	use arts && myaudio="${myaudio} arts"
+
+	local mycpu
+
+	if use altivec; then
+		mycpu="--with-cpu=altivec"
+	elif use 3dnowext; then
+		mycpu="--with-cpu=3dnowext"
+	elif use 3dnow; then
+		mycpu="--with-cpu=3dnow"
+	elif use sse; then
+		mycpu="--with-cpu=sse"
+	elif use mmx; then
+		mycpu="--with-cpu=mmx"
+	fi
+
+	econf --disable-dependency-tracking \
+		--with-optimization=0 ${mycpu} \
+		--with-audio="${myaudio}"
+
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS* README
+}