[gentoo-dev] [PATCH] gnome2-utils.eclass: skip executing cross-compiled tools

2020-12-02 Thread David Michael
Executing tools installed in ROOT will fail when cross-compiling,
so this prints a warning about manually running the command instead
in that case.  The warning is copied from dev-libs/glib.

This also reorders the exception handling by increasing severity so
that the "nothing to do" non-error returns first, otherwise the
expected problem of unexecutable cross-compiled commands returns,
otherwise the unexpected problem of missing commands returns.

The immodule cache functions were updated to handle a different
problem.  They run native tools from BROOT, but they are not
guaranteed to exist while cross-compiling (e.g. gtk+ can't BDEPEND
on itself, so the cross-compiled gtk+ can be installed before the
native gtk+, which fails from gtk-query-immodules not existing).

Closes: https://bugs.gentoo.org/757483
Signed-off-by: David Michael 
---

Hi,

Here is an eclass patch to fix bug #757483.  I wasn't sure if the
cross-compiling message should be a warning while everything else was a
debug-print, but I left it matching what glib does.  The message in the
glib ebuilds should be dropped if this is applied.

Thanks.

David

 eclass/gnome2-utils.eclass | 98 +-
 1 file changed, 75 insertions(+), 23 deletions(-)

diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
index 06643db0f60..4abaf3a1a5c 100644
--- a/eclass/gnome2-utils.eclass
+++ b/eclass/gnome2-utils.eclass
@@ -16,8 +16,9 @@
 
 [[ ${EAPI:-0} == [012345] ]] && inherit multilib
 # eutils.eclass: emktemp
+# toolchain-funs.eclass: tc-is-cross-compiler
 # xdg-utils.eclass: xdg_environment_reset, xdg_icon_cache_update
-inherit eutils xdg-utils
+inherit eutils toolchain-funcs xdg-utils
 
 case "${EAPI:-0}" in
