diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-04-30 15:19:44 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-04-30 15:19:44 +0000 |
| commit | 111e3cb2f46eb2e105db5894f6eacd8f6e7beedd (patch) | |
| tree | 47ad4c531d82a9f619cd12e4adcc2afa5b0a8400 /sys-devel | |
| parent | Install everything in client/lib. Remove sed script by Greg Watson (bug 190584). (diff) | |
| download | historical-111e3cb2f46eb2e105db5894f6eacd8f6e7beedd.tar.gz historical-111e3cb2f46eb2e105db5894f6eacd8f6e7beedd.tar.bz2 historical-111e3cb2f46eb2e105db5894f6eacd8f6e7beedd.zip | |
Fix nodoctargz patch for latest source, bug #413111
Package-Manager: portage-2.2.01.20430-prefix/cvs/Darwin i386
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/llvm/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/llvm/Manifest | 11 | ||||
| -rw-r--r-- | sys-devel/llvm/files/llvm-3.2-nodoctargz.patch | 45 | ||||
| -rw-r--r-- | sys-devel/llvm/llvm-9999.ebuild | 4 |
4 files changed, 58 insertions, 8 deletions
diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog index f75e5e8e1f2a..c493f5aed0b9 100644 --- a/sys-devel/llvm/ChangeLog +++ b/sys-devel/llvm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/llvm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.68 2012/04/30 15:09:25 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.69 2012/04/30 15:19:44 grobian Exp $ + + 30 Apr 2012; Fabian Groffen <grobian@gentoo.org> + +files/llvm-3.2-nodoctargz.patch, llvm-9999.ebuild: + Fix nodoctargz patch for latest source, bug #413111 30 Apr 2012; Fabian Groffen <grobian@gentoo.org> llvm-9999.ebuild: Extract the version LLVM refers to internally so we can properly fix diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index 2b8e98c8d379..80835f33c161 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -12,19 +12,20 @@ AUX llvm-3.0-PPC_macro.patch 1825 RMD160 d991c5c8c05cdc6e4ce6bf4b43059f54822d69b AUX llvm-3.0-gold_LTO_link.patch 442 RMD160 f480458cc7ef79bbfb948c2f6d2e4122eb55c564 SHA1 a92ac6454a751daf6643c1b402d102ce3c304b73 SHA256 62dc70a1d1f581b7f768ca728dcca688a741e03e64566d5f38e02e33c6372ab8 AUX llvm-3.0-ocaml_install.patch 664 RMD160 c439931f952e7e053b726435ae0a8e502ebe5080 SHA1 15c8a81baa0e6e78d734f5451b319bf6d896eb2a SHA256 6f451130ed8fcced98691361d33d4d44d8866e703673c293cf7f88af8362e694 AUX llvm-3.0-set_soname.patch 522 RMD160 84f8b4fe1f1f52a9503e4d5a2192b58c493f9047 SHA1 52ec640907aaca7c37ec0b96dba261529d8aded2 SHA256 0f4fe63baa74a963929dc39359cccb6eb4fba73176d72d4a354ebf50e51318a5 +AUX llvm-3.2-nodoctargz.patch 1761 RMD160 334a821b1b367e593407b918ec9df2f7585e29db SHA1 b68c794a34dadd9b5c3a5e4607da34ff50812f41 SHA256 e17494aef638d2fe3fb0b669516ffcc9e560161903e1e165de0eecba684c8c1b DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA1 6d49fe039d28e8664de25491c775cb2c599e30c1 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 500f587f840199ac53c4fc7572839d08fa9d9123 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779 DIST llvm-3.0.tar.gz 10350539 RMD160 85211cafbed1c5d838ac54669017b5298613f975 SHA1 b683e7294fcf69887c0d709025d4640f5dca755b SHA256 519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477 EBUILD llvm-2.8-r2.ebuild 6222 RMD160 34c51d4deb8ba605df908542a581099af7043a7f SHA1 c86b4cfe710b65ffedd934096df8394da9a8798f SHA256 4e9fc704a4aa3b1a8e07bf9807f1f3fbdc429d1ab075edf025dd6b96e003d852 EBUILD llvm-2.9-r2.ebuild 6179 RMD160 47fd4981eb19d1abd644f6a4b268b04f04b1a77c SHA1 03be220126b66435115c9b90606728aca9eebf25 SHA256 3118e5514d5f0adf026e8bab1dd6b13c07702480dd1b475c6861c0696c0f2dd9 EBUILD llvm-3.0-r2.ebuild 5681 RMD160 cdfa01da33d02f9a89b438d4268c618220b8e5f6 SHA1 1d437f99e3ed6fb6c553965ed0d26d330d53586d SHA256 5e6266684d533133610da81f59daea91ee703926447ce8089cb414bc09fa1b6b -EBUILD llvm-9999.ebuild 5628 RMD160 a570622a4a285dd026766ddfaac6cdfda7eae057 SHA1 81d3f8481c3c91c48d145293b3954ca5cd875e19 SHA256 e2311aebf9680d06b0b3482eaf64bff4f1dc4700fb8d7fbe4fcec4ebeb18f86c -MISC ChangeLog 11565 RMD160 9e2f9da5b06e6d601a0a14fab0234249f7ccec04 SHA1 171f8d621e9102b8a88bf12c19cd2d605413f456 SHA256 504a9ffa51285f56d89aa3dab370ce40ef60495ae15aaa5cf3b3ebe8e4c2fa94 +EBUILD llvm-9999.ebuild 5628 RMD160 07a24d195ec5cda13aee3ca38bd15e99ee6f503a SHA1 5b37b7c01edf8a62d80a2962d24ca6c912e70a66 SHA256 ab20afabbca5df133a500c4328fa497a526cf0c89ddc9e188fc1e3443ccb80da +MISC ChangeLog 11725 RMD160 7d0b1dc7ceece0a6c7ccdd378e5ed0bd9ecdf2ca SHA1 4f797652f366d464717de7aeb66a46ce5bc66e60 SHA256 5301520cf3f762ae6d1cb01205ba26652b03568707edb18b0423613ca3851404 MISC metadata.xml 2290 RMD160 3c36b274b863158d4a53be2c99ea5f42ede2bb80 SHA1 d608d42b2a831a4b9025fa1d2fd68fb11996293b SHA256 fd3cd6846072dbcacb0a3461a3d1a47bb09b858562df26fb9fc0769f0a292bf4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (Darwin) -iEYEARECAAYFAk+eq1cACgkQX3X2B8XHTonvoACfcU61JeGwB+zQrRyIvtiPjHln -0tMAnRPw03ZLktuGgL/hlzmsHfghAvu2 -=4MEs +iEYEARECAAYFAk+ercIACgkQX3X2B8XHToknCgCeJpxaWbH1to6lQ+81XCN9SIIP +Hk8An2X9DTIi/4hj1+0LUsORY0/EhNzI +=0PBf -----END PGP SIGNATURE----- diff --git a/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch b/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch new file mode 100644 index 000000000000..3a622b53daa9 --- /dev/null +++ b/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch @@ -0,0 +1,45 @@ +--- 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) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen +- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir) + $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \ + $(FIND) . -type f -exec \ + $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \; + +-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 714564b5706f..6f9358bf99ef 100644 --- a/sys-devel/llvm/llvm-9999.ebuild +++ b/sys-devel/llvm/llvm-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.24 2012/04/30 15:09:25 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.25 2012/04/30 15:19:44 grobian Exp $ EAPI="4" PYTHON_DEPEND="2" @@ -94,7 +94,7 @@ src_prepare() { python_convert_shebangs -r 2 test/Scripts epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch - epatch "${FILESDIR}"/${PN}-2.9-nodoctargz.patch + epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch epatch "${FILESDIR}"/${PN}-3.0-PPC_macro.patch # User patches |