gentoo resync 08.09.2018

4 files changed, 2 insertions, 86 deletions

diff --git a/media-plugins/vdr-cdplayer/Manifest b/media-plugins/vdr-cdplayer/Manifest
index 450be1147b33..0b9b09b9cbb8 100644
--- a/media-plugins/vdr-cdplayer/Manifest
+++ b/media-plugins/vdr-cdplayer/Manifest
@@ -1,9 +1,5 @@
 AUX confd 632 BLAKE2B 9eb0cd913444a25684af4b5e10423853a8c6578d06b92cb6cd4db17377bec7317d3ca40103217efc58d9d618920c74ae70e1b09114f53b8f27e9bdec7f0a4d49 SHA512 769e851932e0a56db0037ef23806c87a721055544ff25646ac52ed1e1975bdf0332ce999b4bdc7cb04a29670a69df652cedbbdb0562a0df4e77656b555740cff
 AUX rc-addon.sh 858 BLAKE2B 652d56878786d34db4ecf4911b79c4e2d35e50a297976d7f1d71154bb5ac567f0c138c7404effe723af08bda3320df69a43f68db3050b749b494610829bb3300 SHA512 d797b51db03061b854faad9675497e36943162b441d0f31d3c6640cc2065c1a8aafcbdd05b02117350da5e163ce273fd5bbb9d84ec07c6d196a19fe62e77d70b
-DIST vdr-cdplayer-1.2.0.tgz 175851 BLAKE2B 3974a8d1bed9a15f5924cb7852b6ed89b92c56b31e9f296102f8ccf84dee64dd8ab9faf83311db3e1b1cbdf375131c33f4ca2b87995219235be0024c0dccfcd3 SHA512 03dda4389347a43bf20fa15ef4b754aa15c7af965dbc56b7cf054ff0c7d8eb987d77dbec3e8cc513ab7b4a773e0848a58fa72664016d8f6cce9c3aa3fe25674c
-DIST vdr-cdplayer-1.2.1.tgz 180240 BLAKE2B f85f9be545cf57cb0bad68c45242002276a7623e447c7abd569ad345433ec887ce81de7423c23dd6a6e73e9bde6df7219655ce954279bfb80c5e029c83b23b54 SHA512 64b502a7f07d977c95e10a86353bc45351a43b178e8edcbfa783fcc6a5ae985e405b4f86ac783bc15d8795c8b77d59955570f4ab2e89a426f28c343216dc7768
 DIST vdr-cdplayer-1.2.2.tgz 180369 BLAKE2B deffc63e159eb7327ce3c5464c27305fab830ea9b27ed20d1874a819881c471c87c2db197eec4e88c4cdaa47aab0a556fbfbb9bec73e61fe3be587bfa993a7e0 SHA512 783f675f874798f4578b550abb6f0bcf3439d3b4cbcdc8e6abebe2c6f0bd83b7e7a73ef81e48b7b3d34bde80fcef79c5c13a8687caa5a6aa711c38473224a290
-EBUILD vdr-cdplayer-1.2.0.ebuild 850 BLAKE2B e23ce7fef4b6a82354ab992baaafec7ef76ceaeeffdb19e187f8b685aff320a34192bc136e3170e24a739066b305685418a991798603c7d768925c750d0f7cc7 SHA512 1a3c25dfb169d3f6c43d6636a23ee1e44a2ea6c38cd9c8f726ece1b5aec6c46f97daac1d4e7a8ab675847a92689aa2529f128bae7720ff50078b393b0deb98b3
-EBUILD vdr-cdplayer-1.2.1.ebuild 866 BLAKE2B 92affd24369cfff57e607818d9954ca10faa60e4578319737f0cf97087fecd464225b501a919588655b8338b34bb0440151bab6a30390c3ccdfd736f485c4472 SHA512 067cc9e63938fa0c4af4904f4710494a7a79707b0c13869dc6dbfff54a6421ec4e4068598a502cd103b94c9f85251ecd40c5ccbed3b5c0da11e2a133af3bccaa
-EBUILD vdr-cdplayer-1.2.2.ebuild 612 BLAKE2B 0924cb848e7554a52a76da7c19fa2dc36275772aac89e5e9ba0259417fd90c3a698fd7a7ea6fa3bd198b66b33f68f5a74c2aa2ed362ee5e1d4ea7adcc0a7be18 SHA512 7b551473c5476ddf7555827f8d55ff23196cc3c9dabf9f1d440fe9fa6cc26c84d67bc06c8bf94b527ce6552158c95b1f523cc4fd33f1f4c8cb47026f779d574b
+EBUILD vdr-cdplayer-1.2.2.ebuild 612 BLAKE2B a93bbe5fed5397ad6f47c361545c365c795ab23642f03edbb1f8d8b712e1bd9c4bb674b256871855062ee87c2eb292606250aab7d904b5bcee9744ad61b12dcd SHA512 8c1f626465ed6b309d1a93fc722ed1bdc3c203ec731bc35401c18ba54105af66c61b93028ff6b28b6f7ad7981fd65d817221c97adadaa545a2e5980b019d1385
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-cdplayer/vdr-cdplayer-1.2.0.ebuild b/media-plugins/vdr-cdplayer/vdr-cdplayer-1.2.0.ebuild
deleted file mode 100644
index c58ebecd3134..000000000000
--- a/media-plugins/vdr-cdplayer/vdr-cdplayer-1.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: CD-PLAYER"
-HOMEPAGE="https://www.uli-eckhardt.de/vdr/cdplayer.en.shtml"
-SRC_URI="https://www.uli-eckhardt.de/vdr/download/${P}.tgz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="cdparanoia"
-
-DEPEND=">=media-video/vdr-1.6"
-RDEPEND="${DEPEND}
-		>=dev-libs/libcdio-0.8.0
-		>=dev-libs/libcdio-paranoia-0.90
-		>=media-libs/libcddb-1.3.0"
-
-src_prepare() {
-	if has_version "<media-video/vdr-1.7.27"; then
-		cp Makefile.old Makefile
-	fi
-
-	vdr-plugin-2_src_prepare
-
-	use cdparanoia || BUILD_PARAMS="NOPARANOIA=1"
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	if has_version "<media-video/vdr-1.7.27"; then
-		insinto /etc/vdr/plugins/"${VDRPLUGIN}"
-		doins "${S}"/contrib/cd.mpg
-	fi
-}
diff --git a/media-plugins/vdr-cdplayer/vdr-cdplayer-1.2.1.ebuild b/media-plugins/vdr-cdplayer/vdr-cdplayer-1.2.1.ebuild
deleted file mode 100644
index 6607e51d9670..000000000000
--- a/media-plugins/vdr-cdplayer/vdr-cdplayer-1.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: CD-PLAYER"
-HOMEPAGE="https://www.uli-eckhardt.de/vdr/cdplayer.en.shtml"
-SRC_URI="https://www.uli-eckhardt.de/vdr/download/${P}.tgz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="cdparanoia"
-
-DEPEND=">=media-video/vdr-1.6
-		>=dev-libs/libcdio-0.8.0
-		>=media-libs/libcddb-1.3.0
-		cdparanoia? ( >=dev-libs/libcdio-paranoia-0.90 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if has_version "<media-video/vdr-1.7.27"; then
-		cp Makefile.old Makefile
-	fi
-
-	vdr-plugin-2_src_prepare
-
-	use cdparanoia || BUILD_PARAMS="NOPARANOIA=1"
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	if has_version "<media-video/vdr-1.7.27"; then
-		insinto /etc/vdr/plugins/"${VDRPLUGIN}"
-		doins "${S}"/contrib/cd.mpg
-	fi
-}
diff --git a/media-plugins/vdr-cdplayer/vdr-cdplayer-1.2.2.ebuild b/media-plugins/vdr-cdplayer/vdr-cdplayer-1.2.2.ebuild
index c06b3a81b57c..a3695fe480c6 100644
--- a/media-plugins/vdr-cdplayer/vdr-cdplayer-1.2.2.ebuild
+++ b/media-plugins/vdr-cdplayer/vdr-cdplayer-1.2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2