2.8 version bump

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

4 files changed, 149 insertions, 76 deletions

diff --git a/sys-devel/llvm-gcc/ChangeLog b/sys-devel/llvm-gcc/ChangeLog
index 7ddd7315ee0c..bf94606f1056 100644
--- a/sys-devel/llvm-gcc/ChangeLog
+++ b/sys-devel/llvm-gcc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/llvm-gcc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm-gcc/ChangeLog,v 1.8 2010/08/26 07:04:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm-gcc/ChangeLog,v 1.9 2010/10/06 09:17:40 voyageur Exp $
+
+*llvm-gcc-2.8 (06 Oct 2010)
+
+  06 Oct 2010; Bernard Cafarelli <voyageur@gentoo.org> -llvm-gcc-2.6.ebuild,
+  +llvm-gcc-2.8.ebuild:
+  2.8 version bump
 
   26 Aug 2010; Fabian Groffen <grobian@gentoo.org> llvm-gcc-2.7-r1.ebuild,
   llvm-gcc-9999.ebuild:
diff --git a/sys-devel/llvm-gcc/Manifest b/sys-devel/llvm-gcc/Manifest
index 440fcf5b6e72..7ed96f63226f 100644
--- a/sys-devel/llvm-gcc/Manifest
+++ b/sys-devel/llvm-gcc/Manifest
@@ -1,9 +1,9 @@
 AUX gcc-configure-LANG.patch 2052 RMD160 91f5b90600dfccb10c4e2308a5a1485275fdfeee SHA1 56ecd1d6f2e4bd0b35ac108be72a4f6f60212c38 SHA256 63de6d2dcfe14f21d147abeb1390405b9220c03f8e968f482d4b4c1cf279c88b
-DIST llvm-gcc-4.2-2.6.source.tar.gz 48364917 RMD160 08d7ffadb88e3abdcc971372f737e4ddf8f991c6 SHA1 60670d550be09a57d315efa259d2b19955f6fa79 SHA256 5be01f0ed0787c33239ab27b93884e48b544a1be97b944c7a5d29e85fbab495d
 DIST llvm-gcc-4.2-2.7.source.tgz 55699337 RMD160 523edd94ece00caaaa3ff2399f3c0b044b50f432 SHA1 aaf466efa41e95014d51a2f8a60ad3b7771c1829 SHA256 1ccbcef5fe6613392e24f21fd23a9ed2692827c13f8d85c26b3bdcd1b3b5047a
-EBUILD llvm-gcc-2.6.ebuild 2019 RMD160 d613455439fe1bba7cc12b2d36473bf83b28978f SHA1 fdac8e473cbce552efa6c6fd0c81116f2944da76 SHA256 8b650918956ee6c4f9ef869342fcf47ca5f314f334438a3060bb7437d7ad5ab5
+DIST llvm-gcc-4.2-2.8.source.tgz 55748118 RMD160 305f4157b16912831b2b897b09a55fc2405bcc0c SHA1 58fba3ddddb9c69b345c8afa6c699d9d9d13f551 SHA256 04785a0031c1aa1e3a89926ac6a069c96276074ea711958306b8bf96d9d49e4d
 EBUILD llvm-gcc-2.7-r1.ebuild 4033 RMD160 5f25b0a77dedd5ed49e18d3a79e0c0006749bf84 SHA1 827bbbc4c06b4c34d6018b61c35734cdf6171a4b SHA256 162a67a7ff238ccf7895a5f8f8b70f04f3d62954014b34b4bf8f1906c37c43cb
 EBUILD llvm-gcc-2.7.ebuild 2018 RMD160 c36660533b53fae7f64eb5d16c742c1a8626ca75 SHA1 be69e5c41844481919467aacbf0d8474c97400c3 SHA256 8a4b589e0660a15c235cf3fbdd919ff53cd97237f6035f18cad357bdd3feac49
+EBUILD llvm-gcc-2.8.ebuild 4031 RMD160 663f29c38e9c7a883bd80e5639685ef3afffe1bf SHA1 0c8b9335cc2e6f3d684af8b020e3fde840301607 SHA256 ee065a854d6c62ceaf0cbb89c40c78ddf582cc6639ab597fd6f78f971c4bfb07
 EBUILD llvm-gcc-9999.ebuild 3988 RMD160 a992a4eb5d44eb6bb2b9222fe35a89a9eca47a50 SHA1 43d322944696bfd89c9a15f23d8ebe01171f8617 SHA256 11ab00337dd97dc2688cf9ade88b384edce7dd3cdc4f713b03f7a50f98062d26
