gentoo auto-resync : 25:04:2024 - 23:59:45

7 files changed, 30 insertions, 8 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index fe59575f175f..45dad8bb3442 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gr/Manifest b/sci-visualization/gr/Manifest
index 183a29a7d36c..268f079122f9 100644
--- a/sci-visualization/gr/Manifest
+++ b/sci-visualization/gr/Manifest
@@ -2,5 +2,5 @@ AUX gr-0.53.0-musl.patch 797 BLAKE2B 4eb48a510b19a23cc4c82e0f81a1f9753c96f0554ed
 DIST gr-0.72.4.tar.gz 9067899 BLAKE2B 827c80dbfc3483abe4af217c06549c64aa134446e831a5d7fab3906a3aac7bb23b66f8b98674220ff1b6fbd5fad60b9a8e7f7361a27370c033d9375a18f63234 SHA512 4ae1aae6854995ae58327d41930cedd96ef973ce65467f48f24d9985b27b5af2aa0eb6832a801b46e6fa71cade99117957c96738cb000306b0574b0e471692fb
 DIST gr-0.73.3.tar.gz 10076655 BLAKE2B 13bd461b39a86473290912f5a9ba5a4b5ea3ffc8865f6909aad1fc92acf6d39fdb12910e2bf0f8108b7bef1016652515c6cc188db0b98dd052459400b30895ba SHA512 f45daefd880eec9380a2a31f1cd3b124469c1d33c34a9d13a3718b1978da507620b6f7cc025dd20be81a70f52537dbb4537548d8cc32e133693d9b7ae2f476e5
 EBUILD gr-0.72.4.ebuild 2289 BLAKE2B 276f7a9dac58ccf66591c518742837c1e20f4c40690c98744287553bb96d6d4b15d079a425c72465ee5330eda126ec4b5746c596ffc7ecc2b189b63be513db85 SHA512 5c29d01631d8ad9a66af9539bfd5cd41d7b7c811d761d7b2c73fb80ae8bc07be8bb3610d008da10a0669e56828da454ce35844e2e34d47817defe269094e0fe5
-EBUILD gr-0.73.3.ebuild 2278 BLAKE2B 2a57b8441e8f507197586322ebb4cf97a42d000f80e320456d428851170b83ff2c9943beb579b9af436f0e4fa32e60f1030143e579a01a73e06549ac3358d51a SHA512 3251165da62420ca226a70c0acb7f34aef65f10bf07852533870dea87953048152cb4e1bc31b0235ea8f34dea9dbcc9c8e7a4c39ff7003ee739431e0f8b6fa16
+EBUILD gr-0.73.3.ebuild 2297 BLAKE2B 87bbba0668d22bc6f43c123dab81a9e92f9d99180176778a415ba49ab198a9d9c7deed65f53f57c834ec34b4bc5ae5e5276826f77234525f540fa71dcab69a5e SHA512 e106db36df8c4a23144cff2eadab161e94945a357a2611274e9ab181a394941d6451ca3f894c681422f1922b6a456e6c86d8f5be52d55429171898bafc7e3f51
 MISC metadata.xml 430 BLAKE2B 922435158e29d041da262d3aeea2acaf7e3bc422b3e474ff4f3b80aecc014b07c44135dc8ac24d04a39492570d1e3125227c35219b152a4e55bccde56ab00482 SHA512 7a68b4489a3de564b6239ea25d02ffa19384ea2b7813c26d68931784e863b7199a2b17ac99165e67062c4b594ce4895b6459c4c695db0c1db4c55c9fbaac4655
