New revision, fixes bug #151740.

Package-Manager: portage-2.1.2_pre3-r3

4 files changed, 108 insertions, 15 deletions

diff --git a/dev-scheme/drscheme/ChangeLog b/dev-scheme/drscheme/ChangeLog
index 627c62dc4ab9..d5e18b567d18 100644
--- a/dev-scheme/drscheme/ChangeLog
+++ b/dev-scheme/drscheme/ChangeLog
@@ -1,6 +1,11 @@
 # 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.32 2006/10/13 15:21:18 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/ChangeLog,v 1.33 2006/10/17 21:12:44 chutzpah Exp $
+
+*drscheme-352-r2 (17 Oct 2006)
+
+  17 Oct 2006; Patrick McLean <chutzpah@gentoo.org> +drscheme-352-r2.ebuild:
+  New revision, fixes bug #151740.
 
 *drscheme-352-r1 (13 Oct 2006)
 
diff --git a/dev-scheme/drscheme/Manifest b/dev-scheme/drscheme/Manifest
index 4ea5de928f89..def8d58cbe89 100644
--- a/dev-scheme/drscheme/Manifest
+++ b/dev-scheme/drscheme/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX drscheme-301-fPIC.patch 2802 RMD160 51d04864d5b1127f50ece3a1bb87f14adb1a8fb9 SHA1 48d906483efa841dd2b402ebf7a51098fd51c75d SHA256 e9ddebf2fcd4b1b37209a04d9b4e29799bf70c8cc6732c916be8e323840e9e7a
 MD5 4ada17dfe65cb9defc23a29d23eb3c2d files/drscheme-301-fPIC.patch 2802
 RMD160 51d04864d5b1127f50ece3a1bb87f14adb1a8fb9 files/drscheme-301-fPIC.patch 2802
@@ -27,14 +24,18 @@ EBUILD drscheme-352-r1.ebuild 2368 RMD160 47146912e5051abb1b20cdcd901fe94444e212
 MD5 0d0a4e82755f5c8dd4608502993b3b64 drscheme-352-r1.ebuild 2368
 RMD160 47146912e5051abb1b20cdcd901fe94444e212f0 drscheme-352-r1.ebuild 2368
 SHA256 0b926d60d5cd77d42370634a2d36de9c553f820dc0cdaddcaa8ba3d97c9e5b92 drscheme-352-r1.ebuild 2368
+EBUILD drscheme-352-r2.ebuild 2370 RMD160 2433846466d8bd5c0145a97d596d81af20726a84 SHA1 0907c02ca1af0e77ebd3e814a4e08c1f0e30bb43 SHA256 24d87444e500a39823e50f03ab3dde410c0cf42675bf7fee04da0bfa0c910cb8
+MD5 c35c8f2cb81f379da697ebe374546f1e drscheme-352-r2.ebuild 2370
+RMD160 2433846466d8bd5c0145a97d596d81af20726a84 drscheme-352-r2.ebuild 2370
+SHA256 24d87444e500a39823e50f03ab3dde410c0cf42675bf7fee04da0bfa0c910cb8 drscheme-352-r2.ebuild 2370
 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 ChangeLog 7197 RMD160 d1295efbdc00658515574dabba8c2922aa73b81c SHA1 eda90910b389807fe9d61575ce92d2e0c24c41b3 SHA256 57671af3d67a5ff835f74a80f00ef3cc13918075ce5206612c834be58b2bc615
+MD5 c46a59e0d4a2f48339ea41e4d0000b37 ChangeLog 7197
+RMD160 d1295efbdc00658515574dabba8c2922aa73b81c ChangeLog 7197
+SHA256 57671af3d67a5ff835f74a80f00ef3cc13918075ce5206612c834be58b2bc615 ChangeLog 7197
 MISC metadata.xml 694 RMD160 ab738064eeb10e5a01c1f2a9040da48b5f68d244 SHA1 32c314fc3597aa38f9724b26f05ae9494d8b3309 SHA256 b63c1d1ae1adc89c062f612f797abf9e0933fc67725d301558f27832bd8c875d
 MD5 274a7900f799811ad11e1a827bb4b23e metadata.xml 694
 RMD160 ab738064eeb10e5a01c1f2a9040da48b5f68d244 metadata.xml 694
@@ -48,10 +49,6 @@ SHA256 3626e34922727e412cd03d958e6ec1e77c78839907511a783e1d2c98d99ce18d files/di
 MD5 a1fd9a94240b69cf1b11096444087dfc files/digest-drscheme-352-r1 247
 RMD160 be8d76e43b5a96c9c854186bb3433ef927572341 files/digest-drscheme-352-r1 247
 SHA256 3626e34922727e412cd03d958e6ec1e77c78839907511a783e1d2c98d99ce18d files/digest-drscheme-352-r1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFL7rPWt/XSf2CZdkRAh/9AJ0RgROs1oY29OmucNxRdU8GQoTYkgCfXdWX
-EKjDyYMzTvsBzP0KQLPhTMc=
-=OjnZ
------END PGP SIGNATURE-----
+MD5 a1fd9a94240b69cf1b11096444087dfc files/digest-drscheme-352-r2 247
+RMD160 be8d76e43b5a96c9c854186bb3433ef927572341 files/digest-drscheme-352-r2 247
+SHA256 3626e34922727e412cd03d958e6ec1e77c78839907511a783e1d2c98d99ce18d files/digest-drscheme-352-r2 247
diff --git a/dev-scheme/drscheme/drscheme-352-r2.ebuild b/dev-scheme/drscheme/drscheme-352-r2.ebuild
new file mode 100644
index 000000000000..65363d381938
--- /dev/null
+++ b/dev-scheme/drscheme/drscheme-352-r2.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-r2.ebuild,v 1.1 2006/10/17 21:12:44 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/${PF}/"
+	rm -rf "${D}/usr/share/plt/doc"
+
+	# needed so online help works
+	keepdir /usr/share/plt
+	dosym "/usr/share/doc/${PF}" "/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/files/digest-drscheme-352-r2 b/dev-scheme/drscheme/files/digest-drscheme-352-r2
new file mode 100644
index 000000000000..cf1b13d8d559
--- /dev/null
+++ b/dev-scheme/drscheme/files/digest-drscheme-352-r2
@@ -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