From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 23 Sep 2020 10:22:15 +0100
Subject: gentoo resync : 23.09.2020

---
 www-apps/blazeblogger/Manifest                     |  3 +-
 www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild | 35 ++++++++++++----------
 .../files/blazeblogger-1.2.0-makefile.patch        | 11 +++++++
 3 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 www-apps/blazeblogger/files/blazeblogger-1.2.0-makefile.patch

(limited to 'www-apps/blazeblogger')

diff --git a/www-apps/blazeblogger/Manifest b/www-apps/blazeblogger/Manifest
index 2b73ddac32ee..5ada1c114f30 100644
--- a/www-apps/blazeblogger/Manifest
+++ b/www-apps/blazeblogger/Manifest
@@ -1,5 +1,6 @@
 AUX blazeblogger-1.2.0-bash-completion.patch 2058 BLAKE2B 461fc806002d2c6075248c3291f6f6f0d68674a2ea9b85a9ded5182dfd86403e72978000cb8c3c84d583ef6137a919b8093f4ee812946405bddd8a68287ecd3e SHA512 f69b75f16f87c3cf7e16765eb6f237a6c32a046244770b457a94a189a9d2e612933907dc43143a86167252b0a51280eab045fd3e9bf92a00cfe3519393ed9db2
+AUX blazeblogger-1.2.0-makefile.patch 305 BLAKE2B 23ec7554251a0c072c0d02fb9d754d4223423b8c3ab4cc1cfe8d29e8ef37dd8552abade0276af7ca8f3cdb6ce58f00c1350f0345c792309d1ee3128079325b7f SHA512 2ffc851a571e0b25d2f257772aa4bee4ccabe86acadb1fbea1f7ef03cce32225e1a804b259a8cdc9431774eee856d33935290eff482667a08a432122fae2a0fb
 DIST blazeblogger-1.2.0.tar.gz 81340 BLAKE2B 08415245ea7114ecfad7f5817eae4c2a9216178b7ec7ffdd5e72dc9467853dcecce71612c40e0395f88a3358d67e63eaf47cfecf7b84e8e832eff05deaba5406 SHA512 c0fb7d3493933e405c78e871baa0eba7bbf6245d98174ae1f80d215bc413a836a0872fef067ca0622bbb155b54d90e7e81d99e6d10e93aec3bce098677a827bd
 DIST blazeblogger-doc-1.2.0.tar.gz 191467 BLAKE2B 501981679a16b3cd592b6f2fd55c2d8192944106b507ce3119828a3266fe27d49e18887cabb072cece273475b1ccb2321e043195276e53bcb651317839655cd7 SHA512 135d77ae30fa090207cf1147188ceb3552582fcba28d548ed8b104d86d0cff1beb6a3209e4e7cc8984f698e927ab96437254277d96b9dff371d90866c5657989
-EBUILD blazeblogger-1.2.0-r1.ebuild 822 BLAKE2B 02d0fa7f918d0d1e534d629bfc4c2d67eee2bd23c2b953a00c9c8b53e82a1dad5960813b486ac0d37cc7fba34c2d171081d57a296229edff3fd136b9c4177f87 SHA512 21c6bd49895658dc2bb1e7c2c6d05c744ba01a955c0e3dd61a4a5f2ec723d33b66c06f856a754b541aea78a5d8de9f907ee45105a1cb62530bf36e9e175ad809
+EBUILD blazeblogger-1.2.0-r1.ebuild 849 BLAKE2B d580fab40dcd4a658c4130460c8732fa6f32d68c60510a3c05560b2968ba319161eb06b2e186276efa02d7cba32fa29657ecf9340a1e170a71309e19a52e12e6 SHA512 68a5a2adaf12feaf3beddedf77e7f7e29c716c52c710d4e10da3a08478d91a169d4be260993ddf64a3fb851182fa7e9c97d1a28658d177ae941fd7c9ed63d20f
 MISC metadata.xml 249 BLAKE2B 91cbef2ed101800f4cf8640ce7e6eccabbea893a436b81fbcf7a4d79914b80390e9ad90811eaac53a05f8a45eceeb939f32fff9b41bf9f086a0f51ccfe1f6e16 SHA512 276f06c4a1bea09c70d260c03dc673a0e0826484806b084761ed6f98506f37b551a84ff6a6b293988df9d29ad30f207bdf4206b666dcdd5286415fea1257480d
diff --git a/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild b/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild
index 798b095bb8bc..0c268da869c0 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 000000000000..6fde1018c2d2
--- /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)
-- 
cgit v1.2.3