Merge updates from master

7 files changed, 4 insertions, 277 deletions

diff --git a/dev-perl/Test-Regexp/Manifest b/dev-perl/Test-Regexp/Manifest
index f2d6fc61fdcf..20220a8b11ab 100644
--- a/dev-perl/Test-Regexp/Manifest
+++ b/dev-perl/Test-Regexp/Manifest
@@ -1,2 +1 @@
-DIST Test-Regexp-2016060501.tar.gz 18898 SHA256 d59ff798b47b5a8be99f840a9bcf2762d49d2e0c96f51a38c03fe1a41eb4737d SHA512 639d74565fe93950950ed9dda30de5f83b1941d9f06b71dc40e33bd7b5355bba2d0f91afd9355262dc4ec167f39427e06f807e594b97ec74ff11762dea12f411 WHIRLPOOL a9fddf16049269c8c5a72d36d34427fa34b22b8c7a80ad26df467f8dcc2c3f3e728609ebdc7dc677a2add518fcf65ec798ad281f36c81baf5432aaf18386b884
 DIST Test-Regexp-2017040101.tar.gz 18904 SHA256 35cb41df5c5017835b89b853d5a44e25e6da973b450e1edca51bba70e7041e54 SHA512 70595642f8f5cadd4cec73587af8b4e9ce793c37fdf02773d357b84ee8181750f5ae7fbfbc9a35ca3392f5af074ef5b5a1626547cc7a0c3f48439d4a24bdc0b8 WHIRLPOOL 842e09bf6f4422474f73a833c90a4df28441fc4a474ce9ac3dd7fcbcd90ff97ed883d15c00ebedf3f9c0c970bfde6f2ebe4bde783ad025a306b68fa17f88f3f7
diff --git a/dev-perl/Test-Regexp/Test-Regexp-2016060501.0.0.ebuild b/dev-perl/Test-Regexp/Test-Regexp-2016060501.0.0.ebuild
deleted file mode 100644
index 309b73a56281..000000000000
--- a/dev-perl/Test-Regexp/Test-Regexp-2016060501.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DIST_AUTHOR=ABIGAIL
-DIST_VERSION=$(get_major_version)
-
-inherit perl-module
-
-DESCRIPTION="Provide commonly requested regular expressions"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-DEPEND="
-	test? ( >=virtual/perl-Test-Simple-1.1.14 )
-	virtual/perl-ExtUtils-MakeMaker
-"
-RDEPEND="
-	virtual/perl-Test-Simple
-	virtual/perl-Exporter
-"
-
-src_test() {
-	# Omit code coverage / documentation tests
-	perl_rm_files t/{950,960,980,981,982}*.t
-
-	perl-module_src_test
-}
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index 88cee27fb1fe..10e4a1a8bd51 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -1,4 +1,2 @@
-DIST plexmediaserver_1.3.3.3148-b38628e_amd64.deb 101224432 SHA256 3b58d0ad9a9e27e86209c33550be832868102526d512a860d4984ef3daf7cad9 SHA512 fb1d49650a66217df9d13dd0157f6f82b409989eacf2a40e9a92a47c6946e7bedc64429a88d2607a5f689ea7b5fae2ced5c53e2e719c85e7f08f71149844ab71 WHIRLPOOL fa5a0e74e03cc5c357b7c64876b96f265a8b3e74f2002d3d147ce46083f947311ce227a53f61ca1f962e00d89554a4df6ca8e3df7d5b32d13d27118b3d0f34c8
-DIST plexmediaserver_1.3.4.3285-b46e0ea_amd64.deb 101356988 SHA256 dc53290c12ea744249f0937e4defdfbf7fb526a63413d41ff21047fc3572ff55 SHA512 46e7ce694f0be880ada03b327fa937e23d3e2412c2b4d04c79f87afb97ad8897b7977e9f5c1ed4cc6883129c911523f03e5db6c70c76b99cbb2d9e1ac4d9275e WHIRLPOOL 515d15782d4189e71501d11a335440853db4ededc42baa748375ca1a833e24b8db4497a8197698bddc8fc0d8689aa9768b1abbff1c8002f846a102f36267936b
-DIST plexmediaserver_1.4.3.3433-03e4cfa35_amd64.deb 103128692 SHA256 7ef4efec9e1ecc7fa67cf8284ca7316f715f33457d3e9f6bd3980d22c1de3edc SHA512 4432ffefab379ec57de1e0cf0648223d3a58b253ed43d3879fd967de93fd453b8a3820d20a87851fc98c6e8c77dfdfa81eab7ba66ce3ddf465007586d92d0823 WHIRLPOOL 1884d396c06137702cd23797ff452336847931e761e485910b1e4c3a4927ba6b8397f5aa0a265f81c98c7e3e9bfc121e9952d2f4b8757099ffaafc502f5edf95
 DIST plexmediaserver_1.4.4.3495-edef59192_amd64.deb 103118966 SHA256 ba05818febf0267c04151d9a243f2eff0823310a1c89b58d8be4608f4f7a7402 SHA512 5a6caa5bc16f8d57177f86e079d6cad980dabc35e4ed355a7c44058593c11b65dd6a64349b110818b258bfeb679ead153ad2b316189cfdffc51938d70834f138 WHIRLPOOL a95804173d2df36af04760a5c551f0114768d5f134e23cf2156b65ac426379f6aaa5a95bee54b63cb96451a93b2de19eab67f6a96c9dc62a7f677c27212be92b
