From 0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Jan 2018 19:03:35 +0000 Subject: gentoo resync : 21.01.2018 --- sys-apps/Manifest.gz | Bin 48517 -> 48504 bytes sys-apps/busybox/Manifest | 2 +- sys-apps/busybox/busybox-9999.ebuild | 2 + sys-apps/coreutils/Manifest | 2 +- sys-apps/coreutils/coreutils-8.28-r1.ebuild | 2 +- sys-apps/guix/Manifest | 6 +- sys-apps/guix/files/guix-0.12.0-AR.patch | 8 - .../guix/files/guix-0.12.0-no-json-crate.patch | 38 --- sys-apps/guix/guix-0.12.0-r3.ebuild | 139 ----------- sys-apps/guix/guix-0.14.0.ebuild | 150 ++++++++++++ sys-apps/iproute2/Manifest | 2 +- sys-apps/iproute2/iproute2-4.14.1-r1.ebuild | 2 +- sys-apps/kbd/Manifest | 2 +- sys-apps/kbd/kbd-2.0.4.ebuild | 4 +- sys-apps/portage/Manifest | 4 +- sys-apps/portage/portage-2.3.19-r1.ebuild | 2 +- sys-apps/portage/portage-2.3.20.ebuild | 260 +++++++++++++++++++++ 17 files changed, 426 insertions(+), 199 deletions(-) delete mode 100644 sys-apps/guix/files/guix-0.12.0-AR.patch delete mode 100644 sys-apps/guix/files/guix-0.12.0-no-json-crate.patch delete mode 100644 sys-apps/guix/guix-0.12.0-r3.ebuild create mode 100644 sys-apps/guix/guix-0.14.0.ebuild create mode 100644 sys-apps/portage/portage-2.3.20.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 1f1fbb287d64..68e9ee309533 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index 8930aab130a3..e1b1e71c9c41 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -21,5 +21,5 @@ DIST busybox-1.27.2.tar.bz2 2216527 BLAKE2B 77b8fa325b9ba691c0ac944537efdf5d8701 EBUILD busybox-1.25.1.ebuild 8597 BLAKE2B 14ef86039d47e2d6c2323aec3d25cf7840520b629888fd471af8a3eb5f096b314a4620ea4b819e487d5b77738a0c937dc85572bec5bac0869ed02e9afff9c83a SHA512 40c4af782f391f44a05bdde056c1c3d8935369dbfdad7b464f6883c4a4f82a4dc821427f7109da73a703891c0cb5ed65723c0b2c373fdf54155e7fafcb58553f EBUILD busybox-1.26.2-r1.ebuild 8934 BLAKE2B 6483597d33875e5298d285588a269a0ce4d3c88e4d8a3a36089f65a30939e19b749d234731cf35c54061b9bb7673e9f07f01cb661f68e81dc1e5ac490708687e SHA512 d5320f05e15b3b62e720d0fab274575a4ce4c18eca66b811e271c3dd7bafe2bcf9160fcb32d14a36849904f79623b9c1f4817029e813c51f2ef1aecb04375737 EBUILD busybox-1.27.2.ebuild 8934 BLAKE2B c940f059c0f6bad5a1d90292f67692cb806188168f32d0b97c0925223c95ec5d192c9471824b2eb53648b7d0449ea92b859a4ba222ccdd7b1e844a0d6c5e3201 SHA512 28543dc9a553778bdcf7dbae63cd4a726a326bd679658f634927a12a8008d2fb2f421acbb734fb780163773d55ba7f5afe4d6d63abcd9124d273c0bd2a3bb534 -EBUILD busybox-9999.ebuild 8865 BLAKE2B 9a23c4be503cd8b8ccc18c61c6821942bc9468da3553e8b9e6da834ced8646155345492cc9214a9ba35590d6f2a10d03d86b48a38d41fa93fbecfb72b5774860 SHA512 e7d943086a26ec8ad53f37b08fb71a50106fa35fdcd7e45770f47ad8c0d05ff9a66e9b3aa4bfeb3008c2dd91c30a7bcab7f6f3c9f33608d2fb67e2b79451e13c +EBUILD busybox-9999.ebuild 8936 BLAKE2B 19f5a5e58b33ecc7524d91c8fcaa41b348764c6947aa9948ded98025969f88053447af00f3c787338cce25c5fb6d67d7a761b3c6552645e650f367c37b064b0b SHA512 fc1fd4f220690befc1795c42a61491caa20d4e45172f69e37cd20bdc7b0952aa749542423e037a1fb34811179a8fb464afff94d6cc84cc00bee87208a96dcd61 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07 diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index 3abfee0f8026..73ee93bb96b8 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -126,7 +126,9 @@ src_configure() { # If these are not set and we are using a uclibc/busybox setup # all calls to system() will fail. busybox_config_option y ASH + busybox_config_option y SH_IS_ASH busybox_config_option n HUSH + busybox_config_option n SH_IS_HUSH busybox_config_option '"/run"' PID_FILE_PATH busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest index 560d781d047e..2a54357902a7 100644 --- a/sys-apps/coreutils/Manifest +++ b/sys-apps/coreutils/Manifest @@ -16,7 +16,7 @@ DIST coreutils-8.29.tar.xz 5286588 BLAKE2B cbb66d9054bdd2db5b9a6010876484b16d178 EBUILD coreutils-8.25.ebuild 5839 BLAKE2B 118fc33f8b2ce4dcb1b797af0630e3aa6ba45f491d220a700841f53201578afabb3088ad06552080a42137db7ff9d930c25d232d4c71b082c0e1e16f5d732348 SHA512 86a917921cfd7c20755c2570c58438f7bfe923f8838e91508300a745a4417038cc81112a50972f288a02ff3acbb0405ac01784170fbebd62c9ac4c1e40294816 EBUILD coreutils-8.26.ebuild 5858 BLAKE2B 9247499208fc8e9155b0b107dea5cd99b7e1da3ebc55c2cac9c25c4939d7a522afb8de33398169635c678fae8a0f58ee981d9542074e47aa0a6fe56041ae478e SHA512 fc8a6d01fb2e3885b876756dbc0c4a78e0300d470ca2e845de5045f6dc79f8d004b7069ca5df40bfee05662bbc01d05107ad793c868e2b6451b757fb2e149e14 EBUILD coreutils-8.27.ebuild 5901 BLAKE2B e15c043848f33eb817f0237b1428928feb5063b2b2e553667aff0b7ed5b81062fcb8e078d4419da2c6196de56d5dfeab7a849ee25afa4bdc80109f90d43c508a SHA512 a230b81b5913e0b98efe30f2876587178539c9dd462424c4eb71f5572fd496e4b0224f76cef92be973601f022f439ee36da393fabf4b70c2bfec71785321e8cd -EBUILD coreutils-8.28-r1.ebuild 6518 BLAKE2B 3362b3670258ee4e50bacaa00a93d126e7f961adc1a087f99395877e46594a80a95865b6261be08c920146718fdb2bf07807e5556f458f1ed5c803e10cce7375 SHA512 6069b08e59b17252ca1f3dded84870053a3fdd24441dd617ee91a132838166198ce14d9abfde0ff15721c4c668a01db3ed3020c09db8c4cf0e0303bd9a458c11 +EBUILD coreutils-8.28-r1.ebuild 6517 BLAKE2B 611f07f4028dc8524717136719b9905f8a8487c1f72a3b1e84d2985672a42ae85ce3b599f5e43ea151622e41c35bff5a57a5cf6ca7adcff4a5f4bf1f244e1005 SHA512 52e4d5ce216fef2b1dcc2b5ee7e8cf7e5d428053e2f330cd29961d9d72d3240b82a649232a60abacf8c7b620a3b2b2233cba9e2721265b00cda3c369c452ce05 EBUILD coreutils-8.28.ebuild 5871 BLAKE2B de4df961f1615d7acec165054e2118b81eb091d09ba7bdb773bb6592234643312713d78d09ad9def4cea37e0f41618426b089e4b5f4e9f14f95d751f1f90cc4b SHA512 e3f725bf850b21e6881465b29dca4984dc61a6cf0efc24f7c5ae970142cee83cdfd3fd1a8a8ab8801a66d99e40acffe655c6739c4c026c5c2deebdc19abd58bf EBUILD coreutils-8.29.ebuild 6063 BLAKE2B 3582ae6e941fa7d6dc47729939ebec016d6d682d616069cac70c58dc34ecf13820820191be18c353f0fc4d86bb6af7becd888024fa5cf21c718c005c26bebd90 SHA512 095b2958618e972ae9f6d04f7868acc97996a3fbd8bede850d6f215d392736cfe046ee5afb99919e10f34b1dfbcbdd501ef37880f9d6ab0a697d68e342231196 MISC metadata.xml 869 BLAKE2B 397aa866d67eb1d6ff5f604194cf071be0f75606092d78e1cf7f0ced85cf4474d67677307e7e8566ba402c1f94ae2f3e3906ef5006a50e73d6673edb25d517fa SHA512 19e07c93cbe1cfe087eb7fdc8647aa4c264f1e6a193a0ed4e1ceb302bda92565aa76966b6ef2efa15d7535082ef0e6a1454fee20eca4797466f5de5e37ac4957 diff --git a/sys-apps/coreutils/coreutils-8.28-r1.ebuild b/sys-apps/coreutils/coreutils-8.28-r1.ebuild index c53de9d8e493..9397aebfcb4c 100644 --- a/sys-apps/coreutils/coreutils-8.28-r1.ebuild +++ b/sys-apps/coreutils/coreutils-8.28-r1.ebuild @@ -24,7 +24,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux" IUSE="acl caps gmp hostname kill multicall nls selinux static test userland_BSD vanilla xattr" LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest index 596fe2008a66..0424a1101175 100644 --- a/sys-apps/guix/Manifest +++ b/sys-apps/guix/Manifest @@ -1,14 +1,12 @@ -AUX guix-0.12.0-AR.patch 245 BLAKE2B 5f73182271233de6f8d857f6c6db1f8a46801f078acfc207d64c1bd97780de78e66b22b84c0249fa3e9b453c893aee3088c8012fd442b665b218fa72d2e33bf8 SHA512 a8249858c77f7e3485d2851bdfd914fe45d0243087558a8155e941925d5b76adb4f9f5f7b380baf865158f2bbc8f3aa8a0d8901ea86baf5c3056ee548216723d -AUX guix-0.12.0-no-json-crate.patch 1234 BLAKE2B 0faa8e597c3b8d983e093b502f0b9a60836923ac0c9a84ba6684e2bfa1e77c221e7dcf34e14fae81c6b7df7c1b238a7134373a5ec2bc9ae37d0fd616a047fc6c SHA512 6c382181a7598ddb889be2cee712ebfe852b422c1f55c1e298658fd0a3270265dfeaff07d07eaf87c3e1fa79c35dc82d1d3e998413f0cabdfdda85ae56ff005d AUX guix-0.13.0-default-daemon.patch 2888 BLAKE2B 8f94b392167691338a9645697bfec6fc9299245f954dcd45ca3460bf627df7a1aef4d72594925b1ce6d8b656b48bfc37b5565932449482ccf8df1d4bb60105ac SHA512 011e047be6634f6e8b8fce46330c42571b505e05b1c5dcae40889bace64c7211af17d48ec4b817f46d3f9bf6109cb7bfce67823fd4add93e707d1aa8fec0dfcd AUX guix-daemon.initd 404 BLAKE2B ac539e478e463d862004613321e1f5bab32c371c701ee9f4378d71f34824b4a2831efd665c42969caf84e88eccc9bc1e1c12ff1abc971046ef30fb7cddec4cc1 SHA512 546e322b593cfd71d295b6f19fb336c988f05b1a459ca4b776c6aa129cfdec0004c85aee983cd7536a1bdd14e3edfcb25574b79a76a8134328c72fb1c83c8278 -DIST guix-0.12.0.tar.gz 15823786 BLAKE2B 96e1156a4ee32ec1500afd5529bade5408f538ea5280817efb1c31b6563e8aeefb554e82e9e4227198bf43e7b440aa062dd31cb607974f22859097e8f072dc84 SHA512 d61cb289d3773977400fa3c49869f30a3feb5e0364368017b9b8eaadee814c5c31897be398d6ff142349337334eb51cb6d0354bee27c0365de69ce1a09e858d3 DIST guix-0.13.0.tar.gz 18490387 BLAKE2B e146f7a414f91076eafebe122c0abd772c1c2a562da015e952f978e97528c099905c1e7157e659633e644cbbd7066feac021550d52cb76d5999ff464fb685f2f SHA512 39d4e627f69850da650448b72008c1b73cbda0286d6b805bb1ea14d72eb49c5f6bdf30755b791a8b9cbb94e91ce8c1f360963250587591ce1a47db457c901daf +DIST guix-0.14.0.tar.gz 19852695 BLAKE2B 257050ebebc35e7d6c82a30c3bb974da3d3eae9ca7c95dd8d98da6c60a68585330e5665b5343738188a058d84217d3c85731492e16afbd80c23771d40725b31c SHA512 635f6131c3ffa1ea5d18500fabc1d9d86d604a5cd3c8134d0f99dc44e171eef5d15f7ffa008c0e0726cf93fd0886afff0e9a5949014545d6919f8e8dba80eb69 DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 BLAKE2B 3337e52c2db259af98a6ed0eb418a6cd388e11e09c277c460e14edb7065d0170fd544415ccb72db1b1b2559fe700ce313698aed11846271052460f9af51f499a SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27 DIST guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap 2717576 BLAKE2B b7461803f0b3943ef1c855b02f4eef55ef96479cd453fb7ee11518159deca65f741d9c3384598a2fdb0b05b7a9023fb6983a5a3a6ccc204b0c6ac1328f3203cc SHA512 d546e2c0f676a49af482caae6f5575c7937647a81d37e49ad8be6fe12d58989cb825b5e12f2da28aff4649ee1a198ffb8f4a0beea65835a60aefaa905e87e337 DIST guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2656076 BLAKE2B a2c0c82ac3ba4ff5265a506bbe644dc6a61a38cec243e34e8d3bde2d543a4d7221aa921f57f057eb5379aea4e9fd462f0bee7df7e61e4e6381c93401948a9b11 SHA512 f2b257e5b10dcd7421273d8d04782a2bd733781094dd963bf5bd8294604dbd158ea25cbc383a227edce84de968a962ec834226ebdd137a2e1857e2191bfada8c DIST guix-bootstrap-mips64el-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2734180 BLAKE2B 8ac6d9cfb59b1e2214c112fa7bfe865966cd06cb0214f360dc337a54e16cb59e4e3aa6da0662a52e6bceedfbb2a9ebb0eb62fe08491e5761912e2ee17b7ecd48 SHA512 8c4be098a31f63d56e7d35c174ce4095ba8317662c365d44c005980b38ba499461926754a4659e699ab271bb841c9da514f1a36b812d881c212a5f12177d73c0 DIST guix-bootstrap-x86_64-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2885996 BLAKE2B c16595fcb821468d5d293201046642dd4f0b149bb5e64f7b784f29f513ce26243b9747a8eefee3128e813a9b4b27a6a60a1693706b3fcb8cbb238fb4ad6e56c1 SHA512 96efc583f42f6c7647bc026e2d2a96d603e7bea12ca02f6bcc65e819b9966082ac4c9f7e42f64536ff42a988e4766e695d87a82c73dd97d80745975a05badb23 -EBUILD guix-0.12.0-r3.ebuild 3445 BLAKE2B 9995e6507e61c40040dfbf5d10d39f8eae83bd6b2b442cd09545ed196a5d77e81111a2ac0170dee4fba9f20a2b6bfde3aad320c93d4b17ac07c4cc4c1537f514 SHA512 a6d02045dff6a3c0b0aa5a778a70af7b14e0163b400107a88d90ab245fac26bd85e645a972e43732fb862d546ce00143af161edce297f86cb72ab147d5ffce12 EBUILD guix-0.13.0-r1.ebuild 3585 BLAKE2B d78dc51abf4be7d3b0558fa9b96fd6696c4f35a83b3b2b28638d8a4de2dfedb8536477e077e5e8f3ecb1e27b95dc2e3e60fe61faad4deb88c922513b1ee3ca5a SHA512 500a6e19aabde2fe9259171a46b4214ab278548e8415e96dd4fcedcc332e30c6aaef58a4b3c2d02c2c40fc1f282fcf1c32e0113de1cbc2a3dc95bbb87a8e640c +EBUILD guix-0.14.0.ebuild 4042 BLAKE2B 292e76d39cb9d2c127c767e06a84a3b12415a72a78d1710c406fad458b227f6a198f1778abe4f23c82df9027e4d81ebf4e4e1965fb3670cfe13219df413c9bab SHA512 ee8a4b8c71f80b939d19d5e53d3f4020e0e797b9851dd3c59c31c725347e6c5775c8ea51d78efab86faee4a083d182d47ccebaedbcb43f930bad6d54e7cc9fe1 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd diff --git a/sys-apps/guix/files/guix-0.12.0-AR.patch b/sys-apps/guix/files/guix-0.12.0-AR.patch deleted file mode 100644 index c9c91c20734c..000000000000 --- a/sys-apps/guix/files/guix-0.12.0-AR.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff --git a/config-daemon.ac b/config-daemon.ac -index 056c939..b04deed 100644 ---- a/config-daemon.ac -+++ b/config-daemon.ac -@@ -7,2 +7,3 @@ dnl C++ environment. This macro must be used unconditionnaly. - AC_PROG_CXX -+AM_PROG_AR - AC_LANG([C++]) diff --git a/sys-apps/guix/files/guix-0.12.0-no-json-crate.patch b/sys-apps/guix/files/guix-0.12.0-no-json-crate.patch deleted file mode 100644 index 57b4308a3a89..000000000000 --- a/sys-apps/guix/files/guix-0.12.0-no-json-crate.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit 6023041346c79f7ac4105bba2552a82019fae840 -Author: David Thompson -Date: Fri Dec 30 14:15:35 2016 -0500 - - import: crate: Do not build when guile-json is not available. - - * Makefile.am (MODULES): Add 'guix/import/crate.scm' and - 'guix/scripts/import/crate.scm' only when HAVE_GUILE_JSON. - -diff --git a/Makefile.am b/Makefile.am -index 15939af12..97629f26e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -122,7 +122,6 @@ MODULES = \ - guix/import/snix.scm \ - guix/import/cabal.scm \ - guix/import/cran.scm \ -- guix/import/crate.scm \ - guix/import/hackage.scm \ - guix/import/elpa.scm \ - guix/scripts.scm \ -@@ -142,7 +141,6 @@ MODULES = \ - guix/scripts/lint.scm \ - guix/scripts/challenge.scm \ - guix/scripts/import/cran.scm \ -- guix/scripts/import/crate.scm \ - guix/scripts/import/gnu.scm \ - guix/scripts/import/nix.scm \ - guix/scripts/import/hackage.scm \ -@@ -162,6 +160,8 @@ if HAVE_GUILE_JSON - MODULES += \ - guix/import/github.scm \ - guix/import/json.scm \ -+ guix/import/crate.scm \ -+ guix/scripts/import/crate.scm \ - guix/import/pypi.scm \ - guix/scripts/import/pypi.scm \ - guix/import/cpan.scm \ diff --git a/sys-apps/guix/guix-0.12.0-r3.ebuild b/sys-apps/guix/guix-0.12.0-r3.ebuild deleted file mode 100644 index 3aea5c64be89..000000000000 --- a/sys-apps/guix/guix-0.12.0-r3.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools readme.gentoo-r1 user - -DESCRIPTION="GNU package manager (nix sibling)" -HOMEPAGE="https://www.gnu.org/software/guix/" - -# taken from gnu/local.mk -BOOT_GUILE=( - "armhf-linux 20150101 guile-2.0.11.tar.xz" - "i686-linux 20131110 guile-2.0.9.tar.xz" - "mips64el-linux 20131110 guile-2.0.9.tar.xz" - "x86_64-linux 20131110 guile-2.0.9.tar.xz" -) - -binary_src_uris() { - local system_date_guilep uri - for system_date_guilep in "${BOOT_GUILE[@]}"; do - # $1 $2 $3 - # "armhf-linux 20150101 guile-2.0.11.tar.xz" - set -- ${system_date_guilep} - uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3" - # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap - echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap" - done -} - -# copy bootstrap binaries from DISTDIR to ${S} -copy_boot_guile_binaries() { - local system_date_guilep - for system_date_guilep in "${BOOT_GUILE[@]}"; do - # $1 $2 $3 - # "armhf-linux 20150101 guile-2.0.11.tar.xz" - set -- ${system_date_guilep} - cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die - done -} - -SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz - $(binary_src_uris)" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RESTRICT=test # complains about size of config.log and refuses to start tests - -RDEPEND=" - dev-libs/libgcrypt:0= - >=dev-scheme/guile-2[regex,networking,threads] - dev-scheme/guile-json - sys-libs/zlib - app-arch/bzip2 - dev-db/sqlite -" - -DEPEND="${RDEPEND} -" - -QA_PREBUILT="usr/share/guile/site/2.0/gnu/packages/bootstrap/*" - -PATCHES=( - "${FILESDIR}"/${P}-no-json-crate.patch - "${FILESDIR}"/${P}-AR.patch -) - -DISABLE_AUTOFORMATTING=yes -DOC_CONTENTS="Quick start user guide on Gentoo: - -[as root] allow binary substitution to be downloaded (optional) - # guix archive --authorize < /usr/share/guix/hydra.gnu.org.pub -[as root] enable guix-daemon service: - [systemd] # systemctl enable guix-daemon - [openrc] # rc-update add guix-daemon -[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile -[as a user] install guix packages: - \$ guix package -i hello -[as a user] configure environment: - Somewhere in .bash_profile you might want to set - export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale - -Next steps: - guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html -" - -pkg_setup() { - enewgroup guixbuild - for i in {1..10}; do - # we list 'guixbuild' twice to - # both assign a primary group for user - # and add a user to /etc/group - enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild - done -} - -src_configure() { - # to be compatible with guix from /gnu/store - econf \ - --localstatedir="${EPREFIX}"/var -} - -src_prepare() { - copy_boot_guile_binaries - - default - - eautoreconf -} - -src_compile() { - # guile occasionally fails with 'bad address' - emake -j1 -} - -src_install() { - # TODO: emacs highlighter - default - - readme.gentoo_create_doc - - keepdir /etc/guix - # TODO: will need a tweak for prefix - keepdir /gnu/store - fowners root:guixbuild /gnu/store - fperms 1775 /gnu/store - - keepdir /var/guix/profiles/per-user - fperms 1777 /var/guix/profiles/per-user - - newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/sys-apps/guix/guix-0.14.0.ebuild b/sys-apps/guix/guix-0.14.0.ebuild new file mode 100644 index 000000000000..fee128e9630b --- /dev/null +++ b/sys-apps/guix/guix-0.14.0.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools readme.gentoo-r1 user + +DESCRIPTION="GNU package manager (nix sibling)" +HOMEPAGE="https://www.gnu.org/software/guix/" + +# taken from gnu/local.mk and build-aux/download.scm +BOOT_GUILE=( + "aarch64-linux 20170217 guile-2.0.14.tar.xz" + "armhf-linux 20150101 guile-2.0.11.tar.xz" + "i686-linux 20131110 guile-2.0.9.tar.xz" + "mips64el-linux 20131110 guile-2.0.9.tar.xz" + "x86_64-linux 20131110 guile-2.0.9.tar.xz" +) + +binary_src_uris() { + local system_date_guilep uri + for system_date_guilep in "${BOOT_GUILE[@]}"; do + # $1 $2 $3 + # "armhf-linux 20150101 guile-2.0.11.tar.xz" + set -- ${system_date_guilep} + uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3" + # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap + echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap" + done +} + +# copy bootstrap binaries from DISTDIR to ${S} +copy_boot_guile_binaries() { + local system_date_guilep + for system_date_guilep in "${BOOT_GUILE[@]}"; do + # $1 $2 $3 + # "armhf-linux 20150101 guile-2.0.11.tar.xz" + set -- ${system_date_guilep} + cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die + done +} + +SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz + $(binary_src_uris)" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RESTRICT=test # complains about size of config.log and refuses to start tests + +RDEPEND=" + dev-libs/libgcrypt:0= + >=dev-scheme/guile-2:=[regex,networking,threads] + dev-scheme/bytestructures + dev-scheme/guile-git + dev-scheme/guile-json + net-libs/gnutls[guile] + sys-libs/zlib + app-arch/bzip2 + dev-db/sqlite +" + +DEPEND="${RDEPEND} +" + +PATCHES=("${FILESDIR}"/${PN}-0.13.0-default-daemon.patch) + +QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*" + +DISABLE_AUTOFORMATTING=yes +DOC_CONTENTS="Quick start user guide on Gentoo: + +[as root] allow binary substitution to be downloaded (optional) + # guix archive --authorize < /usr/share/guix/hydra.gnu.org.pub +[as root] enable guix-daemon service: + [systemd] # systemctl enable guix-daemon + [openrc] # rc-update add guix-daemon +[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile +[as a user] install guix packages: + \$ guix package -i hello +[as a user] configure environment: + Somewhere in .bash_profile you might want to set + export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale + +Next steps: + guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html +" + +pkg_setup() { + enewgroup guixbuild + for i in {1..10}; do + # we list 'guixbuild' twice to + # both assign a primary group for user + # and add a user to /etc/group + enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild + done +} + +src_prepare() { + copy_boot_guile_binaries + + default + # build system is very eager to run automake itself: bug #625166 + eautomake + + # guile is trying to avoid recompilation by checking if file + # /usr/lib64/guile/2.2/site-ccache/guix/modules.go + # is newer than + # guix/modules.scm + # In case it is instead of using 'guix/modules.scm' guile + # loads system one (from potentially older version of guix). + # To work it around we bump last modification timestamp of + # '*.scm' files. + find "${S}" -name "*.scm" -exec touch {} + || die +} + +src_configure() { + # to be compatible with guix from /gnu/store + econf \ + --localstatedir="${EPREFIX}"/var +} + +src_compile() { + # guile occasionally fails with 'bad address' + emake -j1 +} + +src_install() { + # TODO: emacs highlighter + default + + readme.gentoo_create_doc + + keepdir /etc/guix + # TODO: will need a tweak for prefix + keepdir /gnu/store + fowners root:guixbuild /gnu/store + fperms 1775 /gnu/store + + keepdir /var/guix/profiles/per-user + fperms 1777 /var/guix/profiles/per-user + + newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index 066c0c6f4e50..dc20cfdd2fa8 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -23,7 +23,7 @@ EBUILD iproute2-4.11.0.ebuild 3986 BLAKE2B 0103b40fa4c1104421e3fac2d002cb8422498 EBUILD iproute2-4.12.0.ebuild 4212 BLAKE2B 8b40329be710f3d8461429dd94a5a4d4d29cff3b2bdec2a69870e4b24db9726f81885dac49e9afe3aecbca99d9039077a5553e87f5558c91cfb08ed903adfaca SHA512 d66105200c18892f642ab4c43fe3d72ab8cbfd7b1c212eb2b6d04b2e16f8389a1b5244abed85fbbefe4da90bf2604c57f6a0e13601b268b04609cf31c73da897 EBUILD iproute2-4.13.0.ebuild 4213 BLAKE2B 4a238544e35502f785f0916ec5bd255787b01fe5368d169d380778a5d514bd39784968073bcfaf2a2a7abaaf14c0fe85ec46f5374b204b46be887f750c823d62 SHA512 9e3d7ac9347a9e92ece5f6d737b688bd76136600264c888e449e0738c53a58de45a3459b1bd94f150bf2147f5232a8fefe571985bc2227f0d29322f8657d1039 EBUILD iproute2-4.14.0.ebuild 4150 BLAKE2B 2c218117921dbae1ac920bd3eaede84faf2e6983fdc26c158b4e8405ee0cc9620eb1fdba31aeae169a813e080edbba57fae958bd9429fd0e804a8245cdcfe195 SHA512 1a1c39f742febf5b064bd471e0ea3ed018f81018895833962e110c60d00b3f85351dbb9db5557ad43b3f1988dff0e5bbad69d307ccc6fe1ea637a24e171dc690 -EBUILD iproute2-4.14.1-r1.ebuild 3922 BLAKE2B c0fcd01bd73a71e460c4f760c5497d1db14997c31c5f6a0a8ea939acba001135861387486d67221fcc131126e02416f4dfee4ae0fbdbbcf6e0f240de21573c3e SHA512 a78d8387e2c67518136d19c982bd20c521b36c76b963a9e7565488648cc8ba18135e298b1252827af1a7c97ea553a33d66144f977d52ed50e1cafaf2ac64efe7 +EBUILD iproute2-4.14.1-r1.ebuild 3917 BLAKE2B 122d9152b518fbb536fb9fe427d19c520cb928d863ffeec86a1dddba7f872c2402b3b06bcdf62acd10406c905c17246d046dab058b083be6664f627b0acd90ee SHA512 0ad8578638859289f8621a9811656808cc987bc12349e6d0b9d9ab0cd95cc38d2c547bef3bba6ab905f8527b2132aad1ca21ec1b526bc4edba95b5607b797eb2 EBUILD iproute2-4.14.1-r2.ebuild 4097 BLAKE2B e97221d1703db06c06d8ae792a9c6cdd809c1e28d4dbbaa10f8b501db84788bd531cfd42972705fa84b4714c12c8f417bc0d61065e6443d9fbfbf65b7cdd7c3a SHA512 537e045806c5350b1eeeaed6547fffe38693e921cb079dd358b2fc296ffa096b8a7b63a81b6fda7ebd24e256e4b47ec2d7717f6418844bc3e39d92471db7a583 EBUILD iproute2-4.14.1-r3.ebuild 4267 BLAKE2B a38143923882628abcd8ef0ec26f41786d38a9cabd6f921e5916b6edb0c615ef0339557190471cf36f1c0f48e2283e4f40dac7628f06438ce3ba1082806198f4 SHA512 cea9d4f22d26ead507c532965a45bf9fc5e086b4b23d55d457b3386104d838d5a30395158d4d0a278e2df3c343715e73f46dbb3ed6ae2e57232e86a73d403d19 EBUILD iproute2-4.14.1-r4.ebuild 4305 BLAKE2B cee940c2a0e309cf9fd0c8d652410cc3acf32bd4abcee04055bde9cbfd38704734b3ca7b9ff92ac6f1ff7dd7b8036ac99221be3a9752bec7adcd5310534e49f8 SHA512 a8c6bdd2c21731bf54da7964aece0be7dd1e78948602f9f2534e1978fa783ad917f40f43eb62084046da1ce0ebaac6c840e7886cdcc44987e5b8225e06c40386 diff --git a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild index e84d53c46cd9..d165889df717 100644 --- a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild +++ b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86" fi DESCRIPTION="kernel routing and traffic control utilities" diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index a68e137d96a5..8f828aeae086 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -5,6 +5,6 @@ DIST kbd-2.0.3.tar.xz 1037036 BLAKE2B bbdc0ecd21e74c2d1074339f6d0e4caa69e0d3ee10 DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f EBUILD kbd-1.15.5-r1.ebuild 1040 BLAKE2B b0a2cd71950581a1a7bdcf75b4aa29787ef9b5e22cb5e482c885733be799b02b0d4433fd6a47a50a54efecfc0596d98a9cc30f42e67af9fd831414280f2a2039 SHA512 aea6c477a1527e5f38419c2356bf97e52bbfc9473919b182392d1a0bff96af9d0912b2cd132e4d015889a55e9b3a8613937b1d8e0d847b0d794596309ddc9ceb EBUILD kbd-2.0.3.ebuild 1360 BLAKE2B 3d285f5816f752701e123fc4441e9991dceb0d80eb9ee5f84f87f4cdb140306d23f7e7d40abca7df0ce372ec79ad55996e37b0fa6dc0bb67030fc5b8fde00cde SHA512 358c6679bea2e0270159fa07a4578f75c8356d1774e6d9f8def085f94225ac733a3e2e9a9e552485e15d763a0835256a9ea238893dd0280b4435f724cf23edba -EBUILD kbd-2.0.4.ebuild 1353 BLAKE2B 04d05d62ec1e81288d8ed6c1edac17e8e0991bc1147945459493e4b4b7b31a8e47001f8b223c1594f819249428ca9dfa86b1fa91a08a1213d00fbc7069c871aa SHA512 773f75e85efec50dff3a3e1778ba78da3e60b8d3715388b4cc7b4cc6d6f7a8b15e107b99d3027ecf3c1234346ef0c09e6247c8e161c60b6ad1bdee19ec248439 +EBUILD kbd-2.0.4.ebuild 1351 BLAKE2B 8eac72198ebbb768d02a6a6e9ae50c6f2f37d1a2938f6f10c0cdea0d053431fabd5864ccc3383bb017aee0b0921e2d90fc4466d03e0ccdea2c3020266c61e05f SHA512 232570febfc48781aca0167cf1ef8294895cf6cf6b497b7a3cebe656685be9a921a4a3693f6f25c52ac714d99a18da2558aef3231de8f1161f3b0cd678359320 EBUILD kbd-9999.ebuild 1412 BLAKE2B e0ed21760db01f1b81ed5b41225edb1fbc2b7638875fb663b7b4a70edc7a0f8dff5d02aaa289be61d2276035ec56589a4eebd2a3f9bdf2bdcf26a700b8a0020e SHA512 73150ecc4977e06aab03c867d97a9e78cfc749b1261fb099347072a4b07ff6a0fbdfa868c2262ed6d1c8ae2e994c137906aaf70e9a83919ba27025a600594fb7 MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641 diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild index e16d0d8ce7df..d1af17e39a9e 100644 --- a/sys-apps/kbd/kbd-2.0.4.ebuild +++ b/sys-apps/kbd/kbd-2.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_BRANCH="master" else SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86" fi inherit eutils ${SCM} diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index ac275d7adb6f..6336cdafe8f8 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -4,13 +4,15 @@ DIST portage-2.3.13.tar.bz2 945477 BLAKE2B 0ad44859f04db529713cc80a51e6dadc767ed DIST portage-2.3.14.tar.bz2 948535 BLAKE2B 765c9eabb64c3b095993bb244481df2d243f57ad97029d7bb3d9ac89fd0ee939fb3a2aaa624a0f40959820903d70e6c209518d97df6b82501325963c963db9df SHA512 36daf3b9425e08a8e136e87dbb7be43d4688b5505203f11938a07b916da441e1f802b1cbd2e97505c0dc1c249ba5fda2a059a4ad515c2887f8199d1e130a2732 DIST portage-2.3.16.tar.bz2 949134 BLAKE2B f8e7b6f13dfbf9aecdec444705042c6584c324522c0d131bf3c10f8fbfd5f6eeb97134afa42ed23da37f36ad4e2a0fc27129aebeb100aed2e3fd650c360ed060 SHA512 5847904b3262adcef04c7d6781cf2d03130480a49c5343a3a2d5cc36ddc7245ac30b1ba152329f96e2e4ca8d62ef387554cb228798db60f6f8141830d147dfaf DIST portage-2.3.19.tar.bz2 954921 BLAKE2B e1bb3606ff2c5ba7b2123c61469b99f4d5d89f534a9af26065ac03bb2accd00cd363e4027e33546fc9b6d01b2fb65ca0d4311c6e2e8cc518c09030c979a69240 SHA512 94899bdfa4d22c846234bd28d4744613202cf67d3f32c242cb7fb60b17419419a2a29912e584ade7df52fba4c6a58774c5859148352221c978f34b4e7680981d +DIST portage-2.3.20.tar.bz2 956633 BLAKE2B cf166a10522c5fab6b273674be4d7a673b961fe1c2ca649c7fa6d3759364dd1454ea57edd1e99fd2648b47244fde6f311fb925f50b9a118a1d2880048eb9f39e SHA512 e4fde56f5293b25ef5f484cf601c1db71c350603987e1b2736d9b8434158e8778c637dd5891401e6d484c7a11f1982bbe8213a352c185fc4c6b0039006756764 DIST portage-2.3.6.tar.bz2 943085 BLAKE2B 5c649ec5f5a82b5f55c71425d13ee3335a773c7f78500d6ec963594c95eba5d9fc49c37ab5ca1bde7621398443d526a8a1485b67748f859726f7f581e2d88091 SHA512 5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8 EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2896e0262f09c0d3243e8ef538582353e0386819b5c35ca192c2a3e28040296451157a5bb757c78bdb28885f101b22 SHA512 99cfbd35d7666eef17ea804a14788f4d1612d70743d8d37e4cd94e9eacace3486f7e78e4032215e52abf43fd416bdfbe5dd59178d494fa39b85d25ce569777db EBUILD portage-2.3.13.ebuild 8209 BLAKE2B 1004c283bb2b76242c9abc06664d4370867265c55ba9d62a1f477e769dce602018f6777891ea9f5674f0ae0f86ef52bd13ff5c353f48e7b711a418b2514af776 SHA512 9c190f7b21e34fd33e4d63185cefa011fdd9ced949c8310ea84e959db7834df725fa5d89de22fab958e6942589f44dae2e4b17047c060395ec69f0f7e9bf70b1 EBUILD portage-2.3.14.ebuild 8512 BLAKE2B e32c3ee1a5828cdbe53aad326c4dc6fbdcd57b7963b196ec4853bcb3cef900711ae50d0776200d8f9b74e7552022435dd7f260266c90e49b7bc0a4319a082673 SHA512 60ec8c92d5a46572945d90b9136f4b2f7e4fdf439beabe2d03563002075fa8cd3edc6fd101694795837de770e0545aa6083e2023f7a1483161f7355e8327215c EBUILD portage-2.3.16.ebuild 8360 BLAKE2B e86eb44b2dd331f52d308a63d3db0f94dd2873ba1fba84d9f3a2d0420a18ee656765238c4da0025ebc329a1b42025ab2f665b9374f757e3b7a40b67af2391564 SHA512 993dca2cc7a1b1d102507f11945922cc403771055dc273c10e92b62c55b9f47e9b32136a8d958f66de32476b2c60ce4d211e69cbb1fa7de7003ca0c658944025 -EBUILD portage-2.3.19-r1.ebuild 8413 BLAKE2B 6eda85487fe4fc1c55489ccd224f39f0d319efdfe02ff45a6addc4a1adb18c10233de3eb5939d6c584dd89a50d901d0dd345bf2d6598a8708304a0acedd44ff2 SHA512 fb05c03c4366e0599cc168a78e0467c80e9346f7a02f83aa4d69e9725e64abffc2f117c74239baa4e0195e19e4dfd8784b05aa9fbbc53147e70b783399828e9f +EBUILD portage-2.3.19-r1.ebuild 8411 BLAKE2B 8fef5e60dda148ec909e41d7baec1d4fb62544cc76afbcdeab9e12a0ece109435b3c7c1c330126fdfab8efc3b15a931bb8a8a8a23edde8744ecef48109e04cdc SHA512 4f391d25e2388a39775def36576da9a69d04d6055a61723bd1ec4df75f507759c7060451697a20aeca0e64f7a0df2a2efc1c360ef7dbe6d405a12b58b1576451 +EBUILD portage-2.3.20.ebuild 8417 BLAKE2B 9810d0113d505f17d79427d42b5d065b07495f1ec024bd853d7390ebb6226fc355aec038a7ade04fece97d21e68ad61fa063a238cc379173f5dd02cf4af42b38 SHA512 96e5a26737bfc3e10805fffd07ab7509d1888e96534b0df113fc00e18040671bfca8c0b7d12336d73e972f64862093af2f3b8cabcad2571234599450406be263 EBUILD portage-2.3.6.ebuild 8650 BLAKE2B a455ad0c60356d9e27115f20ca098536fe8ba76ec67c44a6244a5cbf1f2aeb3d5700e332a462decd77a78285bf9d2200a41a8487a0c8465b78625f1a9dcfc2fa SHA512 19083847eb304f04dcf63f3362ae6bc6fdb14cdb0f40673841e5155f9c9dd9578734dc93a8b8721cca3546b42a45b838feafc7632b35e916280d55041e5fe1cb EBUILD portage-2.3.8.ebuild 8196 BLAKE2B cd4e96948e07dd8f9c055847a6638e95725b8fe49158ebcde1a22b7aac1d23f269160e62786c58e78d6ab0273a555dabc17ff0f2d4560d3b52f5c892f3e7e631 SHA512 6b829c279d6447c6041723e113d71157127bef8d103b9f89a8e0c24b225c599b579f4f6d60b5f207590c79854d035ddc2b4ccf596f8d8f1d9bb93ed2d4dfc49e EBUILD portage-9999.ebuild 7951 BLAKE2B a1b82cea5366a9ca1b6291a997328035a5c1d84591028227f3f96f84905ea73b0074ef3e6f90624272ed23b7783971b6425e9609b7e93d77774ec15f6cfa02e7 SHA512 e158702758f00977e4f8f59371ea8025f019cde06aeb2ceb29a2f90a52582fe6a09169ed71da58cf2946d6bd4c8e867aa204141d02bcec7628d24a54bf14365d diff --git a/sys-apps/portage/portage-2.3.19-r1.ebuild b/sys-apps/portage/portage-2.3.19-r1.ebuild index 0881cef7533e..04830e6a4b2e 100644 --- a/sys-apps/portage/portage-2.3.19-r1.ebuild +++ b/sys-apps/portage/portage-2.3.19-r1.ebuild @@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86" SLOT="0" IUSE="build doc epydoc +ipc +native-extensions selinux xattr" diff --git a/sys-apps/portage/portage-2.3.20.ebuild b/sys-apps/portage/portage-2.3.20.ebuild new file mode 100644 index 000000000000..777f27ef0d54 --- /dev/null +++ b/sys-apps/portage/portage-2.3.20.ebuild @@ -0,0 +1,260 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( + pypy + python3_4 python3_5 python3_6 + python2_7 +) +PYTHON_REQ_USE='bzip2(+),threads(+)' + +inherit distutils-r1 systemd + +DESCRIPTION="Portage is the package management and distribution system for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +SLOT="0" +IUSE="build doc epydoc +ipc +native-extensions selinux xattr" + +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/sed-4.0.5 sys-devel/patch + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" +# Require sandbox-2.2 for bug #288863. +# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's +# quite slow, so it's not considered in the dependencies as an alternative to +# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so +# for now, don't pull in xattr deps for other kernels. +# For whirlpool hash, require python[ssl] (bug #425046). +# For compgen, require bash[readline] (bug #445576). +RDEPEND=" + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + !build? ( + >=sys-apps/sed-4.0.5 + app-shells/bash:0[readline] + >=app-admin/eselect-1.2 + $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ + python{2_7,3_4,3_5} pypy) + ) + elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_musl? ( >=sys-apps/sandbox-2.2 ) + elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) + >=app-misc/pax-utils-0.1.17 + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ + python2_7 pypy) + ) ) + !> \ + setup.cfg || die + fi + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i pym/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use xattr && use kernel_linux ; then + einfo "Adding FEATURES=xattr to make.globals ..." + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + if [[ -n ${EPREFIX} ]] ; then + einfo "Setting portage.const.EPREFIX ..." + sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ + -i pym/portage/const.py || \ + die "Failed to patch portage.const.EPREFIX" + + einfo "Prefixing shebangs ..." + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ + die "sed failed" + fi + done < <(find . -type f -print0) + + einfo "Adjusting make.globals ..." + sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ + -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ + -i cnf/make.globals || die "sed failed" + + einfo "Adjusting repos.conf ..." + sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ + -i cnf/repos.conf || die "sed failed" + if use prefix-guest ; then + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + fi + + einfo "Adding FEATURES=force-prefix to make.globals ..." + echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + cd "${S}/cnf" || die + if [ -f "make.conf.example.${ARCH}".diff ]; then + patch make.conf.example "make.conf.example.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + fi +} + +python_compile_all() { + local targets=() + use doc && targets+=( docbook ) + use epydoc && targets+=( epydoc ) + + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi +} + +python_test() { + esetup.py test +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all + + local targets=() + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use epydoc && targets+=( + install_epydoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf + + # Due to distutils/python-exec limitations + # these must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" + done +} + +pkg_preinst() { + # comment out sanity test until it is fixed to work + # with the new PORTAGE_PYM_PATH + #if [[ $ROOT == / ]] ; then + ## Run some minimal tests as a sanity check. + #local test_runner=$(find "${ED}" -name runTests) + #if [[ -n $test_runner && -x $test_runner ]] ; then + #einfo "Running preinst sanity tests..." + #"$test_runner" || die "preinst sanity tests failed" + #fi + #fi + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} + fi + + if has_version ">=${CATEGORY}/${PN}-2.3.1" && \ + has_version "<${CATEGORY}/${PN}-2.3.3"; then + SYNC_DEPTH_UPGRADE=true + else + SYNC_DEPTH_UPGRADE=false + fi +} + +pkg_postinst() { + if ${SYNC_DEPTH_UPGRADE}; then + ewarn "Please note that this release no longer respects sync-depth for" + ewarn "git repositories. There have been too many problems and" + ewarn "performance issues. See bugs 552814, 559008" + fi + einfo "" + einfo "This release of portage NO LONGER contains the repoman code base." + einfo "Repoman has its own ebuild and release package." + einfo "For repoman functionality please emerge app-portage/repoman" + einfo "Please report any bugs you may encounter." + einfo "" +} -- cgit v1.2.3