gentoo resync : 05.04.2018

4 files changed, 13 insertions, 85 deletions

diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index defcdc76fb59..6b9e8dbcacbe 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,10 +1,7 @@
 AUX fotoxx-13.11.1.patch 1791 BLAKE2B 4630767fb8a348923a6f8b71b37ee05a1fa7230a75dd284329294aaa8ddd50e681a40ebb469049817ffa72fdf4d87d22cbb76b01a7d7521fe6bf5380e06a0711 SHA512 e3543c861fb8e5f5de547b8976d15d86fac20ffc83285d2d9c46d805eb6b0e3fe20de07c4644c9272c7cd44c1a6d43360cb82fc92abc15ca34997353e4cbdf2b
-AUX fotoxx-15.04.1.patch 460 BLAKE2B 95f19579fecaa13dacf5249cae1e05561070f2ac9cf8856d17d0bbf0e4b4c55ea476960f5e49580200e190d0f84daa3c29862a1414848a14b6d72a058b694767 SHA512 e4d2ddd827de492ac4890c8c8b34719b9dcc6acd555de60c7d5bef35d8c0dca032635fac9b989c92594ea92d5bd47c0300acca9074696058321bd401fdbb7b0b
 AUX fotoxx-15.05.patch 460 BLAKE2B 95f19579fecaa13dacf5249cae1e05561070f2ac9cf8856d17d0bbf0e4b4c55ea476960f5e49580200e190d0f84daa3c29862a1414848a14b6d72a058b694767 SHA512 e4d2ddd827de492ac4890c8c8b34719b9dcc6acd555de60c7d5bef35d8c0dca032635fac9b989c92594ea92d5bd47c0300acca9074696058321bd401fdbb7b0b
 DIST fotoxx-13.11.1.tar.gz 2473330 BLAKE2B 838772cfd6939dafdc58e52a264f86027e9a5dc65ab9ffc82afc11c114ffa71c60e11f1eb54c182696c1ea9231acbd8eb293d1bba485960f26c0ffe8df5b0323 SHA512 c880f5f1a67f12ab081820d4a897912e20985dbad0096d2f4ef1f37d0b2b626dd66c69a593e57b31432a67f79eadd4ea8022dcde01bec865f71ecbfec456caa2
-DIST fotoxx-15.04.1.tar.gz 3491468 BLAKE2B 02d94f354c1a61e2249e6016a270a9d9b027f3327837958008e51f2b20e63e86dd2dfa7ef234b7cef44e42110fea740f2b1ae4ffd401a9057d5b89a4746170d0 SHA512 d70fb437a4aacc18754a7df90fe3b23287ed3d31cbc545ed75ab3eb20cba6c83b4394251553b795c87ab2ecffe551905f9a39d19fead82fabafd646a9691313f
 DIST fotoxx-15.05.tar.gz 3573278 BLAKE2B 0a7f564b2a31cf7db131d8a09a8624f087b7a5beb377949843d99d5933d5b16fb270177fe233f943af7f26753fffc6a52a5a5feea18c065f0dd99a74256a33f0 SHA512 07155e5f32c0ada33dd95de333a4a124c9fc56b3807bb2edc2b078f0eab37968f374f84701bb8ce9b200f00ed4587c83f772899ba39527378d3527050960ac0e
 EBUILD fotoxx-13.11.1.ebuild 1164 BLAKE2B f08e5c31562fe3d86b21205a0f0b268227c2d97da587f1aa921084f1be8a2b3a47d407a470ffb1b9cbc54164727e127ff8df3a37f646b35117234db843217315 SHA512 4b33c9b0ab25e83ec19b099779c50a2f3748d1b0fbb5183c1ec700f26347809f3a82dac11ef0b8937567514a5fb2e41ac5079cce3b6f36245e2673f2e17557b1
