Version bump.

Package-Manager: portage-2.1.3.7

6 files changed, 77 insertions, 91 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/Manifest b/media-libs/libvorbis/Manifest
index 662a356daf92..ceb8fae63f67 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -5,6 +5,7 @@ SHA256 4b71e4f85f3e558668ce36eaa3becb055ebd3554721f912fe9c31953538ae0d4 files/li
 DIST aotuvb4.51-libvorbis-1.1.2.diff.bz2 23371 RMD160 df4f90ddd7e38069aff77674734d8d39c780c74a SHA1 5720046bdc603d35218beabb668a44a59cfb0ac5 SHA256 feaae2ed481635bf36e5eb18e966559f743e95e410c21560f961d42455b91560
 DIST libvorbis-1.1.0.tar.gz 1312404 RMD160 8819812ee657af556ff9f8f8e7aad35f069c9126 SHA1 52fd3cb3e3876cb890bd8d8867db52663a847418 SHA256 928c94d373ad9a4a04a38cfe0a849ddcc7a87ad06c8e8012931c37faefa19c00
 DIST libvorbis-1.1.2.tar.gz 1316434 RMD160 2f1c59ab8237fe3af28f9979cd96008cfa3567cb SHA1 26289fc41aa5436b1a277d726bb5cb106d675c35 SHA256 3f7135ccbda589c251017912f5f5ec9da626c976d2376bcfda19ad6b9c4a6050
+DIST libvorbis-1.2.0.tar.bz2 1214374 RMD160 4b2ceccb6bed6f367a49f3057ed4e4c0e3f0f302 SHA1 fd10558c7dc297887caf20f3ac2601e084715a6a SHA256 9ef4c57ab72081d31aa2cd256276c1c1b0081927cbf0e87b7f1066e1d112065b
 DIST libvorbis-aotuv-b3.patch 92730 RMD160 7fa466d7a7c5a07487292a477ced6652c1f640ba SHA1 7c7da3c000c0e874df9b2a72321cd1f4b2de8b38 SHA256 9826f892cac3d7e1f2e44ebca470d1389c2efd06481441660b41b4f31fa859fa
 EBUILD libvorbis-1.1.0.ebuild 2186 RMD160 488a7be0ba624c978927304dcb66720ba6fbe338 SHA1 09b992f6c5d4846b2bb54a16f3a5d1187ec33caf SHA256 854cedabc38bf561499702ea4a6051f45732dc2a4b399bb7309462e312d39810
 MD5 4e6e8db6692d2a44f54be43d947eea6f libvorbis-1.1.0.ebuild 2186
@@ -14,14 +15,14 @@ EBUILD libvorbis-1.1.2-r1.ebuild 2079 RMD160 ef41ca681654567ee3d331f15ec22311917
 MD5 ba9f3dcaff0d8a0de70dea25a2a67643 libvorbis-1.1.2-r1.ebuild 2079
 RMD160 ef41ca681654567ee3d331f15ec22311917db406 libvorbis-1.1.2-r1.ebuild 2079
 SHA256 22f015de89bf7681d8bffbc0d67ebaf38c88d80ba063007d9baaf983961351c9 libvorbis-1.1.2-r1.ebuild 2079
