Make PIC hackery a bit more friendly to hardened folks. Removed old versions.

(Portage version: 2.0.51.19)

6 files changed, 23 insertions, 242 deletions

diff --git a/media-libs/libmpeg3/ChangeLog b/media-libs/libmpeg3/ChangeLog
index 339ade25597c..807c215d3f0a 100644
--- a/media-libs/libmpeg3/ChangeLog
+++ b/media-libs/libmpeg3/ChangeLog
@@ -1,123 +1,8 @@
 # ChangeLog for media-libs/libmpeg3
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.31 2005/03/26 20:42:04 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.32 2005/03/29 21:52:22 eradicator Exp $
 
-  26 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  libmpeg3-1.5.2-r1.ebuild:
-  Make shared object on x86 without -fPIC because the asm isn't PIC safe.
+  29 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -libmpeg3-1.5-r1.ebuild, -libmpeg3-1.5.1.ebuild, libmpeg3-1.5.2-r1.ebuild:
+  Make PIC hackery a bit more friendly to hardened folks.  Removed old versions.
 
-*libmpeg3-1.5.2-r1 (26 Mar 2005)
-
-  26 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +libmpeg3-1.5.2-r1.ebuild:
-  Use correct toolchain compiler.  Use -fPIC correctly.
-
-  08 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  +files/1.5.2-gentoo-multilib.patch, libmpeg3-1.5.2.ebuild:
-  multilib fixes
-
-  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  libmpeg3-1.5.2.ebuild:
-  get_libdir fixes.
-
-  30 Sep 2004; Patrick Kursawe <phosphan@gentoo.org> libmpeg3-1.5.2.ebuild:
-  Will get linking correctly now even if liba52 was compiled with djbfft.
-  Adding metadata.xml.
-
-  30 Sep 2004; Patrick Kursawe <phosphan@gentoo.org> libmpeg3-1.5.2.ebuild:
-  Prefixed linker path with ${ROOT} (see bug #54377)
-
-  28 Jul 2004; Tom Gall <tgall@gentoo.org> libmpeg3-1.5.2.ebuild:
-  stable on ppc64, bug #55076
-
-  16 May 2004; Mike Frysinger <vapier@gentoo.org> +files/1.5.2-gcc3.4.patch,
-  libmpeg3-1.5.2.ebuild:
-  Add gcc-3.4 patch by ecco@piggy.demon.nl #49452 by Jonathan Adamczewski
-
-  12 May 2004; Alexander Gabert <pappy@gentoo.org> libmpeg3-1.5-r1.ebuild,
-  libmpeg3-1.5.1.ebuild, libmpeg3-1.5.2.ebuild:
-  removed hardened-gcc logic, is already replaced by filter-flags
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> libmpeg3-1.5.1.ebuild:
-  Add inherit eutils
-
-  27 Feb 2004; Seemant Kulleen <seemant@gentoo.org> libmpeg3-1.5-r1.ebuild,
-  libmpeg3-1.5.1.ebuild:
-  move the filter-flags statement into src_compile
-
-  28 Jan 2004; Aron Griffis <agriffis@gentoo.org> libmpeg3-1.5.2.ebuild:
-  stable on ia64
-
-  04 Nov 2003; Jason Wever <weeve@gentoo.org> libmpeg3-1.5.2.ebuild:
-  New version requires nasm which only works on x86, so marking -sparc.
-
-*libmpeg3-1.5.2 (03 Nov 2003)
-
-  03 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
-  Version bump + linking with a52 fix #32533.
-
-*libmpeg3-1.5.1 (06 Sep 2003)
-
-  06 Sep 2003; Alexander Gabert <pappy@gentoo.org> libmpeg3-1.5-r1.ebuild:
-  added hardened-gcc ignore flags for stable ebuild also
-
-  06 Sep 2003; Alexander Gabert <pappy@gentoo.org> libmpeg3-1.5.1.ebuild:
-  added hardened-gcc ignore flags
-
-  28 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
-  Added patch to fix gcc-2.x issues #25349 and another 
-  to fix largefile support #25349.
-
-  26 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
-  Version bump + update patches + make sure quicktime4linux compiles.
-
-*libmpeg3-1.5-r1 (15 Apr 2002)
-
-  18 Jul 2003; Guy Martin <gmsoft@gentoo.org> libmpeg3-1.5-r1.ebuild :
-  Added -fPIC to CFLAGS and hppa to KEYWORDS.
-
-  31 Mar 2003; Aron Griffis <agriffis@gentoo.org> libmpeg3-1.5-r1.ebuild:
-  Add -fPIC on alpha for bug 10943
-
-  09 Mar 2003; Seemant Kulleen <seemant@gentoo.org> libmpeg3-1.5-r1.ebuild:
-  filter out -fno-common from CFLAGS, thanks to teri-aka TrAns13nT
-  <trans13nt@jyll.net> in bug #16860
-
-  09 Jan 2003; Seemant Kulleen <seemant@gentoo.org> libmpeg3-1.5-r1.ebuild :
-
-  filter out the -fPIC flag, if the user has it.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-  11 Sep 2002; Mark Guertin <gerk@gentoo.org> flac-1.0.3.ebuild :
-  set nasm as x86 only dependancy
-
-  15 Apr 2002; Seemant Kulleen <seemant@gentoo.org> libmpeg3-1.5-r1.ebuild
-  files/digest-libmpeg3-1.5-r1 files/libmpeg3-gentoo-patch-part1
-  files/libmpeg3-gentoo-patch-part2 :
-
-  It seems that the libmpeg3 folks did not design libmpeg3 well for installing
-  the header files.  This is unfortunate because a few applications like
-  transcode and mplayer need those headers in order to build libmpeg3 support.
-  Their src.rpm's however, take care of this problem through patching.  So,
-  to this end, I have patched the Makefile in patch-part1 to actually
-  install the header files.  And I have patched the header files themselves
-  in patch-part2 so that they include one another properly with 
-  #include <blah> instead of #include "../blah"  This works well, so far.
-
-*libmpeg3-1.5 (14 Apr 2002)
-
-  14 Apr 2002; Seemant Kulleen <seemant@gentoo.org> libmpeg3-1.5.ebuild
-  files/digest-libmpeg3-1.5 :
-
-  Version bump.
-
-*libmpeg3-1.3 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/media-libs/libmpeg3/files/digest-libmpeg3-1.5-r1 b/media-libs/libmpeg3/files/digest-libmpeg3-1.5-r1
deleted file mode 100644
index 5ee560c931c5..000000000000
--- a/media-libs/libmpeg3/files/digest-libmpeg3-1.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1800adbd17cb6cdca2e11858cb25649a libmpeg3-1.5.tar.gz 203235
diff --git a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.1 b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.1
deleted file mode 100644
index a6513bfd9e4f..000000000000
--- a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8aec1ab57e0cd7f968b9398e206cb4d4 libmpeg3-1.5.1-src.tar.bz2 626532
diff --git a/media-libs/libmpeg3/libmpeg3-1.5-r1.ebuild b/media-libs/libmpeg3/libmpeg3-1.5-r1.ebuild
deleted file mode 100644
index 85764d90eddc..000000000000
--- a/media-libs/libmpeg3/libmpeg3-1.5-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5-r1.ebuild,v 1.24 2004/07/14 20:11:43 agriffis Exp $
-
-inherit flag-o-matic
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="An mpeg library for linux"
-HOMEPAGE="http://heroinewarrior.com/libmpeg3.php3"
-SRC_URI="http://heroinewarrior.com/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa amd64"
-IUSE=""
-
-RDEPEND="sys-libs/zlib
-	media-libs/jpeg"
-
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# The Makefile is patched to install the header files as well.
-	# This patch was generated using the info in the src.rpm that
-	# SourceForge provides for this package.
-	patch -p1 < ${FILESDIR}/libmpeg3-gentoo-patch-part1
-}
-
-src_compile() {
-	filter-flags -fPIC
-	filter-flags -fno-common
-	[ $ARCH = alpha ] && append-flags -fPIC
-	[ $ARCH = hppa ] && append-flags -fPIC
-	[ $ARCH = amd64 ] && append-flags -fPIC
-
-	make || die
-}
-
-src_install() {
-	# This patch patches the .h files that get installed into /usr/include
-	# to show the correct include syntax '<>' instead of '""'  This patch
-	# was also generated using info from SF's src.rpm
-
-	patch -p1 < ${FILESDIR}/libmpeg3-gentoo-patch-part2
-
-	dodir /usr/bin
-
-	make \
-		DESTDIR=${D}/usr \
-		install || die
-
-	dolib.a ${CHOST%%-*}/libmpeg3.a
-
-	dohtml -r docs
-}
diff --git a/media-libs/libmpeg3/libmpeg3-1.5.1.ebuild b/media-libs/libmpeg3/libmpeg3-1.5.1.ebuild
deleted file mode 100644
index 4152f9dc7b80..000000000000
--- a/media-libs/libmpeg3/libmpeg3-1.5.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.1.ebuild,v 1.9 2004/07/14 20:11:43 agriffis Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="An mpeg library for linux"
-HOMEPAGE="http://heroinewarrior.com/libmpeg3.php3"
-SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
-IUSE=""
-
-RDEPEND="sys-libs/zlib
-		media-libs/jpeg"
-DEPEND="${RDEPEND}
-		x86? ( dev-lang/nasm ) "
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# The Makefile is patched to install the header files as well.
-	# This patch was generated using the info in the src.rpm that
-	# SourceForge provides for this package.
-	epatch ${FILESDIR}/${PV}-gentoo-p1.patch
-	# Add in support for mpeg3split
-	epatch ${FILESDIR}/${PV}-gentoo-mpeg3split.patch
-	epatch ${FILESDIR}/${PV}-pthread.patch
-	epatch ${FILESDIR}/${PV}-largefile.patch
-	epatch ${FILESDIR}/${PV}-proper-c.patch
-}
-
-src_compile() {
-	filter-flags -fPIC
-	filter-flags -fno-common
-	[ ${ARCH} = alpha ] && append-flags -fPIC
-	[ ${ARCH} = hppa ] && append-flags -fPIC
-
-	make || die
-}
-
-src_install() {
-	# This patch patches the .h files that get installed into /usr/include
-	# to show the correct include syntax '<>' instead of '""'  This patch
-	# was also generated using info from SF's src.rpm
-	epatch ${FILESDIR}/${PV}-gentoo-p2.patch
-	make DESTDIR=${D}/usr install || die
-	dohtml -r docs
-}
diff --git a/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild b/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild
index c536e7faef59..9b5546a3aef4 100644
--- a/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.5.2-r1.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/libmpeg3/libmpeg3-1.5.2-r1.ebuild,v 1.2 2005/03/26 20:42:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild,v 1.3 2005/03/29 21:52:22 eradicator Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -11,13 +11,13 @@ SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
+IUSE="mmx"
 
 RDEPEND="sys-libs/zlib
 	media-libs/jpeg
 	media-libs/a52dec"
 DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )"