-EBUILD fotoxx-15.04.1.ebuild 1166 BLAKE2B c9a7cf065c5269fad172cf4377e0c238335e9a98129d2b7bfe730a78bdddaa7d236392d0e8757d86a1f4280ebb2362c78b45afdda530c653661c2cd73847fa0e SHA512 515bc431d1fd7c5a46f4eef3443f572406c4122b3533986904a10a71a6955ab2e71a182debd5bb85b5bdd3fbf97e10127cdd827b484a2407040dde3d426c4083
-EBUILD fotoxx-15.05.ebuild 1166 BLAKE2B c9a7cf065c5269fad172cf4377e0c238335e9a98129d2b7bfe730a78bdddaa7d236392d0e8757d86a1f4280ebb2362c78b45afdda530c653661c2cd73847fa0e SHA512 515bc431d1fd7c5a46f4eef3443f572406c4122b3533986904a10a71a6955ab2e71a182debd5bb85b5bdd3fbf97e10127cdd827b484a2407040dde3d426c4083
+EBUILD fotoxx-15.05.ebuild 1148 BLAKE2B 7323dfa8337f28cc7dd55fe7d0eb8fdac3fd1d93ab9eb0779b2035d6fc0c8ade7eedc66f3e5f65e27c125e1f81b5f20c67c3c7af0d41c910224045b8c8541c8e SHA512 677e2151018f939e31882592b189d0173003520e16ce15c1ad9059831e3b2b53ff855338efa7a20fdff839838bad62b322b0e42606554eb9b3e9aea74e016656
 MISC metadata.xml 773 BLAKE2B 75c03d8cf914e9aeb25db837d5e945908082d8711b19fbeb8694371ebb8c2ff6c69088dd4c887ce4f29eb456e2f412f6d992ac04c447a31e814838dbf5932aa1 SHA512 1fbf87c22810a242a8d7f0e91e6ee6bcb6b1a08cb39c3e827171e110bdcc5468a2440c42d56f1630860555a54fee0133483d8551dac164492bb630fcb45c7cc8
diff --git a/media-gfx/fotoxx/files/fotoxx-15.04.1.patch b/media-gfx/fotoxx/files/fotoxx-15.04.1.patch
deleted file mode 100644
index 15fdaa9abacf..000000000000
--- a/media-gfx/fotoxx/files/fotoxx-15.04.1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -r -U1 fotoxx-14.10.2.orig/Makefile fotoxx-14.10.2/Makefile
---- 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/fotoxx-15.04.1.ebuild b/media-gfx/fotoxx/fotoxx-15.04.1.ebuild
deleted file mode 100644
index 5f911c91bb97..000000000000
--- a/media-gfx/fotoxx/fotoxx-15.04.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs fdo-mime
-
-DESCRIPTION="Program for improving image files made with a digital camera"
-HOMEPAGE="http://www.kornelix.com/fotoxx.html"
-SRC_URI="http://www.kornelix.com/uploads/1/3/0/3/13035936/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	x11-libs/gtk+:3
-	media-libs/libpng
-	media-libs/tiff
-	media-libs/lcms:2"
-RDEPEND="${DEPEND}
-	media-libs/exiftool
-	media-gfx/ufraw[gtk]
-	media-gfx/dcraw
-	x11-misc/xdg-utils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PF}.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
-	docompress -x /usr/share/doc
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-gfx/fotoxx/fotoxx-15.05.ebuild b/media-gfx/fotoxx/fotoxx-15.05.ebuild
index 5f911c91bb97..5ef117c20f77 100644
--- a/media-gfx/fotoxx/fotoxx-15.05.ebuild
+++ b/media-gfx/fotoxx/fotoxx-15.05.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-inherit eutils toolchain-funcs fdo-mime
+inherit desktop toolchain-funcs xdg-utils
 
 DESCRIPTION="Program for improving image files made with a digital camera"
 HOMEPAGE="http://www.kornelix.com/fotoxx.html"
@@ -15,19 +15,17 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	x11-libs/gtk+:3
 	media-libs/libpng
 	media-libs/tiff
-	media-libs/lcms:2"
+	media-libs/lcms:2
+	x11-libs/gtk+:3"
 RDEPEND="${DEPEND}
-	media-libs/exiftool
 	media-gfx/ufraw[gtk]
 	media-gfx/dcraw
+	media-libs/exiftool
 	x11-misc/xdg-utils"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PF}.patch
-}
+PATCHES=( "${FILESDIR}"/${P}.patch )
 
 src_compile() {
 	tc-export CXX
@@ -39,16 +37,16 @@ src_install() {
 	# 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
+	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
 	docompress -x /usr/share/doc
 }
 
 pkg_postinst() {
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }