gentoo resync : 08.05.2018

6 files changed, 186 insertions, 33 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index d6e5c472687d..bde6abb33c06 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 28fd0f97d930..85665467e7f9 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -2,7 +2,9 @@ AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d
 DIST ca-certificates_20170717.tar.xz 293028 BLAKE2B 85076cd980841f32e2544c7be020fca9bcd5ef7066ae3cef195cbf9755f8b8e800a8e4076662fa1b7da600c2235e49048eb6e1166b0618fc7685221ab790fed3 SHA512 dfeb5a19bb33bcb127a159b73fcc63b41c99827d77eb4a6069def0cffc7ae8dd10dab97c1ddfdd5b70d0c93e650a51ed5dcd03908516e7ca8b3022bf46eeb7e6
 DIST ca-certificates_20180409.tar.xz 246908 BLAKE2B b553d4347f1a5b88fe59c7269dee617f61cde54d4df1a3aa4b3a7e9aa4b2ee81415e5c421352505ca4b2e0e480b053ccb04024bddfb51450d298d8fdd0567c36 SHA512 e0742da19416d367618547107cc0f1cc045d5ba62c30fb7238e0e36ec0d19ea48e2ffdee2c68a9f06954025c58db9a5376f149e221ede95a3a029cda39d86a53
 DIST nss-3.36.1.tar.gz 23026430 BLAKE2B 76eaf5b24f8954a4e14cf556912250a3ddb7b333054a2ea4ee3d218493a8f12c77a37455aae354ef6ddd9bd55c33a269dad515806d70ef38727fa8a382d47fd4 SHA512 096fe4360b6d584a746ac6156830f8cff821fd173bd889d7a396238919328a227fa4ebb46f738970a4001773046f3dd4f4675b85ff6de8420a4a7657b3ba0c65
+DIST nss-3.37.tar.gz 23027581 BLAKE2B 0ce7190a029321d5620dc8b9aedf1f4252c53dbef57149afbad432b6bc4b590db026505d23f5c766827d5c0179ab931b8a0435a2e9785eff3db515ed7211e512 SHA512 ad5175f126705f57092ac80421ac005bcc32bb18a4a44a527df25994fa90b3bc18af08506683564f619a22076f71232e2b3c9e6e25d6312d0bfed63684139103
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 EBUILD ca-certificates-20170717.3.36.1.ebuild 6253 BLAKE2B 6bfae7c926cac36f7bb5358dd1113a6f8bb30bf0c12518ddbe9e0bd771dbf119bbb9e9592c026fde71910552cfd7864dc04b7e9e1686a316019d1bc7de1509b7 SHA512 d233304edde3acf2f0c9732debaa00641d1caa678e91c6fbd7b8ab40d9792fb8acba2468f54dcb34c9e5431aad969b57ce47afbe46bda1a7d5fa62041bfa8bf2
 EBUILD ca-certificates-20180409.3.36.1-r1.ebuild 5740 BLAKE2B c621da402c252de355a9b4bc3b9be63458444a490013e404fd9488a0ed653ee141311b28bacd8f0d0a791e9b985620adc6e50d824ba2d01f3156af42c6534496 SHA512 e16491771037d7c3e47be526a97f1ed10a13dd14992336258ea7b5ff8885f50efbb8ba9a2bfa799c4157e123e93a858090dbc3e1f736852337d8df12bac6df9b
+EBUILD ca-certificates-20180409.3.37.ebuild 5740 BLAKE2B c621da402c252de355a9b4bc3b9be63458444a490013e404fd9488a0ed653ee141311b28bacd8f0d0a791e9b985620adc6e50d824ba2d01f3156af42c6534496 SHA512 e16491771037d7c3e47be526a97f1ed10a13dd14992336258ea7b5ff8885f50efbb8ba9a2bfa799c4157e123e93a858090dbc3e1f736852337d8df12bac6df9b
 MISC metadata.xml 538 BLAKE2B 20dd319e6f583b4b6b93fdfc7fb965c54c7b92426715cf287611ea58ed5040ffac4afa77df2e6464a387c120a8d80d508c6e997c820eae9395ba859b13c5702e SHA512 f2779da4ea4b24e196b64d6e4c94d47e426d431508db58355a08ca420498cbbe2f322c5f8dc6e132b612baf03ee6bb1561beade226bd2f71d6afa160064d7a7c
