gentoo auto-resync : 05:04:2025 - 01:34:33edge

4 files changed, 23 insertions, 20 deletions

diff --git a/media-gfx/tachyon/Manifest b/media-gfx/tachyon/Manifest
index 6d91c58e03db..8a7acb224635 100644
--- a/media-gfx/tachyon/Manifest
+++ b/media-gfx/tachyon/Manifest
@@ -1,5 +1,5 @@
-AUX tachyon-0.99_beta6-r2-ldflags.patch 856 BLAKE2B 5d8587eac987a66758f0314afb5bba620fbbb99b32d295e4deb649a929ac19afd52c835f375d72bd2284b3cd4d9185c272090d2a27d06ea0220d1c59b03bb995 SHA512 2807689e3bad156d3d54a0f4dce5e6aaf7555750c6650aa3957bd3ae51922ed3f8489534528de45c22d75db85450340d674a621e608668cde972df12c03a63b0
-AUX tachyon-0.99_beta6-r2-shared.patch 8043 BLAKE2B 6d559c22477de0e3148e374a8db2faa1e8249d0599409f9d8cfc843d06c1960639f74797414328c40a7fa46c9143cefb208ab68f4d47e3c0b8fd0dbde1ea951d SHA512 eb9c2e43c679030b410d5f9077e85969ee9ec3926f7c44eb9047c902f5834dd4734af3f07105f116b4dc23c0d420f87d67193a759d329810ca168ac4a28f95ad
-DIST tachyon-0.99b6.tar.gz 2981568 BLAKE2B 69e96362d5914db7cfeaf36a7c0fc57ebe2bff07c6c2c4b13107edb17146577df73ad7dbf740d402e322f1fb2df9cde79e634170ecd9d49037beb678de42df83 SHA512 4d0d707bf46528b87bfe1a05f490f40bcbee8f21271c5212247d4fd25956a27ad8a40b4621817a3f1c03495f1ba9eeb99b152929fdcd92c7118a35ef116f3f33
-EBUILD tachyon-0.99_beta6-r2.ebuild 2523 BLAKE2B cc413b94f470dc2ba097ae4f6a19091eaeaf3523318455ebfe3a0d8de0924af757ff7b3f9a063908593dcc60f902081ac6fe69dfb29de24054bc4e9c08cd157b SHA512 ab8aadf34f7d0c8d6bd31050bdc9e8ddf561e6a114d7a072eaad66a79f89ca346b6514546c44db58952fa894f0fc7d3f6a4b036b66040e0274e52e408bd5ea4e
+AUX tachyon-0.99.5-ldflags.patch 966 BLAKE2B b0f4553870d1932ecc53a990ec571fc24126d9a9ff860e4f2b04f5019c756347e0882884f681a7ee4a13680883e3dcae763ecae0f4f856934dcbe52b1f8de238 SHA512 806c924e48cb6704842ed9d797ad4af731ed5b950fe24fc0ebdd3e1ba433fa72045ec2e4a9867c1e1e981d31ddf0c52239a9f3b071b45037ee1ed65f851a0c5d
+AUX tachyon-0.99.5-shared.patch 8023 BLAKE2B 948245cf3b878653034229aa41380cedc1cc745219b02bb340384534980fc6e5c81f3fa5ee1b1c4ed767640ce26b86a43afc78aa113a1ea04f041afec7478764 SHA512 dcefd4eb3677de4d1c6bc72e70bf9a73e3c6255b8fbd4ead5aa88aba4ffe1a48c01c9a471c164ca7d66f9e562d69c732896e7a8c8da46fc81f9007c9f9bd30f9
+DIST tachyon-0.99.5.tar.gz 1163063 BLAKE2B e3e02dbec850e5fd04aa8dea838d97cca042476ddd2694a455811287f9f6837dbc7b73a6de3ea5d32a6a572752cf40df1c053b6efcee1e91a01bd0f18bf871e4 SHA512 a7a2af36e8cd31855bb048c135145ed62c09d580b80a761a7e8ce26add2aa3665bd8a8684e8cca9bdd1230bb2b6257f9f602c72c847b0b6f2d95673bcbed51b5
+EBUILD tachyon-0.99.5.ebuild 2532 BLAKE2B 07dd30053a957529c04cb7ba313d17af78fe6a9a347240eb01494b5bdad01898a7d1ee12a83c8031859a6b2e587d323a1b1cb16d257b1b4ce871476ef313ab92 SHA512 3ae89ce67b35368eba46e458a28796dcda1a94f7a79f4b83e262c0932c94c0c51755232c658b0e90610c2a4dde15699e9cec0885363ae8b99d5f2f40c2b66672
 MISC metadata.xml 340 BLAKE2B 93f274e908f9ec5837e866d5ca4f7a6711fbf07937663ca71a73d8be1b7691f67fafa0aa69cb588463f692c2f4a5b42a3fa2d6fd90ac3d0200246f03653f4086 SHA512 e369c4b944db3dcd1c793e63fffce8f48fff7a5785058ef8ba8cd981397fa800de31286cfba6f33837a8c16d919bcde260ede1f704af7d2f4531556e37ac11e9
