--- smage/trunk/core/llvm/llvm-10.0.0-r1.smage2	2020/07/02 12:37:50	14019
+++ smage/trunk/core/llvm/llvm-10.0.0-r1.smage2	2020/07/02 14:38:27	14020
@@ -67,20 +67,20 @@
 SRCFILE="${PNAME}-${PVER}.src.tar.xz"
 SRCDIR="${BUILDDIR}/${PNAME}-${PVER}.src"
 
-#CLANG_SRCFILE="cfe-${PVER}.src.tar.xz"
-#CLANG_SRCDIR="${BUILDDIR}/cfe-${PVER}.src"
+CLANG_SRCFILE="clang-${PVER}.src.tar.xz"
+CLANG_SRCDIR="${BUILDDIR}/clang-${PVER}.src"
 
-#CLANG_EXTRA_SRCFILE="clang-tools-extra-${PVER}.src.tar.xz"
-#CLANG_EXTRA_SRCDIR="${BUILDDIR}/clang-tools-extra-${PVER}.src"
+CLANG_EXTRA_SRCFILE="clang-tools-extra-${PVER}.src.tar.xz"
+CLANG_EXTRA_SRCDIR="${BUILDDIR}/clang-tools-extra-${PVER}.src"
 
-#COMPILER_RT_SRCFILE="compiler-rt-${PVER}.src.tar.xz"
-#COMPILER_RT_SRCDIR="${BUILDDIR}/compiler-rt-${PVER}.src"
+COMPILER_RT_SRCFILE="compiler-rt-${PVER}.src.tar.xz"
+COMPILER_RT_SRCDIR="${BUILDDIR}/compiler-rt-${PVER}.src"
 
-#LLD_SRCFILE="lld-${PVER}.src.tar.xz"
-#LLD_SRCDIR="${BUILDDIR}/lld-${PVER}.src"
+LLD_SRCFILE="lld-${PVER}.src.tar.xz"
+LLD_SRCDIR="${BUILDDIR}/lld-${PVER}.src"
 
-#LLDB_SRCFILE="lldb-${PVER}.src.tar.xz"
-#LLDB_SRCDIR="${BUILDDIR}/lldb-${PVER}.src"
+LLDB_SRCFILE="lldb-${PVER}.src.tar.xz"
+LLDB_SRCDIR="${BUILDDIR}/lldb-${PVER}.src"
 
 MANPAGES_SRCFILE="${PNAME}-${PVER}-manpages.tar.bz2"
 MANPAGES_SRCDIR="${BUILDDIR}/${PNAME}-${PVER}-manpages"
@@ -95,14 +95,19 @@
 #	http://llvm.org/releases/${PVER}/${COMPILER_RT_SRCFILE}
 #	http://llvm.org/releases/${PVER}/${LLD_SRCFILE}
 	https://github.com/${PNAME}/llvm-project/releases/download/llvmorg-${PVER}/${SRCFILE}
+	https://github.com/${PNAME}/llvm-project/releases/download/llvmorg-${PVER}/${CLANG_SRCFILE}
+	https://github.com/${PNAME}/llvm-project/releases/download/llvmorg-${PVER}/${CLANG_EXTRA_SRCFILE}
+	https://github.com/${PNAME}/llvm-project/releases/download/llvmorg-${PVER}/${COMPILER_RT_SRCFILE}
+	https://github.com/${PNAME}/llvm-project/releases/download/llvmorg-${PVER}/${LLD_SRCFILE}
 	mirror://${PNAME}/${SRCFILE}
 	mirror://${PNAME}/${MANPAGES_SRCFILE}
 )
 
-#if [[ ${LLDB_ENABLED} = 1 ]]
-#then
+if [[ ${LLDB_ENABLED} = 1 ]]
+then
 #	SRC_URI+=( http://llvm.org/releases/${PVER}/${LLDB_SRCFILE} )
