From 5eb482e9eadc47fa687de312e05b7f0f81130523 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Thu, 2 Apr 2015 15:05:35 +0000 Subject: [PATCH] Fix live ebuild patch, though it requires a rewrite for cmake build system, bug #543536 Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x00F7AB331B0F097F --- sys-devel/llvm/ChangeLog | 7 ++- sys-devel/llvm/Manifest | 33 +++++++------ .../llvm/files/llvm-3.7-nodoctargz.patch | 49 +++++++++++++++++++ sys-devel/llvm/llvm-9999.ebuild | 4 +- 4 files changed, 74 insertions(+), 19 deletions(-) create mode 100644 sys-devel/llvm/files/llvm-3.7-nodoctargz.patch diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog index a45ab201c2c3..52c63511d10c 100644 --- a/sys-devel/llvm/ChangeLog +++ b/sys-devel/llvm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-devel/llvm # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.234 2015/03/19 09:28:02 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.235 2015/04/02 15:05:26 voyageur Exp $ + + 02 Apr 2015; Bernard Cafarelli llvm-9999.ebuild, + +files/llvm-3.7-nodoctargz.patch: + Fix live ebuild patch, though it requires a rewrite for cmake build system, + bug #543536 19 Mar 2015; Bernard Cafarelli llvm-3.1-r2.ebuild, +files/llvm-3.1-docs-pod-markup-fixes.patch, diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index a55c470a5954..08b10ce0ddfd 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -42,6 +42,7 @@ AUX llvm-3.5-gentoo-install.patch 3204 SHA256 0c97173613505ea92f0aa79d4e04e797f1 AUX llvm-3.5.0-fix_LLVMExports_cmake.patch 1563 SHA256 924303a7fa7ee46276eb2984e3e2d9304873df1d63c0d878371cf98b4094aef0 SHA512 8e8c3ae2c8e2bac0d78a7f572ccfae9cfc30e52ffbfa953596c075cf6adc4e5881d2b80cad4d87bbf1de837d88352334bb51a331adc8d8db74354945c036637e WHIRLPOOL b525bbf3a7ade5906e9e35315af1ccb50c4392e1d104c516927a3ab9b627bc3d0fcf41bd0b77093f6743131f801d37d53d1065371e5c86eb4e7d538eb969b3a8 AUX llvm-3.6-gentoo-install.patch 3169 SHA256 318288e667623e22c441f7a1da8c3e27b3fff7426839a58a05e43dd0ac37d443 SHA512 9e13fd8606c6aa636d5e1cd3e32781fa4cae3266acf306f5c38f052a7520fc4b603022244b4502045d968c9ca28292539a17caa33b9b470353adfdbb8e159321 WHIRLPOOL 8f3b9b5150d2a29ba4f94a86235d12cf96c1a28ceb7f55fe7b90b3e5e074fe4883d449ac34cbe823ccc22f1ab8b3e2d05dadb39abaaac0a17e3870bbba1ea14e AUX llvm-3.6.0-ocaml-ctypes-0.4.0.patch 1783 SHA256 3beb0718c10b57b125809d4de991b24d53618469119c652120802b584c7de184 SHA512 8c26e55939c82cca0f1ab9b276720e56cb8f22d1bfcffe228636d18feb3a51b62c408a1fed762d91430137eb231266df4038f88585428dd5d0af19de3749549e WHIRLPOOL be72dbe99b852cd85e1312f8c425e69a09b22ed6d3f5371e8b1ac9697cd2555195e0e36ae4b0d47fc4ee9d77ece883e4668e1c30da30c530bf7fdabfec827a8a +AUX llvm-3.7-nodoctargz.patch 1903 SHA256 6364b822c82697b81bd37db63e059bad26c6e825bc47d894dffac5a3ff28098c SHA512 6fcad8138fb2ab19694bbc92e23c3b34579e5f15dc31b47dd4f0910325b9ec457913185eb78d8f68ae96fca6f48c3754a74de9b3185b25ae25efe41ec5d3348a WHIRLPOOL ce14af312aec1112e10bc213e4bc27f52d6a82aa0b08e3bcdd633795c5f073af2bb8f8e4f6386b22bc6709f654bd1df401303a475730a29f2aef8f9b4fc42342 DIST cfe-3.3.src.tar.gz 9425539 SHA256 b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996 SHA512 06773f43f7d3529f06edb029f7de398f06a700a0f2476e00c4727e70c291028221bfac23625dfd2c220d6ac91a21670848187a934b99a21801c695127371afcc WHIRLPOOL 8b97b527f19015dd3283b9e174615170e639793f64c635ccc4ee4d8216f8de759fd0121a8ef3513fa1c6ad19b31aa3529091ffb44a01ee858edfef400881596a DIST cfe-3.4.2.src.tar.gz 10612313 SHA256 5ba6f5772f8d00f445209356a7daf83c5bca2da5acd10de517ad2359ae95bc10 SHA512 e01fa8e312e9b3b7b3cb572ac21349161aaa50078ecfe7bded273b75db4a0c44acde524f8fdfcbeec54c61eeeb8339e9917d1f205a8fda18e34fe7ccbe89c36d WHIRLPOOL 153208b1a60bb5fbe92a7162cb26bbe70d591e7db9dcf06fcd54efc539bbff0403ec88e64236969c9f256e5586bc333840bd6178fd158577d6fe228d9edd4dcd DIST cfe-3.5.0.src.tar.xz 8233432 SHA256 fc80992e004b06f6c7afb612de1cdaa9ac9d25811c55f94fcf7331d9b81cdb8b SHA512 b26a5e2cd81c150607c23b22fafc0d9c7f12b83b45e476b8e75bf5e99d42be7c98ffeac7349df664f01b00900864a01429860b298e48961861377a4b2daf3e49 WHIRLPOOL 5dd8b6fe97933b74f1668b1d753c16cd3bcd05ccf72aac1283aa449caf93f5ba88ae79e7668f7e79b554e1421549a87af21c86cf92657c1b4d77744165718ce7 @@ -81,25 +82,25 @@ EBUILD llvm-3.4.2.ebuild 15757 SHA256 da50eccf544bcd0bd03d960f6bcb3acebec7d65560 EBUILD llvm-3.5.0.ebuild 15230 SHA256 5bd54d9d06ae712a5dc7aba83f86702cb07710603e5e542021ca681757b730d0 SHA512 414744797085ddfd2d83d960dfa4257e02004aa1c4d778a81dc02c90b643ce49b9c0fbb0ae4df9ad008c76f64941eb2abccfbda3d7690f67c7cc7d4374673de8 WHIRLPOOL b3d40770fbf6f8e8ba9809df649351b2c414abfdac34ab44831c3e07c65fa575cf9de10dfbeb5113a43e611cf5521e8467128907388e9d17f06963fbeddde975 EBUILD llvm-3.5.1.ebuild 15321 SHA256 2b98273203216c42549499e1e094203638536699ca4e1c8b393e1ce4e6534ed7 SHA512 0d770076555d5cdb4fd252d843164cf34feff2d114a19eb7f0f58a2fabbf7d5b9e04107662aac9c5e697b122e8a0dee12397ff62ad7608798b5e762efab6d72d WHIRLPOOL c652cbe76ecb09c77e3fc46e3054dabfbd78a3185f28b6c41edcb614e8cd3490896d04cce2686b0f4a9e8a77ceba7e746b81aa726c7b7716724f3f3ef20024ff EBUILD llvm-3.6.0.ebuild 15305 SHA256 19985cd50c3fe6235975ec473b3dcd6b8c3415138cc87ce43753554a70057ca2 SHA512 6ab0907287008eb7a37fd2335261e88dd455acbafd7cbcf2df51f603fbcdfc09948d77d5d73a242b90e86fad560487039f2cb568b887de8439d161ff73beed1b WHIRLPOOL 0849ea2790dab8ccc05f4151dc7b6114a95114574892aa0fee6f7d4b88fd8c6b9658ecc6a2e4d30918e930bdd24eb1b96d649e810a82caf88845349c45cb050f -EBUILD llvm-9999.ebuild 14402 SHA256 b45c2b3c15b861c26d55eb91dc895e380f9cbd54b0a1a57a05134ff54d5e4b1a SHA512 b2b06bee630eff7cf3f4ec81d8739e9f138f63d44aeab80b8f87ca1b24558bc670684328776e257399c62ac23ef8da6f3788734317f699e762350b9e4bf8eb2e WHIRLPOOL 3bbb955951037e89b02b72e05cfc20b107ac4805afda5d12b67e3d9b9fbb1c56ce15b6aa5a93cc78ba3501a06de9003c88f50e1a6dde919b069c0d6434b85e6a -MISC ChangeLog 39172 SHA256 1bed7aef7cc4193be6b3bf1eee7fab12dda05892dcd9a7282636d1f7b6eb2f8b SHA512 4d5edc1b875c835d5883d61069c4c3f30e66e321c0f2de2e2ca54caabdaea5ad673b019c7980c52f13993a42f63e5cba3f393d0df8c192515332843a08f2e41b WHIRLPOOL e22163e37b0652dc0716d3db521f1b45c1f8fc5eb1839e355ef92ebb1ab904b4042450a0308e181f7a22e19d592c49d99888bb71892d61da4c575d5a1d2f472e +EBUILD llvm-9999.ebuild 14404 SHA256 2a96f1cfca7d5b0085ff5451d37bc872f174f77c36f047d18052fbfeb1416bcf SHA512 96aa5d558090772306c7cd277320094c5a1a34fd97716ae473fe8fc6238c4eb44dd85a0d8d639c49b917fc8113fef1b2c26c6806d864f3c09e5c08601309a87b WHIRLPOOL ad902937b0373fa8458b413b585ef8d7d0cc6a1a4fe57de67f622750c2d50913a01ca7591f857e2d565ca2048e80b5536f893004c63bec6f7196b4b64d8d73be +MISC ChangeLog 39374 SHA256 c6d3fc9e69866cfe1012584c54972544c35e9ca9a1c80ec99c72d6582ae36848 SHA512 1a61f73e637fa3ba7e18afb62191efe76d45d3d1f06c1527e479f4ddfdd8df03079c3fbe8e4c1517bcc3a9ea7be013e9cc6264ed20ab9aea648417f491a93c4a WHIRLPOOL 01469a7bc281e16e138ce89f281958bd0e51d7b4153f61f7c858caddd1400067a070e2594b793721a359d0fc26510328029a92a8f65de7e97653599314336220 MISC metadata.xml 2787 SHA256 22dc7b91c98fb4258271cc9cd4bd99f214b30f258bbdfea83dc37ac74df8d498 SHA512 4fca0d2551a889e7800c688077adf405697d05730bf66621ac53fdefeeeaddb7a8d868973edc9a6fe48e9a07734f1d43fd88229bae693fe181a7dbb95eeb9481 WHIRLPOOL 6284033d40bef02510f924ec1e6a9d3e1072bf26945fdedde0ddaf1d6d35c3d30971cdefa583a8e4d9db3da67bee04145ace15ded4cee63f534588b66633c76b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJVCpaoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJVHVq6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREMzFDRDFGNEQwRTAyNjc2QzRDNjRFQzAw -MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/0FAP/0WoaqdjeufajZVQ7Ks3H+Dr -h4eObA6Agv8rMRiHNyTfEGSno9iorb7DVQjFjg3/mUhwJQvlzVXBCUsBdOH2gB4O -ACR4pyhUVMiWtWdqDfc3upTK2S+OYHh+8qpv8bigmJjpBKqoobjMoQ49tq2Y7tOk -j+A0p0j5jXRwMQvJg+m7LZY9QKp1h3G4WJTTBXOtR1jGdF0110Q7DO6zR64fE62b -MMsbiO3WCIbhxSea8uxVRU8+y280xUbf/5SwiB1Tk6Pu3VQUafCE2FlaPBWsssvP -Pahumtx9XNfBY9sO9j+2oYba1+xPLuMU5q3Q4S8t5o8sr1E5vUIQUKmfEE8Zvfe8 -wYc/kcQRtP1SSudp1KVVI+X9I97+DEGiFV+H2gp03utefvbfrVtxBpq7VLuAGS+U -jtb7nab983D55sC98sDrdSWPqk7x5wYo9aMdFc1RbxCL4rErBTwsw4K70S/hASgs -edTofpT630VEzRT0G+6Iei/+bqQBCqZuqvUTI8mvRr4giNtxKQb98qJfTBn/hzCE -E+wr3g86Iup2NbF7M0rENkY22x/i3pZT/iuK5zZsf6OpYAZZ0qubcEv5zhfyfFPU -mLxC+lOZ0kx3S4COhBybtaW+zxtdEYt9n3LYGHRD21BEsk8neWjKmsyXeAi+kKaB -qAItr1ICM7aqC3jww+Sz -=6vWh +MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/0wQP/0gTiRYL24XMedR7+mL6yiqS +c5yHxP1Lvbmt/2n2bj6/x4AI3Cexs+ECDMvs3sGnzwlQgmpY84c9HuU0lEZKWR+B +mXxy+0n5Za9dFbDvUkvkppvKkqkF8dqx6c2Z+nKd/mO40sJslSPrk64If1SouF+y +JQAFGFDO5UtQ8K7I7lirn5umKPFSZ3zHs/ta8CWpdbnihhruBd3+9sSi+2B9wHih +i/eYuhvgjOOqtt74/ePu7mp1/SXv5GPkHoe91kGnGBSQYOJZM3J3v6k9QGNt0spV +zamMA/dGwGoO9RkmsXnzdPxaxT+t0S/d9U9T28LcCrzEu0flQ9u5kfqsXluxNT9b +MkEKGIktpmnoAJaCSPrs9KDdKSSJVmZXsFJ7/8GAmoYA+v8x1P17GMWfgPD86XJa +nea8xvhabjmPY9rqj1FcfK90yJ4Rw9e4ytUvMn3/uNfqCS0qJSQds/gQFVXsCwcH +5JqB7eLgSPw3UdLkY4GqJkxrEIa/Dphg8GTk3yCrQQ84BpFPBZdyuER8j8ZXV7Ub +rq/nhNI+C4gLnOV3Nf8DbfI1wZWUXtjKelP1eIgrvt+N2U850bxMV2ZFojXc4yWd +YZSR46nYDR6AKNrb3VegBOBa0SiVePmfHGuyAc3wh26SjtTIeJR/vd3akK8CuvKP +GH/5m6CuwRV9oIsyGE9X +=nCwO -----END PGP SIGNATURE----- diff --git a/sys-devel/llvm/files/llvm-3.7-nodoctargz.patch b/sys-devel/llvm/files/llvm-3.7-nodoctargz.patch new file mode 100644 index 000000000000..86905234779f --- /dev/null +++ b/sys-devel/llvm/files/llvm-3.7-nodoctargz.patch @@ -0,0 +1,49 @@ +--- docs/Makefile.orig 2012-04-30 17:00:01.000000000 +0200 ++++ docs/Makefile 2012-04-30 17:15:52.000000000 +0200 +@@ -52,11 +52,10 @@ + # 'make generated BUILD_FOR_WEBSITE=1' + generated:: $(generated_targets) + +-install-html: $(PROJ_OBJ_DIR)/html.tar.gz ++install-html: + $(Echo) Installing HTML documentation + $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html + $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html +- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir) + + $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML) + $(Echo) Packaging HTML documentation +@@ -68,12 +67,11 @@ + + install-doxygen: doxygen + $(Echo) Installing doxygen documentation +- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir) + $(Verb) cd $(PROJ_OBJ_DIR)/doxygen/html && \ + for DIR in $$($(FIND) . -type d); do \ + DESTSUB="$(DESTDIR)$(PROJ_docsdir)/html/doxygen/$$(echo $$DIR | cut -c 3-)"; \ + $(MKDIR) $$DESTSUB && \ + $(FIND) $$DIR -maxdepth 1 -type f -exec $(DataInstall) {} $$DESTSUB \; ; \ + if [ $$? != 0 ]; then exit 1; fi \ + done + +-doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz ++doxygen: regendoc + + regendoc: + $(Echo) Building doxygen documentation +@@ -99,7 +97,6 @@ + install-ocamldoc: ocamldoc + $(Echo) Installing ocamldoc documentation + $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html +- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir) + $(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \ + $(FIND) . -type f -exec \ + $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \; +@@ -109,7 +106,6 @@ + $(Verb) $(RM) -rf $(PROJ_OBJ_DIR)/ocamldoc.tar* + $(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/ocamldoc.tar ocamldoc + $(Verb) $(GZIPBIN) $(PROJ_OBJ_DIR)/ocamldoc.tar +- $(Verb) $(CP) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_OBJ_DIR)/ocamldoc/html/ + + regen-ocamldoc: + $(Echo) Building ocamldoc documentation diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild index 7dba0c94bb39..5e3962e15efa 100644 --- a/sys-devel/llvm/llvm-9999.ebuild +++ b/sys-devel/llvm/llvm-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 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.102 2015/02/04 10:55:25 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.103 2015/04/02 15:05:26 voyageur Exp $ EAPI=5 @@ -143,7 +143,7 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch + epatch "${FILESDIR}"/${PN}-3.7-nodoctargz.patch epatch "${FILESDIR}"/${PN}-3.5-gcc-4.9.patch epatch "${FILESDIR}"/${PN}-3.6-gentoo-install.patch # Make ocaml warnings non-fatal, bug #537308 -- 2.26.2