Replace -O? with -O2, this shouuld fix #141925 and #133888.

(Portage version: 2.1.2_pre2-r9)

4 files changed, 102 insertions, 3 deletions

diff --git a/dev-scheme/drscheme/ChangeLog b/dev-scheme/drscheme/ChangeLog
index dc90fe6d0631..627c62dc4ab9 100644
--- a/dev-scheme/drscheme/ChangeLog
+++ b/dev-scheme/drscheme/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-scheme/drscheme
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/ChangeLog,v 1.31 2006/10/13 14:39:32 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/ChangeLog,v 1.32 2006/10/13 15:21:18 chutzpah Exp $
+
+*drscheme-352-r1 (13 Oct 2006)
+
+  13 Oct 2006; Patrick McLean <chutzpah@gentoo.org> drscheme-352.ebuild,
+  +drscheme-352-r1.ebuild:
+  Replace -O? with -O2, this shouuld fix #141925 and #133888.
 
   13 Oct 2006; Patrick McLean <chutzpah@gentoo.org>
   +files/drscheme-352-destdir.patch, drscheme-352.ebuild:
diff --git a/dev-scheme/drscheme/drscheme-352-r1.ebuild b/dev-scheme/drscheme/drscheme-352-r1.ebuild
new file mode 100644
index 000000000000..da9aa1b2e624
--- /dev/null
+++ b/dev-scheme/drscheme/drscheme-352-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/drscheme-352-r1.ebuild,v 1.1 2006/10/13 15:21:18 chutzpah Exp $
+
+inherit eutils multilib flag-o-matic
+
+DESCRIPTION="DrScheme programming environment.  Includes mzscheme."
+HOMEPAGE="http://www.plt-scheme.org/software/drscheme/"
+SRC_URI="http://download.plt-scheme.org/bundles/${PV}/plt/plt-${PV}-src-unix.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="backtrace cairo jpeg opengl perl png sgc"
+
+RDEPEND="|| ( ( x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libXaw
+			x11-libs/libXft
+		)
+		virtual/x11
+	)
+	!dev-scheme/mzscheme
+	media-libs/freetype
+	media-libs/fontconfig
+	cairo? ( x11-libs/cairo )
+	jpeg? ( media-libs/jpeg )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/plt/src"
+GL_COLLECTS="sgl games/gobblet games/checkers games/jewel games/gl-board-game"
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}/plt"
+
+	epatch "${FILESDIR}/${PN}-350-fPIC.patch"
+	epatch "${FILESDIR}/${P}-destdir.patch"
+
+	if ! use opengl ; then
+		# move aside the opengl-dependent stuff or install will fail
+		mkdir collects-disabled
+
+		for dir in ${GL_COLLECTS}; do
+			mv -f collects/${dir} collects-disabled/$(basename ${dir})
+		done
+	fi
+}
+
+src_compile() {
+	# needed because drschme uses it's own linker that passes LDFLAGS directly
+	# to the linker, rather than passing it through gcc
+	LDFLAGS="${LDFLAGS//-Wl/}"
+	LDFLAGS="${LDFLAGS//,/ }"
+
+	# -O3 seems to cause some miscompiles, this should fix #141925 and #133888
+	replace-flags -O? -O2
+
+	econf --enable-mred \
+		$(use_enable backtrace) \
+		$(use_enable cairo) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable opengl gl) \
+		$(use_enable perl) \
+		$(use_enable png libpng) \
+		$(use_enable sgc) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc ${WORKDIR}/plt/{readme.txt,src/README}
+
+	mv -f "${D}"/usr/share/plt/doc/* "${D}/usr/share/doc/${P}/"
+	rm -rf "${D}/usr/share/plt/doc"
+
+	# needed so online help works
+	keepdir /usr/share/plt
+	dosym "/usr/share/doc/${P}" "/usr/share/plt/doc"
+
+	newicon "${WORKDIR}/plt/collects/icons/PLT-206.png" drscheme.png
+	make_desktop_entry drscheme "DrScheme" drscheme.png "Development"
+}
diff --git a/dev-scheme/drscheme/drscheme-352.ebuild b/dev-scheme/drscheme/drscheme-352.ebuild
index 163fac5ea6d1..34b1c0f9cb1e 100644
--- a/dev-scheme/drscheme/drscheme-352.ebuild
+++ b/dev-scheme/drscheme/drscheme-352.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/drscheme-352.ebuild,v 1.4 2006/10/13 14:39:32 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/drscheme-352.ebuild,v 1.5 2006/10/13 15:21:18 chutzpah Exp $
 
-inherit eutils multilib
+inherit eutils multilib flag-o-matic
 
 DESCRIPTION="DrScheme programming environment.  Includes mzscheme."
 HOMEPAGE="http://www.plt-scheme.org/software/drscheme/"
@@ -56,6 +56,8 @@ src_compile() {
 	LDFLAGS="${LDFLAGS//-Wl/}"
 	LDFLAGS="${LDFLAGS//,/ }"
 
+	replace-flags -O? -O2
+
 	econf --enable-mred \
 		$(use_enable backtrace) \
 		$(use_enable cairo) \
diff --git a/dev-scheme/drscheme/files/digest-drscheme-352-r1 b/dev-scheme/drscheme/files/digest-drscheme-352-r1
new file mode 100644
index 000000000000..cf1b13d8d559
--- /dev/null
+++ b/dev-scheme/drscheme/files/digest-drscheme-352-r1
@@ -0,0 +1,3 @@
+MD5 e79fd305fe431e0477f861902f2ef9e1 plt-352-src-unix.tgz 13661695
+RMD160 f7655e4f21cd54ddd6b9d6c29c056ef76e1b589b plt-352-src-unix.tgz 13661695
+SHA256 f221a21667c19d763e204310055804c6f6eab9349eccf9481afd5104edb8e45d plt-352-src-unix.tgz 13661695