[gentoo-commits] repo/gentoo:master commit in: media-video/projectx/

["Daniel Pielmeier" <billie@gentoo.org>]

commit:     aceece9147deb9e5003bd74babe21ef980c942ce
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  9 12:23:31 2022 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sun Oct  9 12:23:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aceece91

media-video/projectx: Fix bug #/832383.

File is now preconverted to UTF encoding in an updated tarball thus
iconv is not needed anymore.

Closes: https://bugs.gentoo.org/832383
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>

 media-video/projectx/Manifest                                  |  2 +-
 ...ojectx-0.91.0.10-r3.ebuild => projectx-0.91.0.10-r4.ebuild} | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/media-video/projectx/Manifest b/media-video/projectx/Manifest
index 2b46414fb71f..72fcc246d26b 100644
--- a/media-video/projectx/Manifest
+++ b/media-video/projectx/Manifest
@@ -1,4 +1,4 @@
-DIST projectx-0.91.0.10.tar.xz 830104 BLAKE2B 511481dd2c391a6a26acfa0603f1c221d013d334593cf8ce6da0cf09505387424e58772705e17f9e90da546c43ce5aad313723aafd36063c5cd4a46d93634f86 SHA512 681dae4fd368a00a7ada37f8e64271c838a9c3737008b6fcd7f74679ca9fdf2cce140b0627a4c77a9a00baea76659bad0d2d710511b66026f9597ad153a2e725
+DIST projectx-0.91.0.10-r4.tar.xz 830232 BLAKE2B 26171e583dc608c181d3ab3de050beb569659dfa9cd681e161fd0ee7168c4d0bcdaefc1eb42323c8bf901a33f96ea627c01b0ba63f79519e1f6c5d7868331ec9 SHA512 004a8819736c426a27dbd896c125233a1014260ed2999911bdc7aa83b8aa220776297060755fdf6fb15c6a79e71b14ac166c7d423f3ac568a42e2a21ac8c3da8
 DIST projectx-icon.png 1692 BLAKE2B 6da85b69961b81f64638b04860b467e8cf599287513d85157aa71e4575003b8ef6e96cbe4b0b40b54bb15b6ca74c14f4bf1855c80f1f6db89294567a77f9e151 SHA512 33d9e505140d2dd22d34f87ebff040530130bbb7d1e9958d7345f442bd3d6e17dff8d243e22f374217aed20139871e406e46ca6f03ca48eb338dc3630af2417a
 DIST projectx-idctfast.tar.xz 12444 BLAKE2B e4b2a6ab235601dbdd1acf8a73a14fecb5da455670bad52598e0dbd8a7300305fad1b22b3d550dd046dcac68975af4b225e042f7c968ce9108f702d01586302f SHA512 85dd6dd0011c166aaefd47a47c4455dda68ba6da65c9eda5a996f7d078ce3900168714c0c72c6250f7b99181fda84c6d81e3afb392ace9c12c3c5690de01c1d8
 DIST xdg-20100731.java.xz 648 BLAKE2B 8bd082c445d64051c65c66e8a22b61e582d04f1f650e3b15ee2f3400d47b10f137d245bd8a7633d96299e2c688f7bf836b59a4dd49ea3c181684a78fa55304c3 SHA512 8b5d8e695f3f052f889002dc93742da8ba9eada173cb10ad1db525e1ad89d1c8f44200d79dc02068ccf93fdbf2e8daa5bb359dae77bacbc89cb6d4895732774b

diff --git a/media-video/projectx/projectx-0.91.0.10-r3.ebuild b/media-video/projectx/projectx-0.91.0.10-r4.ebuild
similarity index 92%
rename from media-video/projectx/projectx-0.91.0.10-r3.ebuild
rename to media-video/projectx/projectx-0.91.0.10-r4.ebuild
index 25f2b25ae070..bc9ed20e4ba0 100644
--- a/media-video/projectx/projectx-0.91.0.10-r3.ebuild
+++ b/media-video/projectx/projectx-0.91.0.10-r4.ebuild
@@ -11,7 +11,7 @@ XDG_P="xdg-20100731"
 
 DESCRIPTION="Converts, splits and demuxes DVB and other MPEG recordings"
 HOMEPAGE="http://project-x.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.xz
+SRC_URI="https://dev.gentoo.org/~billie/distfiles/${PF}.tar.xz
 	https://dev.gentoo.org/~billie/distfiles/${PN}-idctfast.tar.xz
 	https://dev.gentoo.org/~billie/distfiles/${XDG_P}.java.xz
 	https://dev.gentoo.org/~billie/distfiles/${PN}-icon.png"
@@ -33,7 +33,6 @@ DEPEND="
 	${COMMON_DEPEND}
 	>=virtual/jdk-1.8:*
 	app-arch/xz-utils
-	virtual/libiconv
 "
 
 S="${WORKDIR}/Project-X"
@@ -74,13 +73,6 @@ src_prepare() {
 	# convert CRLF to LF
 	edos2unix *.txt MANIFEST.MF
 
-	# convert docs to utf-8
-	if [ -x "$(type -p iconv)" ]; then
-		for X in zutun.txt; do
-			iconv -f LATIN1 -t UTF8 -o "${X}~" "${X}" && mv -f "${X}~" "${X}" || die
-		done
-	fi
-
 	# merge/remove resources depending on USE="X"
 	if use X; then
 		mv -f htmls resources/ || die