Version bump, adds a patch to fix segfault with modular X, fixes bug #127709.

(Portage version: 2.1_pre7-r5)

5 files changed, 123 insertions, 4 deletions

diff --git a/dev-scheme/drscheme/ChangeLog b/dev-scheme/drscheme/ChangeLog
index 7c02c06ddcab..9c1221871aa5 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.15 2006/04/03 14:34:55 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/ChangeLog,v 1.16 2006/04/12 02:05:31 chutzpah Exp $
+
+*drscheme-301-r2 (12 Apr 2006)
+
+  12 Apr 2006; Patrick McLean <chutzpah@gentoo.org>
+  +files/drscheme-301-no-setfont.patch, +drscheme-301-r2.ebuild:
+  Version bump, adds a patch to fix segfault with modular X, fixes bug #127709.
 
   03 Apr 2006; Patrick McLean <chutzpah@gentoo.org> -drscheme-209.ebuild:
   Cleaned up some old versions.
diff --git a/dev-scheme/drscheme/Manifest b/dev-scheme/drscheme/Manifest
index 6582aefcec1d..fa3894c38c60 100644
--- a/dev-scheme/drscheme/Manifest
+++ b/dev-scheme/drscheme/Manifest
@@ -1,21 +1,30 @@
-MD5 c62710de0b7b3307d4a655735e0abc46 ChangeLog 4165
-RMD160 7ef4606e45932c419e003ff4054256a1e1117dc7 ChangeLog 4165
-SHA256 360aa8ebce322afd2f63a6cd5c72338841b20d1259d3e9f93e11f0e057313dc9 ChangeLog 4165
+MD5 a1829c8cdde5f3830832d3dd7550c3ba ChangeLog 4395
+RMD160 daf5ce7e6baa506bc30e20983a3da23b32b27d8e ChangeLog 4395
+SHA256 f4acb2de1e1c3e1f9ef1e63571531a36a2ab0af4613c76e0057e8b5288050e76 ChangeLog 4395
 MD5 3af4bc914ad88827b2b9f6a72c30cb89 drscheme-209-r1.ebuild 1473
 RMD160 f9f620426eae5977f29d0bd695c9c11c435dbdf6 drscheme-209-r1.ebuild 1473
 SHA256 9bc6905aa88d01f34399acf221f1ac1f05d276bf75f7f9f3813a070a4dda4fe3 drscheme-209-r1.ebuild 1473
 MD5 c9d15a066ee43fa09b7cb6bb32bb2b95 drscheme-301-r1.ebuild 2007
 RMD160 cec9c82efa0630bb697c8a4a6b2d7a5f56a9d749 drscheme-301-r1.ebuild 2007
 SHA256 de50830cedfeab7c90dd5163cfac0a7fe590602b60607d35e7ffc5bd8393c4cd drscheme-301-r1.ebuild 2007
+MD5 878f5c2195256f36d5b482cefb8e8966 drscheme-301-r2.ebuild 2053
+RMD160 ed7460e6a2a5f1c7d004f4dc2114643570fde7d8 drscheme-301-r2.ebuild 2053
+SHA256 d8ebb435a6a46f8674992e6f5cd8faa63eea79cba24f95d9d87ee5ae5f349501 drscheme-301-r2.ebuild 2053
 MD5 0d8f49573c1ac60204059b2478d1eb64 files/digest-drscheme-209-r1 247
 RMD160 f8f11e16c9c7e3b1554d3f75ffb79b5447650443 files/digest-drscheme-209-r1 247
 SHA256 393df297498f9b0b2356fb065678beac1238d0af201b33ec28ebdf4b194c875c files/digest-drscheme-209-r1 247
 MD5 c33fd1e458e8e0e604dfd27831afb954 files/digest-drscheme-301-r1 247
 RMD160 9d65ddb9d3cac127bfea915be9776d66310216b2 files/digest-drscheme-301-r1 247
 SHA256 0498ab462acb3e1debbd8af007b6354ff1f281cedd38b86f4f7ea31217a52634 files/digest-drscheme-301-r1 247
+MD5 b00dc440a5ec2cd08f98f34f827a25b7 files/digest-drscheme-301-r2 247
+RMD160 d308beb49ef1f2b187f28a033f86ed182934d152 files/digest-drscheme-301-r2 247
+SHA256 971b6397eabbbeb6d20c88970180e362041d3895b09009211f2f444215b97b01 files/digest-drscheme-301-r2 247
 MD5 4ada17dfe65cb9defc23a29d23eb3c2d files/drscheme-301-fPIC.patch 2802
 RMD160 51d04864d5b1127f50ece3a1bb87f14adb1a8fb9 files/drscheme-301-fPIC.patch 2802
 SHA256 e9ddebf2fcd4b1b37209a04d9b4e29799bf70c8cc6732c916be8e323840e9e7a files/drscheme-301-fPIC.patch 2802
