gentoo resync : 30.06.2018

17 files changed, 193 insertions, 202 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 40f9423457c2..a8b6e734670e 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index d6f3fdf4ba31..f4a6ecc3b771 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,18 +1,16 @@
-AUX 2.0/criu-2.0-automagic-libbsd.patch 473 BLAKE2B 0ea905cc0e6c1e8e9207fd4a4959a5506b886e040a9547b6c9ee2b84191a1ee908c329a3ad36f0e539e708c12bf8b61c3fde5936382eda8b1b454b2dd65c8479 SHA512 869cb0fe66588e0a78de7020c5f62a70c267aa7e2744be4915b8bffff01763630dc65f75988471428629d99bbce93831391db60efcbdbaf495c459978e8e05e2
 AUX 2.0/criu-2.0-sysroot.patch 362 BLAKE2B f99d30b790242b5bf56be24f65b94f51c428b7418c135051738f65c7475883e0afdebd3245b323cd87a18dc7bdd521a09cd03f777b1e79ccaf90254cc71ee231 SHA512 1ddce6d4072453305dc380c87f9905e441b9554cc8977c2ddc0a4ef4794732bea5c1448519ab8672d36dab5cbe1ec95dc7f8f9548b63d84aa6a7bbddeca77706
 AUX 2.2/criu-2.2-flags.patch 259 BLAKE2B 6e62d8e96ba9b2beaa4a525f14ebca1a198dae73c83d37396d92642dd426a015828daa0f5022471f0822f1660acc373cc5a848d86bcb231d9ed00b6ca5975866 SHA512 d2b122abb9d8878b5d50e11aa6a5323bd16a30f60eb7b746ecb7e4dcaab2a54d7974931778b5d82766d92963dc5075784df87bb736ad5019c66052bd25d9d57d
-AUX 2.2/criu-2.2-makefile.patch 2453 BLAKE2B cc63506856cd287521b081516b808184f45283ba774e2e9e6cbab8c12b4a6076d279af59fbbce976d5a50e6534854dd73c234ea408718f86ddbf6c12e17c3918 SHA512 e56ab0d9ba0fa12fd12e3c419b9b1f37021dd923eab3f1a7ac4d2ab06d7f01d06b1341a06c29ed41feb0dd5baf89195bde34d9b6b1b7b9839eed0ff654f44319
-AUX 2.2/criu-2.2-no-git.patch 612 BLAKE2B aa05a7339df52432f5556a34bf4f8c86c3649eb2396a242512437e326e4e8a5bb284f94d19d1506157b86ee0bb17a6f63ba65b32472584d115b57ed4efb1e792 SHA512 e10b01d50905788a2e25b9481de548c2f96173b62f7f7bab70eaa197217ac5a8f657f1fc356774dd7b5b0817288e5b0d336ef57aaeb33b6c0a8b5ee427d53c77
 AUX 2.3/criu-2.3-aarch64.patch 533 BLAKE2B bae80e07fde9eb3055ab709f3d0fa1dcae73ba01e1b84e0ee1e7858f6b68e91b1c101add3a892b4db48ea1a5aa677ae1d0ea08f6184891b5f251b649947f9299 SHA512 357b54639e0368077fc33a80fc4c8b3e40831b36ff06c7c45acc6c8de128b146536f41eb5e870f767a5e05ef8977e3b39f6be853471d2a0b2fa6e99f89f85dd1
 AUX 2.3/criu-2.3-no-git.patch 651 BLAKE2B 76d7bd15f67789a72cd0d58c854da5601cfdc42e657cc819acecd52653b2b3699db3f00cb5916148c9a1a8013159716d8607bfd6443d24a2f98bd6e0abe21f90 SHA512 9010b79a01f7bab35ca23749d6e61706404cca89d5cdacd31fc32aba82b088becd9997f9a82db460e16bd84d9f38b1b35e90d3c49ad04b0f141d037e9ebafdd8
 AUX 2.4/criu-2.4-makefile.patch 2497 BLAKE2B c9ea525b59aba01f6418ede5cd68fe02878da1962b9748689c1637e8a1733b9027507d0e382ec226ddf47e2d392d3a467855732137ff7ed3763513b4421e98a1 SHA512 3bb9963907b92d791e54ad57fde2474b77ac4bcd26e7eff67ff098feacd6c0255c560a3d364031e0a4051b9a8c943b9401afb271cfee1d91e58e116a02f3d979
 AUX 2.5/criu-2.5-automagic-libbsd.patch 516 BLAKE2B d7d1f929dade8247b1d4999aab073cc27cb2f0e3823c589e2313df5d1bd55162e3c3a7cc6eadfe0929fe8e51a774017acbb4b1f1582c7f72221d1c3f354aaa60 SHA512 01f1a6ac36c8c40b2f0d4cecafb2783d7bf7be51af042710615aa79318ef7914cef063b437428c4c2c8b2dd02434abbec7affd3983b4da74aabe429b1ce947b6