+	mmx? ( dev-lang/nasm )"
 
 src_unpack() {
 	unpack ${A}
@@ -46,6 +46,13 @@ src_unpack() {
 		fi
 	fi
 	sed -i "/LIBS = /s:$: -L\${ROOT}usr/$(get_libdir) ${libs}:" Makefile
+
+	if ! use mmx || has_pic ; then
+		sed -i -e 's:^NASM =.*:NASM =:' \
+		       -e 's|^HAVE_NASM :=.*|HAVE_NASM=n|' \
+		       -e 's|USE_MMX = 1|USE_MMX = 0|' \
+		       Makefile
+	fi
 }
 
 src_compile() {
@@ -53,20 +60,21 @@ src_compile() {
 
 	rm -f ${obj_dir}/*.o &> /dev/null
 
+	make CC="$(tc-getCC)" ${obj_dir}/libmpeg3.a || die "Failed libmpeg3.a"
+	rm -f ${obj_dir}/*.o
+
 	# x86 asm is not pic safe
-	if use x86; then
-		filter-flags -fPIC
-	else
+	if ! use mmx; then
 		append-flags -fPIC
 	fi
 
 	make CC="$(tc-getCC)" ${obj_dir}/libmpeg3.so || die "Failed libmpeg3.so"
-	rm ${obj_dir}/*.o
 
-	filter-flags -fPIC
-	make CC="$(tc-getCC)" ${obj_dir}/libmpeg3.a || die "Failed libmpeg3.a"
-	touch ${obj_dir}/libmpeg3.so
+	# This would add -fno-pie to CFLAGS, so don't change to it! --eradicator
+	# filter-flags -fPIC
+	CFLAGS=${CFLAGS//-fPIC/}
 
+	touch ${obj_dir}/libmpeg3.a
 	make CC="$(tc-getCC)" || die "Failed to build utilities"
 }