commit: c125919714144c2ccc6612c5e6ae4eeaddd1c2bf Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Thu Sep 17 15:36:30 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Sep 17 15:36:30 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1259197
www-apps/blazeblogger: Port to EAPI 7 Closes: https://bugs.gentoo.org/474030 Closes: https://bugs.gentoo.org/481164 Closes: https://bugs.gentoo.org/740910 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: David Seifert <soap <AT> gentoo.org> www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild | 35 ++++++++++++---------- .../files/blazeblogger-1.2.0-makefile.patch | 11 +++++++ 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild b/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild index 798b095bb8b..0c268da869c 100644 --- a/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild +++ b/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -inherit eutils +inherit bash-completion-r1 DESCRIPTION="Simple, capable content management system for producing static content" HOMEPAGE="http://blaze.blackened.cz/"; -SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz +SRC_URI=" + https://${PN}.googlecode.com/files/${P}.tar.gz doc? ( https://${PN}.googlecode.com/files/${PN}-doc-${PV}.tar.gz ) " LICENSE="FDL-1.3 GPL-3" @@ -18,17 +19,21 @@ IUSE="doc" RDEPEND="dev-lang/perl" DEPEND="${RDEPEND}" -src_prepare() { - sed -e '/-m 644 COPYING/d' \ - -e '/-m 644 INSTALL/d' \ - -i Makefile || die - - epatch "${FILESDIR}"/${P}-bash-completion.patch #bug 417953 -} +PATCHES=( + "${FILESDIR}"/${P}-bash-completion.patch #bug 417953 + "${FILESDIR}"/${P}-makefile.patch +) src_install() { - emake prefix="${D}/usr" config="${D}/etc" \ - compdir="${D}/usr/share/bash-completion" install - - use doc && dohtml -r "${WORKDIR}"/${PN}-doc-${PV}/* + emake \ + prefix="${ED}"/usr \ + config="${ED}"/etc \ + compdir="${D}"/$(get_bashcompdir) \ + docsdir="${ED}"/usr/share/doc/${PF} \ + install + + if use doc; then + docinto html + dodoc -r "${WORKDIR}"/${PN}-doc-${PV}/. + fi } diff --git a/www-apps/blazeblogger/files/blazeblogger-1.2.0-makefile.patch b/www-apps/blazeblogger/files/blazeblogger-1.2.0-makefile.patch new file mode 100644 index 00000000000..6fde1018c2d --- /dev/null +++ b/www-apps/blazeblogger/files/blazeblogger-1.2.0-makefile.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -84,8 +84,6 @@ + $(INSTALL) -m 644 TODO $(docsdir) + $(INSTALL) -m 644 README $(docsdir) + $(INSTALL) -m 644 AUTHORS $(docsdir) +- $(INSTALL) -m 644 COPYING $(docsdir) +- $(INSTALL) -m 644 INSTALL $(docsdir) + -$(INSTALL) -m 644 ChangeLog $(docsdir) + + install_man: $(MAN1)
