[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molden/

["David Seifert" <soap@gentoo.org>]

commit:     bf486b04b3c2f2513ba8fee0278e7395d4cdb63c
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Sat Jul 16 14:05:58 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 14:05:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf486b04

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 <AT> atlas.cz>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

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

diff --git a/sci-chemistry/molden/molden-6.9.ebuild b/sci-chemistry/molden/molden-6.9-r1.ebuild
similarity index 80%
rename from sci-chemistry/molden/molden-6.9.ebuild
rename to sci-chemistry/molden/molden-6.9-r1.ebuild
index df6e76dbfe75..e3ff6d0a079e 100644
--- a/sci-chemistry/molden/molden-6.9.ebuild
+++ b/sci-chemistry/molden/molden-6.9-r1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="opengl"
 
-RDEPEND="
+DEPEND="
 	x11-libs/libXmu
 	opengl? (
 		media-libs/freeglut
@@ -25,10 +25,9 @@ RDEPEND="
 		virtual/glu
 	)
 "
-DEPEND="${RDEPEND}
-	x11-misc/gccmakedep
-	app-editors/vim"
-	# vim provides ex, which the build system uses (surf/Makefile, at least)
+RDEPEND="${DEPEND}
+	sci-chemistry/surf
+"
 
 PATCHES=(
 	"${FILESDIR}/${P}-ldflags.patch"
@@ -36,9 +35,6 @@ PATCHES=(
 
 src_prepare() {
 	default
-	sed \
-		-e 's:makedepend:gccmakedep:g' \
-		-i src/surf/Makefile || die
 	sed 's:shell g77:shell $(FC):g' -i makefile || die
 }
 
@@ -60,7 +56,7 @@ src_compile() {
 	)
 
 	einfo "Building Molden..."
-	emake -j1 molden ambfor/ambfor ambfor/ambmd surf/surf "${args[@]}"
+	emake -j1 molden ambfor/ambfor ambfor/ambmd "${args[@]}"
 	if use opengl ; then
 		einfo "Building Molden OpenGL helper..."
 		emake -j1 "${args[@]}" gmolden
@@ -68,7 +64,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin bin/molden bin/ambfor bin/ambmd bin/surf
+	dobin bin/molden bin/ambfor bin/ambmd
 	if use opengl; then
 		dobin bin/gmolden
 		doicon -s 64 haux/gmolden.png