diff --git a/media-gfx/tachyon/files/tachyon-0.99_beta6-r2-ldflags.patch b/media-gfx/tachyon/files/tachyon-0.99.5-ldflags.patch
index 220589a8f548..06fb74d91255 100644
--- a/media-gfx/tachyon/files/tachyon-0.99_beta6-r2-ldflags.patch
+++ b/media-gfx/tachyon/files/tachyon-0.99.5-ldflags.patch
@@ -1,6 +1,7 @@
---- a/Makefile
-+++ b/Makefile
-@@ -121,7 +121,7 @@ ${MGFLIB} : ../libmgf/Makefile
+diff '--color=auto' -urN unix.orig/Makefile unix/Makefile
+--- unix.orig/Makefile	2025-04-04 18:07:35.287673315 +0300
++++ unix/Makefile	2025-04-04 18:07:46.214794876 +0300
+@@ -165,7 +165,7 @@
  	};
  
  ${ARCHDIR}/tachyon : ${RAYLIB} ${PARSELIB} ${OBJDIR}/main.o ${OBJDIR}/getargs.o ${OBJDIR}/parse.o ${OBJDIR}/nffparse.o ${OBJDIR}/glwin.o ${OBJDIR}/spaceball.o ${OBJDIR}/trackball.o ${PARSEOBJS} 
diff --git a/media-gfx/tachyon/files/tachyon-0.99_beta6-r2-shared.patch b/media-gfx/tachyon/files/tachyon-0.99.5-shared.patch
index 8bd37071a8dc..43d0571fe610 100644
--- a/media-gfx/tachyon/files/tachyon-0.99_beta6-r2-shared.patch
+++ b/media-gfx/tachyon/files/tachyon-0.99.5-shared.patch
@@ -1,16 +1,18 @@
-diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile
---- a/Makefile.shared	2011-02-07 16:14:38.000000000 +0100
-+++ b/Makefile	2011-07-23 20:23:51.000000000 +0200
-@@ -22,7 +22,7 @@ OBJDIR=${ARCHDIR}/libtachyon
+diff '--color=auto' -urN unix.orig/Makefile unix/Makefile
+--- unix.orig/Makefile	2025-04-04 18:08:53.437298704 +0300
++++ unix/Makefile	2025-04-04 18:11:23.444469688 +0300
+@@ -23,8 +23,8 @@
  #
  # Name of raytracing library file to create
  #
 -RAYLIB=${ARCHDIR}/libtachyon.a
+-RAYLIBOPTIX=${ARCHDIR}/libtachyonoptix.a
 +RAYLIB=${ARCHDIR}/libtachyon.so
++RAYLIBOPTIX=${ARCHDIR}/libtachyonoptix.so
  RAYLIBDIR=${ARCHDIR}
  
- #
-@@ -251,124 +251,125 @@ RAYOBJS= ${OBJDIR}/api.o \
+ 
+@@ -337,124 +337,125 @@
  	${OBJDIR}/tgafile.o \
  	${OBJDIR}/winbmp.o
  
@@ -175,5 +177,5 @@ diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile
 -	${CC} ${CFLAGS} -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o
 +	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o
  
- clean :
- 	@echo "Cleaning object files, binaries etc."
+ 
+ ##
diff --git a/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild b/media-gfx/tachyon/tachyon-0.99.5.ebuild
index e6b03c7a30c3..68096e01db6b 100644
--- a/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild
+++ b/media-gfx/tachyon/tachyon-0.99.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~x64-macos"
 IUSE="doc examples jpeg mpi +opengl openmp png threads"
 
 DEPEND="
-	jpeg? ( virtual/jpeg:0= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	mpi? ( virtual/mpi )
 	opengl? (
 		virtual/glu
@@ -30,8 +30,8 @@ RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${PF}-ldflags.patch"
-	"${FILESDIR}/${PF}-shared.patch"
+	"${FILESDIR}/${P}-ldflags.patch"
+	"${FILESDIR}/${P}-shared.patch"
 )
 
 src_prepare() {