diff --git a/sci-visualization/gr/gr-0.73.3.ebuild b/sci-visualization/gr/gr-0.73.3.ebuild
index 07d5cc654cae..8e55d4f9c9ba 100644
--- a/sci-visualization/gr/gr-0.73.3.ebuild
+++ b/sci-visualization/gr/gr-0.73.3.ebuild
@@ -43,7 +43,7 @@ REQUIRED_USE="cairo? ( truetype )"
 
 src_configure() {
 	if use agg ; then
-		mycmakeargs+=( -DAGG_LIBRARY=libagg.so -DAGG_INCLUDE_DIR=/usr/include/agg2 )
+		mycmakeargs+=( -DAGG_LIBRARY=/usr/$(get_libdir)/libagg.so -DAGG_INCLUDE_DIR=/usr/include/agg2 )
 	else
 		mycmakeargs+=( -DAGG_LIBRARY= )
 	fi
diff --git a/sci-visualization/spyview/Manifest b/sci-visualization/spyview/Manifest
index bc297f50f841..60be27c29001 100644
--- a/sci-visualization/spyview/Manifest
+++ b/sci-visualization/spyview/Manifest
@@ -1,4 +1,5 @@
+AUX spyview-no-user-dirs.patch 391 BLAKE2B ef2a6c00b5afbd10de15fb220fdc9ade91d50105501dc613ba0374c355b2703de3ed48c1c6603358084b564de5fa0e6ca9a211ccca9a3043e93f862f06277e9b SHA512 d9ad19ab0fa4d26bc056cb96eb5581988365ed3e7823de1ab4dfd876419912de08f7d0f7c46e16526a774164c10827bc2353816166f64d41922036a684b588c8
 DIST spyview-2018.12.24.tgz 15461336 BLAKE2B d88cea7a91b51a695bdc6eb4146b010b196cf24c2f21f16ef47782ed99f6f3b79d2950c35267ea71ac7a14705cb8ed8a4d1e12c03be0d5d8f6ad2f816c197c77 SHA512 b73837491650ccb9cc8f70e5a80700d33c05bbbf6914c778508ba1848db67b28cca0013e142def1f47755fb1370abfd850a55e4b69cca442ba43323029fb6d05
-EBUILD spyview-2018.12.24.ebuild 1487 BLAKE2B b928281b7ea4978af7aaada2a0237b9ff5246edb2a001d1d490cfe2e87e7f9d22925e12afe9804aac34726558de9aae33978d3da2f018ab4cff3d11cfabc5230 SHA512 adf66a06767ce05a62a0b84f1dc2dc4167105173de4179ca9a07a53287d52cd8c02c6e561bb0b8f02452d5c7bfc16b20c237ae6f740f72eb776dae3223097631
-EBUILD spyview-9999.ebuild 1488 BLAKE2B 9cdc4a5a7b0f359e59d7b9c4e9e0b9369b9ad86ee733cd55e78ee0bf28350d1f515678f12720ae4c4d990895e01e79c31daf0c46fefa71d13cce4d1085a4a0a7 SHA512 a100da6a22672df74431780e68a0bcb6b1c1c682b46190f5fb77f31d707ea29be1f06f776619d2d37c1f0fce2badb9d84f100eeed6fd83a22ab9c083f6e6eb06
+EBUILD spyview-2018.12.24.ebuild 1534 BLAKE2B 156556c8acbf2f7ccd7c30631689c2dcb6a99d6e1946e7b9ac0da7592c711e7a0d1cec96b100f205250b2b1c05e7f9845e303c3be0d0a8959fc6a39c151b0537 SHA512 443040eb643c4912616534df929863e74a7f27d58b59f8251b195861190d886feb90bb6c814f4d72827526a5c557b9001b3b51b9ae7313db40e1b54732422261
+EBUILD spyview-9999.ebuild 1535 BLAKE2B a56a176b15262d1da8c573808eaea6d21f7e883a6fa996a8bd05797569b0990892317ae33ea9302ac7e5267f52f0072c94bd3f2e1b05979fb789882b37e3a7ee SHA512 244750bfb4ecf6b6eb2b55921afc9bd0ee828aa42424cabddbc7f581809d5a133beca49912924dc2a1ecead7fffa47b02cbd2159f56f3154a5012e7af8dd80ce
 MISC metadata.xml 347 BLAKE2B 9a9e10fe692599a6055ab987a725ec0bdc034e07cc2bc5ae57aa5ba4a7cbe7fb70adeae09feaa8334fd77f3bed48bf58581c3f26f7ce23a3e2588aed674ec09b SHA512 8bfcdcd6294d1e646e922a6fabd2dc0723d9c4400a19480698fb396bec7aba5f034ac78a104a46d3ae48b7b60ed0f0e0174182e8c9d513c82fa3df2416d9ea11
diff --git a/sci-visualization/spyview/files/spyview-no-user-dirs.patch b/sci-visualization/spyview/files/spyview-no-user-dirs.patch
new file mode 100644
index 000000000000..0cae5571a137
--- /dev/null
+++ b/sci-visualization/spyview/files/spyview-no-user-dirs.patch
@@ -0,0 +1,15 @@
+diff --git a/source/configure.ac b/source/configure.ac
+index f1d777f..6790257 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,7 +4,9 @@ AC_CANONICAL_TARGET
+ AM_INIT_AUTOMAKE(subdir-objects)
+ AC_CONFIG_SRCDIR([spyview/ImageWindow.C])
+ AC_CONFIG_HEADER([config.h])
+-USER_DIRS
++
++# No idea what this is supposed to do or call...
++# USER_DIRS
+ 
+ # For local macros
+ AC_CONFIG_MACRO_DIR([m4])
diff --git a/sci-visualization/spyview/spyview-2018.12.24.ebuild b/sci-visualization/spyview/spyview-2018.12.24.ebuild
index 887b1f8e05b1..6dcdb79c891f 100644
--- a/sci-visualization/spyview/spyview-2018.12.24.ebuild
+++ b/sci-visualization/spyview/spyview-2018.12.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,6 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 COMMON_DEPEND="
 	dev-libs/boost:=
@@ -34,6 +33,10 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	sci-visualization/gnuplot"
 
+PATCHES=(
+	"${FILESDIR}/spyview-no-user-dirs.patch"
+)
+
 src_unpack() {
 	if [[ ${PV} == *9999* ]] ; then
 		git-r3_src_unpack
diff --git a/sci-visualization/spyview/spyview-9999.ebuild b/sci-visualization/spyview/spyview-9999.ebuild
index e5448ad183e5..ca495102a00e 100644
--- a/sci-visualization/spyview/spyview-9999.ebuild
+++ b/sci-visualization/spyview/spyview-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,6 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 COMMON_DEPEND="
 	dev-libs/boost:=
@@ -34,6 +33,10 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	sci-visualization/gnuplot"
 
+PATCHES=(
+	"${FILESDIR}/spyview-no-user-dirs.patch"
+)
+
 src_unpack() {
 	if [[ ${PV} == *9999* ]] ; then
 		git-r3_src_unpack