-AUX 2.9/criu-2.9-makefile.patch 2504 BLAKE2B 854a693730bf674ea9b18298d527f61e17e2e357db81662c863b4a51b4dd73bbe4acb99d3546c96b55ed81c201c6d53203e3a7c80be8752cdf8c46221a24b628 SHA512 8d0919c1fb7f2672e44f8366eb3df70dae9d687224170b43688365af9be4a974d169c78f84dc2525d32b24188749c992b8b716df840af0ebdace2eaa61eb2366
 AUX criu-2.8-automagic-libbsd.patch 511 BLAKE2B afcda80c50a2ea0a74f3578c56b2dcfe1bbb3ff17dc88bb0ea7da16fa8db21e1adb5e2f85479459d079991f7d9f2b443881d9a8d07cae1b1b541ac5a691f37ac SHA512 d43280f988965dc6c7932767a896fa252234aefee99b85651d2d3ea0ffac7dd3fce60c067d9eb7c847ad941cb20eca68a118f77246d56831d083ba01aa8f037a
 DIST criu-2.5.tar.bz2 605226 BLAKE2B c4086b9822b119a648bda4f6cc831eba5b7e3fba5af41f8f0b1c00dac7d4aff88a71e81569c4559fd98113e76eba0653c67684f443c1c803c453209367a4c875 SHA512 ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
 DIST criu-3.6.tar.bz2 739437 BLAKE2B 0f128cf69a5a073df3abc736e3081b7d266573575c038a457fdf8adcdab668d957559f3b9a16606ff31871c3bf5e111349995c496c4236b5191340486814981f SHA512 5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586
 DIST criu-3.7.tar.bz2 749499 BLAKE2B 41222983183910b8a039a69e1a425993703e4f461c1cc0e64e92f877aff571d56c7f32cdae7848ef1633a15cac9e7b746f8c84a71f3607f7fc22959964820258 SHA512 8feb9e2579c04b67a7fe9631bb662504a7eb78550c3951cbe29252d87d9258fd6994533f6e60b0017b6a6e21bbdd5e7cd7e8a255be53b77b57efacec4e50140f
+DIST criu-3.9.tar.bz2 772167 BLAKE2B 7c781acc9d6353a4e32c5daa9606332030d4c99d10c00d7f1c59beb54c1bc4cfb2ca0eea0663caa5ef936de436ac2efadf8c6b01a55e06905bd5a7fb91cf29e8 SHA512 875a4bfb809d7b479bb6357a4e114f2f5caaaf2940019a41cc6494fd90025d72b5fc4129be89eef1b9f62a5358eb96509fd15a33b64fe2b8f7f805dc8110b994
 EBUILD criu-2.5-r1.ebuild 2342 BLAKE2B 9e6707f582403bc60ae035e5c6197a786dca87277cfd2013ca593b666708f270d9d644e1a481738b9936b890823ec488fa7ebdaae8c8338a6f7cb27fa2e51c62 SHA512 9b6cf63124c3e10d79ee548f8b909520dfe424509768d4ee2c873e4011c8915fc2cfe3019d7aa147e05f9e57b2c2cf1900d06a76153be7446280022f12dfd014
 EBUILD criu-3.6.ebuild 2536 BLAKE2B 72958629ad1b82af05194890c8de5ac7f09558d98b9d54ef7edd29afc4d9c5dc58122209d515b61de13eb8d036b8222f5670fccfde321c96f1d5a536a63619ba SHA512 e1f212536f091c4d87c92b30440dc67734d15c453471389f057d94594c17f79e2b1ad3a21f9c138009d3aa84546206ffedbe5e4238a691b71132d41f38f5dad3
 EBUILD criu-3.7.ebuild 2731 BLAKE2B 56f4cc2ae30e2b63114da6377c6b8cbe2597ec3406340796d4a60a90faa16be07c8db8d9e3f7038898f0fe7c3911b5df7260561fcbe7fa0c42267ca4d52c8ca6 SHA512 748b92a6dc5e4453cbb91656db75257376ee016909324cbd3982d8c2087b58857c7236a4159bdb46711aacb32779eaef4675deb847b97023fbf77614bd3ebc39
+EBUILD criu-3.9.ebuild 2894 BLAKE2B 744ce1f3784854ec89265532bc7805a2a728d43c296953b45e11df6e600877088cebc554050fd0f113d73eb6f711259bfe4ca0118bb4506a6bd446b89f108c3d SHA512 012799dc23ea084a5fcb1afee6c94e211bee9682485729b54311a04447248712d77e63682f8c03775db19cee9cebf50fc7e3fd8595e588b8cecbeff5ef1850d4
 MISC metadata.xml 480 BLAKE2B 55ce3f89b53789b3ed3e9a19fd4dbf3184941572269b3ef489c3cbbef8bac8a3aac58ea84887ac0c99919797e74c289ffaa617fc8370f936c9c34c27b976ace1 SHA512 0a108eed5d8cdb1818b9c497377b3a83b282354c9402f1ee6473df4eca6ab75f508b3faba55a88007ca225238ac0c00fa1c0d845fdd4c98556f1c03b6f33a764
