Actually remove the manual libraries symlinking; don't append -fPIC as libtool now is safe, reorder flag mangling, fix SRC_URI useflag test, add ~x86-fbsd keyword.

Package-Manager: portage-2.1_pre7-r4

3 files changed, 24 insertions, 32 deletions

diff --git a/media-libs/libvorbis/ChangeLog b/media-libs/libvorbis/ChangeLog
index dd8670130de8..6c7e575ebe99 100644
--- a/media-libs/libvorbis/ChangeLog
+++ b/media-libs/libvorbis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libvorbis
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.62 2006/04/05 18:05:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.63 2006/04/05 18:59:00 flameeyes Exp $
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> libvorbis-1.1.2.ebuild:
+  Actually remove the manual libraries symlinking; don't append -fPIC as
+  libtool now is safe, reorder flag mangling, fix SRC_URI useflag test, add
+  ~x86-fbsd keyword.
 
   05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> libvorbis-1.1.2.ebuild:
   Use directly elibtoolize, it handles MacOSX by itself. Fix libraries links.
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index 6f247cc4a868..d32994433a27 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d5067a121a65a87df6cc3d51f2717629 ChangeLog 8818
-RMD160 cd30ded35a0d03bd19c537001aea7c105840e438 ChangeLog 8818
-SHA256 eb0d9dae28c0631157aa59e80a4d41adca52fc8408d9521d008abb051f5d1940 ChangeLog 8818
+MD5 ff8ab6c68864c53903703cdac5659a4a ChangeLog 9066
+RMD160 2f7576fd6a970aa083b7d71bd7dbbb2f1a8bb4e4 ChangeLog 9066
+SHA256 2d0d9561b4499d469777f7934abd012c9f0f67e223e3954aa7b4c98c6c838cca ChangeLog 9066
 MD5 fa4a831d30804a9840476e2e65c42241 files/digest-libvorbis-1.0.1-r2 68
 RMD160 e79a59771961439a3175a67882a75eb97abbc4a9 files/digest-libvorbis-1.0.1-r2 68
 SHA256 d222f57fdd4e555892bf6f1381de7434f3c562d1625140767e35730d6ee5397c files/digest-libvorbis-1.0.1-r2 68
@@ -25,16 +25,16 @@ SHA256 8ea99b744988698692c6bcc02f4721a78006e63911be7cd80206c7895d6ccf01 libvorbi
 MD5 1d9944b876b9f20c3e5a31c9593d306a libvorbis-1.1.1.ebuild 2510
 RMD160 7318f427bf2c6a8e432130fe228ee661dce9ae4f libvorbis-1.1.1.ebuild 2510
 SHA256 6e0bcf71264ff784c704c745c013686f3bece627691de12738443e99bdca7717 libvorbis-1.1.1.ebuild 2510
-MD5 4cd9f9faa41e3672d5d3fd5420131813 libvorbis-1.1.2.ebuild 2496
-RMD160 fcb67434b69a51e2f29d3a348c23fc999bf2204b libvorbis-1.1.2.ebuild 2496
-SHA256 5ca07c03189212f00e014366117fb1c94d5b41490440fd7456d2da2811dab12f libvorbis-1.1.2.ebuild 2496
+MD5 95769765472a90818b48999137b32954 libvorbis-1.1.2.ebuild 2076
+RMD160 3483d833b095e343d7df9e9ba73dc43046dc0137 libvorbis-1.1.2.ebuild 2076
+SHA256 8b8e960a73b61f2e17bafa6aacda58e33bcf5a11f4954507530c7f5e11b2d4d6 libvorbis-1.1.2.ebuild 2076
 MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a metadata.xml 252
 SHA256 5ab00710d822d203a1a38e1b6a9754137de4fe2cf5c4e79470419ed3f3927450 metadata.xml 252
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFENAZYAiZjviIA2XgRAlIWAJ9kKDMolFGxaQ1CdLR1mGwudIRIqQCdHvN0
-g5Mh7rQa0tljkm/xL+6dL/c=
-=QciB
+iD8DBQFENBL7AiZjviIA2XgRAsk5AJ4r/ylkieII87Ri8uS/WUNQGl21+ACgp//p
+pp1J6QLYG87+4kFFtxABH3E=
+=3iC/
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libvorbis/libvorbis-1.1.2.ebuild b/media-libs/libvorbis/libvorbis-1.1.2.ebuild
index 0c8453bd59ef..8f4a4105657f 100644
--- a/media-libs/libvorbis/libvorbis-1.1.2.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.1.2.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2006 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.3 2006/04/05 18:05:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.1.2.ebuild,v 1.4 2006/04/05 18:59:00 flameeyes 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"
+	aotuv? ( mirror://gentoo/aotuvb4.51-${P}.diff.bz2 )"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="aotuv"
 
 RDEPEND=">=media-libs/libogg-1.0"
 DEPEND="${RDEPEND}
 	sys-apps/sed"
 
-S=${WORKDIR}/${P/_*/}
+S="${WORKDIR}/${P/_*/}"
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -28,9 +28,7 @@ src_unpack() {
 	# seems it does not handle -mno-ieee-fp very well.
 	sed -i -e "s:-mno-ieee-fp::g" configure
 
-	if use aotuv; then
-		epatch ${DISTDIR}/aotuvb4.51-${P}.diff.bz2
-	fi
+	use aotuv && epatch ${DISTDIR}/aotuvb4.51-${P}.diff.bz2
 
 	elibtoolize
 
@@ -39,8 +37,7 @@ src_unpack() {
 
 src_compile() {
 	# Cannot compile with sse2 support it would seem #36104
-	use x86 && [ $(gcc-major-version) -eq 3 ] && append-flags -mno-sse2
-	[ "`gcc-version`" == "3.4" ] && replace-flags -Os -O2
+	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
@@ -51,19 +48,16 @@ src_compile() {
 	filter-flags -march=pentium?
 
 	# gcc-3.4 and k6 with -ftracer causes code generation problems #49472
-	if [ $(gcc-major-version) -eq 3 -a $(gcc-minor-version) -eq 4 ];
-	then
+	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
 
-	# Make prelink work properly
-	append-flags -fPIC
-	append-ldflags -fPIC
-
 	econf || die
 	use ppc-macos && cd ${S} && sed -i -e 's/examples//' Makefile
 	emake || die
@@ -71,13 +65,6 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	if use ppc-macos; then
-		dosym libvorbisfile.3.1.1.dylib /usr/$(get_libdir)/libvorbisfile.3.dylib
-		dosym libvorbisenc.2.0.2.dylib /usr/$(get_libdir)/libvorbisenc.2.dylib
-	else
-		dosym libvorbisfile.so.3.1.1 /usr/$(get_libdir)/libvorbisfile.so.3
-		dosym libvorbisenc.so.2.0.2 /usr/$(get_libdir)/libvorbisenc.so.2
-	fi
 
 	rm -rf ${D}/usr/share/doc
 	dodoc AUTHORS README todo.txt