big cleanup; remove old cruft

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.26-gentoo-r1 x86_64

17 files changed, 11 insertions, 1429 deletions

diff --git a/dev-scheme/drscheme/ChangeLog b/dev-scheme/drscheme/ChangeLog
index 11d98d5fc685..3e0356fb754b 100644
--- a/dev-scheme/drscheme/ChangeLog
+++ b/dev-scheme/drscheme/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-scheme/drscheme
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/ChangeLog,v 1.70 2008/11/04 20:58:47 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/ChangeLog,v 1.71 2008/11/04 21:09:44 hkbst Exp $
+
+  04 Nov 2008; Marijn Schouten <hkBst@gentoo.org> -files/360p1.patch,
+  -files/drscheme-301-fPIC.patch, -files/drscheme-301-no-setfont.patch,
+  -files/drscheme-350-fPIC.patch, -files/drscheme-352-destdir.patch,
+  -files/drscheme-360-DESTDIR-3m.patch, -reversion.patch,
+  -drscheme-360-r1.ebuild, -drscheme-360-r2.ebuild, -drscheme-360-r3.ebuild,
+  -drscheme-370.6_p20070725.ebuild, -drscheme-370.6_p20070725-r1.ebuild,
+  -drscheme-371.ebuild, -drscheme-372.ebuild, -drscheme-372-r1.ebuild:
+  big cleanup; remove old cruft
 
 *drscheme-4.1.2 (04 Nov 2008)
 
diff --git a/dev-scheme/drscheme/Manifest b/dev-scheme/drscheme/Manifest
index 85dcc53d7aca..2cd6cf1bb701 100644
--- a/dev-scheme/drscheme/Manifest
+++ b/dev-scheme/drscheme/Manifest
@@ -1,32 +1,14 @@
-AUX 360p1.patch 3844 RMD160 80db29c1f1af6c3254c3672ee10afc4c6b71b10f SHA1 5f855fbc2e1e1b4ac1a85ed7d590daf4b7cd1739 SHA256 83ca690b3f145a63f477c257bcc089b1314e8f5e794afb7fc2bec0eb3d9320a2
-AUX drscheme-301-fPIC.patch 2802 RMD160 51d04864d5b1127f50ece3a1bb87f14adb1a8fb9 SHA1 48d906483efa841dd2b402ebf7a51098fd51c75d SHA256 e9ddebf2fcd4b1b37209a04d9b4e29799bf70c8cc6732c916be8e323840e9e7a
-AUX drscheme-301-no-setfont.patch 511 RMD160 758e16e3d00d4ff12ef0e3c3922557f2f6f224ff SHA1 6db61212f47da27c424dc3691ffbf2bf56e48ff5 SHA256 ceca61ff0366a5456fdbaef0f86fa1088f8c315f15d1ab171541b2356874f329
-AUX drscheme-350-fPIC.patch 2979 RMD160 9382e8fc9ad56cad49eda737b7bc3ee558db4b4c SHA1 5aa9b10757c70e2fefa6e1568d6ef805bd11a1f1 SHA256 d020ff1cbc173525a68d52da05e8552787f4bb2ce555e88051997bcc865caff1
-AUX drscheme-352-destdir.patch 16696 RMD160 dffee12eb9170861c4f71699881f14cca9cdf2e1 SHA1 63aee8a3436dfb13cbc97c72b28aedf723882675 SHA256 2e26b0498b103b2559b411c0df7f6927b1ad310336732eb637031f51463062d0
-AUX drscheme-360-DESTDIR-3m.patch 692 RMD160 fa2f89197dd7b3aa0b2d04683eb9c3115cc39535 SHA1 c502ecf79af615c677b5fa172df8e0b5a19705d2 SHA256 f9e628a87e2c151a33ee2fa57ea37f6876a93145cc1877ab7c9653ba01ab9e8a
 AUX drscheme-372-as_needed.patch 1682 RMD160 13e9e2e17c8eeadcb1f54d87a44a76e076673556 SHA1 33b92cb5cf94efdd3c024b95b801012f0fee53db SHA256 afd811f6d803f23c998c7b199a854b1100089a16470c0ce06e77a64b4df7fec0
 AUX drscheme-4.1.2-as_needed.patch 1724 RMD160 5eba5c33ab5945a040356d6b5639cb43dcf0b2cd SHA1 775690004e0cbd379a7c06cd83c98f8c6cd8d3d6 SHA256 cc3fa1bfafc76d19378671257853182d6b056229c7392815a1cfa315f8cda1ae
-DIST plt-360-src-unix.tgz 14106005 RMD160 cbe045f26f429d7df85540f09135c90bde45f84c SHA1 e2ca4fe7f9e66f61a81e5e7a381700f4e94e2d7f SHA256 014cd5c91231a5b6dd67c90ca9d2c26a7466abe0d072a37a40a605b29870f3bd
-DIST plt-370.6-src-unix.tgz 14609493 RMD160 88d901637187cd89ab54db905f48bef77da84d21 SHA1 d263d53dfb62ee5976f189eb8db3e5f6eb14fd96 SHA256 9679294c0cce4ae7b5ac9dfa60c383b9579d00370ab45be13d74202413f08ad5
-DIST plt-371-src-unix.tgz 15192430 RMD160 6abeb5045295d45645230f4ca3cf9e8ed3bb21e2 SHA1 a6cefadbc7561e0ab506c04ff6185ea10f7a9bcf SHA256 966ac7d85626e06dcc9384b9d55013ab780c140f640d9140a6046175775baf52
 DIST plt-372-src-unix.tgz 15267684 RMD160 d5caa01a6aec222fabe08733221d8a29a18fe916 SHA1 7352ea75767818fb53013b9c1add4da9515930c4 SHA256 6b635b41fcb27acbd1eaa773c88eb2c1131e9857b104c8ec1b111cff2d7fb2ec
 DIST plt-4.0.1-src-unix.tgz 14678717 RMD160 e862ce62a78204fda51ab2f3908325105ce6966f SHA1 13e67aa6d0e48a2ad0876995c07a3a0c4a425b2f SHA256 88916d974823b5383110ce5c5845330dc722a8e720dac8be06e5bf83a076d363
 DIST plt-4.0.2-src-unix.tgz 14657055 RMD160 d104710bcbc62f4e348db78ad0b9131883c482f9 SHA1 4e1c8f2b689d6711d60acaa59750ee40b08900b3 SHA256 bca6bb590e0d217699650fbfb6e14086ef2f7b82dab739e9e6d64c6185025b8d
 DIST plt-4.1-src-unix.tgz 14908190 RMD160 80bb4b9bf0bf878c5150c5d69330b47cdd5e1de2 SHA1 12b0de3ea1255a40c7c184105a6272d4bd4d8c1b SHA256 d632a469923f087f3dd34ef39c36c0f3ad277018b8d8f26030d26c773f3de28c
 DIST plt-4.1.2-src-unix.tgz 14624105 RMD160 16bee63b04857fe147d57434fee52684382cbfa2 SHA1 62efd7047e9e5fe90492487a02583236464ddbbc SHA256 0ab7ea7b59387565e8ce066431ad39d31d6229b3e65f57eb018993585b82e8a9
 EBUILD drscheme-0.372-r1.ebuild 2482 RMD160 d0340c6a5aace9f2e79fb8a7b39016918eb52a21 SHA1 fb5460ce998291740168a61aa89a154a0b1b89d0 SHA256 d4f6a1091d88e9852c177dd55fbf3a3a570b04f9f3356a24a1759ca3bbe44df6
