gentoo auto-resync : 06:07:2024 - 08:06:15

6 files changed, 20 insertions, 72 deletions

diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 4e4ba7251c80..1002deb767dc 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/wxmacmolplt/Manifest b/sci-chemistry/wxmacmolplt/Manifest
index 15e8ec679986..eed90ecfb010 100644
--- a/sci-chemistry/wxmacmolplt/Manifest
+++ b/sci-chemistry/wxmacmolplt/Manifest
@@ -1,6 +1,3 @@
-AUX wxmacmolplt-7.5-glew.patch 232 BLAKE2B 9e0bd2849cc20664ca4a6b6678d2d78a723ae3e730225355dd70db0cac56d501c14aaa34d86d2ff87932feb950178a7245a943b763bde728f64a07a49ed4ba29 SHA512 cf1f77f9a86224b866f55154316a044314fda47a82de9b5be4ee58ed4ea8f4a07f9540e7060f477249b773e147739f15f43df293110045bdbca9567c60fbd5dc
-DIST wxmacmolplt-7.5.tar.gz 1965376 BLAKE2B 01033266ae66a215582a62690e792ca4ae82c8a8885fe277e2e77ee67ff70f02f6a9c10467ea6f3cee15933c6c89ba3c6137c9d29e47322ac4f395a3efd41383 SHA512 a1064d5068136b2a91328c7f912ff57d4741081d6d61437e7b4567fbf732917485b391493d637b8892bdad50b539363cfa9c778bb35407a9c0a2bfed20e42bc0
 DIST wxmacmolplt-7.7.2.tar.gz 2012054 BLAKE2B 0e419d9700dd6461a4520722f43cc36cdaa2f51920868a868bdd58db169ed92f88c71d4ce0d79446c4c564eb794f7327b0eef5f87d9ab5a639829287b29482d6 SHA512 bf4b3126bbc8657a604f8dee8b022a17dbf4633a877318ceb45d803456acb0da007c2edae23f581fb6eeafd6ea411d147fbc076acb07aba3dcb8ee55b9c486fa
-EBUILD wxmacmolplt-7.5-r1.ebuild 986 BLAKE2B 67cccea1d2e7886ee67f78ac54548047c2fe889dedfef45956a4614149d5597fd0376f0f01fd59085c9f925faa2284c2c22d4bae2d8ee98f2eca3be6b06e96ed SHA512 6e1d9051621a36deb7aeb997aa93a0b5becea1b3f7512fc56d2ee97788b5a9bedace25fb40a7a7b4e77a76830e7f8aa61ad0c32ea3e1afdb66b744197d50daf0
 EBUILD wxmacmolplt-7.7.2.ebuild 982 BLAKE2B edc3b4383a20ec6039472319273947988aa77de31622a40bd604857560684612d79dd6743c2048fc423e928c5a9c8b45e38899568a68de32069591b7593ef2b7 SHA512 99e5cf215f4ef74d6c7480b9aa1732cc1eda079634e2e09e61b83f080b9093febea8d48c77d4e5dbf20bc32c3eecfef9e26b233ec7e549818b3714b13e8ac82f
 MISC metadata.xml 717 BLAKE2B e2344ebd6332d01a309edb0951483adff1342584fd1a9a6b6890c4cae7bba86f8e9f874b4200726845c1aed7712a4459fddda27ae544ee98da63098e897b499e SHA512 169c1aa0ff6cdfe7ed5e155bd1bdb2ea817c59501dde6c7caa1d25bc4826341516731e3082bf7960cc6f87fdf2a26983c04e26baea21b7bdff815eef45e4521b
