gentoo resync : 03.11.2019

3 files changed, 2 insertions, 97 deletions

diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index bef1fe6ccdb3..a70e24fce622 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -9,6 +9,5 @@ AUX ufraw-0.22-gcc9.patch 3569 BLAKE2B ce417eb79994190666b842f6017f18eadead284bb
 AUX ufraw-0.22-jasper-automagic.patch 613 BLAKE2B 100e6b31540030a20c8cff8e99329a738378788b2ab11665c0c8ab2f3246c821a176dba8b26cea354e8b0d127d2c601c21b0ac94f5264327916d0f8779618165 SHA512 855337bf109ebc0ea7b9bd429bcc429bd9caa561e2a815352c51e860a6e405d500913b70414ded7f47e053332c89b964d1817c8f22627504cf157f1565f3c7a4
 AUX ufraw-0.22-jpeg9.patch 1076 BLAKE2B 84448c537706d7b29f54d4735a75bf9501eac7927529c6d8e43d6cd746763ab753715d54cf943bb8bb5ddd8a29891f7522a680426acd2eb52af450492656ae3e SHA512 520e9351d7b8aa84f79a7c2841c2f56eaca849e67e448dc9503d248e31c1aa9fecaa64a332c0a155b6ba1ab7debec8734f3f2ef710bcb534a5fca34e9b5c8f7c
 DIST ufraw-0.22.tar.gz 1103554 BLAKE2B 5ffa4c660602553853221d7b31bfb78b02644bfeb4461cf752186d83ed8087b7905e414c7d741916ca9460c05849ab679b2f3098c99e5246f54a49b6a915268f SHA512 a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2
-EBUILD ufraw-0.22-r2.ebuild 1939 BLAKE2B 7262c313dbcc14685c90969a9c88ebadadf9b721a86bc309c5f667b17230c73b7e7d9d72acc9b8af8727e3e5cb27c8769a26146e554796a67b0c59f26d4405c1 SHA512 c8eb3ea3142f28efefe2f16c771af54f2834a39600b8f64428cfab01774ae67f344489aac415f0816b14065ea0ab17b9ca7a34126bffc0d91a8eaa18f25e1c9e
-EBUILD ufraw-0.22-r3.ebuild 2076 BLAKE2B 37b67ff3a94eb222a3d61d368d3013919f4eb57de0da6943439bec39437494570f8024c1b4ff1eabcd7398935c5903b00340f04d5c694cce4855a5826cb2ee91 SHA512 9ade02ae32b3b0cdbf2aa52579781dfa77f3424421ef32c5f1e56e370b921a2101474d81688573355145cd5f8bb27559e88e55e9f1ceb10649674bea9473d832
+EBUILD ufraw-0.22-r3.ebuild 2075 BLAKE2B c4784ef9a9e28f169890b50925ea48af92e14956fbdb861e3476449c483d2af1edc9ec6aee84b1188e877359bada9d9169a9801aeed9baee0cfb18c03123b833 SHA512 dbc4cab64e2a0a242221b8924bd77c46a3e53d6e3c943b6d238779d98888a67867d8d9d36a32da03e6d7ddfbb76c5fe17033795d7e8bd59ad52e8e94946398db
 MISC metadata.xml 588 BLAKE2B 3e6ec0c8b11a3c30d1b20b5df4303fc1bc10b4e6459a24358ac50bcfaa414b307efe6d392d23fd7ce1443917865deae0dfa89cc7a068567f227cdc387f99d1cb SHA512 3d161ddfe0da5620312603d66acbc24244317da4dcb905558eddda9d54bf96024881ffbdcaa49f9daf73d779d5e7dbb47a523e05cc6c614756b468f14ef66ab9
diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
deleted file mode 100644
index 0b2b7c889c2a..000000000000
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="RAW Image format viewer and GIMP plugin"
-HOMEPAGE="http://ufraw.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="contrast fits gimp gnome gtk openmp timezone"
-
-REQUIRED_USE="gimp? ( gtk )"
-
-RDEPEND="
-	dev-libs/glib:2=
-	>=media-gfx/exiv2-0.11:0=
-	media-libs/lcms:2=
-	>=media-libs/lensfun-0.2.5:=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	virtual/jpeg:0=
-	fits? ( sci-libs/cfitsio:0= )
-	gimp? ( >=media-gfx/gimp-2 )
-	gnome? ( >=gnome-base/gconf-2 )
-	gtk? (
-		>=media-gfx/gtkimageview-1.5
-		>=x11-libs/gtk+-2.6:2
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
-	"${FILESDIR}"/${P}-jasper-automagic.patch
-	"${FILESDIR}"/${P}-crashfix.patch
-	"${FILESDIR}"/${P}-drop_superfluous_abs.patch
-	"${FILESDIR}"/${P}-fix-unsigned-char.patch
-	"${FILESDIR}"/${P}-jpeg9.patch
-	"${FILESDIR}"/${P}-exiv2-0.27.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable contrast) \
-		$(use_with fits cfitsio) \
-		$(use_with gimp) \
-		$(use_enable gnome mime) \
-		$(use_with gtk) \
-		--disable-jasper \
-		$(use_enable openmp) \
-		$(use_enable timezone dst-correction)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" schemasdir=/etc/gconf/schemas install
-	einstalldocs
-}
-
-pkg_preinst() {
-	if use gnome; then
-		gnome2_gconf_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gnome; then
-		xdg_mimeinfo_database_update
-		xdg_desktop_database_update
-		gnome2_gconf_install
-	fi
-}
-
-pkg_postrm() {
-	if use gnome; then
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/media-gfx/ufraw/ufraw-0.22-r3.ebuild b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
index 165cf72d2144..364bb452b7e3 100644
--- a/media-gfx/ufraw/ufraw-0.22-r3.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"