bump

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

4 files changed, 141 insertions, 2 deletions

diff --git a/dev-scheme/drscheme/ChangeLog b/dev-scheme/drscheme/ChangeLog
index 53d1f86c0e2e..11d98d5fc685 100644
--- a/dev-scheme/drscheme/ChangeLog
+++ b/dev-scheme/drscheme/ChangeLog
@@ -1,6 +1,12 @@
 # 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.69 2008/09/18 01:47:16 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/ChangeLog,v 1.70 2008/11/04 20:58:47 hkbst Exp $
+
+*drscheme-4.1.2 (04 Nov 2008)
+
+  04 Nov 2008; Marijn Schouten <hkBst@gentoo.org>
+  +files/drscheme-4.1.2-as_needed.patch, +drscheme-4.1.2.ebuild:
+  bump
 
   18 Sep 2008; Brent Baude <ranger@gentoo.org> drscheme-4.1.ebuild:
   Marking drscheme-4.1 ppc for bug 229915
diff --git a/dev-scheme/drscheme/Manifest b/dev-scheme/drscheme/Manifest
index 86dfeb9a89ef..85dcc53d7aca 100644
--- a/dev-scheme/drscheme/Manifest
+++ b/dev-scheme/drscheme/Manifest
@@ -5,6 +5,7 @@ AUX drscheme-350-fPIC.patch 2979 RMD160 9382e8fc9ad56cad49eda737b7bc3ee558db4b4c
 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
@@ -12,6 +13,7 @@ DIST plt-372-src-unix.tgz 15267684 RMD160 d5caa01a6aec222fabe08733221d8a29a18fe9
 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
@@ -23,7 +25,8 @@ EBUILD drscheme-372-r1.ebuild 2240 RMD160 70c3a0dc39953b625284830d4dd3fa5c5cbc39
 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 12942 RMD160 1c49ff29bdde77c7b0d0b6866e8fa0b378712252 SHA1 55da5ec7ce7e8922c0c0292b2222117456ef83eb SHA256 8dcfb88468b1dbc5d2a8f3517270a02c48fe2032d2e42f2229b77dec4f169fbd
+MISC ChangeLog 13095 RMD160 52706de1ba019a4a631df3ba277f09a4dcebc3e8 SHA1 fae3357a83c097a5f457b2aed175cc045bd55283 SHA256 e3ba80a69de3c7afd649f99ead4d9a8db10e4ec6fb5a11affbfc82871384df1d
 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-4.1.2.ebuild b/dev-scheme/drscheme/drscheme-4.1.2.ebuild
new file mode 100644
index 000000000000..302e537e0225
--- /dev/null
+++ b/dev-scheme/drscheme/drscheme-4.1.2.ebuild
@@ -0,0 +1,94 @@
+# 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-4.1.2.ebuild,v 1.1 2008/11/04 20:58:47 hkbst 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*}"
+
+pkg_setup() {
+	if use cairo && use X; then
+		if ! built_with_use x11-libs/cairo X; then
+			eerror "Cairo must be built with X use flag"
+			die "Cairo must be built with X use flag"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed "s,docdir=\"\${datadir}/plt/doc,docdir=\"\${datadir}/doc/${PF}," -i src/configure
+
+	epatch "${FILESDIR}/${PN}-4.1.2-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 both || die "emake both failed"
+	else
+		emake || 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/files/drscheme-4.1.2-as_needed.patch b/dev-scheme/drscheme/files/drscheme-4.1.2-as_needed.patch
new file mode 100644
index 000000000000..e1ab970c93ca
--- /dev/null
+++ b/dev-scheme/drscheme/files/drscheme-4.1.2-as_needed.patch
@@ -0,0 +1,36 @@
+diff -Naur plt-372.orig/src/configure plt-372/src/configure
+--- plt-372.orig/src/configure	2008-06-01 15:25:38.000000000 +0200
++++ plt-372/src/configure	2008-06-01 15:32:21.000000000 +0200
+@@ -5390,7 +5390,8 @@
+   Linux)
+     LIBS="$LIBS -rdynamic"
+     DYN_CFLAGS="-fPIC"
+     GC_THREADS_FLAG="-DGC_LINUX_THREADS"
++    LIBMZSCHEME_DEP="-ldl -lm"
+     # PPC: X11 librares are not found
+     case `$UNAME -m` in
+       ppc)
+diff -Naur plt-372.orig/src/mred/Makefile.in plt-372/src/mred/Makefile.in
+--- plt-372.orig/src/mred/Makefile.in	2008-06-01 15:25:37.000000000 +0200
++++ plt-372/src/mred/Makefile.in	2008-06-01 20:33:27.000000000 +0200
+@@ -125,7 +125,7 @@
+ 	$(MREDLINKER) $(MREDLDFLAGS) $(MRSTATIC) -o mred@CGC@ $(MREDOBJECTS) $(MREDLDLIBS) $(MRSTATIC_STUB)
+ 
+ libmred.@LIBSFX@: $(WXLIBSNORM)
+-	$(AR) $(ARFLAGS) libmred.@LIBSFX@ $(WXLIBSNORM) @LIBMRED_DEP@
++	$(AR) $(ARFLAGS) libmred.@LIBSFX@ $(WXLIBSNORM) @LIBMRED_DEP@ @LDFLAGS@ $(LDLIBS)
+ 
+ MRFW = PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd
+ MRFWRES = PLT_MrEd.framework/Versions/$(FWVERSION)/Resources/PLT_MrEd.rsrc
+diff -Naur plt-372.orig/src/mzscheme/gc2/Makefile.in plt-372/src/mzscheme/gc2/Makefile.in
+--- plt-372.orig/src/mzscheme/gc2/Makefile.in	2008-06-01 15:25:38.000000000 +0200
++++ plt-372/src/mzscheme/gc2/Makefile.in	2008-06-01 20:32:00.000000000 +0200
+@@ -310,7 +310,7 @@
+ EXTRA_OBJS_L = ../src/gmp.@LTO@ @FOREIGN_OBJSLIB_IF_USED@
+ 
+ ../libmzscheme3m.@LIBSFX@: $(OBJS) $(EXTRA_OBJS_T)
+-	$(AR) $(ARFLAGS) ../libmzscheme3m.@LIBSFX@ $(OBJS) $(EXTRA_OBJS_L)
++	$(AR) $(ARFLAGS) ../libmzscheme3m.@LIBSFX@ $(OBJS) $(EXTRA_OBJS_L) @LDFLAGS@ $(LIBS)
+ 	$(RANLIB) ../libmzscheme3m.@LIBSFX@
+ 
+ ../mzscheme@MMM@@NOT_OSX@: main.@LTO@ ../libmzscheme3m.@LIBSFX@