commit: d76c33479e3c73502d0c792a9e6a166bf3952c65 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Fri Jun 2 17:28:02 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri Jun 2 17:28:02 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d76c3347
app-misc/grabcartoons: [QA] Use proper distfile name Bug: https://bugs.gentoo.org/show_bug.cgi?id=619888 Package-Manager: Portage-2.3.6, Repoman-2.3.2 app-misc/grabcartoons/Manifest | 2 +- .../grabcartoons-2.8.4_p20141112.ebuild | 30 ++++++++++-------- app-misc/grabcartoons/grabcartoons-9999.ebuild | 37 +++++++++++----------- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/app-misc/grabcartoons/Manifest b/app-misc/grabcartoons/Manifest index 0c0b9017f20..1f9b0dd635b 100644 --- a/app-misc/grabcartoons/Manifest +++ b/app-misc/grabcartoons/Manifest @@ -1 +1 @@ -DIST cb230f01fb288a0b9f0fc437545b97d06c846bd3.tar.gz 40998 SHA256 4cb1061ff66540d8b9fe5ef470cdf55ba3e458fd136d59250a626eb4f29d519c SHA512 6de81d151414ccbb7b00c2f472f0d811a7024c67a3c4bdc929babf2ff8990280ba1fde0851e4405dbc487c58e99f13a1dd07a0cd202099f6289dd0ed61296ee5 WHIRLPOOL b52c5e1b786dc2073f70c46e1a7a16d89ef586aa42456466466c5bff9e39f27a74c471c41a5682950563f1f7ff93669b8bd285d3642d66ed46a593c3f96e6a59 +DIST grabcartoons-2.8.4_p20141112.tar.gz 40998 SHA256 4cb1061ff66540d8b9fe5ef470cdf55ba3e458fd136d59250a626eb4f29d519c SHA512 6de81d151414ccbb7b00c2f472f0d811a7024c67a3c4bdc929babf2ff8990280ba1fde0851e4405dbc487c58e99f13a1dd07a0cd202099f6289dd0ed61296ee5 WHIRLPOOL b52c5e1b786dc2073f70c46e1a7a16d89ef586aa42456466466c5bff9e39f27a74c471c41a5682950563f1f7ff93669b8bd285d3642d66ed46a593c3f96e6a59 diff --git a/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild b/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild index 0dd1a1b2aa7..77fbcd8f86b 100644 --- a/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild +++ b/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild @@ -1,29 +1,33 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/zzamboni/grabcartoons.git"; +else + inherit vcs-snapshot + SRC_URI="https://github.com/zzamboni/grabcartoons/archive/cb230f01fb288a0b9f0fc437545b97d06c846bd3.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + DESCRIPTION="Comic-summarizing utility" HOMEPAGE="http://zzamboni.org/grabcartoons"; -EGIT_COMMIT="cb230f01fb288a0b9f0fc437545b97d06c846bd3" -SRC_URI="https://github.com/zzamboni/grabcartoons/archive/cb230f01fb288a0b9f0fc437545b97d06c846bd3.tar.gz"; -KEYWORDS="~amd64 ~x86" + LICENSE="BSD" SLOT="0" +IUSE="" +# Opens a web page, which is unacceptable during an emerge. +RESTRICT="test" RDEPEND=" dev-lang/perl virtual/perl-Getopt-Long" -# Opens a web page, which is unacceptable during an emerge. -RESTRICT="test" -S="${WORKDIR}/${PN}-${EGIT_COMMIT}" - -PATCHES=( - "${FILESDIR}"/2.8.4-fix-install-paths.patch - ) +PATCHES=( "${FILESDIR}"/2.8.4-fix-install-paths.patch ) src_install() { - emake PREFIX="${ED}"usr install - dodoc ChangeLog README + emake PREFIX="${ED%/}"/usr install + einstalldocs } diff --git a/app-misc/grabcartoons/grabcartoons-9999.ebuild b/app-misc/grabcartoons/grabcartoons-9999.ebuild index 06e1dd33181..77fbcd8f86b 100644 --- a/app-misc/grabcartoons/grabcartoons-9999.ebuild +++ b/app-misc/grabcartoons/grabcartoons-9999.ebuild @@ -1,34 +1,33 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit eutils git-r3 +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/zzamboni/grabcartoons.git"; +else + inherit vcs-snapshot + SRC_URI="https://github.com/zzamboni/grabcartoons/archive/cb230f01fb288a0b9f0fc437545b97d06c846bd3.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi DESCRIPTION="Comic-summarizing utility" HOMEPAGE="http://zzamboni.org/grabcartoons"; -EGIT_REPO_URI="https://github.com/zzamboni/grabcartoons.git"; - -if [[ "${PV}" != "9999" ]] ; then - KEYWORDS="~amd64 ~x86" - #EGIT_COMMIT="" -fi - LICENSE="BSD" SLOT="0" - -RDEPEND="dev-lang/perl - virtual/perl-Getopt-Long" - +IUSE="" # Opens a web page, which is unacceptable during an emerge. RESTRICT="test" -src_prepare() { - epatch "${FILESDIR}"/2.8.4-fix-install-paths.patch -} +RDEPEND=" + dev-lang/perl + virtual/perl-Getopt-Long" + +PATCHES=( "${FILESDIR}"/2.8.4-fix-install-paths.patch ) src_install() { - emake PREFIX="${ED}"/usr install - dodoc ChangeLog README + emake PREFIX="${ED%/}"/usr install + einstalldocs }
