Gentoo Archives: gentoo-commits

From: Theo Anderson <telans@××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: app-editors/bluegriffon-bin/
Date: Tue, 27 Apr 2021 23:24:26
Message-Id: 1619523537.05baf16b2b8430387e3822c3779a087dd242a5fd.telans@gentoo
1 commit: 05baf16b2b8430387e3822c3779a087dd242a5fd
2 Author: ScardracS <marco <AT> scardovi <DOT> com>
3 AuthorDate: Tue Apr 27 10:59:31 2021 +0000
4 Commit: Theo Anderson <telans <AT> posteo <DOT> de>
5 CommitDate: Tue Apr 27 11:38:57 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=05baf16b
7
8 app-editors/bluegriffon-bin: various fixes
9
10 Closes: https://bugs.gentoo.org/780618
11 Closes: https://bugs.gentoo.org/780621
12
13 Package-Manager: Portage-3.0.18, Repoman-3.0.3
14 Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>
15
16 ...in-3.1.ebuild => bluegriffon-bin-3.1-r1.ebuild} | 64 +++++++++++++---------
17 app-editors/bluegriffon-bin/metadata.xml | 5 +-
18 2 files changed, 41 insertions(+), 28 deletions(-)
19
20 diff --git a/app-editors/bluegriffon-bin/bluegriffon-bin-3.1.ebuild b/app-editors/bluegriffon-bin/bluegriffon-bin-3.1-r1.ebuild
21 similarity index 81%
22 rename from app-editors/bluegriffon-bin/bluegriffon-bin-3.1.ebuild
23 rename to app-editors/bluegriffon-bin/bluegriffon-bin-3.1-r1.ebuild
24 index 6333b1b66..acaa5bddb 100644
25 --- a/app-editors/bluegriffon-bin/bluegriffon-bin-3.1.ebuild
26 +++ b/app-editors/bluegriffon-bin/bluegriffon-bin-3.1-r1.ebuild
27 @@ -1,4 +1,4 @@
28 -# Copyright 1999-2020 Gentoo Authors
29 +# Copyright 1999-2021 Gentoo Authors
30 # Distributed under the terms of the GNU General Public License v2
31
32 EAPI=7
33 @@ -9,51 +9,61 @@ DESCRIPTION="The Open Source next-gen Web Editor based on the rendering engine o
34 HOMEPAGE="https://github.com/therealglazou/bluegriffon http://www.bluegriffon.org/"
35 SRC_URI="http://bluegriffon.org/freshmeat/${PV}/bluegriffon-${PV}.Ubuntu18.04-x86_64.tar.bz2 -> ${P}.tar.bz2
36 http://bluegriffon.org/BG_files/bluegriffon.png -> ${PN}.png"
37 +
38 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
39 SLOT="0"
40 KEYWORDS="~amd64"
41 IUSE=""
42 +
43 S="${WORKDIR}/bluegriffon/"
44 XDG_ECLASS_DESKTOPFILES="${FILESDIR}"
45 XDG_ECLASS_ICONFILES="${FILESDIR}"
46
47 -BUNDLED_DEPEND="dev-libs/nspr
48 - dev-libs/nss"
49 -DEPEND=">=sys-libs/glibc-2.30-r8"
50 -RDEPEND="${DEPEND}
51 +BUNDLED_DEPEND="
52 + dev-libs/nspr
53 + dev-libs/nss
54 +"
55 +
56 +DEPEND="sys-libs/glibc"
57 +
58 +RDEPEND="
59 + ${DEPEND}
60 ${BUNDLED_DEPEND}
61 - x11-libs/gtk+:2
62 + dev-libs/dbus-glib
63 + dev-libs/expat
64 + dev-libs/fribidi
65 + dev-libs/gobject-introspection
66 + dev-libs/libbsd
67 + dev-libs/libffi:0/7
68 + dev-libs/libpcre
69 + media-gfx/graphite2
70 + media-libs/freetype
71 + media-libs/harfbuzz:0/0.9.18
72 + media-libs/libpng:0/16
73 + sys-apps/util-linux
74 virtual/opengl
75 x11-libs/cairo
76 - x11-libs/pango
77 - dev-libs/gobject-introspection
78 + x11-libs/gtk+:3
79 + x11-libs/libXau
80 x11-libs/libxcb
81 - x11-libs/libXrender
82 - x11-libs/libXi
83 - x11-libs/libXrandr
84 - x11-libs/libXcursor
85 x11-libs/libXcomposite
86 + x11-libs/libXcursor
87 x11-libs/libXdamage
88 - x11-libs/libXext
89 - x11-libs/libXau
90 x11-libs/libXdmcp
91 - media-libs/freetype
92 - x11-libs/libxcb
93 + x11-libs/libXext
94 + x11-libs/libXi
95 + x11-libs/libXrandr
96 + x11-libs/libXrender
97 + x11-libs/libXt
98 + x11-libs/pango
99 x11-libs/pixman
100 - media-libs/libpng:0/16
101 - sys-apps/util-linux
102 - media-libs/harfbuzz:0/0.9.18
103 - dev-libs/fribidi
104 - dev-libs/libffi:0/7
105 - dev-libs/libpcre
106 - dev-libs/expat
107 - media-gfx/graphite2
108 - dev-libs/libbsd"
109 -BDEPEND=""
110 +"
111 +
112 +QA_PREBUILT="/opt/bluegriffon/*"
113
114 src_install() {
115 dodir /opt/bluegriffon
116 - cp -ap "${S}"/* "${D}"/opt/bluegriffon/
117 + cp -ap "${S}"/* "${ED}"/opt/bluegriffon/ || die
118 dosym ../../opt/bluegriffon/bluegriffon-bin /usr/bin/bluegriffon-bin
119 doicon "${DISTDIR}/bluegriffon-bin.png"
120 domenu "${FILESDIR}/bluegriffon-bin.desktop"
121
122 diff --git a/app-editors/bluegriffon-bin/metadata.xml b/app-editors/bluegriffon-bin/metadata.xml
123 index 2b27a4eb9..563fa6d81 100644
124 --- a/app-editors/bluegriffon-bin/metadata.xml
125 +++ b/app-editors/bluegriffon-bin/metadata.xml
126 @@ -1,7 +1,10 @@
127 <?xml version="1.0" encoding="UTF-8"?>
128 <!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
129 <pkgmetadata>
130 - <!-- maintainer-needed -->
131 + <maintainer type="person">
132 + <email>marco@××××××××.com</email>
133 + <name>Marco Scardovi</name>
134 + </maintainer>
135 <longdescription lang="en">BlueGriffon
136 The next-gen Web and EPUB Editor based on the rendering engine of Firefox