diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-04-06 22:33:41 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-04-06 22:33:41 +0100 |
| commit | e68d405c5d712af4387159df07e226217bdda049 (patch) | |
| tree | 009ab0f3d427f0813e62930d71802cb054c07e30 /eclass/xorg-3.eclass | |
| parent | 401101f9c8077911929d3f2b60a37098460a5d89 (diff) | |
gentoo resync : 06.04.2022
Diffstat (limited to 'eclass/xorg-3.eclass')
| -rw-r--r-- | eclass/xorg-3.eclass | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass index e908d51c669f..c68b3041629a 100644 --- a/eclass/xorg-3.eclass +++ b/eclass/xorg-3.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: xorg-3.eclass @@ -8,7 +8,7 @@ # Author: Tomáš Chvátal <scarabeus@gentoo.org> # Author: Donnie Berkholz <dberkholz@gentoo.org> # Author: Matt Turner <mattst88@gentoo.org> -# @SUPPORTED_EAPIS: 7 +# @SUPPORTED_EAPIS: 7 8 # @PROVIDES: multilib-minimal # @BLURB: Reduces code duplication in the modularized X11 ebuilds. # @DESCRIPTION: @@ -52,19 +52,19 @@ fi # we need to inherit autotools first to get the deps inherit autotools libtool multilib toolchain-funcs flag-o-matic \ ${FONT_ECLASS} ${GIT_ECLASS} +unset FONT_ECLASS GIT_ECLASS if [[ ${XORG_MULTILIB} == yes ]]; then inherit multilib-minimal fi -EXPORTED_FUNCTIONS="src_prepare src_configure src_unpack src_compile src_install pkg_postinst pkg_postrm" case "${EAPI:-0}" in - 7) ;; + [7-8]) ;; *) die "EAPI=${EAPI} is not supported" ;; esac # exports must be ALWAYS after inherit -EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS} +EXPORT_FUNCTIONS src_prepare src_configure src_unpack src_compile src_install pkg_postinst pkg_postrm IUSE="" @@ -119,7 +119,7 @@ HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/${XORG_MOD # to bz2. : ${XORG_TARBALL_SUFFIX:="bz2"} -if [[ -n ${GIT_ECLASS} ]]; then +if [[ ${PV} == *9999* ]]; then : ${EGIT_REPO_URI:="https://gitlab.freedesktop.org/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}.git"} elif [[ -n ${XORG_BASE_INDIVIDUAL_URI} ]]; then SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${P}.tar.${XORG_TARBALL_SUFFIX}" @@ -143,12 +143,10 @@ if [[ ${PN} != util-macros ]] ; then # Required even by xorg-server [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0" fi -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" for arch in ${XORG_EAUTORECONF_ARCHES}; do EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )" done -unset arch +unset arch XORG_EAUTORECONF_ARCHES BDEPEND+=" ${EAUTORECONF_DEPENDS}" [[ ${XORG_EAUTORECONF} != no ]] && BDEPEND+=" ${EAUTORECONF_DEPEND}" unset EAUTORECONF_DEPENDS @@ -226,7 +224,6 @@ DOC_DEPEND=" doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto - app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 @@ -269,7 +266,7 @@ xorg-3_pkg_setup() { xorg-3_src_unpack() { debug-print-function ${FUNCNAME} "$@" - if [[ -n ${GIT_ECLASS} ]]; then + if [[ ${PV} == *9999* ]]; then git-r3_src_unpack else unpack ${A} |