diff options
| author |   Adam Feldman <NP-Hardass@gentoo.org> | 2021-06-08 19:19:32 -0400 |
|---|---|---|
| committer | Adam Feldman <NP-Hardass@gentoo.org> | 2021-06-08 22:04:29 -0400 |
| commit | 62b152f81e4100efc29170f81bdc1e5e861cd42a (patch) | |
| tree | 0345e31bfcff3bc8da1ee939c2a56357635fe13e /eclass | |
| parent | sys-auth/consolekit: drop package (diff) | |
| download | gentoo-mate-62b152f81e4100efc29170f81bdc1e5e861cd42a.tar.gz gentoo-mate-62b152f81e4100efc29170f81bdc1e5e861cd42a.tar.bz2 gentoo-mate-62b152f81e4100efc29170f81bdc1e5e861cd42a.zip | |
eclass/mate{,-desktop.org}: sync from ::gentoo
Signed-off-by: Adam Feldman <NP-Hardass@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/mate-desktop.org.eclass | 19 | ||||
| -rw-r--r-- | eclass/mate.eclass | 4 |
2 files changed, 10 insertions, 13 deletions
diff --git a/eclass/mate-desktop.org.eclass b/eclass/mate-desktop.org.eclass index 776a3a6..849479d 100644 --- a/eclass/mate-desktop.org.eclass +++ b/eclass/mate-desktop.org.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: mate-desktop.org.eclass @@ -6,6 +6,7 @@ # mate@gentoo.org # @AUTHOR: # Authors: NP-Hardass <NP-Hardass@gentoo.org> based upon the gnome.org eclass. +# @SUPPORTED_EAPIS: 6 # @BLURB: Helper eclass for mate-desktop.org hosted archives # @DESCRIPTION: # Provide a default SRC_URI and EGIT_REPO_URI for MATE packages as well as @@ -34,13 +35,13 @@ inherit versionator # @DESCRIPTION: # Name of the package as hosted on mate-desktop.org. # Leave unset if package name matches PN. -: ${MATE_DESKTOP_ORG_PN:=$PN} +: ${MATE_DESKTOP_ORG_PN:=${PN}} # @ECLASS-VARIABLE: MATE_DESKTOP_ORG_PV # @DESCRIPTION: # Package version string as listed on mate-desktop.org. # Leave unset if package version string matches PV. -: ${MATE_DESKTOP_ORG_PV:=$PV} +: ${MATE_DESKTOP_ORG_PV:=${PV}} # @ECLASS-VARIABLE: MATE_BRANCH # @DESCRIPTION: @@ -48,17 +49,13 @@ inherit versionator # If live ebuild, will be set to '9999'. : ${MATE_BRANCH:=$(get_version_component_range 1-2)} -# Set SRC_URI or EGIT_REPO_URI based on whether live +# Set SRC_URI or EGIT_REPO_URI based on whether live if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI=" - https://github.com/mate-desktop/${MATE_DESKTOP_ORG_PN}.git - git://github.com/mate-desktop/${MATE_DESKTOP_ORG_PN}.git - http://github.com/mate-desktop/${MATE_DESKTOP_ORG_PN}.git - " + EGIT_REPO_URI="https://github.com/mate-desktop/${MATE_DESKTOP_ORG_PN}.git" SRC_URI="" else - SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${MATE_DESKTOP_ORG_PN}-${MATE_DESKTOP_ORG_PV}.tar.${MATE_TARBALL_SUFFIX}" + SRC_URI="https://pub.mate-desktop.org/releases/${MATE_BRANCH}/${MATE_DESKTOP_ORG_PN}-${MATE_DESKTOP_ORG_PV}.tar.${MATE_TARBALL_SUFFIX}" fi # Set HOMEPAGE for all ebuilds -HOMEPAGE="http://mate-desktop.org" +HOMEPAGE="https://mate-desktop.org" diff --git a/eclass/mate.eclass b/eclass/mate.eclass index d7dd2db..34d5e47 100644 --- a/eclass/mate.eclass +++ b/eclass/mate.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: mate.eclass @@ -120,7 +120,7 @@ mate_src_configure() { local mateconf=() # Pass --disable-static whenever possible - if ! use_if_iuse static-libs; then + if ! in_iuse static-libs || ! use static-libs; then if grep -q "enable-static" "${ECONF_SOURCE:-.}"/configure; then mateconf+=( --disable-static ) fi |