[gentoo-commits] repo/proj/guru:dev commit in: app-shells/pokemon-colorscripts/

2022-11-05 Thread Patrick Taylor
commit: e874bf810b294fe37936329e7610d0db8c84f55c
Author: Patrick J Taylor  gmail  com>
AuthorDate: Sat Nov  5 15:52:41 2022 +
Commit:     Patrick Taylor  gmail  com>
CommitDate: Sat Nov  5 15:53:08 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e874bf81

app-shells/pokemon-colorscripts: new package, add 

Signed-off-by: Patrick J Taylor  gmail.com>

 app-shells/pokemon-colorscripts/metadata.xml   |  8 +
 .../pokemon-colorscripts-.ebuild   | 40 ++
 2 files changed, 48 insertions(+)

diff --git a/app-shells/pokemon-colorscripts/metadata.xml 
b/app-shells/pokemon-colorscripts/metadata.xml
new file mode 100644
index 0..50dcf2837
--- /dev/null
+++ b/app-shells/pokemon-colorscripts/metadata.xml
@@ -0,0 +1,8 @@
+
+https://www.gentoo.org/dtd/metadata.dtd'>
+
+   
+   patrick.joseph.tay...@gmail.com
+   Patrick J Taylor
+   
+

diff --git a/app-shells/pokemon-colorscripts/pokemon-colorscripts-.ebuild 
b/app-shells/pokemon-colorscripts/pokemon-colorscripts-.ebuild
new file mode 100644
index 0..7fd4da23d
--- /dev/null
+++ b/app-shells/pokemon-colorscripts/pokemon-colorscripts-.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=(python3_{8,9,10})
+
+inherit git-r3 python-single-r1
+
+DESCRIPTION="Pokemon unicode sprites for your terminal!"
+
+HOMEPAGE="https://gitlab.com/phoneybadger/pokemon-colorscripts;
+
+EGIT_REPO_URI="https://gitlab.com/phoneybadger/pokemon-colorscripts.git;
+
+LICENSE="MIT"
+
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-lang/python-3.10.8_p1"
+
+src_prepare() {
+   default
+   sed -i \
+   's#PROGRAM_DIR = os.path.dirname(PROGRAM)#PROGRAM_DIR = 
"/opt/pokemon-colorscripts/"#g' \
+   pokemon-colorscripts.py || die "sed failed."
+}
+
+src_install() {
+   insinto /opt/pokemon-colorscripts
+   doins -r "${S}/colorscripts"
+   doins "${S}/pokemon.json"
+
+   python_scriptinto /opt/pokemon-colorscripts
+   python_doscript "${S}/pokemon-colorscripts.py"
+
+   dosym -r /opt/pokemon-colorscripts/pokemon-colorscripts.py 
/usr/bin/pokemon-colorscripts
+}



[gentoo-commits] repo/proj/guru:dev commit in: app-shells/pokemon-colorscripts/

2022-11-05 Thread Patrick Taylor
commit: f231d14f851d5f674793f94d2f9ad918f2b1416d
Author: Patrick J Taylor  gmail  com>
AuthorDate: Sat Nov  5 17:03:14 2022 +
Commit:     Patrick Taylor  gmail  com>
CommitDate: Sat Nov  5 17:03:14 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f231d14f

app-shells/pokemon-colorscripts: unkeyword  for ~amd64

Additionally, allow CPython 3.11 and set REQUIRED_USE/RDEPEND.

Signed-off-by: Patrick J Taylor  gmail.com>

 app-shells/pokemon-colorscripts/pokemon-colorscripts-.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-shells/pokemon-colorscripts/pokemon-colorscripts-.ebuild 
b/app-shells/pokemon-colorscripts/pokemon-colorscripts-.ebuild
index 7fd4da23d..55e2ba3fe 100644
--- a/app-shells/pokemon-colorscripts/pokemon-colorscripts-.ebuild
+++ b/app-shells/pokemon-colorscripts/pokemon-colorscripts-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=(python3_{8,9,10})
+PYTHON_COMPAT=(python3_{8,9,10,11})
 
 inherit git-r3 python-single-r1
 
@@ -17,9 +17,9 @@ LICENSE="MIT"
 
 SLOT="0"
 