diff --git a/sys-process/criu/criu-3.9.ebuild b/sys-process/criu/criu-3.9.ebuild
new file mode 100644
index 000000000000..523a1b1c4e52
--- /dev/null
+++ b/sys-process/criu/criu-3.9.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit toolchain-funcs linux-info flag-o-matic python-r1 python-utils-r1
+
+DESCRIPTION="utility to checkpoint/restore a process tree"
+HOMEPAGE="https://criu.org/"
+SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="doc python selinux setproctitle static-libs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/protobuf-c
+	dev-libs/libnl:3
+	net-libs/libnet:1.1
+	sys-libs/libcap
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	setproctitle? ( dev-libs/libbsd )"
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)"
+RDEPEND="${RDEPEND}
+	python? (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-python/ipaddr[${PYTHON_USEDEP}]
+	)"
+
+CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
+	~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN
+	~NETFILTER_XT_MARK"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
+	"${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch
+	"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
+)
+
+criu_arch() {
+	# criu infers the arch from $(uname -m).  We never want this to happen.
+	case ${ARCH} in
+	amd64) echo "x86";;
+	arm64) echo "aarch64";;
+	*)     echo "${ARCH}";;
+	esac
+}
+
+src_prepare() {
+	default
+
+	if ! use selinux; then
+		sed \
+			-e 's:libselinux:no_libselinux:g' \
+			-i Makefile.config || die
+	fi
+
+	use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install
+}
+
+src_configure() {
+	# Gold linker generates invalid object file when used with criu's custom
+	# linker script.  Use the bfd linker instead. See https://crbug.com/839665#c3
+	tc-ld-disable-gold
+}
+
+src_compile() {
+	local target="all $(usex doc 'docs' '')"
+	RAW_LDFLAGS="$(raw-ldflags)" emake \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		ARCH="$(criu_arch)" \
+		V=1 WERROR=0 DEBUG=0 \
+		SETPROCTITLE=$(usex setproctitle) \
+		PYCRIU=$(usex python) \
+		${target}
+}
+
+src_test() {
+	# root privileges are required to dump all necessary info
+	if [[ ${EUID} -eq 0 ]] ; then
+		emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
+	fi
+}
+
+install_crit() {
+	"${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/"
+}
+
+src_install() {
+	emake \
+		ARCH="$(criu_arch)" \
+		PREFIX="${EPREFIX}"/usr \
+		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	use doc && dodoc CREDITS README.md
+
+	if use python ; then
+		cd lib
+		python_foreach_impl install_crit
+	fi
+
+	if ! use static-libs; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+}
diff --git a/sys-process/criu/files/2.0/criu-2.0-automagic-libbsd.patch b/sys-process/criu/files/2.0/criu-2.0-automagic-libbsd.patch
deleted file mode 100644
index 3f39ef63f82f..000000000000
--- a/sys-process/criu/files/2.0/criu-2.0-automagic-libbsd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/criu/Makefile.config b/criu/Makefile.config
-index aaaca1f..e977bcd 100644
---- a/criu/Makefile.config
-+++ b/criu/Makefile.config
-@@ -4,10 +4,12 @@ include ../scripts/feature-tests.mak
- 
- CONFIG_HEADER := include/config.h
- 
-+ifeq ($(SETPROCTITLE),yes)
- ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),y)
-         LIBS	+= -lbsd
-         DEFINES	+= -DCONFIG_HAS_LIBBSD
- endif
-+endif
- 
- ifeq ($(call pkg-config-check,libselinux),y)
-         LIBS	+= -lselinux
diff --git a/sys-process/criu/files/2.2/criu-2.2-makefile.patch b/sys-process/criu/files/2.2/criu-2.2-makefile.patch
deleted file mode 100644
index e4e856d8ba72..000000000000
--- a/sys-process/criu/files/2.2/criu-2.2-makefile.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/Makefile.install b/Makefile.install
-index b3f5551..2349107 100644
---- a/Makefile.install
-+++ b/Makefile.install
-@@ -6,23 +6,10 @@ BINDIR		?= $(PREFIX)/bin
- SBINDIR		?= $(PREFIX)/sbin
- MANDIR		?= $(PREFIX)/share/man
- SYSTEMDUNITDIR	?= $(PREFIX)/lib/systemd/system/
--LOGROTATEDIR	?= $(PREFIX)/etc/logrotate.d/
-+LOGROTATEDIR	?= $(SYSCONFDIR)/etc/logrotate.d/
- LIBDIR		?= $(PREFIX)/lib
- INCLUDEDIR	?= $(PREFIX)/include/criu
- 
--#
--# For recent Debian/Ubuntu with multiarch support.
--DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
--ifneq "$(DEB_HOST_MULTIARCH)" ""
--        LIBDIR			?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
--else
--        #
--        # For most other systems
--        ifeq "$(shell uname -m)" "x86_64"
--                LIBDIR		?= $(PREFIX)/lib64
--        endif
--endif
--
- export BINDIR SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR
- export INCLUDEDIR LIBDIR DESTDIR PREFIX
- 
-diff --git a/lib/Makefile b/lib/Makefile
-index f1c0821..3bef265 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -25,8 +25,12 @@ lib-c: c/$(CRIU_SO)
- #
- # Python bindings.
- lib-py:
-+ifeq ($(PYCRIU),yes)
- 	$(call msg-gen, $@)
- 	$(Q) $(MAKE) -C py all
-+else
-+	$(Q) echo "no py criu"
-+endif
- .PHONY: lib-py
- 
- all: lib-c lib-py
-@@ -43,7 +47,7 @@ clean:
- 	$(Q) $(RM) -r build usr
- .PHONY: clean
- 
--install: lib-c lib-py ../crit/crit c/criu.pc.in
-+install: lib-c ../crit/crit c/criu.pc.in
- 	$(E) "  INSTALL " $(CRIU_SO)
- 	$(Q) mkdir -p $(DESTDIR)$(LIBDIR)
- 	$(Q) install -m 755 c/$(CRIU_SO) $(DESTDIR)$(LIBDIR)/$(CRIU_SO).$(CRIU_SO_VERSION_MAJOR).$(CRIU_SO_VERSION_MINOR)
-@@ -55,8 +59,6 @@ install: lib-c lib-py ../crit/crit c/criu.pc.in
- 	$(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
- 	$(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)),' c/criu.pc.in > c/criu.pc
- 	$(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
--	$(E) "  INSTALL " crit
--	$(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES)
- .PHONY: install
- 
- uninstall:
-diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk
-index bd40944..3cfbffa 100644
---- a/scripts/nmk/scripts/build.mk
-+++ b/scripts/nmk/scripts/build.mk
-@@ -87,7 +87,7 @@ builtin-name	:= $(strip $(builtin-name))
- 
- #
- # Link flags.
--ld_flags	:= $(strip $(LDFLAGS) $(ldflags-y))
-+ld_flags	:= $(strip $(RAW_LDFLAGS) $(ldflags-y))
- 
- #
- # $(obj) related rules.
diff --git a/sys-process/criu/files/2.2/criu-2.2-no-git.patch b/sys-process/criu/files/2.2/criu-2.2-no-git.patch
deleted file mode 100644
index 0622225c2905..000000000000
--- a/sys-process/criu/files/2.2/criu-2.2-no-git.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 7c85403..20992ed 100644
---- a/Makefile
-+++ b/Makefile
-@@ -179,9 +179,9 @@ test: zdtm
- # Generating tar requires tag matched CRIU_VERSION.
- # If not found then simply use GIT's describe with
- # "v" prefix stripped.
--head-name := $(shell git tag -l v$(CRIU_VERSION))
-+head-name := $(shell if [ -d ".git" ]; then git tag -l v$(CRIU_VERSION); fi)
- ifeq ($(head-name),)
--        head-name := $(shell git describe)
-+        head-name := $(shell if [ -d ".git" ]; then git describe; fi)
- endif
- tar-name := $(shell echo $(head-name) | sed -e 's/^v//g')
- criu-$(tar-name).tar.bz2:
diff --git a/sys-process/criu/files/2.9/criu-2.9-makefile.patch b/sys-process/criu/files/2.9/criu-2.9-makefile.patch
deleted file mode 100644
index 7ec91eebaa33..000000000000
--- a/sys-process/criu/files/2.9/criu-2.9-makefile.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/Makefile.install b/Makefile.install
-index dbc22e1..23fd1ae 100644
---- a/Makefile.install
-+++ b/Makefile.install
-@@ -6,24 +6,11 @@ BINDIR		?= $(PREFIX)/bin
- SBINDIR		?= $(PREFIX)/sbin
- MANDIR		?= $(PREFIX)/share/man
- SYSTEMDUNITDIR	?= $(PREFIX)/lib/systemd/system/
--LOGROTATEDIR	?= $(PREFIX)/etc/logrotate.d/
-+LOGROTATEDIR	?= $(SYSCONFDIR)/etc/logrotate.d/
- LIBDIR		?= $(PREFIX)/lib
- INCLUDEDIR	?= $(PREFIX)/include/criu
- LIBEXECDIR	?= $(PREFIX)/libexec
- 
--#
--# For recent Debian/Ubuntu with multiarch support.
--DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
--ifneq "$(DEB_HOST_MULTIARCH)" ""
--        LIBDIR			?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
--else
--        #
--        # For most other systems
--        ifeq "$(shell uname -m)" "x86_64"
--                LIBDIR		?= $(PREFIX)/lib64
--        endif
--endif
--
- export BINDIR SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR
- export INCLUDEDIR LIBDIR DESTDIR PREFIX LIBEXECDIR
- 
-diff --git a/lib/Makefile b/lib/Makefile
-index 616f089..aab3189 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -25,8 +25,12 @@ lib-c: c/$(CRIU_SO)
- #
- # Python bindings.
- lib-py:
-+ifeq ($(PYCRIU),yes)
- 	$(call msg-gen, $@)
- 	$(Q) $(MAKE) -C py all
-+else
-+	$(Q) echo "no py criu"
-+endif
- .PHONY: lib-py
- 
- all: lib-c lib-py
-@@ -43,7 +47,7 @@ clean:
- 	$(Q) $(RM) -r build usr
- .PHONY: clean
- 
--install: lib-c lib-py ../crit/crit c/criu.pc.in
-+install: lib-c ../crit/crit c/criu.pc.in
- 	$(E) "  INSTALL " $(CRIU_SO)
- 	$(Q) mkdir -p $(DESTDIR)$(LIBDIR)
- 	$(Q) install -m 755 c/$(CRIU_SO) $(DESTDIR)$(LIBDIR)/$(CRIU_SO).$(CRIU_SO_VERSION_MAJOR).$(CRIU_SO_VERSION_MINOR)
-@@ -55,8 +59,6 @@ install: lib-c lib-py ../crit/crit c/criu.pc.in
- 	$(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
- 	$(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)),' c/criu.pc.in > c/criu.pc
- 	$(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
--	$(E) "  INSTALL " crit
--	$(Q) $(PYTHON_BIN) ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES)
- .PHONY: install
- 
- uninstall:
-diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk
-index 1860d58..e169b0c 100644
---- a/scripts/nmk/scripts/build.mk
-+++ b/scripts/nmk/scripts/build.mk
-@@ -87,7 +87,7 @@ builtin-name	:= $(strip $(builtin-name))
- 
- #
- # Link flags.
--ld_flags	:= $(strip $(LDFLAGS) $(ldflags-y))
-+ld_flags	:= $(strip $(RAW_LDFLAGS) $(ldflags-y))
- 
- #
- # $(obj) related rules.
diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index 99342ecd0e70..663b4abb9902 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -7,5 +7,5 @@ AUX cronie-systemd.patch 865 BLAKE2B 3418425036ce7558f516a70203dac43126299d815bd
 DIST cronie-1.5.1.tar.gz 114848 BLAKE2B 9b2a045c2c3c18a931588c620e455c4f2efbf17a5f5826bc1b276bd2c4537fe91d7f81cdb7434dc7d8357414c14d9dc89c90bb7a5dc22956d90b6a84c731f498 SHA512 7e5b2e5cc782d04b84ffced21b4601ed5a041c125ec9daa3ae3c704c04b376b07f8f6e6e1351659690ce695ca4c9373456420099eefde985e15fbe5d3ebdcf5a
 DIST cronie-1.5.2.tar.gz 121604 BLAKE2B 4225439fd13a32bba3bd24f25d7dd405cdb123e666ebbf14574143af9d161867f82ea3fc479d81a884590faaa9c42e19c971285e01a19d6ac793b7deb7fc4775 SHA512 6455e234becc44e6568fa25fd72abfaa293cb0bc2d2f1d124e551c068ba01083192b21e82e941158c8c1f41cb6dad3851d665b9f3baa82fd49080f3f8619740b
 EBUILD cronie-1.5.1-r1.ebuild 2265 BLAKE2B 25c8da9344fb0f174dbfc46b9e43211e5fa90250507e3adc727944ea9da6af0544b57fe0c8dc7110ad4c0840a2883a71b2a25c39a6688eb331459a3dc2439c25 SHA512 9111a8dda379ac26fa09e823b451b016f9c1ae76872723ee9bcc76655b0d14d6407f258f7ef3c6f1565f4f30777ed825e7b871ac38019897145670bddb55324e
-EBUILD cronie-1.5.2.ebuild 2304 BLAKE2B 7dfdab50996758c6686315f3f46b47ae4931183c7df9d01d2ea9c567ef6bc3fc390494d08c169fa7010c0d768e6387436e6f223e18ab925052e8251cb2542444 SHA512 5ec2fce3aa8fba1b9d7f02c25e8441bc66222a075e7cd4433de5effee7999ecddedf7b9271a83ed00d3c9f27cde8726befcb4a1b4bcdf0583e377f8446cd84dd
+EBUILD cronie-1.5.2.ebuild 2437 BLAKE2B 3a93b479f40b4a82d5dbad0f9faefa85985155282b4afa9c62688410bd04dea038585300e0ccf70844770c46be2d939824eab71f24ddd5fc0c85d8e482492219 SHA512 38943e05b4936b57aaa52fb06fd79a2aabff21dd28b8533601b8e0a4eabd4e2a772a08479756799be31181e311402ece4f3bfee88acac8f238bc00a51e86679d
 MISC metadata.xml 1014 BLAKE2B be8a19ba115ac54d9cc8c667072264f4eb134ba5133e404f74436ab5b0fd88b42a21d6a6f0441ebe3158ce475ea29f5eebc5d135e6b2317ef4b35ee1365bce52 SHA512 7f8295708e5049940e4e2147494e8ee2649635b492fe9096f1d61785f6fd8126d380be1517b253e668d6355d0d2d03e97af4fcca47ed42a6b70a5d669e7ab2c5
diff --git a/sys-process/cronie/cronie-1.5.2.ebuild b/sys-process/cronie/cronie-1.5.2.ebuild
index f9c9fbc31a16..04f7c7876b18 100644
--- a/sys-process/cronie/cronie-1.5.2.ebuild
+++ b/sys-process/cronie/cronie-1.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools cron pam systemd user
+inherit autotools cron flag-o-matic pam systemd user
 
 DESCRIPTION="Cronie is a standard UNIX daemon cron based on the original vixie-cron"
 HOMEPAGE="https://github.com/cronie-crond/cronie"
@@ -14,7 +14,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="+anacron +inotify pam selinux"
 
 DEPEND="pam? ( virtual/pam )
-	anacron? ( !sys-process/anacron )"
+	anacron? ( !sys-process/anacron
+		elibc_musl? ( sys-libs/obstack-standalone )
+	)"
 RDEPEND="${DEPEND}
 	sys-apps/debianutils"
 
@@ -46,6 +48,10 @@ src_configure() {
 		--with-daemon_username=cron
 		--with-daemon_groupname=cron
 	)
+
+	if use anacron; then
+		use elibc_musl && append-cflags "-lobstack"
+	fi
 	SPOOL_DIR="/var/spool/cron/crontabs" \
 	ANACRON_SPOOL_DIR="/var/spool/anacron" \
 	econf "${myeconfargs[@]}"
diff --git a/sys-process/evisum/Manifest b/sys-process/evisum/Manifest
new file mode 100644
index 000000000000..8715af7ef7ad
--- /dev/null
+++ b/sys-process/evisum/Manifest
@@ -0,0 +1,3 @@
+DIST evisum-0.1.1.tar.xz 77748 BLAKE2B 32c3330586d7d919ff54d8c3166bbece11efb1031617f039e7806dca268a6df3739db27ebc456c3b28e3d7599d325fb8aff16b21cc65b20e6011aa551a10e006 SHA512 dcfa7cdf18e08e63c53baff69c88fc81939534c7b1ecfe6a87567c30334d6f2c2899092c8eb630112f79d36e42cc2f4accc3ed3e389ed8cd0e78f52a566c2ca2
+EBUILD evisum-0.1.1.ebuild 464 BLAKE2B 7d4b4e56c16a1fbc8e57f4383add68b30a9522bf3590287d536dda40c9e81f8044fd4a210fd7953e6723f0528777a5b6ae57f25620af32cd87cf3ba4aefe354f SHA512 d1f799e5025e202ef28fda97c5b6e2d8009f393afd029418395a0be2b7b1130316c297b0ed21dfaa2e90a7634e4f067207fc3a7328c954ca286ece903803361f
+MISC metadata.xml 905 BLAKE2B c288b46a8df2a24a0e509001487c8d987443c139407cb9ec2b964c2cabd02d39566fd2cbda5e77356df2648db9cde543a881350522382734795f3dbc82d460c5 SHA512 75dd35bac971d67c6fd9a78b2cfb599f50d1f8d6107a83729efc9df0cea4fd414ddc50719bfbeddb48edfee82a4a1888a66a2932e35d6b61df8299f87331e381
diff --git a/sys-process/evisum/evisum-0.1.1.ebuild b/sys-process/evisum/evisum-0.1.1.ebuild
new file mode 100644
index 000000000000..b495f2d787b7
--- /dev/null
+++ b/sys-process/evisum/evisum-0.1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="System and process monitor written with EFL"
+HOMEPAGE="https://www.enlightenment.org/"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/efl-1.20.0[X]"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake PREFIX="${D}"/usr install
+	einstalldocs
+}
diff --git a/sys-process/evisum/metadata.xml b/sys-process/evisum/metadata.xml
new file mode 100644
index 000000000000..4213c69bb418
--- /dev/null
+++ b/sys-process/evisum/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription lang="en">
+    This is a process monitor and system monitor.
+
+      - Full support across Linux, MacOS, FreeBSD and OpenBSD.
+      - Process Listing.
+      - Single-process view.
+      - Start/stop/kill individual process.
+      - Process PID, UID, name, thread count, memory use, nice, priority, state, CPU ID 
+        and CPU usage.
+      - CPU monitoring.
+      - Memory monitoring.
+      - Disk usage monitoring.
+      - Network usage monitoring.
+      - CPU temperature monitoring.
+      - Battery and power status.
+  </longdescription>
+</pkgmetadata>
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 867045533fc7..6fe7b765bdc7 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,5 +1,5 @@
-DIST parallel-20180222.tar.bz2 1720969 BLAKE2B c101c5bec829302ae45bf8347a22733610ef4bb038322af107ed39630b94f82a18f44419ddefcf6c062e20291c198e569856a2443fa5ad1bbe21c42c35bddfb5 SHA512 12d205e88179f2bac9585927a72f429ac186f1a3e386590ba61d54da6ecf69fb1ee124774e289a6a18fc5c8a7e0e4a0c13cc4a7bc4a853d6e46bcad52ba0243f
 DIST parallel-20180322.tar.bz2 1735453 BLAKE2B 3dd93dc829850051b9701a673e1da167d7013e693935da2d9df3830ec61ffe871727971512fa631e7ef9e563b08a2100ddfdd6d82c717626f4d3a2528d66e934 SHA512 62299fc3aca77c3d7b844b928d266209735b9f8012dd299ab5c142e4588bc0bf4e039e48200c0602b36719b3f70dc2442c89469939be71f3bcff887b2885f5dd
