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

Package-Manager: portage-2.1.2_pre2-r9

5 files changed, 117 insertions, 11 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/Manifest b/dev-scheme/drscheme/Manifest
index 6b8f2cefeeb4..93ebc3e40dd1 100644
--- a/dev-scheme/drscheme/Manifest
+++ b/dev-scheme/drscheme/Manifest
@@ -20,14 +20,18 @@ EBUILD drscheme-301-r2.ebuild 2346 RMD160 7266de9376a23ce2f5ae9b11eaf13a973b8cc5
 MD5 2fa45c157897e563148f1d56dad6a6cf drscheme-301-r2.ebuild 2346
 RMD160 7266de9376a23ce2f5ae9b11eaf13a973b8cc502 drscheme-301-r2.ebuild 2346
 SHA256 7fe613a456cb25f91a8c2fa1d1b5394023478bba83e500b2558acb75179cf52e drscheme-301-r2.ebuild 2346
-EBUILD drscheme-352.ebuild 2252 RMD160 5e8cf1f9ffd6c800686010df8c6496eb381c7093 SHA1 76d7d478246d78525b43b99059afcb743af2d073 SHA256 47a73c8f5d948e45565f6222d63415cb811866f2ec856def253666cf1b29dc7d
-MD5 b75ad0ae3b5c362917867e8c54c272b8 drscheme-352.ebuild 2252
-RMD160 5e8cf1f9ffd6c800686010df8c6496eb381c7093 drscheme-352.ebuild 2252
-SHA256 47a73c8f5d948e45565f6222d63415cb811866f2ec856def253666cf1b29dc7d drscheme-352.ebuild 2252
-MISC ChangeLog 6857 RMD160 0914ee0d03fe4a52dabdd852fa7d597d59a1bad3 SHA1 893da54cef41c07d17dd49ee0454a2a1cd9eda20 SHA256 6feda124338dec1c53510e687317194022d10958956f8569188faca8c9539ee9
-MD5 511a2281c3a0d3d0056f4cf0dd3b6770 ChangeLog 6857
-RMD160 0914ee0d03fe4a52dabdd852fa7d597d59a1bad3 ChangeLog 6857
-SHA256 6feda124338dec1c53510e687317194022d10958956f8569188faca8c9539ee9 ChangeLog 6857
+EBUILD drscheme-352-r1.ebuild 2368 RMD160 47146912e5051abb1b20cdcd901fe94444e212f0 SHA1 7c74eaa9c028b4190163924946190041c103c140 SHA256 0b926d60d5cd77d42370634a2d36de9c553f820dc0cdaddcaa8ba3d97c9e5b92
+MD5 0d0a4e82755f5c8dd4608502993b3b64 drscheme-352-r1.ebuild 2368
+RMD160 47146912e5051abb1b20cdcd901fe94444e212f0 drscheme-352-r1.ebuild 2368
+SHA256 0b926d60d5cd77d42370634a2d36de9c553f820dc0cdaddcaa8ba3d97c9e5b92 drscheme-352-r1.ebuild 2368
+EBUILD drscheme-352.ebuild 2289 RMD160 56a2c14303a00344bececc3e89e718deb7d2d857 SHA1 f839c5cedd32eb475d11f5a11a20c0fc9dc48ed7 SHA256 96dd7067fa373db39b5df6175bb4cbe10794e26f17f38b397e3d769f60b4d44c
+MD5 7635fb085ae641f3fdc0712fa7b0f852 drscheme-352.ebuild 2289
+RMD160 56a2c14303a00344bececc3e89e718deb7d2d857 drscheme-352.ebuild 2289
+SHA256 96dd7067fa373db39b5df6175bb4cbe10794e26f17f38b397e3d769f60b4d44c drscheme-352.ebuild 2289
+MISC ChangeLog 7052 RMD160 5c3cc6f6346f678617d7159f8d65e6a1dc93c86b SHA1 5c729e1a3e6bc0f25e3549f8658c182e3ddc2a01 SHA256 c044f309eb506847943849c40d3fee1359e702ba3bf17709d428b16b90ec5c04
+MD5 a49bf96e95e52d16e7eceb40781c31e4 ChangeLog 7052
+RMD160 5c3cc6f6346f678617d7159f8d65e6a1dc93c86b ChangeLog 7052
+SHA256 c044f309eb506847943849c40d3fee1359e702ba3bf17709d428b16b90ec5c04 ChangeLog 7052
 MISC metadata.xml 694 RMD160 ab738064eeb10e5a01c1f2a9040da48b5f68d244 SHA1 32c314fc3597aa38f9724b26f05ae9494d8b3309 SHA256 b63c1d1ae1adc89c062f612f797abf9e0933fc67725d301558f27832bd8c875d
 MD5 274a7900f799811ad11e1a827bb4b23e metadata.xml 694
 RMD160 ab738064eeb10e5a01c1f2a9040da48b5f68d244 metadata.xml 694
@@ -38,3 +42,6 @@ SHA256 751aa53e4159ea7d464ed7c599b8468066b2ea79d23dba37c5e8da3a1fcde30e files/di
 MD5 a1fd9a94240b69cf1b11096444087dfc files/digest-drscheme-352 247
 RMD160 be8d76e43b5a96c9c854186bb3433ef927572341 files/digest-drscheme-352 247
 SHA256 3626e34922727e412cd03d958e6ec1e77c78839907511a783e1d2c98d99ce18d files/digest-drscheme-352 247
+MD5 a1fd9a94240b69cf1b11096444087dfc files/digest-drscheme-352-r1 247
+RMD160 be8d76e43b5a96c9c854186bb3433ef927572341 files/digest-drscheme-352-r1 247
+SHA256 3626e34922727e412cd03d958e6ec1e77c78839907511a783e1d2c98d99ce18d files/digest-drscheme-352-r1 247
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