Add missing AC_PROG_CXX and use system ltdl for libtool-2.2.

(Portage version: 2.1.5_rc7)

4 files changed, 120 insertions, 4 deletions

diff --git a/media-sound/moc/ChangeLog b/media-sound/moc/ChangeLog
index 43ffc8fa0da1..262ad4926770 100644
--- a/media-sound/moc/ChangeLog
+++ b/media-sound/moc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/moc
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.56 2008/04/10 08:58:48 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.57 2008/05/08 18:27:17 drac Exp $
+
+*moc-2.5.0_alpha3-r2 (08 May 2008)
+
+  08 May 2008; Samuli Suominen <drac@gentoo.org>
+  +files/moc-2.5.0_alpha3-libtool22.patch, +moc-2.5.0_alpha3-r2.ebuild:
+  Add missing AC_PROG_CXX and use system ltdl for libtool-2.2.
 
   10 Apr 2008; Samuli Suominen <drac@gentoo.org> moc-2.5.0_alpha3-r1.ebuild:
   DEPEND dev-util/pkgconfig because eautoreconf fails without pkg.m4 wrt
diff --git a/media-sound/moc/files/moc-2.5.0_alpha3-libtool22.patch b/media-sound/moc/files/moc-2.5.0_alpha3-libtool22.patch
new file mode 100644
index 000000000000..699a95df1952
--- /dev/null
+++ b/media-sound/moc/files/moc-2.5.0_alpha3-libtool22.patch
@@ -0,0 +1,32 @@
+diff -ur moc-2.5.0-alpha3.orig/configure.in moc-2.5.0-alpha3/configure.in
+--- moc-2.5.0-alpha3.orig/configure.in	2008-02-26 00:37:30.000000000 +0200
++++ moc-2.5.0-alpha3/configure.in	2008-05-08 21:17:21.000000000 +0300
+@@ -8,6 +8,7 @@
+ 
+ AC_CANONICAL_HOST
+ AC_PROG_CC
++AC_PROG_CXX
+ AC_PROG_INSTALL
+ 
+ AC_PROG_AWK
+diff -ur moc-2.5.0-alpha3.orig/Makefile.am moc-2.5.0-alpha3/Makefile.am
+--- moc-2.5.0-alpha3.orig/Makefile.am	2007-12-15 09:38:57.000000000 +0200
++++ moc-2.5.0-alpha3/Makefile.am	2008-05-08 21:20:59.000000000 +0300
+@@ -40,8 +40,6 @@
+ 	       themes.h \
+ 	       keys.c \
+ 	       keys.h \
+-	       ltdl.c \
+-	       ltdl.h \
+ 	       io.c \
+ 	       io.h \
+ 	       compat.c \
+@@ -70,7 +68,7 @@
+ 		     jack.c \
+ 		     jack.h
+ man_MANS = mocp.1
+-mocp_LDADD = @EXTRA_OBJS@
++mocp_LDADD = @EXTRA_OBJS@ -lltdl
+ mocp_DEPENDENCIES = @EXTRA_OBJS@
+ mocp_LDFLAGS = @EXTRA_LIBS@ $(RCC_LIBS)
+ EXTRA_DIST = config.example mocp.1 THANKS keymap.example Doxyfile \
diff --git a/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild b/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild
index fca3f05ecdd5..aca59c9e64b1 100644
--- a/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild
+++ b/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild,v 1.9 2008/04/10 08:58:48 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild,v 1.10 2008/05/08 18:27:17 drac Exp $
 
 inherit autotools eutils
 
@@ -43,8 +43,8 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-faad2.patch
-	epatch "${FILESDIR}"/${P}-ffmpegheaders.patch
+	epatch "${FILESDIR}"/${P}-faad2.patch \
+		"${FILESDIR}"/${P}-ffmpegheaders.patch
 	cp -f "${WORKDIR}"/m4/* m4/
 	AT_M4DIR="m4" eautoreconf
 }
diff --git a/media-sound/moc/moc-2.5.0_alpha3-r2.ebuild b/media-sound/moc/moc-2.5.0_alpha3-r2.ebuild
new file mode 100644
index 000000000000..ae8c9afaeb6b
--- /dev/null
+++ b/media-sound/moc/moc-2.5.0_alpha3-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha3-r2.ebuild,v 1.1 2008/05/08 18:27:17 drac Exp $
+
+inherit autotools eutils
+
+MY_P=${P/_/-}
+
+MOC_M4_VER=1
+
+DESCRIPTION="Music On Console - ncurses interface for playing audio files"
+HOMEPAGE="http://moc.daper.net"
+SRC_URI="ftp://ftp.daper.net/pub/soft/${PN}/unstable/${MY_P}.tar.bz2
+	mirror://gentoo/${PN}-m4-${MOC_M4_VER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa aac jack mad musepack vorbis flac wavpack sndfile modplug timidity sid ffmpeg speex libsamplerate curl debug"
+
+RDEPEND="media-libs/libao
+	alsa? ( media-libs/alsa-lib )
+	aac? ( media-libs/faad2 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag )
+	musepack? ( media-libs/libmpcdec >=media-libs/taglib-1.3 )
+	vorbis? ( >=media-libs/libvorbis-1 )
+	flac? ( media-libs/flac )
+	wavpack? ( >=media-sound/wavpack-4.31 )
+	sndfile? ( >=media-libs/libsndfile-1 )
+	modplug? ( >=media-libs/libmodplug-0.7 )
+	timidity? ( media-libs/libtimidity media-sound/timidity++ )
+	sid? ( >=media-libs/libsidplay-2 )
+	ffmpeg? ( media-video/ffmpeg )
+	speex? ( >=media-libs/speex-1 )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1 )
+	curl? ( >=net-misc/curl-7.12.2 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-faad2.patch \
+		"${FILESDIR}"/${P}-ffmpegheaders.patch \
+		"${FILESDIR}"/${P}-libtool22.patch
+	cp -f "${WORKDIR}"/m4/* m4/
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	econf --without-rcc \
+		$(use_with aac) \
+		$(use_with jack) \
+		$(use_with mad mp3) \
+		$(use_with musepack) \
+		$(use_with vorbis) \
+		$(use_with flac) \
+		$(use_with wavpack) \
+		$(use_with sndfile) \
+		$(use_with modplug) \
+		$(use_with timidity) \
+		$(use_with sid sidplay2) \
+		$(use_with ffmpeg) \
+		$(use_with speex) \
+		$(use_with libsamplerate samplerate) \
+		$(use_with curl) \
+		$(use_enable debug)
+	emake || die "emake failed."
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO *.example
+	rm -rf "${D}"/usr/share/doc/${PN}
+}