commit: 2dd950f3b6fd796720ee4bb3921b9acb57f4ad44
parent: 0df8d93a347b88475f22095c189235128c3ac030
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Tue, 27 Aug 2019 05:27:29 +0200
dev-util/gtk-doc{,-am}: Merge gtk-doc-am into gtk-doc
Diffstat:
2 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
@@ -1,25 +1,16 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-GNOME_ORG_MODULE="gtk-doc"
-PYTHON_COMPAT=( python3_{5,6,7} )
+EAPI=7
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Automake files from gtk-doc"
+DESCRIPTION="Virtual ebuild for ::gentoo compatibility"
HOMEPAGE="https://www.gtk.org/gtk-doc/"
-
-LICENSE="GPL-2 FDL-1.1"
+LICENSE="Public-Domain"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- !<dev-util/gtk-doc-${GNOME_ORG_PVP}
-"
-# This ebuild doesn't even compile anything, causing tests to fail when updating (bug #316071)
+RDEPEND="dev-util/gtk-doc"
+DEPEND="${RDEPEND}"
RESTRICT="test"
src_compile() {
@@ -27,9 +18,5 @@ src_compile() {
}
src_install() {
- python_fix_shebang gtkdoc-rebase
- dobin gtkdoc-rebase
-
- insinto /usr/share/aclocal
- doins gtk-doc.m4
+ :
}
diff --git a/dev-util/gtk-doc/gtk-doc-1.32.ebuild b/dev-util/gtk-doc/gtk-doc-1.32.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
LICENSE="GPL-2 FDL-1.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="debug doc emacs pdf test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -72,10 +72,6 @@ src_install() {
python_fix_shebang "${ED}"/usr/bin/
- # Don't install those files, they are in gtk-doc-am now
- rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
- rm "${ED}"/usr/bin/gtkdoc-rebase || die "failed to remove gtkdoc-rebase"
-
if use doc; then
docinto doc
dodoc doc/*
