| 1 |
commit: 510124e09d078b6fbdc4a92b8026fad768b357af |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 2 20:02:57 2020 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 2 20:05:28 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=510124e0 |
| 7 |
|
| 8 |
gnome-extra/gtkhtml: use app-text/enchant:2 and ebuild fixups |
| 9 |
|
| 10 |
The patching was done bad, calling default instead of gnome2_src_prepare; |
| 11 |
use GNOME2_EAUTORECONF="yes" instead to work in correct order as well. |
| 12 |
Also remove the now unnecessary -r1 p.mask (-r2 is not masked on purpose, |
| 13 |
as it's now ready to enter ~arch as enchant:2 is not p.masked) |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/660720 |
| 16 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 17 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
| 18 |
|
| 19 |
.../{gtkhtml-4.10.0-r1.ebuild => gtkhtml-4.10.0-r2.ebuild} | 12 ++++-------- |
| 20 |
profiles/package.mask | 4 ---- |
| 21 |
2 files changed, 4 insertions(+), 12 deletions(-) |
| 22 |
|
| 23 |
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild |
| 24 |
similarity index 87% |
| 25 |
rename from gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild |
| 26 |
rename to gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild |
| 27 |
index 5479d9c941b..aefd78f80c0 100644 |
| 28 |
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild |
| 29 |
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild |
| 30 |
@@ -1,9 +1,10 @@ |
| 31 |
-# Copyright 1999-2019 Gentoo Authors |
| 32 |
+# Copyright 1999-2020 Gentoo Authors |
| 33 |
# Distributed under the terms of the GNU General Public License v2 |
| 34 |
|
| 35 |
EAPI="6" |
| 36 |
+GNOME2_EAUTORECONF="yes" |
| 37 |
|
| 38 |
-inherit autotools gnome2 |
| 39 |
+inherit gnome2 |
| 40 |
|
| 41 |
DESCRIPTION="Lightweight HTML rendering/printing/editing engine" |
| 42 |
HOMEPAGE="https://gitlab.gnome.org/Archive/gtkhtml" |
| 43 |
@@ -18,7 +19,7 @@ RDEPEND=" |
| 44 |
>=x11-libs/gtk+-3.2:3 |
| 45 |
>=x11-libs/cairo-1.10:= |
| 46 |
x11-libs/pango |
| 47 |
- >=app-text/enchant-2.0.0 |
| 48 |
+ app-text/enchant:2 |
| 49 |
gnome-base/gsettings-desktop-schemas |
| 50 |
>=app-text/iso-codes-0.49 |
| 51 |
>=net-libs/libsoup-2.26.0:2.4 |
| 52 |
@@ -35,11 +36,6 @@ PATCHES=( |
| 53 |
"${FILESDIR}"/enchant-2.patch |
| 54 |
) |
| 55 |
|
| 56 |
-src_prepare() { |
| 57 |
- default |
| 58 |
- eautoreconf |
| 59 |
-} |
| 60 |
- |
| 61 |
src_configure() { |
| 62 |
gnome2_src_configure --disable-static |
| 63 |
} |
| 64 |
|
| 65 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 66 |
index 23b51a11ac0..7c4813783c6 100644 |
| 67 |
--- a/profiles/package.mask |
| 68 |
+++ b/profiles/package.mask |
| 69 |
@@ -1051,10 +1051,6 @@ x11-drivers/xf86-video-voodoo |
| 70 |
# Mask experimental software |
| 71 |
=mail-mta/postfix-3.5* |
| 72 |
|
| 73 |
-# Dennis Lamm <expeditioneer@g.o> (2019-01-29) |
| 74 |
-# Depends on >=app-text/enchant-2.0.0 which is masked |
| 75 |
-=gnome-extra/gtkhtml-4.10.0-r1 |
| 76 |
- |
| 77 |
# Dennis Lamm <expeditioneer@g.o> (2019-01-28) |
| 78 |
# Depends on >=app-text/enchant-2.0.0 which is masked |
| 79 |
>=app-text/gtkspell-3.0.10 |
Archives