[gentoo-commits] proj/lisp:master commit in: dev-scheme/racket/files/, dev-scheme/racket/

[Cyprien Nicolas]

commit:     8dae9e0442eb371308178fe65f924f61c03f5b59
Author:     Cyprien Nicolas (fulax) <c.nicolas+gentoo <AT> gmail <DOT> com>
AuthorDate: Tue Feb 22 19:16:30 2011 +0000
Commit:     Cyprien Nicolas <c.nicolas+gentoo <AT> gmail <DOT> com>
CommitDate: Tue Feb 22 19:16:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=8dae9e04

dev-scheme/racket: Bump to 5.1

---
 ...ch => racket-5.1-hack_makefile_in_temp01.patch} |   12 ++--
 .../{racket-5.0.2.ebuild => racket-5.1.ebuild}     |   50 +++++++-------------
 2 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/dev-scheme/racket/files/racket-5.0.2-hack_makefile_in_temp01.patch b/dev-scheme/racket/files/racket-5.1-hack_makefile_in_temp01.patch
similarity index 81%
rename from dev-scheme/racket/files/racket-5.0.2-hack_makefile_in_temp01.patch
rename to dev-scheme/racket/files/racket-5.1-hack_makefile_in_temp01.patch
index 3164d9f..df40d72 100644
--- a/dev-scheme/racket/files/racket-5.0.2-hack_makefile_in_temp01.patch
+++ b/dev-scheme/racket/files/racket-5.1-hack_makefile_in_temp01.patch
@@ -14,15 +14,15 @@ diff -u -r a/Makefile.in b/Makefile.in
 diff -u -r a/gracket/Makefile.in b/gracket/Makefile.in
 --- a/gracket/Makefile.in	2010-03-17 20:22:01.000000000 +0200
 +++ b/gracket/Makefile.in	2010-04-19 14:50:10.000000000 +0300
-@@ -280,8 +280,6 @@
- 	$(MAKE) install-@WXVARIANT@-post-collects
+@@ -164,8 +164,6 @@
  
- install-common:
+ install-wx_xt:
+ 	$(MAKE) install-common
 -	cd ..; rm -f "$(DESTDIR)$(bindir)/gracket@CGC_INSTALLED@"
 -	cd ..; rm -f "$(DESTDIR)$(bindir)/gracket@MMM_INSTALLED@"
- 	cd ..; echo 'CXX=@CXX@' >> $(BUILDINFO)
- 	cd ..; echo 'CXXFLAGS=@CXXFLAGS@ @PREFLAGS@ @COMPFLAGS@' >> $(BUILDINFO)
  	cd ..; echo 'MROPTIONS=@MROPTIONS@' >> $(BUILDINFO)
+ 	cd ..; echo "MRLIBS=$(GUILIBS_@WXVARIANT@)" >> $(BUILDINFO)
+ 	cd ..; echo "MRLDFLAGS=$(GRACKETLDFLAGS)" >> $(BUILDINFO)
 diff -u -r a/racket/Makefile.in b/racket/Makefile.in
 --- a/racket/Makefile.in	2010-03-17 20:22:06.000000000 +0200
 +++ b/racket/Makefile.in	2010-04-19 14:49:49.000000000 +0300
@@ -34,4 +34,4 @@ diff -u -r a/racket/Makefile.in b/racket/Makefile.in
 -	cd ..; rm -f "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@"
  	cd ..; cp racket/starter "$(DESTDIR)$(libpltdir)/starter"
  	cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libpltdir)/starter"
- 	cd ..; echo 'CC=@CC@' > "$(BUILDINFO)"
+ 	./racket@CGC@ -cu "$(srcdir)/collects-path.rkt" "$(DESTDIR)$(libpltdir)/starter" @COLLECTS_PATH@

diff --git a/dev-scheme/racket/racket-5.0.2.ebuild b/dev-scheme/racket/racket-5.1.ebuild
similarity index 70%
rename from dev-scheme/racket/racket-5.0.2.ebuild
rename to dev-scheme/racket/racket-5.1.ebuild
index 69ab47b..7657cad 100644
--- a/dev-scheme/racket/racket-5.0.2.ebuild
+++ b/dev-scheme/racket/racket-5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI="4"
 
 inherit eutils
 
@@ -15,6 +15,8 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="-backtrace cairo cgc doc opengl profile X slatex sgc -futures -places +foreign static -plain"
 # jit
+REQUIRED_USE="cgc? ( !sgc )"
+
 RDEPEND="X? ( x11-libs/libX11
 			x11-libs/libXaw
 			x11-libs/libXft
