gentoo resync : 20.10.2021

5 files changed, 43 insertions, 28 deletions

diff --git a/media-gfx/sfftobmp/Manifest b/media-gfx/sfftobmp/Manifest
index 4c96d40a2a04..7c73ecff11e6 100644
--- a/media-gfx/sfftobmp/Manifest
+++ b/media-gfx/sfftobmp/Manifest
@@ -1,5 +1,6 @@
-AUX sfftobmp-3.1.1-gcc44-and-boost-1_37.patch 1351 BLAKE2B 00dc9e14b8742a7aaa16bff964d6c183c81856298b205df97c5028081046b6cb0b0687ef0a3649d3560f6a5eafab6e62f5e276d41afc70e57398917828482ece SHA512 bd92e0f3e6743941080319da764ce6bbdb0b8d0694a9e5dd113e3a64c0deb0a86ce33a9a9f306c8a2c75d08f6fb33c78c1fe60f36309acf9c6223ec02b158f5b
-AUX sfftobmp-3.1.2-boost_fs3.patch 538 BLAKE2B bb2ea6156f3572f2da8ffd2f2bfd55fa89afe99af3f358d56b978e98160bd7b90c72cae8490687fc0b9c0509f896f5c6a7bfe41677f42652d77d52860b56e46c SHA512 75158af4ff574fe5112e4057ce0c2bca2f49afaf63862c42add85b8ee8e843f0a08b8c3d9f658f999024643d95ffcd65085bcb0607213722eb021b102037872e
+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_fs3.patch 542 BLAKE2B 032a3f526407bb7e4c94176b914b8dfc298a250b468322561e6f0fa9b37578cd8872717080469eb147bd7fab2c9239d8a06ce9e2b937b87899355aa231e3a459 SHA512 1829c9cbfef93e9a019c2b92aa60e45c9f32498fba15ceac456ccd0fa6244e92aa8dc2b5ddff3cf56ad01e7e7111f0553807b4faa94c3d1ddeb2ab7328c8c915
 DIST sfftobmp3_1_2_src.zip 121478 BLAKE2B fe5e09d358cfa75a45a05e780fcf8b3409ae9791882c8c4ab3fe99b078cade57a75751343c42a5d7764702ca32565e8c97d417e3c095c10a01b6fcd0f09f03b3 SHA512 3c460dcd60486954f792ecc8e864d109dabbae30b56a6ba4b3228a42dd489fd88793e4d93e2d032e6cd1c552bf5e217bc2afb3eae85a1a4e1db340f7761905b7
-EBUILD sfftobmp-3.1.2-r1.ebuild 776 BLAKE2B 57ddfa11e0f88cff41ce693309b478594a57e353504cd2476a527bc25ed977885683c32d764271babd15897b0fe3364ffb55942d3ca86d0395b8b9b4f20f577c SHA512 8c0a30b354a613cf39a404cab80a1c56b67e8d01f1617dbb4e53a23f8d63c86062b66dfc6584e9cb7a0fa395e573607e9e227c3819080ec8d558fc59b4a4c930
+EBUILD sfftobmp-3.1.2-r1.ebuild 827 BLAKE2B bdc6c0a4f3d12d1bdfdfe6bd018d773958722e40102a25c5306ce0805a7d344fb7d06f7061456231bc2ce90e86f1ab48054add8ee3b33506b3a1f82ab4be35ac SHA512 3f4e8e8c92c9b1fb214ffa13ddec3715a1ad8696327926428262c9f835d7277b3d904bace7fa5902b819312e0be339539deaaf393e450f4b64a06713abe043a9
 MISC metadata.xml 246 BLAKE2B 7c25526b9240c42e9e0b41a00848ca2311c8edf487c120d4bdb03b78e15f3e773c8437e037ee3000ad437d5d12b237b2fb09e6c151f0be7e1cbe06f448f07a70 SHA512 f0ff62e58d57dded6e30f61f7734cdc744f9a727a7e2435f225b38990217690713eb50dff49920235efa94547e9a6aab32ba5c3a599fd80689e0c4d841eaa043
diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch
index 3ba832afaed6..226b717431de 100644
--- a/media-gfx/sfftobmp/files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch
+++ b/media-gfx/sfftobmp/files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch
@@ -1,8 +1,5 @@
-Only in sfftobmp3_1_1: Makefile.am.orig
-Only in sfftobmp3_1_1: Makefile.am.rej
-diff -ur sfftobmp3_1_1.orig/src/cmdline.cpp sfftobmp3_1_1/src/cmdline.cpp
---- sfftobmp3_1_1.orig/src/cmdline.cpp	2007-10-07 22:01:21.000000000 +0300
-+++ sfftobmp3_1_1/src/cmdline.cpp	2009-05-09 00:33:06.000000000 +0300
+--- a/src/cmdline.cpp
++++ b/src/cmdline.cpp
 @@ -35,6 +35,7 @@
  
  ---RCS-Info--------------------------------------------------*/
@@ -11,9 +8,8 @@ diff -ur sfftobmp3_1_1.orig/src/cmdline.cpp sfftobmp3_1_1/src/cmdline.cpp
  #include <vector>
  #include <cassert>
  #include <iostream>
-diff -ur sfftobmp3_1_1.orig/src/common.cpp sfftobmp3_1_1/src/common.cpp
---- sfftobmp3_1_1.orig/src/common.cpp	2007-10-07 22:01:20.000000000 +0300
-+++ sfftobmp3_1_1/src/common.cpp	2009-05-09 00:28:37.000000000 +0300
+--- a/src/common.cpp
++++ b/src/common.cpp
 @@ -49,6 +49,7 @@
  #include <sys/utime.h>
  #endif
@@ -22,9 +18,8 @@ diff -ur sfftobmp3_1_1.orig/src/common.cpp sfftobmp3_1_1/src/common.cpp
  #include <cassert>
  #include <iostream>
  
-diff -ur sfftobmp3_1_1.orig/src/Makefile.am sfftobmp3_1_1/src/Makefile.am
---- sfftobmp3_1_1.orig/src/Makefile.am	2006-10-24 23:14:19.000000000 +0300
-+++ sfftobmp3_1_1/src/Makefile.am	2009-05-09 00:27:42.000000000 +0300
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -3,4 +3,4 @@
  INCLUDES            =  -I$(top_builddir) -I$(top_srcdir)
  bin_PROGRAMS = sfftobmp
diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-Wformat.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-Wformat.patch
new file mode 100644
index 000000000000..a7ab1c185751
--- /dev/null
+++ b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-Wformat.patch
@@ -0,0 +1,11 @@
+--- a/src/output.cpp
++++ b/src/output.cpp
+@@ -163,7 +163,7 @@
+   m_pFile->Write(acBuf, strlen(acBuf));
+   sprintf(acBuf, "%s", "# generated with SffToBmp\n");
+   m_pFile->Write(acBuf, strlen(acBuf));
+-  sprintf(acBuf, "%ld %ld\n", aWidth, aHeight);
++  sprintf(acBuf, "%u %u\n", aWidth, aHeight);
+   m_pFile->Write(acBuf, strlen(acBuf));
+ }
+ 
diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch
index f39d157e1972..7ae13855def7 100644
--- a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch
+++ b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/425364
 
---- src/cmdline.cpp
-+++ src/cmdline.cpp
+--- a/src/cmdline.cpp
++++ b/src/cmdline.cpp
 @@ -264,14 +264,14 @@
    }
    do {
diff --git a/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild b/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
index 4f2ebeb017fe..1bc93102d377 100644
--- a/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
+++ b/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
@@ -1,37 +1,45 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools epatch flag-o-matic
+EAPI=8
+
+inherit autotools flag-o-matic
 
 MY_P=${PN}${PV//./_}
 
 DESCRIPTION="sff to bmp converter"
 HOMEPAGE="http://sfftools.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sfftools/${MY_P}_src.zip"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND MIT"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc x86"
-IUSE=""
 
-RDEPEND=">=dev-libs/boost-1.49
+RDEPEND="
+	dev-libs/boost:=
 	media-libs/tiff:0
 	virtual/jpeg:0"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/${MY_P}
+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
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.1.1-gcc44-and-boost-1_37.patch \
-		"${FILESDIR}"/${PN}-3.1.2-boost_fs3.patch
-	append-cppflags -DBOOST_FILESYSTEM_VERSION=3
+	default
 	eautoreconf
 }
 
+src_configure() {
+	append-cppflags -DBOOST_FILESYSTEM_VERSION=3
+	default
+}
+
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	dodoc doc/{changes,credits,readme}
 }