-MISC ChangeLog 1681 RMD160 9a36072e71466849f39f8c054e8e9dc700b06c1e SHA1 82c396393e5bd23909fae25082727e76ed42c70c SHA256 8dd51cf75f871a67be1cc101d3a2fb3b4c69414764ed6181003ef87f9adc8d14
+MISC ChangeLog 1832 RMD160 29a5cf46a04d7b33e0a45d378e5c45623f95c268 SHA1 64361ee59fa5c702865c0a642f90c980ab6b5484 SHA256 3821cd5dc28b3732e75730a73ef2c1923280a4b39d4e34feacd759aaf9ac05f2
 MISC metadata.xml 1210 RMD160 452adfc54714ef433d1029368d731d2ba232443a SHA1 00c2795c89050749d088beb5202877fa6bf7a01d SHA256 9d192d1f60fc67d6bee5d6669fe84adc94a097d42f70a6f20e4f708d094b5d7c
diff --git a/sys-devel/llvm-gcc/llvm-gcc-2.6.ebuild b/sys-devel/llvm-gcc/llvm-gcc-2.6.ebuild
deleted file mode 100644
index 6a7aabe29f86..000000000000
--- a/sys-devel/llvm-gcc/llvm-gcc-2.6.ebuild
+++ /dev/null
@@ -1,72 +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-gcc/llvm-gcc-2.6.ebuild,v 1.3 2010/01/05 10:19:26 voyageur Exp $
-
-EAPI=2
-inherit multilib
-
-LLVM_GCC_VERSION=4.2
-MY_PV=${LLVM_GCC_VERSION}-${PV/_pre*}
-
-DESCRIPTION="LLVM C front-end"
-HOMEPAGE="http://llvm.org"
-SRC_URI="http://llvm.org/releases/${PV}/${PN}-${MY_PV}.source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT=0
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bootstrap fortran multilib nls objc objc++ test"
-
-RDEPEND=">=sys-devel/llvm-$PV"
-DEPEND="${RDEPEND}
-	>=sys-apps/texinfo-4.2-r4
-	>=sys-devel/binutils-2.18
-	>=sys-devel/bison-1.875
-	test? ( dev-util/dejagnu
-		sys-devel/autogen )"
-
-S=${WORKDIR}/llvm-gcc${MY_PV}.source/obj
-
-src_prepare() {
-	#we keep the directory structure suggested by README.LLVM,
-	mkdir -p "${S}"
-}
-
-src_configure() {
-	# Target options are handled by econf
-
-	EXTRALANGS=""
-	use fortran && EXTRALANGS="${EXTRALANGS},fortran"
-	use objc && EXTRALANGS="${EXTRALANGS},objc"
-	use objc++ && EXTRALANGS="${EXTRALANGS},obj-c++"
-
-	ECONF_SOURCE="${WORKDIR}"/llvm-gcc${MY_PV}.source econf --prefix=/usr/$(get_libdir)/${PN}-${MY_PV} \
-		$(use_enable multilib) \
-		--program-prefix=${PN}-${MY_PV}- \
-		--enable-llvm=/usr --enable-languages=c,c++${EXTRALANGS} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	BUILDOPTIONS="LLVM_VERSION_INFO=${MY_PV}"
-	use bootstrap && BUILDOPTIONS="${BUILDOPTIONS} bootstrap"
-	emake ${BUILDOPTIONS} || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "installation failed"
-	rm -rf "${D}"/usr/share/man/man7
-	if ! use nls; then
-		einfo "nls USE flag disabled, not installing locale files"
-		rm -rf "${D}"/usr/share/locale
-	fi
-
-	# Add some symlinks
-	dodir /usr/bin
-	cd "${D}/usr/bin"
-	for X in c++ g++ cpp gcc gcov gccbug ; do
-		ln -s /usr/$(get_libdir)/${PN}-${MY_PV}/bin/${PN}-${MY_PV}-${X}  llvm-${X}
-	done
-	use fortran && \
-		ln -s /usr/$(get_libdir)/${PN}-${MY_PV}/bin/${PN}-${MY_PV}-gfortran llvm-gfortran
-}
diff --git a/sys-devel/llvm-gcc/llvm-gcc-2.8.ebuild b/sys-devel/llvm-gcc/llvm-gcc-2.8.ebuild
new file mode 100644
index 000000000000..3b95f3ddcb89
--- /dev/null
+++ b/sys-devel/llvm-gcc/llvm-gcc-2.8.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm-gcc/llvm-gcc-2.8.ebuild,v 1.1 2010/10/06 09:17:40 voyageur Exp $
+
+EAPI=3
+inherit libtool flag-o-matic gnuconfig multilib
+
+LLVM_GCC_VERSION=4.2
+MY_PV=${LLVM_GCC_VERSION}-${PV/_pre*}
+
+DESCRIPTION="LLVM C front-end"
+HOMEPAGE="http://llvm.org"
+SRC_URI="http://llvm.org/releases/${PV}/${PN}-${MY_PV}.source.tgz"
+
+LICENSE="GPL-2"
+SLOT=0
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos"
+IUSE="bootstrap fortran multilib nls objc objc++ test"
+
+RDEPEND=">=sys-devel/llvm-$PV"
+DEPEND="${RDEPEND}
+	>=sys-apps/texinfo-4.2-r4
+	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
+	>=sys-devel/bison-1.875
+	test? ( dev-util/dejagnu
+		sys-devel/autogen )"
+
+S=${WORKDIR}/llvm-gcc-${MY_PV}.source
+
+src_prepare() {
+	#we keep the directory structure suggested by README.LLVM,
+	mkdir -p "${S}"/obj
+
+	# From toolchain eclass
+	elibtoolize --portage --shallow --no-uclibc
+	gnuconfig_update
+
+	# update configure files
+	local f
+	for f in $(grep -l 'autoconf version 2.13' $(find "${S}" -name configure)) ; do
+		#ebegin "  Updating ${f/${S}\/} [LANG]"
+		ebegin "  Updating \"${f/${S}\/}\" [LANG]"
+		patch "${f}" "${FILESDIR}"/gcc-configure-LANG.patch >& "${T}"/configure-patch.log \
+			|| eerror "Please file a bug about this"
+		eend $?
+	done
+	sed -i 's|A-Za-z0-9|[:alnum:]|g' gcc/*.awk #215828
+
+	if [[ -x contrib/gcc_update ]] ; then
+		einfo "Touching generated files"
+		./contrib/gcc_update --touch | \
+			while read f ; do
+				einfo "  ${f%%...}"
+			done
+	fi
+}
+
+src_configure() {
+	gcc_do_filter_flags
+	# Target options are handled by econf
+
+	cd "${S}"/obj
+	EXTRALANGS=""
+	use fortran && EXTRALANGS="${EXTRALANGS},fortran"
+	use objc && EXTRALANGS="${EXTRALANGS},objc"
+	use objc++ && EXTRALANGS="${EXTRALANGS},obj-c++"
+
+	ECONF_SOURCE="${S}" econf --prefix="${EPREFIX}"/usr/$(get_libdir)/${PN}-${MY_PV} \
+		$(use_enable multilib) \
+		--program-prefix=${PN}-${MY_PV}- \
+		--enable-llvm="${EPREFIX}"/usr --enable-languages=c,c++${EXTRALANGS} \
+		$(use prefix && echo "--with-local-prefix=${EPREFIX}/usr") \
+		|| die "configure failed"
+}
+
+src_compile() {
+	gcc_do_filter_flags
+	cd "${S}"/obj
+	BUILDOPTIONS="LLVM_VERSION_INFO=${MY_PV}"
+	use bootstrap && BUILDOPTIONS="${BUILDOPTIONS} bootstrap"
+	emake ${BUILDOPTIONS} || die "emake failed"
+}
+
+src_test() {
+	cd "${S}"/obj
+	emake -j1 -k check || ewarn "check failed and that sucks :("
+}
+
+src_install() {
+	cd "${S}"/obj
+
+	# Do allow symlinks in private gcc include dir as this can break the build
+	find gcc/include*/ -type l -print0 | xargs -0 rm -f
+	# Remove generated headers, as they can cause things to break
+	# (ncurses, openssl, etc).
+	for x in $(find gcc/include*/ -name '*.h') ; do
+		grep -q 'It has been auto-edited by fixincludes from' "${x}" \
+			&& rm -f "${x}"
+	done
+
+	emake DESTDIR="${D}" install || die "installation failed"
+	rm -rf "${ED}"/usr/share/man/man7
+	if ! use nls; then
+		einfo "nls USE flag disabled, not installing locale files"
+		rm -rf "${ED}"/usr/share/locale
+	fi
+
+	# Add some symlinks
+	dodir /usr/bin
+	cd "${ED}/usr/bin"
+	for X in c++ g++ cpp gcc gcov gccbug ; do
+		ln -s "${EPREFIX}"/usr/$(get_libdir)/${PN}-${MY_PV}/bin/${PN}-${MY_PV}-${X}  llvm-${X}
+	done
+	use fortran && \
+		ln -s "${EPREFIX}"/usr/$(get_libdir)/${PN}-${MY_PV}/bin/${PN}-${MY_PV}-gfortran llvm-gfortran
+
+	# 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
+		local f=$(echo "${ED}"usr/$(get_libdir)/${PN}-${MY_PV}/lib/gcc/${CHOST}/${LLVM_GCC_VERSION}*/libstdc++.dylib)
+		install_name_tool -id "/${f#${D}}" "${f}"
+	fi
+}
+
+gcc_do_filter_flags() {
+	strip-flags
+
+	# In general gcc does not like optimization, and add -O2 where
+	# it is safe.  This is especially true for gcc 3.3 + 3.4
+	replace-flags -O? -O2
+
+	# ... sure, why not?
+	strip-unsupported-flags
+
+	# dont want to funk ourselves
+	filter-flags '-mabi*' -m31 -m32 -m64
+
+	filter-flags '-mcpu=*'
+}