gentoo resync : 30.06.2018

3 files changed, 6 insertions, 44 deletions

diff --git a/app-misc/media-player-info/Manifest b/app-misc/media-player-info/Manifest
index 28f890caea13..9f149b19c795 100644
--- a/app-misc/media-player-info/Manifest
+++ b/app-misc/media-player-info/Manifest
@@ -1,5 +1,3 @@
-DIST media-player-info-22.tar.gz 104833 BLAKE2B 881e28b156e2dccbacdb16adff56e96d50b28d9e7aa30290e1439dddfa318930df419cc00846129f682d45cc750ce3a304a42f4fc04a1ff6e14001478d228a7d SHA512 7686aadb559b5a2cd2b969b9aadcf4c2b35037702e6fef4db66c6b8c0860d400c9f46a3b46150b9ce573d4f1fca53a5302fa7c1cdf888942a6489613c4d3c071
 DIST media-player-info-23.tar.gz 100849 BLAKE2B c64e33cb92c7f7b3fd77dd165fa5d33e433d09fbf171aba8ded2a274a24a544a85b7c874552951be25fe266090a882305416908975409b7c294d9435378c465d SHA512 4555456945f6f8c2fb23c86f80dc61e8e5448f3c402ac685e7eccd2df9f7861cdd41da842b0917349f7d83200ef10c810eb8b75fa6d62829834fdbdb81560f04
-EBUILD media-player-info-22.ebuild 1063 BLAKE2B f0efff681115dc405cd4dd9c3fc6b82efa74e7fdf36a2d1885ce8ce471250d7170fa3db9c00e86210e99578124c4dafa12947867e066393343621c39a4447341 SHA512 0e3214f4a13d59b8188ee35908d9d60f767eebd3ea01e2cb617fc0e74c3dc97ad3df5fb1eba80f7fd36f7a7610c440c6bb5b07d60c1a701de6376de5d3a19100
-EBUILD media-player-info-23.ebuild 1067 BLAKE2B f9614c835e7494376339635bb9d936d4b5ffec794cf3920edab4087d6c33e8ecf159e843cf84a5a3331920d607f5030a4ff26207cccf7f737a7e57dce2de8d38 SHA512 db5fff962e781adfe280ec80732cb4cb82cf735543c0e03a62684f91254fa6ddd863e3cb3b3b77048c6ee4c2eb9841243ea2791b81be203967e72894074fbc23
+EBUILD media-player-info-23.ebuild 1056 BLAKE2B 9235326e34617c91bcb8fcdaa431bc97c3be2b3c4f2f92f356052108b46bbc264e6058697922d4fc15c26564aaee8ee3b355354b8fa3e6ddd8e9f4d00e77335a SHA512 b33469c2c3400ed93b12c86e543a44d0730e393793544b99b56089761488eebee7eb15136f8bb1380dad7c6815ae34ca8c7abf27cadaf6d8c953281a95b51a95
 MISC metadata.xml 266 BLAKE2B 9c01787259e2c33e012f96ae52558f21518e2dc4e2bae1e528e8d53b897a698d9d205226aaf5c3796002ac10335d09b57de0d7a0ec079ea9982c7e05d1f67091 SHA512 c4dde7027a929519d75bf240bdf01edee88b6ab874e56c9e524f783b801eb26b5e86a9378cf23b21f7fd2f0f9ee45764daa7deef9173a05e0fedd997e648313b
diff --git a/app-misc/media-player-info/media-player-info-22.ebuild b/app-misc/media-player-info/media-player-info-22.ebuild
deleted file mode 100644
index c279cba26c92..000000000000
--- a/app-misc/media-player-info/media-player-info-22.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit eutils python-any-r1
-
-DESCRIPTION="A repository of data files describing media player capabilities"
-HOMEPAGE="https://cgit.freedesktop.org/media-player-info/"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86"
-IUSE=""
-
-# https://cgit.freedesktop.org/media-player-info/commit/?id=d83dd01a0a1df6198ee08954da1c033b88a1004b
-RDEPEND=">=virtual/udev-208"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-pkg_postinst() {
-	# Run for /lib/udev/hwdb.d/20-usb-media-players.hwdb
-	udevadm hwdb --update --root="${ROOT%/}"
-	# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-	if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
-		return 0
-	fi
-	udevadm control --reload
-}
diff --git a/app-misc/media-player-info/media-player-info-23.ebuild b/app-misc/media-player-info/media-player-info-23.ebuild
index 24e2cf1b615c..b5c5cdff697d 100644
--- a/app-misc/media-player-info/media-player-info-23.ebuild
+++ b/app-misc/media-player-info/media-player-info-23.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+EAPI=7
 
-inherit eutils python-any-r1
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit python-any-r1
 
 DESCRIPTION="A repository of data files describing media player capabilities"
 HOMEPAGE="https://cgit.freedesktop.org/media-player-info/"
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86"
 IUSE=""
 
 # https://cgit.freedesktop.org/media-player-info/commit/?id=d83dd01a0a1df6198ee08954da1c033b88a1004b