Version bump.

(Portage version: 2.1.3.7)

5 files changed, 65 insertions, 80 deletions

diff --git a/media-libs/libvorbis/ChangeLog b/media-libs/libvorbis/ChangeLog
index b00794afe4ed..dd5ae5fa978a 100644
--- a/media-libs/libvorbis/ChangeLog
+++ b/media-libs/libvorbis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libvorbis
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.80 2007/08/29 10:12:42 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.81 2007/09/04 17:46:17 drac Exp $
+
+*libvorbis-1.2.0 (04 Sep 2007)
+
+  04 Sep 2007; Samuli Suominen <drac@gentoo.org> +libvorbis-1.2.0.ebuild:
+  Version bump wrt #189612, thanks to Zeev Tarantov for reporting.
 
   29 Aug 2007; Markus Rothe <corsair@gentoo.org> libvorbis-1.1.2-r1.ebuild:
   Stable on ppc64; bug #186716
diff --git a/media-libs/libvorbis/files/digest-libvorbis-1.1.2 b/media-libs/libvorbis/files/digest-libvorbis-1.1.2
deleted file mode 100644
index e9656b24f33a..000000000000
--- a/media-libs/libvorbis/files/digest-libvorbis-1.1.2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 515d046afd4e2a8244ec1442c715b80a aotuvb4.51-libvorbis-1.1.2.diff.bz2 23371
-RMD160 df4f90ddd7e38069aff77674734d8d39c780c74a aotuvb4.51-libvorbis-1.1.2.diff.bz2 23371
-SHA256 feaae2ed481635bf36e5eb18e966559f743e95e410c21560f961d42455b91560 aotuvb4.51-libvorbis-1.1.2.diff.bz2 23371
-MD5 37847626b8e1b53ae79a34714c7b3211 libvorbis-1.1.2.tar.gz 1316434
-RMD160 2f1c59ab8237fe3af28f9979cd96008cfa3567cb libvorbis-1.1.2.tar.gz 1316434
-SHA256 3f7135ccbda589c251017912f5f5ec9da626c976d2376bcfda19ad6b9c4a6050 libvorbis-1.1.2.tar.gz 1316434
diff --git a/media-libs/libvorbis/files/digest-libvorbis-1.2.0 b/media-libs/libvorbis/files/digest-libvorbis-1.2.0
new file mode 100644
index 000000000000..fd15d78b59b0
--- /dev/null
+++ b/media-libs/libvorbis/files/digest-libvorbis-1.2.0
@@ -0,0 +1,3 @@
+MD5 7c6e409d7aa1fa8a5481dea571d5bde0 libvorbis-1.2.0.tar.bz2 1214374
+RMD160 4b2ceccb6bed6f367a49f3057ed4e4c0e3f0f302 libvorbis-1.2.0.tar.bz2 1214374
+SHA256 9ef4c57ab72081d31aa2cd256276c1c1b0081927cbf0e87b7f1066e1d112065b libvorbis-1.2.0.tar.bz2 1214374
diff --git a/media-libs/libvorbis/libvorbis-1.1.2.ebuild b/media-libs/libvorbis/libvorbis-1.1.2.ebuild
deleted file mode 100644
index afc7e36dedd6..000000000000
--- a/media-libs/libvorbis/libvorbis-1.1.2.ebuild
+++ /dev/null
@@ -1,73 +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/libvorbis/libvorbis-1.1.2.ebuild,v 1.14 2007/02/05 12:18:48 blubb Exp $
-
-inherit libtool flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="the Ogg Vorbis sound file format library"
-HOMEPAGE="http://xiph.org/vorbis/"
-SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz
-	aotuv? ( mirror://gentoo/aotuvb4.51-${P}.diff.bz2 )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="aotuv"
-
-RDEPEND=">=media-libs/libogg-1.0"
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-S=${WORKDIR}/${P/_*/}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-
-	# Fix a gcc crash.  With the new atexit patch to gcc, it
-	# seems it does not handle -mno-ieee-fp very well.
-	sed -i -e "s:-mno-ieee-fp::g" configure
-
-	use aotuv && epatch "${DISTDIR}"/aotuvb4.51-${P}.diff.bz2
-
-	elibtoolize
-
-	epunt_cxx #74493
-}
-
-src_compile() {
-	# Cannot compile with sse2 support it would seem #36104
-	use x86 && [[ $(gcc-major-version) == 3 ]] && append-flags -mno-sse2
-
-	# take out -fomit-frame-pointer from CFLAGS if k6-2
-	is-flag -march=k6-3 && filter-flags -fomit-frame-pointer
-	is-flag -march=k6-2 && filter-flags -fomit-frame-pointer
-	is-flag -march=k6 && filter-flags -fomit-frame-pointer
-
-	# over optimization causes horrible audio artifacts #26463
-	filter-flags -march=pentium?
-
-	# 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
-
-	# gcc on hppa causes issues when assembling
-	use hppa && replace-flags -march=2.0 -march=1.0
-
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	rm -rf ${D}/usr/share/doc
-	dodoc AUTHORS README todo.txt
-	docinto txt
-	dodoc doc/*.txt
-	dohtml -r doc
-}
diff --git a/media-libs/libvorbis/libvorbis-1.2.0.ebuild b/media-libs/libvorbis/libvorbis-1.2.0.ebuild
new file mode 100644
index 000000000000..d8a58bc7b34b
--- /dev/null
+++ b/media-libs/libvorbis/libvorbis-1.2.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.2.0.ebuild,v 1.1 2007/09/04 17:46:17 drac Exp $
+
+inherit libtool flag-o-matic eutils toolchain-funcs
+
+DESCRIPTION="the Ogg Vorbis sound file format library"
+HOMEPAGE="http://xiph.org/vorbis"
+SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND=">=media-libs/libogg-1"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	elibtoolize
+
+	epunt_cxx #74493
+}
+
+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
+
+	# gcc on hppa causes issues when assembling
+	use hppa && replace-flags -march=2.0 -march=1.0
+
+	econf
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	rm -rf "${D}"/usr/share/doc/${P}
+
+	dodoc AUTHORS CHANGES README todo.txt
+
+	if use doc; then
+		docinto txt
+		dodoc doc/*.txt
+		dohtml -r doc
+	fi
+}