Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 834033 - sci-chemistry/surf-1.0 - file collision with sci-chemistry/molden-6.9
Summary: sci-chemistry/surf-1.0 - file collision with sci-chemistry/molden-6.9
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo Chemistry-Related Packages
URL:
Whiteboard:
Keywords: PullRequest
Depends on:
Blocks:
 
Reported: 2022-02-25 15:47 UTC by Toralf Förster
Modified: 2022-07-16 14:06 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
emerge-info.txt (emerge-info.txt,16.86 KB, text/plain)
2022-02-25 15:47 UTC, Toralf Förster
Details
emerge-history.txt (emerge-history.txt,222.33 KB, text/plain)
2022-02-25 15:47 UTC, Toralf Förster
Details
etc.portage.tar.bz2 (etc.portage.tar.bz2,28.61 KB, application/x-bzip)
2022-02-25 15:47 UTC, Toralf Förster
Details
logs.tar.bz2 (logs.tar.bz2,7.68 KB, application/x-bzip)
2022-02-25 15:47 UTC, Toralf Förster
Details
sci-chemistry:surf-1.0:20220225-005112.log (sci-chemistry:surf-1.0:20220225-005112.log,57.79 KB, text/plain)
2022-02-25 15:47 UTC, Toralf Förster
Details
difference between the sci-chemistry/surf ebuild and the one coming with sci-chemistry/molden (surf-molden.patch,5.55 KB, patch)
2022-02-25 17:37 UTC, milan hodoscek
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Toralf Förster gentoo-dev 2022-02-25 15:47:45 UTC
 * Press Ctrl-C to Stop
 * 
 * sci-chemistry/molden-6.9:0::gentoo
 * 	/usr/bin/surf
 * 	/usr/lib/debug/usr/bin/surf.debug
 * 

  -------------------------------------------------------------------

  This is an unstable amd64 chroot image at a tinderbox (==build bot)
  name: 17.1_systemd-j4_debug-20220223-030006

  -------------------------------------------------------------------

gcc-config -l:
 [1] x86_64-pc-linux-gnu-9.3.1
 [2] x86_64-pc-linux-gnu-11.2.1 *
clang/llvm (if any):
Python 3.9.10
Available Ruby profiles:
  [1]   ruby26 (with Rubygems)
  [2]   ruby27 (with Rubygems)
  [3]   ruby30 (with Rubygems) *
Available Rust versions:
  [1]   rust-1.58.1 *
The following VMs are available for generation-2:
*)	Eclipse Temurin JDK 11.0.14_p9 [openjdk-bin-11]
2)	Eclipse Temurin JDK 8.322_p06 [openjdk-bin-8]
Available Java Virtual Machines:
  [1]   openjdk-bin-8 
  [2]   openjdk-bin-11  system-vm

The Glorious Glasgow Haskell Compilation System, version 8.10.4
php cli:
  [1]   php7.4
  [2]   php8.0
  [3]   php8.1 *

  HEAD of ::gentoo
commit 6b9156516f15f61f7df73ca7691d1f52bdba0951
Merge: 7af725ec35de 3595f8f712cb
Author: Repository mirror & CI <repomirrorci@gentoo.org>
Date:   Thu Feb 24 23:51:46 2022 +0000

    Merge updates from master

emerge -qpvO sci-chemistry/surf
[ebuild  N    ] sci-chemistry/surf-1.0
Comment 1 Toralf Förster gentoo-dev 2022-02-25 15:47:46 UTC
Created attachment 765800 [details]
emerge-info.txt
Comment 2 Toralf Förster gentoo-dev 2022-02-25 15:47:48 UTC
Created attachment 765801 [details]
emerge-history.txt
Comment 3 Toralf Förster gentoo-dev 2022-02-25 15:47:49 UTC
Created attachment 765802 [details]
etc.portage.tar.bz2
Comment 4 Toralf Förster gentoo-dev 2022-02-25 15:47:50 UTC
Created attachment 765803 [details]
logs.tar.bz2
Comment 5 Toralf Förster gentoo-dev 2022-02-25 15:47:51 UTC
Created attachment 765804 [details]
sci-chemistry:surf-1.0:20220225-005112.log
Comment 6 milan hodoscek 2022-02-25 17:34:50 UTC
I checked the sources of surf in molden and surf in the ebuild package surf.
They are the same except in the molden's surf version somebody put void in front of a few functions. So surf package is using older C then the one in molden but otherwise they are the sam. I didn't check the Makefiles. They are different but I dint test them :-(

So I guess it would be easier to not bother with the surf program inside molden, but just use the one from the separate ebuild.

I will also attach a patch file so one can see the differences
Comment 7 milan hodoscek 2022-02-25 17:37:33 UTC
Created attachment 765818 [details, diff]
difference between the sci-chemistry/surf ebuild and the one coming with sci-chemistry/molden
Comment 8 Larry the Git Cow gentoo-dev 2022-07-16 14:06:11 UTC
The bug has been closed via the following commit(s):

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

commit bf486b04b3c2f2513ba8fee0278e7395d4cdb63c
Author:     Petr Vaněk <arkamar@atlas.cz>
AuthorDate: 2022-07-16 14:05:58 +0000
Commit:     David Seifert <soap@gentoo.org>
CommitDate: 2022-07-16 14:05:58 +0000

    sci-chemistry/molden: install sci-chemistry/surf instead of bundled one
    
    sci-chemistry/molden newly installs /bin/surf since 6.9, commit
    ec853626b72f ("sci-chemistry/molden: add version 6.9"), however, this is
    bundled version of sci-chemistry/surf which should be used instead. This
    change solves multiple issues:
    
    - unnecessary /bin/surf collision with sci-chemistry/surf and
      www-client/surf, #834033 #858209
    - missing SURF license of bundled surf, which is no longer needed
    - ex: no python-exec wrapped executable found in /usr/lib/python-exec,
      #849371 issue, which is triggered by surf/surf target.
    
    x11-misc/gccmakedep and app-editors/vim dependencies are no longer
    needed because they were used in surf/surf target.
    
    Closes: https://github.com/gentoo/gentoo/pull/26439
    Closes: https://bugs.gentoo.org/822510
    Closes: https://bugs.gentoo.org/834033
    Closes: https://bugs.gentoo.org/849371
    Closes: https://bugs.gentoo.org/858209
    Signed-off-by: Petr Vaněk <arkamar@atlas.cz>
    Signed-off-by: David Seifert <soap@gentoo.org>

 .../molden/{molden-6.9.ebuild => molden-6.9-r1.ebuild}   | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)