From e5b79550a0be91c0bdbfb17ce10c99d20046d95f Mon Sep 17 00:00:00 2001 From: Rafael Martins Date: Thu, 4 Dec 2014 06:14:52 +0000 Subject: [PATCH] revbump. fixes #514570 and moves to distutils-r1 Package-Manager: portage-2.2.10/cvs/Linux x86_64 --- media-sound/marrie/ChangeLog | 8 ++++- media-sound/marrie/Manifest | 28 ++--------------- ...ie-0.3.1.ebuild => marrie-0.3.1-r1.ebuild} | 31 +++++++++---------- media-sound/marrie/marrie-9999.ebuild | 31 +++++++++---------- 4 files changed, 40 insertions(+), 58 deletions(-) rename media-sound/marrie/{marrie-0.3.1.ebuild => marrie-0.3.1-r1.ebuild} (64%) diff --git a/media-sound/marrie/ChangeLog b/media-sound/marrie/ChangeLog index cfed89bad189..5e64d95c1546 100644 --- a/media-sound/marrie/ChangeLog +++ b/media-sound/marrie/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/marrie # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/marrie/ChangeLog,v 1.7 2014/07/06 12:53:19 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/marrie/ChangeLog,v 1.8 2014/12/04 06:14:45 rafaelmartins Exp $ + +*marrie-0.3.1-r1 (04 Dec 2014) + + 04 Dec 2014; Rafael G. Martins + +marrie-0.3.1-r1.ebuild, -marrie-0.3.1.ebuild, marrie-9999.ebuild: + revbump. fixes #514570 and moves to distutils-r1 06 Jul 2014; Michał Górny marrie-0.3.1.ebuild, marrie-9999.ebuild: diff --git a/media-sound/marrie/Manifest b/media-sound/marrie/Manifest index c6bc3cbda272..cda7fb07af4a 100644 --- a/media-sound/marrie/Manifest +++ b/media-sound/marrie/Manifest @@ -1,27 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - DIST marrie-0.3.1.tar.gz 7479 SHA256 5440d3b945e1789761373fbe0f0c60d75214250ef7393b1761e32c4bbcc667a3 SHA512 924c36c95d8226fd6a500a84342e06dbc73e3976db584c194fb943e9100005120fee266bdb69448aef93df60b3888fb0cabdec657d8becb1aa7332732355b0b8 WHIRLPOOL 528453c1126db023b8da75a39c74e609efc112cee4e667e12c5bf064d2a0a4df97c8b89e5e2b15fd6dd710e39aab9f01a00d1a6b2068378f1bb1a56b65fabfe3 -EBUILD marrie-0.3.1.ebuild 1282 SHA256 e3948c03e12eb8b7c7943f8246454dd2472f82856c100b2896a4f852c0703c0e SHA512 8a7cb8ebf254b185fb8a69815e1b4036556b7771df0d6191a4046c855f93963c28d1f11fb5d48c27d3dc4dd518aaa582d69d0e970d1ba2eebfd52ba1a79398c3 WHIRLPOOL 0df1311501c35d6dc9037d9f7e437d4193f3347a36f264dbb18c6dc0a83b99c3101251368f61d94c0b182d2c553d1f332ef7acef7c550df1062b316cc528689a -EBUILD marrie-9999.ebuild 1281 SHA256 b9fba7fdda73baf1218fa15a0ed2be2ac313fc2d5b62eff5049c5ff90d8c5b8c SHA512 af30136f5c0ee87fa5a6e15cabcbc7c8c64fe26c573e684f05ba0a64bfefe35ccd682d214e958a0329dda5c3a4557ebd3b362690267ce1c4b7e881cdb78dd1fa WHIRLPOOL e2d1373863484358711659eb0ee6e709945f289a045f198652c6325657a509f1e231115d12dd9df87a95c576203fdc65f87cd5b55c6e8f77ddf2922b572d68ef -MISC ChangeLog 1475 SHA256 e43dd44e314450074f100addc6efdf62ede746051559dda755cb19ef30b51127 SHA512 9b538102b8400a5474f0760348d1f5fd768b8b1514f9eceb55a4bf0fb19d9c38462428f921438b812fc19cd8c7b30637b65ff343a48998b919e8bc625d78a024 WHIRLPOOL 80d2f87b4b3de3255df521a3990c8345b3143c7e923fd934678a0c7b900a35ca88348a46d52ae24acde7979e37ca8ddbe8fac560cc806cc474c54f433c75a821 +EBUILD marrie-0.3.1-r1.ebuild 1289 SHA256 8a39de980cd8a857cb4b62a4aff87499a61ce75e3c65f091b060f123df406b00 SHA512 69f7e1eef88077448ff7aba2f02a286cc796bbd5562fe15a9ec4220ffbeef6870b46015c5a9cfa4a3c7bd7fc1d8d6ffd82f3467aa2b8956b44511a5978d2bd4e WHIRLPOOL 85f560b1daffc945d5596559ea8bd3ede4b11f34c4a70ba52e7518994c82f37200752c8816d3291e790d331ce9a7b8269fa6d129f56ce83ee6c0dc892bafa6a9 +EBUILD marrie-9999.ebuild 1285 SHA256 e970c3ab60a97be7e42e7fc42321e190e9b5f7d1c255238e207ed423cfd7e5d9 SHA512 104952574ada6482836a66aeb5201e90a30b71c80c51ef394d26057de05acc7297ca3f406278bd0f86271f658b3a2a43a6fce360ff27b1582531472265e8a429 WHIRLPOOL 1d6badfb69f214f5eb80d8de44b128096cf570270e7e9cd6ab7f2f57fe890192d3237f4a03373a924aae11f15259c7376e89624f9a7552bc914fff4173db9033 +MISC ChangeLog 1695 SHA256 445c1254bcbe73d4a7d3b817c3062f609b6f39c89e1c948a8f047d73186393ca SHA512 62d35d6d845b30287a3b31c32c8e5cc53d806b671d6ee1d2bf13d49a657781e2c1cbeb9513bf607f9b97c84452623a0a26741a5407a9e3d518ffe9e3cadfab08 WHIRLPOOL 68f870bfa9a17ec88eab060466d50c431e0ead3dc839d0f24205931719cee4f6648373da0bb3db45b79f16568f2e2643753c7dfa97ab897d66c057590b8f83b8 MISC metadata.xml 495 SHA256 987375eceb3e50b6f07cd64365425fba4f77ced4dae4f24e946bc13a5ca5e48f SHA512 5892338666d768f881d7c48f6be08cb7be72e6470b2fddded9237ce6c261337b7f5f396986be36399f3bdd6dde278cbb3c7a8fdf5aa661a95bec31ee97171ead WHIRLPOOL 1dc743e37de363f887c09e81f95b38afb0c64feffd2234359a968675dc7ca489853d52e2576009d3abd778b2601b94347a6a1a8b6ad8956361db88b621cd6291 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQJ8BAEBCABmBQJTuUbFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOcTAP/1e93tKkcho+2tKnnio85nzr -zNkwWkyQOU8yF3gyga0vkmFWAcbkLgrc5pPqvZeX0MKuKIpgS7sndUyKaB44skeU -fcf47KImrdN93Q+R8QOSewGfwTvU98VLjBcgGAneyBkJ0R8rIqYs8HbZZGcr87iN -8OsvLnhqQ8fRXKTwfhzsbcXWJaunhz/LIz0rS7J9Jzdz5L02sEAXMtk5hmskNHaG -HGiWvH1/7y6BEdbRxbF7dTJsf994x+xcnT98Q2S1CuSpNiVssgXRyc547mSHhBF/ -bFOvTYihG+UbMVvyptNoifm300DlolBe8nJaUIhoi8x9IzjesRIQYuxAH86Qf8ze -lPP89+VJ2TmsubEVYkqNr/kcj+6rsJdF7THsOB77JysDs2UUMG1N3bjfFOmcYURD -Gc2J2EsugQEqGC+Zl57Ryza/ypOhaoRhhzOIUJ82jdoYqvjWUhBTGupcqeSNuUd4 -RySn4JAWj6B+pDJbGaKX5P430GXgpSO2sTfQZEqne05+mmIIljClo3t5R89DhEqu -fGLDdS8qM3/fVoCdf+xB+CWa/+pnxBXgL7PBDgsAL9s0CIPqiPuf/u/MBhYB033w -8oAocCo46sv1HaWfqygPOjoDfar62BKMLJ30NLJA32k6hITOSd67XpZiKWPRMgoN -CaBYDL9Zhff2qxAq0+WD -=ZE9X ------END PGP SIGNATURE----- diff --git a/media-sound/marrie/marrie-0.3.1.ebuild b/media-sound/marrie/marrie-0.3.1-r1.ebuild similarity index 64% rename from media-sound/marrie/marrie-0.3.1.ebuild rename to media-sound/marrie/marrie-0.3.1-r1.ebuild index 83ceefb3a04b..f44b29f00ab6 100644 --- a/media-sound/marrie/marrie-0.3.1.ebuild +++ b/media-sound/marrie/marrie-0.3.1-r1.ebuild @@ -1,23 +1,22 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/marrie/marrie-0.3.1.ebuild,v 1.2 2014/07/06 12:53:19 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/marrie/marrie-0.3.1-r1.ebuild,v 1.1 2014/12/04 06:14:45 rafaelmartins Exp $ -EAPI=4 +EAPI=5 -PYTHON_DEPEND="2:2.7" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*" +PYTHON_COMPAT=( python2_7 ) -HG_ECLASS="" +GIT_ECLASS="" if [[ ${PV} = *9999* ]]; then - HG_ECLASS="mercurial" - EHG_REPO_URI="http://hg.rafaelmartins.eng.br/marrie/" + GIT_ECLASS="git-r3" + EGIT_REPO_URI="git://github.com/rafaelmartins/marrie.git + https://github.com/rafaelmartins/marrie.git" fi -inherit distutils ${HG_ECLASS} +inherit distutils-r1 ${GIT_ECLASS} DESCRIPTION="A simple podcast client that runs on the Command Line Interface" -HOMEPAGE="http://projects.rafaelmartins.eng.br/marrie/" +HOMEPAGE="https://github.com/rafaelmartins/marrie" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" KEYWORDS="~amd64 ~x86" @@ -30,28 +29,28 @@ LICENSE="BSD" SLOT="0" IUSE="doc" -RDEPEND="dev-python/feedparser" +RDEPEND=" + dev-python/setuptools + dev-python/feedparser" DEPEND="${RDEPEND} doc? ( dev-python/docutils )" -PYTHON_MODNAME="marrie.py" - src_compile() { - distutils_src_compile + distutils-r1_src_compile if use doc; then rst2html.py README.rst marrie.html || die "rst2html.py failed" fi } src_install() { - distutils_src_install + distutils-r1_src_install if use doc; then dohtml marrie.html fi } pkg_postinst() { - distutils_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" diff --git a/media-sound/marrie/marrie-9999.ebuild b/media-sound/marrie/marrie-9999.ebuild index 2c9b2577cc68..606042c200c6 100644 --- a/media-sound/marrie/marrie-9999.ebuild +++ b/media-sound/marrie/marrie-9999.ebuild @@ -1,23 +1,22 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/marrie/marrie-9999.ebuild,v 1.5 2014/07/06 12:53:19 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/marrie/marrie-9999.ebuild,v 1.6 2014/12/04 06:14:45 rafaelmartins Exp $ -EAPI=4 +EAPI=5 -PYTHON_DEPEND="2:2.7" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*" +PYTHON_COMPAT=( python2_7 ) -HG_ECLASS="" +GIT_ECLASS="" if [[ ${PV} = *9999* ]]; then - HG_ECLASS="mercurial" - EHG_REPO_URI="http://hg.rafaelmartins.eng.br/marrie/" + GIT_ECLASS="git-r3" + EGIT_REPO_URI="git://github.com/rafaelmartins/marrie.git + https://github.com/rafaelmartins/marrie.git" fi -inherit distutils ${HG_ECLASS} +inherit distutils-r1 ${GIT_ECLASS} DESCRIPTION="A simple podcast client that runs on the Command Line Interface" -HOMEPAGE="http://projects.rafaelmartins.eng.br/marrie/" +HOMEPAGE="https://github.com/rafaelmartins/marrie" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" KEYWORDS="~amd64 ~x86" @@ -30,28 +29,28 @@ LICENSE="BSD" SLOT="0" IUSE="doc" -RDEPEND="dev-python/feedparser" +RDEPEND=" + dev-python/setuptools + dev-python/feedparser" DEPEND="${RDEPEND} doc? ( dev-python/docutils )" -PYTHON_MODNAME="marrie.py" - src_compile() { - distutils_src_compile + distutils-r1_src_compile if use doc; then rst2html.py README.rst marrie.html || die "rst2html.py failed" fi } src_install() { - distutils_src_install + distutils-r1_src_install if use doc; then dohtml marrie.html fi } pkg_postinst() { - distutils_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" -- 2.26.2