+DIST plexmediaserver_1.5.3.3580-4b377d295_amd64.deb 105500574 SHA256 983d48597179125c7de3c49f44af7d7cfca0a7bf645c26833c906cbe5e1accd8 SHA512 92c64d2acaa37fa98c02ff95a07eb44078b4f7db519047f65647d7f09dcca6ca1fb67738119e2988a0b9b61e3260f4a2402f5710a17d35797c574c122e62c537 WHIRLPOOL 2606946d34d356161d22a2298589e18f4e710671bf41fd2f84d486186c7472f505b8a5a7131ed56ad7ef648b61e5f67d6e8cd25781a56520601a76317f6a6213
diff --git a/media-tv/plex-media-server/plex-media-server-1.3.3.ebuild b/media-tv/plex-media-server/plex-media-server-1.3.3.ebuild
deleted file mode 100644
index 6647e72dfe47..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.3.3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user systemd unpacker
-
-MINOR1="3148"
-MINOR2="b38628e"
-
-_APPNAME="plexmediaserver"
-_USERNAME="plex"
-_SHORTNAME="${_USERNAME}"
-_FULL_VERSION="${PV}.${MINOR1}-${MINOR2}"
-
-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="mirror bindist strip"
-KEYWORDS="-* amd64"
-
-DEPEND="
-	net-dns/avahi
-	sys-apps/fix-gnustack"
-
-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*" )
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	enewgroup ${_USERNAME}
-	enewuser ${_USERNAME} -1 /bin/bash /var/lib/${_APPNAME} ${_USERNAME}
-}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_install() {
-	# Copy main files over to image and preserve permissions so it is portable
-	cp -rp usr/ "${ED}" || die
-
-	# Move the config to the correct place
-	local CONFIG_VANILLA="${S}/etc/default/plexmediaserver"
-	local CONFIG_PATH="/etc/${_SHORTNAME}"
-	dodir "${CONFIG_PATH}"
-	insinto "${CONFIG_PATH}"
-	doins "${CONFIG_VANILLA}"
-
-	# Remove Debian specific files
-	rm -rf "${ED%/}/usr/share/doc" || 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
-}
-
-pkg_postinst() {
-	einfo ""
-	elog "Plex Media Server is now installed. Please check the configuration file in /etc/plex/${_SHORTNAME} 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 flag from library 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
-}
diff --git a/media-tv/plex-media-server/plex-media-server-1.3.4-r1.ebuild b/media-tv/plex-media-server/plex-media-server-1.3.4-r1.ebuild
deleted file mode 100644
index 83a5896e0f83..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.3.4-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user systemd unpacker pax-utils
-
-MINOR1="3285"
-MINOR2="b46e0ea"
-
-_APPNAME="plexmediaserver"
-_USERNAME="plex"
-_SHORTNAME="${_USERNAME}"
-_FULL_VERSION="${PV}.${MINOR1}-${MINOR2}"
-
-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="mirror bindist strip"
-KEYWORDS="-* amd64"
-
-DEPEND="sys-apps/fix-gnustack"
-RDEPEND="net-dns/avahi"
-
-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}"
-
-pkg_setup() {
-	enewgroup ${_USERNAME}
-	enewuser ${_USERNAME} -1 /bin/bash /var/lib/${_APPNAME} ${_USERNAME}
-}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_install() {
-	# Copy main files over to image and preserve permissions so it is portable
-	cp -rp usr/ "${ED}" || die
-
-	# Move the config to the correct place
-	local CONFIG_VANILLA="${S}/etc/default/plexmediaserver"
-	local CONFIG_PATH="/etc/${_SHORTNAME}"
-	dodir "${CONFIG_PATH}"
-	insinto "${CONFIG_PATH}"
-	doins "${CONFIG_VANILLA}"
-
-	# Remove Debian specific files
-	rm -rf "${ED%/}/usr/share/doc" || 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
-}
-
-pkg_postinst() {
-	einfo ""
-	elog "Plex Media Server is now installed. Please check the configuration file in /etc/plex/${_SHORTNAME} 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.4.4.ebuild b/media-tv/plex-media-server/plex-media-server-1.4.4.ebuild
index 26a6c3afc111..479f0c36ab24 100644
--- a/media-tv/plex-media-server/plex-media-server-1.4.4.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.4.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="amd64? ( ${URI}/${_FULL_VERSION}/plexmediaserver_${_FULL_VERSION}_amd64
 SLOT="0"
 LICENSE="Plex"
 RESTRICT="mirror bindist strip"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 DEPEND="
 	sys-apps/fix-gnustack
diff --git a/media-tv/plex-media-server/plex-media-server-1.4.3.ebuild b/media-tv/plex-media-server/plex-media-server-1.5.3.ebuild
index 6ec1479f0b4e..83a716311b7b 100644
--- a/media-tv/plex-media-server/plex-media-server-1.4.3.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.5.3.ebuild
@@ -6,13 +6,12 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 inherit eutils user systemd unpacker pax-utils python-single-r1
 
-MINOR1="3433"
-MINOR2="03e4cfa35"
+MINOR_VERSION="3580-4b377d295"
 
 _APPNAME="plexmediaserver"
 _USERNAME="plex"
 _SHORTNAME="${_USERNAME}"
-_FULL_VERSION="${PV}.${MINOR1}-${MINOR2}"
+_FULL_VERSION="${PV}.${MINOR_VERSION}"
 
 URI="https://downloads.plex.tv/plex-media-server"
 
@@ -48,7 +47,6 @@ 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
 }