gentoo resync : 05.12.2021

3 files changed, 2 insertions, 108 deletions

diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index 9d4aa910353d..2e180b8e78c5 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -2,8 +2,6 @@ AUX xpaint-3.1.3-gentoo-prefix.patch 3605 BLAKE2B c513a72991ec83b99fc12d90c112c7
 AUX xpaint-3.1.3-gentoo-qa.patch 1480 BLAKE2B 43b80854e8d0bb68566f86116444507852bf61807846ec97238a90fefc8a86f9be3978858c12af3278b787b14f805edb628327ae411b8b6fbdcd7530ee72cbd5 SHA512 cfa7057625f3086b573f9109a89f29e1cf17c15d253a0c903bd0f315e4aac3d8111df899ef98d0a3416486d81305f0a041f061985d31d435ccbd24b0fc5a57b3
 AUX xpaint-3.1.3-libtool-clang.patch 1434 BLAKE2B d89978f8c925a64fa62ff2a0788ed81ca5faee6a71afda069930a7381e2bb095bbad3c1236c3594532afc5441ef789bf6ea0571b4bb25065e2cbef7fdc52ebe3 SHA512 f4027619c4eda686953fc33c62518a7ef12db09e6160f5e038179aa06f64629d2ad28b373ec332fe3266fd7e15af77577b6a60cfdffb165afe1358519201c399
 AUX xpaint-3.1.4-gentoo-shared-lib.patch 503 BLAKE2B 12bae42eb3a119c8acb3c5a6436191bf65c9697f6d743531633f0d64f5cdb26270f659eb0725a26efcc780cc06f91cf7f4e4f5032cf72f21614f3f7e48615b25 SHA512 971fb77386f2a896605d05346c4cf65fd68bdcc7b2f82e1319059f1c4ac37b0d76585c8ff0ce6d5841639bd94b420ac29b2e5275fe9309b31549cc540f2a9833
-DIST xpaint-3.1.3.tar.bz2 1656489 BLAKE2B c6f5ed4a6c990dccacc572c834fabf68a16cacfde477915e5c3598a96335a899344d4375a48e6bf06fb601e9b260a11cc2b43afb404a83b9fb7b3044288ce1fa SHA512 8ef15d6af4b65d9da18d3e5eb9eacc0b42e718d069e20de91f2e0352b642d0a4b7626a2008fdd6217c0668ed1ecdc7a09c4a993a6074c77b7899b4613c1c4bda
 DIST xpaint-3.1.4.tar.bz2 1630009 BLAKE2B 6090156f0c27742487edfd24e803e814d7f2801c3847a5435a896e575ee3bf0b17f498e8ba8f4b7a87536780dd7c15ec7e0c0e0acb28b225d95ed0c835abfa97 SHA512 ea81f0f0eaad2072fe487efba933b6f0a4f2a4d8ae7548169b8e765cf1232c9944149a822173350af91309535d8f3625b8e58814811a5f4491fa3e2fcdf92e1d
-EBUILD xpaint-3.1.3.ebuild 1941 BLAKE2B 5e739c74c5341e48c973cb0786b96f56724ea602cf463855d2e587ce67a5437620585bfa84b8b6de2707c882453c43e3f1181e3f76fae69ad6ca73725d60caf4 SHA512 3b073c54cc13783430d34d6777eab200953dff07d01c529fc6ba1a5ff21de390a98758b588388fcc217c06783f335033f2de71275961b5563d68aa231fdc7dbf
-EBUILD xpaint-3.1.4.ebuild 1833 BLAKE2B e0059015e593960e104a5270bc7122d51c4b0589cdc0d6bb3c617b3b0845de5b7a0a92c09d12fff5abe813646622307edfa5e67f1c87da6c0a9e2d152c131963 SHA512 afb301b6c6e0c93cb1157acfbdf91f7240d786e36a06319a41cba49c438597832dff70bc66380903a155fc77f33bf5d08fcceb7665ab4c434c0adf6dfa303a3d
+EBUILD xpaint-3.1.4.ebuild 1831 BLAKE2B b58a61ef1b8713afd3483f0222aef890c88a439551ef417d1cd3b88f5429eecba6b141485ad60856083b5794acebb8a91f3dbe4c2668ab419656d7f3393b45b7 SHA512 f8c103d2e97011cece1ca579b12d186eefd10478f591269b234297edd6c2a6f166384fb329fb92fcf920d717c2a6011aaa5cf023fad771e1d1cb7296d338ab4a
 MISC metadata.xml 1440 BLAKE2B 54c11ed5ec99921d5ff28f23ee6be2df1fb2d21b3a994c92a94f0edfb2b69116620767bb51811c095736c1f1a7fb4205d6f1971997d81ca9f3c17c6c394d3068 SHA512 34c889965c22aa055b0205d0f93b45f51572958bf0ac992a781a3a5c679303081c368e4af35fa4c4699e8ac4724e125b4048b2d2856c408092cd4c7859728880
diff --git a/media-gfx/xpaint/xpaint-3.1.3.ebuild b/media-gfx/xpaint/xpaint-3.1.3.ebuild
deleted file mode 100644
index 1c03f7e9b5fb..000000000000
--- a/media-gfx/xpaint/xpaint-3.1.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop toolchain-funcs xdg-utils
-
-DESCRIPTION="Image editor with tiff, jpeg and png support"
-HOMEPAGE="http://sf-xpaint.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pgf tiff"
-# jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592
-
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	media-libs/netpbm:=
-	x11-libs/libICE
-	x11-libs/libX11
-	>=x11-libs/libXaw3dXft-1.6.2h[unicode]
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	sys-libs/zlib
-	pgf? ( media-libs/libpgf )
-	tiff? (
-		media-libs/jbigkit:0=
-		media-libs/tiff:0
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libtool-clang.patch
-	"${FILESDIR}"/${P}-gentoo-qa.patch
-	"${FILESDIR}"/${P}-gentoo-prefix.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable tiff) \
-		--disable-libdvipgm \
-		--disable-libopenjpeg
-}
-
-src_compile() {
-	# clean up
-	emake clean
-	emake -C util clean
-
-	# parallel make still fails sometimes
-	emake substads
-	emake xpaint.1
-
-	# regenerate resources in app-defaults
-	rm XPaint.ad || die
-
-	default
-	emake \
-		WITH_PGF="$(usex pgf "yes" "no")" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		includedir="${EPREFIX}"/usr/include \
-		-C util
-}
-
-src_install() {
-	default
-	emake \
-		WITH_PGF="$(usex pgf "yes" "no")" \
-		DESTDIR="${ED}" \
-		-C util install
-	doicon icons/xpaint.svg
-	make_desktop_entry "${PN}"
-	find "${ED}" \( -name '*.la' -o -name '*.a' \) -type f -delete || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/xpaint/xpaint-3.1.4.ebuild b/media-gfx/xpaint/xpaint-3.1.4.ebuild
index 64e86898d496..adb623f11685 100644
--- a/media-gfx/xpaint/xpaint-3.1.4.ebuild
+++ b/media-gfx/xpaint/xpaint-3.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pgf tiff"
 # jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592