[gentoo-commits] proj/gentoo-mate:master commit in: eclass/
commit: 64ae6b997115c0aacd610bfdff4d3482ca10faf0
Author: Adam Feldman gentoo org>
AuthorDate: Tue Mar 23 02:04:07 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 30 14:19:03 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=64ae6b99
eclass/mate.eclass: Add EAPI 7 support
Bug: https://bugs.gentoo.org/770277
Signed-off-by: Adam Feldman gentoo.org>
eclass/mate.eclass | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/eclass/mate.eclass b/eclass/mate.eclass
index 34d5e47..a3b4cfd 100644
--- a/eclass/mate.eclass
+++ b/eclass/mate.eclass
@@ -7,7 +7,7 @@
# @AUTHOR:
# Authors: NP-Hardass based upon the gnome2
# and autotools-utils eclasses
-# @SUPPORTED_EAPIS: 6
+# @SUPPORTED_EAPIS: 6 7
# @BLURB: Provides phases for MATE based packages.
# @DESCRIPTION:
# Exports portage base functions used by ebuilds written for packages using the
@@ -16,7 +16,7 @@
# Check EAPI only
case "${EAPI:-0}" in
- 6) ;;
+ 6|7) ;;
*) die "EAPI=${EAPI:-0} is not supported" ;;
esac
@@ -26,8 +26,12 @@ esac
# @DESCRIPTION:
# Available values for MATE_LA_PUNT:
# - "no": will not clean any .la files
+# - In EAPI < 7:
# - "yes": will run prune_libtool_files --modules
# - If it is not set, it will run prune_libtool_files
+# - In EAPI 7:
+# - Any non-"no" value will run
+# find "${ED}" -name '*.la' -delete || die
# MATE_LA_PUNT is a stub to GNOME2_LA_PUNT
MATE_LA_PUNT=${MATE_LA_PUNT:-""}
GNOME2_LA_PUNT="${MATE_LA_PUNT}"
@@ -35,7 +39,7 @@ GNOME2_LA_PUNT="${MATE_LA_PUNT}"
inherit gnome2 autotools mate-desktop.org
case "${EAPI:-0}" in
- 6) EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst
pkg_postinst pkg_postrm ;;
+ 6|7) EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst
pkg_postinst pkg_postrm ;;
*) die "EAPI=${EAPI:-0} is not supported" ;;
esac
[gentoo-commits] proj/gentoo-mate:master commit in: eclass/
commit: 8068ee5cbb854480484a6df9a78d63883eb45c54
Author: Adam Feldman gentoo org>
AuthorDate: Tue Mar 23 02:04:00 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 30 14:19:03 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=8068ee5c
eclass/mate-desktop.org.eclass: Add EAPI 7 support
Bug: https://bugs.gentoo.org/770277
Signed-off-by: Adam Feldman gentoo.org>
eclass/mate-desktop.org.eclass | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/eclass/mate-desktop.org.eclass b/eclass/mate-desktop.org.eclass
index 849479d..92f1d1d 100644
--- a/eclass/mate-desktop.org.eclass
+++ b/eclass/mate-desktop.org.eclass
@@ -6,7 +6,7 @@
# m...@gentoo.org
# @AUTHOR:
# Authors: NP-Hardass based upon the gnome.org eclass.
-# @SUPPORTED_EAPIS: 6
+# @SUPPORTED_EAPIS: 6 7
# @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
@@ -14,7 +14,7 @@
# EAPIs < 6 are banned.
case "${EAPI:-0}" in
- 6) ;;
+ 6|7) ;;
*) die "EAPI=${EAPI:-0} is not supported" ;;
esac
@@ -22,7 +22,7 @@ if [[ ${PV} == ]]; then
inherit git-r3
fi
-inherit versionator
+[[ ${EAPI:-0} -eq 6 ]] && inherit eapi7-ver
# @ECLASS-VARIABLE: MATE_TARBALL_SUFFIX
# @INTERNAL
@@ -47,7 +47,7 @@ inherit versionator
# @DESCRIPTION:
# Major and minor numbers of the version number, unless live.
# If live ebuild, will be set to ''.
-: ${MATE_BRANCH:=$(get_version_component_range 1-2)}
+: ${MATE_BRANCH:=$(ver_cut 1-2)}
# Set SRC_URI or EGIT_REPO_URI based on whether live
if [[ ${PV} == ]]; then
[gentoo-commits] proj/gentoo-mate:master commit in: eclass/
commit: 62b152f81e4100efc29170f81bdc1e5e861cd42a
Author: Adam Feldman gentoo org>
AuthorDate: Tue Jun 8 23:19:32 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 9 02:04:29 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=62b152f8
eclass/mate{,-desktop.org}: sync from ::gentoo
Signed-off-by: Adam Feldman gentoo.org>
eclass/mate-desktop.org.eclass | 19 ---
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 @@
# m...@gentoo.org
# @AUTHOR:
# Authors: NP-Hardass 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 ''.
: ${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} == ]]; 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
[gentoo-commits] proj/gentoo-mate:master commit in: eclass/
commit: 4040e4cb00d79fb53ce1ab6fc4f1d57cc924038b Author: Ettore Di Giacinto gentoo org> AuthorDate: Wed Mar 1 15:55:27 2017 + Commit: Ettore Di Giacinto gentoo org> CommitDate: Wed Mar 1 15:55:38 2017 + URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=4040e4cb Drop $Id$ from MATE eclasses per council decision in bug #611234. * Update also year in headers eclass/mate-desktop.org.eclass | 3 +-- eclass/mate.eclass | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/eclass/mate-desktop.org.eclass b/eclass/mate-desktop.org.eclass index 6587957..776a3a6 100644 --- a/eclass/mate-desktop.org.eclass +++ b/eclass/mate-desktop.org.eclass @@ -1,6 +1,5 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ # @ECLASS: mate-desktop.org.eclass # @MAINTAINER: diff --git a/eclass/mate.eclass b/eclass/mate.eclass index 39d9da1..a5cb06b 100644 --- a/eclass/mate.eclass +++ b/eclass/mate.eclass @@ -1,6 +1,5 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ # @ECLASS: mate.eclass # @MAINTAINER:
[gentoo-commits] proj/gentoo-mate:master commit in: eclass/
commit: d5ba0b9126554e2a5e4533e0ce501f5ff008669c
Author: NP-Hardass gentoo org>
AuthorDate: Sun Aug 14 02:13:38 2016 +
Commit: NP Hardass gentoo org>
CommitDate: Sun Aug 14 02:24:01 2016 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=d5ba0b91
eclass: mate.eclass: Fix spacing for documentation
eclass/mate.eclass | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/eclass/mate.eclass b/eclass/mate.eclass
index ac134a9..39d9da1 100644
--- a/eclass/mate.eclass
+++ b/eclass/mate.eclass
@@ -42,7 +42,8 @@ esac
DEPEND=">=mate-base/mate-common-${MATE_BRANCH}"
# @FUNCTION: mate_py_cond_func_wrap
-# @DESCRIPTION: Wraps a function for conditional python use, to run for each
+# @DESCRIPTION:
+# Wraps a function for conditional python use, to run for each
# python implementation in the build directory.
# This function should only be used if the ebuild also inherits the
# python-r1 eclass
@@ -66,7 +67,8 @@ mate_py_cond_func_wrap() {
: ${MATE_FORCE_AUTORECONF:="false"}
# @FUNCTION: ematedocize
-# @DESCRIPTION: A wrapper around mate-doc-common
+# @DESCRIPTION:
+# A wrapper around mate-doc-common
ematedocize() {
ebegin "Running mate-doc-common --copy"
mate-doc-common --copy || die
[gentoo-commits] proj/gentoo-mate:master commit in: eclass/
commit: 95e59916f4f6b3b65945af66d8ff1ff100810a0b
Author: NP-Hardass gentoo org>
AuthorDate: Sun Jul 24 22:53:45 2016 +
Commit: NP Hardass gentoo org>
CommitDate: Sun Jul 24 22:53:45 2016 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=95e59916
eclass: mate.eclass: avoid double elibtoolize call
eclass/mate.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/mate.eclass b/eclass/mate.eclass
index 678cac0..ac134a9 100644
--- a/eclass/mate.eclass
+++ b/eclass/mate.eclass
@@ -104,7 +104,7 @@ mate_src_prepare() {
if [[ "${force_autoreconf}" == "true" ]] || [[ ${chksum} !=
$(gen_chksum) ]]; then
want_mate_doc && ematedocize
- eautoreconf
+ AT_NOELIBTOOLIZE="yes" eautoreconf # gnome2_src_prepare calls
elibtoolize
fi
}
[gentoo-commits] proj/gentoo-mate:master commit in: eclass/
commit: df2df4469eaa647728e56b405b9fb1e6a61aacbd
Author: NP-Hardass gentoo org>
AuthorDate: Sun Jul 24 22:51:51 2016 +
Commit: NP Hardass gentoo org>
CommitDate: Sun Jul 24 22:52:09 2016 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=df2df446
eclass: mate.eclass: Fix documentation for MATE_FORCE_AUTORECONF
eclass/mate.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/mate.eclass b/eclass/mate.eclass
index 59feac2..678cac0 100644
--- a/eclass/mate.eclass
+++ b/eclass/mate.eclass
@@ -57,9 +57,9 @@ mate_py_cond_func_wrap() {
fi
}
-# @ECLASS-VARIABLE: FORCE_AUTORECONF
+# @ECLASS-VARIABLE: MATE_FORCE_AUTORECONF
# @DESCRIPTION:
-# Available values for FORCE_AUTORECONF:
+# Available values for MATE_FORCE_AUTORECONF:
# - true: will always run eautoreconf
# - false: will default to automatic detect
# - If it is not set, it will default to false
[gentoo-commits] proj/gentoo-mate:master commit in: eclass/
commit: 20018132667c2c787a3284ff52dbc01f85bc7c22
Author: NP-Hardass gentoo org>
AuthorDate: Wed Jul 6 06:17:24 2016 +
Commit: NP Hardass gentoo org>
CommitDate: Wed Jul 6 06:17:44 2016 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=20018132
eclass: mate*: Switch back to case statements
eclass/mate-desktop.org.eclass | 7 ---
eclass/mate.eclass | 14 --
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/eclass/mate-desktop.org.eclass b/eclass/mate-desktop.org.eclass
index c57528d..6587957 100644
--- a/eclass/mate-desktop.org.eclass
+++ b/eclass/mate-desktop.org.eclass
@@ -13,9 +13,10 @@
# exporting some useful values like the MATE_BRANCH
# EAPIs < 6 are banned.
-if [[ "${EAPI:-0}" != "6" ]]; then
- die "EAPI=${EAPI:-0} is not supported"
-fi
+case "${EAPI:-0}" in
+ 6) ;;
+ *) die "EAPI=${EAPI:-0} is not supported" ;;
+esac
if [[ ${PV} == ]]; then
inherit git-r3
diff --git a/eclass/mate.eclass b/eclass/mate.eclass
index 6e31a46..59feac2 100644
--- a/eclass/mate.eclass
+++ b/eclass/mate.eclass
@@ -15,9 +15,10 @@
# fact that MATE is a GNOME fork. For additional functions, see
gnome2-utils.eclass.
# Check EAPI only
-if [[ "${EAPI:-0}" != "6" ]]; then
- die "EAPI=${EAPI:-0} is not supported"
-fi
+case "${EAPI:-0}" in
+ 6) ;;
+ *) die "EAPI=${EAPI:-0} is not supported" ;;
+esac
# Inherit happens below after declaration of GNOME2_LA_PUNT
@@ -32,9 +33,10 @@ GNOME2_LA_PUNT=${MATE_LA_PUNT:-""}
inherit gnome2 autotools mate-desktop.org
-if [[ "${EAPI:-0}" == "6" ]]; then
- EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst
pkg_postinst pkg_postrm
-fi
+case "${EAPI:-0}" in
+ 6) EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst
pkg_postinst pkg_postrm ;;
+ *) die "EAPI=${EAPI:-0} is not supported" ;;
+esac
# Autotools requires our MATE m4 files
DEPEND=">=mate-base/mate-common-${MATE_BRANCH}"
[gentoo-commits] proj/gentoo-mate:master commit in: eclass/
commit: 889ec5167e1d6c8e00a07037bdda6b235340f2ed
Author: NP-Hardass gentoo org>
AuthorDate: Mon Jun 27 20:05:59 2016 +
Commit: NP Hardass gentoo org>
CommitDate: Mon Jun 27 20:06:05 2016 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=889ec516
eclass: mate.eclass fix typo from _PYTHON_r1 to _PYTHON_R1
eclass/mate.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/mate.eclass b/eclass/mate.eclass
index 9259634..6e31a46 100644
--- a/eclass/mate.eclass
+++ b/eclass/mate.eclass
@@ -45,7 +45,7 @@ DEPEND=">=mate-base/mate-common-${MATE_BRANCH}"
# This function should only be used if the ebuild also inherits the
# python-r1 eclass
mate_py_cond_func_wrap() {
- if [[ ! ${_PYTHON_r1} ]]; then
+ if [[ ! ${_PYTHON_R1} ]]; then
die "This function requires the inheritence of the python-r1
eclass"
fi
if use python; then
