| 1 |
commit: c125919714144c2ccc6612c5e6ae4eeaddd1c2bf |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 17 15:36:30 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 17 15:36:30 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1259197 |
| 7 |
|
| 8 |
www-apps/blazeblogger: Port to EAPI 7 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/474030 |
| 11 |
Closes: https://bugs.gentoo.org/481164 |
| 12 |
Closes: https://bugs.gentoo.org/740910 |
| 13 |
Package-Manager: Portage-3.0.7, Repoman-3.0.1 |
| 14 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 15 |
|
| 16 |
www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild | 35 ++++++++++++---------- |
| 17 |
.../files/blazeblogger-1.2.0-makefile.patch | 11 +++++++ |
| 18 |
2 files changed, 31 insertions(+), 15 deletions(-) |
| 19 |
|
| 20 |
diff --git a/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild b/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild |
| 21 |
index 798b095bb8b..0c268da869c 100644 |
| 22 |
--- a/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild |
| 23 |
+++ b/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild |
| 24 |
@@ -1,13 +1,14 @@ |
| 25 |
-# Copyright 1999-2013 Gentoo Foundation |
| 26 |
+# Copyright 1999-2020 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
-EAPI=4 |
| 30 |
+EAPI=7 |
| 31 |
|
| 32 |
-inherit eutils |
| 33 |
+inherit bash-completion-r1 |
| 34 |
|
| 35 |
DESCRIPTION="Simple, capable content management system for producing static content" |
| 36 |
HOMEPAGE="http://blaze.blackened.cz/" |
| 37 |
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz |
| 38 |
+SRC_URI=" |
| 39 |
+ https://${PN}.googlecode.com/files/${P}.tar.gz |
| 40 |
doc? ( https://${PN}.googlecode.com/files/${PN}-doc-${PV}.tar.gz ) " |
| 41 |
|
| 42 |
LICENSE="FDL-1.3 GPL-3" |
| 43 |
@@ -18,17 +19,21 @@ IUSE="doc" |
| 44 |
RDEPEND="dev-lang/perl" |
| 45 |
DEPEND="${RDEPEND}" |
| 46 |
|
| 47 |
-src_prepare() { |
| 48 |
- sed -e '/-m 644 COPYING/d' \ |
| 49 |
- -e '/-m 644 INSTALL/d' \ |
| 50 |
- -i Makefile || die |
| 51 |
- |
| 52 |
- epatch "${FILESDIR}"/${P}-bash-completion.patch #bug 417953 |
| 53 |
-} |
| 54 |
+PATCHES=( |
| 55 |
+ "${FILESDIR}"/${P}-bash-completion.patch #bug 417953 |
| 56 |
+ "${FILESDIR}"/${P}-makefile.patch |
| 57 |
+) |
| 58 |
|
| 59 |
src_install() { |
| 60 |
- emake prefix="${D}/usr" config="${D}/etc" \ |
| 61 |
- compdir="${D}/usr/share/bash-completion" install |
| 62 |
- |
| 63 |
- use doc && dohtml -r "${WORKDIR}"/${PN}-doc-${PV}/* |
| 64 |
+ emake \ |
| 65 |
+ prefix="${ED}"/usr \ |
| 66 |
+ config="${ED}"/etc \ |
| 67 |
+ compdir="${D}"/$(get_bashcompdir) \ |
| 68 |
+ docsdir="${ED}"/usr/share/doc/${PF} \ |
| 69 |
+ install |
| 70 |
+ |
| 71 |
+ if use doc; then |
| 72 |
+ docinto html |
| 73 |
+ dodoc -r "${WORKDIR}"/${PN}-doc-${PV}/. |
| 74 |
+ fi |
| 75 |
} |
| 76 |
|
| 77 |
diff --git a/www-apps/blazeblogger/files/blazeblogger-1.2.0-makefile.patch b/www-apps/blazeblogger/files/blazeblogger-1.2.0-makefile.patch |
| 78 |
new file mode 100644 |
| 79 |
index 00000000000..6fde1018c2d |
| 80 |
--- /dev/null |
| 81 |
+++ b/www-apps/blazeblogger/files/blazeblogger-1.2.0-makefile.patch |
| 82 |
@@ -0,0 +1,11 @@ |
| 83 |
+--- a/Makefile |
| 84 |
++++ b/Makefile |
| 85 |
+@@ -84,8 +84,6 @@ |
| 86 |
+ $(INSTALL) -m 644 TODO $(docsdir) |
| 87 |
+ $(INSTALL) -m 644 README $(docsdir) |
| 88 |
+ $(INSTALL) -m 644 AUTHORS $(docsdir) |
| 89 |
+- $(INSTALL) -m 644 COPYING $(docsdir) |
| 90 |
+- $(INSTALL) -m 644 INSTALL $(docsdir) |
| 91 |
+ -$(INSTALL) -m 644 ChangeLog $(docsdir) |
| 92 |
+ |
| 93 |
+ install_man: $(MAN1) |
Archives