-EBUILD libvorbis-1.1.2.ebuild 1991 RMD160 dee4684700aaaa21ab57a02ef58a135e4ba01b9c SHA1 265efc75ecaef6c66a986c9ccf810cef5ee88ff1 SHA256 55e4af6757f2a18b54b21808f3fc8dd62b4301679e8f81c32f9da26b09915323
-MD5 9e06086bb51bb50464275dca6f48718d libvorbis-1.1.2.ebuild 1991
-RMD160 dee4684700aaaa21ab57a02ef58a135e4ba01b9c libvorbis-1.1.2.ebuild 1991
-SHA256 55e4af6757f2a18b54b21808f3fc8dd62b4301679e8f81c32f9da26b09915323 libvorbis-1.1.2.ebuild 1991
-MISC ChangeLog 11226 RMD160 13e22e18f9e468026a920029d0193b761dc2c9f7 SHA1 7160bfb1d44c1806110f91bbfd492b28379c91fc SHA256 249dd7b09fb7c84a2af98586567b279645d17018498f604ae9fb7f6de5424a6d
-MD5 63138a712816abcedeeb9800d2c86018 ChangeLog 11226
-RMD160 13e22e18f9e468026a920029d0193b761dc2c9f7 ChangeLog 11226
-SHA256 249dd7b09fb7c84a2af98586567b279645d17018498f604ae9fb7f6de5424a6d ChangeLog 11226
+EBUILD libvorbis-1.2.0.ebuild 1336 RMD160 52ccb254add2927e241aa275cde7b9693f1dadf9 SHA1 427af92fe93f9bc76f6cd2a3c4aae26ea845ea1d SHA256 03007aa4f894f1ed863df37fe669060546b35ae4ee602bda81793230b757659e
+MD5 6a206143840f5b132291ecc04269bd68 libvorbis-1.2.0.ebuild 1336
+RMD160 52ccb254add2927e241aa275cde7b9693f1dadf9 libvorbis-1.2.0.ebuild 1336
+SHA256 03007aa4f894f1ed863df37fe669060546b35ae4ee602bda81793230b757659e libvorbis-1.2.0.ebuild 1336
+MISC ChangeLog 11397 RMD160 0ef0cedb8b74784bd6d5ca79d6f956bb71f325bc SHA1 c5a2a8f1cc6bae95fa5a08e51b563a626c78aed9 SHA256 1b598bda21c10a2061ce836b72aeb061a41fb57572dc90e40560efda83db7869
+MD5 d0249ae3b6eb05639b1712df863b56ca ChangeLog 11397
+RMD160 0ef0cedb8b74784bd6d5ca79d6f956bb71f325bc ChangeLog 11397
+SHA256 1b598bda21c10a2061ce836b72aeb061a41fb57572dc90e40560efda83db7869 ChangeLog 11397
 MISC metadata.xml 252 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a SHA1 6e5cc1551616801a2f257d688e6fc286044c3499 SHA256 5ab00710d822d203a1a38e1b6a9754137de4fe2cf5c4e79470419ed3f3927450
 MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a metadata.xml 252
@@ -29,9 +30,9 @@ SHA256 5ab00710d822d203a1a38e1b6a9754137de4fe2cf5c4e79470419ed3f3927450 metadata
 MD5 d4c2f448dc37a3358b78ac2481769cfc files/digest-libvorbis-1.1.0 500
 RMD160 dc677d2f65f193b9b56a4be26d80d464df245744 files/digest-libvorbis-1.1.0 500
 SHA256 62983ed20e494d026d20018af732fbbbff6b7cb006c45335369fa08f65c0591e files/digest-libvorbis-1.1.0 500
-MD5 b2c2de64723ab3bb1585e8f72d9fb73d files/digest-libvorbis-1.1.2 533
-RMD160 80b1a31defb55a6a49b8786e46d71fa8e43892e2 files/digest-libvorbis-1.1.2 533
-SHA256 b48758a485c5ee43eb83d87a26f1455ac914ad11ec510f44222d08f13b4bb18a files/digest-libvorbis-1.1.2 533
 MD5 b2c2de64723ab3bb1585e8f72d9fb73d files/digest-libvorbis-1.1.2-r1 533
 RMD160 80b1a31defb55a6a49b8786e46d71fa8e43892e2 files/digest-libvorbis-1.1.2-r1 533
 SHA256 b48758a485c5ee43eb83d87a26f1455ac914ad11ec510f44222d08f13b4bb18a files/digest-libvorbis-1.1.2-r1 533
+MD5 17ed148244ac249ea4636ffe3f64625a files/digest-libvorbis-1.2.0 253
+RMD160 08372cbd9e376766259fcd01cc22e30a59cd22ce files/digest-libvorbis-1.2.0 253
+SHA256 54731d8ac608d40a31f3f3feca151cb91a444a6215776422a7dd1a7c616f3e29 files/digest-libvorbis-1.2.0 253
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
+}