diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
| commit | 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch) | |
| tree | ade7cb031f363fad64c77139dea7aa3d81908537 /eclass/gnome.org.eclass | |
| parent | 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff) | |
gentoo resync : 16.02.1018
Diffstat (limited to 'eclass/gnome.org.eclass')
| -rw-r--r-- | eclass/gnome.org.eclass | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/eclass/gnome.org.eclass b/eclass/gnome.org.eclass index 6b2ae672a2d4..fd6077e4594c 100644 --- a/eclass/gnome.org.eclass +++ b/eclass/gnome.org.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: gnome.org.eclass @@ -11,7 +11,8 @@ # @DESCRIPTION: # Provide a default SRC_URI for tarball hosted on gnome.org mirrors. -inherit versionator +# versionator inherit kept for older EAPIs due to ebuilds (potentially) relying on it +[[ ${EAPI} == [0123456] ]] && inherit eapi7-ver versionator # @ECLASS-VARIABLE: GNOME_TARBALL_SUFFIX # @DESCRIPTION: @@ -28,7 +29,11 @@ fi # Even though xz-utils are in @system, they must still be added to DEPEND; see # https://archives.gentoo.org/gentoo-dev/msg_a0d4833eb314d1be5d5802a3b710e0a4.xml if [[ ${GNOME_TARBALL_SUFFIX} == "xz" ]]; then - DEPEND="${DEPEND} app-arch/xz-utils" + if [[ ${EAPI:-0} != [0123456] ]]; then + BDEPEND="app-arch/xz-utils" + else + DEPEND="app-arch/xz-utils" + fi fi # @ECLASS-VARIABLE: GNOME_ORG_MODULE @@ -41,7 +46,7 @@ fi # @INTERNAL # @DESCRIPTION: # Major and minor numbers of the version number. -: ${GNOME_ORG_PVP:=$(get_version_component_range 1-2)} +: ${GNOME_ORG_PVP:=$(ver_cut 1-2)} SRC_URI="mirror://gnome/sources/${GNOME_ORG_MODULE}/${GNOME_ORG_PVP}/${GNOME_ORG_MODULE}-${PV}.tar.${GNOME_TARBALL_SUFFIX}" |