old, fix dodoc

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 12 insertions, 152 deletions

diff --git a/media-libs/akode/akode-2.0.1-r1.ebuild b/media-libs/akode/akode-2.0.1-r1.ebuild
deleted file mode 100644
index 5176b029046d..000000000000
--- a/media-libs/akode/akode-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/akode/akode-2.0.1-r1.ebuild,v 1.7 2007/10/14 10:08:08 armin76 Exp $
-
-WANT_AUTOMAKE="1.9"
-WANT_AUTOCONF="2.5"
-
-inherit eutils autotools
-
-MY_P=${P/_beta/b}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A simple framework to decode the most common audio formats."
-HOMEPAGE="http://www.carewolf.com/"
-#SRC_URI="http://www.carewolf.com/akode/${MY_P}.tar.gz"
-SRC_URI="http://www.kde-apps.org/content/files/30375-${P}.tar.bz2
-	mirror://gentoo/${P}+flac-1.1.3.tar.bz2"
-LICENSE="LGPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="alsa jack flac mp3 oss speex vorbis"
-
-DEPEND="media-libs/libsamplerate
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	flac? ( >=media-libs/flac-1.1.2 )
-	mp3? ( media-libs/libmad )
-	vorbis? ( media-libs/libvorbis )
-	speex? ( media-libs/speex )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-alsa-tests.patch"
-	epatch "${WORKDIR}/${P}+flac-1.1.3.patch"
-	epatch "${WORKDIR}/${P}+flac-1.1.3-2.patch"
-	epatch "${WORKDIR}/${P}-ogglflac-1.1.3.patch"
-
-	sed -i -e '/case $AUTO\(CONF\|HEADER\)_VERSION in/,+1 s/2\.5/2.[56]/g' \
-		admin/cvs.sh
-
-	emake -j1 -f admin/Makefile.common || die "unable to regenerate configure"
-
-	elibtoolize
-}
-
-src_compile() {
-	local myconf="--with-libsamplerate
-				  $(use_with oss) $(use_with alsa) $(use_with jack)
-				  $(use_with flac) $(use_with mp3 libmad)
-				  $(use_with vorbis) $(use_with speex)
-				  --without-polypaudio"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/media-libs/akode/akode-2.0.2.ebuild b/media-libs/akode/akode-2.0.2.ebuild
index 94af4efb5a39..e3fc89402e5c 100644
--- a/media-libs/akode/akode-2.0.2.ebuild
+++ b/media-libs/akode/akode-2.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/akode/akode-2.0.2.ebuild,v 1.9 2008/05/24 16:07:33 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/akode/akode-2.0.2.ebuild,v 1.10 2009/10/17 12:08:00 ssuominen Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="2.5"
@@ -8,14 +8,13 @@ WANT_AUTOCONF="2.5"
 inherit eutils autotools
 
 MY_P=${P/_beta/b}
-S="${WORKDIR}"/${MY_P}
+S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="A simple framework to decode the most common audio formats."
 HOMEPAGE="http://www.carewolf.com/"
-#SRC_URI="http://www.carewolf.com/akode/${MY_P}.tar.gz"
 SRC_URI="http://www.kde-apps.org/CONTENT/content-files/30375-${P}.tar.bz2"
-LICENSE="LGPL-2"
 
+LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="alsa jack flac mp3 oss speex vorbis"
@@ -46,17 +45,17 @@ src_unpack() {
 
 src_compile() {
 	local myconf="--with-libsamplerate
-				  $(use_with oss) $(use_with alsa) $(use_with jack)
-				  $(use_with flac) $(use_with mp3 libmad)
-				  $(use_with vorbis) $(use_with speex)
-				  --without-polypaudio
-				  --without-ffmpeg"
+		  $(use_with oss) $(use_with alsa) $(use_with jack)
+		  $(use_with flac) $(use_with mp3 libmad)
+		  $(use_with vorbis) $(use_with speex)
+		  --without-polypaudio
+		  --without-ffmpeg"
 
-	econf ${myconf} || die
+	econf ${myconf}
 	emake || die
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README
 }
diff --git a/media-libs/akode/files/akode-2.0.1-alsa-tests.patch b/media-libs/akode/files/akode-2.0.1-alsa-tests.patch
deleted file mode 100644
index 94dabc153dea..000000000000
--- a/media-libs/akode/files/akode-2.0.1-alsa-tests.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Index: akode-2.0.1/akode/configure.in.in
-===================================================================
---- akode-2.0.1.orig/akode/configure.in.in
-+++ akode-2.0.1/akode/configure.in.in
-@@ -105,59 +105,11 @@ AC_DEFUN([KDE_CHECK_SUN],
- 
- AC_DEFUN([KDE_CHECK_ALSA],
- [
--  have_alsa=no
-+  PKG_CHECK_MODULES([ALSA], [alsa >= 0.9], [have_alsa=yes], [have_alsa=no])
- 
--  AC_CHECK_HEADERS([sys/asoundlib.h alsa/asoundlib.h],
--    [have_alsa=yes])
--
--  AC_CHECK_LIB(asound, snd_seq_create_simple_port,
--    [:], [have_alsa=no])
--
--  AC_LANG_SAVE
--  AC_LANG_C
--  if test "x$have_alsa" = xyes; then
--    AC_TRY_COMPILE([
--      #include "confdefs.h"
--      #ifdef HAVE_SYS_ASOUNDLIB_H
--      #include <sys/asoundlib.h>
--      #endif
--      #ifdef HAVE_ALSA_ASOUNDLIB_H
--      #include <alsa/asoundlib.h>
--      #endif
--    ],[
--      #if (SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)
--        /* we have ALSA 0.9.x */
--      #else
--        #error not ALSA 0.9.x
--      #endif
--    ],
--    have_alsa_0_9=yes)
--
--    AC_TRY_COMPILE([
--      #include "confdefs.h"
--      #ifdef HAVE_SYS_ASOUNDLIB_H
--      #include <sys/asoundlib.h>
--      #endif
--      #ifdef HAVE_ALSA_ASOUNDLIB_H
--      #include <alsa/asoundlib.h>
--      #endif
--    ],[
--      #if (SND_LIB_MAJOR == 1)
--        /* we have ALSA 1.x */
--      #else
--        #error not ALSA 1.x
--      #endif
--    ],
--    have_alsa_1=yes)
--  fi
--  AC_LANG_RESTORE
--
--  if test "x$have_alsa_0_9" = xyes || test "x$have_alsa_1" = xyes; then
--    LIBASOUND="-lasound"
-+  if test "x$have_alsa" = "xyes"; then
-     AC_DEFINE(HAVE_LIBASOUND2, 1, [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)])
-   fi
--
--  AC_SUBST(LIBASOUND)
- ])
- 
- AC_ARG_WITH(flac,AC_HELP_STRING([--with-flac],[Enable FLAC support @<:@default=check@:>@]),[flac_test="$withval"],[flac_test="yes"])
-Index: akode-2.0.1/akode/plugins/alsa_sink/Makefile.am
-===================================================================
---- akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.am
-+++ akode-2.0.1/akode/plugins/alsa_sink/Makefile.am
-@@ -4,4 +4,4 @@ lib_LTLIBRARIES	= libakode_alsa_sink.la
- 
- libakode_alsa_sink_la_SOURCES = alsa_sink.cpp
- libakode_alsa_sink_la_LDFLAGS = -module -avoid-version -no-undefined
--libakode_alsa_sink_la_LIBADD = ../../lib/libakode.la $(LIBASOUND)
-+libakode_alsa_sink_la_LIBADD = ../../lib/libakode.la $(ALSA_LIBS)