-EBUILD parallel-20180222.ebuild 870 BLAKE2B 8c59bf00bce95835f194564e853f2730ab87539f14b077a463cc9d84d83c77d0be0bbeeeb997827cb3ddaf7482cee9508e3c1df295bff39b6417e4a831470654 SHA512 3eaf6a0d19f2dc305976cc468631cd79b790aef1e41a803b25eee6908c528b51e3abc4f71b36392b76fdf148bc12e40502040543d34bce691fa83ab2fdc0c68a
-EBUILD parallel-20180322.ebuild 872 BLAKE2B ca91a138a59b01cfe03759ac09535604ff0f5bb9c4c69216145441a75e7d03771975f967971b4b5cbe0f4c6a79fd3dc68511fe1e43bb6def590345cde597c94f SHA512 8b7a52a0e152253144731dee8397d6b07e9ca1559febbc6a2d1cc1ee910673d80b3763ea5aa564c267da2e1e2c14dda010f438066a91da6f780eae99200056f6
+DIST parallel-20180622.tar.bz2 1758233 BLAKE2B 4796d35d8e34baacb50ac8669c53f6a3018d02b21d0ccedf3cda1ee955964a3ffed21a5e30a5071212b75d80ad8a71a0a5e348afeebc46b2cdea746de7313202 SHA512 c8ad8e747464ddfb59e1dcdb626c8a25b2da75f41e7a93e6a18a59b7370baf9f00810827868180034ca94f3eb2028452baf8cab41c5b76f91ed4d4a45c06cd24
+EBUILD parallel-20180322.ebuild 870 BLAKE2B 8c59bf00bce95835f194564e853f2730ab87539f14b077a463cc9d84d83c77d0be0bbeeeb997827cb3ddaf7482cee9508e3c1df295bff39b6417e4a831470654 SHA512 3eaf6a0d19f2dc305976cc468631cd79b790aef1e41a803b25eee6908c528b51e3abc4f71b36392b76fdf148bc12e40502040543d34bce691fa83ab2fdc0c68a
+EBUILD parallel-20180622.ebuild 872 BLAKE2B ca91a138a59b01cfe03759ac09535604ff0f5bb9c4c69216145441a75e7d03771975f967971b4b5cbe0f4c6a79fd3dc68511fe1e43bb6def590345cde597c94f SHA512 8b7a52a0e152253144731dee8397d6b07e9ca1559febbc6a2d1cc1ee910673d80b3763ea5aa564c267da2e1e2c14dda010f438066a91da6f780eae99200056f6
 MISC metadata.xml 1003 BLAKE2B a5a05ad6fb91321ade93dc8534764af73614a4495ae0ae023825b155be4a2d8f095df51971bb174c3e5fa335d7753121b09b22d8fef5ec4ffce3460b95fa2ed1 SHA512 a9da23fd3dc9476e2934a06ed8c0638fb3ee2530ea0ed9305a88ef0fa517a2996494d4e97492a709a601937d794748b0cba794d0b919667decdace77123c700f