@@ -26,14 +28,11 @@ RDEPEND="X? ( x11-libs/libX11
 		slatex? ( virtual/latex-base )
 		!dev-scheme/plt-scheme"
 DEPEND="${RDEPEND}"
-S="${WORKDIR}/${P}/src/build"
-ECONF_SOURCE="${S}/.."
+
+S="${WORKDIR}/${P}/src"
 MY_PNUM="01"
 
 pkg_setup() {
-	if use cgc && use sgc ; then
-		die "You cannot use both cgc and sgc USE flags, you have to choose one of them"
-	fi
 	for my_flag in backtrace futures places
 	do
 		if use "${my_flag}" ; then
@@ -49,27 +48,12 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	mkdir -v "${S}" || die "failed to create build dir"
-}
-
 src_prepare() {
-	#( cd .. && rm -Rv wxcommon && rm -Rv foreign ) \
-	#|| die "failed to remove dir of bundled libraries"
-	#rm -Rv ../wxcommon/{jpeg,libpng,zlib} ../../collects  \
-	#|| die "failed to remove dir of bundled libraries"
-	#rm -Rv ../wxcommon/{jpeg,libpng,zlib} ../wxxt \
-	rm -Rv ../wxcommon/{jpeg,libpng,zlib} \
-		|| die "failed to remove dir of bundled libraries"
-	sed -i -e "s/docdir=\"\${datadir}\/racket\/doc\"/docdir=\"\${datadir}\/doc\/${PF}\"/" ../configure || die "sed failed"
-	pushd ..
+	sed -i -e "s/docdir=\"\${datadir}\/racket\/doc\"/docdir=\"\${datadir}\/doc\/${PF}\"/" configure || die "sed failed"
+	# Fix LDFLAGS issue for the starter binary
+	sed -i -e 's:CFLAGS) -o ../starter:CFLAGS) @LDFLAGS@ -o ../starter:' racket/dynsrc/Makefile.in || die 'sed starter LDFLAGS failed'
+	# Patch for allowing plain-install, and some other fixes I don't know the origin
 	epatch "${FILESDIR}/${P}-hack_makefile_in_temp${MY_PNUM}.patch"
-	popd
-	#sed -i -e 's/#! \/bin\/sh/#! \/bin\/sh -x/g' ../configure \
-	#|| die "sed failed"
-	sed -i -e 's:CFLAGS) -o ../starter:CFLAGS) @LDFLAGS@ -o ../starter:' \
-		../racket/dynsrc/Makefile.in || die 'sed starter LDFLAGS failed'
 }
 
 src_configure() {
@@ -117,18 +101,20 @@ src_install() {
 	# From boost-1.42.0-r2.ebuild
 	local jobs=$( echo " ${MAKEOPTS} " | \
 		sed -e 's/ --jobs[= ]/ -j /g' \
-		-e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \
-		-e 's/ -j\>/ -j1/g' | \
+			-e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \
+			-e 's/ -j\>/ -j1/g' | \
 		( while read -d ' ' j ; do if [[ "${j#-j}" = "$j" ]]; then continue; fi; jobs="${j#-j}"; done; echo ${jobs} ) )
 	if [[ "${jobs}" != "" ]]; then NUMJOBS="-j "${jobs}; fi;
 
-	time emake DESTDIR="${D}" PLT_SETUP_OPTIONS="${NUMJOBS}" "${pla1n}"install || die "emake install failed"
+	time emake DESTDIR="${D}" PLT_SETUP_OPTIONS="${NUMJOBS}" \
+		"${pla1n}"install || die "emake install failed"
 	if use cgc || use sgc ; then
-		time emake DESTDIR="${D}" "${pla1n}"install-cgc || die "emake cgc target failed"
+		time emake DESTDIR="${D}" PLT_SETUP_OPTIONS="${NUMJOBS}" \
+			"${pla1n}"install-cgc || die "emake cgc target failed"
 	fi
 	if use X; then
-		newicon ../../collects/icons/PLT-206.png drscheme.png
-		make_desktop_entry drscheme "DrScheme" drscheme "Development"
+		newicon ../collects/icons/PLT-206.png drracket.png
+		make_desktop_entry drracket "DrRacket" drracket "Development"
 	fi
 	# deal with slatex
 	if use slatex; then
@@ -138,7 +124,7 @@ src_install() {
 			popd
 		fi
 		insinto /usr/share/texmf/tex/latex/slatex/
-		newins ../../collects/slatex/slatex.sty plt-slatex.sty
+		newins ../collects/slatex/slatex.sty plt-slatex.sty
 	else
 		if ! use plain; then
 			rm -Rfv "${D}"/usr/bin/*slatex* || die "Failed to delete slatex files"