old, fix dodoc

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 13 insertions, 157 deletions

diff --git a/media-libs/akode/Manifest b/media-libs/akode/Manifest
index da8d81383784..a6e1e1c1f142 100644
--- a/media-libs/akode/Manifest
+++ b/media-libs/akode/Manifest
@@ -1,10 +1,6 @@
-AUX akode-2.0.1-alsa-tests.patch 2369 RMD160 5f2f833524823daa1cc51b6ebe1f0e8005a84e3a SHA1 b0a7928e82bed3cae6c46283e66b71c59723c85a SHA256 4f22d466e2ac1b4838c9b9bd7861817f34de9602749bdda8890b7686a9d7612e
 AUX akode-2.0.2-amd64-flac-1.1.3.patch 515 RMD160 c4d88ea933fb00575316f80ea2d4627864e32f76 SHA1 b1ebc8d706df291399f874174c3c27693308e6db SHA256 a0531f197d46d6c721e118c9b5a24fa5945057b6991f9ca94cb9b4b081841452
 AUX akode-2.0.2-gcc43.patch 1531 RMD160 fad2a8e6076d6bb8672f1cbae4337bedb3fbc682 SHA1 c4bdb299e0de2b3315a2bc2ec7f4cad1637ab69d SHA256 ff78a293ab871939e3f4364a502bcd45e4a9683b46ba6749d7eaeecd3076f76c
-DIST 30375-akode-2.0.1.tar.bz2 460964 RMD160 e476f01a6baea4051e407166b1997ecdca1bfa86 SHA1 122fe6aabda78a8bda6d81074b7b66eb424f34eb SHA256 a1a31d3ea59e151ff1ff51e9f2be0db84fc9fcb40f590abb1c46494d6ff1c08e
 DIST 30375-akode-2.0.2.tar.bz2 472605 RMD160 fa0322367d8e24e541007d3f9e508c3c31370d96 SHA1 10ad1e335bc53c2a90d133b493568324514c729c SHA256 ad689f7b3531cc3c42fda07c264873360bc0f4a94b90c1a4c91c92a22333a7a6
-DIST akode-2.0.1+flac-1.1.3.tar.bz2 3679 RMD160 128b33e8b419863c7616568d047c23eb094583c4 SHA1 a76cf8e97b8ea1f36b9f05abd73707d6b7c470b3 SHA256 6381c77623439b647ad2b024118cade0b7230e1f8d6711159ca60ed7bc5372c5
-EBUILD akode-2.0.1-r1.ebuild 1745 RMD160 b83de8c1a5fb0f0f890cbfd0d46ef89c42ef26f2 SHA1 b80c2b2d1cb4f1459aa52204b8804d1ae766dd90 SHA256 93af75f17a2f0c0a49521095e2814aa0c708c461babc823e3229423216522381
-EBUILD akode-2.0.2.ebuild 1689 RMD160 6c4b1026097779849c0c7499e9282c7073a942e6 SHA1 99f3eca035bc8021073b6aca2703fc834860146b SHA256 fbdba6608533ccdd75cb7857e2cd40c9d1a44a23bbb08e94cc65879a417f1c77
+EBUILD akode-2.0.2.ebuild 1609 RMD160 217212b4691ce45201ce81096c154df36ec49607 SHA1 183441f4adf009107e015bb632d86a1234fa5a3b SHA256 cc4c5c4b29d95cf617aeeb5b128d2ff8e9d0b0a8275769810d21a6929b54ee76
 MISC ChangeLog 5407 RMD160 a99068e8a6fa0120bc5441cef8b9d77cb21b9e8e SHA1 fa9439ea74651263219d80d616474ee3a27e6326 SHA256 472a30949c38f18c0991506a7e49edeeedace50f1bec58e6d33a5bf697e2a7a1
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
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)