Forward-port the hardened-gcc fixes.

5 files changed, 17 insertions, 73 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 3e8813b7353a..60ed6c36a8f3 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.37 2003/09/20 20:05:58 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.38 2003/09/23 22:25:18 max Exp $
+
+  23 Sep 2003; Max Kalika <max@gentoo.org> mjpegtools-1.6.1.90-r1.ebuild:
+  Forward-port the hardened-gcc fixes.
 
   20 Sep 2003; Alexander Gabert <pappy@gentoo.org> mjpegtools-1.6.1.90.ebuild:
   added hardened-gcc exclusion gcc flags for failing assembler
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index e0346b731e5e..35b93086f42b 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,12 +1,10 @@
-MD5 4971c97bb453b4a8f94887446572c7c3 mjpegtools-1.6.1.90-r1.ebuild 1562
+MD5 6bc31bfe478508633bd0cb606ea44ad8 mjpegtools-1.6.1.90-r1.ebuild 1849
 MD5 ac487ddde6a6af1ed6db4527dcde1e6f mjpegtools-1.6.0-r7.ebuild 2918
-MD5 50d0e8c2f1e5893a150e65799a494d13 mjpegtools-1.6.1.90.ebuild 1948
-MD5 2ebf0dc239120a0b3a9ffb0d4998f139 ChangeLog 7000
+MD5 827287e0def93e7f50367323a148aec2 ChangeLog 7112
 MD5 c9bb82e3c4de92ad8ed6ce7470250e6b metadata.xml 180
 MD5 9fa67243454e797c061ddd4facf262cc mjpegtools-1.6.1.ebuild 2413
 MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90-r1 72
 MD5 4a594198579130cfe453fffb532b2aef files/digest-mjpegtools-1.6.1 147
 MD5 961944a5d3c12bdac7baf7d12ea995d7 files/digest-mjpegtools-1.6.0-r7 147
-MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90 72
 MD5 81c49bb48a8d8e3ea4eb360811c01f67 files/no-x11-lib.patch 497
 MD5 94b45a7608327840f696deb03ebc5ffc files/1.6.0-r7-ppc.patch 443
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.90 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.90
deleted file mode 100644
index 5f401da864e9..000000000000
--- a/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.90
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a903c49ee5902710b8e44bd6c0f4b38e mjpegtools-1.6.1.90.tar.gz 1168921
diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild
index 0b52899da6e8..c5ecfd4f62d1 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild,v 1.1 2003/09/19 23:23:18 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild,v 1.2 2003/09/23 22:25:18 max Exp $
 
 inherit flag-o-matic
 
@@ -53,6 +53,16 @@ src_compile() {
 	fi
 
 	econf ${myconf}
+
+	if has_version 'sys-devel/hardened-gcc' ; then
+		for i in `find "${S}" -name "Makefile"` ; do
+			sed -e "s:CC = gcc:CC = gcc -yet_exec:g" \
+				-e "s:CXX = gcc:CXX = g++ -yet_exec:g" \
+				-e "s:CXXCPP = gcc -E:CXX = g++ -E -yet_exec:g" \
+				-i "${i}" || die "sed failed"
+		done
+	fi
+
 	emake || die "compile problem"
 }
 
diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.90.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.90.ebuild
deleted file mode 100644
index f3e4e91de7a5..000000000000
--- a/media-video/mjpegtools/mjpegtools-1.6.1.90.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.90.ebuild,v 1.4 2003/09/20 20:05:58 pappy Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Tools for MJPEG video."
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 -ppc"
-IUSE="gtk avi dv quicktime sdl X 3dnow mmx sse"
-
-DEPEND="media-libs/jpeg
-	>=sys-apps/sed-4
-	=dev-libs/glib-1.2*
-	x86? ( media-libs/libmovtar )
-	mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 dev-lang/nasm )
-	3dnow? ( dev-lang/nasm )
-	sse? ( dev-lang/nasm )
-	gtk? ( =x11-libs/gtk+-1.2* )
-	avi? ( >=media-video/avifile-0.7.38 )
-	dv? ( >=media-libs/libdv-0.99 )
-	quicktime? ( virtual/quicktime )
-	sdl? ( media-libs/libsdl )
-	X? ( x11-base/xfree )"
-
-src_compile() {
-	local myconf
-
-	replace-flags "-march=pentium4" "-march=pentium3"
-	filter-flags "-mfpmath=sse"
-
-	myconf="${myconf} `use_with X x`"
-	myconf="${myconf} `use_with quicktime`"
-	myconf="${myconf} `use_enable x86 cmov-extensions`"
-
-	if [ "`use dv`" ] ; then
-		myconf="${myconf} --with-dv=/usr"
-	fi
-	if [ "`use mmx`" -o "`use 3dnow`" -o "`use sse`" ] ; then
-		myconf="${myconf} --enable-simd-accel"
-	fi
-	if [ "`use mmx`" ] ; then
-		myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx"
-	fi
-
-	econf ${myconf}
-
-	# http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
-	has_version 'sys-devel/hardened-gcc' && find ${W} -name "Makefile" -type f -exec \
-		sed -i "s:CC = gcc:CC = gcc -yet_exec:g" {} \;
-	has_version 'sys-devel/hardened-gcc' && find ${W} -name "Makefile" -type f -exec \
-		sed -i "s:CXX = gcc:CXX = g++ -yet_exec:g" {} \;
-	has_version 'sys-devel/hardened-gcc' && find ${W} -name "Makefile" -type f -exec \
-		sed -i "s:CXXCPP = gcc -E:CXX = g++ -E -yet_exec:g" {} \;
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	einstall
-	dodoc mjpeg_howto.txt
-}