[gentoo-dev] [PATCH 2/2] eclass/mate.eclass: Add EAPI 7 support
---
eclass/mate.eclass | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/eclass/mate.eclass b/eclass/mate.eclass
index 34d5e47acc22..a3b4cfd0b602 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
--
2.26.2
[gentoo-dev] [PATCH 1/2] eclass/mate-desktop.org.eclass: Add EAPI 7 support
---
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 418f3f8ce076..740751066d0a 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
--
2.26.2
Re: [gentoo-dev] Make 'man' global USE flag from currently local
On 2/13/21 6:16 AM, Alessandro Barbieri wrote: > Il Sab 13 Feb 2021, 02:19 Aisha Tammy ha scritto: > > Hi all, > I am proposing to make the `man` USE flag into a global one. > Currently it is used by ~45 packages most of which have the same > description 'Build and install man pages': > https://packages.gentoo.org/useflags/man > Hopefully no objections to this part? > > Cheers, > Aisha > > > IMO manpages should be installed unconditionally and the useflag dropped > The key point to be stressed is BUILD and install. In most, if not all of those packages in question, I suspect they distribute prebuilt manpages. They USE flag is typically used to specify whether to pull deps to (re)build from scratch. So, the issue isn't really so much manpages being installed unconditionally, but whether they should be built from scratch when they are shipped prebuilt. -- Thanks, Adam Feldman Gentoo Developer np-hard...@gentoo.org 0x671C52F118F89C67 signature.asc Description: OpenPGP digital signature
Re: [gentoo-dev] RFC: New "Accept Github contributions" metadata flag
On 8/18/20 8:05 AM, Joonas Niilola wrote: > Hey, > > some of you may already have seen the new packages.gentoo.org page, > https://packages.gentoo.org/ > > and the new maintainer pages in it, > https://packages.gentoo.org/maintainers > > If you open a maintainer page, > https://packages.gentoo.org/maintainer/juip...@gentoo.org > > you can see a tab called "pull requests" there, > https://packages.gentoo.org/maintainer/juip...@gentoo.org/pull-requests > > with description saying: > "If you also like to help the Gentoo project, you can consider sending a > Pull Request via GitHub. > Before doing so, you might want to take a look at the wiki page." > > I'm suggesting of adding a new metadata flag to our Wiki's > User:/Project: page which then prints a message to this page saying > whether the maintainer (be it project or user), "accepts" or "deals > with" Github contributions. The wording can be a bit better, but it'd be > there to **notify** our **contributors** whether their time and effort > will most likely be wasted making a pull request for this particular > maintainer. > > This note would then be displayed in every package the maintainer is > assigned to, > https://packages.gentoo.org/packages/media-libs/rlottie/pull-requests > > I'd imagine a simple switch in Wiki could do it. No need to add anything > to ::gentoo repo. The switch can be visible in User:/Project: page, but > it doesn't have to. Unspecified metadata flag would print something like > "This maintainer hasn't specified whether they handle Github pull > requests. If you wish to help using Github, please also open a bug prior > to that and link your pull request commit to that bug (add link to > glep-66 here)". Or just default it to "No." > > Note that the bug text could always be displayed nevertheless, since > that is still the main channel to communicate with maintainers. > > It's undeniable we get a lot of pull requests and unfortunate that many > are left without any attention to rot. > https://github.com/gentoo/gentoo/pulls > > I think this would serve both parties - devs and contributors, with > little to no cost. > > -- juippis > > Personally, I'd rather see a generic package maintenance tags. "Accepts Github PRs" "Accepts any contribution freely" "Accepts project member contributions" "Accepts contributions after contact/N Week timeout" "Accepts no contributions" or similar Most of my packages fall within projects that keep synchronized with external overlays/repositories and it drives me absolutely bonkers when someone edits my packages (contrary to Gentoo official policy) without speaking to me first so that I can ensure the changes are replicated. So I'd welcome something that pushes further standardization of that preexisting policy. Allow devs to specify when they are OK with relaxing the existing policy, but keep it in force for those who want and/or need it. -- Thanks, Adam Feldman Gentoo Developer np-hard...@gentoo.org 0x671C52F118F89C67 signature.asc Description: OpenPGP digital signature
Re: [gentoo-dev] [PATCH] mate.eclass: drop static-libs whenever possible
On 8/2/20 3:56 AM, Mart Raudsepp wrote:
> Ühel kenal päeval, L, 01.08.2020 kell 14:32, kirjutas Adam Feldman:
>> + gnome2_src_configure ${mateconf[@]} "$@"
>
> This might be something we may want to consider adding to gnome2.eclass
> instead?
> But I guess that's something to consider for any EAPI-7 port instead,
> should one eventually happen (instead of everything moving to meson
> instead).
> So no objections adding it to mate.eclass for the time being.
> gnome2.eclass would need too much checking that it's fine to bother at
> this point without the EAPI bump. But remind about it, should a EAPI-7
> gnome2 ever go up for review here :)
>
>
> Mart
>
Would you like a patch for gnome2.eclass now with a:
if has ${EAPI:-0} 7; then
fi
block so you'll be set to go upon updating the eclass to EAPI 7?
--
Thanks,
Adam Feldman
Gentoo Developer
np-hard...@gentoo.org
0x671C52F118F89C67
signature.asc
Description: OpenPGP digital signature
Re: [gentoo-dev] [PATCH] mate.eclass: drop static-libs whenever possible
On 8/1/20 4:25 PM, Michał Górny wrote:
> On Sat, 2020-08-01 at 14:32 -0400, Adam Feldman wrote:
>> Whenever package doesn't have static-libs available and selected,
>> if configure script has static-libs selectable, explicitly disable
>>
>> Bug: https://bugs.gentoo.org/695878
>> ---
>> eclass/mate.eclass | 12 +++-
>> 1 file changed, 11 insertions(+), 1 deletion(-)
>>
>> diff --git a/eclass/mate.eclass b/eclass/mate.eclass
>> index db511aedb1f1..d6718872c05d 100644
>> --- a/eclass/mate.eclass
>> +++ b/eclass/mate.eclass
>> @@ -115,7 +115,17 @@ mate_src_prepare() {
>> # MATE specific configure handling
>> # Stub to gnome2_src_configure()
>> mate_src_configure() {
>> -gnome2_src_configure "$@"
>> +
>> +local mateconf=()
>> +
>> +# Pass --disable-static whenever possible
>> +if ! use_if_iuse static-libs; then
>> +if grep -q "enable-static" "${ECONF_SOURCE:-.}"/configure; then
>> +mateconf+=( --disable-static )
>> +fi
>> +fi
>> +
>> +gnome2_src_configure ${mateconf[@]} "$@"
>
> "${mateconf[@]}". Using [@] without quoting makes no sense, and I'm
> sure linters will complain.
>
>> }
>>
>> # @FUNCTION: mate_src_install
>
Fixed. Thanks for the review.
--
Thanks,
Adam Feldman
Gentoo Developer
np-hard...@gentoo.org
0x671C52F118F89C67
signature.asc
Description: OpenPGP digital signature
[gentoo-dev] [PATCH] mate.eclass: #637786, adj {MATE,GNOME}_LA_PUNT to fix eclassdoc gen
Closes: https://bugs.gentoo.org/637786
---
eclass/mate.eclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/eclass/mate.eclass b/eclass/mate.eclass
index d6718872c05d..2bcf1f7afd63 100644
--- a/eclass/mate.eclass
+++ b/eclass/mate.eclass
@@ -29,7 +29,8 @@ esac
# - "yes": will run prune_libtool_files --modules
# - If it is not set, it will run prune_libtool_files
# MATE_LA_PUNT is a stub to GNOME2_LA_PUNT
-GNOME2_LA_PUNT=${MATE_LA_PUNT:-""}
+MATE_LA_PUNT=${MATE_LA_PUNT:-""}
+GNOME2_LA_PUNT="${MATE_LA_PUNT}"
inherit gnome2 autotools mate-desktop.org
--
2.26.2
[gentoo-dev] [PATCH] mate.eclass: drop static-libs whenever possible
Whenever package doesn't have static-libs available and selected,
if configure script has static-libs selectable, explicitly disable
Bug: https://bugs.gentoo.org/695878
---
eclass/mate.eclass | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/eclass/mate.eclass b/eclass/mate.eclass
index db511aedb1f1..d6718872c05d 100644
--- a/eclass/mate.eclass
+++ b/eclass/mate.eclass
@@ -115,7 +115,17 @@ mate_src_prepare() {
# MATE specific configure handling
# Stub to gnome2_src_configure()
mate_src_configure() {
- gnome2_src_configure "$@"
+
+ local mateconf=()
+
+ # Pass --disable-static whenever possible
+ if ! use_if_iuse static-libs; then
+ if grep -q "enable-static" "${ECONF_SOURCE:-.}"/configure; then
+ mateconf+=( --disable-static )
+ fi
+ fi
+
+ gnome2_src_configure ${mateconf[@]} "$@"
}
# @FUNCTION: mate_src_install
--
2.26.2
Re: [gentoo-dev] Re: News item: xorg-server dropping default suid
On 6/27/20 1:36 PM, William Hubbs wrote: > On Sun, Jun 21, 2020 at 10:02:25PM +0200, Andreas Sturmlechner wrote: >> On Sunday, 21 June 2020 21:27:02 CEST Joonas Niilola wrote: >>> What's the current trend of attaching news items? It >>> makes hard to point out enhancements. >> >> Indeed, I didn't even look at the previous mail that was sent like that. > > I realize I'm late to this and maybe this is being discussed in another > thread (I'm catching up), but attaching newsitems is the standard way of > getting them reviewed; this is not anything new. > > Thanks, > > William > I think the point being made was that the vast majority of news items are posted as content inlined in the email as opposed to an attached file. -- Thanks, Adam Feldman Gentoo Developer np-hard...@gentoo.org 0x671C52F118F89C67 signature.asc Description: OpenPGP digital signature
