[gentoo-commits] repo/gentoo:master commit in: media-sound/marrie/

[gentoo-commits] repo/gentoo:master commit in: media-sound/marrie/

[Rafael Martins]

commit:     f72505a69bdc84031f5561b8eff79847fbece12f
Author:     Rafael Martins <rafaelmartins <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 15 20:25:25 2020 +0000
Commit:     Rafael Martins <rafaelmartins <AT> gentoo <DOT> org>
CommitDate: Wed Jan 15 20:26:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f72505a6

media-sound/marrie: version bump. update live ebuild

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Rafael Martins <rafaelmartins <AT> gentoo.org>

 media-sound/marrie/Manifest                        |  2 +-
 .../{marrie-0.3.2-r1.ebuild => marrie-0.4.ebuild}  | 32 ++++++----------------
 media-sound/marrie/marrie-9999.ebuild              | 32 ++++++----------------
 3 files changed, 17 insertions(+), 49 deletions(-)

diff --git a/media-sound/marrie/Manifest b/media-sound/marrie/Manifest
index 9d9d360f2f3..fce580437bd 100644
--- a/media-sound/marrie/Manifest
+++ b/media-sound/marrie/Manifest
@@ -1 +1 @@
-DIST marrie-0.3.2.tar.gz 7626 BLAKE2B 5adb814f50b850621c19e4be1b60e4dd8f94d44c4ecadc3df6650b49fb16a3f31569a8d17ea7e6359d726a15ec4063ffa22d7815e8a17e3f5340348ade172aef SHA512 da6688e18124f2c95e2dd9846a2578fd2e6312f7e145424f50761eaabdd3c234424921f289b595e8842a9f5e3863a9ef106331c19cec42de9731d12f9584958a
+DIST marrie-0.4.tar.gz 7775 BLAKE2B 7b68fbdfe35c7e72fe111b44bbabf4e60eb9f6211867184d1f3f7bc7b1c067f99223eea2dd3c7809f041d0a7b5ac80be360d3c14808605f3145b8d39a0a9c7fd SHA512 9ed8677729e7575519f130c1866923e7223dabf07c9c24b9e3f6a70cd5e1e56da2a5d1a34011b73d65c8d8fa4c962f65709883b9444d078d6439769d4afb644b

diff --git a/media-sound/marrie/marrie-0.3.2-r1.ebuild b/media-sound/marrie/marrie-0.4.ebuild
similarity index 56%
rename from media-sound/marrie/marrie-0.3.2-r1.ebuild
rename to media-sound/marrie/marrie-0.4.ebuild
index c44c712b03f..128c50ca86f 100644
--- a/media-sound/marrie/marrie-0.3.2-r1.ebuild
+++ b/media-sound/marrie/marrie-0.4.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7} )
 
 GIT_ECLASS=""
 if [[ ${PV} = *9999* ]]; then
@@ -25,32 +26,15 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/setuptools
-	>=dev-python/feedparser-5.1.3"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils )"
-
-src_compile() {
-	distutils-r1_src_compile
-	if use doc; then
-		rst2html.py README.rst marrie.html || die "rst2html.py failed"
-	fi
-}
+IUSE=""
 
-src_install() {
-	distutils-r1_src_install
-	if use doc; then
-		dohtml marrie.html
-	fi
-}
+RDEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
 
 pkg_postinst() {
 	distutils-r1_pkg_postinst
 	elog
 	elog "You'll need a media player and a file downloader."
-	elog "Recommended packages: net-misc/wget and media-video/mplayer"
+	elog "Recommended packages: net-misc/wget and media-video/mpv"
 	elog
 }

diff --git a/media-sound/marrie/marrie-9999.ebuild b/media-sound/marrie/marrie-9999.ebuild
index c44c712b03f..128c50ca86f 100644
--- a/media-sound/marrie/marrie-9999.ebuild
+++ b/media-sound/marrie/marrie-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7} )
 
 GIT_ECLASS=""
 if [[ ${PV} = *9999* ]]; then
@@ -25,32 +26,15 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/setuptools
-	>=dev-python/feedparser-5.1.3"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils )"
-
-src_compile() {
-	distutils-r1_src_compile
-	if use doc; then
-		rst2html.py README.rst marrie.html || die "rst2html.py failed"
-	fi
-}
+IUSE=""
 
-src_install() {
-	distutils-r1_src_install
-	if use doc; then
-		dohtml marrie.html
-	fi
-}
+RDEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
 
 pkg_postinst() {
 	distutils-r1_pkg_postinst
 	elog
 	elog "You'll need a media player and a file downloader."
-	elog "Recommended packages: net-misc/wget and media-video/mplayer"
+	elog "Recommended packages: net-misc/wget and media-video/mpv"
 	elog
 }