0|1|2|3|4|5|6|7) ;;
@@ -125,13 +126,21 @@ gnome2_gconf_install() {
has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
local updater="${EROOT%/}${GCONFTOOL_BIN}"
 
-   if [[ ! -x "${updater}" ]]; then
-   debug-print "${updater} is not executable"
+   if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
+   debug-print "No GNOME 2 GConf schemas found"
return
fi
 
-   if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
-   debug-print "No GNOME 2 GConf schemas found"
+   if tc-is-cross-compiler ; then
+   ewarn "Updating of GNOME 2 GConf schemas skipped due to 
cross-compilation."
+   ewarn "You might want to run gconftool-2 manually on the target 
for"
+   ewarn "your final image and re-run it when packages installing"
+   ewarn "GNOME 2 GConf schemas get upgraded or added to the 
image."
+   return
+   fi
+
+   if [[ ! -x "${updater}" ]]; then
+   debug-print "${updater} is not executable"
return
fi
 
@@ -166,13 +175,20 @@ gnome2_gconf_uninstall() {
has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
local updater="${EROOT%/}${GCONFTOOL_BIN}"
 
-   if [[ ! -x "${updater}" ]]; then
-   debug-print "${updater} is not executable"
+   if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
+   debug-print "No GNOME 2 GConf schemas found"
return
fi
 
-   if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
-   debug-print "No GNOME 2 GConf schemas found"
+   if tc-is-cross-compiler ; then
+   ewarn "Removal of GNOME 2 GConf schemas skipped due to 
cross-compilation."
+   ewarn "You might want to run gconftool-2 manually on the target 
for"
+   ewarn "your final image to uninstall this package's schemas."
+   return
+   fi
+
+   if [[ ! -x "${updater}" ]]; then
+   debug-print "${updater} is not executable"
return
fi
 
@@ -269,13 +285,21 @@ gnome2_scrollkeeper_update() {
has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
local updater="${EROOT%/}${SCROLLKEEPER_UPDATE_BIN}"
 
-   if [[ ! -x "${updater}" ]] ; then
-   debug-print "${updater} is not executable"
+   if [[ -z "${GNOME2_ECLASS_SCROLLS}" ]]; then
+   debug-print "No scroll cache to update"
return
fi
 
-   if [[ -z "${GNOME2_ECLASS_SCROLLS}" ]]; then
-   debug-print "No scroll cache to update"
+   if tc-is-cross-compiler ; then
+   ewarn "Updating of scrollkeeper database skipped due to 
cross-compilation."
+   ewarn "You might want to run scrollkeeper-update manually on 
the target"
+   ewarn "for your final image and re-run it when packages 
installing"
+   ewarn "scrollkeeper OMF files get upgraded or added to the 
image."
+   return
+   fi
+
+   if [[ ! -x "${updater}" ]] ; then
+   debug-print "${updater} is not executable"
return
fi
 
@@ -305,6 +329,14 @@ gnome2_schemas_update() {
has 

[gentoo-dev] Last rites: dev-python/pytest-catchlog

2020-12-02 Thread Aaron Bauman
# Aaron Bauman  (2020-12-02)
# Deprecated. Functionality is native to dev-python/pytest now
# Removal in 14 days
dev-python/pytest-catchlog

-- 
Cheers,
Aaron


signature.asc
Description: PGP signature


Re: [gentoo-dev] Packages up for grabs

2020-12-02 Thread Alarig Le Lay
On Wed 02 Dec 2020 11:18:06 GMT, Sergey Popov wrote:
> - net-wireless/wavemon
> 
> Have three bugs opened.
> https://bugs.gentoo.org/show_bug.cgi?id=649632 - version bump request
> https://bugs.gentoo.org/show_bug.cgi?id=703030 - tweak build-time 
> dependency on kernel feature
> https://bugs.gentoo.org/show_bug.cgi?id=757396 - in-progress stabilization

I’m interested to take care of net-wireless/wavemon, I bumped it to
0.9.1 on my own overlay some months ago. I just added the kernel
configuration check and the 0.9.2 version.
https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay/src/branch/master/net-wireless/wavemon

I’ll make a MR for proxy-maint stuff on metadata.xml and then I’ll make
one for the bugs.

-- 
Alarig



[gentoo-portage-dev] [PATCH] find_smallest_cycle: don't merge satisfied PDEPEND too early

2020-12-02 Thread Zac Medico
After PDEPENDs have been neglected by the find_smallest_cycle function,
do not try to merge them too early if they are already satisfied by
an installed package. This fixes incorrect merge order for PDEPEND
cycles involving xorg-server and xorg-drivers, which was triggered
by commit 5095c2023595a75e2848f1ad3dbe25b5fb451a44 because it gave
PDEPEND higher priority than satisfied buildtime dependencies.

Fixes: 5095c2023595 ("find_smallest_cycle: enhance search prioritization")
Reported-by: josef64 in #gentoo-portage
Bug: https://bugs.gentoo.org/754903
Signed-off-by: Zac Medico 
---
 lib/_emerge/DepPrioritySatisfiedRange.py  |  1 +
 lib/_emerge/depgraph.py   |  8 +++---
 .../tests/resolver/test_merge_order.py| 27 +--
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/lib/_emerge/DepPrioritySatisfiedRange.py 
b/lib/_emerge/DepPrioritySatisfiedRange.py
index fb0d7db4e..f546590e0 100644
--- a/lib/_emerge/DepPrioritySatisfiedRange.py
+++ b/lib/_emerge/DepPrioritySatisfiedRange.py
@@ -93,6 +93,7 @@ class DepPrioritySatisfiedRange:
ignore_medium  = _ignore_runtime
ignore_medium_soft = _ignore_satisfied_buildtime_slot_op
ignore_medium_post = _ignore_runtime_post
+   ignore_medium_post_satisifed = _ignore_satisfied_runtime_post
ignore_soft= _ignore_optional
 
 
diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index 1271bda3e..0450291d4 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -8052,18 +8052,18 @@ class depgraph:

(selected_nodes[0],), noiselevel=-1)
 
if selected_nodes and ignore_priority is not None:
-   # Try to merge ignored medium_post deps as soon 
as possible
+   # Try to merge neglected medium_post deps as 
soon as possible
# if they're not satisfied by installed 
packages.
for node in selected_nodes:
children = 
set(mygraph.child_nodes(node))
-   soft = children.difference(
+   medium_post_satisifed = 
children.difference(
mygraph.child_nodes(node,
ignore_priority = \
-   
DepPrioritySatisfiedRange.ignore_soft))
+   
DepPrioritySatisfiedRange.ignore_medium_post_satisifed))
medium_post = children.difference(
mygraph.child_nodes(node,

ignore_priority=DepPrioritySatisfiedRange.ignore_medium_post))
-   medium_post -= soft
+   medium_post -= medium_post_satisifed
for child in medium_post:
if child in selected_nodes:
continue
diff --git a/lib/portage/tests/resolver/test_merge_order.py 
b/lib/portage/tests/resolver/test_merge_order.py
index f81fd2f6f..0510a0636 100644
--- a/lib/portage/tests/resolver/test_merge_order.py
+++ b/lib/portage/tests/resolver/test_merge_order.py
@@ -217,12 +217,23 @@ class MergeOrderTestCase(TestCase):
"IUSE" : "X +encode",
"RDEPEND" : "|| ( 
>=media-video/ffmpeg-0.6.90_rc0-r2[X=,encode=] 
>=media-video/libav-0.6.90_rc[X=,encode=] )",
},
+   "x11-base/xorg-drivers-1.20-r2": {
+   "EAPI": "7",
+   "IUSE": "+video_cards_fbdev",
+   "PDEPEND": "x11-base/xorg-server 
video_cards_fbdev? ( x11-drivers/xf86-video-fbdev )",
+   },
"x11-base/xorg-server-1.14.1" : {
"EAPI" : "5",
"SLOT": "0/1.14.1",
"DEPEND" : "media-libs/mesa",
"RDEPEND" : "media-libs/mesa",
+   "PDEPEND": "x11-base/xorg-drivers",
},
+   "x11-drivers/xf86-video-fbdev-0.5.0-r1": {
+   "EAPI": "7",
+   "DEPEND": "x11-base/xorg-server:=",
+   "RDEPEND": "x11-base/xorg-server",
+   }
}
 