diff --git a/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild b/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild
new file mode 100644
index 000000000000..8d5bc12f58ed
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild
@@ -0,0 +1,179 @@
+# 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
+# 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 ~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=""
+${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
+			eapply -p0 "${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}"'":' \
+		-e 's/openssl rehash/c_rehash/' \
+		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
+
+	(
+	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/screenfetch/Manifest b/app-misc/screenfetch/Manifest
index 68731d197652..d5318c297931 100644
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@@ -1,6 +1,4 @@
-DIST screenfetch-3.7.0.tar.gz 60223 BLAKE2B 5b28ec609bdc4019b4b4d13cd70ae7b5d8f31ac5ea22383926752f6e1595e1c8764bff8a65fed4a1089e149edc50126f5bd761069840f012d0b678f95ccba9d3 SHA512 9a6e89ef2cd48f12b22230c7aff356ac2ece8dc7437034a51a66f8026e5ca4a630af43511a60b21e9fc9f89af9e2493b8cfa3a06294e74c3d611ae3bb0db922d
 DIST screenfetch-3.8.0.tar.gz 71970 BLAKE2B 783d14bb30f5858f2f2f8ac81c6c8bca2fa4c1e7c9225d9ba13a7ace05c365459e277bea625b680fc3e3fedd0303507a583190d866627cedcb33e042aa8fdca7 SHA512 903f42e3bfcd719c4d6b91d10e5678063e223c2baa58214c7e8dae9ea925852f9e2c07ad90148e02d87ce5f9af7b989e80e93c2f569cd579e6f4f7d5c49c62f2
-EBUILD screenfetch-3.7.0.ebuild 668 BLAKE2B 80e3117130dce1b38173d77546cc0bc5e9c7730afe454da952b46ac461c43e7ef6dd40f6a83c88b9b56c5806733bb204675ca496530fe568743e64bdde85564c SHA512 f6d2a7847252534025bc28e068c7600334841329d8d52b5d9039a032400c2054c8f62a2e409c232233f121bdb481d6700dd08b70df83a5fa339f9dbab6c7538c
 EBUILD screenfetch-3.8.0.ebuild 693 BLAKE2B ad0cb380e1a3cd16f21e695e178abb984c76d6d696ef36dcd518b683c84ff82ebdbec02c9dd94f28c4b6b77a59f559614b07ef4cdd22a5a13104c9460a14da95 SHA512 99082dbdb51ba4ef62e0acdc41fddc59544644e8bb94dfbabe33bc3cd171e6416d5525c90770fdae8f86792ceb154e0be74373542668675cfff89c2d15074f9f
 EBUILD screenfetch-9999.ebuild 695 BLAKE2B aba8d3df8fcf9c7de4f83eee0fd1823160d1b7099dd22b20a3dd53b187472fb9bbabf0177a39473776fb2c2dc74056057250042188e43ac907aed246c944ecfe SHA512 bac3af4d7023f27284ec87186021d7e55d274675a719ce1785ba10ae6bbf5d52ddc97152f2c6096e6fca4e785c232016ff579ccb9f1eb44704872b7f694dfc24
-MISC metadata.xml 452 BLAKE2B 29589bb06d4930268b6e8e1a2707a9e24d273b9a3bf88945e0aa643960deba4472877366de982f7d857af7c63a90b72edf10fdbfb5833dd71bb0dea0331db6b0 SHA512 f09da25b50fc92fe253cbd2eb32d158e4628fe4d5a62a028fc0437eb2f6e7d6fab7f568c9e165a8f02477dc11ecdec59d764c9d56a779f97d8805ab218741c1c
+MISC metadata.xml 565 BLAKE2B 765d7d26e0e26fa7fc38808d02d8c9f49af990cacb9c22e670a53dd968dea368411beee7c3c4f9df2b877c8337944bf513edfd086f147dff54e6ac50e77df1a4 SHA512 a6032e340f2ebc2eb69673cdf61fd9c6da9a141e59aea3ff60bdb47120b86147ed6b971cc16df936a7391f8ab8fe8258e10444ffe11e79a7118620f883de45fa
diff --git a/app-misc/screenfetch/metadata.xml b/app-misc/screenfetch/metadata.xml
index b46d2f934145..a91c788aff05 100644
--- a/app-misc/screenfetch/metadata.xml
+++ b/app-misc/screenfetch/metadata.xml
@@ -5,6 +5,10 @@
     <email>hwoarang@gentoo.org</email>
     <name>Markos Chandras</name>
   </maintainer>
+   <maintainer type="person">
+    <email>johu@gentoo.org</email>
+    <name>Johannes Huber</name>
+  </maintainer>
   <use>
     <flag name="X">Use the <pkg>media-gfx/scrot</pkg> package to take screenshots</flag>
   </use>
diff --git a/app-misc/screenfetch/screenfetch-3.7.0.ebuild b/app-misc/screenfetch/screenfetch-3.7.0.ebuild
deleted file mode 100644
index 204be3c6626d..000000000000
--- a/app-misc/screenfetch/screenfetch-3.7.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-MY_PN="${PN/f/F}"
-
-DESCRIPTION="Bash Screenshot Information Tool"
-HOMEPAGE="https://github.com/KittyKatt/screenFetch"
-SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	newbin ${PN}-dev ${PN}
-	dodoc CHANGELOG README.mkdn TODO
-}
-
-pkg_postinst() {
-	optfeature "resoluton detection" x11-apps/xdpyinfo
-	optfeature "screenshot taking" media-gfx/scrot
-	optfeature "screenshot uploading" net-misc/curl
-}