Re-instate llvm-2.5, needed for stable languagekit, update dependencies

svn path=/overlay/; revision=422

11 files changed, 251 insertions, 8 deletions

diff --git a/gnustep-libs/languagekit/Manifest b/gnustep-libs/languagekit/Manifest
index 532d4a3..a9ac6a1 100644
--- a/gnustep-libs/languagekit/Manifest
+++ b/gnustep-libs/languagekit/Manifest
@@ -1,2 +1,2 @@
 DIST etoile-0.4.1.tar.bz2 8281449 RMD160 f7965102a42e8616007baf89f4d11019aa12ef99 SHA1 b87af57c4a39aa939bee9ae883092bc86d942014 SHA256 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
-EBUILD languagekit-0.4.1.ebuild 586 RMD160 025f0bc070aba8c6cbb45e765c399dd54249d82e SHA1 183edf0c46265dad700b2139084fd417ad3fb4ca SHA256 38e9fe0b2c6a3ea8a34100b9978ab83fbec666476ca0c969c355a0465552a6b6
+EBUILD languagekit-0.4.1.ebuild 626 RMD160 67851be920dfeae1c9080070d9fe12868efab692 SHA1 47a3633aab5e80eba96cb772462d275927e717f7 SHA256 988f0f20438354b913f48af254dea96760604f02fe963d3054847ac1eeedfc7b
diff --git a/gnustep-libs/languagekit/languagekit-0.4.1.ebuild b/gnustep-libs/languagekit/languagekit-0.4.1.ebuild
index c878e03..18a9708 100644
--- a/gnustep-libs/languagekit/languagekit-0.4.1.ebuild
+++ b/gnustep-libs/languagekit/languagekit-0.4.1.ebuild
@@ -16,5 +16,6 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=">=gnustep-base/gnustep-gui-0.16.0
-	>=sys-devel/llvm-2.4"
+	>=gnustep-libs/etoile-foundation-${PV}
+	<=sys-devel/llvm-2.5"
 RDEPEND="${DEPEND}"
diff --git a/gnustep-libs/smalltalkkit/Manifest b/gnustep-libs/smalltalkkit/Manifest
index dec90c2..78e6e7d 100644
--- a/gnustep-libs/smalltalkkit/Manifest
+++ b/gnustep-libs/smalltalkkit/Manifest
@@ -1,3 +1,3 @@
 DIST etoile-0.4.1.tar.bz2 8281449 RMD160 f7965102a42e8616007baf89f4d11019aa12ef99 SHA1 b87af57c4a39aa939bee9ae883092bc86d942014 SHA256 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
 DIST sqlite-3.6.2.tar.gz 2313114 RMD160 db83f50ef72083905983b8fac6fcb3070a002d54 SHA1 5408632b484d8e471e4a323e9c98dcdc08504bda SHA256 cb07a9801a128e2f42cf49b7e9d577b092ab54aa05242655af93491a73a91a1f
-EBUILD smalltalkkit-0.4.1.ebuild 1121 RMD160 e0de9a3066ebdc4377710427653cff81417f6e41 SHA1 b591b73d109ed0566a695ae30d430e9e25475a4c SHA256 cd6ff88908ec561986a6f07cfa8bf9732e2259eabb0f5e810e5db7dde8917ef6
+EBUILD smalltalkkit-0.4.1.ebuild 1081 RMD160 f53ccbba725f5edecaa08ba8595d51511cb2a96f SHA1 d05f18dacce447171f180f836fb8c50e3b9d6967 SHA256 33b2208bb473e1a920774a878568acc758939923b9711f4a4475b8bf1af5180b
diff --git a/gnustep-libs/smalltalkkit/smalltalkkit-0.4.1.ebuild b/gnustep-libs/smalltalkkit/smalltalkkit-0.4.1.ebuild
index fc641e6..8d542dd 100644
--- a/gnustep-libs/smalltalkkit/smalltalkkit-0.4.1.ebuild
+++ b/gnustep-libs/smalltalkkit/smalltalkkit-0.4.1.ebuild
@@ -20,7 +20,6 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=">=gnustep-base/gnustep-gui-0.16.0
-	>=gnustep-libs/etoile-foundation-${PV}
 	>=gnustep-libs/languagekit-${PV}"
 RDEPEND="${DEPEND}"
 
