From 636446b4c8be6ce19750b051dcfd5f2b1ab732ab Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 18 Jan 2015 11:51:05 +0000 Subject: [PATCH] Drop build-tile dependency on alex and happy. Released tarballs already comtain pregenerated parsers and lexers to ease bootstrap. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x611FF3AA --- dev-lang/ghc/ChangeLog | 7 ++++++- dev-lang/ghc/Manifest | 16 ++++++++-------- dev-lang/ghc/ghc-7.4.2.ebuild | 15 +++++++-------- dev-lang/ghc/ghc-7.6.3-r1.ebuild | 13 ++++++------- dev-lang/ghc/ghc-7.8.3.ebuild | 5 ++--- dev-lang/ghc/ghc-7.8.4.ebuild | 5 ++--- 6 files changed, 31 insertions(+), 30 deletions(-) diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog index 9003bc1a914f..ef61ec7c3071 100644 --- a/dev-lang/ghc/ChangeLog +++ b/dev-lang/ghc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/ghc # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.276 2015/01/17 15:41:39 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.277 2015/01/18 11:50:59 slyfox Exp $ + + 18 Jan 2015; Sergei Trofimovich ghc-7.4.2.ebuild, + ghc-7.6.3-r1.ebuild, ghc-7.8.3.ebuild, ghc-7.8.4.ebuild: + Drop build-tile dependency on alex and happy. Released tarballs already + comtain pregenerated parsers and lexers to ease bootstrap. 17 Jan 2015; Sergei Trofimovich ghc-7.8.4.ebuild: Regenerate .cmm parser against ia64-CLOSUREs patch. diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest index 095d37b80f54..d3d573120a0b 100644 --- a/dev-lang/ghc/Manifest +++ b/dev-lang/ghc/Manifest @@ -54,16 +54,16 @@ DIST ghc-bin-7.8.4-ppc.tbz2 112803496 SHA256 a47e0fb17137878af1e7b5a166046bee20d DIST ghc-bin-7.8.4-ppc64.tbz2 129284515 SHA256 1e8a350af39d1db1e58a74c9bc4a4c57765eceb33e5b32751fb31340b9ff02ff SHA512 53974e15c26cf6b62d8f838607abd209ec57cf0f45fcc48b90ad62736f5e4e7ff263dcd326ae03d8d5557a22eb9730e5eb8ae4eda55e52dd3d973bc73c84935e WHIRLPOOL adaaa92323d319f6576423ac41678f7d263f36e0e30d89fc14ee89104b006772c26d7b408be7f85225d1bddaf5f15ebdcbb7136f5c8bf7bda4bb0938eefbe6c2 DIST ghc-bin-7.8.4-sparc.tbz2 147340595 SHA256 1cde749ce3c47016c5c7a7179423d0aa2b174ddae4af0392ae3b7f57b098ec0c SHA512 ee5f0b2f1cf2693a0f2be9df71ef61b52bc2327225d40b8be955c1584b9901ffc6aaab63c1e46bf9bb352633b605c98378f8fd3e6cd71aef1c089007e4110217 WHIRLPOOL 27d55a016ffb49852553f920c29929c3bdf383e28b4b806ceb9ffc8b46a59b438801101402e498b069aa6eb56870b70a00ba7b1f4098f3fd8d8ddf1b20caa626 DIST ghc-bin-7.8.4-x86.tbz2 102312459 SHA256 4c53148836e5a1ba55b8db5bb7c3eb915103e0955fb503b2facdc5a72f12a974 SHA512 cabc5bd6d8760ce4120e7053f6c1dffca7d161ba454b6201087760096c037c932e3ff8c82e53346c8278855bf0cff1c2f5fb8046242ca4d8307355b060a9556e WHIRLPOOL 0171d67dc1b63381a491e1577a783eb0e8f53cb579ba96a9b4fdf6685d494d78eb2be780f77ff33422d3b7c320ed102d9b48f6e954f8fee5532982575001a4a5 -EBUILD ghc-7.4.2.ebuild 22109 SHA256 c061678ca7fb3e578856ed5e5ccd72b9e1cf86000889d41b64bf51dcfcdaad3c SHA512 9fa1ac3968cb2e9cc231d2fdaf0fee54b1070c925a86f5fc257858a3bab9eb1b684893a405d4f7fbbc0a6771fa06b7d572e790368f8093e23abed176cefaa43a WHIRLPOOL 813f4113c4dd73bfd0591d48f426a6451b1662458e75ea6b3f748a8d64fec354273cc15f8db218e03965338e87e0b00ffc424dd7defc77a5424ef8651fa29038 -EBUILD ghc-7.6.3-r1.ebuild 29019 SHA256 343248f0572b248bf68911c17c0be7b191831a32372c3fb8790d4058a0069ecd SHA512 185f14b1bbe37caf75544784dbea9859b5d539202b31a2f1c48775be7ee7ddd6dd5af0f6a647ff22dfac95c4d590243f4a3b66f5153438e31f472f7db3041759 WHIRLPOOL bca4e0dd6122a6e05973153119ce3d1db6a97ada0b8d0718638d6446eca7dec322bf954d86605b34ab76b5e0496bdae98ff88694e789476e7de6b78ef2def205 -EBUILD ghc-7.8.3.ebuild 20720 SHA256 9887614b5a6bc0df0bb5a3899344caf7c5555673cb6c080fe58749afe9c65985 SHA512 267750389414cd573a876d2fd6af57c2deea63d05d004bfe1d42cd98af73fc69cbd660e4ceb726b1eba223c99ad784aa2c9b1bb4ab9407f3f9640e36fd5ff7f5 WHIRLPOOL 4c24a143522443adb7c664671ee7d65b92dd28e9aedc444422eb1e23598b167c4b0ebd8ac8f6e4cd3b7cb130a6dab271838be1cc311e5ff95c3164d8a691af6e -EBUILD ghc-7.8.4.ebuild 20875 SHA256 4ff61f3382189060f60c14db16901db33acc422d8df7121df33ad792df4c4516 SHA512 ad0ae1be212f96c2b43cbc545b4d51583a4b919915a4adee088cf2d866353418ae736d8ccb780a07de3c50990de44c9ac254dc38274c74a6e58ce7993680c4bd WHIRLPOOL 52247f9a0caa8a2d81eabcfdc37780d7d9ce6327f914304ae980a4e81c4b998a531438b8e1caf70d5e1c133ab7cb1dda61f384c7cb2d4564495fa754ab9a990c -MISC ChangeLog 51918 SHA256 22e3cbe4e980839f39a8bae59f25b5834ca9a6c4b2751e201276c59ff35d92a9 SHA512 a6ff1fe9a0780a86618f1e790a18f2608dcaf69a848f207590b22fe7c2ba8e7a4754b017bba942e294b33ee28816442b7a73567fbe32b8e87359031282f0d3c5 WHIRLPOOL 2a4197d5dfee88bb9645df4f7c8eb7187732964960fe2b9ae6dac58d056c7d97e3991fc2c3d4490c542ff496b94a8350a9530739207b867083b3780f8d7460fc +EBUILD ghc-7.4.2.ebuild 22049 SHA256 cad96f90d066415ef7480b961725fc8408f0eefe73ebc31077323de7977a1f3a SHA512 7471abb5ad53cda9e2692838852f13355767e2c1fe2f0ea254874c52339e2d4fd2a51ae6a08e0b8f7b85ed690db33f8339cf93e7f60f6af371e7e5b50d13fb4c WHIRLPOOL 19fbd444c97740e8773857a249427fdcfcab33172e0c9d553485e8efd7d04ecb9fd7be4d7a536ecd5d28ba6a15daf31f57d02bac70c3215bb95c94f09c03845c +EBUILD ghc-7.6.3-r1.ebuild 28959 SHA256 d1058f089ebeec2f31e6c599588f0b670b05685c966cc737fcfb3ca5f979aea0 SHA512 6aa4078ec5739747e75f822ca38aa3fed297b520042e1a743599c306ede5c763c61fdd47727afb6f292f127155ed1948d129d9790003cf8d0b187a6f6669a683 WHIRLPOOL f42548e5c18cc3c6c044e9f5b1084378a14819577ac6b1f7898861fdd66d2b3a0b485f3f6eba78436911609416ca74b2ca531241268c3588425f6bb7544a2355 +EBUILD ghc-7.8.3.ebuild 20670 SHA256 b73c10844a39a8cbeaa6f8304270cfc021d2aabd380b28d0fe0803f1843e5b6b SHA512 1c1173a32eb7f1c54ad81030d2299a0905f7e79a23b307bc66afe4206e1b753c0947306106b5854bd8f2efe01c5db3687d7b1786db314aec8a21b147ab43f268 WHIRLPOOL e9b2d092552254e775d8d40c887f2e0dd3582959557a7c0317998bde97cc5dee3800c76d12a782c1eea8a5fb952a43d3fb329114afc08dc27f28177190226c9c +EBUILD ghc-7.8.4.ebuild 20825 SHA256 2c889559394cca2b79bec9a1a51bc5de8d1d40cabd234f73adcdd94d0c6f2702 SHA512 0d0e12706286cb2e65295b979a50cc8e1db91bfb26c59fee87f5219de0d7a590744df5374e0848d3ed4d29805f37891944661544de141d1e4fc2f82d27ebcf8e WHIRLPOOL aef39ac3d91a5ec2a9245b3b00ea48ab257aabd5f3aa14e9bdbde262bca8c3d612613d0ee388222b134c58520f56c18afbc82b0c6ee5607bd680e90da9067452 +MISC ChangeLog 52185 SHA256 cc8349b8b5831311877915b5b0b0f343fa833ee581bb89281b53d43350d8cd45 SHA512 de49cb6ebdc0d9a6cabedc236ce2fdc172b1acc60bc0e32ea36c8976133af5d21bd80a1baf40c414b56fd2c542b3018f9ba026b8c5ec4e6c126df7b17eebf5a1 WHIRLPOOL 09e3b98dd162c8de93f08e860ff9d0ae1e8f4dabd748e0ac926ba789b943099afe0b1e0ed5688eb964e77a36e9d51eadec8e525952cc2a06160b470a2e4f5bbd MISC metadata.xml 561 SHA256 f964cd5b31b8a5e1979c03ced645f9e28b61528b456340e36cacef4b25104735 SHA512 50ef5db553f7ae99de80ef2f45d2c6c9c3b85bc4ef70ef7f79797a3c47f33a8ca9c9caf14752f38b81f0abd17df594820bc2161a10c7d177c126fcb101b24c31 WHIRLPOOL 1d4e744e284d0053a8cff1547dd25c4f0f2dcb8da35dee4523dbadcc9e29a92beb6ce7e63044c09995ffb255d39c5f02d901b330c481763b608ba4ed6e243faf -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlS6grcACgkQcaHudmEf86pR2wCePLU2LyTnwr4+tidyrrwAYTCy -+zQAnRmGe/qK58+pwimQo7GA2wBKR7M0 -=FB3/ +iEYEAREIAAYFAlS7nigACgkQcaHudmEf86oVEQCeNjdXB/zL4fUvBnwkQTB9TDiO +CY8An2CFLq+cnRVhaKO4tpNGP+53uEnQ +=SBvb -----END PGP SIGNATURE----- diff --git a/dev-lang/ghc/ghc-7.4.2.ebuild b/dev-lang/ghc/ghc-7.4.2.ebuild index 14428d69cd9d..20922cd1f5d6 100644 --- a/dev-lang/ghc/ghc-7.4.2.ebuild +++ b/dev-lang/ghc/ghc-7.4.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild,v 1.15 2014/02/15 08:52:36 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild,v 1.16 2015/01/18 11:50:59 slyfox Exp $ # Brief explanation of the bootstrap logic: # @@ -96,12 +96,11 @@ RDEPEND=" # similar for glibc. we have bootstrapped binaries against glibc-2.14 DEPEND="${RDEPEND} - ghcbootstrap? ( >=dev-haskell/alex-2.3 - >=dev-haskell/happy-1.18 - doc? ( app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - >=dev-libs/libxslt-1.1.2 ) ) + ghcbootstrap? ( + doc? ( app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + >=dev-libs/libxslt-1.1.2 ) ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.14 ) ) )" PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )" diff --git a/dev-lang/ghc/ghc-7.6.3-r1.ebuild b/dev-lang/ghc/ghc-7.6.3-r1.ebuild index 58bdc7a60680..55ca0556c070 100644 --- a/dev-lang/ghc/ghc-7.6.3-r1.ebuild +++ b/dev-lang/ghc/ghc-7.6.3-r1.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/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.15 2015/01/02 23:50:56 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.16 2015/01/18 11:50:59 slyfox Exp $ # Brief explanation of the bootstrap logic: # @@ -107,12 +107,11 @@ RDEPEND=" # similar for glibc. we have bootstrapped binaries against glibc-2.14 DEPEND="${RDEPEND} - ghcbootstrap? ( >=dev-haskell/alex-2.3 - >=dev-haskell/happy-1.18 - doc? ( app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - >=dev-libs/libxslt-1.1.2 ) ) + ghcbootstrap? ( + doc? ( app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + >=dev-libs/libxslt-1.1.2 ) ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.15 ) ) )" PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )" diff --git a/dev-lang/ghc/ghc-7.8.3.ebuild b/dev-lang/ghc/ghc-7.8.3.ebuild index 11fb5b94efd8..d9b9fe514c98 100644 --- a/dev-lang/ghc/ghc-7.8.3.ebuild +++ b/dev-lang/ghc/ghc-7.8.3.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/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.11 2015/01/02 23:50:56 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.12 2015/01/18 11:50:59 slyfox Exp $ EAPI=5 @@ -86,8 +86,7 @@ RDEPEND=" # similar for glibc. we have bootstrapped binaries against glibc-2.17 DEPEND="${RDEPEND} - ghcbootstrap? ( >=dev-haskell/alex-2.3 - >=dev-haskell/happy-1.18 + ghcbootstrap? ( doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets diff --git a/dev-lang/ghc/ghc-7.8.4.ebuild b/dev-lang/ghc/ghc-7.8.4.ebuild index b78f4f0889c0..4b0a91ea1c51 100644 --- a/dev-lang/ghc/ghc-7.8.4.ebuild +++ b/dev-lang/ghc/ghc-7.8.4.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/dev-lang/ghc/ghc-7.8.4.ebuild,v 1.7 2015/01/17 15:41:39 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.4.ebuild,v 1.8 2015/01/18 11:50:59 slyfox Exp $ EAPI=5 @@ -87,8 +87,7 @@ RDEPEND=" # similar for glibc. we have bootstrapped binaries against glibc-2.17 DEPEND="${RDEPEND} - ghcbootstrap? ( >=dev-haskell/alex-2.3 - >=dev-haskell/happy-1.18 + ghcbootstrap? ( doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets -- 2.26.2