-EBUILD drscheme-360-r1.ebuild 2262 RMD160 be2da532fa3bb5ea25899187398a42e7c8c760a7 SHA1 721f38b7099c0bcb0f436ed048070f6aa05a235e SHA256 9f71d417ba5f2b617c420312b44a4bf708650ee1b25b08c6519248c5731cb5fb
-EBUILD drscheme-360-r2.ebuild 2302 RMD160 d2206887aa23df79b078289c947f0b12ae8d9e28 SHA1 e860c342190b936a189873e37585c7bbf02edf24 SHA256 38cb519d846da28e7b7b26c4b95215505276f7208ab7421b474e96383d31623e
-EBUILD drscheme-360-r3.ebuild 2336 RMD160 cdabd00f88b2870418a8267b0af071df6c5be71d SHA1 5277efa46f424777f82e42e80cedc2c78edac12b SHA256 26204722dc69b032656a0062eca00dd6527619a60d7a1fada9e97207738dead3
-EBUILD drscheme-370.6_p20070725-r1.ebuild 2059 RMD160 b4e1b832ffb9bf3f7899a66a76f2d50d098a3c23 SHA1 4d6c13bab7edc412f2f4f5034e59f246d3dce3e5 SHA256 9c7ed0605d4ef77896a090c0767e5940093c6b57dfbf248b61de09b672e1933f
-EBUILD drscheme-370.6_p20070725.ebuild 2126 RMD160 6a42e25ae78eac8d5fa2674b2a1356830102692a SHA1 305e8def948c46f1f8078b5e96c8bf9d3a850781 SHA256 7cfe79a751f10d4796a1a0c2220039b338bdcf9cd744e4fee4ca4b6d492c5dae
-EBUILD drscheme-371.ebuild 2029 RMD160 26eba0175d2dd681a5cbca5c9b95e2eab8c85b7a SHA1 b96cc6cdfa51d6b083d1d35a70deb67dcab8a983 SHA256 e1c289f0b375b78f276cfd9dd8191c34ad52a4dfc10abb75643c111c7c1395bc
-EBUILD drscheme-372-r1.ebuild 2240 RMD160 70c3a0dc39953b625284830d4dd3fa5c5cbc3965 SHA1 259ae3b45e12b40d025fd566921438eca89a104c SHA256 8e117c8ec69b236a846a5cb1c9ef9f75b57d91a6f08ae2f0b3b5b8dc6a52705e
-EBUILD drscheme-372.ebuild 2029 RMD160 9942880458f1b93882df88ec3db67753203edee6 SHA1 6ca5cc43291805f832fb57dccf10c5c11e7703a7 SHA256 cc3a777258ffd6bfff552b453751a00d33eadaf42a668e33ba823d5511cf17b9
 EBUILD drscheme-4.0.1.ebuild 2315 RMD160 d188fe360767f2bfc9239d7fb63c2fc5e9aaaae3 SHA1 a1165c660b64b7640a51f4f4fda9f487527d27af SHA256 4dcb435ca58c8d5ed227fd61452f0edaf09b71337388b41db9158d26d1d19847
 EBUILD drscheme-4.0.2.ebuild 2315 RMD160 8d519d244f54594bd16059516e80bf184528361c SHA1 9cf8e83be3cc35d9c81d3cde547cc3b18033629a SHA256 8f865c6b2733ce784b92d6ce82861e3f4a202add2dbc02ce89f5dc0c944dccf0
 EBUILD drscheme-4.1.2.ebuild 2398 RMD160 9ee7488b29d8b2305beb11f8629eb17642610e78 SHA1 9958c3b6fdb3bd29d1db7a0a17fb1584a1bdf3c4 SHA256 b139158fdd712a0262a0f11786c6338ea4ecb1e065a187d8f6af4fdd41b9337b
 EBUILD drscheme-4.1.ebuild 2383 RMD160 1476ee58888b7f440472674a935bc8a0ed5bbf9e SHA1 393c1e365a1064143087328872828a12cd990833 SHA256 18d0f1dbbe0cc61ae6193d002e5335b8841fdae6519ea21cfc928a8bbb23b6b8
-MISC ChangeLog 13095 RMD160 52706de1ba019a4a631df3ba277f09a4dcebc3e8 SHA1 fae3357a83c097a5f457b2aed175cc045bd55283 SHA256 e3ba80a69de3c7afd649f99ead4d9a8db10e4ec6fb5a11affbfc82871384df1d
+MISC ChangeLog 13618 RMD160 34b33a7bb172b243b9cd0fa3669c9e024d6ddeed SHA1 7816672e27d74df4dd7334cb6991ca5d812045a1 SHA256 1cee723be52ee3884eff4bdce1077ba75c1ba09bd214fc80a53162628862f552
 MISC metadata.xml 1110 RMD160 b55008fdb5e048077c038b35b4bcc946cae37ec5 SHA1 59a2bdb6d43220c40705889d3c4f152bcf40f749 SHA256 8ff077a169237d44d25c1c061cfd39e5f609baa1f9c3fb6b43ca0b4910c25584
