Modify DEPEND on x11-libs/libXft to depend on 2.1.12 or higher, fixes bug #152564.

Package-Manager: portage-2.1.2_rc4-r5

diff --git a/dev-scheme/drscheme/Manifest b/dev-scheme/drscheme/Manifest
index 3ddcdb251b2fe769cccc964f793d27abc1559d30..26cee4acdbd96f240fbd49eb0658dcb33a9aa5ba 100644 (file)
--- a/dev-scheme/drscheme/Manifest
+++ b/dev-scheme/drscheme/Manifest
@@ -25,22 +25,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-r2.ebuild 2343 RMD160 c3e4d5f07215662d37a0eaa0267076fbc70795ee SHA1 b77858d40a1760323c0669160345bcb506bc3d3f SHA256 5c509574cb56a46e50fe095e3d81fc54011ed78de22485b2de825d9215ddc73d
-MD5 f77e7c2097eacb08413cfe06b76c0af7 drscheme-352-r2.ebuild 2343
-RMD160 c3e4d5f07215662d37a0eaa0267076fbc70795ee drscheme-352-r2.ebuild 2343
-SHA256 5c509574cb56a46e50fe095e3d81fc54011ed78de22485b2de825d9215ddc73d drscheme-352-r2.ebuild 2343
-EBUILD drscheme-360-r1.ebuild 2446 RMD160 4d0637270da5b09526a483bca0c2c56307befa07 SHA1 636215a42567549b6937b7e2ccf5bb7754166dff SHA256 1ed19f18cf243515f8bb849a6a6c7a6096440db20a76f3d4f2ee41ac93fb0725
-MD5 e173c34b317499ce4715f556c2c5f566 drscheme-360-r1.ebuild 2446
-RMD160 4d0637270da5b09526a483bca0c2c56307befa07 drscheme-360-r1.ebuild 2446
-SHA256 1ed19f18cf243515f8bb849a6a6c7a6096440db20a76f3d4f2ee41ac93fb0725 drscheme-360-r1.ebuild 2446
-EBUILD drscheme-360.ebuild 2099 RMD160 7229c2f875687ac70e56b7b77f2f8b7f66eb10e0 SHA1 602ec8a94c3090cb248a6ec93a125acddd93bc7a SHA256 6aac575f41561869b44291846b8c7b543a5924feeaf00b32ded19b7055512b4a
-MD5 098594b2e9dde8aa258fc41a12bc2a61 drscheme-360.ebuild 2099
-RMD160 7229c2f875687ac70e56b7b77f2f8b7f66eb10e0 drscheme-360.ebuild 2099
-SHA256 6aac575f41561869b44291846b8c7b543a5924feeaf00b32ded19b7055512b4a drscheme-360.ebuild 2099
-MISC ChangeLog 8420 RMD160 e715314d7ace98f163a7cca2fbae75f0138d237d SHA1 0c479023d343f765b9b74e5e92574a3bd650551b SHA256 cf8b61b341248eae22291152f4c67a4ac276466e935214268ac182adcbb31b3b
-MD5 5c048491e8b132ab18d3dae8f767ae18 ChangeLog 8420
-RMD160 e715314d7ace98f163a7cca2fbae75f0138d237d ChangeLog 8420
-SHA256 cf8b61b341248eae22291152f4c67a4ac276466e935214268ac182adcbb31b3b ChangeLog 8420
+EBUILD drscheme-352-r2.ebuild 2345 RMD160 2eb712d2c70060d3cda9de10ff6456fdff521c5a SHA1 ca0e43a2d4156ed4737b43a563c55d00fb13dc30 SHA256 1d988120dca41783fb5d91471b4ea5be2071616159ed0ce184145b0d5427bfa1
+MD5 116caf847ce7cf927b8f0106a5a91b28 drscheme-352-r2.ebuild 2345
+RMD160 2eb712d2c70060d3cda9de10ff6456fdff521c5a drscheme-352-r2.ebuild 2345
+SHA256 1d988120dca41783fb5d91471b4ea5be2071616159ed0ce184145b0d5427bfa1 drscheme-352-r2.ebuild 2345
+EBUILD drscheme-360-r1.ebuild 2448 RMD160 9bcdd97c3747df8b543ce4d9322649b7c0f95a43 SHA1 c46d54ec5f7cb7adf7074ef0eba10c922d19cc12 SHA256 5bfd37e63ff1e58ac62794767a9044fd0e4b03168135d8e536dacf3e2cbfddf7
+MD5 4330036ecc1af91ea09ff2ddc5f4fd0b drscheme-360-r1.ebuild 2448
+RMD160 9bcdd97c3747df8b543ce4d9322649b7c0f95a43 drscheme-360-r1.ebuild 2448
+SHA256 5bfd37e63ff1e58ac62794767a9044fd0e4b03168135d8e536dacf3e2cbfddf7 drscheme-360-r1.ebuild 2448
+MISC ChangeLog 8632 RMD160 5e7ab7909933757361917fc0962cff317b0b7fd9 SHA1 27056205ae501eda64af7cbe8fda9e864bd38a5d SHA256 4934ee2ea393a8c2c890b2ab78504c7a6506c51dbc7871f3edd13840284918a5
+MD5 8307adf5469f445f37fb8b4fb733a7c1 ChangeLog 8632
+RMD160 5e7ab7909933757361917fc0962cff317b0b7fd9 ChangeLog 8632
+SHA256 4934ee2ea393a8c2c890b2ab78504c7a6506c51dbc7871f3edd13840284918a5 ChangeLog 8632
 MISC metadata.xml 694 RMD160 ab738064eeb10e5a01c1f2a9040da48b5f68d244 SHA1 32c314fc3597aa38f9724b26f05ae9494d8b3309 SHA256 b63c1d1ae1adc89c062f612f797abf9e0933fc67725d301558f27832bd8c875d
 MD5 274a7900f799811ad11e1a827bb4b23e metadata.xml 694
 RMD160 ab738064eeb10e5a01c1f2a9040da48b5f68d244 metadata.xml 694
