gentoo resync : 31.01.2018

6 files changed, 24 insertions, 143 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 43d2d70bc6f6..fbbd481eed70 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 0c0da194d433..35d8dbdf711f 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -20,5 +20,5 @@ EBUILD kodi-17.5-r1.ebuild 8830 BLAKE2B 8f09f8a724708f406157cb6a3acb81e06ca2c2f5
 EBUILD kodi-17.6-r1.ebuild 8741 BLAKE2B 63512c0c3c77736a551d2b0a255048a7579f852a5c3b592cb70581747dd7fc04a7beb9b1ceee60222266cb9e478e01f39dbb07f4e84f1a35b509bdb6552ff779 SHA512 6be7bb9f2bc68ef8dfbdf71972d221c503133f99ad42d1b434256d4c55fa6b9edeadc097f928c5176b1038d687b3dc5b38ce083aae969af6147e64562f68cf9e
 EBUILD kodi-17.6-r2.ebuild 8743 BLAKE2B d0d6014cc8735bf9cc273ca9848aff83c466257f551694c3dbd67ce3882b85f7dfab8c29302289f3406848935f8ee4700ad16e8ab7e9445ead5dca29d7d12fd4 SHA512 01ef54d3ae4404f768c126fac8a39ba66ebcf038104322a2f14bd903d336430d935f0201dc84d1025f9d1fd1ea4109de73c7de2342c8f47154a8b08e9c73a571
 EBUILD kodi-17.6.ebuild 8745 BLAKE2B 98d3a0a1b855474eb0bf68b49bbf26a229ad0e8d7a825f10aa131e423401de090bc237a1dae00da87575a851b5f62e27c086964f58afdc6b8e3649b5093b3bab SHA512 e0ab4f578136da46ae6910886d2a8239bf81acdb39256158d616d12a4a6ee168fb45424a3fbd5f31d110117223dcae85d9d881485d238c9c7f59101ca112cc57
