summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/Manifest.gzbin48518 -> 48679 bytes
-rw-r--r--sys-apps/i2c-tools/Manifest4
-rw-r--r--sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild6
-rw-r--r--sys-apps/i2c-tools/i2c-tools-4.0.ebuild4
-rw-r--r--sys-apps/ipmicfg/Manifest3
-rw-r--r--sys-apps/ipmicfg/ipmicfg-1.27.1.170901.ebuild60
-rw-r--r--sys-apps/ipmicfg/metadata.xml12
-rw-r--r--sys-apps/portage-mgorny/Manifest2
-rw-r--r--sys-apps/portage-mgorny/portage-mgorny-2.3.24.3.ebuild163
-rw-r--r--sys-apps/ripgrep/Manifest2
-rw-r--r--sys-apps/ripgrep/ripgrep-0.8.1-r2.ebuild (renamed from sys-apps/ripgrep/ripgrep-0.8.1-r1.ebuild)2
-rw-r--r--sys-apps/sandbox/Manifest2
-rw-r--r--sys-apps/sandbox/sandbox-2.13.ebuild2
13 files changed, 251 insertions, 11 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a796db3c05f5..72876d83039e 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index 10cb78b6d11e..a7f099b41244 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -1,6 +1,6 @@
AUX i2c-tools-3.1.1-python-3.patch 3348 BLAKE2B 4fbe75455e4370da6c61c786cd0eaef94039b24d9de33ecc1ac6333f5776d61d8638493f7b7218bd15e36301cfeed840217050ed37edf3825017cdbf9b7b3d25 SHA512 0f264e49237af0318c868deac39bdd7c2b718c39317c2e47b15ad7d421530dc165f38b5995ca45bcfd65074ab51022d88ced6f2d589e30ebbab1702cf964f8da
DIST i2c-tools-3.1.1.tar.bz2 71789 BLAKE2B 0a7a3db6a3b396cfb8d5e58d8c83cae4e52239786502c6552d971350f7fc05a1ce9d7d89e9cdb154a21ac15bdf34aa0dec9501ea45317ec9c5d9fc211780bbf1 SHA512 b91f89b803e5558d49ce63f42f6542438f4f47927e4ce420cd9df989cab14a5c55d971befed73e8f793b0cf4aa41936c0ef519e5a407dceb2c08964461e803c5
DIST i2c-tools-4.0.tar.xz 79972 BLAKE2B 982e4139ed0e2111f9e082d0690fcc0f86f97a433e292e9464b41991f14a1f90147a3612172bad6880f0df6896612e1dea0ae7bf6f459758b2cff45fb35a5dc7 SHA512 ddf86c357c101388193581bc40285089e6ab5e8d870f8aa5d594acc7ecb8596fbd30501e147b88bdea0200b1be88bc0a374356c188d1bcb067bf8e254e3dc51e
-EBUILD i2c-tools-3.1.1-r1.ebuild 1431 BLAKE2B 9e345a8bcc8122c6e5dc1dc08ce5e3278c682d35725d03ed92d1ca5650f92e6d24e9fc7b8419271f155ca440b538838969a3ed7b038cbd9d6616f1ab736b1343 SHA512 03b8a80f90970877019cc27d519e535fb7478d636603b937a63f375b3c7ed8264bf975bc3640541afbe02ca7f0de7e226940f6a0f6ab4a7f9d54f2fc02efc564
-EBUILD i2c-tools-4.0.ebuild 1400 BLAKE2B 3e8316aec0396172e0b3626f888fb4789eb36916592f085fb23148d893efdea13b2d82bd28ba0682390718c7a17e3ca2d1a16cbcb89e0118602a5b4e2e61581c SHA512 9cc0e3bf449c75a7502e384337912390cb66af15bb1ee51b64a76deffd7fa5b596c040eca9d6c88275e961a2862760d8531ecc268c6174ba082ad3646042da9d
+EBUILD i2c-tools-3.1.1-r1.ebuild 1438 BLAKE2B c9d1e61d5c2f743cca2bdbae3c518998178fbafd09a42538c91d1b637dcc9bd31a1cb746a63fc81e06875c76386a70832305d8cb6f48d3fa282ec598c094b0f2 SHA512 7187a3759ab86014023b45adc9aeea93e7dc1f29f6266b7ef1c514d65e28bb097aa74844d5d279b3961d544f21283ae6076b7c5206c78393866dc4aa41173150
+EBUILD i2c-tools-4.0.ebuild 1391 BLAKE2B 0951d16029bad7c3876c5112c34e492ff0fe3f54b5eb78986ea276252cb7c40e42eb8fafd761597c7078d77d541615d5c60c3e73451e2152dcbe22a7ff313741 SHA512 af1d4c6d94a12a045c4a5bbec615a467a2d1104f54fc1b583cfad4c83dd62c753a06b8c6ae3243c2dd1418c912727028068d92d29c75c598afbf9936f3288e10
MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild b/sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild
index 342d6295325e..98c99d4b0435 100644
--- a/sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
DISTUTILS_OPTIONAL="1"
-inherit flag-o-matic toolchain-funcs distutils-r1
+inherit distutils-r1 flag-o-matic toolchain-funcs
DESCRIPTION="I2C tools for bus probing, chip dumping, EEPROM decoding, and more"
HOMEPAGE="http://www.lm-sensors.org/wiki/I2CTools"
@@ -45,7 +45,7 @@ src_compile() {
src_install() {
emake install prefix="${D}"/usr
dosbin eepromer/eepro{g,m{,er}}
- rm -rf "${D}"/usr/include # part of linux-headers
+ rm -rf "${D}"/usr/include || die # part of linux-headers
dodoc CHANGES README
local d
for d in eeprom eepromer ; do
diff --git a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
index d5f248f7c280..32dffbf1e2ba 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
DISTUTILS_OPTIONAL="1"
-inherit flag-o-matic multilib toolchain-funcs distutils-r1
+inherit distutils-r1 flag-o-matic toolchain-funcs
DESCRIPTION="I2C tools for bus probing, chip dumping, EEPROM decoding, and more"
HOMEPAGE="https://www.kernel.org/pub/software/utils/i2c-tools"
diff --git a/sys-apps/ipmicfg/Manifest b/sys-apps/ipmicfg/Manifest
new file mode 100644
index 000000000000..541dc302238a
--- /dev/null
+++ b/sys-apps/ipmicfg/Manifest
@@ -0,0 +1,3 @@
+DIST IPMICFG_1.27.1_build.170901.zip 1667230 BLAKE2B 6411f735fed2e66f8dc012c480e6f9a4c2c9223643074514ca6fbb0db62df06fd78714c4a95ce92edc22a4473734a1d41a6c3bdb61268c73a628f08e7dc87c0e SHA512 9ed01a8a1eae7a7e41fafdbb3b666e7760057c960b65da547f0cf197b30b1a535fa2fe8357e13e6ccda0e0dd4474170b43ca3bc89f55c2de5df0160adde9377e
+EBUILD ipmicfg-1.27.1.170901.ebuild 1425 BLAKE2B 130cfa8b7cf23f2316fd45f174bef028c7c6e5c3b3344b4651b93339258cd4c1d28cc2ca335ac649a995c65b049881bcaf131f69d8fab2fcbf493d0c4f251a4e SHA512 572e8b141d38c2421e020b0453d8e859182c9d9a37711ff7292aab3f837e9b08e559b814050c1b3b48e78999460a70b78602535d6aaade957564f296f1e0b7a0
+MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/sys-apps/ipmicfg/ipmicfg-1.27.1.170901.ebuild b/sys-apps/ipmicfg/ipmicfg-1.27.1.170901.ebuild
new file mode 100644
index 000000000000..ce0d6c434345
--- /dev/null
+++ b/sys-apps/ipmicfg/ipmicfg-1.27.1.170901.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver
+
+MY_DATE="$(ver_cut 4)"
+MY_PN="${PN^^}"
+MY_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="An in-band utility for configuring Supermicro IPMI devices"
+HOMEPAGE="https://www.supermicro.com"
+SRC_URI="ftp://ftp.supermicro.com/utility/${MY_PN}/${MY_PN}_${MY_PV}_build.${MY_DATE}.zip"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="supermicro"
+SLOT="0"
+
+RDEPEND="sys-libs/glibc"
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist fetch mirror strip"
+
+S="${WORKDIR}/${MY_PN}_${MY_PV}_build.${MY_DATE}"
+
+QA_PREBUILT="opt/ipmicfg/IPMICFG-Linux.x86 opt/ipmicfg/IPMICFG-Linux.x86_64"
+
+pkg_nofetch() {
+ elog "Please download ${A} from"
+ elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI"
+ elog "and place it in your DISTDIR directory."
+}
+
+src_install() {
+ # Choose ARCH
+ if use amd64; then
+ local my_arch_binary="x86_64"
+ local my_arch_folder="64bit"
+ else
+ local my_arch_binary="x86"
+ local my_arch_folder="32bit"
+ fi
+
+ # Install files
+ insinto "/opt/ipmicfg"
+ doins "Linux/${my_arch_folder}"/*.dat
+
+ # Install binary
+ exeinto "/opt/ipmicfg"
+ doexe "Linux/${my_arch_folder}/IPMICFG-Linux.${my_arch_binary}"
+
+ # Install symlink
+ dodir "/opt/bin"
+ dosym "../ipmicfg/IPMICFG-Linux.${my_arch_binary}" "/opt/bin/ipmicfg"
+
+ # Install docs
+ local DOCS=( "IPMICFG_UserGuide.pdf" "ReleaseNotes.txt" )
+ einstalldocs
+}
diff --git a/sys-apps/ipmicfg/metadata.xml b/sys-apps/ipmicfg/metadata.xml
new file mode 100644
index 000000000000..54d5423c4060
--- /dev/null
+++ b/sys-apps/ipmicfg/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+</pkgmetadata>
diff --git a/sys-apps/portage-mgorny/Manifest b/sys-apps/portage-mgorny/Manifest
index 04814e5e78f6..318445b805c7 100644
--- a/sys-apps/portage-mgorny/Manifest
+++ b/sys-apps/portage-mgorny/Manifest
@@ -1,6 +1,8 @@
DIST portage-mgorny-2.3.24.1.tar.gz 1239318 BLAKE2B bfa8418ade600835c90378177bc6cd91f6c17e02c0e05b0829f4ee3b500ce3275fcb76424e19af5618026daa7b79d402aeb0d9f2133e7db09cb8983eeb355427 SHA512 04e3d5ee08f78ba3bb8045c36e7e81b06b7a0aff65a22c82cd2ca6fc0ab9f7b63a49c7eda9048d15fbc9c8d1a898c0d038f7cac2f4daf6d68bb799a9303d74c1
DIST portage-mgorny-2.3.24.2.tar.gz 1239343 BLAKE2B 701c90d333c10976f11910babed4b002cb545561c931d635973cf9b455a247b050b098c61fca0b20a5a8d70d4478a9daddacc826045e74c52d45878260431c93 SHA512 0319a973a26650ce182c0e1f997399f0c3944474ad5c8c2f88b9588ffbf99ccd12bd84e7537f8368f8362a098a72d177fc3c844e2afc086f95094baa27d97b93
+DIST portage-mgorny-2.3.24.3.tar.gz 1235966 BLAKE2B 0919ad1c287075cdeaacb3c40b468ba9afd93df59ea3e8caa87300f87e0638e72d3d2791d07764d82147025c407f83f7442d9c4f02b5b8ae7ba8485f54193499 SHA512 dfb2341a512b3db37b7f282d7246d16afb8df9e1c401656022ac72adf35541bd4aa0224974deb581e76174b1bd7c49368c76215dd977168e5da858e9d8b8eda5
EBUILD portage-mgorny-2.3.24.1.ebuild 5451 BLAKE2B ca175205856228d36517a41420a5739832bf0919ad18d3af8f86ac05c75df3a0a371417c0541ce9caeee804ec519724675149713c495261db67f078daa9e8e25 SHA512 0a4261c22521ce902df520f254607cfa80019ad91d89eec1bf6ea8517062615a2c9272ba9de477c0509e09aafe7615772b5e4b157c3c8002d6e1b4945ac146b9
EBUILD portage-mgorny-2.3.24.2.ebuild 5467 BLAKE2B e9128167ffd714269124199116d31bb4cc582fd36aee26c8da10dd40fe1e27b8f8aa1e1b2f0c51660c54259ca7f0c39ed431e3e0d432224e2813019fa1e5f6cc SHA512 18a4d5a807e0f13199d6256e5218af8cf6b247a519b330ca19a0d6de714d386c8a12713fce86d1628a7c4fd6f65eab249c4bc4231a37a6e9c5c059e9aa5c52a8
+EBUILD portage-mgorny-2.3.24.3.ebuild 5467 BLAKE2B e9128167ffd714269124199116d31bb4cc582fd36aee26c8da10dd40fe1e27b8f8aa1e1b2f0c51660c54259ca7f0c39ed431e3e0d432224e2813019fa1e5f6cc SHA512 18a4d5a807e0f13199d6256e5218af8cf6b247a519b330ca19a0d6de714d386c8a12713fce86d1628a7c4fd6f65eab249c4bc4231a37a6e9c5c059e9aa5c52a8
EBUILD portage-mgorny-9999.ebuild 5352 BLAKE2B 6ecd0c3f4c4eb308a6eb5c6867402f231ba0233c6e8ef224e6ec2185c77475fd6bc114bf8622fdb28aed5b06af705d4956608ccc1b22402eb1fe50763773e209 SHA512 65c03a6f7e8047b8b51a9761625b291a027f2745b4ac6b10c2323710ca91bd1cdc17e29dbc61c7e0c16a44691e5daab32e3f71324b32928c2277d14b8542302d
MISC metadata.xml 817 BLAKE2B 8792bea6f73e3d72c747a11a0946c119abd9a24e3a1f40c457563536a9a1ce304c8c2ff0682fad3f94913d171806a262cf73de7437b5f250215810d8ffb32447 SHA512 e3498363b89e349d37b13dd40c7b3225f8c445b1ea2db9f70f2a1d718b7576103296d52581aa5ae0edc4ddd3fa8123161425c2732753f88e997b1cca818572b2
diff --git a/sys-apps/portage-mgorny/portage-mgorny-2.3.24.3.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.24.3.ebuild
new file mode 100644
index 000000000000..eb3315f80c86
--- /dev/null
+++ b/sys-apps/portage-mgorny/portage-mgorny-2.3.24.3.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="Fork of Portage focused on cleaning up and useful features"
+HOMEPAGE="https://github.com/mgorny/portage"
+SRC_URI="https://github.com/mgorny/portage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/portage-${PV}
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build +ipc +native-extensions selinux xattr kernel_linux"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+ >=app-arch/tar-1.27
+ >=sys-apps/sed-4.0.5
+ sys-devel/patch"
+RDEPEND="
+ >=app-arch/tar-1.27
+ !build? (
+ >=app-admin/eselect-1.2
+ app-crypt/openpgp-keys-gentoo-release
+ >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+ >=app-portage/gemato-10
+ app-shells/bash:0[readline]
+ $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+ python{2_7,3_4,3_5} pypy)
+ >=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
+ >=sys-apps/sed-4.0.5
+ )
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+ elibc_musl? ( >=sys-apps/sandbox-2.2 )
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+ >=app-misc/pax-utils-0.1.17
+ selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+ xattr? ( kernel_linux? (
+ >=sys-apps/install-xattr-0.3
+ $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+ python2_7 pypy)
+ ) )
+ !app-portage/repoman
+ !sys-apps/portage"
+PDEPEND="
+ !build? (
+ >=net-misc/rsync-2.6.4
+ )"
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+ if has_version sys-apps/portage; then
+ ewarn "If you are migrating from sys-apps/portage to sys-apps/portage-mgorny,"
+ ewarn "please note that Portage will abort upon having to unmerge itself."
+ ewarn "However, sys-apps/portage-mgorny will already be installed at this"
+ ewarn "point, so you simply have to restart emerge and it will successfully"
+ ewarn "clean the old package afterwards."
+ fi
+}
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ if ! use ipc ; then
+ einfo "Disabling ipc..."
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+ -i pym/_emerge/AbstractEbuildProcess.py ||
+ die "failed to patch AbstractEbuildProcess.py"
+ fi
+
+ if use xattr && use kernel_linux ; then
+ einfo "Adding FEATURES=xattr to make.globals ..."
+ echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+ || die "failed to append to make.globals"
+ fi
+
+ if [[ -n ${EPREFIX} ]] ; then
+ einfo "Setting portage.const.EPREFIX ..."
+ sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+ -i pym/portage/const.py ||
+ die "Failed to patch portage.const.EPREFIX"
+
+ einfo "Prefixing shebangs ..."
+ while read -r -d $'\0' ; do
+ local shebang=$(head -n1 "${REPLY}")
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${REPLY}" ||
+ die "sed failed"
+ fi
+ done < <(find . -type f -print0)
+
+ einfo "Adjusting make.globals ..."
+ sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+ -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+ -i cnf/make.globals || die "sed failed"
+
+ einfo "Adjusting repos.conf ..."
+ sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+ -i cnf/repos.conf || die "sed failed"
+ if 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_configure_all() {
+ cat >> setup.cfg <<-EOF || die
+ [build_ext]
+ portage-ext-modules=$(usex native-extensions true false)
+ EOF
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install() {
+ distutils-r1_python_install \
+ --system-prefix="${EPREFIX}/usr" \
+ --bindir="$(python_get_scriptdir)" \
+ --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+ --sysconfdir="${EPREFIX}/etc" \
+ "${@}"
+
+ keepdir /var/log/portage/elog
+}
+
+pkg_preinst() {
+ # 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/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index 69fb6684c8cb..d3788e18f535 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -44,5 +44,5 @@ DIST winapi-0.3.4.crate 905247 BLAKE2B a6dacb223c0f7743af4c16d4256eea6fdab49ef7f
DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
DIST wincolor-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374
-EBUILD ripgrep-0.8.1-r1.ebuild 1528 BLAKE2B 57a1799d3cceb5a1605ed94512edf5f1cf9e4e30bbf8af7f60524989da7ad26e3f2a4aa1cc4ec1ef6e5f9cf6605895c30feb4f10a6e5ec5656e1d6704fc2f178 SHA512 486a5e5a6b8319b8509acab50cc0000484ff6819585a6e89a13b007e5d104b2313432ba9763ee5c1b956851f1236b2344041132411991c4d719ee758836be4f1
+EBUILD ripgrep-0.8.1-r2.ebuild 1532 BLAKE2B 1b5dec09d8a0ad05d570534daa72dfd4cff896a20e79b6c26daf151c79234042eaa02a44afa1652c16881b2787e0612d46649fbccbf52fa8008feafd7196ef60 SHA512 d4d4be24db631878e260c1d43b4b2d73bad4a8002cdf2fc404457f587b52b975e836ded7d17a9e9b9343b8dc54941dc06debf717d4532453a67ca8d5b9f525bb
MISC metadata.xml 339 BLAKE2B 814975935c3042512ae2d83d3964bc94bef9b6b19181adc8c07f538e095983d503af6f6683c61109f4c3515175f02879f07d352845966c04bc774ee47d65db97 SHA512 4501066b64cc47d58915b452027ea603d319b0eae3d9bcd45642f16bcca3e5bbba3fc998fe8501ce63c4717ccf5f404392b98b54d53b93c648e8c8de116141ef
diff --git a/sys-apps/ripgrep/ripgrep-0.8.1-r1.ebuild b/sys-apps/ripgrep/ripgrep-0.8.1-r2.ebuild
index 27998b14ac3e..e0f4fe2ab36d 100644
--- a/sys-apps/ripgrep/ripgrep-0.8.1-r1.ebuild
+++ b/sys-apps/ripgrep/ripgrep-0.8.1-r2.ebuild
@@ -76,7 +76,7 @@ src_install() {
# hacks to find/install generated files
BUILD_DIR=$(dirname $(find target/release -name rg.1))
doman "${BUILD_DIR}"/rg.1
- dobashcomp "${BUILD_DIR}"/rg.bash
+ newbashcomp "${BUILD_DIR}"/rg.bash rg
dodoc CHANGELOG.md README.md
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index fb6e898b78a6..860d5df360b7 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -2,5 +2,5 @@ AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5
DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6ff807719df79131e6c966d60c3b37d9d8e4e1d466df0992836c4594bf6927b496ecb343a71d7b0656219a6d7 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9
DIST sandbox-2.13.tar.xz 424968 BLAKE2B efcbf527853e8cfe8b3fec026041f55f51cba78029f92195ec76a45e84cb2b6cc129267c6e50608584607de72a86b2e7836e77f20677de9b94bb5c40999e4712 SHA512 46ad79335e51a1ec0aaa34ab5eeabe9d007818c518682409c5aaf97d49ec23021ece8fa53264ce5332cdd04ef6b3fd9beff0dc0a3cb5dfe2f9b6a6e359f8c1cf
EBUILD sandbox-2.12.ebuild 1928 BLAKE2B a7a78a1e8b6513b88b79ed395caa976601698355fc839004ae132b5a94e33295e4edc9d41e6c8e056c8fa0abee3c2199bc3a5fa09394ab58c5f60133c0b18b1e SHA512 f3e73bc7fb6b73490d395fe109bfbb35986720b8fafbdb3a1d8885a3388e4561b5e7f92a06c19909dca4e985923059743bbc0d060da39d1dc3031a8218a6e48f
-EBUILD sandbox-2.13.ebuild 1938 BLAKE2B 26db9bc8c8334a4a20bcb09765861f6ed6b6a3da6edd02cc9438943fc18271a9ffa90a26d37e2f648cdd5073a22de71decc21417db1ea331833f11d146f5ce4d SHA512 11cd256384d562de308cd579a04c3742dc436a8e3f4e30cc66d837373c2352b99b23bd4fbfee6fa61b74b7e1eaae95b7ffec1f0fb9785979b783c17f420cdbe7
+EBUILD sandbox-2.13.ebuild 1936 BLAKE2B 6fbde8f69b9389b46c027c04153bf0c863191cad8f42d7ccf151d10525a0ccd2e1b227d30663ed18b3233d8f81466c0fa004a73e2ccb776018c00890d6b8d41e SHA512 e1876c3b78ad65abbad3eb48c7eab773749fc6ad457bfc4a4560ef5bcbe8fdb9d227b27d8c6dcded3e5810d840cfeff3e10a54f81fa1918ca7eb0c53b86c52d8
MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.13.ebuild b/sys-apps/sandbox/sandbox-2.13.ebuild
index 37b52a70e2e2..966c4ce8a6d1 100644
--- a/sys-apps/sandbox/sandbox-2.13.ebuild
+++ b/sys-apps/sandbox/sandbox-2.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE=""
DEPEND="app-arch/xz-utils