Remove the cmake hack since upstream started installing cmake files from Makefiles.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 23 insertions, 41 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index ed0a92e3c48f..80701e26066e 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.188 2014/04/10 19:35:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.189 2014/04/12 09:44:01 mgorny Exp $
+
+  12 Apr 2014; Michał Górny <mgorny@gentoo.org> llvm-9999.ebuild:
+  Remove the cmake hack since upstream started installing cmake files from
+  Makefiles.
 
 *llvm-3.4-r2 (10 Apr 2014)
 
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 2627a5126b19..fcdc60c5252a 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -58,25 +58,25 @@ EBUILD llvm-3.3.ebuild 6798 SHA256 4e53042e76ce97e6a460cda74c5dbadc1cee9009345e8
 EBUILD llvm-3.4-r1.ebuild 14806 SHA256 eb56a521612ee0a9ef4375d7908a7fee73950acba71006e50223a83b3927483f SHA512 391fcd8eedd6c4777db48dfd23799079e4b333b78fb8a21c3b42fd1d291edfacf56ffecf072c1b01e7b248fd913b778b547b8c885317d1efd906433b867420dc WHIRLPOOL 3650a3c0f5ea67a81cdcd1ae4f4c0e7b700c96ee37d9122b9aa357182d5ade1b10ada64ced8dd8ea2157043047a10aa538192324139bd3742026ea4f8aa071e1
 EBUILD llvm-3.4-r2.ebuild 14519 SHA256 2a02f740eb03cc219efa22b568a15791d0e36cdb0ae456ba8f83f14c639a5eb8 SHA512 d26ec40080935baf844fa61ce527aaf24ffdd30c8f15c9f4ca34fb5185fd9ecc9e140a9acd3f1b9aca1747b57f9ce36ed28ed8c864d012ab52e97bb2bcb400a9 WHIRLPOOL 2e2efb3e1340930246e55097b478ccfa1ada88b0d9f67011863d79a8d25b1f7018c1d7b1c40c9af6779b48124efc497a6bb7c96649b58ad1906069c5d648f753
 EBUILD llvm-3.4.ebuild 14517 SHA256 89ff017e78d65e03c3334b732358a374c357c25579239ef87146436a32a58bda SHA512 0d6dc970cb65cd4ca8d6706f4993d068c753582bdfec9f23c3ad1d6343425f4b07ad1664d0a5e6dd1be9923fb11f93a629c8e690c0b7311949fa2de921a2b21f WHIRLPOOL a60dd2ffa9abc18875f4bcb263a0e494459d7a86d7a9bdf75a5d869f82e566dd0d8c1b0da203936ffd85580d77e04a641e2924239dff7e051f11954a56afa03e