diff --git a/sys-process/parallel/parallel-20180322.ebuild b/sys-process/parallel/parallel-20180322.ebuild
index a195928e2b8b..778fdc10b82a 100644
--- a/sys-process/parallel/parallel-20180322.ebuild
+++ b/sys-process/parallel/parallel-20180322.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-lang/perl:=
diff --git a/sys-process/parallel/parallel-20180222.ebuild b/sys-process/parallel/parallel-20180622.ebuild
index 778fdc10b82a..a195928e2b8b 100644
--- a/sys-process/parallel/parallel-20180222.ebuild
+++ b/sys-process/parallel/parallel-20180622.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-lang/perl:=
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 3c4f5e5fb487..4c9439dd4390 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -3,6 +3,6 @@ AUX psmisc-22.21-sysmacros.patch 693 BLAKE2B f5e346821af0ae418431d8585a6f7f6150d
 DIST psmisc-22.21.tar.gz 457702 BLAKE2B 7e81b695546c3dca6e1ade47bd1cd736ad434eb964608ead3e7d5a3b97f6d3d6c927e8e13ee525e716b66067e5a1573c4f0b8434540b9c66aac6e6b8f15bcfde SHA512 766aeb45687090b88b17176c5117a603e83fe92a13c013aea72c8ee80048adf02e18c7daa52ddfb8b2135f7c9a1bcae38896cdfb8d0158728d85a446c5e0d5ae
 DIST psmisc-23.1.tar.xz 296136 BLAKE2B e53f7b80f1106622d652dad772d4236a62a1eb58e277f078cf0392d5a0bd7963c66805e28f6d1300999f2e2e5dcb692b1ecb3f6d39cefa77ebbc87302cd730be SHA512 f678869ea555986a2538ada9630b74ce79304f3ee85cc9d69a3912d8d30ad491829eac0dcb69aae7003ee9b5de9645d2135b80a9e0b77824e60c417dc0be5f95
 EBUILD psmisc-22.21-r3.ebuild 1381 BLAKE2B 0ab006290c79539f4bcf949f0e6cbbbca2c55236f5068856f5b53aeb6444908138fc1f0dd15040c596ae34fb6f8a5eeda31ad0483d85154a91804eff7dee9e1e SHA512 e909d68ebb9b81959c8c4126bf511337450c19fdc66dac38db2fa66bf580e88d42a070e9fc602f9b68bbf0d96044ff57ae7b7655095e48aec5e8dab37bd1a483
