gentoo resync : 21.01.2018

16 files changed, 46 insertions, 273 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e5959af1e8a9..ce628146b86f 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 9cf2816ddd15..ef84cae5802e 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -3,13 +3,11 @@ DIST ca-certificates_20161130.tar.xz 298656 BLAKE2B 8574745d8ef62262b339035ca11d
 DIST ca-certificates_20170717.tar.xz 293028 BLAKE2B 85076cd980841f32e2544c7be020fca9bcd5ef7066ae3cef195cbf9755f8b8e800a8e4076662fa1b7da600c2235e49048eb6e1166b0618fc7685221ab790fed3 SHA512 dfeb5a19bb33bcb127a159b73fcc63b41c99827d77eb4a6069def0cffc7ae8dd10dab97c1ddfdd5b70d0c93e650a51ed5dcd03908516e7ca8b3022bf46eeb7e6
 DIST nss-3.30.2.tar.gz 9499119 BLAKE2B 720ebe79c791f80f1717548cc9a8afea455ee8d74c1489bcecf0229b6f19f5bbcc66e9625ac74b655c55897450400090c19eac92c035276c8815fcf98bac945c SHA512 02f14bc000cbde42268c4b6f42df80680b010d1491643ef9b11e0bac31a286a2e7fa251c40cb4ac70b64883a1b90efc64440ef9d797357f8a47cd37195fc5500
 DIST nss-3.30.tar.gz 9500552 BLAKE2B 634734400562db5b35f170c5d138fbad45cfdc972a4154db8e2ce7f810d66ef9bad972c1204bc88bae7374d03f4d5c7845d85eb340b387189c258d09b3d7b699 SHA512 c21e9b5e4b689ea8cbc6f4d7913df43e2a78c4435e0ce092f2ce00e46079ce2268e17ec8527b283ac69eff3d96ff0165a5b42b6579bfe0a720115ff2938260d3
-DIST nss-3.32.1.tar.gz 9494609 BLAKE2B d5e4e87b8172022cfdaaebf3c76cb6702ecc0594bc9f2edbeeb4a0bde30faf2857b7a38f2f964bdb0fc6de2b439faf5477c55b91d0eb42bd35de6780afc6e6f0 SHA512 b377aba822c2955d801022eba1636b71943a64f6e74d5611c2625910d230059383c4dbdedd65e70b356eaea33aeefdd24de3b31d7a4823d921ea475af3dd9da8
 DIST nss-3.34.1.tar.gz 9562876 BLAKE2B 645fe06435dffa1a0dec688c7c10854dbd664e719889b36027dc2e52c4f585c2ce7bdcd947dcf5d938013246405c04e1b9dbd802b229e0acc96fc07f321bb51a SHA512 6cc4826df4202e865e903a2ed05b49f708a047347b7b4d58f9b83ed097115a128239c4596a033ddeb9ee3fbfe6345a024e11eacb6149bce2d71fbe82c0a41c63
-DIST nss-3.34.tar.gz 9586315 BLAKE2B d04fcd46a7bf318b4bab14f316ae53145f415b5abb637205eeedb72f5847d43b76ea5e77485c56e4eaa3d90b850ee4bb18b6d0e42422f94ea0a9f12559263e02 SHA512 72388b596151499850546a68d9a20d82434c59f159564fb7170980f110d43d7026f174f93660d3bb6da79b618fd7d4f1f16246fc80ba568aa555df99ebbaea21
+DIST nss-3.35.tar.gz 9620041 BLAKE2B a4115117ff017ce36f030d9f69c75111177166651968739353d112cc5d2c4732b33b8c684c5957a66bb969ecab1a15fb2cd6bb237d959d307cdee43ec638cd73 SHA512 8d466f4602427d278b6aa28af0e6bdb99326fc40c94ac6d517d1cbe7ce6b9332dadba52ea092762fac2fd6e72f17cb880cf81e1cf86bf6b4f7913a755419626d
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 EBUILD ca-certificates-20161130.3.30-r1.ebuild 5957 BLAKE2B 62d319e8e5a91e087692455ea9b0ae3428fe32cf68a3194112599adb2fe1782754950708f22463caf848bde08d8d5b535ac6e7ba306b1418cc47271a514569cd SHA512 9daed98f9c1b864f6fb5aaa9172820ca660f0c794b9a68a82dd90979630c7f0d66682fd27896d679fcdfcd0048fbac77ce25b133db65f0e03c73628276649477
 EBUILD ca-certificates-20161130.3.30.2.ebuild 6248 BLAKE2B 067c2ca4532d086a86c77bfd0ef21cb282d21b7643d8af6e237ead84e29dcd23647feb1690c47b9d8da43659ec14f251ad7e9d4d5a2985fe76e1b4b531770d2a SHA512 ad3ce9a68d80b6604972d8a78de462aff6df914cc1452c1c5d972723f1a8be1eb9582f214fcd5b4c65a2638356054beaeac9f3bb1b310e563ad44c9b7add0564
