summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/Manifest.gzbin49839 -> 49542 bytes
-rw-r--r--sys-apps/file/Manifest2
-rw-r--r--sys-apps/file/file-5.37-r1.ebuild2
-rw-r--r--sys-apps/firejail/Manifest4
-rw-r--r--sys-apps/firejail/firejail-0.9.50.ebuild49
-rw-r--r--sys-apps/firejail/metadata.xml4
-rw-r--r--sys-apps/flock/Manifest3
-rw-r--r--sys-apps/flock/flock-2.19.ebuild19
-rw-r--r--sys-apps/flock/metadata.xml5
-rw-r--r--sys-apps/fwupd/Manifest5
-rw-r--r--sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch77
-rw-r--r--sys-apps/fwupd/fwupd-1.3.2.ebuild1
-rw-r--r--sys-apps/fwupd/fwupd-1.3.3-r1.ebuild (renamed from sys-apps/fwupd/fwupd-1.3.3.ebuild)7
-rw-r--r--sys-apps/gentoo-systemd-integration/Manifest2
-rw-r--r--sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild6
-rw-r--r--sys-apps/guix/Manifest5
-rw-r--r--sys-apps/guix/guix-1.0.0-r1.ebuild156
-rw-r--r--sys-apps/guix/guix-1.0.0.ebuild152
-rw-r--r--sys-apps/guix/guix-1.0.1.ebuild1
-rw-r--r--sys-apps/hwdata-redhat/Manifest4
-rw-r--r--sys-apps/hwdata-redhat/files/hwdata-redhat-0.217-python-3.patch13
-rw-r--r--sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild40
-rw-r--r--sys-apps/hwdata-redhat/metadata.xml5
-rw-r--r--sys-apps/install-xattr/Manifest2
-rw-r--r--sys-apps/install-xattr/install-xattr-0.8.ebuild46
-rw-r--r--sys-apps/iproute2/Manifest2
-rw-r--r--sys-apps/iproute2/iproute2-5.2.0-r1.ebuild2
-rw-r--r--sys-apps/kmod/Manifest2
-rw-r--r--sys-apps/kmod/kmod-26-r2.ebuild2
-rw-r--r--sys-apps/lcdutils/Manifest7
-rw-r--r--sys-apps/lcdutils/files/lcdutils-0.2-include-stdlib.h-for-exit.patch (renamed from sys-apps/lcdutils/files/include-stdlib.h-for-exit.patch)0
-rw-r--r--sys-apps/lcdutils/files/lcdutils-0.2-makefile.patch20
-rw-r--r--sys-apps/lcdutils/lcdutils-0.2-r1.ebuild25
-rw-r--r--sys-apps/lcdutils/lcdutils-0.2.ebuild35
-rw-r--r--sys-apps/lcdutils/metadata.xml12
-rw-r--r--sys-apps/lsb-release/Manifest2
-rw-r--r--sys-apps/lsb-release/metadata.xml6
-rw-r--r--sys-apps/openrc/Manifest6
-rw-r--r--sys-apps/openrc/openrc-0.41.2.ebuild35
-rw-r--r--sys-apps/openrc/openrc-0.42.1.ebuild33
-rw-r--r--sys-apps/openrc/openrc-9999.ebuild33
-rw-r--r--sys-apps/paxctld/Manifest4
-rw-r--r--sys-apps/paxctld/paxctld-1.2.3.ebuild (renamed from sys-apps/paxctld/paxctld-1.2.2.ebuild)2
-rw-r--r--sys-apps/pkgcore/Manifest4
-rw-r--r--sys-apps/pkgcore/pkgcore-0.10.7.ebuild (renamed from sys-apps/pkgcore/pkgcore-0.10.5.ebuild)0
-rw-r--r--sys-apps/portage/Manifest2
-rw-r--r--sys-apps/portage/portage-2.3.79.ebuild261
-rw-r--r--sys-apps/qcontrol/Manifest4
-rw-r--r--sys-apps/qcontrol/files/0.4.2-Makefile.patch4
-rw-r--r--sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild41
-rw-r--r--sys-apps/rng-tools/Manifest4
-rw-r--r--sys-apps/rng-tools/rng-tools-6.7-r2.ebuild2
-rw-r--r--sys-apps/rng-tools/rng-tools-6.8.ebuild86
-rw-r--r--sys-apps/systemd/Manifest2
-rw-r--r--sys-apps/systemd/systemd-243-r2.ebuild2
55 files changed, 541 insertions, 709 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 8913ba758c24..7a1411ce5ddd 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 1543fd8b1b8b..5ca82e0152cc 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -2,6 +2,6 @@ AUX file-5.37-CVE-2019-18218.patch 1038 BLAKE2B 30622d39fb4006b07fabab70dfe6fc3f
DIST file-5.36.tar.gz 875792 BLAKE2B ce1d98148e26c243982bb85357d440ab774fc42c526bca4dbff15c05247d2c15b54b030671a5590020fa5383c436204116f7817ec4dd33aa4387b059e4d7fe21 SHA512 3ec5e51ffb7a82defa74845a90fbc983f6e169fc116606049bc01ff6e720d340c8abf6eb7a08b9ac1099162a5c02deac3633b07b039d486344c8abd9052ca751
DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
EBUILD file-5.36.ebuild 3140 BLAKE2B 5dd07458582785009964253e23e2e52f1abf1ca163aea5b4c4a504fcc5d85443a3a865edfeeebb29b5be6c02db00eb010d91be1777072fc2f7b4713b95decea0 SHA512 261875b1a18aedea7ca70e54fdadb974ed40d8ef42852fa1b9f88860402fa7fa1ad27d36f52adf6390205aecab16b58d8c0464f1dcbbfb051a451bdbd32e6788
-EBUILD file-5.37-r1.ebuild 3209 BLAKE2B ef43572b251dea058e097956c54d58c79c2496a9fbe277ac6098ae22cf4f574f48ac5b8dee0a67599267022fbf559b5cf76d59822c56f840f527b2347fab9aef SHA512 52a2f42b4354de7dcf247328d9e169ec3fe2f4c9663fc8496ca5d6cd753dbd8e5569a26dace28d46c0002f4a39382a62e8fc89907bbb027c349ae30e7375d32d
+EBUILD file-5.37-r1.ebuild 3206 BLAKE2B 63ddf85b31c06e00bca8c6db2e5a7350e4a018295978e878587dbb8194bfa757b738f8d54d9c10e42c76d67c9a4b91caa7660f177aaa708df30715fbaabc06c6 SHA512 19516eff8a94546f2a5cd1774ab1bb432fdc1a8aa235f23a7dfb29995cad9c8cb2b8473697e2c784cfbae259eb77dab137ae9c8c8148c5e0ccc0ac52a6731f91
EBUILD file-9999.ebuild 3240 BLAKE2B deaea9fdf075c13ae9584fb37ad19193485118b9e4c5289b5fdf5bc365431a50df698b11cea463b4ce939d8534bd371fc0a64fac7f4b9b131c59054f79e035f4 SHA512 31da4beb4b69906ce21177453922c3e23a8580e0378135428f1e2ab8de1e34cce368dccebcecd6973bd5879351152156010d60982e393e1fcad632ddc755fb22
MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a
diff --git a/sys-apps/file/file-5.37-r1.ebuild b/sys-apps/file/file-5.37-r1.ebuild
index 746e3380b6e6..15902d849e8c 100644
--- a/sys-apps/file/file-5.37-r1.ebuild
+++ b/sys-apps/file/file-5.37-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index d66aabbfefe0..74531eb9d473 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,8 +1,6 @@
AUX 0.9.50-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5a4600a49ce2d79642479e5b649f5103d732aaa40ab2dbb8dcd563c75a5b0f048ae805134eef6d4afe52174b972 SHA512 04c88fbaa37c677efef1805c6b0bca6d87742acf5c80b047844e776e51c02c8803d2588a5dde74817b0cbbf6ce9d239ca39a823df1928ef36f232b403fb41889
AUX firejail-compressed-manpages.patch 598 BLAKE2B d9b39a043a4d9219e1a8413c04aa77ec971d572b43112d6d2481796f237f00bf3927ea77fd84f15cb0c3c8c4e60549c7cbe0e26181b348408a9b873f1ae03154 SHA512 3f488582ff46ee8e87a4752c073b8f8ae4c07b2262e7bdbc9b5dc54f6b94323fbbebb7fadcbb112bc7d0d9a4a29a8f898209e8940c78127749e1006569120230
-DIST firejail-0.9.50.tar.xz 279488 BLAKE2B 96d8e9161f0631ebfa400fd79c1d8d139d014da46cc2bf7fd3683f75ef7dced6a435e09e1733b675bc549662d50fddca9bd8811872a5ed186d731bb3c16903ea SHA512 766fe8a0c65ddc717759f0ea54a4fe72213f43ecf241c385e484eb7e47bebd5896976998c76e6a5ef9c153d4007c2a01e9d942cc9f352c4b085fb02fe708a87d
DIST firejail-0.9.60.tar.gz 1067102 BLAKE2B c5fd9a9c60fe17fc7ae24946ae5ea2f666d1dd20d982c540783dd2e56d30859a24258c4f3426e2bafaff3530557f5865bc73af9573e399039e8d5b097e5cddee SHA512 cb3eeff2f77801b4593a719a6b63da09cdc6c7f96f8ea8ea1aaa7e8538b080421a284441c6e43ce036fdf8510e08a73816c58d22f0af048344b8752f4a02759a
-EBUILD firejail-0.9.50.ebuild 1171 BLAKE2B 5b36b05b69a2936a8a94e56950fed464abc9719960305adbab0a228baedd930492ffca5cba4097db8ca68ca4371db74eaebbf702dd136876941c9a4556cbf0fc SHA512 639bebf94119505b10629c481c5db8df7eff476d84afe9795f4b9b9d56bb720c9e2a2507e9c50fa8156156badbe5ccfddc1d5f6f15b6b16591a594a4eea4b0df
EBUILD firejail-0.9.60-r1.ebuild 1739 BLAKE2B 42e3ab59089ac04bd56768985de0ecdff1a1c4aa81a5bafc98409b0d15c3f1a85676d28149da9acff3c0df416327cff3f3cf2396ce036fd3f03809236c482593 SHA512 7c24163c7742575152ba862fd5cb0e33144fc7072bc914c9f102fffb4b939078ce6193f0de626d38da0dbd0ae306fd251038f3e762058e0064af2b6936c58977
EBUILD firejail-9999.ebuild 2138 BLAKE2B 5f5134f7714330077f997a1d2714204dff80c4f41ed204ebc6d0e84c728e2d55b292b0bbad79903d01725492b4d9a45454948a8b9967379e694f82e49712ec1b SHA512 74426f3056a37ef9e9f8d430deafc9af15ba6957fef58cf0e43fdb9edf4321971ef92136c8261e528d53efba9602e304bf72c7096d65ba872808db0fe8e6d9c3
-MISC metadata.xml 1839 BLAKE2B 89a65b4a6f02a94778bee8b4fadb9b54cfb1220407f5fb256e7b0bb0a439a10069d7c84470be6a12ad478413eb2563b5f18f8cea0c60a11fb6582c94f991c06f SHA512 539f6f95e5df4bd194a473e140205414620dfa47d0be1e51a3557b04f3185b8471d6f378b9dc661c41f1cb04962810b1276f79477377f8f0880171a2b0f47b9b
+MISC metadata.xml 1685 BLAKE2B dad0274bfdc82a077e254d7659d66a6070e538205f7bb5dba600096a3771404071a60f571e556065bd15bbc4f0d6a12562a9e43ca39b8cbdc32bb19813bfeb0c SHA512 0ce8e6291fbebfb9d80232b414838eaa2e00842880084276caec236338b60886047ae3a936646466bdd6ee6d8079038a59b34785ba559207fc7bebe3b93f392e
diff --git a/sys-apps/firejail/firejail-0.9.50.ebuild b/sys-apps/firejail/firejail-0.9.50.ebuild
deleted file mode 100644
index 85b81b1bd4d5..000000000000
--- a/sys-apps/firejail/firejail-0.9.50.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Security sandbox for any type of processes"
-HOMEPAGE="https://firejail.wordpress.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="apparmor +bind +chroot contrib +file-transfer +network
- network-restricted +seccomp +userns x11"
-
-DEPEND="!sys-apps/firejail-lts
- apparmor? ( sys-libs/libapparmor )"
-RDEPEND="${DEPEND}
- x11? ( x11-wm/xpra[client,server] )"
-
-PATCHES=( "${FILESDIR}/${PV}-contrib-fix.patch" )
-
-RESTRICT=test
-
-src_prepare() {
- default
- find -name Makefile.in -exec sed -i -r \
- -e '/^\tinstall .*COPYING /d' \
- -e '/CFLAGS/s: (-O2|-ggdb) : :g' \
- -e '1iCC=@CC@' {} + || die
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable apparmor)
- $(use_enable bind)
- $(use_enable chroot)
- $(use_enable contrib contrib-install)
- $(use_enable file-transfer)
- $(use_enable network)
- $(use_enable seccomp)
- $(use_enable userns)
- $(use_enable x11)
- )
- use network-restricted && myeconfargs+=( --enable-network=restricted )
- econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail/metadata.xml
index 3af2a06d7a1d..07938ac97ea4 100644
--- a/sys-apps/firejail/metadata.xml
+++ b/sys-apps/firejail/metadata.xml
@@ -14,18 +14,16 @@
This is the regular version. For a long term support version see sys-apps/firejail-lts.
</longdescription>
<upstream>
+ <remote-id type="cpe">cpe:/a:firejail_project:firejail</remote-id>
<remote-id type="github">netblue30/firejail</remote-id>
</upstream>
<use>
<flag name="apparmor">Enable support for custom AppArmor profiles</flag>
- <flag name="bind">Enable custom bind mounts</flag>
<flag name="chroot">Enable chrooting to custom directory</flag>
<flag name="contrib">Install contrib scripts</flag>
<flag name="file-transfer">Enable file transfers between sandboxes and the host system</flag>
<flag name="globalcfg">Enable global config file</flag>
<flag name="network">Enable networking features</flag>
- <flag name="network-restricted">Grant access to --interface, --net=ethXXX and --netfilter only to root user;
- regular users are only allowed --net=none</flag>
<flag name="overlayfs">Enable overlayfs</flag>
<flag name="private-home">Enable private home feature</flag>
<flag name="seccomp">Enable system call filtering</flag>
diff --git a/sys-apps/flock/Manifest b/sys-apps/flock/Manifest
deleted file mode 100644
index 5cc049141fd5..000000000000
--- a/sys-apps/flock/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST flock-2.19.tar.gz 5452 BLAKE2B c3906ea309f17def315aac3988a1865769502d111951fc3f4bf5e54b65b166d8c98e358f2b9c71335a6411ece416073c64e017651a229bde3c06e321103eab17 SHA512 f6b3e88731e343a7845b5354668b24a6c0d4bbf75ba992f73cfdacb814ceb95088371a162935d41ca22fd648493a79f9b3dbfd045af497449fad7ea5c48be21f
-EBUILD flock-2.19.ebuild 397 BLAKE2B 895881a29cb86a3b7dedc976e53159207bffb253f034771cedb3f8ba2d7fd3679923779877036437a9978595f979b0ab1d158bd9668ce574b5ce8fceec4c2909 SHA512 cd211d93d9a01ba3cd7cc00eae0d6163919bb09120dc7aee137e875ae34f1fed57bb4d6f5d891483d8cca0a889ebc6656bbda105d00e1dd4255d6419b75feba2
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/flock/flock-2.19.ebuild b/sys-apps/flock/flock-2.19.ebuild
deleted file mode 100644
index 636679105276..000000000000
--- a/sys-apps/flock/flock-2.19.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit freebsd
-
-DESCRIPTION="Manage locks from shell scripts"
-HOMEPAGE="http://svnweb.freebsd.org/ports/head/sysutils/flock/"
-SRC_URI="http://www.zonov.org/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND=""
-DEPEND="sys-freebsd/freebsd-mk-defs
- virtual/pmake"
diff --git a/sys-apps/flock/metadata.xml b/sys-apps/flock/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/sys-apps/flock/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 07aeb8680f28..35474f4ca960 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,4 +1,3 @@
-AUX fwupd-1.2.9-without_systemd_build_fix.patch 2232 BLAKE2B 9cdd0466f4d9e86f823ddd1cfd3d899545cccd4ecf933cb48447a5010cd67ede434834ebfb348f457404da2f10395f2987e56afa3549432bff53380236eccac0 SHA512 29790db66320547fd1046f5f05d0485c54d984be8e0394bba5e8a64dbb73328639896840ece42d4d252d48a2a9c30fe599e0b064491ed16bb7b028ee18f6484b
AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de
DIST fwupd-1.2.8.tar.gz 1911999 BLAKE2B 61a24ce24f778b96f7ad23496890f7a1d20c09e6bbd707f29d154992668d5c0a25cfd31b5d0d11519740e086c098cbdfd440fe9f5cab4dde0ac43fe6b438e911 SHA512 d603f9f4e5a4c0fc6abb0b75f7d884eff47fb8a16285aa545f7140fe98ce781d127ff3769f9c206bb3bfd084bbc5bf6abf9424f70e727ff79162416fe7881154
@@ -6,6 +5,6 @@ DIST fwupd-1.3.2.tar.gz 2100817 BLAKE2B 49441603ac0934a10b730b82b4f86cbdac03c3ab
DIST fwupd-1.3.3.tar.gz 2125604 BLAKE2B 4471d270ec7f99857dd811b2ba9d8f591a0787ee7ad2bf45edff90904483b8fe54483cde2722e7ee9afb426b17b4d4090f6935b3fa2712a277d058802fc2e9f5 SHA512 b8f0d88fa9c1c8219dd040775d76207f1be87294ebb5f38043b77a670a1601cc597a711f5635aa3d164a08ee0dd068dd22514acae96f6fc5ad20d35099d02f50
EBUILD fwupd-1.2.11.ebuild 3768 BLAKE2B 5a9b07a619542ad0f4e778bbbc54928aa345fa3b6995ebc29c05c72e445a1a88fe5b03cd896f59c71346acb55aff00258ab2ec2678bd5895986514fbf427ce40 SHA512 aeda057c4dab66bf0bac38413cf8ff93e6036c902e8037994978925156dfda1d4f6d3431d33d54f7faca8d5509311e4b134848e5d71d51e2f6deb80165183943
EBUILD fwupd-1.2.8.ebuild 3656 BLAKE2B 4f219b26d50bc3fd9560ec8684a3629f788f92f6b9fa15ef1d948302f40f6194191b4a7d0a9891a5b8d5973d75d575df3d48c27e49733f32a0c8454af0c621d6 SHA512 224bcb6a1b84676695992bdcdcb6d28892b8068ad4f4a09d5b7bad50fba77902c4b10d172e705aa703195f80a0b879cb8322c9f5bb08a9610c502432e6908c5d
-EBUILD fwupd-1.3.2.ebuild 3816 BLAKE2B 26454756617c530a9b9d2c686e51ad19187ed29ecb32775780dbb95656a5479ea8c3e294c93bbbce56c1db89e761ba2059d2aaa9147ed875ab5961eb694f286d SHA512 e62c310ba101ae3dac52c9ddf971fc96cd30c0633b9da26debb1cfcf12d28b2d3ee11a931303dd1f68d7a7247fafb57737934661391081ae3da274d8c93da083
-EBUILD fwupd-1.3.3.ebuild 3817 BLAKE2B e3d8b2d52dc643af9cf4ea301c32f790d76f22c958269ebe9f5d7e9702bba2f794713e77425ec7b9ad980065fbfd56f625ce2d584052dd49da63e8501c9aef85 SHA512 9916bac5e22301339255bd3dd63d58c8e518e04deeb0f0dd22b385708a3b07f4462589622ff08a573b6d8d0d7989b217469c0cf0ca95400d1e501de46b2dd7cd
+EBUILD fwupd-1.3.2.ebuild 3844 BLAKE2B 841247f22be46bc8fe07f2dfd7768027782262b8042ce7c09c0f16019266c4d3b9c48741f0f58700171a746b4aea4c4f0b1ff618913d2d619641f72d7e647af9 SHA512 9b7d7396dede2dad6fb7cb75f2528bd85ada0dabaaa6c87cd13ef7a6c01f376d32d098c17f833d77e79931c0ecf4abe46d07bfe615a7f55a99d26c450e1df4e8
+EBUILD fwupd-1.3.3-r1.ebuild 3961 BLAKE2B cd73af45cd3c45c8b98aadba4a12ddd6aca773a68048bea1330f09a73919c94eca3c7d9e375fa6199f30d0e9701cdf2ce29552de0d5c354a8be88767ffa0549f SHA512 7cee94266bb8d1f3c0ae9d9b447b6988b4f96231042eaabadd000765e13d4e0510a3bd0823cf1176a5f2a51a38b4c46da94981e5ba8f7eea258316070107e3e0
MISC metadata.xml 1333 BLAKE2B 7978d7232cd10e4fd6d19684077dd1ba1a7db10c4869bfffcb7bc6410134da36572bccc21bd00ed29671513f3ea1323bec4dac15fdbb94e22adf523fdcd90fae SHA512 188a5b54787b8b41a0101ec580a59e0edebb94db65c4360bfc3dd108458a8ea80d43873a1109075bdac15beb77034d3a1d4d118a29235da6c74faed5111355f7
diff --git a/sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch b/sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch
deleted file mode 100644
index 37be190d8aa1..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From d92cccaf1396d93f97480f32694372b8256f9b11 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 20 May 2019 11:28:31 +0100
-Subject: [PATCH] trivial: Fix non-systemd build
-
----
- src/fu-tool.c | 2 ++
- src/fu-util-common.c | 5 ++++-
- src/fu-util.c | 6 +++++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/src/fu-tool.c b/src/fu-tool.c
-index 353a52e88..eac7a8cc4 100644
---- a/src/fu-tool.c
-+++ b/src/fu-tool.c
-@@ -113,8 +113,10 @@ fu_util_start_engine (FuUtilPrivate *priv, FuEngineLoadFlags flags, GError **err
- {
- g_autoptr(GError) error_local = NULL;
-
-+#ifdef HAVE_SYSTEMD
- if (!fu_systemd_unit_stop (fu_util_get_systemd_unit (), &error_local))
- g_debug ("Failed top stop daemon: %s", error_local->message);
-+#endif
- if (!fu_engine_load (priv->engine, flags, error))
- return FALSE;
- if (fu_engine_get_tainted (priv->engine)) {
-diff --git a/src/fu-util-common.c b/src/fu-util-common.c
-index 219752b1e..51e16f671 100644
---- a/src/fu-util-common.c
-+++ b/src/fu-util-common.c
-@@ -28,6 +28,7 @@ fu_util_get_systemd_unit (void)
- return SYSTEMD_FWUPD_UNIT;
- }
-
-+#ifdef HAVE_SYSTEMD
- static const gchar *
- fu_util_get_expected_command (const gchar *target)
- {
-@@ -35,10 +36,12 @@ fu_util_get_expected_command (const gchar *target)
- return "fwupd.fwupdmgr";
- return "fwupdmgr";
- }
-+#endif
-
- gboolean
- fu_util_using_correct_daemon (GError **error)
- {
-+#ifdef HAVE_SYSTEMD
- g_autofree gchar *default_target = NULL;
- g_autoptr(GError) error_local = NULL;
- const gchar *target = fu_util_get_systemd_unit ();
-@@ -58,7 +61,7 @@ fu_util_using_correct_daemon (GError **error)
- fu_util_get_expected_command (target));
- return FALSE;
- }
--
-+#endif
- return TRUE;
- }
-
-diff --git a/src/fu-util.c b/src/fu-util.c
-index c8528e71e..dec96e741 100644
---- a/src/fu-util.c
-+++ b/src/fu-util.c
-@@ -2122,7 +2122,11 @@ fu_util_modify_config (FuUtilPrivate *priv, gchar **values, GError **error)
- if (!fu_util_prompt_for_boolean (FALSE))
- return TRUE;
- }
-- return fu_systemd_unit_stop (fu_util_get_systemd_unit (), error);
-+#ifdef HAVE_SYSTEMD
-+ if (!fu_systemd_unit_stop (fu_util_get_systemd_unit (), error))
-+ return FALSE;
-+#endif
-+ return TRUE;
- }
-
- static void
diff --git a/sys-apps/fwupd/fwupd-1.3.2.ebuild b/sys-apps/fwupd/fwupd-1.3.2.ebuild
index b1c77f7d52de..a3a5324b96da 100644
--- a/sys-apps/fwupd/fwupd-1.3.2.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.2.ebuild
@@ -87,6 +87,7 @@ RDEPEND="
"
pkg_setup() {
+ python-single-r1_pkg_setup
if use nvme; then
kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
fi
diff --git a/sys-apps/fwupd/fwupd-1.3.3.ebuild b/sys-apps/fwupd/fwupd-1.3.3-r1.ebuild
index 71773bc2c483..684e4c548a49 100644
--- a/sys-apps/fwupd/fwupd-1.3.3.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.3-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{5,6,7} )
-inherit linux-info meson python-single-r1 vala xdg
+inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
HOMEPAGE="https://fwupd.org"
@@ -87,6 +87,9 @@ RDEPEND="
"
pkg_setup() {
+ tc-ld-disable-gold # bug https://github.com/fwupd/fwupd/issues/1530
+
+ python-single-r1_pkg_setup
if use nvme; then
kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
fi
@@ -126,7 +129,7 @@ src_configure() {
# Dependencies are not available (yet?)
-Dplugin_modem_manager="false"
)
-
+ export CACHE_DIRECTORY="${T}"
meson_src_configure
}
diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest
index d230e31237f1..86d043268888 100644
--- a/sys-apps/gentoo-systemd-integration/Manifest
+++ b/sys-apps/gentoo-systemd-integration/Manifest
@@ -1,4 +1,4 @@
DIST gentoo-systemd-integration-7.tar.gz 64243 BLAKE2B 389c6627af6eca9b4a0854d35751a8cb45cdb2795c7b621e96e9d5bcc13a80fe1cb109c0cb2bfd9d33f7642fd08198a0afbd5b4e5956ea6ba8dc89cf4635d9c0 SHA512 cd47caa01d73da57998b6b37d89cbeb53fa722c7f4a31bb03d03762350490cde1db3ce06090df6b6ff25c1cafb40f6c2186efbd52156ebc6d078b4a59d6fef52
EBUILD gentoo-systemd-integration-7.ebuild 795 BLAKE2B 2c805a1b5ce121177976d0b617dca47124dff234dedfa506928eb850d5c040db89aee7b78d731535104118d074db65c634ebbe7b4e849c134e3a84307ca68671 SHA512 9c9e95d6f959f361db79972ff2eec3e3b5a07d42589d6e6756d77f937e1d5aafdd591c44fb866b361e8e67c67398acb5cdaeca37786b21d907f375d48275721e
-EBUILD gentoo-systemd-integration-9999.ebuild 798 BLAKE2B 158bfac69e33f9e4a888ddc0e9d5145717845d58d0e1ef46b5fc25386450fae0cc3f8dcaca666e19d43da4399bfc1cad3eb59e3a0a120b2d2141dac3e7876deb SHA512 accb867e55abf208d58f603fc1f1a38eff01ce40ed1d169fc5b841dee86e65db4786edb20d38efb4993e58520f12a59e44acfaaee6ec04e7f3b2efced97c817c
+EBUILD gentoo-systemd-integration-9999.ebuild 729 BLAKE2B 24adcb67d253b61a09eee0df7ee78cbcafc01c3e60f5d114351204f456cdd4c138f5c27c311e72ef80e976458424266c2b9d979aa1c8022887e7b01936975841 SHA512 bd37d55941397bf4aefda23375d58892a480d4348548a543d5a0d5139acfba677082e4c14eb839a9e9b77952fb86dd32623e0b9f255a36cc32ad9327d32ce345
MISC metadata.xml 355 BLAKE2B e2e7d95fe4d4f671d0b8a24bee9db8c458232ceed374b7ed902f724ca5971cebb81acc19fe62a6d53bf98cff4c7b999d3dbcf674426e46accda3d591d6009545 SHA512 b590b927b555441da6f665dbf637ffaa27651f074a62d1738959c5913f45ee648146f9054e07ade42d5f28f93cb350b43c94299a50506d01d446de22ebacdbc0
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
index 74179967eb4f..37315de4274a 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -26,10 +26,6 @@ RDEPEND=">=sys-apps/systemd-207
DEPEND=">=sys-apps/systemd-207
virtual/pkgconfig"
-if [[ ${PV} == 9999 ]]; then
- DEPEND+=" sys-devel/systemd-m4"
-fi
-
src_prepare() {
default
[[ ${PV} != 9999 ]] || eautoreconf
diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest
index 37f7d04f23e1..fdc163c03ad8 100644
--- a/sys-apps/guix/Manifest
+++ b/sys-apps/guix/Manifest
@@ -1,13 +1,10 @@
AUX guix-0.16.0-default-daemon.patch 2082 BLAKE2B c60299f9cf2718fb227340acab688206d5453df98b80890e1659d2e477d2a1e9fe1a2d21fb9696ccdb67dd000d094103a38e979de2105023d175cff69a740846 SHA512 69d2089a089bc4718bcdb6f8e5dd17cff8cd07149d8c10182b7cb22d343d8137b368725d7e3d4bc0d380b0eeabe22cae5b3b914ded0cbdac6307bf9d5c898285
AUX guix-daemon.initd 404 BLAKE2B ac539e478e463d862004613321e1f5bab32c371c701ee9f4378d71f34824b4a2831efd665c42969caf84e88eccc9bc1e1c12ff1abc971046ef30fb7cddec4cc1 SHA512 546e322b593cfd71d295b6f19fb336c988f05b1a459ca4b776c6aa129cfdec0004c85aee983cd7536a1bdd14e3edfcb25574b79a76a8134328c72fb1c83c8278
-DIST guix-1.0.0.tar.gz 30707058 BLAKE2B 061aaa7068b2da641a613c36838d9853eeefd6ab6a2d9d9645a86fbeb9a7dcd370cc6a0d2ff45469235c2296edde540471675ed858522dcd6351e853a8617ff8 SHA512 45af6f80d1d4f4a63d00741070904acbb4986241561f52b4e81ce92fcdab6806a9ee10cbabfb6eddf88c4132cf9d678640d3a2c9895f170f8e6cbbf4d2128419
DIST guix-1.0.1.tar.gz 31992360 BLAKE2B 84ef9ffba36d72f3a99167e0089a02f54172c9e8dd95e74aa55467383698aba3b26dc38992dc159903608b0623a707065b129b359e83338f5f361ce0e98e6ea4 SHA512 b884a4c6e099bf12bee547f5b247ac1bfb0d10a227712079ca1a857f75c3cf20d40d2c90780a8b486f5ee8e40366de44487d3f8429e570c561a72073506ac588
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-1.0.0-r1.ebuild 4318 BLAKE2B 0b772abfb69fbd24492842bcb477ec8ea9c6003e385912cd254f35962a10e86dfe56981adc3b83651a7499a322a7b60bf66cfc1048d5f696a816ae14cb499604 SHA512 fedf3fff7bb23ef49e16fe49280a6a52947f3bdef38897f2fc135837d9d2fc1a884c70a1f63eb56a9d58c89eb6bdff33216bf0ed13bf034b828fe20b764cd14f
-EBUILD guix-1.0.0.ebuild 4099 BLAKE2B 6972352ba69a95522407debbe30b71a5b7a418a0ceb721390c3987eec72b895281f704b213a891e4ecfb6f6b9be81c1f85a176832be2b5779bfbe0152971adfb SHA512 de5fd8a904bf15bdd3b810ab865e42ac0cca977e3fa1d10df052e27548c20af9cb07e85878c4a344a48337c1f209da7338c4a0f9b66d2ca7da6a5de2fa8e6036
-EBUILD guix-1.0.1.ebuild 4507 BLAKE2B 3d9dd2b0f9f8b091eb9c67df1f60c30b30f442e0d957cc7c2037d79b75673c3a2cf95752619b5a7a7ece664862fdf23ec0db7ce708f3a2bca75a640297388f92 SHA512 8766136693c12181e5b4af9d2f912bfd93b8a9292515480a474c49d1d44425ff1ed099a8517155cc30326a4dbd041505ae031568b2fc100f6245a4fc058c8f86
+EBUILD guix-1.0.1.ebuild 4561 BLAKE2B e83b2007f66bef0612f6aea68f894645c0856a41312857ceef3d3084e4f684d69d87a37a9f7fa1cf6c49f7b585dfc73fab1240c2a588ba9b60c73021aedbeaa1 SHA512 60c31ddb829937de5995e643be99739267345a5ea4aed91953ca593e3d4ac71bc6674cd41bf9019da2fdd0524af91f6f1b69e7a76a45a1af4bff7a75dc2e5d66
MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/sys-apps/guix/guix-1.0.0-r1.ebuild b/sys-apps/guix/guix-1.0.0-r1.ebuild
deleted file mode 100644
index 475d3bba8b83..000000000000
--- a/sys-apps/guix/guix-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools readme.gentoo-r1 systemd user
-
-DESCRIPTION="GNU package manager (nix sibling)"
-HOMEPAGE="https://www.gnu.org/software/guix/"
-
-# taken from gnu/local.mk and gnu/packages/bootstrap.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/${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.2:=[regex,networking,threads]
- dev-scheme/bytestructures
- dev-scheme/guile-gcrypt
- >=dev-scheme/guile-git-0.2.0
- dev-scheme/guile-json
- dev-scheme/guile-sqlite3
- net-libs/gnutls[guile]
- sys-libs/zlib
- app-arch/bzip2
- dev-db/sqlite
-"
-
-DEPEND="${RDEPEND}
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.16.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/ci.guix.info.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
- eautoreconf
-
- # 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
-
- # Gentoo stores systemd unit files in lib, never in lib64: bug #689772
- sed -i nix/local.mk \
- -e 's|systemdservicedir = $(libdir)/systemd/system|systemdservicedir = '"$(systemd_get_systemunitdir)"'|' || 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/guix/guix-1.0.0.ebuild b/sys-apps/guix/guix-1.0.0.ebuild
deleted file mode 100644
index 218eb8858e5d..000000000000
--- a/sys-apps/guix/guix-1.0.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 gnu/packages/bootstrap.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/${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.2:=[regex,networking,threads]
- dev-scheme/bytestructures
- dev-scheme/guile-gcrypt
- >=dev-scheme/guile-git-0.2.0
- dev-scheme/guile-json
- dev-scheme/guile-sqlite3
- net-libs/gnutls[guile]
- sys-libs/zlib
- app-arch/bzip2
- dev-db/sqlite
-"
-
-DEPEND="${RDEPEND}
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.16.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/ci.guix.info.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
- eautoreconf
-
- # 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/guix/guix-1.0.1.ebuild b/sys-apps/guix/guix-1.0.1.ebuild
index cb8689ab8712..309d371d09c3 100644
--- a/sys-apps/guix/guix-1.0.1.ebuild
+++ b/sys-apps/guix/guix-1.0.1.ebuild
@@ -122,6 +122,7 @@ src_prepare() {
# loads system one (from potentially older version of guix).
# To work it around we bump last modification timestamp of
# '*.scm' files.
+ # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
find "${S}" -name "*.scm" -exec touch {} + || die
# Gentoo stores systemd unit files in lib, never in lib64: bug #689772
diff --git a/sys-apps/hwdata-redhat/Manifest b/sys-apps/hwdata-redhat/Manifest
deleted file mode 100644
index 58b4df7d4cc3..000000000000
--- a/sys-apps/hwdata-redhat/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX hwdata-redhat-0.217-python-3.patch 227 BLAKE2B 457b3e02ec68f773ddeba3e2ae3a10e6a6db662ee5e324e0745fa872010b59ed2c0b703a294e2c675baf58e0bff3131cca3e390b1ed52939f507ae1655d68c80 SHA512 eed127d4d5b4b33c8f7e1bf25c7a7d5a09c1ccea37d7fd8f0c1139dc000b6879763edd78cb26fe978100d24f3092b2474a6e20535e8aa0363da435e775ef579c
-DIST hwdata-0.217-1.fc9.src.rpm 735079 BLAKE2B e1e25329a42307c36be611d66db7f016d8e4c360c6d84086c830d1d0c47a9a764501cd45f6dd84298a5da52c21f9d9a05ba5875867b3386e358f4af56fa98de6 SHA512 31f057d62283adb926b3e89f4128e256a111d92e6bf0a63adea752d94be2b2e86ffa7535ba6d77a84373dc1ddbc5feb53e337520a8eb6063937e573cccef2634
-EBUILD hwdata-redhat-0.217.ebuild 1099 BLAKE2B a66fb57d2e38eefdda325d2dca59239b3e776cd5b2a3006eeb3983ffd006ad3c6fb5b0218d225b597918703649e1e24bfed8b523f091b4376885dba8ea41c117 SHA512 2affd6910646eb3e057f0de993f4a55c28fe0ab4fadd8f2e48860e29c3e480bd8ec1cac5c3f0db3c8ff5b953299804ad7d217b1381b98449ca3c7938b6378dde
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/hwdata-redhat/files/hwdata-redhat-0.217-python-3.patch b/sys-apps/hwdata-redhat/files/hwdata-redhat-0.217-python-3.patch
deleted file mode 100644
index f16fddd992c4..000000000000
--- a/sys-apps/hwdata-redhat/files/hwdata-redhat-0.217-python-3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- check-pci-ids.py
-+++ check-pci-ids.py
-@@ -5,8 +5,8 @@
-
- # Check that the sorting order is preserved in pci.ids
-
--vendor_id = None
--device_id = None
-+vendor_id = -1
-+device_id = -1
- lineno = 1
-
- file = open("pci.ids")
diff --git a/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild b/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild
deleted file mode 100644
index 5885b39f566f..000000000000
--- a/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils flag-o-matic rpm
-
-# Tag for which Fedora Core version it's from
-FCVER="9"
-# Revision of the RPM. Shouldn't affect us, as we're just grabbing the source
-# tarball out of it
-RPMREV="1"
-
-MY_P="${P/-redhat}"
-DESCRIPTION="Hardware identification and configuration data"
-HOMEPAGE="https://fedora.redhat.com/projects/config-tools/"
-SRC_URI="https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/9/Everything/source/SRPMS/${MY_P}-${RPMREV}.fc${FCVER}.src.rpm"
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-RDEPEND="virtual/modutils
- !sys-apps/hwdata-gentoo"
-DEPEND="${RDEPEND}
- test? ( sys-apps/pciutils )"
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- rpm_src_unpack ${A}
-
- cd "${S}"
- sed -i -e "s:\(/sbin\/lspci\):/usr\1:g" Makefile || die
- epatch "${FILESDIR}/${P}-python-3.patch"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- # Don't let it overwrite a udev-installed file
- rm -rf "${D}"/etc/ || die
-}
diff --git a/sys-apps/hwdata-redhat/metadata.xml b/sys-apps/hwdata-redhat/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/sys-apps/hwdata-redhat/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-apps/install-xattr/Manifest b/sys-apps/install-xattr/Manifest
index 2d18d2b718ef..25f811480bd7 100644
--- a/sys-apps/install-xattr/Manifest
+++ b/sys-apps/install-xattr/Manifest
@@ -1,6 +1,8 @@
DIST install-xattr-0.5.tar.bz2 16136 BLAKE2B 8973584d4819b9f500dcfb76ed0eaddce725b78e72dfa73ccff52c745e6f041926f8f930e5c5035fa888402c6b530207546098864266268dee2c897404bf7c74 SHA512 0bbde3a548fc5062041b38f90ac09c402f3cb0aebf4f0c331552fc44d39dd3d5e4d73bca0811de36c53af8afa5d22e543a7c90107d272f2a1b97c819b244eb7c
DIST install-xattr-0.7.tar.bz2 16200 BLAKE2B bdddd4610e5fbb6f6ccfcdfb37abacff00ada5ca5fa18a6a4ad254b623ebe6dc9d0a2c8931f919f8623ed8f64e9c09584d6beabffbf3c72088f80383b198a2d7 SHA512 1cb4a4e72a9c5820081e032bd0d681ef985a228ad9bb025d5eb31c7b57678348d772f270def803376f2d9d4f8e6ebcede9629ce65eef917b3e8a06d6f40eec44
+DIST install-xattr-0.8.tar.bz2 16359 BLAKE2B 25c483211ea6d01f46d9739fd3f1327e543e8b986a252d97e8b012ff6169a9b6430dc0ab7c184bf04c6665182c242eb37f7059d2d23cecececea723bde74cb56 SHA512 3af95a724d95286854767fe28679b024de8d257ce2d21addecbd40906e10bf48cfd4263609c6c2f436c6a807e91d24118110fda041091fadbefd848c892af778
EBUILD install-xattr-0.5.ebuild 910 BLAKE2B 99504c17e85a6c5fd9a5d17f73ffb929879ac8f55773bb48e844405371ecc1965b1816a077d57c1093e2f20f4bf8edbdd7653037f486be4648f542f58777dd80 SHA512 edcb914a669002180eac241d124805c8017cd446405f3b8c59a4341f655620385c192e60ab8f681c0c336c3b30887c8cc855472a2e5a4e638790354e9eccd5e8
EBUILD install-xattr-0.7.ebuild 1011 BLAKE2B a594ec3eadb5d7077d7205f6cbba45f82717a7fb5a292e5af42398b9a316e222ed5700a0b5ff7c6078badbbb313081c0b7120894de271eb01eead4cf9facdf77 SHA512 f619bf65db059c10b32de8423e845632f0133bd62ba4580172c83758024a44d6f8e9d9289fb1a8c2c93c5f50e7ea63932f8a50289a043e9750a0cf54927f5a4b
+EBUILD install-xattr-0.8.ebuild 1011 BLAKE2B a594ec3eadb5d7077d7205f6cbba45f82717a7fb5a292e5af42398b9a316e222ed5700a0b5ff7c6078badbbb313081c0b7120894de271eb01eead4cf9facdf77 SHA512 f619bf65db059c10b32de8423e845632f0133bd62ba4580172c83758024a44d6f8e9d9289fb1a8c2c93c5f50e7ea63932f8a50289a043e9750a0cf54927f5a4b
EBUILD install-xattr-9999.ebuild 1011 BLAKE2B a594ec3eadb5d7077d7205f6cbba45f82717a7fb5a292e5af42398b9a316e222ed5700a0b5ff7c6078badbbb313081c0b7120894de271eb01eead4cf9facdf77 SHA512 f619bf65db059c10b32de8423e845632f0133bd62ba4580172c83758024a44d6f8e9d9289fb1a8c2c93c5f50e7ea63932f8a50289a043e9750a0cf54927f5a4b
MISC metadata.xml 330 BLAKE2B c6c9d215cd38a95f824fac1761bc4e6048ac50688318fa33a94d6d97739e726efaff57e4e0814d16b5336cf4481498580d4e2743404a619cad0d81c052880b6f SHA512 6bca1bac9701b2dde509f25dd18dd819d769cda23669faf680800747a37369002eb3954606fc6541dec324473eb13a78bc0c8a97085436072ee076d85e7a2345
diff --git a/sys-apps/install-xattr/install-xattr-0.8.ebuild b/sys-apps/install-xattr/install-xattr-0.8.ebuild
new file mode 100644
index 000000000000..484fbb669765
--- /dev/null
+++ b/sys-apps/install-xattr/install-xattr-0.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Wrapper to coreutil's install to preserve Filesystem Extended Attributes"
+HOMEPAGE="https://dev.gentoo.org/~blueness/install-xattr/"
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git"
+ inherit git-r3
+else
+ SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+ S=${WORKDIR}/${PN}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+src_prepare() {
+ default
+ tc-export CC
+ append-cppflags "-D_FILE_OFFSET_BITS=64"
+}
+
+src_compile() {
+ if [[ ${PV} == "9999" ]] ; then
+ cd "${WORKDIR}/${P}/misc/${PN}" || die
+ fi
+ default
+}
+
+src_install() {
+ if [[ ${PV} == "9999" ]] ; then
+ cd "${WORKDIR}/${P}/misc/${PN}" || die
+ fi
+ DESTDIR=${ED} emake install
+}
+
+# We need to fix how tests are done
+src_test() {
+ true
+}
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index f21bc9beac47..2bc2590bf3f0 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -11,7 +11,7 @@ DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 72d082b4f39b6b9f0040149ea14d3c5c6d999e
DIST iproute2-5.3.0.tar.xz 742660 BLAKE2B e2152eb6c7d443f54bad0aec0cba23656c1defafc53f10130b63288f070e6e77c27a78a3f9bf6f6d14be3490eadd583a779f5d44ec23d16535e14abe04feb848 SHA512 c20ce477cb3ec24194ea56d3d9037795e26975ffde188b63ba974a0aa671dd169f356e9446bf43dc56523e01c0bafa442b91d83da9b2302daee18e237f2f3157
EBUILD iproute2-4.19.0-r1.ebuild 4386 BLAKE2B edf0b109425c96b752459c0483ff5a3969e8bcb0cd0011d24e886084e6b4354d21f4f8575c9786136698e10347513c8a9fd1bcf2cb99a88851d1117eba19c39c SHA512 5a76cab28c2d9351c107717cadcfa1439d19f9dc6e4d9aa0498f6678f04362bd327eff16c3460caa74cb02a25e06e6654011c66bac9c27a0def2b18f7560e469
EBUILD iproute2-5.1.0.ebuild 4436 BLAKE2B 020def1d432958b593d7086707c8ab70b517731cbda5ecea7d276cca68168831b2f7d1f9e10426d790d30a0f7c4631a7b56f9e0b8e6b3f994576be6b01139607 SHA512 b095e0ae75f06ac4cbe3af525d9756d6dfc5c54b1b662bdd23803ade0d9754702af616a646b41fb92cd5f9f46c1149eac56706d889204b7181fdb64173b5506c
-EBUILD iproute2-5.2.0-r1.ebuild 4481 BLAKE2B a292beb5cf4fde2b2713439587b2dffe7cc92f01ebf9ab4b13cf695754d378b7976cec16556140e83b28ffdc0bf6d4bc6da1f66c3006a90da6ad7eb3ac008796 SHA512 45a88909a69a93313eb7ba9f0d8912f1503ef047f89ebb69846b3ef6eb9fecea002f44ac52620c3afd69a2ba38a0e9f02298d57c3ee7184a7d0421dac3ed4b3e
+EBUILD iproute2-5.2.0-r1.ebuild 4480 BLAKE2B f7f2bccba971e15cad8250925623c48f3b28589b0209d13ebaad645deae58abbcfda5bd92c6f77277239c3b8980f975dc0c5b3415c4012007173e9faba5937e4 SHA512 ea32ede9b3c3368b8d98a9cf7b99dada170cb37ec34732229f07253295f61c0aceca6c4903ed987295078ed11fcf44c33ab5aecb41e6e96258cf064a7ceacc85
EBUILD iproute2-5.3.0.ebuild 4436 BLAKE2B 020def1d432958b593d7086707c8ab70b517731cbda5ecea7d276cca68168831b2f7d1f9e10426d790d30a0f7c4631a7b56f9e0b8e6b3f994576be6b01139607 SHA512 b095e0ae75f06ac4cbe3af525d9756d6dfc5c54b1b662bdd23803ade0d9754702af616a646b41fb92cd5f9f46c1149eac56706d889204b7181fdb64173b5506c
EBUILD iproute2-9999.ebuild 4391 BLAKE2B 80ea005a28636d8d9af168ea30a995384be217ef19763f9a35e12f2606a4c1cd030800e19f3ca2d7f548a2d26c1781cd6f4ffe51e678198a2bc693967b2982d2 SHA512 930fab14b85b89d960737f188046e3937280fac97d7a0795581905af9ffab0979cdee0edbb4bc2e246744d905561b37e8852f86f02167c8f0a6b53baa98bd712
MISC metadata.xml 672 BLAKE2B d27b6af84b177e8b12f64470dbac0e8fdcf45091681ced6d5ebd02414849c221e608a6a4bb8ce6aae305475e086cf140836b943a9e5380f10c368ac359397a98 SHA512 d71c5077fcf769520048a46b0fdd3563b974b65afdc68eb73fc0816d2c87dd9a73bca72e25d7e8f3c9f2ceb23c473bb92a1a92d8d5f43a7e15f965669226f0a2
diff --git a/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild b/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
index c2110b978df4..ef2a2624c012 100644
--- a/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
fi
DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index e84ca67eadae..b72006daec8e 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -3,6 +3,6 @@ AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52
DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865
EBUILD kmod-25.ebuild 4924 BLAKE2B d7fbc42a9d490d10c0fca9e590c7e0cf8520ee7bf80d780d33a08af22e46fea044725d3ec2e5c49f0520d17721f97130e06212d823972aea9387c2b3cda80d04 SHA512 3fa591487100ffe314c1a7f34d598cb1188c89893462a57f6b497baeaf702af6a154b4d36967304fcba144aaa92ad0897613eeed4e33b5d802a06444cb88f803
-EBUILD kmod-26-r2.ebuild 5100 BLAKE2B da66a8eecb4e06570fe7dd188cb1790d286abf3d06b66b9005ff749436a89454d24f646674f919676cd72fbd4303aeb968e0136b8b0b89977d2f68e817aeff59 SHA512 e277e37d46fd4d4cbf81ff8c83157cc4239356ec55b2383fe254a867cd50fb64945eb4d4692daccde7ddc061ad422cccbd11ebfcb16b6ccc8f6dc3eb9c6aead6
+EBUILD kmod-26-r2.ebuild 5099 BLAKE2B 4487c5058627df2a8204e2fab619f5dc5ccf88508073d38b6d7b6a7b1aad2815e1af78dc64fecec9bfabd20714c0b5c7a51bcea9312f428943fd339d7224f4fc SHA512 a91fdf2e4b8edabab95b85ae3300c60fe2d553b3de6053524c7de20accb346062c6648539091d33c086532593eb7b537b39bed26a1a5481f9a2094a1d9e7dfcf
EBUILD kmod-9999.ebuild 4974 BLAKE2B c2d8c0da4b9d209e46ee9a39def747c7e2dfe7bc50df0d5e47c9201674d184be3a40438bf42168f08aade146f07117c169aeafbad207a3743b3508ea339a9527 SHA512 7e1a487fdfd13e7dd95e8fc27fb51eca38345be289e40a0248bacb81745bf797c57a53f28bf9ff5e9051895780e913764b5ce7e080f518df77c0c7043bed99b4
MISC metadata.xml 540 BLAKE2B ec5ee262fe76215688d99e32778848e71de5825f488eea2219e076290e020aa86de6138ab8366d5e077d44797789a27c22fea1c64f9c6e2713cf315b4b891455 SHA512 c4f47a77dfa7bc4cbaa61744fc46c5547763b51b48521cd229ac89680325ecbf415bd9e1ce9c71982ea721d0d5c4cf3677a0f70e8dad65235f523840cd14de94
diff --git a/sys-apps/kmod/kmod-26-r2.ebuild b/sys-apps/kmod/kmod-26-r2.ebuild
index ff45565b2b21..c2aa5bc3dd97 100644
--- a/sys-apps/kmod/kmod-26-r2.ebuild
+++ b/sys-apps/kmod/kmod-26-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
inherit autotools git-r3
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 ~riscv s390 sh ~sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 ~riscv s390 sh ~sparc x86"
inherit libtool
fi
diff --git a/sys-apps/lcdutils/Manifest b/sys-apps/lcdutils/Manifest
index 5e60aaa135b3..b99dc2590bef 100644
--- a/sys-apps/lcdutils/Manifest
+++ b/sys-apps/lcdutils/Manifest
@@ -1,4 +1,5 @@
-AUX include-stdlib.h-for-exit.patch 1165 BLAKE2B 0a3f425a53c21a3613c5151e77836b254ce8aa8cf876703df3fbfb61310b5f223bce1e77f9d83c3512d18a5bc3f11e389433d1adfc2de5eb59e48f21ef782f98 SHA512 3356faefff0c258025bc76abcdb188a47558ed83c613be744fd5fd245f63fd5eb60417738d68c75971b5ad523e047b06c5969d0e8be28b9e9beb3aa4f7e667fd
+AUX lcdutils-0.2-include-stdlib.h-for-exit.patch 1165 BLAKE2B 0a3f425a53c21a3613c5151e77836b254ce8aa8cf876703df3fbfb61310b5f223bce1e77f9d83c3512d18a5bc3f11e389433d1adfc2de5eb59e48f21ef782f98 SHA512 3356faefff0c258025bc76abcdb188a47558ed83c613be744fd5fd245f63fd5eb60417738d68c75971b5ad523e047b06c5969d0e8be28b9e9beb3aa4f7e667fd
+AUX lcdutils-0.2-makefile.patch 446 BLAKE2B c268c67bf1ec0cba97b46ba12112103d81ad32e3463871539dfffd5cc6caf5422c1ebf4064604ed3adb0883b87b12c26f2bb0d8b08d3da33bdb9d6f708fc9538 SHA512 ee811308e5045eeee2f99536473294d9b7fec852b1d578dfb6c9fdaea0c250c2f59da740d9f6be52234ecb4cedbf38ff49886e388d350d93fd97ea92177c2dfd
DIST lcdutils-0.2.tar.gz 10819 BLAKE2B ea493a49cc1d121b1edb848645f189b4996463e0616dc418e938658767cb56b4ca3982bda0d7349eb303b88ecd3015fa2d8c178607ad14311ca5a0af57a2305b SHA512 ea7140b7b27aade66d025b4c4c7441a2357d03f5081f67ccac8175e709e8f20bf800208a72675eacfca1af8329c01b9e8b1a9bd910bf858bcbdb8aff3c2169f4
-EBUILD lcdutils-0.2.ebuild 726 BLAKE2B 1fc03db86040605893b4ece1b582eb1d3b07d93ca7f377b11b4e7406ea971312efbfb7c883d0ab6e86671ef0e994470b60b99f6b983357a72bf6e5c9537aefef SHA512 62d09e49dcae09d2f34cc18c0e7e82e1a6d4df93996ccf55832f58e315157052cb0314fa3194d4eaf7eeb40cfec24d83f8372230d2012e390cfb4eb6bfd4c580
-MISC metadata.xml 375 BLAKE2B dc1da69c818d8740e699ffbe55df71b5d3728c0a3ccd47b2a87acc90e3026c2aa2cc5098eaf15da2dc4048b9d36a90933db295fab501fd70b7e04e6841dd47ec SHA512 db0267b82ae887ad69ba5196396d803b84344a6fc22aeb05341a80ffc6993e4538bf79d55f3d670d7947749a87de59eb4f1f0ed7c4a6cbcecf51e7feaed83502
+EBUILD lcdutils-0.2-r1.ebuild 525 BLAKE2B 6ed005f8034ab40c78b291e436573580c79344582c63821dfa128e1c4db6db9ade9a89b55ba7da6efcfa5b31d96468f8296dcbfda1e10aff9cd4ae59de33b0b3 SHA512 0feca5c9444e3812261be7a9d5feb22314cb7fc43282fb8c9205f7790fe3e94ad357f285e16284bf9c0c2d1c74d115838ee955b599da34b19ce649d57712032d
+MISC metadata.xml 621 BLAKE2B 4d425917eb908ab4412f462a205cbd7afdc5e723e7a7792c9f4285153c6dd2eea0f1a93e84240ea785dd1b0b96a2e389a9151b12cfffd2db4d1be5c9047d3753 SHA512 7ae20b14fc6b1186a82f543a5683d61e211004d651c8b558c7a374ae4bed2878fdc018a35b5b77d363ebf97b5f328929d2154231d14c2b5b0609e378af29c8cb
diff --git a/sys-apps/lcdutils/files/include-stdlib.h-for-exit.patch b/sys-apps/lcdutils/files/lcdutils-0.2-include-stdlib.h-for-exit.patch
index 81870496a529..81870496a529 100644
--- a/sys-apps/lcdutils/files/include-stdlib.h-for-exit.patch
+++ b/sys-apps/lcdutils/files/lcdutils-0.2-include-stdlib.h-for-exit.patch
diff --git a/sys-apps/lcdutils/files/lcdutils-0.2-makefile.patch b/sys-apps/lcdutils/files/lcdutils-0.2-makefile.patch
new file mode 100644
index 000000000000..a67db0c2e297
--- /dev/null
+++ b/sys-apps/lcdutils/files/lcdutils-0.2-makefile.patch
@@ -0,0 +1,20 @@
+--- a/Makefile 2002-07-08 15:31:37.000000000 +0200
++++ b/Makefile 2019-11-06 20:38:11.499806312 +0100
+@@ -1,13 +1,14 @@
+ #CC=mips-uclibc-gcc
+ #LDFLAGS=-static
+
+-CFLAGS=-O2 -Wall
++CFLAGS?=-O2 -Wall
+
+ all: putlcd buttond
+
+ install: all
+- install putlcd /usr/local/sbin
+- install buttond /usr/local/sbin
++ install -d ${DESTDIR}/usr/bin
++ install putlcd ${DESTDIR}/usr/bin
++ install buttond ${DESTDIR}/usr/bin
+
+ clean:
+ rm -f putlcd buttond *.o
diff --git a/sys-apps/lcdutils/lcdutils-0.2-r1.ebuild b/sys-apps/lcdutils/lcdutils-0.2-r1.ebuild
new file mode 100644
index 000000000000..885e05c28b42
--- /dev/null
+++ b/sys-apps/lcdutils/lcdutils-0.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="(Sun) Cobalt Qube/RaQ button reading and LCD writing utilities"
+HOMEPAGE="https://people.debian.org/~pm/mips-cobalt/"
+SRC_URI="https://people.debian.org/~pm/mips-cobalt/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~mips ~x86"
+
+PATCHES=(
+ "${FILESDIR}/${P}-include-stdlib.h-for-exit.patch"
+ "${FILESDIR}/${P}-makefile.patch"
+)
+
+src_prepare() {
+ default
+
+ tc-export CC
+}
diff --git a/sys-apps/lcdutils/lcdutils-0.2.ebuild b/sys-apps/lcdutils/lcdutils-0.2.ebuild
deleted file mode 100644
index 86daddae5bf8..000000000000
--- a/sys-apps/lcdutils/lcdutils-0.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Cobalt RaQ/Qube LCD Writing and Button reading utilities"
-HOMEPAGE="http://people.debian.org/~pm/mips-cobalt/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~mips ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- sed -i -e "s:CFLAGS=-O2 -Wall:CFLAGS=${CFLAGS}:g" Makefile
- epatch "${FILESDIR}"/include-stdlib.h-for-exit.patch
-}
-
-src_compile() {
- emake distclean || die "distclean failed"
- emake all || die "all failed"
-}
-
-src_install() {
- dobin buttond putlcd || die "dobin failed"
- dodoc ChangeLog || die "dodoc failed"
-}
diff --git a/sys-apps/lcdutils/metadata.xml b/sys-apps/lcdutils/metadata.xml
index 14e7453a3b04..542e1c857301 100644
--- a/sys-apps/lcdutils/metadata.xml
+++ b/sys-apps/lcdutils/metadata.xml
@@ -1,12 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<maintainer type="project">
<email>mips@gentoo.org</email>
<name>Mips Team</name>
</maintainer>
-
<longdescription>
- Provides utilities for Cobalt Microserver systems to write to the LCD and read button input
+ Provides utilities for the (Sun) Cobalt Microserver Systems
+ to write to the LCD and read the button input.
</longdescription>
</pkgmetadata>
diff --git a/sys-apps/lsb-release/Manifest b/sys-apps/lsb-release/Manifest
index 5cc32dd42205..ae8563b22980 100644
--- a/sys-apps/lsb-release/Manifest
+++ b/sys-apps/lsb-release/Manifest
@@ -1,4 +1,4 @@
AUX lsb-release-1.4-os-release.patch 614 BLAKE2B b15e0e136ccbee1907cafc9523ad0ca31b87fd910b770b212f1d06aef668f184343f7d961aa38a1ba35e2bc1628750bd1680a70b7405271fab59c5f732fde66c SHA512 289795f45144071f5f166a3dfd387267fd3327767bae9d8e9c48818de0c60b961ac35952eb8b42b3ebfd415b337c096fa2db8009fdfbc218814a3ace633a8483
DIST lsb-release-1.4.tar.gz 10769 BLAKE2B d6c71d6604481a637f63fae00742ba77421345b36234fcfcae1da98bc1c80a8450bc569c2ea2f4b1c3a852de2fe24413fe397d4a60a0ca94eb70a9626871f4bb SHA512 84f6f8794380463587005043f601b7a40190cd9e3409abff7f5ce7658cf029a14346eff87838296d90307192bdeff68cc00480c5c04814da7acdb3e220640fde
EBUILD lsb-release-1.4-r3.ebuild 906 BLAKE2B 4df8a89ddb925949f553785ab113300cc271aedab569e1ef1569b49a7b3cbd7fe3968c2c568559fb281a03e6e6dae21d970cd40ba318d7792660637c0c6fa97f SHA512 b31d8616e8721a54ea3cb79572b35af5a9c650081760a9645fca87ef586a01296c31ebfaf61073301e498d357a9accce20203b2ea4a57cbcb10cdd53a5b2da7c
-MISC metadata.xml 795 BLAKE2B 3af7256256701726c04244c09e8cb8aa9e560cea0b16502412f3565235cae17ab172daf4cc26cf7356ef021d2989752c733a8d4250d241e32e1c79f2149622b8 SHA512 e0951bbb925a0729e886a608c2b177fa9a68aea5571316d0d89f8cae3fa6f48c97aeb37c1393ae429f02ec40f640fe237836f018ba31c2a3d0b9a81ef2661dcf
+MISC metadata.xml 808 BLAKE2B cb931504b70813859d35bfda6408cb28f2bd56cb4f0cdca944c051b9731c2c1e7c38d87bfab70cffabf82d4f537ea68eaa88bf05e2c90e27899238315fe29ad5 SHA512 cc252166fb933fc78a5b5479c9cc2a49a0d9224371cd14635cb92e7e3c4c801bdc6f837b6680704d20f63dc0b8872b67c72b952361e9328dc12305f9351f7a87
diff --git a/sys-apps/lsb-release/metadata.xml b/sys-apps/lsb-release/metadata.xml
index bb4a0b6679e2..671d7112efd8 100644
--- a/sys-apps/lsb-release/metadata.xml
+++ b/sys-apps/lsb-release/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>jer@gentoo.org</email>
- <name>Jeroen Roovers</name>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
</maintainer>
<longdescription lang="en">
This program forms part of the required functionality of
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index bfee18ec27e2..9aa50db8c5d5 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -2,7 +2,7 @@ AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a
AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
DIST openrc-0.41.2.tar.gz 245302 BLAKE2B ab80dc4f3a7c2c464fe64cdfa7fd31363d5a9d25e90d0239325be05561e5802f22c47013fde82650f5ce08cf99f16f5f479d8617c254647b8c40cec9609d0b6b SHA512 ebfa691cae4704bb3023ea0508a712a45b8c20809828729dfa5292e96f3fd1b309813d80d7c286d0c09680bf5378aba40cfd994f27951f43a3ffb1fd0d69a58b
DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
-EBUILD openrc-0.41.2.ebuild 5787 BLAKE2B ac01992ca07c9ee352e72fa241c61630ee11f6ad4c514153febd9d6d126008ff7c4c18976c8734231e36e8cba3c1115f4af8eb0ccc933a55f97f71c2ad23d393 SHA512 449adec16cf5d0131e2adeb8d0694684700ff707f3080389775d3203317d46ee2bc7c9f5c0e025f4b93872cce0f78c52b930e6fffd093d988619e289cd92dbf7
-EBUILD openrc-0.42.1.ebuild 5902 BLAKE2B 5387455fdf77a16a9f5f17cda3d9d087d97f5da6cc42f4765015dfe314550fe6186e53d1bd396b604edd58e3b78c8e7df79c40f3e7780bfb096238704cee6c74 SHA512 9c9e0d68f5d5aa35b91a1002a7ea4c79576916de761dbbc789b42f5e01304a5de78c518f4ba6a50c3ee0b84f34b654374d92dd5f0aaa241e49acac6436c65535
-EBUILD openrc-9999.ebuild 5902 BLAKE2B 5387455fdf77a16a9f5f17cda3d9d087d97f5da6cc42f4765015dfe314550fe6186e53d1bd396b604edd58e3b78c8e7df79c40f3e7780bfb096238704cee6c74 SHA512 9c9e0d68f5d5aa35b91a1002a7ea4c79576916de761dbbc789b42f5e01304a5de78c518f4ba6a50c3ee0b84f34b654374d92dd5f0aaa241e49acac6436c65535
+EBUILD openrc-0.41.2.ebuild 5249 BLAKE2B 324f3a9e2a9753a79dc547f7615478d05f8500582638646b5ca71b235fbbdec4b54adf20a1e9ffd07ec572e1880f7d5854d35503172325a4817b2b070a60c70e SHA512 296a87cf7bf0476f51b1a2410ff1e69f9275b2d3e319a268e211cc2e3d96e8e58fbfda47c203d8cb5d46cc4ac4dcdc4b2a39193dc299ef4a9478319b1d32489f
+EBUILD openrc-0.42.1.ebuild 5362 BLAKE2B f54e7d19eb62bc7326dafd03c6beba37ef00c9a0a9e78b5735e5b08694b3c7da0eb6a9eb17f2825976f0ff12904ead87744e96489ea398d74b100e0cd393899b SHA512 c573bc86ded84c6ff4f4349663b4dee73689a496ab35ca81518bc83be162d10087d790c114e992ce975a5bc19e76d3d7e8a78e0db1c44868a60d8cec6d70ec3e
+EBUILD openrc-9999.ebuild 5362 BLAKE2B f54e7d19eb62bc7326dafd03c6beba37ef00c9a0a9e78b5735e5b08694b3c7da0eb6a9eb17f2825976f0ff12904ead87744e96489ea398d74b100e0cd393899b SHA512 c573bc86ded84c6ff4f4349663b4dee73689a496ab35ca81518bc83be162d10087d790c114e992ce975a5bc19e76d3d7e8a78e0db1c44868a60d8cec6d70ec3e
MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1
diff --git a/sys-apps/openrc/openrc-0.41.2.ebuild b/sys-apps/openrc/openrc-0.41.2.ebuild
index 029b236f6ad9..81bb6c4a741f 100644
--- a/sys-apps/openrc/openrc-0.41.2.ebuild
+++ b/sys-apps/openrc/openrc-0.41.2.ebuild
@@ -19,19 +19,17 @@ fi
LICENSE="BSD-2"
SLOT="0"
IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs
- unicode kernel_linux kernel_FreeBSD"
+ unicode"
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+COMMON_DEPEND="
ncurses? ( sys-libs/ncurses:0= )
pam? (
sys-auth/pambase
sys-libs/pam
)
audit? ( sys-process/audit )
- kernel_linux? (
- sys-process/psmisc
- !<sys-process/procps-3.3.9-r2
- )
+ sys-process/psmisc
+ !<sys-process/procps-3.3.9-r2
selinux? (
sys-apps/policycoreutils
>=sys-libs/libselinux-2.6
@@ -44,11 +42,8 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
bash? ( app-shells/bash )
!prefix? (
- kernel_linux? (
- >=sys-apps/sysvinit-2.86-r6[selinux?]
- virtual/tmpfiles
- )
- kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+ >=sys-apps/sysvinit-2.86-r6[selinux?]
+ virtual/tmpfiles
)
selinux? (
>=sec-policy/selinux-base-policy-2.20170204-r4
@@ -84,13 +79,8 @@ src_compile() {
SH=$(usex bash /bin/bash /bin/sh)"
local brand="Unknown"
- if use kernel_linux ; then
- MAKE_ARGS="${MAKE_ARGS} OS=Linux"
- brand="Linux"
- elif use kernel_FreeBSD ; then
- MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
- brand="FreeBSD"
- fi
+ MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+ brand="Linux"
export BRANDING="Gentoo ${brand}"
use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
export DEBUG=$(usev debug)
@@ -124,9 +114,6 @@ src_install() {
gen_usr_ldscript libeinfo.so
gen_usr_ldscript librc.so
- if ! use kernel_linux; then
- keepdir /lib/rc/init.d
- fi
keepdir /lib/rc/tmp
# Setup unicode defaults for silly unicode users
@@ -179,11 +166,7 @@ pkg_postinst() {
fi
# Added for 0.35.
- if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
- if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
- cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
- fi
- elif ! use kernel_linux; then
+ if [[ ! -h "${EROOT}"/lib ]]; then
if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
fi
diff --git a/sys-apps/openrc/openrc-0.42.1.ebuild b/sys-apps/openrc/openrc-0.42.1.ebuild
index 9bb3ff7fbb38..3e6f63ea18b9 100644
--- a/sys-apps/openrc/openrc-0.42.1.ebuild
+++ b/sys-apps/openrc/openrc-0.42.1.ebuild
@@ -19,19 +19,17 @@ fi
LICENSE="BSD-2"
SLOT="0"
IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs
- sysv-utils unicode kernel_linux kernel_FreeBSD"
+ sysv-utils unicode"
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+COMMON_DEPEND="
ncurses? ( sys-libs/ncurses:0= )
pam? (
sys-auth/pambase
sys-libs/pam
)
audit? ( sys-process/audit )
- kernel_linux? (
- sys-process/psmisc
- !<sys-process/procps-3.3.9-r2
- )
+ sys-process/psmisc
+ !<sys-process/procps-3.3.9-r2
selinux? (
sys-apps/policycoreutils
>=sys-libs/libselinux-2.6
@@ -44,12 +42,9 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
bash? ( app-shells/bash )
!prefix? (
- kernel_linux? (
sysv-utils? ( !sys-apps/sysvinit )
!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
- virtual/tmpfiles
- )
- kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+ virtual/tmpfiles
)
selinux? (
>=sec-policy/selinux-base-policy-2.20170204-r4
@@ -86,13 +81,8 @@ src_compile() {
SH=$(usex bash /bin/bash /bin/sh)"
local brand="Unknown"
- if use kernel_linux ; then
- MAKE_ARGS="${MAKE_ARGS} OS=Linux"
- brand="Linux"
- elif use kernel_FreeBSD ; then
- MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
- brand="FreeBSD"
- fi
+ MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+ brand="Linux"
export BRANDING="Gentoo ${brand}"
use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
export DEBUG=$(usev debug)
@@ -126,9 +116,6 @@ src_install() {
gen_usr_ldscript libeinfo.so
gen_usr_ldscript librc.so
- if ! use kernel_linux; then
- keepdir /lib/rc/init.d
- fi
keepdir /lib/rc/tmp
# Setup unicode defaults for silly unicode users
@@ -181,11 +168,7 @@ pkg_postinst() {
fi
# Added for 0.35.
- if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
- if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
- cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
- fi
- elif ! use kernel_linux; then
+ if [[ ! -h "${EROOT}"/lib ]]; then
if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
fi
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 9bb3ff7fbb38..3e6f63ea18b9 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -19,19 +19,17 @@ fi
LICENSE="BSD-2"
SLOT="0"
IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs
- sysv-utils unicode kernel_linux kernel_FreeBSD"
+ sysv-utils unicode"
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+COMMON_DEPEND="
ncurses? ( sys-libs/ncurses:0= )
pam? (
sys-auth/pambase
sys-libs/pam
)
audit? ( sys-process/audit )
- kernel_linux? (
- sys-process/psmisc
- !<sys-process/procps-3.3.9-r2
- )
+ sys-process/psmisc
+ !<sys-process/procps-3.3.9-r2
selinux? (
sys-apps/policycoreutils
>=sys-libs/libselinux-2.6
@@ -44,12 +42,9 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
bash? ( app-shells/bash )
!prefix? (
- kernel_linux? (
sysv-utils? ( !sys-apps/sysvinit )
!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
- virtual/tmpfiles
- )
- kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+ virtual/tmpfiles
)
selinux? (
>=sec-policy/selinux-base-policy-2.20170204-r4
@@ -86,13 +81,8 @@ src_compile() {
SH=$(usex bash /bin/bash /bin/sh)"
local brand="Unknown"
- if use kernel_linux ; then
- MAKE_ARGS="${MAKE_ARGS} OS=Linux"
- brand="Linux"
- elif use kernel_FreeBSD ; then
- MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
- brand="FreeBSD"
- fi
+ MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+ brand="Linux"
export BRANDING="Gentoo ${brand}"
use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
export DEBUG=$(usev debug)
@@ -126,9 +116,6 @@ src_install() {
gen_usr_ldscript libeinfo.so
gen_usr_ldscript librc.so
- if ! use kernel_linux; then
- keepdir /lib/rc/init.d
- fi
keepdir /lib/rc/tmp
# Setup unicode defaults for silly unicode users
@@ -181,11 +168,7 @@ pkg_postinst() {
fi
# Added for 0.35.
- if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
- if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
- cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
- fi
- elif ! use kernel_linux; then
+ if [[ ! -h "${EROOT}"/lib ]]; then
if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
fi
diff --git a/sys-apps/paxctld/Manifest b/sys-apps/paxctld/Manifest
index d9a8f50b30ac..8af6d0eefebe 100644
--- a/sys-apps/paxctld/Manifest
+++ b/sys-apps/paxctld/Manifest
@@ -1,3 +1,3 @@
-DIST paxctld_1.2.2.orig.tar.gz 16302 BLAKE2B 051be5210704a0a8447eab46f3a8528fccbb43b6ab60725a38e6210da68ae0e60b83e563ab4796dbde9bccce93982ebfd14b4288466b5531c5b1e261a4020e6c SHA512 f3944b752bcaab2644c640a7992d8f267e882ff8528b85664cc3d7926de042d3540044030bac2f5c64121ff5ed0caff60ca41d3837a77fe2cdf19ad58c6b7c81
-EBUILD paxctld-1.2.2.ebuild 735 BLAKE2B 2079c08c4a5fd148d1e5198ac393598da6cf6e505efdb099d88a40095b878cebf5f22912e0aa4dfaf8f7595d7f22f6808119cf6c6efb1952ec299525a9b4776e SHA512 d147b30cb1d341a990b00c2c18f078d7375dc53bdb7d81dabc28fff88d1289341fabdb3b19eca9d4e55a941ed32b4b99bab279efa97271d193e0fc99edd9c636
+DIST paxctld_1.2.3.orig.tar.gz 17174 BLAKE2B 6f288b039f719febf2f3370a0d245c07928f441754f0ac43bb3608d2718548d0ab90fbf9244d5b97bdfbc7c6bfab3d7359d435e99a2e19dd80661019ba0b654c SHA512 da3f5739aabbe0f276a194c71c20349b0571472aa6c114fe46ea4eb406fe1b419b167207b8d0b288776574c455f005386303b8ef92b0294e98532b269017ab54
+EBUILD paxctld-1.2.3.ebuild 732 BLAKE2B 82b12a6b32f17b7aa0110f7acf4349da0d8acf260a4bab7b2cc5ace30c449d960482fb63649f697df71626d13530e93b4cc10e50d50942cbb76b163d67e391a0 SHA512 e2a6674deb0720e2ceb67a8e52c72c93c33cc2eb7237f08fa682322b7b3f3a5282a0f020b45654376eab4bd042ff36eaab4be5204e9b60160236619f71836ca4
MISC metadata.xml 363 BLAKE2B 27b81c37d5a0f685942eda5610d73a0933a7654282c851a92bc352f27676c609452b6c7a3f3bb94c0fa358fa360c5c113aac6acd24e186347912f61cf4a0bdf3 SHA512 b848c5de5ed09c4843c3e75d59ea4697c5d1c1fa2ce8c9e9a0bf38b5102d57f25aa626f3c6295f4f3a345b1cedc15553fb45b460bf41e73df43eb2eef6e00281
diff --git a/sys-apps/paxctld/paxctld-1.2.2.ebuild b/sys-apps/paxctld/paxctld-1.2.3.ebuild
index e172e7e00145..644e1e6f67e0 100644
--- a/sys-apps/paxctld/paxctld-1.2.2.ebuild
+++ b/sys-apps/paxctld/paxctld-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 2b0e0350c0cf..0d674141bea5 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,8 +1,8 @@
-DIST pkgcore-0.10.5.tar.gz 644935 BLAKE2B cbf35bb18c757e33259dc81aa0e70b56a1ef7b03259fa06d5c0fb5b7ad23772134c2068a9d09be6bbf294b3eb7cbc71716ccd8db83e65b2ef38b6b60721acd29 SHA512 4fbe7e503df51317ff3245d549b8bb1c7f3c6e2b0eac97e0828a7b4c726bfcb3bccb7f83c44bfc581ceacd943b490443cfbed7c7c00497a01fb26b8254f4b35a
DIST pkgcore-0.10.6.tar.gz 645141 BLAKE2B 16723dfae157c809e53f8607bd72ee178ac23280c1eea2f73af4864521aa4c5d7026972e85ab0ca92d3d714819ee24e86a3154ed2ed7f5d619ac7863b58c3436 SHA512 c5221cc7a72f5c3ae76ad1ce59a6b46f8b066991df9766f59b08d8514b6bb5336d8bef217c343d97ff764eb7b3614197f7613d5dfac52360603298dc06f6d7ea
+DIST pkgcore-0.10.7.tar.gz 645474 BLAKE2B 3c311967cd2b4e29a45fbf4f2af9207c20f2401780fc3991c726917d103d6e59e951172280c212c7dd46db33defbfd6aad1a55da4d02484b8963ab8049b86c6a SHA512 91910c9b7ec02396e1e0ff2a23a18757749fea635e3e294131d736eeee8d67bd58e9b5f1de7440e50d926291dd3ed36dc7381a29f7ac9b58c27cf4f3fc49ee45
DIST pkgcore-0.9.7.tar.gz 592202 BLAKE2B fa16380e89ad2fb2a05d8f08387c3cfa2203b4e6faad3fc4758d572eb08d6c64f781eef8c2d56151f1facec3a202325d4c4a271a1a3ced88df7371f2af75dbf3 SHA512 cb996fd35a8e4e73acfacf1942d498932ec092a282397bd41df72eea26b6d08c15e01b96ece8ebb6876e84281d85d4f8ef81e1f2ef107adff1b984ee592d6a6f
-EBUILD pkgcore-0.10.5.ebuild 1422 BLAKE2B 94c02312eca2b999086c8a7e2ed8cf043999e7d85b663f809f93769545205ee29bfca48f21065612ab9f2b37d3aace43654cbd7ffd742a9cc6493a0b247e0801 SHA512 d107b6261344fee23f37f4fc2ca1ab7c552b0d587edc64e679a564d9b1f8c3e9beecd6ac0a9d71e488dfdc0c3d34f362a215c6d03d0df4e442ae2c70ca06fcbb
EBUILD pkgcore-0.10.6.ebuild 1422 BLAKE2B 94c02312eca2b999086c8a7e2ed8cf043999e7d85b663f809f93769545205ee29bfca48f21065612ab9f2b37d3aace43654cbd7ffd742a9cc6493a0b247e0801 SHA512 d107b6261344fee23f37f4fc2ca1ab7c552b0d587edc64e679a564d9b1f8c3e9beecd6ac0a9d71e488dfdc0c3d34f362a215c6d03d0df4e442ae2c70ca06fcbb
+EBUILD pkgcore-0.10.7.ebuild 1422 BLAKE2B 94c02312eca2b999086c8a7e2ed8cf043999e7d85b663f809f93769545205ee29bfca48f21065612ab9f2b37d3aace43654cbd7ffd742a9cc6493a0b247e0801 SHA512 d107b6261344fee23f37f4fc2ca1ab7c552b0d587edc64e679a564d9b1f8c3e9beecd6ac0a9d71e488dfdc0c3d34f362a215c6d03d0df4e442ae2c70ca06fcbb
EBUILD pkgcore-0.9.7.ebuild 1490 BLAKE2B 867dacbb663e06ddfc7595da418bf5b71a5481972317496a9c93ca00ebee64233abec8790304c1b10097ba6b2444fc01f1713803b09940608cd1b4535ccfeac5 SHA512 362e413b8ea9d0bcefdfeeb66272ce9e922a2461ac158977634c33a9b9fb672b6ac6741223feb43c82ba393dc8b8274a7825781c4f3a8790b6f1da7dd75731e7
EBUILD pkgcore-9999.ebuild 1422 BLAKE2B 94c02312eca2b999086c8a7e2ed8cf043999e7d85b663f809f93769545205ee29bfca48f21065612ab9f2b37d3aace43654cbd7ffd742a9cc6493a0b247e0801 SHA512 d107b6261344fee23f37f4fc2ca1ab7c552b0d587edc64e679a564d9b1f8c3e9beecd6ac0a9d71e488dfdc0c3d34f362a215c6d03d0df4e442ae2c70ca06fcbb
MISC metadata.xml 409 BLAKE2B 42709aa3a13109a21d1cfa0db9ef758216a2e902d68a10f0db14b4019464a702ef0c91079d0856f9389a2221886bbd3d5d5480ca99efc708543d198d00b7ed3e SHA512 ec04202f105a62a697511c7a89dad118b3618fdce4044c25648492e1557a95b9e29c01a08fca21e106273485471af98c52a6db6b2a40605a67a632938faebd29
diff --git a/sys-apps/pkgcore/pkgcore-0.10.5.ebuild b/sys-apps/pkgcore/pkgcore-0.10.7.ebuild
index 670df92a2cf7..670df92a2cf7 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.5.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.7.ebuild
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a806ab14d578..4e1094625b25 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -4,10 +4,12 @@ DIST portage-2.3.66.tar.bz2 1023966 BLAKE2B dc378b714101b287fa33defeb778e586da83
DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545cccca0f516a5724e331e SHA512 20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
DIST portage-2.3.76.tar.bz2 1033462 BLAKE2B 1be0641337cd7d2a55f8aaba6f84bbfa7182503050e669fb28cd00e4de13cce31ec6e33cc2794e372d1a67b7d2f27e6bb85969f720f2ed449c619598b708b903 SHA512 e7774cf89e3865cb1ca5465fc961b452cc8529ccf09e86b7ebd16cca049f1efb527dca9aba892392d5909283cf12930117b1d33fa58e1e429f4408cf50181921
DIST portage-2.3.78.tar.bz2 1037439 BLAKE2B 7f6d41feba299d2ae81a09ead816bb5695f93cf96f9a16fc4f7c865ceeed7cc5cc3ff5ad92b21a8b03a6ecbee462271a054adcb05c82ff079160d78531f21aee SHA512 a33ec04b78c6e2e13dad80a43e6da6855aa91aa385a4d6f4b97bacc3af49e3e165e1b7183194e51cd7c4db0bba29200d60378197713c961601f84569f239b3e5
+DIST portage-2.3.79.tar.bz2 1038675 BLAKE2B 7a6cff28fa1d4b54607e9416914ab534d250718b082a9789a36be057933867a8a3befd7c99d404b058f67b92c6ee975323c37251fe89d3e3e46865daf0fea25e SHA512 23101644185fb7c6eff12f015d442599b3af744f7b13dcb630f47a7f27c1392c46bd4aa5fa32d403dcf058cc3cc1d56cef00fd8c34dda811388eb268761c0797
DIST repoman-bug-685482-fbebef9677d6.patch 3350 BLAKE2B f715267e2731c1ec7c780aa9c6cffe1f848b3ad050273646579677a0522483df6fef844ffd87fb22f7dad53f1ec60221acd0d81a813569baf768ba62a6c1921c SHA512 0e44625aeec7c239d7db8fdcf6a13313f4a8c1275e0e474cc2f05e5476d86214881cec2917d816c8b63f69d508c0bfa69e6a8e05b614b405463c998a4fb7ce12
EBUILD portage-2.3.66-r1.ebuild 8231 BLAKE2B fec9217335b6ecf5dc4a9a2517abb5a3a854d19f0ceb5d28fda4c39e37e39b1a780b90ef1dfc734ebcc7d07cc9f8d14592fb70c320c6c182362fe17ee78219f7 SHA512 13d1d9155cb02fbacb27319f15feaaba8cc2330cff12b0529c357540e9cc3f60bc6897b14c03e1eca5c59bb3b4c1c478577ab7ef9d2a04087b4091ba7cb595c2
EBUILD portage-2.3.69.ebuild 8088 BLAKE2B 8e1eaddb5a399fb98c4a6119f406a2154a7a4143df50719ba6441d2d49d72a6b7498c8dea66cd260518d926808824b14409ebf771640817d0046a79455701f0a SHA512 fd511c30175607c354b756a5e72582e4c6484fadeec68ef1af7b1104476b6d1ce2657d07d6f02536d6620c728a8b2b103e31ca39f4876e94a44a7f76c96cc12d
EBUILD portage-2.3.76-r1.ebuild 8604 BLAKE2B 0cbb22bc20cfb3c9bda0809b3c3ca308d693ec65f790aa5170951f868ae17662f50f7d9f12b706600b6139a01f3189088935061fcd429e5d5d8a6264663bdeec SHA512 8f22668e737df00f88bf87ff7fb14906181345993d2fadb145aad363b407911c7c8fe5bf1aac82407713f4a289e3b2c905c0750121b14d13579a98879a11ed4a
EBUILD portage-2.3.78-r2.ebuild 8752 BLAKE2B b699e718a1cc50b5796b80822116e864e816a9628ceae5a86543399d897ab404f9ffd7e8870a55dfd5b9e363e24ede50e7376066b6608341791cc17b1e8533de SHA512 1933b88b7cc6ac2d51ee535a40d4d8e2c165163e0fcf510a6ad844f25c08ef882b38e04b7182df2745cf5fbc1a13572cbf29b41b6ca7f1edb23fe9f398bd28da
+EBUILD portage-2.3.79.ebuild 8105 BLAKE2B 5f1f0b94aba3fbf2b940c7996874feca98a206d02e19ba2c248980c38cd1e6a8df905c5dd8988966613eec0f7345c1a1a40952b41eb7a1c1a6f6d1a6da333932 SHA512 507deb786b8739522b688a5377316c4397ada98e3b05308be0258bafc0e7d691d527048e4330f2db7e457650199189fdd76698d3cdcec67bed024adf1ee0a5e0
EBUILD portage-9999.ebuild 7909 BLAKE2B 1116fee5fe17096e2a5b33cce164c6dd8e1f7a8cb04716e0218d001df4a09e957541b8267f0bf92e2b7f80a868aa0aeb081a4f83d8fa9529e619e682b8f4b480 SHA512 8b0b42bf555c092fc43aedc3c38f9eb78f7ea77b315dda867aacaddae4f7eba05434accfad2aa91e4d1a31d9ebeb9453483d3a5d6e5cdb785bb4c30ef6aaaa79
MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.79.ebuild b/sys-apps/portage/portage-2.3.79.ebuild
new file mode 100644
index 000000000000..8e7b92e07cce
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.79.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+ pypy
+ python3_5 python3_6 python3_7
+ python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info systemd prefix
+
+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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+SLOT="0"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify 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).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+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_5} pypy)
+ rsync-verify? (
+ >=app-portage/gemato-14[${PYTHON_USEDEP}]
+ >=app-crypt/openpgp-keys-gentoo-release-20180706
+ >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+ )
+ )
+ 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 )
+ kernel_linux? ( sys-apps/util-linux )
+ >=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)
+ ) )
+ !<app-admin/logrotate-3.8.0
+ !<app-portage/gentoolkit-0.4.6
+ !<app-portage/repoman-2.3.10"
+PDEPEND="
+ !build? (
+ >=net-misc/rsync-2.6.4
+ userland_GNU? ( >=sys-apps/coreutils-6.4 )
+ )"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+ local x y
+ for x in ${@}; do
+ for y in ${SRC_ARCHIVES}; do
+ echo ${y}/${x}
+ done
+ done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+ $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_pretend() {
+ local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
+
+ check_extra_config
+}
+
+pkg_setup() {
+ use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ if use gentoo-dev; then
+ einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+ sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+ -i lib/_emerge/create_depgraph_params.py || \
+ die "failed to patch create_depgraph_params.py"
+
+ einfo "Enabling additional FEATURES for gentoo-dev..."
+ echo 'FEATURES="${FEATURES} strict-keepdir"' \
+ >> cnf/make.globals || die
+ fi
+
+ if use native-extensions; then
+ printf "[build_ext]\nportage-ext-modules=true\n" >> \
+ setup.cfg || die
+ fi
+
+ if ! use ipc ; then
+ einfo "Disabling ipc..."
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+ -i lib/_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 use build || ! use rsync-verify; then
+ sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+ -e '/^sync-webrsync-verify-signature/s|yes|no|' \
+ -i cnf/repos.conf || die "sed failed"
+ fi
+
+ if [[ -n ${EPREFIX} ]] ; then
+ einfo "Setting portage.const.EPREFIX ..."
+ hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+ -w "/_BINARY/" lib/portage/const.py
+
+ 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 ! -name etc-update -print0)
+
+ einfo "Adjusting make.globals, repos.conf and etc-update ..."
+ hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+ 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() {
+ python_setup
+ python_export PYTHON_SITEDIR
+ [[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
+ env -u DISTDIR \
+ -u PORTAGE_OVERRIDE_EPREFIX \
+ -u PORTAGE_REPOSITORIES \
+ -u PORTDIR \
+ -u PORTDIR_OVERLAY \
+ PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
+ "${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+ # 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
+}
diff --git a/sys-apps/qcontrol/Manifest b/sys-apps/qcontrol/Manifest
index cea59a2ba413..eb9c4170ec08 100644
--- a/sys-apps/qcontrol/Manifest
+++ b/sys-apps/qcontrol/Manifest
@@ -1,7 +1,7 @@
-AUX 0.4.2-Makefile.patch 706 BLAKE2B 330c3c0dc85987480f26817dc77dc7ffe28f037996fce412bf839eb91261d4daf5f13dfa0f916dc8ac9696c5c1364da4d0f1bd70738675cd05702e1823f0ec06 SHA512 c5f2066b6df7724f3eab33e2f8b93e1b981268863b7e9eec2ab0591fa00de4c9ee98566b0469c495ad04b27c977a06ed81afdfdeee6de687cd5382c7ca14a8e3
+AUX 0.4.2-Makefile.patch 705 BLAKE2B 388fe4eba874b32aea8b46b9a2ac9020a12362b0f3acdca640239b41f788ce86cc78673342f36f4057516700e2cb82be7cc6b1a25c3f0eb77677465acc7e6471 SHA512 67ac833ea2db6927db4d781b58314a81f5f55beec128c4f556e55196ce37780128d2676c562af2e6062fdc4fc66a4a55f7dbde5e880ce055874f3ba383fa8047
AUX conf.d 133 BLAKE2B 4d77e38035348a26a1dc576cdc681ef41e10104730158e4c3f58ea40b9a30aca5f6bd0a01dafd26dc6dd481029acc270a068fbfc17672dbc6c374d047ce34af6 SHA512 d2b0d1e75eb42c3be65065cb45efaeb3acece3f857cf77b5baf1db9d199d7676e42363ac4f84682e26f81da13ba700bb4f9fbb1b6d483c45a5864e87bc3f2db4
AUX init.d 2211 BLAKE2B 5656083b4689db24bfa77b07704316123a4690e8160d355b42d6bdc359a9ace495ae52b72199e31573307b400ec6e9bea02cfd5e9e136a5faa7b3d94591b3a8c SHA512 66c6c4f30e93f759ca7a9875e23ed82843d9cc728c14c7bc7fffee3fbbafefa57244155649986c547264f500a21d0099efd1195d1810b47370c8f77ed79e4dde
DIST qcontrol_0.4.2-6.diff.gz 11426 BLAKE2B 5f4374d2a6a2f79ca357827437d7ec42c6122b8f3ba008bb8c39adaf80a2edff24ed4f0abb29780ad70cac09eb1d39124d3d9762d603c896c8857ad7b8e7910e SHA512 ce450d04c72052c8e7ce0bf26d21d9942d3ea02b958b510efdf26d368ee69778eaf61bec2084c4d21cc1a5d281d1331e40b7bcaf388b4b59174a37ed037dd984
DIST qcontrol_0.4.2.orig.tar.gz 18344 BLAKE2B c90d3d31ffd624bad11e70a2c700e0e058c9fa6cc2cfa6bb803471df67d07d03a88ae134d5543dbbefe30b5870089a29151614a545dc171de5eb4732d6592461 SHA512 f132faff54833f11ae79622dc8e33b4e0f2516f7377633ff47a4ebe71335503c5e4892723c049b00888622ce059026cd97c6856b425b94163ec09887bd21e81e
-EBUILD qcontrol-0.4.2-r1.ebuild 1456 BLAKE2B 69b682ca190ddf7a456e46999e4e5b899e12b89d24d6ebd68d853dea01b3f619ead24c1dda0de31ea9741440b6be107c2b961ab4229fd45dc6d65bc94a14f720 SHA512 53e948c4a9d04a2bf34961864f5fef6c90baacfe95aacf9280bec35602190e5041ab5d9cd1fdbb292698da0e716986ffa69c93ba016facba67732ef8e853456a
+EBUILD qcontrol-0.4.2-r1.ebuild 1370 BLAKE2B 5cc8eb0a71190f95679c6e401ca01b8feb9775a07acacbc99ca5929874db34f5cfd5d1ca3d9bf4286f07467f4bf083752b1158e5974d80f73ad3f453c6e21544 SHA512 e7ccccff4cf7e0189cf2c24b15b00c3bd7415648d64516cc3afb2c25fdf58bb0166cdbf0ff75454b12c04487675b1543413281920a085711f375cb04c3ee1643
MISC metadata.xml 367 BLAKE2B 8a20a869201a1a69097488f15283baa6eaff5e80667974605e34470d0fbeef210efce302a5feb1b30075273c468b96cf197125d7f7dcdef93faff7b35fb34664 SHA512 ee0131a33df4a79331dfe2a7485d71b05f8f386d3b6ce0b26ab76a7c9f8d9b20efb931fda54d499feb9dd6c3feba34299cf8943fbac2ffea2076e634d49087de
diff --git a/sys-apps/qcontrol/files/0.4.2-Makefile.patch b/sys-apps/qcontrol/files/0.4.2-Makefile.patch
index ad3701c549eb..501e8321fc52 100644
--- a/sys-apps/qcontrol/files/0.4.2-Makefile.patch
+++ b/sys-apps/qcontrol/files/0.4.2-Makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig 2011-04-02 20:44:05.021252507 +0200
-+++ Makefile 2011-04-02 20:45:21.751248966 +0200
+--- a/Makefile 2011-04-02 20:44:05.021252507 +0200
++++ b/Makefile 2011-04-02 20:45:21.751248966 +0200
@@ -1,5 +1,4 @@
-CFLAGS=-Os -Wall -I /usr/include/lua5.1
-LDFLAGS=-llua5.1 -lpthread
diff --git a/sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild b/sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild
index f135fd986def..9330b5503f8e 100644
--- a/sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild
+++ b/sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=0
+EAPI=7
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Send commands to some microcontrollers, e.g., to change LEDs or sound a buzzer"
HOMEPAGE="http://qnap.nas-central.org/index.php/PIC_Control_Software"
SRC_URI="mirror://debian/pool/main/q/qcontrol/${P/-/_}.orig.tar.gz
mirror://debian/pool/main/q/qcontrol/${P/-/_}-6.diff.gz"
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="arm"
IUSE=""
@@ -18,45 +18,40 @@ IUSE=""
DEPEND=">=dev-lang/lua-5.1"
RDEPEND="${DEPEND}"
-src_unpack () {
- unpack ${A}
- cd "${WORKDIR}"
-
- epatch *.diff
-
- cd "${S}"
- epatch debian/patches/*.patch
-
- epatch "${FILESDIR}"/${PV}-Makefile.patch
+src_prepare() {
+ default
+ eapply "${WORKDIR}"/*.diff
+ eapply debian/patches/*.patch
+ eapply "${FILESDIR}"/${PV}-Makefile.patch
}
src_compile() {
- emake CC="$(tc-getCC)" qcontrol || die "emake failed"
+ emake CC="$(tc-getCC)" qcontrol
}
src_install() {
dosbin qcontrol
- doman "${S}"/debian/qcontrol.1
+ doman debian/qcontrol.1
insinto /etc/qcontrol
- doins "${S}"/debian/configs/*.lua
+ doins debian/configs/*.lua
newconfd "${FILESDIR}"/conf.d qcontrol
newinitd "${FILESDIR}"/init.d qcontrol
}
-pkg_postinst() {
+pkg_preinst() {
device=$(grep "Hardware[[:space:]]*:" /proc/cpuinfo 2>/dev/null | \
head -n1 | sed "s/^[^:]*: //")
- case $device in
+ case ${device} in
"QNAP TS-109/TS-209")
- dosym /etc/qcontrol/ts209.lua /etc/qcontrol.conf ;;
+ dosym qcontrol/ts209.lua /etc/qcontrol.conf ;;
"QNAP TS-119/TS-219")
- dosym /etc/qcontrol/ts219.lua /etc/qcontrol.conf ;;
+ dosym qcontrol/ts219.lua /etc/qcontrol.conf ;;
"QNAP TS-409")
- dosym /etc/qcontrol/ts409.lua /etc/qcontrol.conf ;;
+ dosym qcontrol/ts409.lua /etc/qcontrol.conf ;;
"QNAP TS-41x")
- dosym /etc/qcontrol/ts41x.lua /etc/qcontrol.conf ;;
+ dosym qcontrol/ts41x.lua /etc/qcontrol.conf ;;
*)
ewarn "Your device is unsupported" ;;
esac
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index c6f8db82d9dd..adb3d7ebb420 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -14,8 +14,10 @@ AUX test-for-argp.patch 1245 BLAKE2B eb60f4d921f395d713e0ab9f132e47ce8783a096600
DIST rng-tools-5.tar.gz 122182 BLAKE2B de7085d530e38de21a1c33792d67a72e0131b221082d690cdb299367b80b0a123c2976174aa3f895a4a2ab1216aacfaa8e09de485c85154dc4a5b8f960d05245 SHA512 58047c37cad4f5f1210b696e4dba122878f78e57d05d9cb822f79234240ecce31efd2d39061fea1eb5b2e81d48d8c3bf6b92d06451f1ce5d5db7117704e89c50
DIST rng-tools-6.6.tar.gz 51468 BLAKE2B 47231c60d78a48ade07855dfe8a807d6c10b8e27dc662ff7d98cf232b50e6c32f24197291a813d6ed6d15325a33fe9683d82943109a80cac1d9e348fc30cb849 SHA512 00bbe7f817d8f228f357a79ca270c27c62c0e588a99cd76917ecb7e88dfb627028c66497a59c9918205f3551aaf631963c8fd6504cb4198ddf57f714204c21c4
DIST rng-tools-6.7.tar.gz 52792 BLAKE2B 3789aa4c6e2f024dcaef6b9b51521e206d65500a94ab456db61dc45c69ac5e4849a1e74abbe0f7640827ffb4bb20675c1f639a5be852d21d0d1a3c6b2e96bb5e SHA512 2f09edacb5448087041257326faf570c303b42f90bb695a1999b2c7543f20a28b15cdf705a2eca55cae8e9cf9fb5205c056fc26cfaf6af958bcda2cde1952b4d
+DIST rng-tools-6.8.tar.gz 53769 BLAKE2B 2a10a5639c5b1f4506b2c2cfb0185d16b5b604bd8aae72ca616b121f2e7624ff1ba00eb32daa3626b00d89f106356924bde511e263ab8978ff764757b44588ea SHA512 8fa47c2f0f8ebe6ac13025fa2c74505528b503c4e126c5d02b939797d6d4a8c9fc2b345353e48e497e32c1620a0821431e70752a9eb8ecb71960f16713696b62
EBUILD rng-tools-5-r2.ebuild 1144 BLAKE2B 071f7d226fb3c5585be712206d4397c248501e1fb54122c01119444472b8888e7bc95cd21bfc7663bca9c0d40364361b012ef7dde824718918c6e8334436c74f SHA512 dfdbc4425a776b799c873948453091c4cfb674a190626b0d5035d872e31deb9255850f73f73e4e9f664c3e8d72ea316aff9dc0f8a0e70d5d676449aaf81e0339
EBUILD rng-tools-6.6-r1.ebuild 1409 BLAKE2B 20dfe5ef85122bd102a654c3ef95ae651c18116721d0b42478269cc6e3941c449081325149337a215dc6e250296d298d21ac4eaa8052b53b2055451b777c803f SHA512 91710d9bc23534b1e4930a24ab609816838938ab54e4627748c6eab5c36a615ba6baa681fc46dff9bd15c0b75e6cf181f1383528e14bbd811106d23d55153492
EBUILD rng-tools-6.7-r1.ebuild 2143 BLAKE2B 0a0da05d43c4763da8c42c1d5ed39287878fd1c24dafe7d37f4002bb6bd08293ba0fa80189210a19a83ab5c5c6914a0e0205d497f1f88d59f2cea997ceb00eb4 SHA512 14e9cd49419ba51d6df5be4134f6bae33aae463a6e19faa6220023f1ba80c9d971c442ae52ca248d85828eb395fa60e5ae41fb95d85e4364b15e99709d36a286
-EBUILD rng-tools-6.7-r2.ebuild 2176 BLAKE2B 7f5e0f0681f65aed8684689492201d52a28feca1da6301f7a83aee3a48f24e1b04d411f856947e5ea889087b9dc936e3407c41adc11805057e1c2a2ad95c186b SHA512 e6d8b7846d7bd1e62d30cebfd15fd4fd5e4c97efc1848e0ce6f4bf730142be8f421be4151f21069842b2d571ce602837faae99f4970adaea60b0bd843437c407
+EBUILD rng-tools-6.7-r2.ebuild 2175 BLAKE2B fa366fc1400dcc910e2ba860b782be8bd65aedbb49d332d7d601b42ab943de6bf97d40cfddc82e42051ffe0e463321ba636bf1d7fc6d26e264d8603738ddacfb SHA512 c88ab785faa70b88d38cf52e59298da211f1af45f06f9d831551aa3696f7dc90fd5d240ac642fefcf6b57af383585e736fc521e435d0611d1b0613b573ab29e7
+EBUILD rng-tools-6.8.ebuild 1835 BLAKE2B 7d78bef80be7e07da0792566bd96ca306984557f7eecb6940ae75b3ca75cbfb0590a3ed0f89f7b24a29abf65a836939577b75e4840f14896ce49ecd20ab1d785 SHA512 0efb9570fad17b1fec65c455bce367ef50062ac4bb5f764ba7f61734d5ff865386ee89f3871fad751226569cc424b6d38de4b236aa03de4a483bb0a793f04162
MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild b/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild
index 8e4fab261407..fc7e0779e3f7 100644
--- a/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv x86"
IUSE="jitterentropy nistbeacon pkcs11 selinux"
DEPEND="dev-libs/libgcrypt:0
diff --git a/sys-apps/rng-tools/rng-tools-6.8.ebuild b/sys-apps/rng-tools/rng-tools-6.8.ebuild
new file mode 100644
index 000000000000..85c8eb05db86
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6.8.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Daemon to use hardware random number generators"
+HOMEPAGE="https://github.com/nhorman/rng-tools"
+SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="jitterentropy nistbeacon pkcs11 selinux"
+
+DEPEND="dev-libs/libgcrypt:0
+ dev-libs/libgpg-error
+ sys-fs/sysfsutils
+ jitterentropy? (
+ app-crypt/jitterentropy:=
+ )
+ nistbeacon? (
+ net-misc/curl[ssl]
+ dev-libs/libxml2:2=
+ dev-libs/openssl:0=
+ )
+ pkcs11? (
+ dev-libs/libp11:=
+ dev-libs/openssl:0=
+ )
+ elibc_musl? ( sys-libs/argp-standalone )
+"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-rngd )"
+DEPEND="${DEPEND}
+ nistbeacon? (
+ virtual/pkgconfig
+ )
+"
+
+src_prepare() {
+ echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
+
+ default
+
+ mv README.md README || die
+
+ eautoreconf
+
+ sed -i '/^AR /d' Makefile.in || die
+ tc-export AR
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable jitterentropy)
+ $(use_with nistbeacon)
+ $(use_with pkcs11)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ newinitd "${FILESDIR}"/rngd-initd-6.7-r1 rngd
+ newconfd "${FILESDIR}"/rngd-confd-6.7 rngd
+ systemd_dounit "${FILESDIR}"/rngd.service
+
+ if use pkcs11; then
+ local DISABLE_AUTOFORMATTING=1
+ local DOC_CONTENTS="
+The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
+to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
+ '${EROOT%/}/etc/conf.d/rngd'
+reflects the correct PKCS11 engine path to be used by rngd.
+"
+ readme.gentoo_create_doc
+ fi
+
+}
+
+pkg_postinst() {
+ use pkcs11 && readme.gentoo_print_elog
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 3c6aa6c6cd49..fb8820e34945 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -14,7 +14,7 @@ DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730
DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
EBUILD systemd-242-r6.ebuild 14157 BLAKE2B eebb763acfe83ff486867663b3485605730725b00aa7e802624ba8f04bb64e4c4e269f617ab37b5322cd29d878aa4a604919993a9767ff99be4db325503d0edd SHA512 66804d5aa53ec07c841d0d6f6bf6eeb3e610b90f43e449f84550a67a8ead10bdef34a43df2839710e4f62410c94c72478cbb4b0ab3aa4d184d58628b50f94ad6
EBUILD systemd-242-r7.ebuild 14195 BLAKE2B 96ca4520a2eaeca5c970adad294080b06c4e928b8369f52f55e7099116864ef76c38edc387c2315654213a98dc502fb7db9d6067c9baa9462ba204d18ea9ab42 SHA512 56bcdb8ecc8cca4e68708f7b17d57592d62ccf43dc4144505251d06f8763d1e9260a1c97547d2b7889119a1e81e890061d5e73786d552c6acd7175d207ca132f
-EBUILD systemd-243-r2.ebuild 14476 BLAKE2B 41a5a1aeceb339cfe053592ad26aa080ba4ff0fce057cf87dacf40e7f33e611f37d9770312caf3b384fab6cc96ef591d98cf42fb3be0b23e01ff9833b0c3bfdb SHA512 b10749d426558a8255990bf97a4ed888e440d42c628b76adb98828eb97e8d3145be683f1fd946b931a042ad012633e50b94cb9731d37247f44baf1537d0a4215
+EBUILD systemd-243-r2.ebuild 14475 BLAKE2B da969d039ee702ad07128892a7d294593e4cb9ebfc2c155e1a45a7d562b293d54a6ceaf105b7bccdb5a9181bba220f5eefb5a31df0267241238ba0ac8c45c110 SHA512 caf293cfef2a8bf74ba0cd04bf97b4ee7b3561c7136164ef517ddb33a64ad840f90fec7c220f0582532ae04425b0e79e29487301b351a8bafd01ef9d96ed244e
EBUILD systemd-243.ebuild 14255 BLAKE2B bcdf5056bce2710f3c088dfdb686c001816ad5fae721c06153d0eab50ae610f49b6449f4d6b4cb0abe0546f38f76a169569886b0f2446d3248a6d8f0b4c1216e SHA512 b8459206cc0395c6755ffe74cee27e48913c979204dbb794c659ad7c2cf8005d75ff4dda5984f65341cf04b7370a8a3d83718b8f9dc7c9fc1958203f31338a52
EBUILD systemd-9999.ebuild 14481 BLAKE2B a01bcb68d3642c895ba67dd0aa2b79b5ee897423c2ecb32ff17a95ab0e5dcbfb0098b27b3e7fa710004b012708c0b79982b9d0bf7a6bb7602e36ef250a297be7 SHA512 4ca46d3ae151b793bc8609289df63701cccb3e608e9254f315af4873b79ad6c7cffbb74dd6e8f7da782f0156ce578059b96b0f359508ef5f28a6f9e5444440c8
MISC metadata.xml 2144 BLAKE2B f98da35b929799e76331e0f4957f175db15fd8766542058520aeeb1cc762f46c4e3c4d40b1dd21da50a3416807359c383e323e17de175a1439d7faa4bb4be0af SHA512 6e5847187232637a1de5f0d8fad2d6ad0515d537206ea3a7bd2ccd9f17e67789f5c80ebf295554aa135325f2e4260217de6e9a6a7f21dd70945a94ebfc3bf0de
diff --git a/sys-apps/systemd/systemd-243-r2.ebuild b/sys-apps/systemd/systemd-243-r2.ebuild
index dbc8966b5a24..7b3083b2a5dd 100644
--- a/sys-apps/systemd/systemd-243-r2.ebuild
+++ b/sys-apps/systemd/systemd-243-r2.ebuild
@@ -11,7 +11,7 @@ else
MY_P=${PN}-${MY_PV}
S=${WORKDIR}/${MY_P}
SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
fi
PYTHON_COMPAT=( python{3_5,3_6,3_7} )