diff --git a/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.5-glew.patch b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.5-glew.patch
deleted file mode 100644
index 809d7723cbb0..000000000000
--- a/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.5-glew.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,7 @@
-       ;;
-    *)
-       HOST=LINUX
--      LIBGL="-lGL -lGLU"
-+      LIBGL=`${PKG_CONFIG} --libs glu glew`
-       ;;
- esac
- AM_CONDITIONAL(HOST_IS_MSW, [test "x$HOST" == xMSW])
diff --git a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild
deleted file mode 100644
index d100dad51cbc..000000000000
--- a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER=3.0
-inherit autotools desktop toolchain-funcs wxwidgets
-
-DESCRIPTION="Chemical 3D graphics program with GAMESS input builder"
-HOMEPAGE="http://www.scl.ameslab.gov/MacMolPlt/"
-SRC_URI="https://wxmacmolplt.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	media-libs/glew:0=
-	media-libs/mesa[X(+)]
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-glew.patch )
-
-src_prepare() {
-	default
-	sed \
-		-e "/^dist_doc_DATA/d" \
-		-i Makefile.am || die "Failed to disable installation of LICENSE file"
-	eautoreconf
-}
-
-src_configure() {
-	tc-export PKG_CONFIG
-
-	setup-wxwidgets unicode
-	econf \
-		--with-glew \
-		--without-ming
-}
-
-src_install() {
-	default
-
-	doicon resources/${PN}.png
-	make_desktop_entry ${PN} wxMacMolPlt ${PN} "Science;DataVisualization;"
-}
diff --git a/sci-chemistry/xds-bin/Manifest b/sci-chemistry/xds-bin/Manifest
index f4e1a6e0072a..09c641ceac9d 100644
--- a/sci-chemistry/xds-bin/Manifest
+++ b/sci-chemistry/xds-bin/Manifest
@@ -1,4 +1,4 @@
-DIST XDS-INTEL64_Linux_x86_64-20170930.tar.gz 9501598 BLAKE2B 33eea09210e9196859f62e66770aef3b34ace7d0cbe50607ef03ba37943fdb13ddf570b53cb2a7e668e650284ff245767a9cca9f6595de9fdb1815bb9625b56e SHA512 8da1d75633e8bf8495c30926a622f57aa0a51ea3b724101c96da6fae0a303860a4a4a8eaf3ecdf66948f18e702211aab3800760ca498c4562e947e3f94c25a4d
-DIST XDS_html_doc-20170930.tar.gz 117249 BLAKE2B 81e0c216eee38f21acc4dba299a20c4790f4aa1dc58e2d0dab5474784bf01842db41ab869b6d36cdfc9a31771e0bcad41b062bbf000771552c7de36f36a2291e SHA512 bbc24eeb0f8a63e6186906b0c0ee67efa83d1cdd169b091878c323455e2448ee6cb1667467bc9701b4e1839af2d10d4cb3e8f8d080b7dd5e449fda03c2aa8f89
-EBUILD xds-bin-20170930.ebuild 1174 BLAKE2B 9a5a18719f52eab2f114ce58ba6ade158ae138b70c092967d5ed0adeae6867963c4cf6391f6bdedd0296a56fad46ab1214cde0faa02c4dab701d572268f3b8f6 SHA512 47963c7d31eaa1d6f2eaf172ef67a7d448e3bec36a9e6da35f85532bb878996ef6791977efd06874e0d3d790820306214e190af1ea07bca30f3320ed64605470
+DIST XDS-INTEL64_Linux_x86_64-20240831.tar.gz 11067644 BLAKE2B d8687af54aad5694937cc633f511766147bb52616a388f03d0d052239a0f81b6e3692be0f234ea012905c89e13f2ef45e0254babe1e23598d954b2e65ed93d20 SHA512 773f074237311c8ea2d6dda974250cf906f84db02589bb40b646ff77afac2ee7d978d272993ab5f9b9f55c9dde7965b8e4fba7222349bf3665679f90ec6ef658
+DIST XDS_html_doc-20240831.tar.gz 151503 BLAKE2B c559d1a7b4ca75b00d5d37d2c9248fea177cca6a2dac5a9b42443430477337f8bc99add4f89f9eac2d57592b6b5843e167d4e86c6c3ce0ccbb5ba91234d534d8 SHA512 5d3a20dd0b6458c5bfd8ed46f4963fd53f59208fff72278acac19237c988537bae9d7b3c993342c8a9abc03e2ab5aed98a002caeb853fb87c19ae19a32f05faa
+EBUILD xds-bin-20240831.ebuild 1459 BLAKE2B a03054c1af3d8ad3b972a08ca0bf6e07d252b047ad3fea490e8e71d751d33e9969d7853f1b00b6ee2080d5e10bfefd8a0e085a9eb4f25cbbf9f39ad3a55ff445 SHA512 4af84bc488142b629636b3a9516d3b56944b4078c865ab10c5acc0a8898b105c5677ad9bb588cc58823a6d34275dd8c6eb9610116ff748e3c55fc31ce75a2c79
 MISC metadata.xml 272 BLAKE2B 531e98b72776bbe9126811b70943add0f6f43141b01cb75b17ac2c8d1cfb6a9b349022fd411894d2b8eeb0612a73db10aed4ba71f9624bd6dbd172a05fca2c76 SHA512 04f5575703aaaa95e575460ae3de428d3da173b3b741ab52b4aad31e381fef78b325f49f99622ec26a65024437759ea013fc525bd63ee553003c71afcc40d10c
