gentoo auto-resync : 06:10:2022 - 07:21:10

4 files changed, 65 insertions, 19 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 43929e6ac20a..3b32ab9bd9bf 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/convertlit/Manifest b/app-text/convertlit/Manifest
index 54a2d93bb752..2bcab30b416a 100644
--- a/app-text/convertlit/Manifest
+++ b/app-text/convertlit/Manifest
@@ -1,6 +1,7 @@
+AUX convertlit-1.8-clang16.patch 1055 BLAKE2B ab534da6bf8fbafb1d2582686d6eb2d053a696276cb4ca3d187cad59c080fe92d84e4f7ec133d30cdb64ed48ff58f91fc46d6a69443bd48827605994f89c3ebf SHA512 0e04c11bac7d2e1da574eb800604e0cbc57c341a1b8349aa25e41d7ed4cdce102cc988a39ed9cefe88aa9d76c5498f8a3d2331e8564f9e4f911c486e33a7fae0
 AUX convertlit-1.8-respectflags-r1.patch 838 BLAKE2B 4ba437ea3a7eb23e08c262b6e6bf031c27f31c7f9e84002767e8225fa939f0bf5142b8d7928a64fc279b28f4b51b2237b9590bb0d98eeb2fe33ba0493aa21c0c SHA512 d02f79dd787712eeab3b13ea7b7e8553a3aa31767bf1a10cc6a714c9e93b6c82ae1fefce9507393268bcbd8bcd9d5939ea41da4a5b18368f4244b5f2e6eb2256
 AUX fix-Wformat-security-warnings.patch 936 BLAKE2B 636599eb3840f5ea084dd60fd96f462f6757a4ec04e41360469eacb03badb3b8271a595692f055d10162e591600994be7e4676800e0f8a8feadbbabccbaeb21a SHA512 6f8798a8b54951c15da4f28d4c8103811c4d77ba96eb12a4e19bc35876c148c1247d19ea5b3d60028b156d50d5dbd67ec5254e47a556d195ca8c084bbc571e4d
 AUX support-ar-variable.patch 408 BLAKE2B d3649dcc362cb54a67eba34b9b6bfc6a52a22cd0ed33de95aad3cd5dad75729c35c45b8817e9c64040b3ea4baee876b456121a7e55094f0ceb01aabf4d6a2a8b SHA512 8d807507cccc58979092becb1725d4871f62746f06b3d4ac8740a0704019d3900cd60098497a0d770fcb9bab68e9bf34dc50219afda0995209ea88a71b084ce6
 DIST clit18src.zip 135120 BLAKE2B b2c47c03df2cee8779f50eee1a19f46907fa966165629d17fb25c66e5bf7b68b6ada6efa1790d36deb6a10f69c17ec7ef2cc66551796cbba04a3f2f7e5e3294d SHA512 0d4b7d525f5164a73a47a00e1c4e93ff50e738a4e6c541ded283c4779e6a67138f601c23a41344517ca5d7f8c9141b25cc6edc7f3967fbf9042e99f647354f36
-EBUILD convertlit-1.8-r3.ebuild 943 BLAKE2B eec3252323c7faabf77ba63b07c90c2bd44df010e246e59ca4e369551daa34cc0668062141132b3026d63b1f30df5f91a88555e89cd0e294f68182b8c8f986e8 SHA512 16524ff50a8ea622e63f3e390f2ae075b4a4ebbc616e3a88df3d1cd5a4304e01ad8e0af6732a3f0860166c71e3ed9c8cb4863be05e0d1b9b116d001c59f53c55
+EBUILD convertlit-1.8-r4.ebuild 858 BLAKE2B 13b18ebc131ec674d68573cbcd6c81fbc95f67e1e52eb8788c05de3d03fcec45adb2dd62a18e9ae00c8838992a798e72d1305fcd3f7f368e7dcccf3fff83dbfd SHA512 e873bd16ac651eca89878ca7cb0b35bbc94c9c590f7ff9d8948a02b0b403a75f4df1387c3476df587e9b99b3b05dd9cccb3a0b131f0976ce41ab6f34a4eaa478
 MISC metadata.xml 563 BLAKE2B b4886b916b7a01672cd20ccb9dd22556733bcdf3599ef88e49db4d53959a16199914c0db6dbf4f7816c44052c017a58d7e94f61b5daaea41b0006e20018662f2 SHA512 97b1c7b73c2f08380b9fba1a68d04f7e77ec45022b709e5ddd7952d31b7710badd46d578fd4578a886f098e2b166f7db54d198819c72cf2bf9654fcba3039ee8
