gentoo auto-resync : 27:10:2022 - 15:57:47

3 files changed, 2 insertions, 99 deletions

diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index 6be8cbad6c32..be63813cb7b5 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -4,6 +4,5 @@ AUX xpaint-3.1.3-libtool-clang.patch 1434 BLAKE2B d89978f8c925a64fa62ff2a0788ed8
 AUX xpaint-3.1.4-gentoo-lto.patch 670 BLAKE2B 851334824d813029f2a78fb2b3698c85eee3cc79bd63f3db222f6c32fa75bd3f7af85f00fc898ee71e3f5851c1c8181b2f3e798865d7516f2bebbba794783e38 SHA512 d2211c291fca46c102ecb820eeda7e4441326e856e91819c6e3adadfde9dd02e1bda8610b305bb2fe056bd6c5d4ad8e1e6b52015dafad86c76005ef5d166e7de
 AUX xpaint-3.1.4-gentoo-shared-lib.patch 503 BLAKE2B 12bae42eb3a119c8acb3c5a6436191bf65c9697f6d743531633f0d64f5cdb26270f659eb0725a26efcc780cc06f91cf7f4e4f5032cf72f21614f3f7e48615b25 SHA512 971fb77386f2a896605d05346c4cf65fd68bdcc7b2f82e1319059f1c4ac37b0d76585c8ff0ce6d5841639bd94b420ac29b2e5275fe9309b31549cc540f2a9833
 DIST xpaint-3.1.4.tar.bz2 1630009 BLAKE2B 6090156f0c27742487edfd24e803e814d7f2801c3847a5435a896e575ee3bf0b17f498e8ba8f4b7a87536780dd7c15ec7e0c0e0acb28b225d95ed0c835abfa97 SHA512 ea81f0f0eaad2072fe487efba933b6f0a4f2a4d8ae7548169b8e765cf1232c9944149a822173350af91309535d8f3625b8e58814811a5f4491fa3e2fcdf92e1d
-EBUILD xpaint-3.1.4-r2.ebuild 1723 BLAKE2B 2cf973875dbde698d428afb8401e427685d3cfd55e2e53a69daaa033fee9194becbbc6acd5a314c0f53cbcccd235464fcd3da4264bc2107e3217a1b8d07e27dc SHA512 4189a6f80e732dee641d36dbe722ca90753ea420aac31b3da313679f9f00f7dd77125a70c8ce09ceacb83691bbcc09f9a446282711c40c45db7fd53df2b5c229
-EBUILD xpaint-3.1.4.ebuild 1831 BLAKE2B b58a61ef1b8713afd3483f0222aef890c88a439551ef417d1cd3b88f5429eecba6b141485ad60856083b5794acebb8a91f3dbe4c2668ab419656d7f3393b45b7 SHA512 f8c103d2e97011cece1ca579b12d186eefd10478f591269b234297edd6c2a6f166384fb329fb92fcf920d717c2a6011aaa5cf023fad771e1d1cb7296d338ab4a
+EBUILD xpaint-3.1.4-r2.ebuild 1724 BLAKE2B 242b047694a1fd016175954802c8694f52e6feb3273e7cb5abf3154681763be31d547e8923ad8787640689012ba33aa13ca47dcc47d921d06409c1ead5b50ae1 SHA512 29f90493395a9972f435fd16a00eb9936717cdbfa314b4467746888a14ca7b40335700c4740aa9dc55864d459c17c6bd7d1f9ec7130f84d61648d7a4d1512080
 MISC metadata.xml 1440 BLAKE2B 54c11ed5ec99921d5ff28f23ee6be2df1fb2d21b3a994c92a94f0edfb2b69116620767bb51811c095736c1f1a7fb4205d6f1971997d81ca9f3c17c6c394d3068 SHA512 34c889965c22aa055b0205d0f93b45f51572958bf0ac992a781a3a5c679303081c368e4af35fa4c4699e8ac4724e125b4048b2d2856c408092cd4c7859728880
diff --git a/media-gfx/xpaint/xpaint-3.1.4-r2.ebuild b/media-gfx/xpaint/xpaint-3.1.4-r2.ebuild
index 59ff76a5800d..31ae9d1b230c 100644
--- a/media-gfx/xpaint/xpaint-3.1.4-r2.ebuild
+++ b/media-gfx/xpaint/xpaint-3.1.4-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit autotools desktop toolchain-funcs xdg
 
 DESCRIPTION="Image editor with tiff, jpeg and png support"
-HOMEPAGE="http://sf-xpaint.sourceforge.net/"
+HOMEPAGE="https://sf-xpaint.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
 
 LICENSE="GPL-3"
diff --git a/media-gfx/xpaint/xpaint-3.1.4.ebuild b/media-gfx/xpaint/xpaint-3.1.4.ebuild
deleted file mode 100644
index adb623f11685..000000000000
--- a/media-gfx/xpaint/xpaint-3.1.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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/libjpeg-turbo:=
-	media-libs/libpng:0=
-	media-libs/netpbm
-	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
-	pgf? ( media-libs/libpgf )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.3-libtool-clang.patch
-	"${FILESDIR}"/${PN}-3.1.3-gentoo-qa.patch
-	"${FILESDIR}"/${PN}-3.1.3-gentoo-prefix.patch
-	"${FILESDIR}"/${P}-gentoo-shared-lib.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
-
-	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' -delete || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}