-EBUILD ca-certificates-20170717.3.32.1.ebuild 6278 BLAKE2B 737296804f2fcbda2a4cdd54cefd52d04021a1c01be664803e7ad8d4d2e46e6dedebcde6819dfe3215f9111062a1890c29ee9322fbc5274603b66ab11fe33c40 SHA512 394207e7ac8970d6b0724ec1bb3d7c233724d4c2f9a05a8c7a475b2d40e08483e940ad185ca6eea023c5d6bff6868b0aa10c4f642eccb6238ffa71ef9505df94
 EBUILD ca-certificates-20170717.3.34.1.ebuild 6278 BLAKE2B 737296804f2fcbda2a4cdd54cefd52d04021a1c01be664803e7ad8d4d2e46e6dedebcde6819dfe3215f9111062a1890c29ee9322fbc5274603b66ab11fe33c40 SHA512 394207e7ac8970d6b0724ec1bb3d7c233724d4c2f9a05a8c7a475b2d40e08483e940ad185ca6eea023c5d6bff6868b0aa10c4f642eccb6238ffa71ef9505df94
-EBUILD ca-certificates-20170717.3.34.ebuild 6278 BLAKE2B 737296804f2fcbda2a4cdd54cefd52d04021a1c01be664803e7ad8d4d2e46e6dedebcde6819dfe3215f9111062a1890c29ee9322fbc5274603b66ab11fe33c40 SHA512 394207e7ac8970d6b0724ec1bb3d7c233724d4c2f9a05a8c7a475b2d40e08483e940ad185ca6eea023c5d6bff6868b0aa10c4f642eccb6238ffa71ef9505df94
+EBUILD ca-certificates-20170717.3.35.ebuild 6278 BLAKE2B 88a549b2fc25e86dde39c60d0244cbc5bb85808b82a8cb51d91d01f4ec4d5ed1ec9ea89bcdc65cfd760c250fe4754bd02b3c1c56e10d21ec2483c0cffc6b265d SHA512 862478347b0b585336996a672cd72913fb3c12908943862b8e2ac1e611bd07bd19473bc0b11b754a390468f6677e4d70cdb843479dbcd19fc897babcb22a1174
 MISC metadata.xml 538 BLAKE2B 20dd319e6f583b4b6b93fdfc7fb965c54c7b92426715cf287611ea58ed5040ffac4afa77df2e6464a387c120a8d80d508c6e997c820eae9395ba859b13c5702e SHA512 f2779da4ea4b24e196b64d6e4c94d47e426d431508db58355a08ca420498cbbe2f322c5f8dc6e132b612baf03ee6bb1561beade226bd2f71d6afa160064d7a7c
