ver bump for header fix, cleanup a little

7 files changed, 112 insertions, 76 deletions

diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index 7fd77feada31..8ffc6e79cd19 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/faad2
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.41 2004/12/29 00:40:52 ciaranm Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.42 2005/01/18 16:44:48 foser Exp $
+
+*faad2-2.0-r4 (18 Jan 2005)
+
+  18 Jan 2005; foser <foser@gentoo.org> faad2-2.0-r4.ebuild :
+  Fix up another include file (this time for latexers hax)
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 0a5f84bf9579..26cf71d09456 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,16 +1,17 @@
-MD5 38155a399d5b225a18f2ebf1bd979f0e faad2-2.0-r2.ebuild 1721
-MD5 15eb0265873d39bf9d35c2218f5d7982 ChangeLog 5536
-MD5 3dbb02a32d4ad5b0609d0844be8d4a8a faad2-1.1.ebuild 1081
-MD5 2e14ef69b3ad3bb2919b188e523b6b4c faad2-2.0-r3.ebuild 2089
+MD5 ebf5309305f363369a7d42c98cf41d60 faad2-2.0-r4.ebuild 2156
 MD5 3a0b110931877c8232a68c5fb353f762 faad2-2.0_rc3-r1.ebuild 1642
+MD5 3dbb02a32d4ad5b0609d0844be8d4a8a faad2-1.1.ebuild 1081
+MD5 15eb0265873d39bf9d35c2218f5d7982 ChangeLog 5536
+MD5 38155a399d5b225a18f2ebf1bd979f0e faad2-2.0-r2.ebuild 1721
 MD5 8b5320d3c7b57d34bbd12f34eaaabc08 metadata.xml 304
+MD5 6264dccf9a4c49712b65b406825c5113 files/mp4atom-sliver.patch 659
+MD5 10465da781f67413a312a590160497b8 files/digest-faad2-1.1 62
+MD5 c7b0b0563f7c682ecd92ef4c32ceef60 files/faad2-2.0-gcc34.patch 296
 MD5 042669e1c5f4755340520e417eafad15 files/faad2-2.0-configure-mpeg4ip.patch 416
 MD5 1ceab8b26925d147b1e0a359ce23d56e files/faad2-2.0-noext.patch 856
-MD5 c7b0b0563f7c682ecd92ef4c32ceef60 files/faad2-2.0-gcc34.patch 296
-MD5 6264dccf9a4c49712b65b406825c5113 files/mp4atom-sliver.patch 659
-MD5 f597fe37924ee807ccafd546e2662513 files/faad2-2.0-makefile-space.patch 326
-MD5 ae1e030d365422623250d1fa71e2fe72 files/faad2-1.1-gentoo.diff 440
 MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r2 61
-MD5 10465da781f67413a312a590160497b8 files/digest-faad2-1.1 62
-MD5 9d78b52a4f4b2514b35b4f5319f376cb files/digest-faad2-2.0_rc3-r1 65
 MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r3 61
+MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r4 61
+MD5 9d78b52a4f4b2514b35b4f5319f376cb files/digest-faad2-2.0_rc3-r1 65
+MD5 f597fe37924ee807ccafd546e2662513 files/faad2-2.0-makefile-space.patch 326
+MD5 ae1e030d365422623250d1fa71e2fe72 files/faad2-1.1-gentoo.diff 440
diff --git a/media-libs/faad2/faad2-2.0-r4.ebuild b/media-libs/faad2/faad2-2.0-r4.ebuild
new file mode 100644
index 000000000000..faa357b47eb8
--- /dev/null
+++ b/media-libs/faad2/faad2-2.0-r4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r4.ebuild,v 1.1 2005/01/18 16:44:48 foser Exp $
+
+inherit eutils libtool flag-o-matic
+
+DESCRIPTION="AAC audio decoding library"
+HOMEPAGE="http://www.audiocoding.com/"
+SRC_URI="mirror://sourceforge/faac/${PN}-${PV/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc"
+IUSE="xmms"
+
+RDEPEND="xmms? ( >=media-sound/xmms-1.2.7
+		media-libs/id3lib )
+	!media-video/mpeg4ip"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4.0.7
+	sys-devel/automake
+	sys-devel/autoconf"
+
+S=${WORKDIR}/${PN}
+
+DOCS="AUTHORS ChangeLog INSTALL NEWS README README.linux TODO"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-makefile-space.patch
+	epatch ${FILESDIR}/${P}-configure-mpeg4ip.patch
+
+	epatch ${FILESDIR}/${P}-gcc34.patch
+
+	cd ${S}/common/mp4v2
+	epatch ${FILESDIR}/mp4atom-sliver.patch
+
+	cd ${S}/plugins/xmms/src
+	epatch ${FILESDIR}/${P}-noext.patch
+
+	# Get the xmms plugin to behave
+	cd ${S}
+	elibtoolize
+
+}
+
+src_compile() {
+
+	# see #34392
+	filter-flags -mfpmath=sse
+
+	# Fix for bug #67510
+	WANT_AUTOCONF=2.5 WANT_AUTOMAKE=1.7  \
+		aclocal -I . && \
+		autoheader && \
+		libtoolize --automake --copy	&& \
+		automake --add-missing --copy	&& \
+		autoconf || die "Couldn't build configuration file"
+
+	# mp4v2 needed for rhythmbox
+	# drm needed for nothing but doesn't hurt
+
+	econf \
+		--with-mp4v2 \
+		--with-drm \
+		`use_with xmms` \
+		|| die
+
+	# emake causes xmms plugin building to fail
+	emake || die
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+
+	dodoc ${DOCS}
+
+	# unneeded include, <systems.h> breaks building of apps, but
+	# it is necessary because includes <sys/types.h>,
+	# which is needed by /usr/include/mp4.h... so we just
+	# include <sys/types.h> instead.  See bug #55767
+	dosed "s:#include <systems.h>:#include <sys/types.h>:" /usr/include/mpeg4ip.h
+	# make latexer happy
+	dosed "s:\"mp4ff_int_types.h\":<stdint.h>:" /usr/include/mp4ff.h
+
+}
diff --git a/media-libs/faad2/faad2-2.0_rc3-r1.ebuild b/media-libs/faad2/faad2-2.0_rc3-r1.ebuild
deleted file mode 100644
index 86b7f47a02f7..000000000000
--- a/media-libs/faad2/faad2-2.0_rc3-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0_rc3-r1.ebuild,v 1.7 2004/06/24 22:59:39 agriffis Exp $
-
-inherit eutils libtool flag-o-matic
-
-DESCRIPTION="The fastest ISO AAC audio decoder available, correctly decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC files"
-HOMEPAGE="http://faac.sourceforge.net/"
-SRC_URI="mirror://sourceforge/faac/${PN}-${PV/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 alpha ia64 ~hppa"
-IUSE="xmms"
-
-RDEPEND="xmms? ( >=media-sound/xmms-1.2.7
-	media-libs/id3lib )
-	!media-video/mpeg4ip"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.0.7
-	sys-devel/automake
-	sys-devel/autoconf"
-
-S=${WORKDIR}/${PN}
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README README.linux TODO"
-
-src_compile() {
-	# see #34392
-	filter-flags -mfpmath=sse
-
-	WANT_AUTOCONF=2.5 WANT_AUTOMAKE=1.7 sh ./bootstrap
-
-	# mp4v2 needed for rhythmbox
-	# drm needed for nothing but doesn't hurt
-
-	econf \
-		--with-mp4v2 \
-		--with-drm \
-		`use_with xmms` \
-		|| die
-
-	# emake causes xmms plugin building to fail
-	make || die
-}
-
-src_install() {
-	# Copy over the xmms plugins first.  make install will not install these unless this is an upgrade.  See bug #38001
-	if use xmms; then
-		exeinto `xmms-config --input-plugin-dir`
-		doexe ${S}/plugins/xmmsmp4/src/.libs/libmp4.so
-		doexe ${S}/plugins/xmms/src/.libs/libaac.so
-	fi
-
-	make DESTDIR=${D} install || die
-
-	dodoc ${DOCS}
-
-	# unneeded include, breaks building of apps
-	# <foser@gentoo.org>
-	dosed "s:#include <systems.h>::" /usr/include/mpeg4ip.h
-}
diff --git a/media-libs/faad2/files/digest-faad2-2.0-r4 b/media-libs/faad2/files/digest-faad2-2.0-r4
new file mode 100644
index 000000000000..38c97b9bd3b4
--- /dev/null
+++ b/media-libs/faad2/files/digest-faad2-2.0-r4
@@ -0,0 +1 @@
+MD5 1a6f79365f2934a4888b210ef47a3a07 faad2-2.0.tar.gz 766660
diff --git a/media-libs/faad2/files/digest-faad2-2.0_rc3-r1 b/media-libs/faad2/files/digest-faad2-2.0_rc3-r1
deleted file mode 100644
index ed3436fcdb47..000000000000
--- a/media-libs/faad2/files/digest-faad2-2.0_rc3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0080076438655ed7facf1089a9805aff faad2-2.0-rc3.tar.gz 704005
diff --git a/media-libs/faad2/metadata.xml b/media-libs/faad2/metadata.xml
index 642af2f50104..e19dc9fc9fd3 100644
--- a/media-libs/faad2/metadata.xml
+++ b/media-libs/faad2/metadata.xml
@@ -6,4 +6,5 @@
   <email>foser@gentoo.org</email>
   <description>Temporary maintainership until a proper herd is found</description>
 </maintainer>
+<longdescription>The fastest ISO AAC audio decoder available, correctly decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC files</longdescription>
 </pkgmetadata>