diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2020-02-02 22:02:57 +0200 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2020-02-02 22:05:28 +0200 |
| commit | 510124e09d078b6fbdc4a92b8026fad768b357af (patch) | |
| tree | 6ec7cd962f41146a5943f1b7fb5939b5dd92911f | |
| parent | x11-misc/xscreensaver: More stable (diff) | |
| download | gentoo-510124e0.tar.gz gentoo-510124e0.tar.bz2 gentoo-510124e0.zip | |
gnome-extra/gtkhtml: use app-text/enchant:2 and ebuild fixups
The patching was done bad, calling default instead of gnome2_src_prepare;
use GNOME2_EAUTORECONF="yes" instead to work in correct order as well.
Also remove the now unnecessary -r1 p.mask (-r2 is not masked on purpose,
as it's now ready to enter ~arch as enchant:2 is not p.masked)
Closes: https://bugs.gentoo.org/660720
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
| -rw-r--r-- | gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild (renamed from gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild) | 12 | ||||
| -rw-r--r-- | profiles/package.mask | 4 |
2 files changed, 4 insertions, 12 deletions
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild index 5479d9c941b7..aefd78f80c09 100644 --- a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild +++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" +GNOME2_EAUTORECONF="yes" -inherit autotools gnome2 +inherit gnome2 DESCRIPTION="Lightweight HTML rendering/printing/editing engine" HOMEPAGE="https://gitlab.gnome.org/Archive/gtkhtml" @@ -18,7 +19,7 @@ RDEPEND=" >=x11-libs/gtk+-3.2:3 >=x11-libs/cairo-1.10:= x11-libs/pango - >=app-text/enchant-2.0.0 + app-text/enchant:2 gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.49 >=net-libs/libsoup-2.26.0:2.4 @@ -35,11 +36,6 @@ PATCHES=( "${FILESDIR}"/enchant-2.patch ) -src_prepare() { - default - eautoreconf -} - src_configure() { gnome2_src_configure --disable-static } diff --git a/profiles/package.mask b/profiles/package.mask index 23b51a11ac06..7c4813783c6d 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1051,10 +1051,6 @@ x11-drivers/xf86-video-voodoo # Mask experimental software =mail-mta/postfix-3.5* -# Dennis Lamm <expeditioneer@gentoo.org> (2019-01-29) -# Depends on >=app-text/enchant-2.0.0 which is masked -=gnome-extra/gtkhtml-4.10.0-r1 - # Dennis Lamm <expeditioneer@gentoo.org> (2019-01-28) # Depends on >=app-text/enchant-2.0.0 which is masked >=app-text/gtkspell-3.0.10 |