commit: 510124e09d078b6fbdc4a92b8026fad768b357af Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Sun Feb 2 20:02:57 2020 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Sun Feb 2 20:05:28 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=510124e0
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 <AT> gentoo.org> .../{gtkhtml-4.10.0-r1.ebuild => gtkhtml-4.10.0-r2.ebuild} | 12 ++++-------- 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 similarity index 87% rename from gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild rename to gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild index 5479d9c941b..aefd78f80c0 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 23b51a11ac0..7c4813783c6 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 <[email protected]> (2019-01-29) -# Depends on >=app-text/enchant-2.0.0 which is masked -=gnome-extra/gtkhtml-4.10.0-r1 - # Dennis Lamm <[email protected]> (2019-01-28) # Depends on >=app-text/enchant-2.0.0 which is masked >=app-text/gtkspell-3.0.10
