gentoo resync : 22.05.2021

5 files changed, 2 insertions, 104 deletions

diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index 62375eabab90..786cb595239e 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,8 +1,4 @@
-AUX fotoxx-15.05-docdir.patch 395 BLAKE2B b0fb1bdd0e56f29569b49ca6b6d2acd205a1272924ab955d5778ffb7150400193ee12052a169ee9a2e0e07dd6b40c0ccb0f62e84463c651577447d32109fa273 SHA512 9204f4712ced994b22137b8f5fc80976120835ea5bde14b5caaa5db604b10de7a7b6ea743333603a1887a8012d806a5af8cf0ffea26f8ea8eb74d228fb822c1e
-AUX fotoxx-15.05-gcc-11.patch 925 BLAKE2B ac27fa95bc877b66607f5aca75c44462c0a8c39ee3acc117c9f6949a9d4975728156470dc04dce9b8a95582c72e5c236b68e4d2f01508246bdef0ac23b087621 SHA512 19801bf47e796953d148a12cdeb1eb5dbac23f4d54b41782923c61096f9dabf791b6d7afbc529f2c4214f940d83ba6807816afb0f8303b3ab514330bc01dfb63
 AUX fotoxx-21.40-documentation.patch 1511 BLAKE2B da0443a6b1ff8684e43005239f0184c742cd59727e3c55460713680b14b5d39ba528b7a17a87b893a9585824f1e402b5f46bbe45451dd8888b62d1752524db44 SHA512 d0f79f986b605c3f981de99c533f57a60aac47844d1434482e507a7e7e4d2be2b581419e211f034213c7c23db0e56f4fe5d789f39624a33aee283c8b8a489509
-DIST fotoxx-15.05.tar.gz 3573278 BLAKE2B 0a7f564b2a31cf7db131d8a09a8624f087b7a5beb377949843d99d5933d5b16fb270177fe233f943af7f26753fffc6a52a5a5feea18c065f0dd99a74256a33f0 SHA512 07155e5f32c0ada33dd95de333a4a124c9fc56b3807bb2edc2b078f0eab37968f374f84701bb8ce9b200f00ed4587c83f772899ba39527378d3527050960ac0e
 DIST fotoxx-21.40.tar.gz 8583921 BLAKE2B 63e49768c6d5941fe4259f83aef4ce8d0e19498c1090e4eb5017337f184edb0c60939323cc6481efcf72d0544347e046c94e37619e1f466b6dde0ab0919c3792 SHA512 05db14fafd8187bcb1de1576ca445fe525e895089fe670a80f890b2c525f5424fabd751ea422a5cc266cc7e8175ecaf7800b97a5ad686ea3e4e482de78190f3b
-EBUILD fotoxx-15.05.ebuild 1199 BLAKE2B deaad80fe616d8691961775ca86ac57c93fad6920a5f7bd46b97163ec83f7d8450bb7d3d5b925b26402c9817be6d8c94b7ab365bb649093a5db6a3f34c30615b SHA512 cb0117567b401365354eb10b3554363afa48400f6b4412468897fca144921c849be45d7839eb47dcdae25dd4488fac212b1ba1370fa31fde88f25c2859dbd57d
-EBUILD fotoxx-21.40.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
+EBUILD fotoxx-21.40.ebuild 2260 BLAKE2B 5d3fecfa601f41c29f00474e810b928dc9bd12218be8d4acaa886640062b00966385884afb449b9fb15c804b1f3df11bda98bc4b2e70a68805411acec56163fc SHA512 342230c7481c9134b8ee93f774f9433c8ac4121714413cc518a2db1bfd3798e6a3a88c880bb035e4c55ca2e325f772ec04f4bbec3ce441894bed75e657ba0159
 MISC metadata.xml 850 BLAKE2B 463cae7d8df56ad93adaf7fbb4cf31f2838452e1349e61175c9981db4e95cc506b992cba2876885f8e949061808300752ef5806e9a096647f769bca654cca8e9 SHA512 e5c38d8602a52ae25bf90990136a98b57f69701cea70d4762f6102dc791f97b134853f7321894d1fbbbfdd353cebad7afa27cb56373f256d9497c3600d66d19e