-#fi
+	SRC_URI+=( https://github.com/${PNAME}/llvm-project/releases/download/llvmorg-${PVER}/${LLDB_SRCFILE} )
+fi
 
 #UP2DATE="updatecmd ${HOMEPAGE} | grep 'Download now' | sed 's:.*][lL][lL][vV][mM]\ \(.*\):\1:'"
 UP2DATE="updatecmd ${HOMEPAGE}/releases/download.html | grep '.src.' | grep '/${PNAME}-[0-9]' | sed 's:.src::g' | highesttarball xz"
@@ -151,24 +156,24 @@
 src_prepare()
 {
 	munpack ${SRCFILE} || die
-#	SRCDIR="${LLD_SRCDIR}" munpack ${LLD_SRCFILE} || die
-#	SRCDIR="${CLANG_SRCDIR}" munpack ${CLANG_SRCFILE} || die
-#	SRCDIR="${CLANG_EXTRA_SRCDIR}" munpack ${CLANG_EXTRA_SRCFILE} || die
-#	SRCDIR="${COMPILER_RT_SRCDIR}" munpack ${COMPILER_RT_SRCFILE} || die
-#	if [[ ${LLDB_ENABLED} = 1 ]]
-#	then
-#		SRCDIR="${LLDB_SRCDIR}" munpack ${LLDB_SRCFILE} || die
-#	fi
-
-#	# move all sources into the llvm src tree
-#	all-abis mv ${LLD_SRCDIR}-$(mabi) ${SRCDIR}-$(mabi)/tools/lld || die
-#	all-abis mv ${CLANG_SRCDIR}-$(mabi) ${SRCDIR}-$(mabi)/tools/clang || die
-#	all-abis mv ${CLANG_EXTRA_SRCDIR}-$(mabi) ${SRCDIR}-$(mabi)/tools/clang/tools/extra || die
-#	all-abis mv ${COMPILER_RT_SRCDIR}-$(mabi) ${SRCDIR}-$(mabi)/projects/compiler-rt || die
-#	if [[ ${LLDB_ENABLED} = 1 ]]
-#	then
-#		all-abis mv ${LLDB_SRCDIR}-$(mabi) ${SRCDIR}-$(mabi)/tools/lldb || die
-#	fi
+	SRCDIR="${LLD_SRCDIR}" munpack ${LLD_SRCFILE} || die
+	SRCDIR="${CLANG_SRCDIR}" munpack ${CLANG_SRCFILE} || die
+	SRCDIR="${CLANG_EXTRA_SRCDIR}" munpack ${CLANG_EXTRA_SRCFILE} || die
+	SRCDIR="${COMPILER_RT_SRCDIR}" munpack ${COMPILER_RT_SRCFILE} || die
+	if [[ ${LLDB_ENABLED} = 1 ]]
+	then
+		SRCDIR="${LLDB_SRCDIR}" munpack ${LLDB_SRCFILE} || die
+	fi
+
+	# move all sources into the llvm src tree
+	all-abis mv ${LLD_SRCDIR}-$(mabi) ${SRCDIR}-$(mabi)/tools/lld || die
+	all-abis mv ${CLANG_SRCDIR}-$(mabi) ${SRCDIR}-$(mabi)/tools/clang || die
+	all-abis mv ${CLANG_EXTRA_SRCDIR}-$(mabi) ${SRCDIR}-$(mabi)/tools/clang/tools/extra || die
+	all-abis mv ${COMPILER_RT_SRCDIR}-$(mabi) ${SRCDIR}-$(mabi)/projects/compiler-rt || die
+	if [[ ${LLDB_ENABLED} = 1 ]]
+	then
+		all-abis mv ${LLDB_SRCDIR}-$(mabi) ${SRCDIR}-$(mabi)/tools/lldb || die
+	fi
 
 	# pre-generated man-pages
 	oldmunpack ${MANPAGES_SRCFILE} || die
@@ -232,7 +237,6 @@
 
 src_install_llvm()
 {
-
 	SRCDIR=${BUILDDIR}/build mmake DESTDIR=${BINDIR} install || die
 
 	# install pre-generated man-pages