-EBUILD psmisc-23.1-r1.ebuild 1293 BLAKE2B 20edf04cccf137ded23bc01e3cc0b531889288dd7586286ee668262302fbda8d3684ef4d2ecc2dc83a887561f84653726ef8ed4a5d0ab2b9a80111e4dfe072d6 SHA512 d61fb2444106352694d27bb85b9e9fc2ad8de4e456f31eebb4a58e52a8647966170aa1f7fd0df7666c2cc6f6ae0549f62ba18b571c1871e7f9a38aa37f858e59
+EBUILD psmisc-23.1-r1.ebuild 1289 BLAKE2B 39155084462d66a8ed80d20b81995d4c4103098e74cd316031ba04c3b0d2e64e3aaacb351d653a9f0c604b8d6385454c30d6bed8f5256dea45c38e2d9cd1a2a0 SHA512 669fb2c4be77046896b6eafe69c9e2468298e6c8f7bc33b7ea0a5907729faf83b568d39e0a75663d67abb56f1e8cffa72810b679a0f1375c80d56cec4f75346c
 EBUILD psmisc-23.1.ebuild 1299 BLAKE2B c7cf0bf50d0f3b718c419668ef2314282f4ca9628886584ecad78cd8b60f10c3a0335286e56554965b70796d00e7a7ccb2d56e59083a64ccb19ccac4e5803ba5 SHA512 0387c7623dd36e04f74e7a83d948d1ff0a064a8b5108267b9d5ab1024a72f9225e4ae1e7bdee014b2ae69e2c609528810484e0e22708f7a17f6ea349fe634ece
 MISC metadata.xml 326 BLAKE2B 899a2f3fa295d2e0e8d6114542a149db37c730b845d7ba720127ca2b9b85044c53ff7aa107f866a6e2ece895a8159e25350b17d9665fc9ff915aed3640ac22cf SHA512 580a0e66078b7304d0bf76e3c990e61ee4c073b49381b60c5f3f01e2b64d5f0c318eb5596f7da09a70fa52dc93769b25f37f531038e5d7ce6278dda10e18117c
diff --git a/sys-process/psmisc/psmisc-23.1-r1.ebuild b/sys-process/psmisc/psmisc-23.1-r1.ebuild
index 6351521f372c..01b241dadf67 100644
--- a/sys-process/psmisc/psmisc-23.1-r1.ebuild
+++ b/sys-process/psmisc/psmisc-23.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="ipv6 nls selinux X"
 
 RDEPEND=">=sys-libs/ncurses-5.7-r7:0=