-EBUILD kodi-9999.ebuild 8927 BLAKE2B fa914e304a3ab6de604a7cb9522ab2b49827c200eb0c227e93db0d63ecebccd23f1996ca3011377b3474cdaaf1ce846d669d057ef23a918da4a50ce17b4e49a5 SHA512 d41df079f17e00f876e1a4154a8e6176cbdb9d6b77b815ce916a1b079bf0d4692e2c284800646f5730d26c12294a73cb260c0961d217d28ae70ea95c7603e04f
+EBUILD kodi-9999.ebuild 8929 BLAKE2B b54f2a127046257898a1961f41d1896e33e602d0c50a113a9a45aff8aeda5696fba1907a3730352374a63b5da311a875f20088137657b9dabc3d5b8ff3565709 SHA512 8da04c2e8f532597e6ed2e2ab87a68700bf7c5f5c24a9d628634d47921b48b4aa09a342e6a68592c2474864ffafa7b92409b7d9fe27e1fe6b37be8222192c3ca
 MISC metadata.xml 1716 BLAKE2B cc5a56b572fc4bc5b17a303e266e66c06450e9ef111f080a57bef31f847d522edd01354be20cbd5450b6773321c49618ae74f9a5caed39948d672314b06c27c0 SHA512 4ea0d31caa3a4c10ff5a421fa830c9db3eeb2628cecc19759ad218eb551d2c4382016ec5655a5c5be1e257eec29cad0717523a9fe3f251ff762cdf0ba60b4355
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index eedaf958c4e3..3996c58ade2b 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -97,7 +97,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
 	)
 	wayland? (
-		>=dev-cpp/waylandpp-0.1.5
+		>=dev-cpp/waylandpp-0.2.2:=
 		media-libs/mesa[wayland]
 		>=dev-libs/wayland-protocols-1.7
 		>=x11-libs/libxkbcommon-0.4.1
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index 7bf0bcaea855..86b62224cef2 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -2,8 +2,6 @@ AUX conf.d/plex-media-server 216 BLAKE2B 094d0f6f7cdfa696ae47d7879c7459be5755dfe
 AUX init.d/plex-media-server 413 BLAKE2B f60fe9f653c591cddaf77a0ebcb47218681a63235e82bc016c7d2ee9180df7f6ff24f3784216ea370bdc2d493531492f196200b6ec56ff8b303e69adaa0f108d SHA512 aeb873a00081f20abd27cc76d395908ae0643bd8aa665557adafef2ed97edbe93c18b55818b49227746f9c3ce4b7a81ceb9132f07d8d873bc7b5a932b944a402
 AUX systemd/plex-media-server.service 159 BLAKE2B d4988890f6424e0b9160e90df0125fbcb32e86443c5b869f66ac6e28c3701fdaa3dd819823edd0c8675792bf4e24e7fcf3bb8894e55539ad8fc5eb9ac9a550fc SHA512 9066840efa43b127dd0d4b26ea0552894db97bf48f89003258095986e7d4728e05bee2f49de856777ed3d0b5ec41654c14505bc9867b227b754aeecd0529abd6
 AUX virtualenv_start_pms.patch 839 BLAKE2B 20d6a53b40a2c714153bc7f04c2bbad568b75197cd450cb52129cc3718fad1db09f9fe2a92e8608e1e95b710e0b4af58a373650ab4017438b63fe61132f13d75 SHA512 55fb8f3234942d10c0d6d1820fbab48b8a9f26f069031946dae551cde8b7d18d61ef36ec994719d2519687dc75e5ec27205702395a8af112bda720b7a62072aa
-DIST plexmediaserver_1.10.0.4523-648bc61d4_amd64.deb 108257188 BLAKE2B 7b8ab929ef059ba7f2c6aea061348216361f0fa5af19a5e70fed134760e615f2bd28133a37337660711b3de4af883aede52e63e1a585b6ab15ca93d6ec7e8251 SHA512 8b4111c73ad04e28a2b8040fbd60b8272e2556d4a492442c25fab2b681eb7dc1477e5ec30261884a622eb9c6ab99836318c97cbb726ac07c31495c450258c0cc
 DIST plexmediaserver_1.10.1.4602-f54242b6b_amd64.deb 108445778 BLAKE2B 8c71bbc7a90d5465aa23b4ddaddbec8ccc81f7e5f09e2e3b98a878c5375158381c5fc20fd6542a3a9e642007ab06045eb3afe210ef5f16a5f60f1d3abd8c3fe7 SHA512 16f3f28e1ba409b141c8f2f7ecb912bcf47485e68d8e813c4908465407d8e6e3c455e6358538445e06b73380f82c46a5b29e6d02d4b4576407dc8d7bc0644b38
-EBUILD plex-media-server-1.10.0.ebuild 3995 BLAKE2B 8540831d6584e06d01b88745b9bea68d65723902ba01cdea5be95a7e37eb5ebaec777cc086f3404b5c59c0f0c4a08c08ddef9f38e935e49403e008881d639d37 SHA512 fcbdc2328fe600088c6479fd2ae1621e0f9e49eee3077d09f88d54d9d5d3d20d2eb331846c63c2c0a359db0044ca818625fb9dffa2410e20fefa95f6c4f80346
-EBUILD plex-media-server-1.10.1.ebuild 3996 BLAKE2B cc5934721ef9cb4930ccc5be2fb56142de1786328b3fa74f481786025fb40be1ccfa07bd16f09cb38c888855ed3d8c75372bf2f1b57efde2f428bc53571fd56a SHA512 1bdb9753635f6cbb17272e28f9556d1b49a6eb98e251e06d165a5f02b0b641e74de558c674356e9b2f639137a20604ff506d4793ff35f04c0f2073659dd8a34e
+EBUILD plex-media-server-1.10.1-r1.ebuild 4677 BLAKE2B 7cfaefc35a60566276ac1b3ed681dbcb4ff03ebb50f8397a7ffa74e80c4c5fe472d31cc5e4472bdfd31822944c467ad6079395c058d883b4e4484c5e0632a179 SHA512 e9a925e244a8c20891343adf132a3a99d86f306262afd87bd5a897667ad25a297823c80de4b9c1dbce3305663d7be9c6de0571d45de77cd867c40757d430c2b7
 MISC metadata.xml 272 BLAKE2B 084b8ae019863d5cda604c5cafb2ae06aaa78efedd73224cdddf5089fc709ef783841063c23d2d599dcea7d4c49770158d12dee34738322fc5933ca80fec71c5 SHA512 21fe9d289af64cd556f7c8edb452857c3285dec0e3b83a3be2e8a67dda1da59994ab70de86c78a5d9fe9a3c488ff82dc909f7e5fee946386bffb410b02caafdb
diff --git a/media-tv/plex-media-server/plex-media-server-1.10.0.ebuild b/media-tv/plex-media-server/plex-media-server-1.10.0.ebuild
deleted file mode 100644
index b5a991388dc5..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.10.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils user systemd unpacker pax-utils python-single-r1
-
-MINOR_VERSION="4523-648bc61d4"
-
-_APPNAME="plexmediaserver"
-_USERNAME="plex"
-_SHORTNAME="${_USERNAME}"
-_FULL_VERSION="${PV}.${MINOR_VERSION}"
-
-URI="https://downloads.plex.tv/plex-media-server"
-
-DESCRIPTION="A free media library that is intended for use with a plex client."
-HOMEPAGE="http://www.plex.tv/"
-SRC_URI="amd64? ( ${URI}/${_FULL_VERSION}/plexmediaserver_${_FULL_VERSION}_amd64.deb )"
-SLOT="0"
-LICENSE="Plex"
-RESTRICT="bindist strip"
-KEYWORDS="-* amd64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	sys-apps/fix-gnustack
-	dev-python/virtualenv[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	net-dns/avahi
-	${PYTHON_DEPS}"
-
-QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
-QA_PREBUILT="*"
-QA_MULTILIB_PATHS=(
-	"usr/lib/${_APPNAME}/.*"
-	"usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*"
-)
-
-EXECSTACKED_BINS=( "${ED%/}/usr/lib/plexmediaserver/libgnsdk_dsp.so*" )
-BINS_TO_PAX_MARK=( "${ED%/}/usr/lib/plexmediaserver/Plex Script Host" )
-
-S="${WORKDIR}"
-PATCHES=( "${FILESDIR}/virtualenv_start_pms.patch" )
-
-pkg_setup() {
-	enewgroup ${_USERNAME}
-	enewuser ${_USERNAME} -1 /bin/bash /var/lib/${_APPNAME} "${_USERNAME},video"
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_install() {
-	# Move the config to the correct place
-	local CONFIG_VANILLA="/etc/default/plexmediaserver"
-	local CONFIG_PATH="/etc/${_SHORTNAME}"
-	dodir "${CONFIG_PATH}"
-	insinto "${CONFIG_PATH}"
-	doins "${CONFIG_VANILLA#/}"
-	sed -e "s#${CONFIG_VANILLA}#${CONFIG_PATH}/${_APPNAME}#g" -i "${S}"/usr/sbin/start_pms || die
-
-	# Remove Debian specific files
-	rm -rf "usr/share/doc" || die
-
-	# Copy main files over to image and preserve permissions so it is portable
-	cp -rp usr/ "${ED}" || die
-
-	# Make sure the logging directory is created
-	local LOGGING_DIR="/var/log/pms"
-	dodir "${LOGGING_DIR}"
-	chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${LOGGING_DIR}" || die
-
-	# Create default library folder with correct permissions
-	local DEFAULT_LIBRARY_DIR="/var/lib/${_APPNAME}"
-	dodir "${DEFAULT_LIBRARY_DIR}"
-	chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${DEFAULT_LIBRARY_DIR}" || die
-
-	# Install the OpenRC init/conf files
-	doinitd "${FILESDIR}/init.d/${PN}"
-	doconfd "${FILESDIR}/conf.d/${PN}"
-
-	_handle_multilib
-
-	# Install systemd service file
-	local INIT_NAME="${PN}.service"
-	local INIT="${FILESDIR}/systemd/${INIT_NAME}"
-	systemd_newunit "${INIT}" "${INIT_NAME}"
-
-	_remove_execstack_markings
-	_add_pax_markings
-
-	einfo "Configuring virtualenv"
-	virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"usr/lib/plexmediaserver/Resources/Python || die
-	pushd "${ED}"usr/lib/plexmediaserver/Resources/Python &>/dev/null || die
-	find . -type f -exec sed -i -e "s#${D}##g" {} + || die
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	einfo ""
-	elog "Plex Media Server is now installed. Please check the configuration file in /etc/${_SHORTNAME}/${_APPNAME} to verify the default settings."
-	elog "To start the Plex Server, run 'rc-config start plex-media-server', you will then be able to access your library at http://<ip>:32400/web/"
-}
-
-# Finds out where the library directory is for this system
-# and handles ldflags as to not break library dependencies
-# during rebuilds.
-_handle_multilib() {
-	# Prevent revdep-rebuild, @preserved-rebuild breakage
-	cat > "${T}"/66plex <<-EOF || die
-		LDPATH="${EPREFIX}/usr/$(get_libdir)/plexmediaserver"
-	EOF
-
-	doenvd "${T}"/66plex
-}
-
-# Remove execstack flags from some libraries/executables so that it works in hardened setups.
-_remove_execstack_markings() {
-	for f in "${EXECSTACKED_BINS[@]}"; do
-		# Unquoting 'f' so that expansion works.
-		fix-gnustack -f ${f} > /dev/null
-	done
-}
-
-# Add pax markings to some binaries so that they work on hardened setup.
-_add_pax_markings() {
-	for f in "${BINS_TO_PAX_MARK[@]}"; do
-		pax-mark m "${f}"
-	done
-}
diff --git a/media-tv/plex-media-server/plex-media-server-1.10.1.ebuild b/media-tv/plex-media-server/plex-media-server-1.10.1-r1.ebuild
index 760f6bd70b88..1d59396063e0 100644
--- a/media-tv/plex-media-server/plex-media-server-1.10.1.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.10.1-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="amd64? ( ${URI}/${_FULL_VERSION}/plexmediaserver_${_FULL_VERSION}_amd64
 SLOT="0"
 LICENSE="Plex"
 RESTRICT="bindist strip"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
@@ -84,7 +84,12 @@ src_install() {
 	doinitd "${FILESDIR}/init.d/${PN}"
 	doconfd "${FILESDIR}/conf.d/${PN}"
 
-	_handle_multilib
+	# Disabling due to Bug 644694
+	#_handle_multilib
+
+	# Mask Plex libraries so that revdep-rebuild doesn't try to rebuild them.
+	# Plex has it's own precompiled libraries.
+	_mask_plex_libraries_revdep
 
 	# Install systemd service file
 	local INIT_NAME="${PN}.service"
@@ -107,6 +112,11 @@ pkg_postinst() {
 	elog "To start the Plex Server, run 'rc-config start plex-media-server', you will then be able to access your library at http://<ip>:32400/web/"
 }
 
+# Disabling the follow function due to Bug 644694.
+# We shouldn't register plex libraries in global
+# library path since this will cause other packages
+# on the system to break.
+
 # Finds out where the library directory is for this system
 # and handles ldflags as to not break library dependencies
 # during rebuilds.
@@ -119,7 +129,15 @@ _handle_multilib() {
 	doenvd "${T}"/66plex
 }
 
-# Remove execstack flags from some libraries/executables so that it works in hardened setups.
+# Adds the precompiled plex libraries to the revdep-rebuild's mask list
+# so it doesn't try to rebuild libraries that can't be rebuilt.
+_mask_plex_libraries_revdep() {
+	dodir /etc/revdep-rebuild/
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/$(get_libdir)/plexmediaserver\"" > "${ED}"/etc/revdep-rebuild/80plexmediaserver
+}
+
+# Remove execstack flags from some libraries/executables
+# so that it works in hardened setups.
 _remove_execstack_markings() {
 	for f in "${EXECSTACKED_BINS[@]}"; do
 		# Unquoting 'f' so that expansion works.