diff --git a/media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch b/media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch
deleted file mode 100644
index 8cab49ff51ea..000000000000
--- a/media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- fotoxx-14.10.2.orig/Makefile	2014-10-09 15:17:09.000000000 +0700
-+++ fotoxx-14.10.2/Makefile	2014-10-13 20:44:55.061728475 +0700
-@@ -16,3 +16,3 @@
- LOCALESDIR = $(SHAREDIR)/locales
--DOCDIR = $(PREFIX)/share/doc/fotoxx
-+DOCDIR = $(PREFIX)/share/doc/$(PF)
- MANDIR = $(PREFIX)/share/man/man1
-@@ -90,4 +90,2 @@
- 	rm -f fotoxx.1.gz
--	# menu (desktop) file
--	cp -f desktop $(DESTDIR)$(MENUFILE)
- 
diff --git a/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch b/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch
deleted file mode 100644
index 5d84e687d397..000000000000
--- a/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix 'smart_erase_blur' declaration and definition mismatch.
-
-https://bugs.gentoo.org/768207
---- a/f.repair.cc
-+++ b/f.repair.cc
-@@ -2265,7 +2265,7 @@ void smart_erase_func(int mode)
- 
- //  add blur to the erased area to help mask the side-effects
- 
--int smart_erase_blur(float radius)
-+void smart_erase_blur(float radius)
- {
-    int         ii, px, py, dx, dy, adx, ady;
-    float       blur_weight[12][12];                                        //  up to blur radius = 10
-@@ -2274,7 +2274,7 @@ int smart_erase_blur(float radius)
-    float       red, green, blue;
-    float       *pix9, *pix3, *pixN;
- 
--   if (sa_stat != 3) return 0;
-+   if (sa_stat != 3) return;
- 
-    rad = radius - 0.2;
-    rad2 = rad * rad;
-@@ -2342,7 +2342,6 @@ int smart_erase_blur(float radius)
-    CEF->Fmods++;
-    CEF->Fsaved = 0;
-    Fpaint2();                                                              //  update window
--   return 0;
- }
- 
- 
diff --git a/media-gfx/fotoxx/fotoxx-15.05.ebuild b/media-gfx/fotoxx/fotoxx-15.05.ebuild
deleted file mode 100644
index b15710b39828..000000000000
--- a/media-gfx/fotoxx/fotoxx-15.05.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop toolchain-funcs xdg-utils
-
-DESCRIPTION="Program for improving image files made with a digital camera"
-HOMEPAGE="https://www.kornelix.net/fotoxx/fotoxx.html"
-SRC_URI="http://www.kornelix.com/uploads/1/3/0/3/13035936/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	media-libs/libpng
-	media-libs/tiff
-	media-libs/lcms:2
-	x11-libs/gtk+:3"
-RDEPEND="${DEPEND}
-	media-gfx/ufraw[gtk]
-	media-gfx/dcraw
-	media-libs/exiftool
-	x11-misc/xdg-utils"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-docdir.patch
-	"${FILESDIR}"/${P}-gcc-11.patch
-)
-
-src_compile() {
-	tc-export CXX
-	emake
-}
-
-src_install() {
-	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
-	# and README, changelog, translations, edit-menus, KB-shortcuts must not be compressed
-	emake DESTDIR="${D}" install
-	newmenu desktop ${PN}.desktop
-	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
-	docompress -x /usr/share/doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/fotoxx/fotoxx-21.40.ebuild b/media-gfx/fotoxx/fotoxx-21.40.ebuild
index 12a78336fe75..d9e91deab328 100644
--- a/media-gfx/fotoxx/fotoxx-21.40.ebuild
+++ b/media-gfx/fotoxx/fotoxx-21.40.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 # For required dependencies read doc/README, for required tools read