diff options
| -rw-r--r-- | eclass/haskell-cabal.eclass | 51 | ||||
| -rw-r--r-- | sys-kernel/gentoo-sources/Manifest | 9 | ||||
| -rw-r--r-- | sys-kernel/gentoo-sources/gentoo-sources-4.14.293.ebuild | 28 | ||||
| -rw-r--r-- | sys-kernel/gentoo-sources/gentoo-sources-4.19.258.ebuild | 28 | ||||
| -rw-r--r-- | sys-kernel/gentoo-sources/gentoo-sources-4.9.328.ebuild | 28 |
5 files changed, 142 insertions, 2 deletions
diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index 0f7f67a244d7..5c0fcba0ebe1 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -180,7 +180,6 @@ fi # ) : ${CABAL_CHDEPS:=} - # @ECLASS_VARIABLE: CABAL_LIVE_VERSION # @PRE_INHERIT # @DEFAULT_UNSET @@ -188,6 +187,16 @@ fi # Set this to any value to prevent SRC_URI from being set automatically. : ${CABAL_LIVE_VERSION:=} +# @ECLASS_VARIABLE: GHC_BOOTSTRAP_PACKAGES +# @DEFAULT_UNSET +# @DESCRIPTION: +# Extra packages that need to be exposed when compiling Setup.hs +# @EXAMPLE: +# GHC_BOOTSTRAP_PACKAGES=( +# cabal-doctest +# ) +: ${GHC_BOOTSTRAP_PACKAGES:=} + # 'dev-haskell/cabal' passes those options with ./configure-based # configuration, but most packages don't need/don't accept it: # #515362, #515362 @@ -269,6 +278,10 @@ cabal-version() { # We ask portage, not ghc, so that we only pick up # portage-installed cabal versions. _CABAL_VERSION_CACHE="$(ghc-extract-pm-version dev-haskell/cabal)" + # exception for live (9999) version + if [[ "${_CABAL_VERSION_CACHE}" == 9999 ]]; then + _CABAL_VERSION_CACHE="$(ghc-cabal-version)" + fi fi fi echo "${_CABAL_VERSION_CACHE}" @@ -301,8 +314,42 @@ cabal-bootstrap() { setup_bootstrap_args+=(-threaded) fi + # The packages available when compiling Setup.hs need to be controlled, + # otherwise module name collisions are possible. + local -a bootstrap_pkg_args=(-hide-all-packages) + + # Expose common packages bundled with GHC + # See: <https://gitlab.haskell.org/ghc/ghc/-/wikis/commentary/libraries/version-history> + local default_exposed_pkgs=" + Cabal + base + binary + bytestring + containers + deepseq + directory + exceptions + filepath + haskeline + mtl + parsec + pretty + process + stm + template-haskell + terminfo + text + transformers + unix + xhtml + " + + for pkg in $default_exposed_pkgs ${GHC_BOOTSTRAP_PACKAGES[*]}; do + bootstrap_pkg_args+=(-package "$pkg") + done + make_setup() { - set -- -package "${cabalpackage}" --make "${setupmodule}" \ + set -- "${bootstrap_pkg_args[@]}" --make "${setupmodule}" \ $(ghc-make-args) \ "${setup_bootstrap_args[@]}" \ ${HCFLAGS} \ diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest index 1af2112c04ab..f7b487f40de1 100644 --- a/sys-kernel/gentoo-sources/Manifest +++ b/sys-kernel/gentoo-sources/Manifest @@ -13,6 +13,9 @@ DIST genpatches-4.14-302.extras.tar.xz 3656 BLAKE2B b84627b57c9aafb67c405a24f80c DIST genpatches-4.14-303.base.tar.xz 5852552 BLAKE2B c57656a4febfe96463625de3a3206c1175566ff45c13ec3da13a74c4b6a3cec03031ed7294a4eaccb1d48f389c0aa60b7133926414d65cc9f6469beea69d7f60 SHA512 a6348236f57694f2bc48fade9516ab0ac33de8e7e26faa091d6c45838eaacb6911eb07e81653692602d003ae48acf5139ae63421064e2ca760a56c2c908ad8cb DIST genpatches-4.14-303.experimental.tar.xz 5708 BLAKE2B 92f03ae563a7d9cad7c677263bbe092b16e3a1c2b29e59583d40911c9a2f37811d282737f4d98c1d014ab05243acd4c87faecf2334e94700ece87c436da730d4 SHA512 4c65694741bf81eab8f90b3d019f58dc6e82ae938d7ebce4d9fec60543697f8293309ccd8c79d8cf6929b4fdc34c43f91dd7548f6dc8c52091beb84e41c80368 DIST genpatches-4.14-303.extras.tar.xz 3656 BLAKE2B 2f250a314ad5e159a47b06fee8e38b3e5cb9be6fa1abce2773d33255b664c073513c81377c52e2ac3272b1dbd2ee194f805c816a5e6b0413291fb99b0f81966f SHA512 8efa20a34d986cef8a37b9af22fc1107805e2b795b43ed3834f309c615882f363b16311c1a3fed3318badea6a0a4faf8b9ee2c9902a607b6ebcd26515823b2a2 +DIST genpatches-4.14-304.base.tar.xz 5863064 BLAKE2B 80e98fd30f6a6419c2afce0574d46e13799ec21285e58e984dacdb53bcd610b01eb262cb2f2b3ad603569ce2f51a16345e7a17095ef2748c839402ddac2467f3 SHA512 6566b3bee292ec71ba36ec1459629baa030831c4fead9e5b414192d3e6f07b0bf197c798d795751d948dc8fd197482551598ddc71633fc34f3c0ac4571b3dedc +DIST genpatches-4.14-304.experimental.tar.xz 5708 BLAKE2B db262e17158ac68fd88403c2297b5759cea2201b7955edefbc7c05552634c2162a620fb8b335ce9ad5259117fbf654b3885f332329652e6b5b80518f5439b04f SHA512 fa1d05c2ea4b129e2d096978277000e3e5c5aed25aa8975c9052c25d81d16a9c388502d4e483b38ad191b5325e9ab5b4bf24577a3b64b3a16b57d8e095ae3d21 +DIST genpatches-4.14-304.extras.tar.xz 3652 BLAKE2B 707ca59e29f21cc1d6cf8b579bc85e8f9dc6e574fb60c0ba1c8022ff4afa9c72c3811adc623013de190d3553511973c75b4dd2362d5108c62bf1a72d1abcc5e6 SHA512 7915857fe0bef51c0152b9187cffd3744e659bf196b3beb708cffb05a77085137b9c6fe5e284bd9e3ff25f21a90962f20b78a1ab42c732e2752b897867ef1868 DIST genpatches-4.19-249.base.tar.xz 5600204 BLAKE2B aff3a7c269f42dc509a2d71285c90737e4e6872bba67f9ed5ba6599ea57cd4710152f31b4916cf3bfcdd6f4a0115953723b5f4851c2b2ebc247a3c9322bce90b SHA512 9fbd1b6c0a83478d20695c0a29a5ce61c296173317bda3226f76f5b6d588c3bf141ad7170b9397eb76e1454ee68e48ade8550af33add15e8568e753da6955173 DIST genpatches-4.19-249.experimental.tar.xz 5460 BLAKE2B 07bfb98c286bf7d893e5b4b9478dc3428236262b66d39160ce0a34b713d87d382b614e35e5d418305658da0706a67b0fa93e4926007a0c3fdf48131fad6a499e SHA512 753abcb94e38ac8282bf5f9a49a1b2fc65db67ce8ff473c2f5969213922e79996c447de0cb1a776e013c2e07753d4ae6a03189f6bde7da3470e0644cadb61a88 DIST genpatches-4.19-249.extras.tar.xz 3664 BLAKE2B 3f5a8d3f6d6acc48e1d1c82e7cf5bca7b9fcbede5b2362637ef82b4d36b406ff91b01654ca3c1129f3ca40377db35926b02ee6bb87c2ab27357e08b7554d3ba5 SHA512 f25835630b6f09037f706394ae173ffc0d4a41300d3a9065f241f322175bbb630bcf882de3c6a2cce2059045a10fdb2cfc4358ad8ebfc68c161331b84100846f @@ -25,6 +28,9 @@ DIST genpatches-4.19-255.extras.tar.xz 3664 BLAKE2B 4ac9065f4914e29b91760369a122 DIST genpatches-4.19-256.base.tar.xz 5714236 BLAKE2B 0bb3dfa91bc81e74a945b27d13b8a400f53888ea894650f99e3538442583b8d9ae284763c159f234bc998936134a2a3f10ac8cdc40234046eb06507971910f79 SHA512 7fcdd29c5500f12e1d823ff7b1fa9e3c33a6978e5f79559778b0a1f995b5d96a5654f7cfe47317388fde1cb10b61a5eefe61dfab0081a9423dc670d292df1515 DIST genpatches-4.19-256.experimental.tar.xz 5464 BLAKE2B ded78c1d095f2837ee328a8da4eb20653319e02f2e2736f3bc5158035bb2ffaa8b6e8d791275b202885b73febf34256d8819621bcdea79af1cd83e494d78fe6e SHA512 7fd1d8cc4cd3a70df9edb390eb1863220cf5e5de4d5c2a7a5fdf1ff8696be37c448d33e3ec4533e01a440f2e4662dc9357be1c6764c1bb4e4aca7361dea47e06 DIST genpatches-4.19-256.extras.tar.xz 3664 BLAKE2B 81a7bde84fcb2485507dcc8002cdc8fbbe9801c48da96dececa15e540c830d4d90df29d17ed5ff34365c658b3df14ec968c397c8c53e2ffa41a943a6eed2465d SHA512 c9eb4337261b2a3d98179e2b4c0d50789dbba3aad26e91f71b4078335a85653fcae27c148efa38036eb0bfe04c8011f75e0091079ddfb530a79e7a99b302aaa0 +DIST genpatches-4.19-257.base.tar.xz 5727008 BLAKE2B 4c5ab4c98861d461d67a909db806c0007a57487bf2ad3c91049c813759c9503b21001932534a087562e0f06c89300e418b8e54067dce852a3440f94d1aae8a0b SHA512 1fcc64e9cb05b5f0beb8370b8d5b4dcbfc6a3d2a187a4da34e4e30480603142a7786d1f0d2c366a88c2f007d67eb3aae6963f6d993cd2dd5d2b6299517308dba +DIST genpatches-4.19-257.experimental.tar.xz 5464 BLAKE2B 03286f075b1522dc0830126cb0b99536dbffaa2ae77b20e9b9c7b1bcffdfe3490de6df67de2f3d133f5f2a1f35c926e14cb59e8b7df6d86a4c5a3581e45a8324 SHA512 1f8fa1c112df79122e27962cfefa2d50469c04f2796f54333a0df3b288f892c5e2cd448f0efaaf53e6eedba7696700b3e0a3217594a96c677005d8f6a83fe1be +DIST genpatches-4.19-257.extras.tar.xz 3664 BLAKE2B e6be75d52ba5edfcb37a60f3ba50b465c4e5d456755fac776235feecaee57fab267ccf9e2d11f5ed2409d30aac63a8b553c803ddd68910e6ad85b0c27d68a6f5 SHA512 d0c449942fea4cc2a6c45dd015d1e91e8eb1659f0ab1f3f7ce50af308cd3b37050f1b00820cfc6a6dd85d90fddd66c0caadc41782799d70e546c72f993670259 DIST genpatches-4.9-324.base.tar.xz 5256552 BLAKE2B e264347c300df06aba685dc116100b82cd5f611971aacb22fb2832467cba51bcb6379b5543cbb89bbe05a94966cd12960996de3df8338bd30272e15dd54513a9 SHA512 1a93982191932dfd3ccc3bd80727a6c00e7a6326b196725468b1740f19c50ae7020afc67cde474c5e0ca0ce4c6cabbbfbddca980752bf5f22c7782ce76efd97b DIST genpatches-4.9-324.experimental.tar.xz 106360 BLAKE2B 6453e139134cb068f59d2c855c2d74cfb09fb450fcd0061c92d8951a45b85bf2b69dc9777649e183b463a86b3c4cba9bbb6ff7d53e9bdebe341a2cada4f57900 SHA512 aef60a9b2235487775790fc799749aaba052bc5325e2a1f328dbdc09e42857bfb73995c9de66067fbceb028588716201c023edbe30156ca3f9a7329b5ce63987 DIST genpatches-4.9-324.extras.tar.xz 3672 BLAKE2B a0fa11eb759f5ef643c17a31ca86ad2e68d78de9e038664508fe0ee598057c351735aed675aa7e8aadaa1358e79fc860ccd357dd6811befccab02da0a18a226c SHA512 78eb0ada42db6ec736556c55910587fc6ee05f18a185a48532e2db3910d8da407243fe07a547b33607aca626e1ef948dda513457e71798df2210a9e1649a2771 @@ -40,6 +46,9 @@ DIST genpatches-4.9-329.extras.tar.xz 3676 BLAKE2B 272bd53fdaf6f50f8f8a24d62e1e3 DIST genpatches-4.9-330.base.tar.xz 5305160 BLAKE2B 5c4273daba2294cd013f57b355047305b51efa5e16636182231ba42c02261cd26d02370f5c603d024235b0b4455812b00f0404f929d08dc6a3afbf8420c42c48 SHA512 75851f921f2ed89196ef7c65ee4af950e18b29501ecdc8ad3f097b85f5ca05b16b840782247c33a80d4403daa40b137c54a7555ea46ac1d8345f7b1071b813db DIST genpatches-4.9-330.experimental.tar.xz 106400 BLAKE2B 8fea5a488817e7e216bd99b00887c4c03adc09ebaf0443f41c9d8fbc715b1bd3d385d166987fb584d14f56a7224ba67db56726a7eac9a492098225f69bccf16d SHA512 d09a079d404ccc3fb840fc3307b72e50826f0dff497c175fad6ebc549fcc082dbd7171cf32929d30cf296ef09d37d138063197ee63755ec2afad55956ba8b329 DIST genpatches-4.9-330.extras.tar.xz 3676 BLAKE2B a4b70eb90d01d06355204013baf1ca366a8f08cddbcc4454785ca61202526b81701a23005e37aea88b9aa2df9c81b07dc8b6bc6b70ab05f0f9d27b5dbdad0ad9 SHA512 a15dbe9ef7b3b92f4e2225d397637398792f1fa811e1f84324c4803f08f09ed29f435e1336318dff4c74487fc95b4ab51549f55f43b14a832b3321829675203b +DIST genpatches-4.9-331.base.tar.xz 5312812 BLAKE2B 833bfe0876720272798b2660ad73dd5b9d221715fa114dcb91ee52b3c9211d9a88f08bd3a7a4a1a5ed3917cea802d8d1408796e66ae5aa6bfee820d618dd3f15 SHA512 2f6e3676bcee8b1c35c45d631882c36bdb155d39cf23b87c314f25e633b4646712b0a5b496d2625b6d0c13208eef774068ce91e4f0e0aff704ca54fa2b7d3ef7 +DIST genpatches-4.9-331.experimental.tar.xz 106384 BLAKE2B fa21188e53543a4444438525eb86e3be9eb2a1c794daaa04f0dd92a6be767b392cf1de69a358c9f8b9e6b56f886099b38dcfd1df02ae94da40580b9044186b5f SHA512 fcba59211223ca40c1f4e04ee70995ed52f8834583067ea2de00e777c292b07eb7fb5af7cfc5e302e586b6d67d5dc50ea41b40ea521bd58f077b99d6beee3cc6 +DIST genpatches-4.9-331.extras.tar.xz 3676 BLAKE2B dc948d2b3897bd2548d815e775ce0a664929888cd4e65c0b874d7a82bbf4e62b176670bcf2bab755671cecaa29aa81838433a67d6711b9535c734ff5f112682f SHA512 2c4be456187e1f5e6e2f5827c6330d95fdfacb6359f724e0b5e0bd6fa13a3381cf8cd8043a15ee2a78583b68841a8581fb76360625c4dd867f32bc839aea67d8 DIST genpatches-5.10-144.base.tar.xz 3907764 BLAKE2B 41b8ce08ca73879811e11d91f9365ddfbbc15617a4b825ba00144e71feb86e0ef24b3418b77b203a13ad6299237085a2a1c796beb6ac9aa98a5990a39fd1dd02 SHA512 1b946439d9cf6d97df1acadd7b36ef657fac40ff98b31e2237f3cc412e9efd6d4d1d409339af9d48779dbd9d88aac124f67e07afcf99e7760f93afb6d226131c DIST genpatches-5.10-144.experimental.tar.xz 16876 BLAKE2B 7be06890636984bcfec45818726c48dee9b2de69a3278bad8a79b1f9d4443695bf9fa56132b4f41c21564a43fe309f1191b2ce794430f6a697c58308d32396ff SHA512 677edca73f20e9c41fda7c400daf4870d00141cbd6ba8ced934ce785e3e6270db15f820ba5561202687fd437aa64ad2f71bb1a3f397c577d7d1dde90e1cc79e1 DIST genpatches-5.10-144.extras.tar.xz 3868 BLAKE2B 0d956a61fb525b8ce3b14c215a0c0a6ffa46f21fcf87a63884d31418946a64de0c680472a62fc9bc0d83f67b49dfe88ed373e3ff2ba2f369a0909e3947b27c16 SHA512 c870f84b1a4ae7b95518d08ab46fc7e632a47884e43a9c774be34335ebf825388136ed360f5129c8c97567600e79ce2889d64d9b60a1a8bd2a5b4052e74e2973 diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.293.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.293.ebuild new file mode 100644 index 000000000000..c82e8bf4f64a --- /dev/null +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.293.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="304" + +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" +IUSE="experimental" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" +} + +pkg_postrm() { + kernel-2_pkg_postrm +} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.258.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.258.ebuild new file mode 100644 index 000000000000..5b3ce6544a64 --- /dev/null +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.258.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="257" + +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" +IUSE="experimental" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" +} + +pkg_postrm() { + kernel-2_pkg_postrm +} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.328.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.328.ebuild new file mode 100644 index 000000000000..341fbba6f547 --- /dev/null +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.328.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="331" + +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" +IUSE="experimental" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" +} + +pkg_postrm() { + kernel-2_pkg_postrm +} |