Updating aoTuV patch to b5.6-20081209. Fixes bug 250890.

(Portage version: 2.2_rc17/cvs/Linux 2.6.27-hh6 i686)

2 files changed, 70 insertions, 1 deletions

diff --git a/media-libs/libvorbis/ChangeLog b/media-libs/libvorbis/ChangeLog
index 5021f4a84f18..ce5f2937d692 100644
--- a/media-libs/libvorbis/ChangeLog
+++ b/media-libs/libvorbis/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libvorbis
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.107 2008/11/17 20:40:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.108 2008/12/15 03:47:23 yngwin Exp $
+
+*libvorbis-1.2.1_rc1-r2 (15 Dec 2008)
+
+  15 Dec 2008; Ben de Groot <yngwin@gentoo.org>
+  +libvorbis-1.2.1_rc1-r2.ebuild:
+  Updating aoTuV patch to b5.6-20081209 (which actually includes
+  libvorbis-1.2.1-rc2). Fixes bug 250890.
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/libvorbis-1.2.0-CVE-2008-1419.patch,
diff --git a/media-libs/libvorbis/libvorbis-1.2.1_rc1-r2.ebuild b/media-libs/libvorbis/libvorbis-1.2.1_rc1-r2.ebuild
new file mode 100644
index 000000000000..6b674eec4b35
--- /dev/null
+++ b/media-libs/libvorbis/libvorbis-1.2.1_rc1-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.2.1_rc1-r2.ebuild,v 1.1 2008/12/15 03:47:23 yngwin Exp $
+
+EAPI="1"
+inherit autotools flag-o-matic eutils toolchain-funcs
+
+MY_P=${P/_/}
+DESCRIPTION="The Ogg Vorbis sound file format library with aoTuV patch"
+HOMEPAGE="http://xiph.org/vorbis"
+SRC_URI="http://people.xiph.org/~giles/2008/${MY_P}.tar.bz2
+	aotuv? ( mirror://gentoo/aotuv-b5.6-1.2.1rc1.diff.bz2 )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+aotuv doc"
+
+RDEPEND=">=media-libs/libogg-1"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+	cd "${S}"
+	use aotuv && epatch "${DISTDIR}"/aotuv-b5.6-1.2.1rc1.diff.bz2
+
+	rm ltmain.sh
+	AT_M4DIR=m4 eautoreconf
+
+	# Insane.
+	sed -i -e "s:-O20::g" -e "s:-mfused-madd::g" configure
+	sed -i -e "s:-mcpu=750::g" configure
+}
+
+src_compile() {
+	# gcc-3.4 and k6 with -ftracer causes code generation problems #49472
+	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "34" ]]; then
+		is-flag -march=k6* && filter-flags -ftracer
+		is-flag -mtune=k6* && filter-flags -ftracer
+		replace-flags -Os -O2
+	fi
+
+	econf
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	rm -rf "${D}"/usr/share/doc/*
+	dodoc AUTHORS CHANGES README todo.txt
+	use aotuv && dodoc aoTuV_README-1st.txt aoTuV_technical.txt
+	if use doc; then
+		docinto txt
+		dodoc doc/*.txt
+		rm doc/*.txt
+		docinto html
+		dohtml -r doc/*
+	fi
+}