-EBUILD llvm-9999.ebuild 13559 SHA256 aa47abdb514c9c3e3fdcd99466218d61050a696c489669bfdb8b20c6f1c741d0 SHA512 cb38f0143078988b3f5091c716a6b3594ab03a4e09fbd24b70b4788a82101159331da917d9e574395d3193abe62503cfc0d408bb97afff81a08cc85dea450e35 WHIRLPOOL e9ad011097f1b26b34ac3b691e31909bc5188cf247bb89dbfbbf696c01ffbac16a36f2c264ce0867b2c753a08d4ad16b885ba9cf0c14a80925d38e37a7ee1db5
-MISC ChangeLog 31203 SHA256 d85a726b809343c3a7ec8c9c74af0adf589e4f041b8e6deeda1abdd77fc03a3d SHA512 2ba5c64c5c61c07d40af25e4bc5632d58348aa6c32ae35dfa284d1dd5e6222021b7de693e69d0c1ecd0eeb16f9c7c424e86c6c3db3f46826e428df34047753f8 WHIRLPOOL c06222dfc6283060770bb138e5593e5cef0e958b46c138f6bb58b4423a914c95d1005ea7fded9bc73cf07995fa49a22d455494497ce396534a5db278953dd93e
+EBUILD llvm-9999.ebuild 12899 SHA256 926287db088ec2a0a672b8243749b7c0d824c370f24ccd1c0a6075f3b8c8dfc5 SHA512 5b716ba2755e4d170dbe9e834176850b90d48ebe9b06676394f0dabbbbe6f9e06af9d37c2a836601749ec19c8338f3b8abae06f99235bf4b4a7ecc5e7d6474bc WHIRLPOOL a3c59c3f4bbe507dcbd056e2fbc23092fdc93fb6c5c471d6c871f6992de0adb0c8311778842275a230b413fd80866f128f77c8e7c4fe509778e2bb529b1f5f25
+MISC ChangeLog 31360 SHA256 4cc886a0f3d9b3d952865e6e64a8567b0ead04448823945a501f2c00d73cec05 SHA512 b45b7487f7f6643fc1749241ece3b1dd115bfa725d6ea62ff72e9c8bc09aceb4d7a665a1a37a54b9f2cfdcf6abb5dccb14befdf527231b1c7aaf4a8faa7de0cb WHIRLPOOL e043423920926e1d6579db48aae50dc1ad67c592d83ab7884841261a7b272ee42160eeb2d5bf3d68a024ae4eee3cb8b588425a216fada8b36e7131ae68519c8d
 MISC metadata.xml 2723 SHA256 d1bbe72da2553592ad60522f744b8339bce17487343abf372d966c1fe9cd163d SHA512 800f72039a5f0fdb175a8ddab7ae8f184907865802ffd5f139006f3a8c77053f114e2f7b01cef3f41f6fffb3f8f8b2b474fdf95461f27b2dc8ae31cbd732a14e WHIRLPOOL 462d3d2f22e29d3678621a9f89ed98a58ee60fde57da7be21fbca7fd61e106abbcb19c0e491424869302c19ca93b15c480cd7ca2a3181f2148174d44e891e190
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTRvKQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTSQrmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOgaYP/AuvtQ+wWmcuT/nVCvUoINHk
-xsb4uXL4HctV6mx/vquW22b02U7luUz8oFvoLjsN0/mw8Ws8o6dv3F5z02wjBcOw
-/tfJPWPGt5pL/h2dzGlFMH+Pz/rEf8Oz4HxW2wEJvWIfdYDXHQfPDps9vC7JroMd
-HmceWf7HJjPdXcnbVz5qwh9SD4s9a4O5QVEVcqyQN/hLjtKxkVloOsKuGzbVZevm
-3QaRLSFhv3eGwlmZdd+ZDgwT9Iz4Vsry5czuJATr51TdHwR223doQVUEAKEmpESP
-UGNVz9Sgb3kGgaH0kWq/tweNajIw0gkCJ6HVH5i/MUV7R0dA+Cz8dW99NV0+3dT3
-kdqqMLIPUBx7s3WWyT45FNSzIpeny1hi6FhGzchDEfDAF+gkShPfMn+/GSZ/EdyS
-xUnD08BqfwlnOZdF23BWo3C8WYBF8m0Zfe+W5BngixQiKWTn1zBUDOZihb0ntBNm
-ECyfWd94NwzzGMHAMOdJ1yyHMdmHERZefRPkw6q+7peNKzB8cgf0nT6nU8x2fr9l
-yZQljHLZjIm1UkJh9+uLIR26jH5pvVhi0OmbSyQzbVw9YoBQ27pcOon6THlTEzJV
-mrVLtgjxv2fDZ6tBijf5RvlkZUs8QkFv4MayPGzIbaFBGxlGQLq4mJQfX6irJqDF
-rdAXCUZ/UbT0rUTb6J4n
-=yo9z
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOOOsQAIiyCVBkq6GY/KJo8ryvqzE7
+8nbNcJ/qlm6c2pHWXqEyleuNI3M+UR0EAnTVbwml6RR//5+cgECEUHRWjEoFQtKW
+z76wFtU4JDLhiug43YTRd6OC0lP8DdJaEw/My7f2VL5R8ZcXq6xPKj1t+YzwXr20
+ZDPtdg9z6Pk/KDCLyYDpZjXhJeov0mLGN83cpXCp/JM/Ri1BPnkH3dhiPzXtfQkC
+q25LbL7rAwRCOqfak+oDsmtX0WRTBFWMkBMMEaHR723wJmTF4lsOa4CVo9ySo+gw
+kK0k9YaaWs1Sb1XA1XnpREaVZ0RhNNL1G6UM5b6iyd3RZfLdwDvqYIsWmpnQV/MG
+4InjEZ6bOceX6JmTKBxPuBQ1aDcrmdxlVrpM3fNkWPSaFdXLdhHeAySggf/q55av
+pmdh2/XR61rkhzZTPlb+uqOJGra1vfgbzjuWmYkwpDge5xw1vXftjcg0L4U25t71
+l5uQFTfHQJj7aa0dXrCx14RFk2n2pPLMKxNfpQSU2rwFHm6G9V2hg9qrlsgWIWIj
+iy8tGqn695EYKCBq8PLdH0nwZczuLvp5zcdjcY164SKz3P7uR/GCUZIRBHx2B9fP
+h0/29Yd4KRedaI3h59a5iVd0YYlevpwZMJwPURZl9En1b8ougwuZnwZj04OEja1h
+kBcCdwDIHlqCP/YIWhQo
+=5z2K
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 20b716512cc2..e62fabb84d59 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.83 2014/04/10 17:03:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.84 2014/04/12 09:44:01 mgorny Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
 
-inherit cmake-utils eutils flag-o-matic git-r3 multibuild multilib \
+inherit eutils flag-o-matic git-r3 multibuild multilib \
 	multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs
 
 DESCRIPTION="Low Level Virtual Machine"
@@ -248,25 +248,6 @@ multilib_src_configure() {
 
 	ECONF_SOURCE=${S} \
 	econf "${conf_flags[@]}"
-
-	multilib_build_binaries && cmake_configure
-}
-
-cmake_configure() {
-	# sadly, cmake doesn't seem to have host autodetection
-	# but it's fairly easy to steal this from configured autotools
-	local targets=$(sed -n -e 's/^TARGETS_TO_BUILD=//p' Makefile.config || die)
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# just the stuff needed to get correct cmake modules
-		$(cmake-utils_use ncurses LLVM_ENABLE_TERMINFO)
-
-		-DLLVM_TARGETS_TO_BUILD="${targets// /;}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-	)
-
-	BUILD_DIR=${S%/}_cmake \
-	cmake-utils_src_configure
 }
 
 set_makeargs() {
@@ -395,9 +376,6 @@ multilib_src_install() {
 			dosym ../../../../$(get_libdir)/LLVMgold.so \
 				/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so
 		fi
-
-		# install cmake modules
-		emake -C "${S%/}"_cmake/cmake/modules DESTDIR="${D}" install
 	fi
 
 	# Fix install_names on Darwin.  The build system is too complicated