Added prelinking support. Thanks to Jakob on bug #37383 for noticing this problem. Also updated copyright years.

7 files changed, 80 insertions, 11 deletions

diff --git a/media-libs/libvorbis/ChangeLog b/media-libs/libvorbis/ChangeLog
index 84e4b4348fca..202e005ece22 100644
--- a/media-libs/libvorbis/ChangeLog
+++ b/media-libs/libvorbis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libvorbis
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.26 2004/01/21 13:55:00 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.27 2004/01/24 06:48:58 raker Exp $
+
+*libvorbis-1.0.1-r1 (24 Jan 2004)
+
+  24 Jan 2004; Nick Hadaway <raker@gentoo.org> libvorbis-1.0.1.ebuild:
+  Added -fPIC to compile and linking flags for proper prelinking support.
+  Thanks to Jakob on bug #37383 for noticing this.
 
   21 Jan 2004; <gustavoz@gentoo.org> libvorbis-1.0.1.ebuild:
   stable on sparc
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index caac54e3fbb2..64cdb2431891 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,12 +1,14 @@
-MD5 6d22b16809393142dba7b108e6c9b19e libvorbis-1.0-r3.ebuild 1776
+MD5 95da7f841c58998f6467f16fdbe85294 libvorbis-1.0-r3.ebuild 1773
+MD5 08e8d7c1eb8b4e0100c0f2fa222ae28e libvorbis-1.0.1-r1.ebuild 1700
 MD5 87dfab7f2454e37ecd73f97f2785d5e1 libvorbis-1.0.1.ebuild 1627
-MD5 355c2703c2ff4a442975de8554e1856b libvorbis-1.0-r2.ebuild 1715
-MD5 9158fe26cf387ab2ea29cda273ddd3bb libvorbis-1.0-r4.ebuild 2167
-MD5 92e9c14a74acaa70a754f9582ef4c0dc ChangeLog 3977
+MD5 e2dc0841cad6c255f83efd40c5c4c7b4 libvorbis-1.0-r2.ebuild 1712
+MD5 df023f62b51942a22b4528a8ef4c466b libvorbis-1.0-r4.ebuild 2166
+MD5 bc18b50c29192e8cc17892e596ea2c95 ChangeLog 4206
 MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
 MD5 fa4a831d30804a9840476e2e65c42241 files/digest-libvorbis-1.0.1 68
 MD5 0a0d3872bdf2c6da4e3fe5471fd3eb16 files/digest-libvorbis-1.0-r2 65
 MD5 0a0d3872bdf2c6da4e3fe5471fd3eb16 files/digest-libvorbis-1.0-r3 65
 MD5 0a0d3872bdf2c6da4e3fe5471fd3eb16 files/digest-libvorbis-1.0-r4 65
 MD5 069e26021a32d3d105c544229e071e5f files/libvorbis-m4.patch 919
+MD5 fa4a831d30804a9840476e2e65c42241 files/digest-libvorbis-1.0.1-r1 68
 MD5 174ab9630810bce8aac9eac4f4f20247 files/libvorbis-simd.patch 28887
diff --git a/media-libs/libvorbis/files/digest-libvorbis-1.0.1-r1 b/media-libs/libvorbis/files/digest-libvorbis-1.0.1-r1
new file mode 100644
index 000000000000..e4c8aa7dd85d
--- /dev/null
+++ b/media-libs/libvorbis/files/digest-libvorbis-1.0.1-r1
@@ -0,0 +1 @@
+MD5 4d6726fd02ce02f6e24824e594b0949a libvorbis-1.0.1.tar.gz 1218076
diff --git a/media-libs/libvorbis/libvorbis-1.0-r2.ebuild b/media-libs/libvorbis/libvorbis-1.0-r2.ebuild
index 039f3cf80abf..1d75ddfbaf6c 100644
--- a/media-libs/libvorbis/libvorbis-1.0-r2.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.0-r2.ebuild,v 1.6 2003/11/15 02:38:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.0-r2.ebuild,v 1.7 2004/01/24 06:48:58 raker Exp $
 
 inherit libtool eutils
 
diff --git a/media-libs/libvorbis/libvorbis-1.0-r3.ebuild b/media-libs/libvorbis/libvorbis-1.0-r3.ebuild
index a157763149f3..aab1b7c2806a 100644
--- a/media-libs/libvorbis/libvorbis-1.0-r3.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.0-r3.ebuild,v 1.2 2003/09/06 23:59:48 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.0-r3.ebuild,v 1.3 2004/01/24 06:48:58 raker Exp $
 
 inherit libtool eutils
 
diff --git a/media-libs/libvorbis/libvorbis-1.0-r4.ebuild b/media-libs/libvorbis/libvorbis-1.0-r4.ebuild
index a1501ed3b48e..00ceccbc8602 100644
--- a/media-libs/libvorbis/libvorbis-1.0-r4.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.0-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.0-r4.ebuild,v 1.10 2003/12/13 00:12:24 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.0-r4.ebuild,v 1.11 2004/01/24 06:48:58 raker Exp $
 
 inherit libtool eutils flag-o-matic
 
diff --git a/media-libs/libvorbis/libvorbis-1.0.1-r1.ebuild b/media-libs/libvorbis/libvorbis-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..aa29cb102f17
--- /dev/null
+++ b/media-libs/libvorbis/libvorbis-1.0.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.0.1-r1.ebuild,v 1.1 2004/01/24 06:48:58 raker Exp $
+
+inherit libtool flag-o-matic gcc
+
+DESCRIPTION="the Ogg Vorbis sound file format library"
+HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
+SRC_URI="http://www.vorbis.com/files/${PV}/unix/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="x86 ~amd64 ~mips sparc hppa"
+
+DEPEND=">=media-libs/libogg-1.0"
+
+src_unpack() {
+	unpack ${A}
+	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
+}
+
+src_compile() {
+	elibtoolize
+
+	# Cannot compile with sse2 support it would seem #36104
+	use x86 && [ $(gcc-major-version) -eq 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 on hppa causes issues when assembling
+	use hppa && replace-flags -march=2.0 -march=1.0
+
+	# Make prelink work properly
+	append-flags -fPIC
+	append-ldflags -fPIC
+
+	econf || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dosym /usr/lib/libvorbisfile.so.3.0.0 /usr/lib/libvorbisfile.so.0
+	dosym /usr/lib/libvorbisenc.so.2.0.0 /usr/lib/libvorbisenc.so.0
+
+	rm -rf ${D}/usr/share/doc
+	dodoc AUTHORS COPYING README todo.txt
+	docinto txt
+	dodoc doc/*.txt
+	dohtml -r doc
+}