diff --git a/metadata/cache/gnustep-libs/languagekit-0.4.1 b/metadata/cache/gnustep-libs/languagekit-0.4.1
index c749f5d..647d381 100644
--- a/metadata/cache/gnustep-libs/languagekit-0.4.1
+++ b/metadata/cache/gnustep-libs/languagekit-0.4.1
@@ -1,5 +1,5 @@
->=gnustep-base/gnustep-gui-0.16.0 >=sys-devel/llvm-2.4 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
->=gnustep-base/gnustep-gui-0.16.0 >=sys-devel/llvm-2.4 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
+>=gnustep-base/gnustep-gui-0.16.0 >=gnustep-libs/etoile-foundation-0.4.1 <=sys-devel/llvm-2.5 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+>=gnustep-base/gnustep-gui-0.16.0 >=gnustep-libs/etoile-foundation-0.4.1 <=sys-devel/llvm-2.5 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
 0
 http://download.gna.org/etoile/etoile-0.4.1.tar.bz2
 
diff --git a/metadata/cache/gnustep-libs/smalltalkkit-0.4.1 b/metadata/cache/gnustep-libs/smalltalkkit-0.4.1
index d7c2e19..548d930 100644
--- a/metadata/cache/gnustep-libs/smalltalkkit-0.4.1
+++ b/metadata/cache/gnustep-libs/smalltalkkit-0.4.1
@@ -1,5 +1,5 @@
->=gnustep-base/gnustep-gui-0.16.0 >=gnustep-libs/etoile-foundation-0.4.1 >=gnustep-libs/languagekit-0.4.1 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
->=gnustep-base/gnustep-gui-0.16.0 >=gnustep-libs/etoile-foundation-0.4.1 >=gnustep-libs/languagekit-0.4.1 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
+>=gnustep-base/gnustep-gui-0.16.0 >=gnustep-libs/languagekit-0.4.1 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+>=gnustep-base/gnustep-gui-0.16.0 >=gnustep-libs/languagekit-0.4.1 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
 0
 http://download.gna.org/etoile/etoile-0.4.1.tar.bz2 http://www.sqlite.org/sqlite-3.6.2.tar.gz
 
