3 files changed, 2 insertions, 137 deletions
diff --git a/media-video/projectx/Manifest b/media-video/projectx/Manifest
index 21d270e70808..e9e1507ff816 100644
--- a/media-video/projectx/Manifest
+++ b/media-video/projectx/Manifest
@@ -7,6 +7,5 @@ DIST projectx-0.91.0.10.tar.xz 830104 BLAKE2B 511481dd2c391a6a26acfa0603f1c221d0
 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
-EBUILD projectx-0.91.0.10-r2.ebuild 3277 BLAKE2B a682a39f1869f45ddea86f759fe04375da69e0b0b9f40894d385e1e758c287aa608fa0b362c8161455b5fd3fca558f1f8557b3dbc27d6ad9880188e35cf0be20 SHA512 bf4a4c64e156feabf89e2b0f81097c6d2a809e7ea065601eff23fe8a78b746887a30b5c1a7bccba3d835e6fadc90d232f2a4182dd3d22425669233da7d11b531
-EBUILD projectx-0.91.0.10-r3.ebuild 3282 BLAKE2B 86e0dc08b4aa451439a1d51cd47a02919662b925d8178f32257c2de08d64a17316f44913b992abaade9b3d65b3c17eaf19dc15de9e5391dd34de835f2605e19d SHA512 03645b4c86772d82a94a4005eeb6fc5b70224ef346e1cd01ae4f5077a71d2d3ea3bcab60ccc7b1de40c95343ec042b360788ffef503c65c4145196d8df936d7a
+EBUILD projectx-0.91.0.10-r3.ebuild 3281 BLAKE2B ee583ac243692e5e6ad22e0fc1e8f62b31d89f336612fc46560069d554b5fe753081145dcbe2deca44e7ac1d468c7e09a22ed217e392a832caae9a40a084fd9a SHA512 2c1c1fe0231da7fe3f950ede177c207ca223e0abdc2242dc7d0b6fffe24707fab63a280514e5b272615cf19c278c8824b02e0688608b9f20e83d77d9ff618d60
 MISC metadata.xml 742 BLAKE2B 5aacc52def6d49258139e9435aa1db4f2295a07e4491a921db142c262c84a3deaaf8b9b22d7bc68dcd00ee142cb4f9912463f4ab2fb79eae74ea461375b1467c SHA512 3a5546c1efbafa335ee5d05ff24c2b22f0f49d8944e242348bef9627ac5e72205d9bd3e697b3d89c7d0ef3e34d98fe19b58c021f41bcaff872c74373a6803341
diff --git a/media-video/projectx/projectx-0.91.0.10-r2.ebuild b/media-video/projectx/projectx-0.91.0.10-r2.ebuild
deleted file mode 100644
index 9dc9a50eaad6..000000000000
--- a/media-video/projectx/projectx-0.91.0.10-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit desktop eutils java-pkg-2 java-ant-2 toolchain-funcs xdg
-
-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
-	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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="X cpu_flags_x86_mmx cpu_flags_x86_sse"
-
-COMMON_DEPEND="
-	dev-java/commons-net:0
-	X? ( dev-java/browserlauncher2:1.0 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	>=virtual/jre-1.5
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=virtual/jdk-1.5
-	app-arch/xz-utils
-	virtual/libiconv
-"
-
-S="${WORKDIR}/Project-X"
-
-mainclass() {
-	# read Main-Class from MANIFEST.MF
-	sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" || die
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	local X
-
-	# apply stdout corruption patch (zzam@gentoo.org)
-	eapply "${FILESDIR}/${PN}-0.91.0.10-stdout-corrupt.patch"
-
-	# apply BrowserLauncher2 patch
-	use X && eapply "${FILESDIR}/${PN}-0.91.0.10-bl2.patch"
-	rm -rf src/edu || die
-
-	# apply IDCTFast patch
-	eapply "${FILESDIR}/${PN}-0.91.0.10-idctfast.patch"
-
-	# apply XDG patch
-	cp -f "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java" || die
-	eapply "${FILESDIR}/${PN}-0.91.0.10-xdg.patch"
-
-	# copy build.xml
-	cp -f "${FILESDIR}/build-0.91.0.10.xml" build.xml || die
-
-	# patch executable and icon
-	sed -i -e "s:^\(Exec=\).*:\1${PN}_gui:g" \
-		-e "s:^\(Icon=\).*:\1${PN}:g" *.desktop || die
-
-	# 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
-	else
-		rm -rf src/net/sourceforge/dvb/projectx/gui || die
-		rm resources/*.gif || die
-	fi
-
-	# update library packages
-	cd lib || die
-	rm -f {commons-net,jakarta-oro}*.jar || die
-	java-pkg_jar-from commons-net
-	use X && java-pkg_jar-from browserlauncher2-1.0
-	java-pkg_ensure-no-bundled-jars
-}
-
-src_compile() {
-	local IDCT="idct-mjpeg"  # default IDCT implementation
-	if use x86 || use amd64; then
-		use cpu_flags_x86_mmx && IDCT="idct-mjpeg-mmx"
-		use cpu_flags_x86_sse && IDCT="idct-mjpeg-sse"
-	fi
-
-	eant build $(use_doc) -Dmanifest.mainclass=$(mainclass)
-
-	cd lib/PORTABLE || die
-	emake CC=$(tc-getCC) IDCT="${IDCT}" LDFLAGS="${LDFLAGS}" \
-		CPLAT="${CFLAGS} -O3 -ffast-math -fPIC"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_doso lib/PORTABLE/libidctfast.so
-
-	java-pkg_dolauncher ${PN}_cli --main $(mainclass) \
-		--java_args "-Djava.awt.headless=true -Xmx256m"
-
-	if use X; then
-		java-pkg_dolauncher ${PN}_gui --main $(mainclass) \
-			--java_args "-Xmx256m"
-		dosym ${PN}_gui /usr/bin/${PN}
-		newicon "${DISTDIR}/${PN}-icon.png" "${PN}.png"
-		domenu *.desktop
-	else
-		dosym ${PN}_cli /usr/bin/${PN}
-	fi
-
-	dodoc *.txt
-	use doc && java-pkg_dojavadoc apidocs
-	use source && java-pkg_dosrc src
-}
diff --git a/media-video/projectx/projectx-0.91.0.10-r3.ebuild b/media-video/projectx/projectx-0.91.0.10-r3.ebuild
index d8f6c92c8c24..a6df47e09cb3 100644
--- a/media-video/projectx/projectx-0.91.0.10-r3.ebuild
+++ b/media-video/projectx/projectx-0.91.0.10-r3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="X cpu_flags_x86_mmx cpu_flags_x86_sse"
 
 COMMON_DEPEND="