gentoo auto-resync : 13:07:2024 - 12:26:41

3 files changed, 69 insertions, 8 deletions

diff --git a/media-gfx/sfftobmp/Manifest b/media-gfx/sfftobmp/Manifest
index 1a047d0003db..07f9da9ff87f 100644
--- a/media-gfx/sfftobmp/Manifest
+++ b/media-gfx/sfftobmp/Manifest
@@ -1,6 +1,7 @@
 AUX sfftobmp-3.1.1-gcc44-and-boost-1_37.patch 749 BLAKE2B 3bd8d52ed467c188f8b0545dfbce8be3d7093c25ba7c9882701751a6eef18c9e43d9b83979669457ef337d857866754be750de44ffe0482880275a7f294751b2 SHA512 ad6c0bf2a2c0c44ab9f7fe0226137061561b943d59167f9de0adc6d1998d1a938166a2120b24c6499466a310736310a5e05be8b7d4575ea1121d99604fc56cdb
 AUX sfftobmp-3.1.2-Wformat.patch 342 BLAKE2B 1e6db3a432fce740f34f2cb2a3f3662f59c0fedd84e6b63a1cc58dbf2f5d9e48858ad0f1e25e0a9b2ef493eec4cdc8587cb24430026ad3c51190ddaf2213e8b3 SHA512 afde9e1a0acabe7d4fa51b6a533f09afe93deb5c8015c1cb322849feb543ccd45bf0639a61928c6c8641a741b348e119528ba1a03d6c201d12b4be98d49eb85e
+AUX sfftobmp-3.1.2-boost-1.85.patch 2355 BLAKE2B cb299609f09b179ce7c2eb942aadcee739ce3ae52a64447a9eca156ae0171f7eeff0ee91a33f7f24e70c6ae1e7da3e27194f72f6182737478ec63e9a6489a088 SHA512 0fa1b2e8804f5387ee9d59bcb0acbf7c50f309ec47ce5e3acf6ddd5e137a2f656f59666e536a2fdcbe86d461168fcd39b19fe2dbb5133edd87ba48d18dd24c9e
 AUX sfftobmp-3.1.2-boost_fs3.patch 542 BLAKE2B 032a3f526407bb7e4c94176b914b8dfc298a250b468322561e6f0fa9b37578cd8872717080469eb147bd7fab2c9239d8a06ce9e2b937b87899355aa231e3a459 SHA512 1829c9cbfef93e9a019c2b92aa60e45c9f32498fba15ceac456ccd0fa6244e92aa8dc2b5ddff3cf56ad01e7e7111f0553807b4faa94c3d1ddeb2ab7328c8c915
 DIST sfftobmp3_1_2_src.zip 121478 BLAKE2B fe5e09d358cfa75a45a05e780fcf8b3409ae9791882c8c4ab3fe99b078cade57a75751343c42a5d7764702ca32565e8c97d417e3c095c10a01b6fcd0f09f03b3 SHA512 3c460dcd60486954f792ecc8e864d109dabbae30b56a6ba4b3228a42dd489fd88793e4d93e2d032e6cd1c552bf5e217bc2afb3eae85a1a4e1db340f7761905b7
-EBUILD sfftobmp-3.1.2-r3.ebuild 852 BLAKE2B ea521dc8f61e934634dab4323a378949d799c8c35563d87fc5de3100f39f146e7de9f9fa571839ead68915e1d3bf884ceaa5a85102ed8c2a505a82cd82377fd5 SHA512 64cd26fb83e49291cc181c6ebea3135116a1e996feee4383cecec8a4067264e8f79ea375eadd6a7047f81dab9a2c0c25a604beb37628b877a2fa17e2703e0320
+EBUILD sfftobmp-3.1.2-r3.ebuild 808 BLAKE2B 7968c675c3396ca1fdfceea8b4cef90663fdc8a5650698e62deee53e6773966887001e3c6423f9d098dbd109efc348c20b03e4a16c99c0388c8602cb2a0575cb SHA512 d033ef1efcc7ae2d69ad2e68779f79114b8d1ee9b66f2b6f996baab95831430805b4d95454c7cdb6ad448d61daa77c9e8d38be3e7a6d25567d435817345771bc
 MISC metadata.xml 246 BLAKE2B 7c25526b9240c42e9e0b41a00848ca2311c8edf487c120d4bdb03b78e15f3e773c8437e037ee3000ad437d5d12b237b2fb09e6c151f0be7e1cbe06f448f07a70 SHA512 f0ff62e58d57dded6e30f61f7734cdc744f9a727a7e2435f225b38990217690713eb50dff49920235efa94547e9a6aab32ba5c3a599fd80689e0c4d841eaa043
diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost-1.85.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost-1.85.patch
new file mode 100644
index 000000000000..9fac13880922
--- /dev/null
+++ b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost-1.85.patch
@@ -0,0 +1,63 @@
+https://www.boost.org/doc/libs/1_85_0/libs/filesystem/doc/deprecated.html
+--- a/src/cmdline.cpp
++++ b/src/cmdline.cpp
+@@ -41,7 +41,6 @@
+ #include <iostream>
+ 
+ #include <boost/filesystem/operations.hpp>
+-#include <boost/filesystem/convenience.hpp>
+ 
+ #include <tiff.h>
+ 
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -41,7 +41,6 @@
+ 
+ #include <boost/filesystem/path.hpp>
+ #include <boost/filesystem/operations.hpp>
+-#include <boost/filesystem/convenience.hpp>
+ 
+ extern "C"
+ {
+@@ -172,10 +171,10 @@ int main( int argc, char *argv[] )
+             if (pathOutFileName.string().length()) {
+               // A fixed name was given, so use it as a base name
+               outPath = pathOutFileName;
+-              std::string orgExt = fs::extension(outPath);
++              std::string orgExt = outPath.extension().string();
+               if (nFileCountOut > 1) {
+                 sprintf(acNumber, "_%03d", nPage+1);
+-                outPath = fs::change_extension(outPath, acNumber);
++                outPath.replace_extension(acNumber);
+                 if (orgExt.length()) {
+                   std::string strTemp = outPath.string();
+                   strTemp += orgExt;
+@@ -184,15 +183,15 @@ int main( int argc, char *argv[] )
+               }
+             } else {
+               // Otherwise construct output filename from input filename
+-              outPath = pathOutDirectory / pathInFileName.leaf();
++              outPath = pathOutDirectory / pathInFileName.filename();
+               if (nFileCountOut > 1) {
+                 sprintf(acNumber, "_%03d", nPage+1);
+-                outPath = fs::change_extension(outPath, acNumber);
++                outPath.replace_extension(acNumber);
+                 std::string strTemp = outPath.string();
+                 strTemp += pOut->GetExtension();
+                 outPath = fs::path(strTemp);
+               } else {
+-                outPath = fs::change_extension(outPath, pOut->GetExtension());
++                outPath.replace_extension(pOut->GetExtension());
+               }
+             }
+             if (!proc.doOverwrite() && !((nPage > 0) && (nFileCountOut == 1)) && fs::exists(outPath)) {
+--- a/src/output.cpp
++++ b/src/output.cpp
+@@ -42,7 +42,6 @@
+ #include <iostream>
+ 
+ #include <boost/filesystem/path.hpp>
+-#include <boost/filesystem/convenience.hpp>
+ 
+ #ifdef WIN32
+ #include <io.h>
diff --git a/media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild b/media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild
index 236b6a7b496a..6b9a92e6cfc2 100644
--- a/media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild
+++ b/media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic
+inherit autotools
 
 MY_P=${PN}${PV//./_}
 
@@ -19,7 +19,8 @@ KEYWORDS="amd64 ~hppa ppc x86"
 RDEPEND="
 	dev-libs/boost:=
 	media-libs/libjpeg-turbo:=
-	media-libs/tiff:="
+	media-libs/tiff:=
+"
 DEPEND="${RDEPEND}"
 BDEPEND="app-arch/unzip"
 
@@ -27,6 +28,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.1-gcc44-and-boost-1_37.patch
 	"${FILESDIR}"/${PN}-3.1.2-boost_fs3.patch
 	"${FILESDIR}"/${PN}-3.1.2-Wformat.patch
+	"${FILESDIR}"/${PN}-3.1.2-boost-1.85.patch
 )
 
 src_prepare() {
@@ -34,11 +36,6 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	append-cppflags -DBOOST_FILESYSTEM_VERSION=3
-	default
-}
-
 src_install() {
 	default
 	dodoc doc/{changes,credits,readme}