diff --git a/app-misc/ca-certificates/ca-certificates-20170717.3.34.ebuild b/app-misc/ca-certificates/ca-certificates-20170717.3.34.ebuild
deleted file mode 100644
index 7778372001e5..000000000000
--- a/app-misc/ca-certificates/ca-certificates-20170717.3.34.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result.  The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging bugs from users, here's some handy tips:
-# - To see what cert is hitting errors, use openssl:
-#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
-#   Focus on the errors written to stderr.
-#
-# - Look at the upstream log as to why certs were added/removed:
-#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
-#
-# - If people want to add/remove certs, tell them to file w/mozilla:
-#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit eutils python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
-	# Compile from source ourselves.
-	PRECOMPILED=false
-	inherit versionator
-
-	DEB_VER=$(get_version_component_range 1)
-	NSS_VER=$(get_version_component_range 2-)
-	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
-	# Debian precompiled version.
-	PRECOMPILED=true
-	inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
-		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
-		cacert? (
-			https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
-		)"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="insecure_certs"
-${PRECOMPILED} || IUSE+=" cacert"
-
-DEPEND=""
-if ${PRECOMPILED} ; then
-	DEPEND+=" !<sys-apps/portage-2.1.10.41"
-fi
-# c_rehash: we run `c_rehash`
-# debianutils: we run `run-parts`
-RDEPEND="${DEPEND}
-	app-misc/c_rehash
-	sys-apps/debianutils"
-
-if ! ${PRECOMPILED}; then
-	DEPEND+=" ${PYTHON_DEPS}"
-fi
-
-S=${WORKDIR}
-
-pkg_setup() {
-	# For the conversion to having it in CONFIG_PROTECT_MASK,
-	# we need to tell users about it once manually first.
-	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
-		|| ewarn "You should run update-ca-certificates manually after etc-update"
-}
-
-src_unpack() {
-	${PRECOMPILED} || default
-
-	# Do all the work in the image subdir to avoid conflicting with source
-	# dirs in $WORKDIR.  Need to perform everything in the offset #381937
-	mkdir -p "image/${EPREFIX}"
-	cd "image/${EPREFIX}" || die
-
-	${PRECOMPILED} && unpacker_src_unpack
-}
-
-src_prepare() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		mkdir -p usr/sbin
-		cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die
-
-		if use cacert ; then
-			pushd "${S}"/nss-${NSS_VER} >/dev/null
-			epatch "${DISTDIR}"/nss-cacert-class1-class3.patch
-			popd >/dev/null
-		fi
-	fi
-
-	default
-	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
-	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
-	sed -i \
-		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
-		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
-		usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		python_setup
-		local d="${S}/${PN}/mozilla" c="usr/share/${PN}"
-		# Grab the database from the nss sources.
-		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
-		emake -C "${d}"
-
-		# Now move the files to the same places that the precompiled would.
-		mkdir -p etc/ssl/certs etc/ca-certificates/update.d "${c}"/mozilla
-		if use cacert ; then
-			mkdir -p "${c}"/cacert.org
-			mv "${d}"/CAcert_Inc..crt "${c}"/cacert.org/cacert.org_root.crt || die
-		fi
-		mv "${d}"/*.crt "${c}"/mozilla/ || die
-	else
-		mv usr/share/doc/{ca-certificates,${PF}} || die
-	fi
-
-	if ! use insecure_certs ; then
-		elog "To prevent applications relying on system's trusted root certificate store"
-		elog "from using CAs where at least one major browser vendor Gentoo is following"
-		elog "has decided to apply trust level restrictions, the following"
-		elog "certificate(s) were removed:"
-		# Remove untrusted certs from StartCom and WoSign (bug #598072)
-		elog "$(find "${c}" -type f \( \
-			-iname '*startcom*' \
-			-o -iname '*wosign*' \
-			\) -printf '%P removed; see https://bugs.gentoo.org/598072 for details\n' -delete)"
-	fi
-
-	(
-	echo "# Automatically generated by ${CATEGORY}/${PF}"
-	echo "# $(date -u)"
-	echo "# Do not edit."
-	cd "${c}"
-	find * -name '*.crt' | LC_ALL=C sort
-	) > etc/ca-certificates.conf
-
-	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
-	cp -pPR image/* "${D}"/ || die
-	if ! ${PRECOMPILED} ; then
-		cd ca-certificates
-		doman sbin/*.8
-		dodoc debian/README.* examples/ca-certificates-local/README
-	fi
-
-	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
-	doenvd 98ca-certificates
-}
-
-pkg_postinst() {
-	if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
-		# if the user has local certs, we need to rebuild again
-		# to include their stuff in the db.
-		# However it's too overzealous when the user has custom certs in place.
-		# --fresh is to clean up dangling symlinks
-		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
-	fi
-
-	if [ -n "$(find -L "${EROOT}"etc/ssl/certs/ -type l)" ] ; then
-		ewarn "Removing the following broken symlinks:"
-		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
-	fi
-}
diff --git a/app-misc/ca-certificates/ca-certificates-20170717.3.32.1.ebuild b/app-misc/ca-certificates/ca-certificates-20170717.3.35.ebuild
index 7778372001e5..db831330cdac 100644
--- a/app-misc/ca-certificates/ca-certificates-20170717.3.32.1.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20170717.3.35.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
 
 # The Debian ca-certificates package merely takes the CA database as it exists
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index f3476672c358..9d4c127df846 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -9,6 +9,6 @@ DIST mc-4.8.20.tar.xz 2529580 BLAKE2B 14e575b650d28e0dcaa8ef0dc0b8e9bbf3e840ddc3
 EBUILD mc-4.8.15.ebuild 2602 BLAKE2B 3b279bf633a0299e11a4ff247c02e4293fb6a221c2009e149136ecda8b03cd1d9433ea8dcd1a3194e61e5380c81b905072f7c3e1688920e4dc57ceb3c270d41f SHA512 906e1842f664cff03939a0fed27aaa447abf92553916bedcdbe7c23aa65f704c2538ca5be666086dbe2ce3204bbdfc87854346f3894293ccef8ef5d8a2ae6e7f
 EBUILD mc-4.8.18-r1.ebuild 2466 BLAKE2B 97822d672464a1956119a1f44c9fb9bfebf39573ff944c70d0a3ce053efa7965fe00418b90352fa9937fafc228f3854eae09fbac27f3e8561be379583c3abeaf SHA512 3bea1c8e2c8aa1e882ccfde6619dff042939290de9075ed111360925a78d6e631bfde6cc47d60bb6e1b287826fe6cc0483201ee317a3698894c3a900fd6af505
 EBUILD mc-4.8.19.ebuild 2722 BLAKE2B fb279a01c7d86133d64f50fe330d7e94e321b9aabbac51583412d49fe2fbe6b5f826bbb2381f1212760e846c05fae2eeccc0e56928491143e0680fa996fce597 SHA512 8c88c706cbed51a95ef9c2577b7dad338c187db961c7365616d4085b856d3b45035251efa86746c48232f02ed83ffe9c8fa24a629463968dd26847e1c019f353
-EBUILD mc-4.8.20-r1.ebuild 2486 BLAKE2B 945d8fbcbca52c67ac46bd2b26d2eb41ac16ab2946e6a84d4ed81330896b8aa4b1da2c36a0b65940746523d2845b6fab6d1bd84193eb6c53190aaa845c53e8ee SHA512 2ffd4b88c9061486b67bd4fa47374f653d3a2e91f692a867d387ca97e85157fe74e369f0a19102f65d0bf635273e9a8e1ab3b6ac4b14411810e76052acf5248c
+EBUILD mc-4.8.20-r1.ebuild 2484 BLAKE2B c21567591935cf0c88af5956661a8b5c7b47d053459b0c73b4927271319bd8cd48a7584c809d09088a6e6d29a4cfa35a4867f2239bfaf3584e753fb7b52e9952 SHA512 1e689261679bde58dce2e4818fb1ff3b413e9d952474d4fa36662c4900deb0526e13abed14979d558db98181471db3a982815215603d1f633ef8b04c650f6f84
 EBUILD mc-9999.ebuild 2585 BLAKE2B c226f71fd8a9ea6abfa2c0b3cf9c731f1271e64d257d34797635738cf634b9159c693ef312cfcbda43f0aa2207b79bbb0d2071f41c3393372da44c547c6fcdd3 SHA512 bab03c4a246785495ff69deaba2c97268ec95449b5887a941dbc54513d0f00d193fec63c26a69f1d95c45612a81c5c8818f12dcf0b0ede5f4e7afa81595d6d91
 MISC metadata.xml 994 BLAKE2B 59d3e1c9bc8bcaf74ef8f646f1067a07127a70825bb2651e7bee1628e93131769caf1c7251b6aecd4ed35707984b95c928fcf5563b3e2ba6997c090ea08ea0b4 SHA512 8e36834754b8335c133eb3693d17d02a0c6c3c7d25263857558cf290922b8e7508bf90c609e09ebbfaed54eecc2179936ded60c2b723cc0abc6722db180cc3ed
diff --git a/app-misc/mc/mc-4.8.20-r1.ebuild b/app-misc/mc/mc-4.8.20-r1.ebuild
index 3d228f0c06ec..aca26bd2379f 100644
--- a/app-misc/mc/mc-4.8.20-r1.ebuild
+++ b/app-misc/mc/mc-4.8.20-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/openastro/Manifest b/app-misc/openastro/Manifest
index b6d49639b333..9f24d2972fd4 100644
--- a/app-misc/openastro/Manifest
+++ b/app-misc/openastro/Manifest
@@ -1,7 +1,7 @@
 DIST openastro.org_1.1.48.orig.tar.gz 205879 BLAKE2B a1550c4afd022408bbef1d44f8ad73370a93e2a8d2f4ff0f43c05269d5865a5cdf10aa487c9e1b62f5367afc771c4a92565e414534bde37612290f2afebdddc6 SHA512 996e503a8dd2504da252ad2b20ac185301e81523629cbcf05fcf37ec4ca3859ef513a194feb2d05bd7c4cbe796bf514afa4eb242b8cd51c65d134b51165f97d3
 DIST openastro.org_1.1.49.orig.tar.gz 213256 BLAKE2B c313877c481439d2e7cda6de0442c8205ae824aeb5e7ddf22d7f0fc6eed2171addb4075786479c4efbb3523aba5fd7e05cb49f1754d4771ffa127e17a20304ec SHA512 1028807d2a84850699f47a03ad74a851873b9b448f87169bee7d142e5ca750aafe33313b6181b9ee0ed6ccb66c3a867e86bd56648ebe67f4a7a9e1b914b77cec
 DIST openastro.org_1.1.50.orig.tar.gz 217959 BLAKE2B 9c1f35178afa63911d83a781771705d0de525710928ff91e25ec509099e44b3933bfa69e6db0506c3f696b00376a220cfba63ac86f59248f07a14dc01cf5e908 SHA512 39004f78c8dd098e2f018147b581608e22718fc844dc5abe5d97124662882d2ca6bd0a49fd4a003284cadfe31ab8c7a9343ecfa4fd990b7b3af0eb9d5ad18fa4
-EBUILD openastro-1.1.48.ebuild 878 BLAKE2B 4fecc049ba6c98dc4fa33ae684c7599660fbf55c814b9fb1cff9e284a2d9f6a8de4a0e0bcdedf5a7d9875bc1edb4c9859f9375d27ed112087c22419152aa2112 SHA512 93cd92f55cfc6bd7a0640e873d5e476be95e55c37d4f142181d7cf25362052e212c5a09f50dff3ddf933063094cb45b367d4dc4f7d20121917b1a95c63e617fb
-EBUILD openastro-1.1.49.ebuild 878 BLAKE2B 50fec8b630837e8bbbf058070c90fec0bb3d15ad6d8765b2b7d901fd980ac67fc2bcae2fbd254705dd03c26c176abfcc5a4752b1ca0170db88b6f93e40c9fba1 SHA512 d75832311d0a72bad750c3788816c0e9f2a7852590bcaf60bda5173c286766fc26101082b26021ecabc1769064e5d80d8cd215063734c9e00ae94ad372cd95db
-EBUILD openastro-1.1.50.ebuild 878 BLAKE2B 84f6ab4f6611134d23625f77289067e7e18550bc24a4ed08069e54860a80f7ef5096b03cb00df7fca1cc2baeb88397626320d56e1aa3369c0b7c07ce72cdaab4 SHA512 ad82c73d67653db5e702fdadb9362f1d53bd6988060c45cb10259bd64a467039d4e55b13e3e20fce91593e4a8196fe79f5f795b8fc5d4cc061a951a1282c084d
-MISC metadata.xml 760 BLAKE2B 1815582591f074165e4ea27351524f18596911131a049de6a612bb385ba0a5e421136a0e688aa36523ae21cc20bb4ca18a565223635ae22f47a5f5738af7e206 SHA512 3eb66f295e3c7d65a2e7afb60c5e21fb7da3aa9b14a2067ac4a29311aa139f5d1515450b8f036acc3920b485bfddf9a69ccb921e4cd2ce3de8de7ca65a811d72
+EBUILD openastro-1.1.48.ebuild 881 BLAKE2B 6a714b30a55e6e0e0616777cc0ea8783e523ece3525733269542ae7f94ba5f4b2a979e55aed09c400c50d41ad21aaec297998fe0ef7c9c496d71a5e4ef0aa914 SHA512 727b27d10985fbc5b8260616d77992809655699944fed2d7faf9f1669836e0d8640627d507ed61e4cc7fe1be7f29222bdd5f1633523f5199d74bcde81e6395c6
+EBUILD openastro-1.1.49.ebuild 881 BLAKE2B 6a714b30a55e6e0e0616777cc0ea8783e523ece3525733269542ae7f94ba5f4b2a979e55aed09c400c50d41ad21aaec297998fe0ef7c9c496d71a5e4ef0aa914 SHA512 727b27d10985fbc5b8260616d77992809655699944fed2d7faf9f1669836e0d8640627d507ed61e4cc7fe1be7f29222bdd5f1633523f5199d74bcde81e6395c6
+EBUILD openastro-1.1.50.ebuild 881 BLAKE2B 880f4c752f69d9cdd383cdbe7e9071a970acaaa66e27d29c25e8d09fa1aaa803cf86affee968c5379984281a0828994c0641acf0b2fdc3d87024399c528b9398 SHA512 16f8be04eb0abc032702981e9ab59f38b294cabd7dcfda0277e0b5768c47e90c1a793f1d167b2a385732ed7c0eeabc0ccb6dadd0e5c3122e497bcc85942e1668
+MISC metadata.xml 760 BLAKE2B e9b074215b46c50472e3eed1ec3c37eec0278596de1865b5ac230957be46dd197750dff099c62bd4f51be639ad47506b5f1e2c896fd87dee8ea275f53d247380 SHA512 300f1ab4db7cfe1acce6a62282ddc506c4af8f41c548702afa73a46ecce2882bf604074f3d4aae1d07e856f0459e9df96bd9d940c1635fb850ecac71013dbf39
diff --git a/app-misc/openastro/metadata.xml b/app-misc/openastro/metadata.xml
index 209be477efe3..51e2b2a8f736 100644
--- a/app-misc/openastro/metadata.xml
+++ b/app-misc/openastro/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <maintainer type="person">
     <email>lluixhi@gmail.com</email>
     <name>Aric Belsito</name>
   </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <maintainer status="active">
       <email>devel@openastro.org</email>
diff --git a/app-misc/openastro/openastro-1.1.48.ebuild b/app-misc/openastro/openastro-1.1.48.ebuild
index dc4fc8ffdfa9..102f982b518e 100644
--- a/app-misc/openastro/openastro-1.1.48.ebuild
+++ b/app-misc/openastro/openastro-1.1.48.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ IUSE="jpeg png"
 DEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pycairo[svg,${PYTHON_USEDEP}]
+	dev-python/pycairo[svg(+),${PYTHON_USEDEP}]
 	dev-python/librsvg-python[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyswisseph[${PYTHON_USEDEP}]
diff --git a/app-misc/openastro/openastro-1.1.49.ebuild b/app-misc/openastro/openastro-1.1.49.ebuild
index 142482203fa1..102f982b518e 100644
--- a/app-misc/openastro/openastro-1.1.49.ebuild
+++ b/app-misc/openastro/openastro-1.1.49.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
@@ -21,7 +21,7 @@ IUSE="jpeg png"
 DEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pycairo[svg,${PYTHON_USEDEP}]
+	dev-python/pycairo[svg(+),${PYTHON_USEDEP}]
 	dev-python/librsvg-python[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyswisseph[${PYTHON_USEDEP}]
diff --git a/app-misc/openastro/openastro-1.1.50.ebuild b/app-misc/openastro/openastro-1.1.50.ebuild
index f9ead0377429..f7f9437778dd 100644
--- a/app-misc/openastro/openastro-1.1.50.ebuild
+++ b/app-misc/openastro/openastro-1.1.50.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
@@ -21,7 +21,7 @@ IUSE="jpeg png"
 DEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pycairo[svg,${PYTHON_USEDEP}]
+	dev-python/pycairo[svg(+),${PYTHON_USEDEP}]
 	dev-python/librsvg-python[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyswisseph[${PYTHON_USEDEP}]
diff --git a/app-misc/srm/Manifest b/app-misc/srm/Manifest
index 38cd08fae99a..9f6c0d5d4f7e 100644
--- a/app-misc/srm/Manifest
+++ b/app-misc/srm/Manifest
@@ -1,7 +1,4 @@
-AUX srm-1.2.11-cflags.patch 572 BLAKE2B 4f0c95b13ba53452ff2850c32144e28ca2139876f910e174b38548716b19bcd4b2b5522c226e7a8c08a8d30fa18fbabb96bdb1bed6908c65be77243b35bc05c1 SHA512 ff776f2b76c5fd2423927fd903fb3d19080b3fab36eb491f9e116f7d9b9bca4a92bdea3c63369f10edd5b76283d737e64deaff418d861980f6c6b493a683827d
 AUX srm-1.2.15-cflags.patch 343 BLAKE2B e6159fdc6211273859215dc2a90fe598a1c956bef5aa69c02cb6bef54129873e71189d1646d04cb89f3be8bf968cc23631452e089a819d57d4fe3681ff3e4dd9 SHA512 81196944b68b0bff7b32a16dd749cc15ce73c125dba6bfa175dbc38b4baf3a291702139ae63f900e94c3babdacf769fc943992e192371c5c7073275320f0f9c6
-DIST srm-1.2.11.tar.gz 124982 BLAKE2B 0de5a413071ef6f30c377d61326b12d9c3b89ddeb8bd761b1f30a63c147bec7b51389cb19e7dd1da869e53a3a713f3a71993363419ecef7423a69219671b9667 SHA512 4b9b80242242dc64dcf97e4180676a1dc8b64d43f144ad4278d6762716e5e1b77b4c794900c298a919be7bdf1af71dcaf7286d4fae909ec5314752bfb73da8db
 DIST srm-1.2.15.tar.gz 132031 BLAKE2B f01fd8fce0095f5d2247026d3627fc8100b1bc9263f947f2d8500c999220c781ff109283c25b480fe295deb7e162f246afbad68c0797e0fec180ff57f1ff87be SHA512 a8ec78473c55b70557fca88f525998ed51df3be58618b9da220e1bb73df013163f4e1563cbe2062b9cf1512152afeb9004b5be0be69cc1278c0d28597310dfd2
-EBUILD srm-1.2.11-r2.ebuild 827 BLAKE2B 33e9cce28e4d06a40e701ea474ba9279967e83cc11f198d9a78043812d3e76f1150de672eac32d40fdf0439ed82bf4e1764b4a26ddf6e6e075aeb87112806549 SHA512 73f6d3948533f1f96530a581afe31c2e02f46b2a0ef16490e750844d7af6aa7b68eee2dfd69d208df4d1313f0a080c893f043db2bf61e67649d6fd4f38b9642d
 EBUILD srm-1.2.15.ebuild 825 BLAKE2B 1f94efecbfd09c9689e09c3524c804938d2348a1ec2a4e2136140db5164ab382fad14d048905d6450fdd44c86dfa7ff34b984a46f0c9928bb06dec8ad5c917af SHA512 cd3ca3a093d981c404b22ae7053545ab2e2090b1c843198b20a23c338d174956aa50970802fbfc429c7296691d5dffbfbf88a5aa5a511ceeb458f768c45c13f3
 MISC metadata.xml 326 BLAKE2B 636855bc40c79e71abaecf65d197fd8f963e639bcf150cbb8afb9426b76ae73b4104e1c3a9d5cf0c10d3f871c137a55afeee0a3ddb04f4b79cbef7f187f4e04e SHA512 721014538f226f65a6d673e52715b7802e714f87fb8c98c74e610ea603f1cd72504da9229d72e15012fee7fc3d17f6c1b702e1ad5ec300b9696f8b717b492293
diff --git a/app-misc/srm/files/srm-1.2.11-cflags.patch b/app-misc/srm/files/srm-1.2.11-cflags.patch
deleted file mode 100644
index 7f05c5d2aa9d..000000000000
--- a/app-misc/srm/files/srm-1.2.11-cflags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.in	2010-06-06 13:22:08.000000000 -0400
-+++ configure.in	2011-11-06 11:36:37.684800151 -0500
-@@ -6,8 +6,6 @@
- 
- dnl Checks for programs.
- AC_PROG_CC
--dnl reset CFLAGS
--CFLAGS=
- 
- AC_PROG_INSTALL
- AC_PROG_RANLIB
-@@ -39,10 +37,9 @@
- AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes] turn on debugging
-                        [default=$debug_default]],, enable_debug=$debug_default)
- if test "x$enable_debug" = "xyes"; then
--  CFLAGS="$CFLAGS -g"
-   AC_MSG_RESULT(yes)
- else
--  CFLAGS="$CFLAGS -O2 -DNDEBUG"
-+  CFLAGS="$CFLAGS -DNDEBUG"
-   AC_MSG_RESULT(no)
- fi
- 
diff --git a/app-misc/srm/srm-1.2.11-r2.ebuild b/app-misc/srm/srm-1.2.11-r2.ebuild
deleted file mode 100644
index f88fd563ae67..000000000000
--- a/app-misc/srm/srm-1.2.11-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils
-
-DESCRIPTION="A command-line compatible rm which destroys file contents before unlinking"
-HOMEPAGE="https://sourceforge.net/projects/srm/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="debug"
-
-DEPEND="!app-misc/secure-delete
-		sys-kernel/linux-headers
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.11-cflags.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-pkg_postinst() {
-	ewarn "Please note that srm will not work as expected with any journaled file"
-	ewarn "system (e.g., reiserfs, ext3)."
-	ewarn "See: ${EROOT%/}/usr/share/doc/${PF}/README"
-}
diff --git a/app-misc/tmux-mem-cpu-load/Manifest b/app-misc/tmux-mem-cpu-load/Manifest
index 233607df45bd..3d5e018c238e 100644
--- a/app-misc/tmux-mem-cpu-load/Manifest
+++ b/app-misc/tmux-mem-cpu-load/Manifest
@@ -1,4 +1,6 @@
 DIST tmux-mem-cpu-load-2.2.1.tar.gz 9893 BLAKE2B 12776c3a7612a193418a16a1a8bba9720df9296f7ae35183de80031d62c6559fe9b1385e95762e265b2de1f1df17e02f0215801f203c3a7a9c32be321bacae85 SHA512 44d677bbe9eb457b8857c603f469c46767878b2b8af8f169f2b01393ce65fc8da3c33288bc0743b3c2846b77de798437130a7676ca95c5cab52cd4166d9ded73
+DIST tmux-mem-cpu-load-3.4.0.tar.gz 19483 BLAKE2B eeaabcd4447b326dbf77d3e5844971d2b466c93169993d4a16912bc4d0f777b07db1b0c2973dfaef9e0cd5b4f0dfd132043aed20170a1a7856d7a3c1f6a96ba8 SHA512 f963683faa86ff7b20a658787978ce3c4c36c41fabe297e18e4b1483e680d71a3b10c220dbae5c29bc7f7cb65e79839041b53c9aaee75a17bdc78bf0b76e8dc1
 EBUILD tmux-mem-cpu-load-2.2.1-r1.ebuild 627 BLAKE2B 6ecc9a16bd9ba3eb4d3ffde164a190c4d8da3c0f39e191b44f7adb2954334905e7c21d8e3a99796fbb36202b308f77429359c8788e5e9413d369f6a317a6ab16 SHA512 3d66b62af62ec70c543d7dfca1d6fe09404daa3ccaaec915bd55b7c59b15dde8a2455c94040b1a745a4255ff7963a5a89ca581617d8738b7cd20c564f6c7e0fc
+EBUILD tmux-mem-cpu-load-3.4.0.ebuild 596 BLAKE2B aeed1f26d88315743f481699c88f963f7e7e89f5e9c7443e6df258d2e4e2b1b3948be56a8dcd281cdd9c9d5a08a0e5032f1afa076a12930d36b89d787b8068e2 SHA512 cda20eca54f75e3facb84ec5ed06ecee1799e83a8dd92d5c84b4672d2cdd82db38802c3aec849b0420c7b53e3f72443430bf1b2aa455fd780c8b281da7302a9f
 EBUILD tmux-mem-cpu-load-9999.ebuild 588 BLAKE2B 41c7f8754f4ccb8040cb502a905c96f9e3bdf6c207a040f18f2297af8de8b6bdd10b23a1a22173cd3a44d10b4ec6c5bd5a20a279ee8fa6bbdb2d00669acf5e28 SHA512 fd86b3f4890c292e4ff399ea07814bd5a53d39b7c8c9288957435ecde7455b7f510142b63a6c5d9db8176db489926975c6722dcc2d9a75128a71ec26248871e2
 MISC metadata.xml 233 BLAKE2B e05b8f920dfe21c6d9317562a4a2254dd8064cdaf0ea234443cc2867d417d87ea06817f234423ad58b507204af8e7222e3930f379b9957db62123dc23e0c1b86 SHA512 51ddf069656109f26ff5d12f93672537e90f70a3df00f5ffc18f4b365bc41847e441dd7aad0c50e46fe84cdac5ca6dceca1bb96de365d508cfeef1dacbaa5a0e
diff --git a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-3.4.0.ebuild b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-3.4.0.ebuild
new file mode 100644
index 000000000000..d70c36f8ee97
--- /dev/null
+++ b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-3.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+IUSE=""
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/thewtex/tmux-mem-cpu-load.git"}
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/thewtex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="CPU, RAM memory, and load monitor for use with tmux"
+HOMEPAGE="https://github.com/thewtex/tmux-mem-cpu-load/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DOCS=( AUTHORS README.rst )