Fix proper PIC usage for everyone but ppc. See bug #98494.

(Portage version: 2.0.51.22-r2)

5 files changed, 21 insertions, 57 deletions

diff --git a/media-libs/libdts/ChangeLog b/media-libs/libdts/ChangeLog
index b65744ccde73..89c734a36814 100644
--- a/media-libs/libdts/ChangeLog
+++ b/media-libs/libdts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libdts
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdts/ChangeLog,v 1.16 2005/08/18 13:56:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdts/ChangeLog,v 1.17 2005/08/26 19:14:51 eradicator Exp $
+
+*libdts-0.0.2-r3 (26 Aug 2005)
+
+  26 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -libdts-0.0.2-r1.ebuild, -libdts-0.0.2-r2.ebuild, +libdts-0.0.2-r3.ebuild:
+  Fix proper PIC usage for everyone but ppc.  See bug #98494.
 
   18 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
   +files/libdts-0.0.2-freebsd.patch, libdts-0.0.2-r2.ebuild:
diff --git a/media-libs/libdts/files/digest-libdts-0.0.2-r2 b/media-libs/libdts/files/digest-libdts-0.0.2-r2
deleted file mode 100644
index 969bee6c5327..000000000000
--- a/media-libs/libdts/files/digest-libdts-0.0.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a1c0dac95d7031498c2d19d7a3107469 libdts-0.0.2.tar.gz 295185
diff --git a/media-libs/libdts/files/digest-libdts-0.0.2-r1 b/media-libs/libdts/files/digest-libdts-0.0.2-r3
index 969bee6c5327..969bee6c5327 100644
--- a/media-libs/libdts/files/digest-libdts-0.0.2-r1
+++ b/media-libs/libdts/files/digest-libdts-0.0.2-r3
diff --git a/media-libs/libdts/libdts-0.0.2-r2.ebuild b/media-libs/libdts/libdts-0.0.2-r2.ebuild
deleted file mode 100644
index 5bea512269bd..000000000000
--- a/media-libs/libdts/libdts-0.0.2-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdts/libdts-0.0.2-r2.ebuild,v 1.2 2005/08/18 13:56:32 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="library for decoding DTS Coherent Acoustics streams used in DVD"
-HOMEPAGE="http://www.videolan.org/dtsdec.html"
-SRC_URI="http://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="oss debug"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	=sys-devel/automake-1.7*
-	>=sys-devel/autoconf-2.52d-r1"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-libtool2.patch
-	epatch ${FILESDIR}/${P}-freebsd.patch
-
-	cd ${S}
-
-	export WANT_AUTOMAKE=1.7
-	export WANT_AUTOCONF=2.5
-
-	libtoolize --force --copy || die "libtoolize --force --copy failed"
-	aclocal || die "aclocal failed"
-	autoheader || die "autoheader failed"
-	automake --gnu --add-missing --include-deps --force-missing --copy || die "automake failed"
-	autoconf || die "autoconf failed"
-}
-
-src_compile() {
-	econf $(use_enable oss) $(use_enable debug) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/libdts.txt
-}
-
-src_test() { :; }
diff --git a/media-libs/libdts/libdts-0.0.2-r1.ebuild b/media-libs/libdts/libdts-0.0.2-r3.ebuild
index 118025befa72..2951bee55152 100644
--- a/media-libs/libdts/libdts-0.0.2-r1.ebuild
+++ b/media-libs/libdts/libdts-0.0.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdts/libdts-0.0.2-r1.ebuild,v 1.6 2005/07/09 01:30:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdts/libdts-0.0.2-r3.ebuild,v 1.1 2005/08/26 19:14:51 eradicator Exp $
 
 inherit eutils
 
@@ -10,8 +10,9 @@ SRC_URI="http://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="oss debug"
+RESTRICT="test"
 
 RDEPEND="virtual/libc"
 DEPEND="${RDEPEND}
@@ -21,7 +22,16 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-libtool.patch
+	if use ppc ; then
+		# For some reason, ppc isn't properly using -fPIC... this
+		# patch is broken, but makes it "work" on ppc.  If someone
+		# will get me access, I'll fix it... --eradicator
+		# Bug #98494
+		epatch ${FILESDIR}/${P}-libtool2.patch
+	else
+		epatch ${FILESDIR}/${P}-libtool.patch
+	fi
+	epatch ${FILESDIR}/${P}-freebsd.patch
 
 	cd ${S}
 
@@ -42,7 +52,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO doc/libdts.txt
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/libdts.txt
 }
-
-src_test() { :; }