+MD5 37afa306dd87b996df9eee6ad0c05760 files/drscheme-301-no-setfont.patch 511
+RMD160 758e16e3d00d4ff12ef0e3c3922557f2f6f224ff files/drscheme-301-no-setfont.patch 511
+SHA256 ceca61ff0366a5456fdbaef0f86fa1088f8c315f15d1ab171541b2356874f329 files/drscheme-301-no-setfont.patch 511
 MD5 274a7900f799811ad11e1a827bb4b23e metadata.xml 694
 RMD160 ab738064eeb10e5a01c1f2a9040da48b5f68d244 metadata.xml 694
 SHA256 b63c1d1ae1adc89c062f612f797abf9e0933fc67725d301558f27832bd8c875d metadata.xml 694
diff --git a/dev-scheme/drscheme/drscheme-301-r2.ebuild b/dev-scheme/drscheme/drscheme-301-r2.ebuild
new file mode 100644
index 000000000000..ccb6c64bf54e
--- /dev/null
+++ b/dev-scheme/drscheme/drscheme-301-r2.ebuild
@@ -0,0 +1,86 @@
+# 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-301-r2.ebuild,v 1.1 2006/04/12 02:05:31 chutzpah Exp $
+
+inherit eutils flag-o-matic multilib
+
+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="cairo jpeg opengl perl png"
+
+DEPEND="|| ( ( x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libXaw
+			x11-libs/libXft
+		)
+		virtual/x11
+	)
+	media-libs/freetype
+	media-libs/fontconfig
+	cairo? ( x11-libs/cairo )
+	jpeg? ( media-libs/jpeg )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng )"
+
+S=${WORKDIR}/plt/src
+SED_FILES="bin/framework-test bin/framework-test-engine collects/info-domain/compiled/cache.ss"
+
+src_unpack() {
+	unpack ${A}
+	cd ${WORKDIR}/plt
+
+	epatch "${FILESDIR}/${P}-fPIC.patch"
+	epatch "${FILESDIR}/${P}-no-setfont.patch"
+}
+
+src_compile() {
+
+	econf --enable-mred \
+		$(use_enable opengl gl) \
+		$(use_enable png libpng) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable perl) \
+		$(use_enable cairo) \
+		--prefix=/usr/$(get_libdir)/${PN}/ || die "econf failed"
+
+	make || die
+}
+
+src_install() {
+	cd ${S}
+
+	sed -ie 's/cp -p/cp/' Makefile
+
+	dodir /usr/$(get_libdir)
+	make prefix=${D}/usr/$(get_libdir)/${PN} install || die "make install failed"
+
+	dodoc README
+	cd ${D}/usr/$(get_libdir)/${PN}/man/man1
+	doman *
+	rm -rf ${D}/usr/$(get_libdir)/${PN}/man
+
+	# create symlinks for all the executables
+	dodir /usr/bin
+	MY_D="${D%/}"
+	MY_D="${MY_D//\//\/}"
+
+	cd ${D}/usr/$(get_libdir)/${PN}/bin
+	for EXE in *; do
+
+		# fix paths in generated shell scripts
+		file -b "${EXE}" | grep -q "Bourne shell" && \
+			sed -i "s/${MY_D}//g" "${EXE}"
+
+		dosym "/usr/$(get_libdir)/${PN}/bin/${EXE}" "/usr/bin/${EXE}"
+	done
+
+	for FILE in ${SED_FILES}; do
+		sed -i "s/${MY_D}//g" "${D}/usr/$(get_libdir)/${PN}/${FILE}"
+	done
+
+}
diff --git a/dev-scheme/drscheme/files/digest-drscheme-301-r2 b/dev-scheme/drscheme/files/digest-drscheme-301-r2
new file mode 100644
index 000000000000..379f868629cc
--- /dev/null
+++ b/dev-scheme/drscheme/files/digest-drscheme-301-r2
@@ -0,0 +1,3 @@
+MD5 61f43172460bb297edcf3e0c3599a5e2 plt-301-src-unix.tgz 12706538
+RMD160 35a7a927bf24e7c5c331551ad72c32c9b7d4d742 plt-301-src-unix.tgz 12706538
+SHA256 c914cd2f4ccf1ca706738ee9e11df75632a71cab2a9d70fb292b4ebad410dd52 plt-301-src-unix.tgz 12706538
diff --git a/dev-scheme/drscheme/files/drscheme-301-no-setfont.patch b/dev-scheme/drscheme/files/drscheme-301-no-setfont.patch
new file mode 100644
index 000000000000..90858505d86a
--- /dev/null
+++ b/dev-scheme/drscheme/files/drscheme-301-no-setfont.patch
@@ -0,0 +1,15 @@
+Index: src/wxxt/src/DeviceContexts/WindowDC.cc
+===================================================================
+--- src/wxxt/src/DeviceContexts/WindowDC.cc	(revision 2652)
++++ src/wxxt/src/DeviceContexts/WindowDC.cc	(revision 2653)
+@@ -2676,8 +2676,10 @@
+     if (!(current_font = font)) // nothing to do without a font
+ 	return;
+ 
++#if 0
+     xfs  =(XFontStruct*)font->GetInternalFont(scale_x, scale_y);
+     XSetFont(DPY, TEXT_GC, xfs->fid);
++#endif
+ }
+ 
+ void wxWindowDC::SetTextForeground(wxColour *col)