@@ -51,9 +47,6 @@ SHA256 751aa53e4159ea7d464ed7c599b8468066b2ea79d23dba37c5e8da3a1fcde30e files/di
 MD5 a1fd9a94240b69cf1b11096444087dfc files/digest-drscheme-352-r2 247
 RMD160 be8d76e43b5a96c9c854186bb3433ef927572341 files/digest-drscheme-352-r2 247
 SHA256 3626e34922727e412cd03d958e6ec1e77c78839907511a783e1d2c98d99ce18d files/digest-drscheme-352-r2 247
-MD5 4253bc04f83435329a2dfce659e14cbc files/digest-drscheme-360 247
-RMD160 05b648cd1be988209b1c082600ced169393f4547 files/digest-drscheme-360 247
-SHA256 3fd8f8a4e4b61de05637b39ef8d6e7f31564cf9c1f0a04cf2f2637f7cb089a65 files/digest-drscheme-360 247
 MD5 4253bc04f83435329a2dfce659e14cbc files/digest-drscheme-360-r1 247
 RMD160 05b648cd1be988209b1c082600ced169393f4547 files/digest-drscheme-360-r1 247
 SHA256 3fd8f8a4e4b61de05637b39ef8d6e7f31564cf9c1f0a04cf2f2637f7cb089a65 files/digest-drscheme-360-r1 247

diff --git a/dev-scheme/drscheme/drscheme-360.ebuild b/dev-scheme/drscheme/drscheme-360.ebuild
deleted file mode 100644 (file)
index edea7e8..0000000
--- a/dev-scheme/drscheme/drscheme-360.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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-360.ebuild,v 1.2 2006/11/21 23:12:24 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-2.1.9
-       !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"
-GL_COLLECTS="sgl games/gobblet games/checkers games/jewel games/gl-board-game"
-
-src_unpack() {
-       unpack ${A}
-       cd "${WORKDIR}/plt-${PV}"
-
-       epatch "${FILESDIR}/${PN}-350-fPIC.patch"
-}
-
-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-360 b/dev-scheme/drscheme/files/digest-drscheme-360
deleted file mode 100644 (file)
index d327f48..0000000
--- a/dev-scheme/drscheme/files/digest-drscheme-360
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 84bcab3ff30c333ae3c6b732518bdf27 plt-360-src-unix.tgz 14106005
-RMD160 cbe045f26f429d7df85540f09135c90bde45f84c plt-360-src-unix.tgz 14106005
-SHA256 014cd5c91231a5b6dd67c90ca9d2c26a7466abe0d072a37a40a605b29870f3bd plt-360-src-unix.tgz 14106005