diff --git a/app-text/convertlit/convertlit-1.8-r3.ebuild b/app-text/convertlit/convertlit-1.8-r4.ebuild
index 840c6a5c1e1e..552a931c5197 100644
--- a/app-text/convertlit/convertlit-1.8-r3.ebuild
+++ b/app-text/convertlit/convertlit-1.8-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -10,35 +10,31 @@ MY_P="clit${PV//./}"
 DESCRIPTION="CLit converts MS ebook .lit files to .opf (xml+html+png+jpg)"
 HOMEPAGE="http://www.convertlit.com/"
 SRC_URI="http://www.convertlit.com/${MY_P}src.zip"
+S="${WORKDIR}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
 RDEPEND=">=dev-libs/libtommath-0.36-r1"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
 PATCHES=(
-	"${FILESDIR}/${P}-respectflags-r1.patch"
-	"${FILESDIR}/fix-Wformat-security-warnings.patch"
-	"${FILESDIR}/support-ar-variable.patch"
+	"${FILESDIR}"/${P}-respectflags-r1.patch
+	"${FILESDIR}"/fix-Wformat-security-warnings.patch
+	"${FILESDIR}"/support-ar-variable.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )
 
 src_compile() {
-	tc-export CC
+	tc-export AR CC
 
-	cd "${S}/lib" || die "failed to change into ${S}/lib directory"
-	emake
-	cd "${S}/${MY_P}" || die "failed to change into ${S}/${MY_P} directory"
-	emake
+	emake -C lib
+	emake -C ${MY_P}
 }
 
 src_install() {
+	dobin ${MY_P}/clit
 	einstalldocs
-	dobin "${MY_P}/clit"
 }
diff --git a/app-text/convertlit/files/convertlit-1.8-clang16.patch b/app-text/convertlit/files/convertlit-1.8-clang16.patch
new file mode 100644
index 000000000000..13d5786c13f9
--- /dev/null
+++ b/app-text/convertlit/files/convertlit-1.8-clang16.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/870946
+--- a/clit18/display.c
++++ b/clit18/display.c
+@@ -24,2 +24,3 @@
+ #include <stdlib.h>
++#include <string.h>
+ #include "litlib.h"
+--- a/clit18/drm5.c
++++ b/clit18/drm5.c
+@@ -32,2 +32,3 @@
+ #include <string.h>

++#include <ctype.h>

+ #include <assert.h>

+--- a/clit18/explode.c
++++ b/clit18/explode.c
+@@ -26,2 +26,3 @@
+ #include <string.h>

++#include <sys/stat.h>

+ #include "clit.h"

+--- a/clit18/hexdump.c
++++ b/clit18/hexdump.c
+@@ -18,2 +18,3 @@
+ #include <stdlib.h>
++#include <string.h>
+ 
+--- a/clit18/manifest.c
++++ b/clit18/manifest.c
+@@ -25,2 +25,3 @@
+ #include <stdlib.h>

++#include <string.h>

+ #include "litlib.h"

+--- a/clit18/transmute.c
++++ b/clit18/transmute.c
+@@ -24,2 +24,3 @@
+ #include <stdlib.h>
++#include <string.h>
+ #include "litlib.h"
+--- a/lib/litsections.c
++++ b/lib/litsections.c
+@@ -33,2 +33,3 @@
+ #include "litinternal.h"

++#include "lzx/lzx.h"

+ #include "lzx.h"

+--- a/lib/newlzx/lzxglue.c
++++ b/lib/newlzx/lzxglue.c
+@@ -30,2 +30,3 @@
+ #include <stdlib.h>

++#include <string.h>

+ #include "litlib.h"