-KEYWORDS="~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND=">=dev-lang/python-3.10.8_p1"
+RDEPEND="${PYTHON_DEPS}"
 
 src_prepare() {
default



[gentoo-commits] repo/proj/guru:dev commit in: sci-chemistry/vesta-bin/

2022-09-13 Thread Patrick Taylor
commit: 0cf72a0dbe583cc5baa85697cde7061758378ee4
Author: Patrick J Taylor  gmail  com>
AuthorDate: Tue Sep 13 17:09:18 2022 +
Commit:     Patrick Taylor  gmail  com>
CommitDate: Tue Sep 13 18:27:24 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0cf72a0d

sci-chemistry/vesta-bin: add explicit GTK2 dependency

Closes: https://bugs.gentoo.org/869944
Signed-off-by: Patrick J Taylor  gmail.com>

 sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild 
b/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild
index f532d32a7..e52f9072f 100644
--- a/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild
+++ b/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild
@@ -20,7 +20,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 # As of 3.5.6, wayland support required for gtk even when running on xorg.
-RDEPEND=">=x11-libs/gtk+-3.24.34[wayland]
+RDEPEND="x11-libs/gtk+:3[wayland]
+   x11-libs/gtk+:2
>=virtual/glu-9.0-r2
>=virtual/jdk-17"
 



[gentoo-commits] repo/proj/guru:dev commit in: sci-chemistry/vesta-bin/

2022-09-13 Thread Patrick Taylor
commit: e5bdcf04d1e64e13c519609089fb30e3f9ad0b33
Author: Patrick J Taylor  gmail  com>
AuthorDate: Tue Sep 13 16:57:04 2022 +
Commit:     Patrick Taylor  gmail  com>
CommitDate: Tue Sep 13 18:27:24 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e5bdcf04

sci-chemistry/vesta-bin: set QA_PREBUILT to silence QA warnings

Closes: https://bugs.gentoo.org/869938
Closes: https://bugs.gentoo.org/869941
Signed-off-by: Patrick J Taylor  gmail.com>

 sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild 
b/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild
index 65ce1ce48..f532d32a7 100644
--- a/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild
+++ b/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild
@@ -26,6 +26,8 @@ RDEPEND=">=x11-libs/gtk+-3.24.34[wayland]
 
 RESTRICT="strip"
 
+QA_PREBUILT="opt/VESTA/*"
+
 src_install() {
insinto /opt/VESTA
doins -r "${S}"/*



[gentoo-commits] repo/proj/guru:dev commit in: sci-chemistry/xcrysden/files/, sci-chemistry/xcrysden/

2022-09-13 Thread Patrick Taylor
commit: f97bb147c9e7d1ae7a0cafae40ab2d891b970dc8
Author: Patrick J Taylor  gmail  com>
AuthorDate: Tue Sep 13 18:25:51 2022 +
Commit:     Patrick Taylor  gmail  com>
CommitDate: Tue Sep 13 18:27:24 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f97bb147

sci-chemistry/xcrysden: edit Makefiles to respect LDFLAGS

Closes: https://bugs.gentoo.org/869947
Signed-off-by: Patrick J Taylor  gmail.com>

 .../xcrysden/files/xcrysden-1.6.2-LDFLAGS.patch| 171 +
 sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild   |   1 +
 2 files changed, 172 insertions(+)

diff --git a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-LDFLAGS.patch 
b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-LDFLAGS.patch
new file mode 100644
index 0..1ae39ae5e
--- /dev/null
+++ b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-LDFLAGS.patch
@@ -0,0 +1,171 @@
+diff --git a/C/Makefile b/C/Makefile
+index 2aa0307..452e0f1 100644
+--- a/C/Makefile
 b/C/Makefile
+@@ -12,7 +12,7 @@ include make-objects
+ 
+ .SUFFIXES: .o .c
+ .c.o:
+-  $(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $<
++  $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $<
+ 
+ objects = $(XC_OBJS) $(EXTERNAL_OBJS)
+ 
+@@ -24,18 +24,18 @@ compile:
+ #objects: $(objects)
+ #
+ #$(objects): %.o: %.c
+-# $(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $<
++# $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $<
+ 
+ xcrys: $(XC_OBJS) $(EXTERNAL_OBJS)
+-  $(CC)  $(CFLAGS) $(XC_OBJS) $(EXTERNAL_OBJS) \
++  $(CC) $(LDFLAGS)  $(CFLAGS) $(XC_OBJS) $(EXTERNAL_OBJS) \
+   -o xcrys $(FFTW3_LIB) $(MESCHACH_LIB) $(TK_LIB) $(TCL_LIB) $(TOGL_LIB) 
$(GLU_LIB) $(GL_LIB) $(X_LIB) $(MATH) $(LDLIB) $(EXT_LIB)
+ 
+ xctclsh: xcTclsh.o
+-  $(CC) $(CFLAGS) xcTclsh.o -o xctclsh $(TCL_LIB) $(MATH) $(LDLIB)
++  $(CC) $(LDFLAGS) $(CFLAGS) xcTclsh.o -o xctclsh $(TCL_LIB) $(MATH) 
$(LDLIB)
+ 
+ XFS_OBJS = xsf2xsf.o
+ xsf2xsf: $(XFS_OBJS) 
+-  $(CC) $(CFLAGS) $(XFS_OBJS) -o xsf2xsf $(MATH) $(LDLIB)
++  $(CC) $(LDFLAGS) $(CFLAGS) $(XFS_OBJS) -o xsf2xsf $(MATH) $(LDLIB)
+ 
+ 
+ install:
+diff --git a/F/Makefile b/F/Makefile
+index 3f8270e..92f17d1 100644
+--- a/F/Makefile
 b/F/Makefile
+@@ -4,10 +4,10 @@ include ../Make.sys
+ .SUFFIXES : .o .f .f90
+ 
+ .f90.o:
+-  $(FC) $(FFLAGS) -c $<
++  $(FC) $(LDFLAGS) $(FFLAGS) -c $<
+ 
+ .f.o:
+-  $(FC) $(FFLAGS) -c $<
++  $(FC) $(LDFLAGS) $(FFLAGS) -c $<
+ 
+ OBJ =   gengeom.o \
+   multhexa.o \
+@@ -73,70 +73,70 @@ spaghetti:
+   cd SRC_spaghetti; $(MAKE)
+ 
+ gengeom: $(OBJ)
+-  $(FC) $(FFLAGS) -o gengeom $(OBJ)
++  $(FC) $(LDFLAGS) $(FFLAGS) -o gengeom $(OBJ)
+ 
+ calplane: $(OBJ2)
+-  $(FC) $(FFLAGS) -o calplane $(OBJ2)
++  $(FC) $(LDFLAGS) $(FFLAGS) -o calplane $(OBJ2)
+ 
+ atomlab: $(OBJ3)
+-  $(FC) $(FFLAGS) -o atomlab $(OBJ3)
++  $(FC) $(LDFLAGS) $(FFLAGS) -o atomlab $(OBJ3)
+ 
+ recvec: recvec.o auxil.o
+-  $(FC) $(FFLAGS) -o recvec recvec.o auxil.o 
++  $(FC) $(LDFLAGS) $(FFLAGS) -o recvec recvec.o auxil.o 
+ 
+ str2xcr: $(OBJ5)
+-  $(FC) $(FFLAGS) -o str2xcr $(OBJ5)
++  $(FC) $(LDFLAGS) $(FFLAGS) -o str2xcr $(OBJ5)
+ 
+ fracCoor: fracCoor.o auxil.o  readf1.o
+-  $(FC) $(FFLAGS) -o fracCoor fracCoor.o auxil.o  readf1.o
++  $(FC) $(LDFLAGS) $(FFLAGS) -o fracCoor fracCoor.o auxil.o  readf1.o
+ 
+ multislab: $(OBJ6)
+-  $(FC) $(FFLAGS) -o multislab $(OBJ6)
++  $(FC) $(LDFLAGS) $(FFLAGS) -o multislab $(OBJ6)
+ 
+ savestruct: $(OBJ7)
+-  $(FC) $(FFLAGS) -o savestruct $(OBJ7)
++  $(FC) $(LDFLAGS) $(FFLAGS) -o savestruct $(OBJ7)
+ 
+ ftnunit: ftnunit.o
+-  $(FC) $(FFLAGS) -o ftnunit ftnunit.o
++  $(FC) $(LDFLAGS) $(FFLAGS) -o ftnunit ftnunit.o
+ 
+ kPath: $(OBJ8)
+-  $(FC) $(FFLAGS) -o kPath $(OBJ8)
++  $(FC) $(LDFLAGS) $(FFLAGS) -o kPath $(OBJ8)
+ 
+ pwKPath: $(OBJ88)
+-  $(FC) $(FFLAGS) -o pwKPath $(OBJ88)
++  $(FC) $(LDFLAGS) $(FFLAGS) -o pwKPath $(OBJ88)
+ 
+ fhi_inpini2ftn34: fhi_inpini2ftn34.o
+-  $(FC) $(FFLAGS) -o fhi_inpini2ftn34 fhi_inpini2ftn34.o
++  $(FC) $(LDFLAGS) $(FFLAGS) -o fhi_inpini2ftn34 fhi_inpini2ftn34.o
+ 
+ fhi_coord2xcr: fhi_coord2xcr.o
+-  $(FC) $(FFLAGS) -o fhi_coord2xcr fhi_coord2xcr.o
++  $(FC) $(LDFLAGS) $(FFLAGS) -o fhi_coord2xcr fhi_coord2xcr.o
+ 
+ wn_readbands: $(OBJ9)
+-  $(FC) $(FFLAGS) -o wn_readbands $(OBJ9)  $(OBJ10)
++  $(FC) $(LDFLAGS) $(FFLAGS) -o wn_readbands $(OBJ9)  $(OBJ10)
+ 
+ wn_readbakgen: wn_readbakgen.o
+-  $(FC) $(FFLAGS) -o wn_readbakgen wn_readbakgen.o
++  $(FC) $(LDFLAGS) $(FFLAGS) -o wn_readbakgen wn_readbakgen.o
+ 
+ pw: pwi2xsf pwi2xsf_old pwo_xsf2xsf
+ 
+ 
+ pwi2xsf_old: $(OBJ11) 
+-  $(FC) $(FFLAGS) -o pwi2xsf_old $(OBJ11)
++  $(FC) $(LDFLAGS) $(FFLAGS) -o pwi2xsf_old $(OBJ11)
+ 
+ pwi2xsf: $(OBJ111)
+-  $(FC) $(FFLAGS) -o pwi2xsf $(OBJ111)
++  $(FC) $(LDFLAGS) $(FFLAGS) -o pwi2xsf $(OBJ111)
+ 
+ pwo_xsf2xsf: $(OBJ13)
+-   

[gentoo-commits] repo/proj/guru:dev commit in: sci-chemistry/vesta-bin/, sci-chemistry/vesta-bin/files/

2022-09-10 Thread Patrick Taylor
commit: e2c88d95b6cf9b32b65f525119d7cd4ba241c23a
Author: Patrick J Taylor  gmail  com>
AuthorDate: Sun Sep 11 01:09:01 2022 +
Commit:     Patrick Taylor  gmail  com>
CommitDate: Sun Sep 11 01:09:01 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e2c88d95

sci-chemistry/vesta-bin: remove absolute symlink

Signed-off-by: Patrick J Taylor  gmail.com>

 sci-chemistry/vesta-bin/files/VESTA.desktop| 4 ++--
 sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/sci-chemistry/vesta-bin/files/VESTA.desktop 
b/sci-chemistry/vesta-bin/files/VESTA.desktop
index 240692b76..8741428db 100644
--- a/sci-chemistry/vesta-bin/files/VESTA.desktop
+++ b/sci-chemistry/vesta-bin/files/VESTA.desktop
@@ -2,7 +2,7 @@
 Name=VESTA
 Type=Application
 Comment=For the visualisation of molecular and crystal structures.
-Exec=VESTA
-TryExec=VESTA
+Exec=/opt/VESTA/VESTA
+TryExec=/opt/VESTA/VESTA
 Icon=/usr/share/icons/hicolor/128x128/apps/VESTA.png
 Categories=Science;

diff --git a/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild 
b/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild
index 7969e59ca..65ce1ce48 100644
--- a/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild
+++ b/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild
@@ -36,5 +36,4 @@ src_install() {
newicon -s 128x128 "${D}"/opt/VESTA/img/logo.png VESTA.png
 
dosym -r /opt/VESTA/libVESTA.so /usr/lib64/libVESTA.so
-   dosym "${EPREFIX}"/opt/VESTA/VESTA /usr/bin/VESTA
 }



[gentoo-commits] repo/proj/guru:dev commit in: sci-chemistry/vesta-bin/

2022-09-10 Thread Patrick Taylor
commit: f18a1954b9ed034bb3d4d5fc6e6b0d79725c4e31
Author: Patrick J Taylor  gmail  com>
AuthorDate: Sun Sep 11 00:37:19 2022 +
Commit:     Patrick Taylor  gmail  com>
CommitDate: Sun Sep 11 00:37:19 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f18a1954

sci-chemistry/vesta-bin: fix symlinks and very minor syntax changes

Signed-off-by: Patrick J Taylor  gmail.com>

 sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild 
b/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild
index 38cf7d8a9..7969e59ca 100644
--- a/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild
+++ b/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild
@@ -28,13 +28,13 @@ RESTRICT="strip"
 
 src_install() {
insinto /opt/VESTA
-   doins -r ${S}/*
+   doins -r "${S}"/*
fperms +x /opt/VESTA/VESTA
fperms +x /opt/VESTA/VESTA-gui
 
-   domenu "${FILESDIR}/VESTA.desktop"
-   newicon -s 128x128 ${D}/opt/VESTA/img/logo.png VESTA.png
+   domenu "${FILESDIR}"/VESTA.desktop
+   newicon -s 128x128 "${D}"/opt/VESTA/img/logo.png VESTA.png
 
-   dosym /opt/VESTA/libVESTA.so /usr/lib64/libVESTA.so
-   dosym /opt/VESTA/VESTA-gui /usr/bin/VESTA
+   dosym -r /opt/VESTA/libVESTA.so /usr/lib64/libVESTA.so
+   dosym "${EPREFIX}"/opt/VESTA/VESTA /usr/bin/VESTA
 }



[gentoo-commits] repo/proj/guru:dev commit in: licenses/

2022-09-10 Thread Patrick Taylor
commit: 2034132d98503a6cf49400dcd09b24bc4629e5f9
Author: Patrick J Taylor  gmail  com>
AuthorDate: Sat Sep 10 23:37:36 2022 +
Commit:     Patrick Taylor  gmail  com>
CommitDate: Sat Sep 10 23:37:36 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2034132d

licenses: add VESTA license

Signed-off-by: Patrick J Taylor  gmail.com>

 licenses/VESTA | 28 
 1 file changed, 28 insertions(+)

diff --git a/licenses/VESTA b/licenses/VESTA
new file mode 100644
index 0..05a271792
--- /dev/null
+++ b/licenses/VESTA
@@ -0,0 +1,28 @@
+
+ VESTA LICENSE
+Version 3
+
+Copyright (C) 2006-2021, Koichi Momma and Fujio Izumi
+
+VESTA is currently copyrighted with its source code not open to the 
+public; we wish to control the development and future of VESTA by 
+ourselves. This software is distributed free of charge for academic, 
+scientific, educational, and non-commercial users. Users belonging to
+commercial enterprises may also use this software at no cost until a 
+license for business users is established.
+
+Permission to use this software is hereby granted under the following
+conditions:
+
+1) Drawings produced by VESTA may be used in any publications provided 
+that its use is explicitly acknowledged. A suitable reference for 
+VESTA is:
+
+K. Momma and F. Izumi, "VESTA 3 for three-dimensional visualization of 
crystal, volumetric and morphology data," J. Appl. Crystallogr., 44, 1272-1276 
(2011).
+
+2) You should not redistribute any copy of the distributed files
+including MADEL and STRUCTURE TIDY unless you have a written
+permission from us.
+
+Part of these terms may be changed without any prior announcement.
+This software is provided "as is" without any expressed or implied warranty.



[gentoo-commits] repo/proj/guru:dev commit in: sci-chemistry/xcrysden/

2022-09-10 Thread Patrick Taylor
commit: 4dcefd003b68a8e91ff7febad71989613f4c2858
Author: Patrick J Taylor  gmail  com>
AuthorDate: Sat Sep 10 23:26:39 2022 +
Commit:     Patrick Taylor  gmail  com>
CommitDate: Sat Sep 10 23:26:39 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4dcefd00

sci-chemistry/xcrysden: add missing dependencies

Signed-off-by: Patrick J Taylor  gmail.com>

 sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild 
b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
index f8b459ae2..b76f8a0a1 100644
--- a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
+++ b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
@@ -17,7 +17,9 @@ SLOT="0"
 
 KEYWORDS="~amd64"
 
-RDEPEND=">=dev-lang/tcl-8.6.12
+RDEPEND=">=x11-base/xorg-server-21.1.4
+   >=virtual/glu-9.0-r2
+   >=dev-lang/tcl-8.6.12
>=dev-lang/tk-8.6.12
>=dev-tcltk/togl-2.0-r3
>=dev-tcltk/bwidget-1.9.14



[gentoo-commits] repo/proj/guru:dev commit in: sci-chemistry/vesta-bin/, sci-chemistry/vesta-bin/files/

2022-09-10 Thread Patrick Taylor
commit: d03410871366d089e0888d0743dd438ce4a0f85b
Author: Patrick J Taylor  gmail  com>
AuthorDate: Sat Sep 10 23:37:28 2022 +
Commit:     Patrick Taylor  gmail  com>
CommitDate: Sat Sep 10 23:37:28 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d0341087

sci-chemistry/vesta-bin: new package, add 3.5.8

Signed-off-by: Patrick J Taylor  gmail.com>

 sci-chemistry/vesta-bin/Manifest   |  1 +
 sci-chemistry/vesta-bin/files/VESTA.desktop|  8 ++
 sci-chemistry/vesta-bin/metadata.xml   |  8 ++
 sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild | 40 ++
 4 files changed, 57 insertions(+)

diff --git a/sci-chemistry/vesta-bin/Manifest b/sci-chemistry/vesta-bin/Manifest
new file mode 100644
index 0..eddda12fc
--- /dev/null
+++ b/sci-chemistry/vesta-bin/Manifest
@@ -0,0 +1 @@
+DIST VESTA-gtk3.tar.bz2 24963082 BLAKE2B 
e3f32358c841ba3dadcb95df68385ef7bd3d004abdd4aad67ad170b04c252318bf49c8bf52eed505277342df22d59d80a1e68440d248c52d08fb12c870c519a2
 SHA512 
d6ec6ed11a173b899b8d29da0b727f454272e5b3127544c1992a0a8a5a9d4318b0e021230beddd0b43b92cdd5a077a1394dc987dd9dae1b40f00e8ebddef9843

diff --git a/sci-chemistry/vesta-bin/files/VESTA.desktop 
b/sci-chemistry/vesta-bin/files/VESTA.desktop
new file mode 100644
index 0..240692b76
--- /dev/null
+++ b/sci-chemistry/vesta-bin/files/VESTA.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=VESTA
+Type=Application
+Comment=For the visualisation of molecular and crystal structures.
+Exec=VESTA
+TryExec=VESTA
+Icon=/usr/share/icons/hicolor/128x128/apps/VESTA.png
+Categories=Science;

diff --git a/sci-chemistry/vesta-bin/metadata.xml 
b/sci-chemistry/vesta-bin/metadata.xml
new file mode 100644
index 0..50dcf2837
--- /dev/null
+++ b/sci-chemistry/vesta-bin/metadata.xml
@@ -0,0 +1,8 @@
+
+https://www.gentoo.org/dtd/metadata.dtd'>
+
+   
+   patrick.joseph.tay...@gmail.com
+   Patrick J Taylor
+   
+

diff --git a/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild 
b/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild
new file mode 100644
index 0..38cf7d8a9
--- /dev/null
+++ b/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="Visualisation for Electronic and STructural Analysis."
+
+HOMEPAGE="https://jp-minerals.org/vesta/en/;
+
+SRC_URI="https://jp-minerals.org/vesta/archives/${PV}/VESTA-gtk3.tar.bz2;
+
+S="${WORKDIR}/VESTA-gtk3"
+
+LICENSE="VESTA"
+
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+# As of 3.5.6, wayland support required for gtk even when running on xorg.
+RDEPEND=">=x11-libs/gtk+-3.24.34[wayland]
+   >=virtual/glu-9.0-r2
+   >=virtual/jdk-17"
+
+RESTRICT="strip"
+
+src_install() {
+   insinto /opt/VESTA
+   doins -r ${S}/*
+   fperms +x /opt/VESTA/VESTA
+   fperms +x /opt/VESTA/VESTA-gui
+
+   domenu "${FILESDIR}/VESTA.desktop"
+   newicon -s 128x128 ${D}/opt/VESTA/img/logo.png VESTA.png
+
+   dosym /opt/VESTA/libVESTA.so /usr/lib64/libVESTA.so
+   dosym /opt/VESTA/VESTA-gui /usr/bin/VESTA
+}



[gentoo-commits] repo/proj/guru:dev commit in: sci-chemistry/xcrysden/

2022-09-10 Thread Patrick Taylor
commit: cba32fbe5315194e22ea3919f3831e7fa98ad2c6
Author: Patrick J Taylor  gmail  com>
AuthorDate: Sat Sep 10 21:11:29 2022 +
Commit:     Patrick Taylor  gmail  com>
CommitDate: Sat Sep 10 21:11:29 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cba32fbe

sci-chemistry/xcrysden: BDEPEND->DEPEND

Signed-off-by: Patrick J Taylor  gmail.com>

 sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild 
b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
index 99ad16333..f8b459ae2 100644
--- a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
+++ b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
@@ -24,7 +24,7 @@ RDEPEND=">=dev-lang/tcl-8.6.12
>=media-libs/mesa-22.1.3
>=sci-libs/fftw-3.3.10"
 
-BDEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
"${FILESDIR}/${P}-ext-bwidget.patch"



[gentoo-commits] repo/proj/guru:dev commit in: sci-chemistry/xcrysden/files/, sci-chemistry/xcrysden/

2022-09-10 Thread Patrick Taylor
commit: c6a2a87c15be29578d3ce20dc49f0e324b797782
Author: Patrick J Taylor  gmail  com>
AuthorDate: Sat Sep 10 20:18:37 2022 +
Commit:     Patrick Taylor  gmail  com>
CommitDate: Sat Sep 10 20:19:04 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c6a2a87c

sci-chemistry/xcrysden: rename patches to match established convention

Signed-off-by: Patrick J Taylor  gmail.com>

 .../{xcrysden-1.6.2-Togl_lib.patch => xcrysden-1.6.2-Togl-lib.patch}  | 0
 ...n-1.6.2-wrapper_paths.patch => xcrysden-1.6.2-wrapper-paths.patch} | 0
 sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild  | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-Togl_lib.patch 
b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-Togl-lib.patch
similarity index 100%
rename from sci-chemistry/xcrysden/files/xcrysden-1.6.2-Togl_lib.patch
rename to sci-chemistry/xcrysden/files/xcrysden-1.6.2-Togl-lib.patch

diff --git a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-wrapper_paths.patch 
b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-wrapper-paths.patch
similarity index 100%
rename from sci-chemistry/xcrysden/files/xcrysden-1.6.2-wrapper_paths.patch
rename to sci-chemistry/xcrysden/files/xcrysden-1.6.2-wrapper-paths.patch

diff --git a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild 
b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
index b243f1a06..99ad16333 100644
--- a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
+++ b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
@@ -28,8 +28,8 @@ BDEPEND="${RDEPEND}"
 
 PATCHES=(
"${FILESDIR}/${P}-ext-bwidget.patch"
-   "${FILESDIR}/${P}-Togl_lib.patch"
-   "${FILESDIR}/${P}-wrapper_paths.patch"
+   "${FILESDIR}/${P}-Togl-lib.patch"
+   "${FILESDIR}/${P}-wrapper-paths.patch"
 )
 
 src_prepare() {



[gentoo-commits] repo/proj/guru:dev commit in: sci-chemistry/xcrysden/files/, sci-chemistry/xcrysden/

2022-09-10 Thread Patrick Taylor
commit: ae3ffad2c35d356a7f5b05daf3eb1799e1000d56
Author: Patrick J Taylor  gmail  com>
AuthorDate: Sat Sep 10 20:17:37 2022 +
Commit:     Patrick Taylor  gmail  com>
CommitDate: Sat Sep 10 20:19:04 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ae3ffad2

sci-chemistry/xcrysden: replace patch with flag-o-matic to set -fcommon

Signed-off-by: Patrick J Taylor  gmail.com>

 .../xcrysden/files/xcrysden-1.6.2-gcc_flags.patch  | 14 --
 sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild   |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-gcc_flags.patch 
b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-gcc_flags.patch
deleted file mode 100644
index ef231827e..0
--- a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-gcc_flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Adds -fcommon to CFLAGS to allow compilation on more recent GCC.
-diff --git a/system/Make.sys-shared b/system/Make.sys-shared
-index 51891e7..f89f876 100644
 a/system/Make.sys-shared
-+++ b/system/Make.sys-shared
-@@ -19,7 +19,7 @@ MAKE = make
- # C-preprocessor flags
- CPPFLAGS ?=
- # C-compiler flags
--CFLAGS += -ffast-math -funroll-loops -fPIC -pedantic -Wall
-+CFLAGS += -ffast-math -funroll-loops -fPIC -pedantic -Wall -fcommon
- 
- CC = gcc 
- #LDLIB  = -ldl

diff --git a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild 
b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
index c6ecb73d0..b243f1a06 100644
--- a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
+++ b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit desktop xdg
+inherit desktop flag-o-matic xdg
 
 DESCRIPTION="For the visualisation of molecular and crystal structures."
 
@@ -28,7 +28,6 @@ BDEPEND="${RDEPEND}"
 
 PATCHES=(
"${FILESDIR}/${P}-ext-bwidget.patch"
-   "${FILESDIR}/${P}-gcc_flags.patch"
"${FILESDIR}/${P}-Togl_lib.patch"
"${FILESDIR}/${P}-wrapper_paths.patch"
 )
@@ -39,6 +38,7 @@ src_prepare() {
 }
 
 src_compile() {
+   append-cflags "-fcommon"
emake xcrysden
 }
 



[gentoo-commits] repo/proj/guru:dev commit in: sci-chemistry/xcrysden/

2022-09-09 Thread Patrick Taylor
commit: 6ec032dc40cd80668fc874aea01f61da09a29bcf
Author: Patrick J Taylor  gmail  com>
AuthorDate: Fri Sep  9 22:23:09 2022 +
Commit:     Patrick Taylor  gmail  com>
CommitDate: Fri Sep  9 22:23:42 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6ec032dc

sci-chemistry/xcrysden: fix missing metadata

Signed-off-by: Patrick J Taylor  gmail.com>

 sci-chemistry/xcrysden/metadata.xml | 8 
 1 file changed, 8 insertions(+)

diff --git a/sci-chemistry/xcrysden/metadata.xml 
b/sci-chemistry/xcrysden/metadata.xml
new file mode 100644
index 0..50dcf2837
--- /dev/null
+++ b/sci-chemistry/xcrysden/metadata.xml
@@ -0,0 +1,8 @@
+
+https://www.gentoo.org/dtd/metadata.dtd'>
+
+   
+   patrick.joseph.tay...@gmail.com
+   Patrick J Taylor
+   
+



[gentoo-commits] repo/proj/guru:dev commit in: sci-chemistry/xcrysden/

2022-09-09 Thread Patrick Taylor
commit: fef1b3cef4e78333e8a2627ad33a6d9431725a89
Author: Patrick J Taylor  gmail  com>
AuthorDate: Fri Sep  9 22:22:28 2022 +
Commit:     Patrick Taylor  gmail  com>
CommitDate: Fri Sep  9 22:23:41 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fef1b3ce

sci-chemistry/xcrysden: use xdg over xdg-utils

Signed-off-by: Patrick J Taylor  gmail.com>

 sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild | 11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild 
b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
index 4d9e97a87..c6ecb73d0 100644
--- a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
+++ b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=8
 
-inherit desktop
-inherit xdg-utils
+inherit desktop xdg
 
 DESCRIPTION="For the visualisation of molecular and crystal structures."
 
@@ -57,11 +56,3 @@ src_install() {
/usr/share/doc/${P}/examples/FermiSurface \
/usr/share/man/
 }
-
-pkg_postinst() {
-   xdg_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_icon_cache_update
-}



[gentoo-commits] repo/proj/guru:dev commit in: sci-chemistry/xcrysden/files/

2022-09-08 Thread Patrick Taylor
commit: 49f61b1d314069b7b6dca1ad29cf40729559b576
Author: Patrick J Taylor  gmail  com>
AuthorDate: Thu Sep  8 22:09:03 2022 +
Commit:     Patrick Taylor  gmail  com>
CommitDate: Thu Sep  8 22:09:03 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=49f61b1d

sci-chemistry/xcrysden: fixed path to icon in desktop file

Signed-off-by: Patrick J Taylor  gmail.com>

 sci-chemistry/xcrysden/files/xcrysden.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/xcrysden/files/xcrysden.desktop 
b/sci-chemistry/xcrysden/files/xcrysden.desktop
index 1f0128280..6880af143 100644
--- a/sci-chemistry/xcrysden/files/xcrysden.desktop
+++ b/sci-chemistry/xcrysden/files/xcrysden.desktop
@@ -4,5 +4,5 @@ Type=Application
 Comment=For the visualisation of molecular and crystal structures.
 Exec=xcrysden
 TryExec=xcrysden
-Icon=/usr/share/icons/hicolor/96x96/apps/xcrysden.png
+Icon=/usr/share/icons/hicolor/32x32/apps/xcrysden.png
 Categories=Science;



[gentoo-commits] repo/proj/guru:dev commit in: sci-chemistry/xcrysden/files/, sci-chemistry/xcrysden/, ...

2022-09-08 Thread Patrick Taylor
commit: 7911079d4e3a5d8f1c18ac258508766ad148a2a7
Author: Patrick Taylor  gmail  com>
AuthorDate: Thu Sep  8 19:41:15 2022 +
Commit:     Patrick Taylor  gmail  com>
CommitDate: Thu Sep  8 19:41:54 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7911079d

sci-chemistry/xcrysden: new package, add 1.6.2

Signed-off-by: Patrick Taylor  gmail.com>

 sci-chemistry/xcrysden/Manifest|   1 +
 sci-chemistry/xcrysden/files/icons/xcrysden.png| Bin 0 -> 11920 bytes
 .../xcrysden/files/xcrysden-1.6.2-Togl_lib.patch   |  14 +
 .../files/xcrysden-1.6.2-ext-bwidget.patch |  14 +
 .../xcrysden/files/xcrysden-1.6.2-gcc_flags.patch  |  14 +
 .../files/xcrysden-1.6.2-wrapper_paths.patch   |  16 +
 sci-chemistry/xcrysden/files/xcrysden.desktop  |   8 +++
 sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild   |  67 +
 8 files changed, 134 insertions(+)

diff --git a/sci-chemistry/xcrysden/Manifest b/sci-chemistry/xcrysden/Manifest
new file mode 100644
index 0..a5d3d6532
--- /dev/null
+++ b/sci-chemistry/xcrysden/Manifest
@@ -0,0 +1 @@
+DIST xcrysden-1.6.2.tar.gz 2460277 BLAKE2B 
f0b7c2c5aeff51db97b29c8052273ed44bb9c183e0df62c406eee327c4c5d86d141d8adfd05df70b97661a8cbddbf052c233c288f1f30b308e4c877539c06a84
 SHA512 
9ed1b7fc11674509a3f2bf6604aa11e087fd77a971afb93039ca542cb9abb62b2553c7f386b845f004df5d3d340bdf1fe673552319788f006fd031efb6a4ad67

diff --git a/sci-chemistry/xcrysden/files/icons/xcrysden.png 
b/sci-chemistry/xcrysden/files/icons/xcrysden.png
new file mode 100644
index 0..f41eddceb
Binary files /dev/null and b/sci-chemistry/xcrysden/files/icons/xcrysden.png 
differ

diff --git a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-Togl_lib.patch 
b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-Togl_lib.patch
new file mode 100644
index 0..533c50650
--- /dev/null
+++ b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-Togl_lib.patch
@@ -0,0 +1,14 @@
+Ensures that Togl is linked properly.
+diff --git a/system/Make.sys-shared b/system/Make.sys-shared
+index 51891e7..ba478fa 100644
+--- a/system/Make.sys-shared
 b/system/Make.sys-shared
+@@ -48,7 +48,7 @@ X_INCDIR  =
+ 
+ TCL_LIB  = -ltcl$(TCL_VER2)
+ TK_LIB   = -ltk$(TCL_VER2)
+-TOGL_LIB = -lTogl
++TOGL_LIB = -Wl,-rpath,"/usr/lib64/Togl2.0" -L/usr/lib64/Togl2.0 -lTogl2.0
+ GLU_LIB  = -lGLU
+ GL_LIB   = -lGL
+ FFTW3_LIB= -lfftw3

diff --git a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-ext-bwidget.patch 
b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-ext-bwidget.patch
new file mode 100644
index 0..0ca1f69b6
--- /dev/null
+++ b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-ext-bwidget.patch
@@ -0,0 +1,14 @@
+Prevents bwidget from being automatically downloaded when it is already 
required as a build/run-time dependency.
+diff --git a/Makefile b/Makefile
+index cfdc14a..d0f7e6c 100644
+--- a/Makefile
 b/Makefile
+@@ -18,7 +18,7 @@ what:
+ 
+ all: tcl tk mesa togl fftw xcrysden
+ #  meschach 
+-xcrysden: usage bwidget bindir src-C src-F src-Tcl
++xcrysden: usage bindir src-C src-F src-Tcl
+ 
+ usage: $(TOPDIR)/docs/xcrysden.1
+   man $(TOPDIR)/docs/xcrysden.1 | awk 'BEGIN {lprint=0; print "## do not 
edit changes will be lost (file automatically generated)\n"; } /SYNOPSIS/ { 
lprint=1; } /SEE ALSO/ { lprint=0; } /a*/ { if (lprint) print; }' > usage

diff --git a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-gcc_flags.patch 
b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-gcc_flags.patch
new file mode 100644
index 0..ef231827e
--- /dev/null
+++ b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-gcc_flags.patch
@@ -0,0 +1,14 @@
+Adds -fcommon to CFLAGS to allow compilation on more recent GCC.
+diff --git a/system/Make.sys-shared b/system/Make.sys-shared
+index 51891e7..f89f876 100644
+--- a/system/Make.sys-shared
 b/system/Make.sys-shared
+@@ -19,7 +19,7 @@ MAKE = make
+ # C-preprocessor flags
+ CPPFLAGS ?=
+ # C-compiler flags
+-CFLAGS += -ffast-math -funroll-loops -fPIC -pedantic -Wall
++CFLAGS += -ffast-math -funroll-loops -fPIC -pedantic -Wall -fcommon
+ 
+ CC = gcc 
+ #LDLIB  = -ldl

diff --git a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-wrapper_paths.patch 
b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-wrapper_paths.patch
new file mode 100644
index 0..8cc8b247a
--- /dev/null
+++ b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-wrapper_paths.patch
@@ -0,0 +1,16 @@
+Ensures that wrapper scripts account for live filesystem merge.
+diff --git a/sys_utils/wrappers.sh b/sys_utils/wrappers.sh
+index 1fa3cc6..e078b22 100755
+--- a/sys_utils/wrappers.sh
 b/sys_utils/wrappers.sh
+@@ -5,8 +5,8 @@ do
+ #!/bin/sh -f
+ 
+ # simple wrapper to run $cmd
+-XCRYSDEN_TOPDIR="$prefix/share/$xcrysden"
+-XCRYSDEN_LIB_BINDIR="$prefix/lib/$xcrysden"
++XCRYSDEN_TOPDIR="/usr/share/$xcrysden"
++XCRYSDEN_LIB_BINDIR="/usr/lib/$xcrysden"
+ export