Drop 2.6 version

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 5 insertions, 206 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 356a59f2831a..a79ef056dc36 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.14 2010/06/01 21:25:28 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.15 2010/07/20 09:25:26 voyageur Exp $
+
+  20 Jul 2010; Bernard Cafarelli <voyageur@gentoo.org> -llvm-2.6-r2.ebuild,
+  -files/llvm-2.6-cflags.patch:
+  Drop 2.6 version
 
 *llvm-9999 (01 Jun 2010)
 
diff --git a/sys-devel/llvm/files/llvm-2.6-cflags.patch b/sys-devel/llvm/files/llvm-2.6-cflags.patch
deleted file mode 100644
index fbc09657917f..000000000000
--- a/sys-devel/llvm/files/llvm-2.6-cflags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- Makefile.rules.orig	2010-03-18 18:12:25.000000000 +0100
-+++ Makefile.rules	2010-03-18 18:15:56.000000000 +0100
-@@ -284,24 +284,9 @@
- #--------------------------------------------------------------------
- 
- CPP.Defines :=
--# OPTIMIZE_OPTION - The optimization level option we want to build LLVM with
--# this can be overridden on the make command line.
--ifndef OPTIMIZE_OPTION
--  ifneq ($(HOST_OS),MingW)
--    OPTIMIZE_OPTION := -O3
--  else
--    OPTIMIZE_OPTION := -O2
--  endif
--endif
- 
- ifeq ($(ENABLE_OPTIMIZED),1)
-   BuildMode := Release
--  # Don't use -fomit-frame-pointer on Darwin or FreeBSD.
--  ifneq ($(HOST_OS),FreeBSD)
--  ifneq ($(HOST_OS),Darwin)
--    OmitFramePointer := -fomit-frame-pointer
--  endif
--  endif
- 
-   # Darwin requires -fstrict-aliasing to be explicitly enabled.
-   # Avoid -fstrict-aliasing on Darwin for now, there are unresolved issues
-@@ -309,9 +294,6 @@
-   #ifeq ($(HOST_OS),Darwin)
-   #  EXTRA_OPTIONS += -fstrict-aliasing -Wstrict-aliasing
-   #endif
--  CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
--  C.Flags   += $(OPTIMIZE_OPTION) $(OmitFramePointer)
--  LD.Flags  += $(OPTIMIZE_OPTION)
- else
-   BuildMode := Debug
-   CXX.Flags += -g
diff --git a/sys-devel/llvm/llvm-2.6-r2.ebuild b/sys-devel/llvm/llvm-2.6-r2.ebuild
deleted file mode 100644
index 27af2862c0d9..000000000000
--- a/sys-devel/llvm/llvm-2.6-r2.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.6-r2.ebuild,v 1.3 2010/06/01 19:29:46 voyageur Exp $
-
-EAPI="2"
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="http://llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alltargets debug +libffi llvm-gcc ocaml test udis86"
-
-DEPEND="dev-lang/perl
-	>=sys-devel/make-3.79
-	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.28
-	!~sys-devel/bison-1.85
-	!~sys-devel/bison-1.875
-	>=sys-devel/gcc-3.0
-	>=sys-devel/binutils-2.18
-	libffi? ( virtual/libffi )
-	ocaml? ( dev-lang/ocaml )
-	test? ( dev-util/dejagnu )
-	udis86? ( dev-libs/udis86 )"
-RDEPEND="dev-lang/perl"
-
-S=${WORKDIR}/${PN}-${PV/_pre*}
-
-pkg_setup() {
-	# need to check if the active compiler is ok
-
-	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)
-
-	if [[ ${broken_gcc} == *" ${version} "* ]] ; then
-		elog "Your version of gcc is known to miscompile llvm."
-		elog "Check http://www.llvm.org/docs/GettingStarted.html for"
-		elog "possible solutions."
-		die "Your currently active version of gcc is known to miscompile llvm"
-	fi
-
-	if [[ ${CHOST} == i*86-* && ${broken_gcc_x86} == *" ${version} "* ]] ; then
-		elog "Your version of gcc is known to miscompile llvm on x86"
-		elog "architectures.  Check"
-		elog "http://www.llvm.org/docs/GettingStarted.html for possible"
-		elog "solutions."
-		die "Your currently active version of gcc is known to miscompile llvm"
-	fi
-
-	if [[ ${CHOST} == x86_64-* && ${broken_gcc_amd64} == *" ${version} "* ]];
-	then
-		 elog "Your version of gcc is known to miscompile llvm in amd64"
-		 elog "architectures.  Check"
-		 elog "http://www.llvm.org/docs/GettingStarted.html for possible"
-		 elog "solutions."
-		die "Your currently active version of gcc is known to miscompile llvm"
-	 fi
-}
-
-src_prepare() {
-	# 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,' \
-		-e 's,^PROJ_libdir.*,PROJ_libdir := $(DESTDIR)/usr/'$(get_libdir), \
-		-i Makefile.config.in || die "sed failed"
-
-	# this points by default 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"
-
-	einfo "Fixing rpath"
-	sed -e 's/\$(RPATH) -Wl,\$(\(ToolDir\|LibDir\))//g' -i Makefile.rules || die "sed failed"
-
-	# Fix docs installation
-	sed -e '/^NO_INSTALL_MANS/s/$/$(DST_MAN_DIR)tblgen.1 $(DST_MAN_DIR)llvmgcc.1 $(DST_MAN_DIR)llvmgxx.1/' \
-		-i docs/CommandGuide/Makefile || die "manpages sed failed"
-	epatch "${FILESDIR}"/${PN}-2.6-nodoctargz.patch
-	epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch
-
-	# Buggy test, http://llvm.org/bugs/show_bug.cgi?id=5047
-	rm test/DebugInfo/2009-01-15-dbg_declare.ll
-
-	# Do not force -O3 -fomit-frame-pointer on users
-	epatch "${FILESDIR}"/${PN}-2.6-cflags.patch
-}
-
-src_configure() {
-	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; then
-		CONF_FLAGS="${CONF_FLAGS} --enable-pic"
-	fi
-
-	# things would be built differently depending on whether llvm-gcc is
-	# used or not.
-	local LLVM_GCC_DIR=/dev/null
-	local LLVM_GCC_DRIVER=nope ; local LLVM_GPP_DRIVER=nope
-	if use llvm-gcc ; then
-		if has_version sys-devel/llvm-gcc; then
-			LLVM_GCC_DIR=$(ls -d ${ROOT}/usr/$(get_libdir)/llvm-gcc* 2> /dev/null)
-			LLVM_GCC_DRIVER=$(find ${LLVM_GCC_DIR} -name 'llvm*-gcc' 2> /dev/null)
-			if [[ -z ${LLVM_GCC_DRIVER} ]] ; then
-				die "failed to find installed llvm-gcc, LLVM_GCC_DIR=${LLVM_GCC_DIR}"
-			fi
-			einfo "Using $LLVM_GCC_DRIVER"
-			LLVM_GPP_DRIVER=${LLVM_GCC_DRIVER/%-gcc/-g++}
-		else
-			eerror "llvm-gcc USE flag enabled, but sys-devel/llvm-gcc was not found"
-			eerror "Building with standard gcc, re-merge this package after installing"
-			eerror "llvm-gcc to build with it"
-			eerror "This is normal behavior on first LLVM merge"
-		fi
-	fi
-
-	CONF_FLAGS="${CONF_FLAGS} \
-		--with-llvmgccdir=${LLVM_GCC_DIR} \
-		--with-llvmgcc=${LLVM_GCC_DRIVER} \
-		--with-llvmgxx=${LLVM_GPP_DRIVER}"
-
-	if use ocaml; then
-		CONF_FLAGS="${CONF_FLAGS} --enable-bindings=ocaml"
-	else
-		CONF_FLAGS="${CONF_FLAGS} --enable-bindings=none"
-	fi
-
-	# --without-udis86 does not work
-	if use udis86; then
-		CONF_FLAGS="${CONF_FLAGS} --with-udis86"
-	fi
-
-	CONF_FLAGS="${CONF_FLAGS} $(use_enable libffi)"
-	econf ${CONF_FLAGS} || die "econf failed"
-}
-
-src_compile() {
-	emake VERBOSE=1 KEEP_SYMBOLS=1 || die "emake failed"
-}
-
-src_install() {
-	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed"
-}