Bug 902895

Summary:	net-misc/oidc-agent-4.5.1: failed to apply oidc-agent-4.4.0_deps-automagic.patch
Product:	Gentoo Linux	Reporter:	Dan Molik <dan>
Component:	Current packages	Assignee:	Marek Szuba (RETIRED) <marecki>
Status:	RESOLVED FIXED
Severity:	normal
Priority:	Normal
Version:	unspecified
Hardware:	All
OS:	Linux
Whiteboard:
Package list:		Runtime testing required:	---

Description Dan Molik 2023-03-24 13:28:25 UTC

oidc-agent ebuild fails to apply local patch oidc-agent-4.4.0_deps-automagic.patch in version 4.5.1, consider dropping it in the most current version


Reproducible: Always

Steps to Reproduce:
emerge oidc-agent
Actual Results:  
>>> Emerging (1 of 1) net-misc/oidc-agent-4.5.1::gentoo
 * oidc-agent-4.5.1.tar.gz BLAKE2B SHA512 size ;-) ...                                                                                                                                                                                                                                                                 [ ok ]
>>> Unpacking source...
>>> Unpacking oidc-agent-4.5.1.tar.gz to /var/tmp/portage/net-misc/oidc-agent-4.5.1/work
>>> Source unpacked in /var/tmp/portage/net-misc/oidc-agent-4.5.1/work
>>> Preparing source in /var/tmp/portage/net-misc/oidc-agent-4.5.1/work/oidc-agent-4.5.1 ...
 * Applying oidc-agent-4.4.0_deps-automagic.patch ...
patching file Makefile
Hunk #1 FAILED at 78.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej                                                                                                                                                                                                                                                          [ !! ]
 * ERROR: net-misc/oidc-agent-4.5.1::gentoo failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/net-misc/oidc-agent-4.5.1/files/oidc-agent-4.4.0_deps-automagic.patch
 * 
 * Call stack:
 *               ebuild.sh, line 136:  Called src_prepare
 *             environment, line 545:  Called default
 *      phase-functions.sh, line 872:  Called default_src_prepare
 *      phase-functions.sh, line 948:  Called __eapi8_src_prepare
 *             environment, line 313:  Called eapply '--' '/var/tmp/portage/net-misc/oidc-agent-4.5.1/files/oidc-agent-4.4.0_deps-automagic.patch' '/var/tmp/portage/net-misc/oidc-agent-4.5.1/files/oidc-agent-4.4.0_install-perms.patch' '/var/tmp/portage/net-misc/oidc-agent-4.5.1/files/oidc-agent-4.5.0_webkit41.patch'
 *             environment, line 400:  Called _eapply_patch '/var/tmp/portage/net-misc/oidc-agent-4.5.1/files/oidc-agent-4.4.0_deps-automagic.patch'
 *             environment, line 338:  Called __helpers_die 'patch -p1  failed with /var/tmp/portage/net-misc/oidc-agent-4.5.1/files/oidc-agent-4.4.0_deps-automagic.patch'
 *   isolated-functions.sh, line 112:  Called die
 * The specific snippet of code:
 *   		die "$@"
 * 
 * If you need support, post the output of `emerge --info '=net-misc/oidc-agent-4.5.1::gentoo'`,
 * the complete build log and the output of `emerge -pqv '=net-misc/oidc-agent-4.5.1::gentoo'`.
 * The complete build log is located at '/var/tmp/portage/net-misc/oidc-agent-4.5.1/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/net-misc/oidc-agent-4.5.1/temp/environment'.
 * Working directory: '/var/tmp/portage/net-misc/oidc-agent-4.5.1/work/oidc-agent-4.5.1'
 * S: '/var/tmp/portage/net-misc/oidc-agent-4.5.1/work/oidc-agent-4.5.1'


Expected Results:  
it installs

Comment 1 Marek Szuba (RETIRED) archtester

2023-03-27 20:03:25 UTC

And once again I forgot to add the last batch of changes to the commit. Sigh. That said, come to think of it let us indeed not bother with the patch and just set all USE_FOO_SO variables in the ebuilds.

Comment 2 Larry the Git Cow gentoo-dev

2023-03-27 20:18:39 UTC

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e77818288c6c60aced72576c702e7b72f0362965

commit e77818288c6c60aced72576c702e7b72f0362965
Author:     Marek Szuba <marecki@gentoo.org>
AuthorDate: 2023-03-27 20:08:51 +0000
Commit:     Marek Szuba <marecki@gentoo.org>
CommitDate: 2023-03-27 20:18:30 +0000

    net-misc/oidc-agent: drop the deps_automagic patch
    
    The version compatible with 4.5.1 got left out of the version-bump
    commit, and in general not needed if all USE_FOO_SO variables are
    set by the ebuilds.
    
    Closes: https://bugs.gentoo.org/902895
    Signed-off-by: Marek Szuba <marecki@gentoo.org>

 .../oidc-agent/files/oidc-agent-4.4.0_deps-automagic.patch  | 13 -------------
 net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild              |  2 +-
 net-misc/oidc-agent/oidc-agent-4.5.1.ebuild                 |  3 ++-
 3 files changed, 3 insertions(+), 15 deletions(-)