diff --git a/sci-chemistry/xds-bin/xds-bin-20170930.ebuild b/sci-chemistry/xds-bin/xds-bin-20240831.ebuild
index 4e609092fa03..4fcd833d3071 100644
--- a/sci-chemistry/xds-bin/xds-bin-20170930.ebuild
+++ b/sci-chemistry/xds-bin/xds-bin-20240831.ebuild
@@ -1,21 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Software for processing single-crystal X-ray monochromatic diffraction data"
-HOMEPAGE="http://xds.mpimf-heidelberg.mpg.de/"
+HOMEPAGE="https://xds.mr.mpg.de"
 SRC_URI="
-	ftp://ftp.mpimf-heidelberg.mpg.de/pub/kabsch/XDS-INTEL64_Linux_x86_64.tar.gz -> XDS-INTEL64_Linux_x86_64-${PV}.tar.gz
-	ftp://ftp.mpimf-heidelberg.mpg.de/pub/kabsch/XDS_html_doc.tar.gz -> XDS_html_doc-${PV}.tar.gz"
+	https://xds.mr.mpg.de/XDS-INTEL64_Linux_x86_64.tar.gz -> XDS-INTEL64_Linux_x86_64-${PVR}.tar.gz
+	https://xds.mr.mpg.de/XDS_html_doc.tar.gz -> XDS_html_doc-${PVR}.tar.gz"
 
 LICENSE="free-noncomm"
 SLOT="0"
 KEYWORDS="-* ~amd64"
 IUSE="smp"
+RESTRICT="fetch"
 
 QA_PREBUILT="opt/xds-bin/*"
 
+# The web site uses a certificate that is not in the system certificate store.
+# Use a web browser to download, instead.
+pkg_nofetch() {
+	elog "Please visit"
+	elog "https://xds.mr.mpg.de/html_doc/downloading.html"
+	elog "and download XDS-INTEL64_Linux_x86_64.tar.gz and XDS_html_doc.tar.gz."
+	elog "Please save them as: ${A}. in your \${DISTDIR}"
+}
+
 src_unpack() {
 	default
 	mv XDS-* "${S}" || die
@@ -33,7 +43,7 @@ src_install() {
 		dosym ../${PN}/${i}${suffix} /opt/bin/${i}
 	done
 
-	for i in 2cbf cellparm forkcolspot forkintegrate merge2cbf pix2lab xdsconv; do
+	for i in 2cbf cellparm forkxds merge2cbf pix2lab xdsconv; do
 		dosym ../${PN}/${i} /opt/bin/${i}
 	done
 
@@ -42,5 +52,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "This package will expire on September 30, 2017"
+	elog "This package will expire on August 31, 2024"
 }