-MISC reversion.patch 411 RMD160 e7776f13b925b058b7266945ea8650a4b2009f82 SHA1 6d3b219465645e47797a50a827cda34ea2b3b085 SHA256 a8fa149b68439e12cb227b6305721b942e79c23f0c41a44ca5570a9efd21b878
diff --git a/dev-scheme/drscheme/drscheme-360-r1.ebuild b/dev-scheme/drscheme/drscheme-360-r1.ebuild
deleted file mode 100644
index 131ff81f9f73..000000000000
--- a/dev-scheme/drscheme/drscheme-360-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/drscheme-360-r1.ebuild,v 1.10 2008/07/25 20:40:57 pchrist Exp $
-
-inherit eutils multilib flag-o-matic libtool
-
-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="3m backtrace cairo jpeg opengl perl png"
-
-RDEPEND="x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXaw
-	>=x11-libs/libXft-2.1.12
-	!dev-scheme/mzscheme
-	media-libs/freetype
-	media-libs/fontconfig
-	cairo? ( >=x11-libs/cairo-1.2.3 )
-	jpeg? ( media-libs/jpeg )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/plt-${PV}/src"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}/.."
-
-	epatch "${FILESDIR}/${PN}-350-fPIC.patch"
-	epatch "${FILESDIR}/${P}-DESTDIR-3m.patch"
-
-	cd "${S}/mzscheme/gc"
-	elibtoolize
-	cd "${S}"
-
-	# lib dir fixups
-	sed -ie 's:-rpath ${absprefix}/lib:-rpath ${absprefix}/'$(get_libdir)':g' configure
-}
-
-src_compile() {
-	# -O3 seems to cause some miscompiles, this should fix #141925 and #133888
-	replace-flags -O? -O2
-
-	econf --enable-mred \
-		--enable-shared \
-		--enable-lt=/usr/bin/libtool \
-		$(use_enable backtrace) \
-		$(use_enable cairo) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable opengl gl) \
-		$(use_enable perl) \
-		$(use_enable png libpng) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	if use 3m; then
-		emake -j1 3m || die "emake 3m failed"
-	fi
-}
-
-src_install() {
-	export MZSCHEME_DYNEXT_LINKER_FLAGS=$(raw-ldflags)
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	if use 3m; then
-		make DESTDIR="${D}" install-3m || die "make install failed"
-	fi
-
-	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-${PV}/collects/icons/PLT-206.png" drscheme.png
-	make_desktop_entry drscheme "DrScheme" drscheme "Development"
-}
diff --git a/dev-scheme/drscheme/drscheme-360-r2.ebuild b/dev-scheme/drscheme/drscheme-360-r2.ebuild
deleted file mode 100644
index 0e460326c97a..000000000000
--- a/dev-scheme/drscheme/drscheme-360-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/drscheme-360-r2.ebuild,v 1.3 2008/07/25 20:40:57 pchrist Exp $
-
-inherit eutils multilib flag-o-matic libtool
-
-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="3m backtrace cairo jpeg opengl perl png X"
-
-RDEPEND="X? ( x11-libs/libICE
-			  x11-libs/libSM
-			  x11-libs/libXaw
-			  >=x11-libs/libXft-2.1.12
-			  media-libs/freetype
-			  media-libs/fontconfig )
-	cairo? ( >=x11-libs/cairo-1.2.3 )
-	jpeg? ( media-libs/jpeg )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/plt-${PV}/src"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}/.."
-
-	epatch "${FILESDIR}/${PN}-350-fPIC.patch"
-	epatch "${FILESDIR}/${P}-DESTDIR-3m.patch"
-
-	cd "${S}/mzscheme/gc"
-	elibtoolize
-	cd "${S}"
-
-	# lib dir fixups
-	sed -ie 's:-rpath ${absprefix}/lib:-rpath ${absprefix}/'$(get_libdir)':g' configure
-}
-
-src_compile() {
-	# -O3 seems to cause some miscompiles, this should fix #141925 and #133888
-	replace-flags -O? -O2
-
-	econf $(use_enable X mred) \
-		--enable-shared \
-		--enable-lt=/usr/bin/libtool \
-		$(use_enable backtrace) \
-		$(use_enable cairo) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable opengl gl) \
-		$(use_enable perl) \
-		$(use_enable png libpng) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	if use 3m; then
-		emake -j1 3m || die "emake 3m failed"
-	fi
-}
-
-src_install() {
-	export MZSCHEME_DYNEXT_LINKER_FLAGS=$(raw-ldflags)
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	if use 3m; then
-		make DESTDIR="${D}" install-3m || die "make install-m3 failed"
-	fi
-
-	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"
-
-	if use X; then
-		newicon "${WORKDIR}/plt-${PV}/collects/icons/PLT-206.png" drscheme.png
-		make_desktop_entry drscheme "DrScheme" drscheme "Development"
-	fi
-}
diff --git a/dev-scheme/drscheme/drscheme-360-r3.ebuild b/dev-scheme/drscheme/drscheme-360-r3.ebuild
deleted file mode 100644
index 226e946c93fc..000000000000
--- a/dev-scheme/drscheme/drscheme-360-r3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/drscheme-360-r3.ebuild,v 1.3 2008/07/25 20:40:57 pchrist Exp $
-
-inherit eutils multilib flag-o-matic libtool
-
-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="3m backtrace cairo jpeg opengl perl png X"
-
-RDEPEND="X? ( x11-libs/libICE
-			  x11-libs/libSM
-			  x11-libs/libXaw
-			  >=x11-libs/libXft-2.1.12
-			  media-libs/freetype
-			  media-libs/fontconfig )
-	cairo? ( >=x11-libs/cairo-1.2.3 )
-	jpeg? ( media-libs/jpeg )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/plt-${PV}/src"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}/.."
-
-	epatch "${FILESDIR}/${PN}-350-fPIC.patch"
-	epatch "${FILESDIR}/${P}-DESTDIR-3m.patch"
-	epatch "${FILESDIR}/360p1.patch"
-
-	cd "${S}/mzscheme/gc"
-	elibtoolize
-	cd "${S}"
-
-	# lib dir fixups
-	sed -ie 's:-rpath ${absprefix}/lib:-rpath ${absprefix}/'$(get_libdir)':g' configure
-}
-
-src_compile() {
-	# -O3 seems to cause some miscompiles, this should fix #141925 and #133888
-	replace-flags -O? -O2
-
-	econf $(use_enable X mred) \
-		--enable-shared \
-		--enable-lt=/usr/bin/libtool \
-		$(use_enable backtrace) \
-		$(use_enable cairo) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable opengl gl) \
-		$(use_enable perl) \
-		$(use_enable png libpng) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	if use 3m; then
-		emake -j1 3m || die "emake 3m failed"
-	fi
-}
-
-src_install() {
-	export MZSCHEME_DYNEXT_LINKER_FLAGS=$(raw-ldflags)
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	if use 3m; then
-		make DESTDIR="${D}" install-3m || die "make install-m3 failed"
-	fi
-
-	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"
-
-	if use X; then
-		newicon "${WORKDIR}/plt-${PV}/collects/icons/PLT-206.png" drscheme.png
-		make_desktop_entry drscheme "DrScheme" drscheme "Development"
-	fi
-}
diff --git a/dev-scheme/drscheme/drscheme-370.6_p20070725-r1.ebuild b/dev-scheme/drscheme/drscheme-370.6_p20070725-r1.ebuild
deleted file mode 100644
index e058d1ba29db..000000000000
--- a/dev-scheme/drscheme/drscheme-370.6_p20070725-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/drscheme-370.6_p20070725-r1.ebuild,v 1.2 2008/02/29 17:58:40 carlo Exp $
-
-inherit eutils
-
-SRC_URI="mirror://gentoo/plt-${PV%%_p*}-src-unix.tgz"
-#         http://pre.plt-scheme.org/installers/plt-${PV}-src-unix.tgz
-#         http://download.plt-scheme.org/bundles/${PV}/plt/plt-${PV}-src-unix.tgz"
-
-DESCRIPTION="DrScheme programming environment. Includes mzscheme."
-HOMEPAGE="http://www.plt-scheme.org/software/drscheme/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="backtrace cairo cgc llvm opengl profile X"
-
-RDEPEND="X? ( x11-libs/libICE
-			  x11-libs/libSM
-			  x11-libs/libXaw
-			  >=x11-libs/libXft-2.1.12
-			  x11-libs/libXrender
-			  media-libs/freetype
-			  media-libs/fontconfig
-			  cairo? ( x11-libs/cairo )
-			  media-libs/jpeg
-			  opengl? ( virtual/opengl )
-			  media-libs/libpng )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/plt-${PV%%_p*}"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-	sed "s,docdir=\"\${datadir}/plt/doc,docdir=\"\${datadir}/doc/${PF}," -i src/configure
-}
-
-src_compile() {
-	cd src
-
-# according to vapier, we should use the bundled libtool
-# such that we don't preclude cross-compile. Thus don't use
-# --enable-lt=/usr/bin/libtool
-	econf $(use_enable X mred) \
-		--enable-shared \
-		--disable-perl \
-		$(use_enable backtrace) \
-		$(use_enable cairo) \
-		$(use_enable llvm) \
-		$(use_enable opengl gl) \
-		$(use_enable profile gprof) \
-		--enable-xft \
-		--enable-xrender
-
-	if use cgc; then
-		emake -j1 both || die "emake both failed"
-	else
-		emake -j1 || die "emake failed"
-	fi
-}
-
-src_install() {
-	cd src
-	export MZSCHEME_DYNEXT_LINKER_FLAGS=$(raw-ldflags)
-
-	if use cgc; then
-		emake DESTDIR="${D}" install-both || die "emake install-both failed"
-	else
-		emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-
-	if use X; then
-		newicon ../collects/icons/PLT-206.png drscheme.png
-		make_desktop_entry drscheme "DrScheme" drscheme "Development"
-	fi
-}
diff --git a/dev-scheme/drscheme/drscheme-370.6_p20070725.ebuild b/dev-scheme/drscheme/drscheme-370.6_p20070725.ebuild
deleted file mode 100644
index e14825a1048d..000000000000
--- a/dev-scheme/drscheme/drscheme-370.6_p20070725.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/drscheme-370.6_p20070725.ebuild,v 1.4 2008/02/29 17:58:40 carlo Exp $
-
-inherit eutils
-
-SRC_URI="mirror://gentoo/plt-${PV%%_p*}-src-unix.tgz"
-#         http://pre.plt-scheme.org/installers/plt-${PV}-src-unix.tgz
-#         http://download.plt-scheme.org/bundles/${PV}/plt/plt-${PV}-src-unix.tgz"
-
-DESCRIPTION="DrScheme programming environment. Includes mzscheme."
-HOMEPAGE="http://www.plt-scheme.org/software/drscheme/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="backtrace cairo cgc llvm opengl profile X xft xrender"
-
-RDEPEND="X? ( x11-libs/libICE
-			  x11-libs/libSM
-			  x11-libs/libXaw
-			  xft? ( >=x11-libs/libXft-2.1.12 )
-			  xrender? ( x11-libs/libXrender )
-			  media-libs/freetype
-			  media-libs/fontconfig
-			  cairo? ( x11-libs/cairo )
-			  media-libs/jpeg
-			  opengl? ( virtual/opengl )
-			  media-libs/libpng )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/plt-${PV%%_p*}"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-	sed "s,docdir=\"\${datadir}/plt/doc,docdir=\"\${datadir}/doc/${PF}," -i src/configure
-}
-
-src_compile() {
-	cd src
-
-# according to vapier, we should use the bundled libtool
-# such that we don't preclude cross-compile. Thus don't use
-# --enable-lt=/usr/bin/libtool
-	econf $(use_enable X mred) \
-		--enable-shared \
-		--disable-perl \
-		$(use_enable backtrace) \
-		$(use_enable cairo) \
-		$(use_enable llvm) \
-		$(use_enable opengl gl) \
-		$(use_enable profile gprof) \
-		$(use_enable xft) \
-		$(use_enable xrender) \
-		|| die "econf failed"
-
-	if use cgc; then
-		emake -j1 both || die "emake both failed"
-	else
-		emake -j1 || die "emake failed"
-	fi
-}
-
-src_install() {
-	cd src
-	export MZSCHEME_DYNEXT_LINKER_FLAGS=$(raw-ldflags)
-
-	if use cgc; then
-		emake DESTDIR="${D}" install-both || die "emake install-both failed"
-	else
-		emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-
-	if use X; then
-		newicon ../collects/icons/PLT-206.png drscheme.png
-		make_desktop_entry drscheme "DrScheme" drscheme "Development"
-	fi
-}
diff --git a/dev-scheme/drscheme/drscheme-371.ebuild b/dev-scheme/drscheme/drscheme-371.ebuild
deleted file mode 100644
index 3fa54bc1435d..000000000000
--- a/dev-scheme/drscheme/drscheme-371.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/drscheme-371.ebuild,v 1.3 2008/02/29 17:58:40 carlo Exp $
-
-inherit eutils
-
-SRC_URI="http://download.plt-scheme.org/bundles/${PV}/plt/plt-${PV}-src-unix.tgz
-		 http://pre.plt-scheme.org/installers/plt-${PV}-src-unix.tgz"
-#"mirror://gentoo/plt-${PV%%_p*}-src-unix.tgz"
-
-DESCRIPTION="DrScheme programming environment. Includes mzscheme."
-HOMEPAGE="http://www.plt-scheme.org/software/drscheme/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="backtrace cairo cgc llvm opengl profile X"
-
-RDEPEND="X? ( x11-libs/libICE
-			  x11-libs/libSM
-			  x11-libs/libXaw
-			  >=x11-libs/libXft-2.1.12
-			  x11-libs/libXrender
-			  media-libs/freetype
-			  media-libs/fontconfig
-			  cairo? ( x11-libs/cairo )
-			  media-libs/jpeg
-			  opengl? ( virtual/opengl )
-			  media-libs/libpng )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/plt-${PV%%_p*}"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-	sed "s,docdir=\"\${datadir}/plt/doc,docdir=\"\${datadir}/doc/${PF}," -i src/configure
-}
-
-src_compile() {
-	cd src
-
-# according to vapier, we should use the bundled libtool
-# such that we don't preclude cross-compile. Thus don't use
-# --enable-lt=/usr/bin/libtool
-	econf $(use_enable X mred) \
-		--enable-shared \
-		--disable-perl \
-		$(use_enable backtrace) \
-		$(use_enable cairo) \
-		$(use_enable llvm) \
-		$(use_enable opengl gl) \
-		$(use_enable profile gprof) \
-		--enable-xft \
-		--enable-xrender
-
-	if use cgc; then
-		emake -j1 both || die "emake both failed"
-	else
-		emake -j1 || die "emake failed"
-	fi
-}
-
-src_install() {
-	cd src
-	export MZSCHEME_DYNEXT_LINKER_FLAGS=$(raw-ldflags)
-
-	if use cgc; then
-		emake DESTDIR="${D}" install-both || die "emake install-both failed"
-	else
-		emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-
-	if use X; then
-		newicon ../collects/icons/PLT-206.png drscheme.png
-		make_desktop_entry drscheme "DrScheme" drscheme "Development"
-	fi
-}
diff --git a/dev-scheme/drscheme/drscheme-372-r1.ebuild b/dev-scheme/drscheme/drscheme-372-r1.ebuild
deleted file mode 100644
index d11802ee7054..000000000000
--- a/dev-scheme/drscheme/drscheme-372-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/drscheme-372-r1.ebuild,v 1.2 2008/06/03 10:19:12 dev-zero Exp $
-
-inherit eutils latex-package
-
-SRC_URI="http://download.plt-scheme.org/bundles/${PV}/plt/plt-${PV}-src-unix.tgz
-		 http://pre.plt-scheme.org/installers/plt-${PV}-src-unix.tgz"
-#"mirror://gentoo/plt-${PV%%_p*}-src-unix.tgz"
-
-DESCRIPTION="DrScheme programming environment. Includes mzscheme."
-HOMEPAGE="http://www.plt-scheme.org/software/drscheme/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="backtrace cairo cgc llvm opengl profile X"
-
-RDEPEND="X? ( x11-libs/libICE
-			  x11-libs/libSM
-			  x11-libs/libXaw
-			  >=x11-libs/libXft-2.1.12
-			  x11-libs/libXrender
-			  media-libs/freetype
-			  media-libs/fontconfig
-			  cairo? ( x11-libs/cairo )
-			  media-libs/jpeg
-			  opengl? ( virtual/opengl )
-			  media-libs/libpng )"
-
-DEPEND="${RDEPEND} !dev-tex/slatex"
-
-S="${WORKDIR}/plt-${PV%%_p*}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i \
-		-e "s,docdir=\"\${datadir}/plt/doc,docdir=\"\${datadir}/doc/${PF}," \
-		src/configure || die "sed failed"
-
-	epatch "${FILESDIR}/${P}-as_needed.patch"
-}
-
-src_compile() {
-	cd src
-
-# according to vapier, we should use the bundled libtool
-# such that we don't preclude cross-compile. Thus don't use
-# --enable-lt=/usr/bin/libtool
-	econf $(use_enable X mred) \
-		--enable-shared \
-		--disable-perl \
-		$(use_enable backtrace) \
-		$(use_enable cairo) \
-		$(use_enable llvm) \
-		$(use_enable opengl gl) \
-		$(use_enable profile gprof) \
-		--enable-xft \
-		--enable-xrender
-
-	if use cgc; then
-		emake -j1 both || die "emake both failed"
-	else
-		emake -j1 || die "emake failed"
-	fi
-}
-
-src_install() {
-	# deal with slatex
-	insinto /usr/share/texmf/tex/latex/slatex/
-	doins collects/slatex/slatex.sty
-
-	cd src
-	export MZSCHEME_DYNEXT_LINKER_FLAGS=$(raw-ldflags)
-
-	if use cgc; then
-		emake DESTDIR="${D}" install-both || die "emake install-both failed"
-	else
-		emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-
-	if use X; then
-		newicon ../collects/icons/PLT-206.png drscheme.png
-		make_desktop_entry drscheme "DrScheme" drscheme "Development"
-	fi
-}
diff --git a/dev-scheme/drscheme/drscheme-372.ebuild b/dev-scheme/drscheme/drscheme-372.ebuild
deleted file mode 100644
index 1f21b76140fd..000000000000
--- a/dev-scheme/drscheme/drscheme-372.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/drscheme-372.ebuild,v 1.1 2008/03/03 09:29:23 hkbst Exp $
-
-inherit eutils
-
-SRC_URI="http://download.plt-scheme.org/bundles/${PV}/plt/plt-${PV}-src-unix.tgz
-		 http://pre.plt-scheme.org/installers/plt-${PV}-src-unix.tgz"
-#"mirror://gentoo/plt-${PV%%_p*}-src-unix.tgz"
-
-DESCRIPTION="DrScheme programming environment. Includes mzscheme."
-HOMEPAGE="http://www.plt-scheme.org/software/drscheme/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="backtrace cairo cgc llvm opengl profile X"
-
-RDEPEND="X? ( x11-libs/libICE
-			  x11-libs/libSM
-			  x11-libs/libXaw
-			  >=x11-libs/libXft-2.1.12
-			  x11-libs/libXrender
-			  media-libs/freetype
-			  media-libs/fontconfig
-			  cairo? ( x11-libs/cairo )
-			  media-libs/jpeg
-			  opengl? ( virtual/opengl )
-			  media-libs/libpng )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/plt-${PV%%_p*}"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-	sed "s,docdir=\"\${datadir}/plt/doc,docdir=\"\${datadir}/doc/${PF}," -i src/configure
-}
-
-src_compile() {
-	cd src
-
-# according to vapier, we should use the bundled libtool
-# such that we don't preclude cross-compile. Thus don't use
-# --enable-lt=/usr/bin/libtool
-	econf $(use_enable X mred) \
-		--enable-shared \
-		--disable-perl \
-		$(use_enable backtrace) \
-		$(use_enable cairo) \
-		$(use_enable llvm) \
-		$(use_enable opengl gl) \
-		$(use_enable profile gprof) \
-		--enable-xft \
-		--enable-xrender
-
-	if use cgc; then
-		emake -j1 both || die "emake both failed"
-	else
-		emake -j1 || die "emake failed"
-	fi
-}
-
-src_install() {
-	cd src
-	export MZSCHEME_DYNEXT_LINKER_FLAGS=$(raw-ldflags)
-
-	if use cgc; then
-		emake DESTDIR="${D}" install-both || die "emake install-both failed"
-	else
-		emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-
-	if use X; then
-		newicon ../collects/icons/PLT-206.png drscheme.png
-		make_desktop_entry drscheme "DrScheme" drscheme "Development"
-	fi
-}
diff --git a/dev-scheme/drscheme/files/360p1.patch b/dev-scheme/drscheme/files/360p1.patch
deleted file mode 100644
index c541e6c05a99..000000000000
--- a/dev-scheme/drscheme/files/360p1.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-Index: src/mred/mredx.cxx
-===================================================================
---- src/mred/mredx.cxx	(.../v360)	(revision 5838)
-+++ src/mred/mredx.cxx	(.../v360p1)	(revision 5838)
-@@ -151,7 +151,43 @@
- 
- static unsigned long lastUngrabTime;
- static unsigned long lastUnhideTime;
-+static int need_unhide = 0;
- 
-+class Check_Ungrab_Record {
-+public:
-+  Window window;
-+  int x, y, x_root, y_root;
-+  Check_Ungrab_Record *next;
-+};
-+
-+static int cur_registered = 0;
-+static Check_Ungrab_Record *first_cur = NULL, *last_cur = NULL;
-+
-+static void CheckUngrab(Display *dpy, Check_Ungrab_Record *cur)
-+{     
-+  Window root;
-+  int x, y;
-+  unsigned w, h, b, d;
-+  
-+  XGetGeometry(dpy, cur->window, 
-+	       &root, &x, &y, &w, &h,
-+	       &b, &d);
-+  if ((cur->x < 0) || (cur->y < 0)
-+      || ((unsigned int)cur->x > w) || ((unsigned int)cur->y > h)) {
-+    /* Looks bad, but is it a click in a MrEd window
-+       that we could care about? */
-+    
-+    wxWindow *w;
-+    w = wxLocationToWindow(cur->x_root, cur->y_root);
-+    
-+    if (w) {
-+      /* Looks like we need to ungrab */
-+      XUngrabPointer(dpy, 0);
-+      XUngrabKeyboard(dpy, 0);
-+    }
-+  }
-+}
-+
- static Bool CheckPred(Display *display, XEvent *e, char *args)
- {
-   Window window;
-@@ -163,7 +199,7 @@
-   case MotionNotify:
-     if (e->xbutton.time > lastUnhideTime) {
-       lastUnhideTime = e->xbutton.time;
--      wxUnhideAllCursors();
-+      need_unhide = 1;
-     }
-     break;
-   default:
-@@ -197,28 +233,22 @@
-     /* lastUngrabTime keeps us from checking the same events
-        over and over again. */
-     if (e->xbutton.time > lastUngrabTime) {
--      Window root;
--      int x, y;
--      unsigned w, h, b, d;
--      
--      XGetGeometry(XtDisplay(widget), e->xbutton.window, 
--		   &root, &x, &y, &w, &h,
--		   &b, &d);
--      if ((e->xbutton.x < 0) || (e->xbutton.y < 0)
--	  || ((unsigned int)e->xbutton.x > w) || ((unsigned int)e->xbutton.y > h)) {
--	/* Looks bad, but is it a click in a MrEd window
--	   that we could care about? */
--
--	wxWindow *w;
--	w = wxLocationToWindow(e->xbutton.x_root, e->xbutton.y_root);
--	
--	if (w) {
--	  /* Looks like we need to ungrab */
--	  XUngrabPointer(XtDisplay(widget), 0);
--	  XUngrabKeyboard(XtDisplay(widget), 0);
--	}
-+      Check_Ungrab_Record *cur;
-+      if (!cur_registered) {
-+	wxREGGLOB(first_cur);
-+	wxREGGLOB(last_cur);
-       }
--      
-+      cur = new WXGC_PTRS Check_Ungrab_Record;
-+      cur->window = e->xbutton.window;
-+      cur->x = e->xbutton.x;
-+      cur->y = e->xbutton.y;
-+      cur->x_root = e->xbutton.x_root;
-+      cur->y_root = e->xbutton.y_root;
-+      if (last_cur)
-+	last_cur->next = cur;
-+      else
-+	first_cur = cur;
-+      last_cur = cur;
-       lastUngrabTime = e->xbutton.time;
-     }
-   }
-@@ -339,6 +369,7 @@
- 		     XEvent *event, MrEdContext **which)
- {
-   Display *d;
-+  int got;
- 
-   if (which)
-     *which = NULL;
-@@ -351,7 +382,20 @@
-   else
-     d = XtDisplay(orig_top_level);
- 
--  if (XCheckIfEvent(d, event, CheckPred, (char *)which)) {
-+  got = XCheckIfEvent(d, event, CheckPred, (char *)which);
-+
-+  if (need_unhide) {
-+    need_unhide = 0;
-+    wxUnhideAllCursors();
-+  }
-+
-+  while (first_cur) {
-+    CheckUngrab(d, first_cur);
-+    first_cur = first_cur->next;
-+  }
-+  last_cur = NULL;
-+
-+  if (got) {
-     just_check = 0;
-     return 1;
-   } else if (short_circuit) {
-Index: collects/version/patchlevel.ss
-===================================================================
---- collects/version/patchlevel.ss	(.../v360)	(revision 5838)
-+++ collects/version/patchlevel.ss	(.../v360p1)	(revision 5838)
-@@ -1,5 +1,5 @@
- ;; this file contains the current patch level of DrScheme
- ;; it is usually `0' in the repository, and changed only when a patch is made.
- (module patchlevel mzscheme
--  (define patchlevel 0)
-+  (define patchlevel 1)
-   (provide patchlevel))
diff --git a/dev-scheme/drscheme/files/drscheme-301-fPIC.patch b/dev-scheme/drscheme/files/drscheme-301-fPIC.patch
deleted file mode 100644
index adb0a7e262f7..000000000000
--- a/dev-scheme/drscheme/files/drscheme-301-fPIC.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -uNr plt-orig/collects/make/setup-extension.ss plt/collects/make/setup-extension.ss
---- plt-orig/collects/make/setup-extension.ss	2006-01-11 04:15:52.000000000 -0500
-+++ plt/collects/make/setup-extension.ss	2006-02-10 13:02:05.000000000 -0500
-@@ -191,7 +191,7 @@
-            current-extension-linker-flags 
-            (if is-win?
-                null
--               (list (format "-L~a/lib" (path->string sys-path))))
-+               (list "-fPIC" (format "-L~a/lib" (path->string sys-path))))
-            
-            ;; Add libs for Windows:
-            (with-new-flags
-diff -uNr plt-orig/src/foreign/Makefile.in plt/src/foreign/Makefile.in
---- plt-orig/src/foreign/Makefile.in	2006-01-11 04:15:20.000000000 -0500
-+++ plt/src/foreign/Makefile.in	2006-02-10 13:03:07.000000000 -0500
-@@ -3,7 +3,7 @@
- srcdir = @srcdir@
- builddir = @builddir@
- CC = @CC@
--CFLAGS = @CFLAGS@ @COMPFLAGS@ @PREFLAGS@ @PROFFLAGS@ @OPTIONS@ @MZOPTIONS@ \
-+CFLAGS = @CFLAGS@ @COMPFLAGS@ @PREFLAGS@ @PROFFLAGS@ @OPTIONS@ @MZOPTIONS@ -fPIC \
-          -I$(builddir)/../mzscheme \
-          -I$(srcdir)/../mzscheme/include -I$(srcdir)/../mzscheme/src \
-          -Igcc/libffi/include
-diff -uNr plt-orig/src/mzscheme/dynsrc/Makefile.in plt/src/mzscheme/dynsrc/Makefile.in
---- plt-orig/src/mzscheme/dynsrc/Makefile.in	2006-01-11 04:15:36.000000000 -0500
-+++ plt/src/mzscheme/dynsrc/Makefile.in	2006-02-10 13:03:07.000000000 -0500
-@@ -16,10 +16,10 @@
- CFLAGS = @CFLAGS@ @COMPFLAGS@ @PREFLAGS@ -I$(builddir)/.. -I$(srcdir)/../include -I$(srcdir)/../src @MZOPTIONS@
- 
- dynlib:
--	$(MAKE) ../mzdyn.o
-+	$(MAKE) CFLAGS="$(CFLAGS) -fPIC" ../mzdyn.o
- 
- dynlib3m:
--	$(MAKE) ../mzdyn3m.o
-+	$(MAKE) CFLAGS="$(CFLAGS) -fPIC" ../mzdyn3m.o
- 
- dynexample:
- 	$(MAKE) ../dynexmpl.so
-diff -uNr plt-orig/src/mzscheme/gc/Makefile.in plt/src/mzscheme/gc/Makefile.in
---- plt-orig/src/mzscheme/gc/Makefile.in	2006-01-11 04:15:36.000000000 -0500
-+++ plt/src/mzscheme/gc/Makefile.in	2006-02-10 13:03:07.000000000 -0500
-@@ -10,7 +10,7 @@
- #      	 and runs some tests of collector and cords.  Does not add cords or
- #	 c++ interface to gc.a
- # cord/de - builds dumb editor based on cords.
--ABI_FLAG= 
-+ABI_FLAG= -fPIC
- CC= @CC@ $(ABI_FLAG)
- CXX= @CXX@ $(ABI_FLAG)
- AS= @AS@ $(ABI_FLAG)
-diff -uNr plt-orig/src/mzscheme/gc2/Makefile.in plt/src/mzscheme/gc2/Makefile.in
---- plt-orig/src/mzscheme/gc2/Makefile.in	2006-01-11 04:15:37.000000000 -0500
-+++ plt/src/mzscheme/gc2/Makefile.in	2006-02-10 13:03:07.000000000 -0500
-@@ -13,7 +13,7 @@
- ARFLAGS = @ARFLAGS@
- RANLIB = @RANLIB@
- 
--CPPFLAGS = @PREFLAGS@ @OPTIONS@ @GC2OPTIONS@ @MZOPTIONS@ -I$(builddir)/.. -I$(srcdir)/../include
-+CPPFLAGS = @PREFLAGS@ -fPIC @OPTIONS@ @GC2OPTIONS@ @MZOPTIONS@ -I$(builddir)/.. -I$(srcdir)/../include
- CFLAGS = @CFLAGS@ $(CPPFLAGS) @COMPFLAGS@ @PROFFLAGS@
- LIBS = @LIBS@
- 
diff --git a/dev-scheme/drscheme/files/drscheme-301-no-setfont.patch b/dev-scheme/drscheme/files/drscheme-301-no-setfont.patch
deleted file mode 100644
index 90858505d86a..000000000000
--- a/dev-scheme/drscheme/files/drscheme-301-no-setfont.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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)
diff --git a/dev-scheme/drscheme/files/drscheme-350-fPIC.patch b/dev-scheme/drscheme/files/drscheme-350-fPIC.patch
deleted file mode 100644
index f12555aec740..000000000000
--- a/dev-scheme/drscheme/files/drscheme-350-fPIC.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -ur plt.orig/collects/make/setup-extension.ss plt/collects/make/setup-extension.ss
---- plt.orig/collects/make/setup-extension.ss	2006-05-12 17:14:02.000000000 -0400
-+++ plt/collects/make/setup-extension.ss	2006-07-09 12:53:34.000000000 -0400
-@@ -191,7 +191,7 @@
-            current-extension-linker-flags 
-            (if is-win?
-                null
--               (list (format "-L~a/lib" (path->string sys-path))))
-+               (list "-fPIC" (format "-L~a/lib" (path->string sys-path))))
-            
-            ;; Add libs for Windows:
-            (with-new-flags
-diff -ur plt.orig/src/foreign/Makefile.in plt/src/foreign/Makefile.in
---- plt.orig/src/foreign/Makefile.in	2005-06-29 15:28:16.000000000 -0400
-+++ plt/src/foreign/Makefile.in	2006-07-09 12:53:34.000000000 -0400
-@@ -3,7 +3,7 @@
- srcdir = @srcdir@
- builddir = @builddir@
- CC = @CC@
--CFLAGS = @CFLAGS@ @COMPFLAGS@ @PREFLAGS@ @PROFFLAGS@ @OPTIONS@ @MZOPTIONS@ \
-+CFLAGS = @CFLAGS@ @COMPFLAGS@ @PREFLAGS@ @PROFFLAGS@ @OPTIONS@ @MZOPTIONS@ -fPIC \
-          -I$(builddir)/../mzscheme \
-          -I$(srcdir)/../mzscheme/include -I$(srcdir)/../mzscheme/src \
-          -Igcc/libffi/include
-diff -ur plt.orig/src/mzscheme/dynsrc/Makefile.in plt/src/mzscheme/dynsrc/Makefile.in
---- plt.orig/src/mzscheme/dynsrc/Makefile.in	2006-05-24 15:29:58.000000000 -0400
-+++ plt/src/mzscheme/dynsrc/Makefile.in	2006-07-09 12:54:47.000000000 -0400
-@@ -18,14 +18,14 @@
- CFLAGS = @CFLAGS@ @COMPFLAGS@ @PREFLAGS@ -I$(builddir)/.. -I$(srcdir)/../include -I$(srcdir)/../src @MZOPTIONS@
- 
- dynlib:
--	$(MAKE) ../mzdyn.o
-+	$(MAKE) CFLAGS="$(CFLAGS) -fPIC" ../mzdyn.o
- 	$(MAKE) ../starter
- 
- dynlib3m:
--	$(MAKE) ../mzdyn3m.o
-+	$(MAKE) CFLAGS="$(CFLAGS) -fPIC" ../mzdyn3m.o
- 
- dynexample:
--	$(MAKE) ../dynexmpl.so
-+	$(MAKE) CFLAGS="$(CFLAGS) -fPIC" ../dynexmpl.so
- 
- HEADERS = $(builddir)/../mzconfig.h \
-           $(srcdir)/../include/scheme.h $(srcdir)/../src/schemef.h \
-diff -ur plt.orig/src/mzscheme/gc/Makefile.in plt/src/mzscheme/gc/Makefile.in
---- plt.orig/src/mzscheme/gc/Makefile.in	2005-05-27 19:11:11.000000000 -0400
-+++ plt/src/mzscheme/gc/Makefile.in	2006-07-09 12:53:34.000000000 -0400
-@@ -10,7 +10,7 @@
- #      	 and runs some tests of collector and cords.  Does not add cords or
- #	 c++ interface to gc.a
- # cord/de - builds dumb editor based on cords.
--ABI_FLAG= 
-+ABI_FLAG= -fPIC
- CC= @CC@ $(ABI_FLAG)
- CXX= @CXX@ $(ABI_FLAG)
- AS= @AS@ $(ABI_FLAG)
-diff -ur plt.orig/src/mzscheme/gc2/Makefile.in plt/src/mzscheme/gc2/Makefile.in
---- plt.orig/src/mzscheme/gc2/Makefile.in	2006-06-11 09:02:10.000000000 -0400
-+++ plt/src/mzscheme/gc2/Makefile.in	2006-07-09 12:53:34.000000000 -0400
-@@ -13,7 +13,7 @@
- ARFLAGS = @ARFLAGS@
- RANLIB = @RANLIB@
- 
--CPPFLAGS = @PREFLAGS@ @OPTIONS@ @GC2OPTIONS@ @MZOPTIONS@ -I$(builddir)/.. -I$(srcdir)/../include
-+CPPFLAGS = @PREFLAGS@ -fPIC @OPTIONS@ @GC2OPTIONS@ @MZOPTIONS@ -I$(builddir)/.. -I$(srcdir)/../include
- CFLAGS = @CFLAGS@ $(CPPFLAGS) @COMPFLAGS@ @PROFFLAGS@
- LIBS = @LIBS@
- 
diff --git a/dev-scheme/drscheme/files/drscheme-352-destdir.patch b/dev-scheme/drscheme/files/drscheme-352-destdir.patch
deleted file mode 100644
index 721fcc3f586c..000000000000
--- a/dev-scheme/drscheme/files/drscheme-352-destdir.patch
+++ /dev/null
@@ -1,424 +0,0 @@
-Index: collects/setup/dirs.ss
-===================================================================
---- collects/setup/dirs.ss	(revision 4476)
-+++ collects/setup/dirs.ss	(revision 4477)
-@@ -1,42 +1,49 @@
- (module dirs mzscheme
-   (require (prefix config: (lib "config.ss" "config"))
--	   (lib "winutf16.ss" "compiler" "private")
--	   (lib "mach-o.ss" "compiler" "private"))
-+           (lib "winutf16.ss" "compiler" "private")
-+           (lib "mach-o.ss" "compiler" "private"))
- 
-   (provide (rename config:absolute-installation? absolute-installation?))
- 
-+  ;; path normalization is not really necessary by any existing code,
-+  ;; but there might be applications that rely on these paths, so it's
-+  ;; best to do some minor normalization.  This is similar to what
-+  ;; "main-collects.ss" does.  Again, this makes mzscheme expand paths
-+  ;; that begin with `~'.
-+  (define (system-path* what)
-+    (expand-path (simplify-path (find-system-path what) #f)))
-+
-   ;; ----------------------------------------
-   ;;  "collects"
- 
-   (define main-collects-dir
-     (delay
--      (let ([d (find-system-path 'collects-dir)])
--	(cond
--	 [(complete-path? d) d]
--	 [(absolute-path? d)
--	  ;; This happens only under Windows; add a drive
--	  ;;  specification to make the path complete
--	  (let ([exec (path->complete-path 
--		       (find-executable-path (find-system-path 'exec-file))
--		       (find-system-path 'orig-dir))])
--	    (let-values ([(base name dir?) (split-path exec)])
--	      (path->complete-path d base)))]
--	 [else
--	  ;; Relative to executable...
--	  (parameterize ([current-directory (find-system-path 'orig-dir)])
--	    (let ([p (or (find-executable-path (find-system-path 'exec-file) d #t)
--			 ;; If we get here, then we can't find the directory
--			 #f)])
--	      (and p
--		   (simplify-path p))))]))))
-+      (let ([d (system-path* 'collects-dir)])
-+        (cond
-+         [(complete-path? d) d]
-+         [(absolute-path? d)
-+          ;; This happens only under Windows; add a drive
-+          ;;  specification to make the path complete
-+          (let ([exec (path->complete-path
-+                       (find-executable-path (system-path* 'exec-file))
-+                       (system-path* 'orig-dir))])
-+            (let-values ([(base name dir?) (split-path exec)])
-+              (path->complete-path d base)))]
-+         [else
-+          ;; Relative to executable...
-+          (parameterize ([current-directory (system-path* 'orig-dir)])
-+            (let ([p (or (find-executable-path (system-path* 'exec-file) d #t)
-+                         ;; If we get here, then we can't find the directory
-+                         #f)])
-+              (and p (simplify-path p))))]))))
- 
-   (provide find-collects-dir
--	   find-user-collects-dir
--	   get-collects-search-dirs)
-+           find-user-collects-dir
-+           get-collects-search-dirs)
-   (define (find-collects-dir)
-     (force main-collects-dir))
-   (define user-collects-dir
--    (delay (build-path (find-system-path 'addon-dir) (version) "collects")))
-+    (delay (build-path (system-path* 'addon-dir) (version) "collects")))
-   (define (find-user-collects-dir)
-     (force user-collects-dir))
-   (define (get-collects-search-dirs)
-@@ -50,51 +57,47 @@
-   (define (combine-search l default)
-     ;; Replace #f in list with default path:
-     (if l
--	(let loop ([l l])
--	  (cond
--	   [(null? l) null]
--	   [(not (car l)) (append default (loop (cdr l)))]
--	   [else (cons (car l) (loop (cdr l)))]))
--	default))
-+        (let loop ([l l])
-+          (cond
-+           [(null? l) null]
-+           [(not (car l)) (append default (loop (cdr l)))]
-+           [else (cons (car l) (loop (cdr l)))]))
-+        default))
-   (define (cons-user u r)
--    (if (use-user-specific-search-paths) 
--	(cons u r)
--	r))
-+    (if (use-user-specific-search-paths) (cons u r) r))
- 
-   (define-syntax define-finder
-     (syntax-rules ()
-       [(_ provide config:id id user-id config:search-id search-id default)
-        (begin
--	 (define-finder provide config:id id user-id default)
--	 (provide search-id)
--	 (define (search-id)
--	   (combine-search (force config:search-id)
--			   (cons-user (user-id) (single (id))))))]
--      [(_ provide config:id id user-id config:search-id search-id extra-search-dir default)
-+         (define-finder provide config:id id user-id default)
-+         (provide search-id)
-+         (define (search-id)
-+           (combine-search (force config:search-id)
-+                           (cons-user (user-id) (single (id))))))]
-+      [(_ provide config:id id user-id config:search-id search-id
-+          extra-search-dir default)
-        (begin
--	 (define-finder provide config:id id user-id default)
--	 (provide search-id)
--	 (define (search-id)
--	   (combine-search (force config:search-id)
--			   (extra (extra-search-dir) 
--				  (cons-user (user-id) (single (id)))))))]
-+         (define-finder provide config:id id user-id default)
-+         (provide search-id)
-+         (define (search-id)
-+           (combine-search (force config:search-id)
-+                           (extra (extra-search-dir)
-+                                  (cons-user (user-id) (single (id)))))))]
-       [(_ provide config:id id user-id default)
-        (begin
--	 (provide id user-id)
--	 (define dir
--	   (delay
--	     (or (force config:id)
--		 (let ([p (find-collects-dir)])
--		   (and p
--			(simplify-path (build-path p
--						   'up
--						   default)))))))
--	 (define (id)
--	   (force dir))
--	 (define user-dir
--	   (delay (build-path (find-system-path 'addon-dir) (version) default)))
--	 (define (user-id)
--	   (force user-dir)))]))
-+         (provide id user-id)
-+         (define dir
-+           (delay
-+             (or (force config:id)
-+                 (let ([p (find-collects-dir)])
-+                   (and p (simplify-path (build-path p 'up default)))))))
-+         (define (id)
-+           (force dir))
-+         (define user-dir
-+           (delay (build-path (system-path* 'addon-dir) (version) default)))
-+         (define (user-id)
-+           (force user-dir)))]))
- 
-   (define-syntax no-provide (syntax-rules () [(_ . rest) (begin)]))
- 
-@@ -104,8 +107,8 @@
-   (define delayed-#f (delay #f))
- 
-   (provide find-doc-dir
--	   find-user-doc-dir
--	   get-doc-search-dirs)
-+           find-user-doc-dir
-+           get-doc-search-dirs)
-   (define-finder no-provide
-     config:doc-dir
-     find-doc-dir
-@@ -116,9 +119,9 @@
-   ;; For now, include "doc" pseudo-collections in search path:
-   (define (get-doc-search-dirs)
-     (combine-search (force config:doc-search-dirs)
--		    (append (get-new-doc-search-dirs)
--			    (map (lambda (p) (build-path p "doc"))
--				 (current-library-collection-paths)))))
-+                    (append (get-new-doc-search-dirs)
-+                            (map (lambda (p) (build-path p "doc"))
-+                                 (current-library-collection-paths)))))
- 
-   ;; ----------------------------------------
-   ;; "include"
-@@ -145,14 +148,14 @@
-   ;; ----------------------------------------
-   ;; Executables
- 
--  (define-finder provide 
-+  (define-finder provide
-     config:bin-dir
--    find-console-bin-dir 
-+    find-console-bin-dir
-     find-user-console-bin-dir
-     (case (system-type)
-       [(windows) 'same]
-       [(macosx unix) "bin"]))
--  
-+
-   (define-finder provide
-     config:bin-dir
-     find-gui-bin-dir
-@@ -163,64 +166,66 @@
- 
-   ;; ----------------------------------------
-   ;; DLLs
--  
-+
-   (provide find-dll-dir)
-   (define dll-dir
--    (delay (case (system-type)
--	     [(windows)
--	      ;; Extract "lib" location from binary:
--	      (let ([exe (parameterize ([current-directory (find-system-path 'orig-dir)])
--			   (find-executable-path (find-system-path 'exec-file)))])
--		(with-input-from-file exe
--		  (lambda ()
--		    (let ([m (regexp-match (byte-regexp 
--					    (bytes-append
--					     (bytes->utf-16-bytes #"dLl dIRECTORy:")
--					     #"((?:..)*?)\0\0"))
--					   (current-input-port))])
--		      (unless m (error "cannot find \"dLl dIRECTORy\" tag in binary"))
--		      (let-values ([(dir name dir?) (split-path exe)])
--			(if (regexp-match #rx#"^<" (cadr m))
--			    ;; no DLL dir in binary
--			    #f
--			    ;; resolve relative directory:
--			    (let ([p (bytes->path (utf-16-bytes->bytes (cadr m)))])
--			      (path->complete-path p dir))))))))]
--	     [(macosx)
--	      (let ([exe (parameterize ([current-directory (find-system-path 'orig-dir)])
--			   (let loop ([p (find-executable-path (find-system-path 'exec-file))])
--			     (if (link-exists? p)
--				 (loop (let-values ([(r) (resolve-path p)]
--						    [(dir name dir?) (split-path p)])
--					 (if (and (path? dir)
--						  (relative-path? r))
--					     (build-path dir r)
--					     r)))
--				 p)))])
--		(let ([rel (get/set-dylib-path exe "PLT_M[rz]" #f)])
--		  (if rel
--		      (cond
--		       [(regexp-match #rx#"^(@executable_path/)?(.*?)PLT_M(?:rEd|zScheme).framework" rel)
--			=> (lambda (m)
--			     (let ([b (caddr m)])
--			       (if (and (not (cadr m))
--					(bytes=? b #""))
--				   #f ; no path in exe
--				   (simplify-path
--				    (path->complete-path (if (not (cadr m))
--							     (bytes->path b)
--							     (let-values ([(dir name dir?) (split-path exe)])
--							       (if (bytes=? b #"")
--								   dir
--								   (build-path dir (bytes->path b)))))
--							 (find-system-path 'orig-dir))))))]
--		       [else (find-lib-dir)])
--		      ;; no framework reference found!?
--		      #f)))]
--	     [else
--	      (if (eq? 'shared (system-type 'link))
--		  (or (force config:dll-dir)
--		      (find-lib-dir))
--		  #f)])))
-+    (delay
-+      (case (system-type)
-+        [(windows)
-+         ;; Extract "lib" location from binary:
-+         (let ([exe (parameterize ([current-directory (system-path* 'orig-dir)])
-+                      (find-executable-path (system-path* 'exec-file)))])
-+           (with-input-from-file exe
-+             (lambda ()
-+               (let ([m (regexp-match (byte-regexp
-+                                       (bytes-append
-+                                        (bytes->utf-16-bytes #"dLl dIRECTORy:")
-+                                        #"((?:..)*?)\0\0"))
-+                                      (current-input-port))])
-+                 (unless m
-+                   (error "cannot find \"dLl dIRECTORy\" tag in binary"))
-+                 (let-values ([(dir name dir?) (split-path exe)])
-+                   (if (regexp-match #rx#"^<" (cadr m))
-+                     ;; no DLL dir in binary
-+                     #f
-+                     ;; resolve relative directory:
-+                     (let ([p (bytes->path (utf-16-bytes->bytes (cadr m)))])
-+                       (path->complete-path p dir))))))))]
-+        [(macosx)
-+         (let* ([exe (parameterize ([current-directory (system-path* 'orig-dir)])
-+                       (let loop ([p (find-executable-path
-+                                      (system-path* 'exec-file))])
-+                         (if (link-exists? p)
-+                           (loop (let-values ([(r) (resolve-path p)]
-+                                              [(dir name dir?) (split-path p)])
-+                                   (if (and (path? dir)
-+                                            (relative-path? r))
-+                                     (build-path dir r)
-+                                     r)))
-+                           p)))]
-+                [rel (get/set-dylib-path exe "PLT_M[rz]" #f)])
-+           (cond
-+             [(not rel) #f] ; no framework reference found!?
-+             [(regexp-match
-+               #rx#"^(@executable_path/)?(.*?)PLT_M(?:rEd|zScheme).framework"
-+               rel)
-+              => (lambda (m)
-+                   (let ([b (caddr m)])
-+                     (if (and (not (cadr m)) (bytes=? b #""))
-+                       #f ; no path in exe
-+                       (simplify-path
-+                        (path->complete-path
-+                         (if (not (cadr m))
-+                           (bytes->path b)
-+                           (let-values ([(dir name dir?) (split-path exe)])
-+                             (if (bytes=? b #"")
-+                               dir
-+                               (build-path dir (bytes->path b)))))
-+                         (system-path* 'orig-dir))))))]
-+             [else (find-lib-dir)]))]
-+        [else
-+         (if (eq? 'shared (system-type 'link))
-+           (or (force config:dll-dir) (find-lib-dir))
-+           #f)])))
-   (define (find-dll-dir)
-     (force dll-dir)))
-Index: collects/setup/main-collects.ss
-===================================================================
---- collects/setup/main-collects.ss	(revision 4476)
-+++ collects/setup/main-collects.ss	(revision 4477)
-@@ -1,16 +1,16 @@
- (module main-collects mzscheme
-   (require "dirs.ss")
--  
-+
-   (provide path->main-collects-relative
--	   main-collects-relative->path)
--  
-+           main-collects-relative->path)
-+
-   ;; Historical note: this module is based on the old "plthome.ss"
- 
-   ;; The `path->main-collects-relative' and
-   ;; `main-collects-relative->path' functions are used to store paths
-   ;; that are relative to the main "collects" directory, such as in
-   ;; .dep files.  This means that if the plt tree is moved, .dep files
--  ;; still work. It is generally fine if
-+  ;; still work.  It is generally fine if
-   ;; `path->main-collects-relative' misses some usages, as long as it
-   ;; works when we prepare a distribution tree.  Otherwise, things
-   ;; will continue to work fine and .dep files will just contain
-@@ -18,27 +18,25 @@
-   ;; either a pathname or a pair with a pathname in its cdr; the
-   ;; `path->main-collects-relative' pathname will itself be a pair.
- 
-+  ;; we need to compare paths to find when something is in the plt
-+  ;; tree -- this does some basic "normalization" that should work
-+  ;; fine: getting rid of `.' and `..' (simplify-path) and collapsing
-+  ;; `//' to `/' (expand-path).  Using `expand-path' also expands `~'
-+  ;; and `~user', but this should not be a problem in practice.
-   (define (simplify-bytes-path bytes)
--    (path->bytes (simplify-path (bytes->path bytes))))
--
-+    (path->bytes (expand-path (simplify-path (bytes->path bytes)))))
-+  ;; on Windows, turn backslashes to forward slashes
-   (define simplify-path*
-     (if (eq? 'windows (system-type))
--	(lambda (str)
--	  (regexp-replace* #rx#"\\\\" (simplify-bytes-path str) #"/"))
-+	(lambda (bytes)
-+          (simplify-bytes-path (regexp-replace* #rx#"\\\\" bytes #"/")))
- 	simplify-bytes-path))
- 
--  (define main-collects-dir-bytes
--    (delay (and (find-collects-dir)
--		(path->bytes (find-collects-dir)))))
--
-   (define main-collects-dir/
--    (delay (and (force main-collects-dir-bytes)
--		(regexp-replace #rx#"/?$" 
--				(simplify-path* (force main-collects-dir-bytes))
--				#"/"))))
--  (define main-collects-dir/-len
--    (delay (and (force main-collects-dir/)
--		(bytes-length (force main-collects-dir/)))))
-+    (delay (let ([dir (find-collects-dir)])
-+             (and dir (regexp-replace #rx#"/*$"
-+                                      (simplify-path* (path->bytes dir))
-+                                      #"/")))))
- 
-   (define (maybe-cdr-op fname f)
-     (lambda (x)
-@@ -53,14 +51,15 @@
-                        [else (error 'path->main-collects-relative
-                                     "expecting a byte-string, got ~e" path)])]
-            [path* (simplify-path* path)]
--	   [mcd-len (force main-collects-dir/-len)])
-+           [main-collects-dir/ (force main-collects-dir/)]
-+	   [mcd-len (bytes-length main-collects-dir/)])
-       (cond [(and path*
- 		  mcd-len
-                   (> (bytes-length path*) mcd-len)
-                   (equal? (subbytes path* 0 mcd-len)
--			  (force main-collects-dir/)))
-+			  main-collects-dir/))
-              (cons 'collects (subbytes path* mcd-len))]
--            [(equal? path* (force main-collects-dir/)) (cons 'collects #"")]
-+            [(equal? path* main-collects-dir/) (cons 'collects #"")]
-             [else path])))
- 
-   ;; main-collects-relative->path* : datum-containing-bytes-or-path -> path
-@@ -77,6 +76,8 @@
-           [(bytes? path) (bytes->path path)]
-           [else path]))
- 
--  (define path->main-collects-relative (maybe-cdr-op 'path->main-collects-relative path->main-collects-relative*))
--  (define main-collects-relative->path (maybe-cdr-op 'main-collects-relative->path main-collects-relative->path*))
-+  (define path->main-collects-relative
-+    (maybe-cdr-op 'path->main-collects-relative path->main-collects-relative*))
-+  (define main-collects-relative->path
-+    (maybe-cdr-op 'main-collects-relative->path main-collects-relative->path*))
-   )
diff --git a/dev-scheme/drscheme/files/drscheme-360-DESTDIR-3m.patch b/dev-scheme/drscheme/files/drscheme-360-DESTDIR-3m.patch
deleted file mode 100644
index 533f05c881f5..000000000000
--- a/dev-scheme/drscheme/files/drscheme-360-DESTDIR-3m.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/mred/Makefile.in.orig	2006-11-21 16:41:53.000000000 -0500
-+++ src/mred/Makefile.in	2006-11-21 16:42:16.000000000 -0500
-@@ -289,11 +289,11 @@
- 	echo "no dynamic libs"
- 
- install-lib3m:
--	cd ..; $(ICP) mred/libmred3m.@LIBSFX@ "$(libdir)"
-+	cd ..; $(ICP) mred/libmred3m.@LIBSFX@ "$(DESTDIR)$(libdir)"
- 
- install-3m_wx_xt:
--	cd ..; $(ICP) mred/mred3m "$(bindir)"
--	$(MZSCHEME) -mvqu "$(srcdir)/../mzscheme/collects-path.ss" "$(bindir)/mred3m@EXE_SUFFIX@" @COLLECTS_PATH@
-+	cd ..; $(ICP) mred/mred3m "$(DESTDIR)$(bindir)"
-+	$(MZSCHEME) -mvqu "$(srcdir)/../mzscheme/collects-path.ss" "$(DESTDIR)$(bindir)/mred3m@EXE_SUFFIX@" @COLLECTS_PATH@
- 	$(MAKE) @MRLIBINSTALL@3m
- 
- install-3m_wx_mac:
diff --git a/dev-scheme/drscheme/reversion.patch b/dev-scheme/drscheme/reversion.patch
deleted file mode 100644
index c3b28288ea36..000000000000
--- a/dev-scheme/drscheme/reversion.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- drscheme-372-r1.ebuild	2008-06-03 12:45:14.000000000 +0200
-+++ drscheme-0.372-r1.ebuild	2008-06-28 16:25:28.000000000 +0200
-@@ -4,6 +4,9 @@
- 
- inherit eutils latex-package
- 
-+#reversion for 4.0.x
-+PV=${PV/0./}
-+
- SRC_URI="http://download.plt-scheme.org/bundles/${PV}/plt/plt-${PV}-src-unix.tgz
- 		 http://pre.plt-scheme.org/installers/plt-${PV}-src-unix.tgz"
- #"mirror://gentoo/plt-${PV%%_p*}-src-unix.tgz"