[gentoo-dev] [PATCH] gnome2-utils: Drop EAPI < 5 support
Closes: https://bugs.gentoo.org/566728
Signed-off-by: Matt Turner
---
eclass/gnome2-utils.eclass | 21 +
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
index 06643db0f60..e32449890dd 100644
--- a/eclass/gnome2-utils.eclass
+++ b/eclass/gnome2-utils.eclass
@@ -4,7 +4,7 @@
# @ECLASS: gnome2-utils.eclass
# @MAINTAINER:
# gn...@gentoo.org
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7
# @BLURB: Auxiliary functions commonly used by Gnome packages.
# @DESCRIPTION:
# This eclass provides a set of auxiliary functions needed by most Gnome
@@ -14,14 +14,14 @@
# * GConf schemas management
# * scrollkeeper (old Gnome help system) management
-[[ ${EAPI:-0} == [012345] ]] && inherit multilib
+[[ ${EAPI:-0} == [5] ]] && inherit multilib
# eutils.eclass: emktemp
# xdg-utils.eclass: xdg_environment_reset, xdg_icon_cache_update
inherit eutils xdg-utils
case "${EAPI:-0}" in
- 0|1|2|3|4|5|6|7) ;;
- *) die "EAPI=${EAPI} is not supported" ;;
+ 5|6|7) ;;
+ 0|1|2|3|4) die "EAPI=${EAPI} is not supported" ;;
esac
# @ECLASS-VARIABLE: GCONFTOOL_BIN
@@ -110,7 +110,6 @@ gnome2_environment_reset() {
# in the GNOME2_ECLASS_SCHEMAS environment variable.
# This function should be called from pkg_preinst.
gnome2_gconf_savelist() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
pushd "${ED}" > /dev/null || die
export GNOME2_ECLASS_SCHEMAS=$(find 'etc/gconf/schemas/' -name
'*.schemas' 2> /dev/null)
popd > /dev/null || die
@@ -122,7 +121,6 @@ gnome2_gconf_savelist() {
# using gconftool-2.
# This function should be called from pkg_postinst.
gnome2_gconf_install() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
local updater="${EROOT%/}${GCONFTOOL_BIN}"
if [[ ! -x "${updater}" ]]; then
@@ -163,7 +161,6 @@ gnome2_gconf_install() {
# Removes schema files previously installed by the current ebuild from Gconf's
# database.
gnome2_gconf_uninstall() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
local updater="${EROOT%/}${GCONFTOOL_BIN}"
if [[ ! -x "${updater}" ]]; then
@@ -255,7 +252,6 @@ gnome2_omf_fix() {
# in the GNOME2_ECLASS_SCROLLS environment variable.
# This function should be called from pkg_preinst.
gnome2_scrollkeeper_savelist() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
pushd "${ED}" > /dev/null || die
export GNOME2_ECLASS_SCROLLS=$(find 'usr/share/omf' -type f -name
"*.omf" 2> /dev/null)
popd > /dev/null || die
@@ -266,7 +262,6 @@ gnome2_scrollkeeper_savelist() {
# Updates the global scrollkeeper database.
# This function should be called from pkg_postinst and pkg_postrm.
gnome2_scrollkeeper_update() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
local updater="${EROOT%/}${SCROLLKEEPER_UPDATE_BIN}"
if [[ ! -x "${updater}" ]] ; then
@@ -291,7 +286,6 @@ gnome2_scrollkeeper_update() {
# implementations that call gnome2_schemas_update conditionally.
# This function should be called from pkg_preinst.
gnome2_schemas_savelist() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
pushd "${ED}" > /dev/null || die
export GNOME2_ECLASS_GLIB_SCHEMAS=$(find 'usr/share/glib-2.0/schemas'
-name '*.gschema.xml' 2>/dev/null)
popd > /dev/null || die
@@ -302,7 +296,6 @@ gnome2_schemas_savelist() {
# Updates GSettings schemas.
# This function should be called from pkg_postinst and pkg_postrm.
gnome2_schemas_update() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
local updater="${EROOT%/}${GLIB_COMPILE_SCHEMAS}"
if [[ ! -x ${updater} ]]; then
@@ -321,7 +314,6 @@ gnome2_schemas_update() {
# GNOME2_ECLASS_GDK_PIXBUF_LOADERS variable.
# This function should be called from pkg_preinst.
gnome2_gdk_pixbuf_savelist() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
pushd "${ED}" > /dev/null || die
export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find usr/lib*/gdk-pixbuf-2.0
-type f 2>/dev/null)
popd > /dev/null || die
@@ -332,7 +324,6 @@ gnome2_gdk_pixbuf_savelist() {
# Updates gdk-pixbuf loader cache if GNOME2_ECLASS_GDK_PIXBUF_LOADERS has some.
# This function should be called from pkg_postinst and pkg_postrm.
gnome2_gdk_pixbuf_update() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
local updater="${EROOT%/}/usr/bin/${CHOST}-gdk-pixbuf-query-loaders"
if [[ ! -x ${updater} ]]; then
@@ -389,7 +380,6 @@ gnome2_query_immodules_gtk3() {
# Updates glib's gio modules cache.
# This function should be called from pkg_postinst and pkg_postrm.
gnome2_giomodule_cache_update() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
local updater="${EROOT%/}/usr/bin/${CHOST}-gio-querymodules"
if [[ ! -x ${updater} ]]; then
@@ -447,7 +437,7 @@ gnome2
[gentoo-dev] [PATCH] gnome2.eclass: Drop EAPI=4 support
Closes: https://bugs.gentoo.org/596674
Signed-off-by: Matt Turner
---
eclass/gnome2.eclass | 82
1 file changed, 22 insertions(+), 60 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 1a4ff451df3..9c2428532a9 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -4,7 +4,7 @@
# @ECLASS: gnome2.eclass
# @MAINTAINER:
# gn...@gentoo.org
-# @SUPPORTED_EAPIS: 4 5 6
+# @SUPPORTED_EAPIS: 5 6
# @BLURB: Provides phases for Gnome/Gtk+ based packages.
# @DESCRIPTION:
# Exports portage base functions used by ebuilds written for packages using the
@@ -20,7 +20,7 @@ GNOME2_EAUTORECONF=${GNOME2_EAUTORECONF:-""}
inherit eutils libtool ltprune gnome.org gnome2-utils xdg
case "${EAPI:-0}" in
- 4|5)
+ 5)
EXPORT_FUNCTIONS src_unpack src_prepare src_configure
src_compile src_install pkg_preinst pkg_postinst pkg_postrm
;;
6)
@@ -29,13 +29,6 @@ case "${EAPI:-0}" in
*) die "EAPI=${EAPI} is not supported" ;;
esac
-# @ECLASS-VARIABLE: DOCS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# String containing documents passed to dodoc command for eapi4.
-# In eapi5 we rely on einstalldocs (from eutils.eclass) and for newer EAPIs we
-# follow PMS spec.
-
# @ECLASS-VARIABLE: ELTCONF
# @DEFAULT_UNSET
# @DESCRIPTION:
@@ -48,7 +41,7 @@ ELTCONF=${ELTCONF:-""}
# Extra configure opts passed to econf.
# Deprecated, pass extra arguments to gnome2_src_configure.
# Banned in eapi6 and newer.
-if has ${EAPI:-0} 4 5; then
+if has ${EAPI:-0} 5; then
G2CONF=${G2CONF:-""}
fi
@@ -64,7 +57,7 @@ fi
#
# Banned since eapi6 as upstream is moving away from this obsolete macro in
favor
# of autoconf-archive macros, that do not expose this issue (bug #270919)
-if has ${EAPI:-0} 4 5; then
+if has ${EAPI:-0} 5; then
if [[ ${GCONF_DEBUG} != "no" ]]; then
IUSE="debug"
fi
@@ -77,23 +70,18 @@ fi
# @ECLASS-VARIABLE: GNOME2_LA_PUNT
# @DESCRIPTION:
-# For eapi4 it sets if we should delete ALL or none of the .la files
-# For eapi5 and newer it relies on prune_libtool_files (from eutils.eclass)
+# It relies on prune_libtool_files (from ltprune.eclass)
# for this. Available values for GNOME2_LA_PUNT:
# - "no": will not clean any .la files
# - "yes": will run prune_libtool_files --modules
# - If it is not set, it will run prune_libtool_files
-if has ${EAPI:-0} 4; then
- GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"}
-else
- GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""}
-fi
+GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""}
# @FUNCTION: gnome2_src_unpack
# @DESCRIPTION:
# Stub function for old EAPI.
gnome2_src_unpack() {
- if has ${EAPI:-0} 4 5; then
+ if has ${EAPI:-0} 5; then
unpack ${A}
cd "${S}"
else
@@ -115,7 +103,7 @@ gnome2_src_prepare() {
# We stop to run it from eapi6 as scrollkeeper helpers from
# rarian are not running anything and, then, access violations
# shouldn't occur.
- has ${EAPI:-0} 4 5 && gnome2_omf_fix
+ has ${EAPI:-0} 5 && gnome2_omf_fix
# Disable all deprecation warnings
gnome2_disable_deprecation_warning
@@ -135,7 +123,7 @@ gnome2_src_prepare() {
gnome2_src_configure() {
# Deprecated for a long time now and banned since eapi6, see Gnome team
policies
if [[ -n ${G2CONF} ]] ; then
- if has ${EAPI:-0} 4 5; then
+ if has ${EAPI:-0} 5; then
eqawarn "G2CONF set, please review documentation at
https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#G2CONF_and_src_configure";
else
die "G2CONF set, please review documentation at
https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#G2CONF_and_src_configure";
@@ -144,7 +132,7 @@ gnome2_src_configure() {
local g2conf=()
- if has ${EAPI:-0} 4 5; then
+ if has ${EAPI:-0} 5; then
if [[ ${GCONF_DEBUG} != 'no' ]] ; then
if use debug ; then
g2conf+=( --enable-debug=yes )
@@ -164,11 +152,7 @@ gnome2_src_configure() {
# rebuild docs.
# Preserve old behavior for older EAPI.
if grep -q "enable-gtk-doc" "${ECONF_SOURCE:-.}"/configure ; then
- if has ${EAPI:-0} 4 && in_iuse doc ; then
- g2conf+=( $(use_enable doc gtk-doc) )
- else
- g2conf+=( --disable-gtk-doc )
- fi
+ g2conf+=( --disable-gtk-doc )
fi
# Pass --disable-maintainer-mode when needed
@@ -182,13 +166,6 @@ gnome2_src_configure() {
g2conf+=( --disable-scrollkeeper )
fi
- # Pass --disable-silent-rules when possible (not needed since eapi5),
bug #429308
- if has ${EAPI:-0} 4; then
- if grep -q "disable-silent-rules"
"${ECONF_SOURCE:-.}"/configur
Re: [gentoo-dev] Python 2 cleanup: remaining packages, Dec 2020 update
On Sat, 05 Dec 2020 15:47:40 + Marek Szuba wrote: > > > On December 5, 2020 12:31:33 PM UTC, Andrew Savchenko > wrote: > > >Looks like you misunderstood what "Python 3 compatibility mode" > >means. See official explanation: > >https://www.renpy.org/dev-doc/html/changelog.html#python-2-python-3-compatibility-mode > > So I have. Oh well, last rites it most likely is then. Or move > py2 versions of RenPy and their revdeps to a dedicated overlay, > maybe. Do we have a dedicated py2 overlay? Renpy has quite some py2 deps, so it will be reasonable to support it in such overlay instead of duplicating job for common packages. > I am not quite convinced simply having then masked in the > main tree makes sense, as these will have to stay masked even after > RenPy 8.0 has come out. The sense I see: 1) it will make it easier to update to 8.0; 2) for users willing to use renpy it will be a starting point, though they'll need to setup py2 outside of portage somehow, maybe using pip. But maybe it will be easier for users to use bundled renpy from games (it often comes with its own py2); though not all games have linux port — that is the killer feature of the in-tree renpy version. Best regards, Andrew Savchenko pgp8XYKwjv62Y.pgp Description: PGP signature
[gentoo-dev] Packages up for grabs from gnome@
Hello, The GNOME team is happy to hand over the following packages to a dedicated maintainer. For packages without any takers, we'll remain the maintainer for the time being. For packages that are taken, feel free to remove us or keep as backup if you want us doing the occasional version bump based on release announcement notices or such. app-accessibility/caribou app-office/dia app-office/dia2code app-office/glabels app-office/pinpoint app-text/wv dev-libs/libcroco - security vulnerabilities, dep of non-rust librsvg gnome-extra/eiciel gnome-extra/office-runner media-gfx/colorhug-client media-gfx/gtkam media-libs/libart_lgpl net-dialup/moserial net-misc/grdesktop sci-calculators/galculator x11-misc/gcolor2 x11-themes/arc-icon-theme x11-themes/experience x11-themes/geramik x11-themes/gtk-chtheme x11-themes/gtk-engines-experience x11-themes/gtk-engines-flat x11-themes/gtk-engines-qtpixmap x11-themes/gtk-engines-unico x11-themes/vertex-icon-theme x11-themes/vertex-theme The following are definite last-rite candidates if no-one has any interest in these: dev-libs/gtx dev-util/fix-la-relink-command Additionally libxml2 and libxslt as a pair can be handed over; I believe currently base-system and sam_ are considering taking them. Mart signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] Python 2 cleanup: remaining packages, Dec 2020 update
On December 5, 2020 12:31:33 PM UTC, Andrew Savchenko wrote: >Looks like you misunderstood what "Python 3 compatibility mode" >means. See official explanation: >https://www.renpy.org/dev-doc/html/changelog.html#python-2-python-3-compatibility-mode So I have. Oh well, last rites it most likely is then. Or move py2 versions of RenPy and their revdeps to a dedicated overlay, maybe. I am not quite convinced simply having then masked in the main tree makes sense, as these will have to stay masked even after RenPy 8.0 has come out. -- MS
Re: [gentoo-dev] Python 2 cleanup: remaining packages, Dec 2020 update
Hi! On Fri, 4 Dec 2020 10:07:21 +0100 Marek Szuba wrote: > On 2020-12-04 01:54, Michał Górny wrote: > > >>> Waiting for py3 port (likely last rite candidates): > >>> - games-engines/renpy > >> > >> RenPy 7.4.0, released on the 26th of November, features "new Python 3 > >> compatibility mode". It is of course up to the maintainer of this > >> package to decide how to proceed but were this up to me, I would very > >> much rather version-bump games-engines/renpy (in spite of 7.4.0 being > >> described by upstream as a pre-release) than last-rite it altogether. Looks like you misunderstood what "Python 3 compatibility mode" means. See official explanation: https://www.renpy.org/dev-doc/html/changelog.html#python-2-python-3-compatibility-mode * Full Changelog 7.4.0 [...] Python 2/Python 3 Compatibility Mode While Ren'Py is not yet supported on Python 3, this release of Ren'Py includes several features to allow you to begin writing scripts that will work on both Python 2 and Python 3. * Just to be sure I tried to build renpy-7.4.0 using python3: it fails because it still uses python2 code inside (but with import future, so it can support scripts in python 3). Python3 support for the RenPy itself is expected in 8.0 version. > > Sure but I'm afraid the games will need explicit porting to py3 as well. > > Well, the games will probably have to go - if I see correctly we have > currently got 4 games-engines/renpy revdeps in the tree > (games-misc/katawa-shoujo, games-rpg/asphyxia, games-rpg/sakura-spirit, > games-rpg/the-royal-trap) and they all explicitly depend on a slotted > older version of the engine. 1. pygame_sdl2 is ported to python3, so there is no need to remove it even if renpy will be temporarily gone. 2. It should be possible to keep renpy and games as masked in the tree, but this will require users to setup some python2 env themselves. If this is an acceptable option, I can bump renpy to 7.4.0 in the tree. Best regards, Andrew Savchenko pgpLur_fqtS57.pgp Description: PGP signature
