From 05baf16b2b8430387e3822c3779a087dd242a5fd Mon Sep 17 00:00:00 2001
From: ScardracS <marco@scardovi.com>
Date: Tue, 27 Apr 2021 12:59:31 +0200
Subject: [PATCH] app-editors/bluegriffon-bin: various fixes

Closes: https://bugs.gentoo.org/780618
Closes: https://bugs.gentoo.org/780621

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Marco Scardovi <marco@scardovi.com>
---
 ...1.ebuild => bluegriffon-bin-3.1-r1.ebuild} | 70 +++++++++++--------
 app-editors/bluegriffon-bin/metadata.xml      |  5 +-
 2 files changed, 44 insertions(+), 31 deletions(-)
 rename app-editors/bluegriffon-bin/{bluegriffon-bin-3.1.ebuild => bluegriffon-bin-3.1-r1.ebuild} (81%)

diff --git a/app-editors/bluegriffon-bin/bluegriffon-bin-3.1.ebuild b/app-editors/bluegriffon-bin/bluegriffon-bin-3.1-r1.ebuild
similarity index 81%
rename from app-editors/bluegriffon-bin/bluegriffon-bin-3.1.ebuild
rename to app-editors/bluegriffon-bin/bluegriffon-bin-3.1-r1.ebuild
index 6333b1b665..acaa5bddbc 100644
--- a/app-editors/bluegriffon-bin/bluegriffon-bin-3.1.ebuild
+++ b/app-editors/bluegriffon-bin/bluegriffon-bin-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,51 +9,61 @@ DESCRIPTION="The Open Source next-gen Web Editor based on the rendering engine o
 HOMEPAGE="https://github.com/therealglazou/bluegriffon http://www.bluegriffon.org/"
 SRC_URI="http://bluegriffon.org/freshmeat/${PV}/bluegriffon-${PV}.Ubuntu18.04-x86_64.tar.bz2 -> ${P}.tar.bz2
 http://bluegriffon.org/BG_files/bluegriffon.png -> ${PN}.png"
+
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
+
 S="${WORKDIR}/bluegriffon/"
 XDG_ECLASS_DESKTOPFILES="${FILESDIR}"
 XDG_ECLASS_ICONFILES="${FILESDIR}"
 
-BUNDLED_DEPEND="dev-libs/nspr
-		dev-libs/nss"
-DEPEND=">=sys-libs/glibc-2.30-r8"
-RDEPEND="${DEPEND}
+BUNDLED_DEPEND="
+	dev-libs/nspr
+	dev-libs/nss
+"
+
+DEPEND="sys-libs/glibc"
+
+RDEPEND="
+	${DEPEND}
 	${BUNDLED_DEPEND}
-	x11-libs/gtk+:2
-	virtual/opengl
-	x11-libs/cairo
-	x11-libs/pango
-	dev-libs/gobject-introspection
-	x11-libs/libxcb
-	x11-libs/libXrender
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	media-libs/freetype
-	x11-libs/libxcb
-	x11-libs/pixman
-	media-libs/libpng:0/16
-	sys-apps/util-linux
-	media-libs/harfbuzz:0/0.9.18
+	dev-libs/dbus-glib
+	dev-libs/expat
 	dev-libs/fribidi
+	dev-libs/gobject-introspection
+	dev-libs/libbsd
 	dev-libs/libffi:0/7
 	dev-libs/libpcre
-	dev-libs/expat
 	media-gfx/graphite2
-	dev-libs/libbsd"
-BDEPEND=""
+	media-libs/freetype
+	media-libs/harfbuzz:0/0.9.18
+	media-libs/libpng:0/16
+	sys-apps/util-linux
+	virtual/opengl
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+	x11-libs/pixman
+"
+
+QA_PREBUILT="/opt/bluegriffon/*"
 
 src_install() {
 	dodir /opt/bluegriffon
-	cp -ap "${S}"/* "${D}"/opt/bluegriffon/
+	cp -ap "${S}"/* "${ED}"/opt/bluegriffon/ || die
 	dosym ../../opt/bluegriffon/bluegriffon-bin /usr/bin/bluegriffon-bin
 	doicon "${DISTDIR}/bluegriffon-bin.png"
 	domenu "${FILESDIR}/bluegriffon-bin.desktop"
diff --git a/app-editors/bluegriffon-bin/metadata.xml b/app-editors/bluegriffon-bin/metadata.xml
index 2b27a4eb9b..563fa6d813 100644
--- a/app-editors/bluegriffon-bin/metadata.xml
+++ b/app-editors/bluegriffon-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
 	<longdescription lang="en">BlueGriffon
 		The next-gen Web and EPUB Editor based on the rendering engine of Firefox