Keep one major version for older releases

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

3 files changed, 5 insertions, 246 deletions

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index 8a49fc9ee930..f6f514f683e2 100644
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/clang
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.111 2014/09/07 11:12:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.112 2014/11/26 16:08:36 voyageur Exp $
+
+  26 Nov 2014; Bernard Cafarelli <voyageur@gentoo.org> -clang-3.3.ebuild,
+  -clang-3.4.1-r100.ebuild:
+  Keep one major version for older releases
 
 *clang-3.5.0-r100 (07 Sep 2014)
 
diff --git a/sys-devel/clang/clang-3.3.ebuild b/sys-devel/clang/clang-3.3.ebuild
deleted file mode 100644
index 6ff1ff328762..000000000000
--- a/sys-devel/clang/clang-3.3.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.3.ebuild,v 1.4 2014/03/31 21:20:04 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
-
-inherit eutils multilib python-r1
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="http://clang.llvm.org/"
-# Fetching LLVM as well: see http://llvm.org/bugs/show_bug.cgi?id=4840
-SRC_URI="http://llvm.org/releases/${PV}/llvm-${PV}.src.tar.gz
-	http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.gz
-	http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug kernel_FreeBSD multitarget python +static-analyzer test"
-
-DEPEND="static-analyzer? ( dev-lang/perl )
-	${PYTHON_DEPS}"
-RDEPEND="~sys-devel/llvm-${PV}[debug=,multitarget=]
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}/llvm-${PV}.src
-
-src_prepare() {
-	rm -f "${S}"/tools/clang "${S}"/projects/compiler-rt \
-		|| die "symlinks removal failed"
-	mv "${WORKDIR}"/cfe-${PV}.src "${S}"/tools/clang \
-		|| die "clang source directory move failed"
-	mv "${WORKDIR}"/compiler-rt-${PV}.src "${S}"/projects/compiler-rt \
-		|| die "compiler-rt source directory move failed"
-
-	# Same as llvm doc patches
-	epatch "${FILESDIR}"/${PN}-2.7-fixdoc.patch
-
-	# multilib-strict
-	sed -e "/PROJ_headers\|HeaderDir/s#lib/clang#$(get_libdir)/clang#" \
-		-i tools/clang/lib/Headers/Makefile \
-		|| die "clang Makefile sed failed"
-	sed -e "/PROJ_resources\|ResourceDir/s#lib/clang#$(get_libdir)/clang#" \
-		-i tools/clang/runtime/compiler-rt/Makefile \
-		|| die "compiler-rt Makefile sed failed"
-	sed -e "s#/lib/#/lib{{(32|64)?}}/#" \
-		-i tools/clang/test/Preprocessor/iwithprefix.c \
-		|| die "clang test sed failed"
-	# fix the static analyzer for in-tree install
-	sed -e 's/import ScanView/from clang \0/'  \
-		-i tools/clang/tools/scan-view/scan-view \
-		|| die "scan-view sed failed"
-	sed -e "/scanview.css\|sorttable.js/s#\$RealBin#${EPREFIX}/usr/share/${PN}#" \
-		-i tools/clang/tools/scan-build/scan-build \
-		|| die "scan-build sed failed"
-	# Set correct path for gold plugin and coverage lib
-	sed -e "/LLVMgold.so/s#lib/#$(get_libdir)/llvm/#" \
-		-e "s#lib\(/libprofile_rt.a\)#$(get_libdir)/llvm\1#" \
-		-i  tools/clang/lib/Driver/Tools.cpp \
-		|| die "Tools.cpp paths sed failed"
-
-	# From llvm src_prepare
-	einfo "Fixing install dirs"
-	sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \
-		-e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \
-		-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/llvm, \
-		-i Makefile.config.in || die "Makefile.config sed failed"
-
-	einfo "Fixing rpath and CFLAGS"
-	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/llvm, \
-		-e '/OmitFramePointer/s/-fomit-frame-pointer//' \
-		-i Makefile.rules || die "rpath sed failed"
-
-	# Use system llc (from llvm ebuild) for tests
-	sed -e "/^llc_props =/s/os.path.join(llvm_tools_dir, 'llc')/'llc'/" \
-		-i tools/clang/test/lit.cfg  || die "test path sed failed"
-
-	# Automatically select active system GCC's libraries, bugs #406163 and #417913
-	epatch "${FILESDIR}"/${PN}-3.1-gentoo-runtime-gcc-detection-v3.patch
-
-	# Fix search paths on FreeBSD, bug #409269
-	# This patch causes problem for multilib on fbsd, see comments in the patch
-	# (aballier@g.o)
-	# epatch "${FILESDIR}"/${PN}-3.1-gentoo-freebsd-fix-lib-path.patch
-
-	# Fix regression caused by removal of USE=system-cxx-headers, bug #417541
-	# Needs to be updated for 3.2
-	#epatch "${FILESDIR}"/${PN}-3.1-gentoo-freebsd-fix-cxx-paths-v2.patch
-
-	# User patches
-	epatch_user
-}
-
-src_configure() {
-	local CONF_FLAGS="--enable-shared
-		--with-optimize-option=
-		$(use_enable !debug optimized)
-		$(use_enable debug assertions)
-		$(use_enable debug expensive-checks)
-		--with-clang-resource-dir=../$(get_libdir)/clang/${PV/_rc*}"
-
-	# Setup the search path to include the Prefix includes
-	if use prefix ; then
-		CONF_FLAGS="${CONF_FLAGS} \
-			--with-c-include-dirs=${EPREFIX}/usr/include:/usr/include"
-	fi
-
-	if use multitarget; then
-		CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
-	else
-		CONF_FLAGS="${CONF_FLAGS} --enable-targets=host,cpp"
-	fi
-
-	if use amd64; then
-		CONF_FLAGS="${CONF_FLAGS} --enable-pic"
-	fi
-
-	# build with a suitable Python version
-	python_export_best
-
-	# clang prefers clang over gcc, so we may need to force that
-	tc-export CC CXX
-	econf ${CONF_FLAGS}
-}
-
-src_compile() {
-	emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 clang-only
-}
-
-src_test() {
-	cd "${S}"/tools/clang || die "cd clang failed"
-
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-	if ! emake -j1 VERBOSE=1 test; then
-		has test $FEATURES && die "Make test failed. See above for details."
-		has test $FEATURES || eerror "Make test failed. See above for details."
-	fi
-}
-
-src_install() {
-	cd "${S}"/tools/clang || die "cd clang failed"
-	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install
-
-	if use static-analyzer ; then
-		dobin tools/scan-build/ccc-analyzer
-		dosym ccc-analyzer /usr/bin/c++-analyzer
-		dobin tools/scan-build/scan-build
-
-		insinto /usr/share/${PN}
-		doins tools/scan-build/scanview.css
-		doins tools/scan-build/sorttable.js
-	fi
-
-	python_inst() {
-		if use static-analyzer ; then
-			pushd tools/scan-view >/dev/null || die
-
-			python_doscript scan-view
-
-			touch __init__.py || die
-			python_moduleinto clang
-			python_domodule __init__.py Reporter.py Resources ScanView.py startfile.py
-
-			popd >/dev/null || die
-		fi
-
-		if use python ; then
-			pushd bindings/python/clang >/dev/null || die
-
-			python_moduleinto clang
-			python_domodule __init__.py cindex.py enumerations.py
-
-			popd >/dev/null || die
-		fi
-
-		# AddressSanitizer symbolizer (currently separate)
-		python_doscript "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
-	}
-	python_foreach_impl python_inst
-
-	# Fix install_names on Darwin.  The build system is too complicated
-	# to just fix this, so we correct it post-install
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		for lib in libclang.dylib ; do
-			ebegin "fixing install_name of $lib"
-			install_name_tool -id "${EPREFIX}"/usr/lib/llvm/${lib} \
-				"${ED}"/usr/lib/llvm/${lib}
-			eend $?
-		done
-		for f in usr/bin/{c-index-test,clang} usr/lib/llvm/libclang.dylib ; do
-			ebegin "fixing references in ${f##*/}"
-			install_name_tool \
-				-change "@rpath/libclang.dylib" \
-					"${EPREFIX}"/usr/lib/llvm/libclang.dylib \
-				-change "@executable_path/../lib/libLLVM-${PV}.dylib" \
-					"${EPREFIX}"/usr/lib/llvm/libLLVM-${PV}.dylib \
-				-change "${S}"/Release/lib/libclang.dylib \
-					"${EPREFIX}"/usr/lib/llvm/libclang.dylib \
-				"${ED}"/$f
-			eend $?
-		done
-	fi
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	use kernel_FreeBSD && rm "${ED}"usr/$(get_libdir)/clang/${PV}/include/{arm_neon,std,float,iso,limits,tgmath,varargs}*.h
-}
diff --git a/sys-devel/clang/clang-3.4.1-r100.ebuild b/sys-devel/clang/clang-3.4.1-r100.ebuild
deleted file mode 100644
index e191bcf49146..000000000000
--- a/sys-devel/clang/clang-3.4.1-r100.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.4.1-r100.ebuild,v 1.1 2014/05/09 21:10:44 mgorny Exp $
-
-EAPI=5
-
-inherit multilib-build
-
-DESCRIPTION="C language family frontend for LLVM (meta-ebuild)"
-HOMEPAGE="http://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="UoI-NCSA"
-SLOT="0/3.4"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug multitarget python +static-analyzer"
-
-RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget?,python?,static-analyzer,${MULTILIB_USEDEP}]"
-
-# Please keep this package around since it's quite likely that we'll
-# return to separate LLVM & clang ebuilds when the cmake build system
-# is complete.
-
-pkg_postinst() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" ; then
-		#add ccache links as clang might get installed after ccache
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
-
-pkg_postrm() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" && [[ -z ${REPLACED_BY_VERSION} ]]; then
-		# --remove-links would remove all links, --install-links updates them
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}