installed = {
@@ -299,12 +310,24 @@ class MergeOrderTestCase(TestCase):
"USE" : "encode",
"RDEPEND" : 

[gentoo-portage-dev] Re: [PATCH] Updates for portage-3.0.11 release

2020-12-02 Thread Zac Medico
On 12/2/20 12:18 AM, Zac Medico wrote:
> Signed-off-by: Zac Medico 
> ---
>  RELEASE-NOTES | 6 ++
>  setup.py  | 2 +-
>  2 files changed, 7 insertions(+), 1 deletion(-)

Please ignore.
-- 
Thanks,
Zac



signature.asc
Description: OpenPGP digital signature


[gentoo-dev] Packages up for grabs

2020-12-02 Thread Sergey Popov

Dear all

Due to lack of time, i am dropping to maintainer-needed following packages:

app-emulation/dynamips
app-misc/geekcode
net-im/err
net-vpn/vtun
net-wireless/wavemon

Quick summary about current state of these packages in tree:

- app-emulation/dynamips

Have one opened bug(https://bugs.gentoo.org/726652), mostly upstream 
related. Ebuild needs some love(move away from cmake-utils eclass,for 
example).


- app-misc/geekcode

Have one opened bug(https://bugs.gentoo.org/707246). Package is quite 
old, probably a good candidate for last-riting.


- net-im/err

Have two opened bugs. 
One(https://bugs.gentoo.org/show_bug.cgi?id=751865) is about buildsystem 
stuff, other(https://bugs.gentoo.org/show_bug.cgi?id=754663) is related 
to in-tree version being seriously outdated. Version bump will probably 
require to unbundle a lot of stuff.


- net-vpn/vtun

Have one opened bug(https://bugs.gentoo.org/show_bug.cgi?id=708372).
Version in tree is one behind upstream(3.0.4).

- net-wireless/wavemon

Have three bugs opened.
https://bugs.gentoo.org/show_bug.cgi?id=649632 - version bump request
https://bugs.gentoo.org/show_bug.cgi?id=703030 - tweak build-time 
dependency on kernel feature

https://bugs.gentoo.org/show_bug.cgi?id=757396 - in-progress stabilization

--
Best regards, Sergey Popov
Gentoo developer



[gentoo-portage-dev] [PATCH] Updates for portage-3.0.11 release

2020-12-02 Thread Zac Medico
Signed-off-by: Zac Medico 
---
 RELEASE-NOTES | 6 ++
 setup.py  | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 61c3c3d16..7fff83017 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,6 +1,12 @@
 Release Notes; upgrade information mainly.
 Features/major bugfixes are listed in NEWS
 
+portage-3.0.11
+==
+* Bug Fixes:
+- Bug 756961 handle dev-lang/rust[system-bootstrap] dependency cycle
+- Bug 757306 backtracking: fix virtual choices for circular deps
+
 portage-3.0.10
 ==
 * Bug Fixes:
diff --git a/setup.py b/setup.py
index 443b94422..95a53307d 100755
--- a/setup.py
+++ b/setup.py
@@ -655,7 +655,7 @@ class build_ext(_build_ext):
 
 setup(
name = 'portage',
-   version = '3.0.10',
+   version = '3.0.11',
url = 'https://wiki.gentoo.org/wiki/Project:Portage',
author = 'Gentoo Portage Development Team',
author_email = 'dev-port...@gentoo.org',
-- 
2.26.2