diff --git a/metadata/cache/sys-devel/llvm-2.5 b/metadata/cache/sys-devel/llvm-2.5
new file mode 100644
index 0000000..1fbc35b
--- /dev/null
+++ b/metadata/cache/sys-devel/llvm-2.5
@@ -0,0 +1,22 @@
+dev-lang/perl >=sys-devel/make-3.79 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.28 >=sys-devel/gcc-3.0
+dev-lang/perl
+0
+http://llvm.org/releases/2.5/llvm-2.5.tar.gz
+mirror
+http://llvm.org/
+LLVM
+Low Level Virtual Machine
+~amd64 ~ppc ~x86
+eutils multilib portability toolchain-funcs
+debug alltargets pic
+
+
+
+
+
+compile install setup unpack
+
+
+
+
+
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
new file mode 100644
index 0000000..94041c8
--- /dev/null
+++ b/sys-devel/llvm/Manifest
@@ -0,0 +1,4 @@
+AUX llvm-2.3-disable-strip.patch 529 RMD160 f422ef955e196291dfdb9b44e8920e25b54a8dce SHA1 9e182792d2a5dac3fd541a3e6462399322ce31cd SHA256 d6409688ca95689bcf27b5c1ba290b65485d77fb207c0f83883e9c62caa1780f
+AUX llvm-2.3-dont-build-hello.patch 392 RMD160 c76b0bebd54cf41e43c3a19aa39db0348d56cd33 SHA1 a41937d986a48cd55c0b1f5465a81689e6890f51 SHA256 72bb268722d280d3bef338f3f9d125786cdf6a4912acf9151e376a1e904a9cfa
+DIST llvm-2.5.tar.gz 6660609 RMD160 2c904b8d0bcce565ed11114b921321a0404e23fe SHA1 67f4bace9e64cc39255583aa837470d9b9de0aa5 SHA256 8f3d69e63bc5d1ee2c2ee49ff07ccb7e070070a0e937813d2a6179b9e2e173ed
+EBUILD llvm-2.5.ebuild 5576 RMD160 a6a0175b8f60dcad2b546c8997f460e10c5eb813 SHA1 3ad0437909e4cf6e2a711ca0ff7653155cd4148f SHA256 95293653bf7bada49d24a97273ee5325100e2eb8fb2d12033e36b60a51292e2e
diff --git a/sys-devel/llvm/files/llvm-2.3-disable-strip.patch b/sys-devel/llvm/files/llvm-2.3-disable-strip.patch
new file mode 100644
index 0000000..aeff886
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-2.3-disable-strip.patch
@@ -0,0 +1,19 @@
+--- Makefile.rules.orig	2008-08-21 10:54:42.000000000 +0300
++++ Makefile.rules	2008-08-21 10:55:27.000000000 +0300
+@@ -398,11 +398,11 @@
+ endif
+ 
+ # By default, strip symbol information from executable
+-ifndef KEEP_SYMBOLS
+-  Strip := $(PLATFORMSTRIPOPTS)
+-  StripWarnMsg := "(without symbols)"
+-  Install.StripFlag += -s
+-endif
++#ifndef KEEP_SYMBOLS
++#  Strip := $(PLATFORMSTRIPOPTS)
++#  StripWarnMsg := "(without symbols)"
++#  Install.StripFlag += -s
++#endif
+ 
+ # Adjust linker flags for building an executable
+ ifdef TOOLNAME
diff --git a/sys-devel/llvm/files/llvm-2.3-dont-build-hello.patch b/sys-devel/llvm/files/llvm-2.3-dont-build-hello.patch
new file mode 100644
index 0000000..9011b8e
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-2.3-dont-build-hello.patch
@@ -0,0 +1,11 @@
+--- lib/Transforms/Makefile.orig	2008-08-21 12:37:27.000000000 +0300
++++ lib/Transforms/Makefile	2007-12-29 22:09:26.000000000 +0200
+@@ -8,7 +8,7 @@
+ ##===----------------------------------------------------------------------===##
+ 
+ LEVEL = ../..
+-PARALLEL_DIRS = Utils Instrumentation Scalar IPO Hello
++PARALLEL_DIRS = Utils Instrumentation Scalar IPO
+ 
+ include $(LEVEL)/Makefile.common
+ 
diff --git a/sys-devel/llvm/llvm-2.5.ebuild b/sys-devel/llvm/llvm-2.5.ebuild
new file mode 100644
index 0000000..dc94a63
--- /dev/null
+++ b/sys-devel/llvm/llvm-2.5.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils toolchain-funcs 
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="http://llvm.org/"
+SRC_URI="http://llvm.org/releases/${PV}/llvm-${PV}.tar.gz"
+
+LICENSE="LLVM"
+# most part of LLVM fall under the "University of Illinois Open Source License"
+# which doesn't seem to exist in portage yet, so I call it 'LLVM' for now.  it
+# can be read from llvm/LICENSE.TXT in the source tarball.
+
+# the directory llvm/runtime/GCCLibraries/libc contains a stripped down C
+# library licensed under the LGPL 2.1 with some third party copyrights, see the
+# two LICENCE* files in that directory.  Those parts do *not* get built, so
+# we omit LGPL in ${LICENCE}
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="debug alltargets pic"
+# 'jit' is not a flag anymore.  at least on x86, disabling it saves nothing
+# at all, so having it always enabled for platforms that support it is fine
+
+# we're not mirrored, fetch from homepage
+RESTRICT="mirror"
+
+DEPEND="dev-lang/perl
+		>=sys-devel/make-3.79
+		>=sys-devel/flex-2.5.4
+		>=sys-devel/bison-1.28
+		>=sys-devel/gcc-3.0
+        "
+RDEPEND="dev-lang/perl"
+PDEPEND=""
+# note that app-arch/pax is no longer a dependency
+
+S="${WORKDIR}/llvm-${PV}"
+
+pkg_setup() {
+	
+	broken_gcc=( 3.2.2 3.2.3 3.3.2 4.1.1 )
+	broken_gcc_x86=( 3.4.0 3.4.2 )
+	broken_gcc_amd64=( 3.4.6 )
+	
+	gcc_vers=`gcc-fullversion`
+	
+	for version in ${broken_gcc[@]}
+	do
+		if [ "$gcc_vers" = "$version" ]; then
+			elog "Your version of gcc is known to miscompile llvm"
+			elog "check http://www.llvm.org/docs/GettingStarted.html for \
+possible solutions"
+			die "Your version of gcc is known to miscompile llvm" 
+		fi
+	done
+
+	if use x86; then
+		for version in ${broken_gcc_x86[@]}
+		do
+			if [ "$gcc_vers" = "$version" ]; then
+				elog "Your version of gcc is known to miscompile llvm in x86 \
+architectures"
+				elog "check http://www.llvm.org/docs/GettingStarted.html for \
+possible solutions"
+				die "Your version of gcc is known to miscompile llvm" 
+			fi
+		done
+	fi
+
+	if use amd64; then
+		for version in ${broken_gcc_amd64[@]}
+		do
+			if [ "$gcc_vers" = "$version" ]; then
+				elog "Your version of gcc is known to miscompile llvm in amd64 \
+architectures"
+				elog "check http://www.llvm.org/docs/GettingStarted.html for \
+possible solutions"
+				die "Your version of gcc is known to miscompile llvm" 
+			fi
+		done
+	fi
+
+	broken_bison=( 1.85 1.875 )
+
+	for version in ${broken_bison[@]}
+	do
+		if [ $(bison --version | head -n1 | cut -f4 -d" ") = "$version" ]; then
+			elog "Your version of Bison is known not to work with llvm, please \
+upgrade to a newer version"
+			die "Your version of Bison is known not to work with llvm"
+		fi
+	done
+
+
+	buggy_ld=( 2.16 2.17 )
+
+	for version in ${buggy_ld[@]}
+	do
+		if [ $(ld --version | head -n1 | cut -f5 -d" ") = "$version" ]; then
+			ewarn "Your version of Binutils is known to be problematic with \
+llvm -> llvm team recommends upgrading"
+		fi
+	done
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# unfortunately ./configure won't listen to --mandir and the-like, so take
+	# care of this.
+	einfo "Fixing install dirs"
+	sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(DESTDIR)$(PROJ_prefix)/share/doc/'${PF}, \
+		-e 's,^PROJ_etcdir.*,PROJ_etcdir := $(DESTDIR)/etc/llvm,' \
+		-i Makefile.config.in || die "sed failed"
+
+	# fix gccld and gccas, which would otherwise point to the build directory
+	einfo "Fixing gccld and gccas"
+	sed -e 's,^TOOLDIR.*,TOOLDIR=/usr/bin,' \
+		-i tools/gccld/gccld.sh tools/gccas/gccas.sh || die "sed failed"
+
+	# all binaries get rpath'd to a dir in the temporary tree that doesn't
+	# contain libraries anyway; can safely remove those to avoid QA warnings
+	# (the exception would be if we build shared libraries, which we don't)
+	einfo "Fixing rpath"
+	sed -e 's,-rpath \$(ToolDir),,g' -i Makefile.rules || die "sed failed"
+
+	epatch "${FILESDIR}"/llvm-2.3-dont-build-hello.patch
+	epatch "${FILESDIR}"/llvm-2.3-disable-strip.patch
+}
+
+
+src_compile() {
+	local CONF_FLAGS=""
+
+	if use debug; then
+		CONF_FLAGS="${CONF_FLAGS} --disable-optimized"
+		einfo "Note: Compiling LLVM in debug mode will create huge and slow binaries"
+		# ...and you probably shouldn't use tmpfs, unless it can hold 900MB
+	else
+		CONF_FLAGS="${CONF_FLAGS} --enable-optimized --disable-assertions \
+--disable-expensive-checks"
+	fi
+	
+	if use alltargets; then
+		CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
+	else
+		CONF_FLAGS="${CONF_FLAGS} --enable-targets=host-only"
+	fi
+
+	if use amd64 || use pic; then
+		CONF_FLAGS="${CONF_FLAGS} --enable-pic"
+	fi
+
+	# a few minor things would be built a bit differently depending on whether
+	# llvm-gcc is already present on the system or not.  let's avoid that by
+	# not letting it find llvm-gcc.  llvm-gcc isn't required for anything
+	# anyway.  this dummy path will get spread to a few places, but none where
+	# it really matters.
+	CONF_FLAGS="${CONF_FLAGS} --with-llvmgccdir=/dev/null"
+
+	econf ${CONF_FLAGS} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install()
+{
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# for some reason, LLVM creates a few .dir files.  remove them
+	find "${D}" -name .dir -print0 | xargs -r0 rm
+
+	# tblgen does not get installed and wouldn't be very useful anyway
+	# so remove their man pages.  llvmgcc.1 and llvmgxx.1 are present here for
+	# unknown reasons.  llvm-gcc will install proper man pages for itself, so
+	# remove them here
+	einfo "Removing unnecessary man pages"
+	rm "${D}"/usr/share/man/man1/{tblgen,llvmgcc,llvmgxx}.1
+
+}
+
+