gentoo resync : 28.04.2019

4 files changed, 3 insertions, 194 deletions

diff --git a/app-antivirus/clamtk/Manifest b/app-antivirus/clamtk/Manifest
index e462ac5fe8f9..cae17b27485c 100644
--- a/app-antivirus/clamtk/Manifest
+++ b/app-antivirus/clamtk/Manifest
@@ -1,11 +1,8 @@
-AUX change_icon_path.patch 772 BLAKE2B f4773e967f7f87547509bdb34d9e8624453eacecebd37b9b8d4bf44c80698a79e76994bd3750eba189ccf8403958c4b93bdc9f02bba5c5101ac62158674f40f7 SHA512 79b0eb27f0abc972395634f9d40198fa70e49e05eec5c3c2c315e13d769e55f7f2ebb4d206eb7f1735654b1582b1fc8aef649acc68de1b76fba989cb7c2f89b9
 AUX clamtk-6.00-change_icon_path.patch 786 BLAKE2B 05a5e30bf33e4d13134d08277bac3011559c86d6a14d681dbf4217d62addb23345ded4e6e9c30bba1a5175a9a185150b1cf8d7d2773d49a33c6ef5117ab1647c SHA512 29871b25a948d182a613b5d12d60fc34e48ca473edae27763b51cc1403b7dbda56b4bfcf91bdfd04f0165f893010be8f0bf9975f74b8465239c7833cfd861932
-DIST clamtk-5.26.tar.xz 243748 BLAKE2B 42845cdd0f9e7387b2b69c5844ba26306ba1b0e64f70c16bcb7a830ba17c35dd681e48f9b386f6fbbc5c4a8da1ac9383cdddda7ef19376ac7955405fd9234b3e SHA512 791228a678a0b3bd57ef6effc959bec0c78151f56715d85ca8fafc139ab649d417762db1f567e9fc28d10475138ba90012a9fe9b49840a7658039f9d42e7bcf5
 DIST clamtk-6.00.tar.xz 227592 BLAKE2B b1fe3afc1fed5d96fea9fad4dfd065fc794cdcac3bbb49e04afa78548c37d6817c2c7638f46cd045bb1447d71ec619026e8d5226674951045914d5df28c3166a SHA512 5b8434532142f340caf5b16f95da0f5d0f3910c3c834ef963c1c8a9d7c1d032555c38fcb3f6195ad5f6cacde796824b68432bc1d16460a34976f0608eee47fdc
 DIST clamtk-gnome-0.02.tar.xz 14888 BLAKE2B 2137e7bc53f557cdb2f03afe3b6cb3b1185bb12c6b646f2bdb74c69bc3d6b59b23895d36583225f6a536d91237ffd84d307e7b52f16336a88311a60b84b2cbcd SHA512 f4a33d31ecf914f016fd029a7e9b9c903ba39bb139ed21f15786445d2394ace36ff08396baf68130d4bc3081847c34efda31ad3f727b9f5c479da4392750940f
 DIST clamtk-kde-0.18.tar.xz 17732 BLAKE2B ca82934417f2d869fd8c8e36a31ef4a52cf4ee73581c5d1d400c1b28908c5ea2524a8f5d1110b1e949038378613fb4d5607d5123eebe91df695a53d0dd489302 SHA512 145ddd349010e0bb6fe3295e50d6e15a2dd96e604babbd5de4cb49ba75169d2050777cac38e40ac6a64cb89ddf94025d610aca73136c75f81115d0a2d863d24e
 DIST nemo-sendto-clamtk-0.04.tar.xz 4228 BLAKE2B ce656d4f021bc30cd12fb2ee5f98a78c1f1fdb2460ed2cbba0b572408617f91b39b2ca2fe542b9cec7be79b4b9fdfd685f5553e1a671454ca1e6723241dcb805 SHA512 2b5d3abbc4ae5dbc71b1b7bc836df88ad51e6afa00d5e954b5c1355a70c0420b6fef895e1cb5cccb86a662aee2039cef6c01821c1347fa155b5da3529b25562c
 DIST thunar-sendto-clamtk-0.06.tar.xz 4416 BLAKE2B 6b9f8857fead9f175af0a5fd3585790c49865b07016ddbc0dfc21f761ecbac32d97a65731fdca0335fd4852af9efc93c06ecb994f769a5efeade35cb734e9924 SHA512 f3b6f296213ad5974f8134d682cce4e426d9730d1898e8f7ea474e27314ee47957b033bbd7f16196cabf054eccec844c05ff8c8f9a98ad013a7f89b899cee591
-EBUILD clamtk-5.26.ebuild 4426 BLAKE2B 04b372726a7b5a43807832d7164928d928c7f75cd3f10d1740de6d2960885a4119d6bb37360f389f475c564bbbcd05499d7e4b324df80c027772a1cd68c0ad55 SHA512 1aa30856d2c2a845113fb5e22fdcf470fb03a874aed6f22316844c88b300c54dec804dc364d632872a72a10a8f3461a78f0a675439748a97a6b54e3e6fed05d9
-EBUILD clamtk-6.00.ebuild 3932 BLAKE2B e742c5c7045faf112d3531bc77ce02ad128bd3d8fc8d0a1cac6294d151cf124be70deb57e546508427e6398e127c692832cfc2c86ab0c795a1ff35d022c986e1 SHA512 5c2843dcf9424458f32341ad707a6751618e8645f89c1747a997aba6ca92ece9db2832d3c91419a231b66559bd711937dc68a34244dddcd33e92d28db838214f
+EBUILD clamtk-6.00.ebuild 3928 BLAKE2B 43d8bedcb8cc98e74c3301c845135b914bc2d00f02773303e5834f0544e3d009941ce790bf9e425cdaf86d8da4eb917692580693c2c1a32c5b69b51e2ff658c9 SHA512 66dacda515137d8a371e1c9d1f0939be2cb7c70b37b756ac29ca3a400a78bfec5b1748f5a7caffac221f418991d1bc6d2de0cba9e57131ce995bed2a563f5f11
 MISC metadata.xml 942 BLAKE2B 537f7480903f2c4d4d315e0a7becf14be2f4f7cd2280f1918877f738cac8e71b58d65fa702f4a9979f44f2cb81e61dd44e7f9ba8197472095d6c7071a1bc0be6 SHA512 9bd9e7e9560a7358ed5935949a913628f50b885509f065419060d2cb6dbe605723d98930027908c1faf64f368289cac3c86e9d75a91838912036912ed60022a4
diff --git a/app-antivirus/clamtk/clamtk-5.26.ebuild b/app-antivirus/clamtk/clamtk-5.26.ebuild
deleted file mode 100644
index 2c7c172c0911..000000000000
--- a/app-antivirus/clamtk/clamtk-5.26.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="af ar ast az bg bs ca cs da de el_GR en_AU en_CA en_GB eo es eu fi fo fr ga gl he hr hu id it ja km ko lo lt lv mr ms nb nl nl_BE nn pa pl pt pt_BR ro ru si sk sl sr@latin sv ta te th tr ug uk uz zh_CN zh_TW"
-PLOCALE_BACKUP="en_GB"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop l10n perl-functions python-single-r1 xdg-utils
-
-MY_PV_KDE="0.18"
-MY_PV_NAUTILUS="0.02"
-MY_PV_NEMO="0.04"
-MY_PV_THUNAR="0.06"
-
-DESCRIPTION="A graphical front-end for ClamAV"
-HOMEPAGE="https://dave-theunsub.github.io/clamtk/"
-SRC_URI="https://bitbucket.org/davem_/clamtk/downloads/${P}.tar.xz
-	kde? ( https://bitbucket.org/davem_/${PN}-kde/downloads/${PN}-kde-${MY_PV_KDE}.tar.xz )
-	nautilus? ( https://bitbucket.org/davem_/${PN}-gnome/downloads/${PN}-gnome-${MY_PV_NAUTILUS}.tar.xz )
-	nemo? ( https://bitbucket.org/davem_/nemo-sendto-${PN}/downloads/nemo-sendto-${PN}-${MY_PV_NEMO}.tar.xz )
-	thunar? ( https://bitbucket.org/davem_/thunar-sendto-${PN}/downloads/thunar-sendto-${PN}-${MY_PV_THUNAR}.tar.xz )"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kde nautilus nemo +nls thunar"
-REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="app-antivirus/clamav
-	dev-perl/File-chdir
-	dev-perl/Gtk2
-	dev-perl/JSON
-	dev-perl/LWP-Protocol-https
-	dev-perl/LWP-UserAgent-Cached
-	dev-perl/Locale-gettext
-	dev-perl/Text-CSV
-	dev-perl/glib-perl
-	dev-perl/libwww-perl
-	virtual/perl-Digest-MD5
-	virtual/perl-Digest-SHA
-	virtual/perl-Encode
-	virtual/perl-MIME-Base64
-	virtual/perl-Time-Piece
-	x11-themes/faenza-icon-theme
-	nautilus? ( dev-python/nautilus-python[${PYTHON_USEDEP}] )"
-
-DEPEND="nls? ( sys-devel/gettext )"
-
-DOCS=( CHANGES credits.md DISCLAIMER README.md )
-
-PATCHES=( "$FILESDIR"/change_icon_path.patch )
-
-pkg_setup() {
-	if use nautilus; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	default
-
-	unpack "${S}"/clamtk.1.gz
-
-	if use kde; then
-		unpack "${S}"/../clamtk-kde-${MY_PV_KDE}/clamtk-kde.1.gz
-	fi
-
-	if use nautilus; then
-		unpack "${S}"/../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.1.gz
-	fi
-
-	if use nemo; then
-		unpack "${S}"/../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.1.gz
-	fi
-
-	if use thunar; then
-		unpack "${S}"/../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.1.gz
-	fi
-}
-
-src_prepare() {
-	remove_locales() {
-		rm "po/${1}.mo" || die
-	}
-
-	if use nls; then
-		l10n_find_plocales_changes 'po' '' '.mo'
-		l10n_for_each_disabled_locale_do remove_locales
-	fi
-
-	default
-}
-
-src_install() {
-	install_locales() {
-		domo "po/${1}.mo" || die
-	}
-
-	dobin clamtk
-
-	perl_set_version
-	insinto "${VENDOR_LIB}"/ClamTk
-	doins lib/*.pm
-
-	if use nls; then
-		l10n_for_each_locale_do install_locales
-	fi
-
-	doicon images/clamtk.png images/clamtk.xpm
-
-	domenu clamtk.desktop
-
-	doman ../clamtk.1
-
-	if use kde; then
-		insinto /usr/share/kservices5/ServiceMenus
-		doins ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.desktop
-
-		doicon ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.png ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.xpm
-
-		doman ../clamtk-kde.1
-
-		docinto dolphin
-		dodoc ../clamtk-kde-${MY_PV_KDE}/CHANGES ../clamtk-kde-${MY_PV_KDE}/README.md
-	fi
-
-	if use nautilus; then
-		insinto /usr/share/nautilus-python/extensions
-		doins ../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.py
-
-		doicon ../clamtk-gnome-${MY_PV_NAUTILUS}/images/clamtk-gnome.png
-
-		doman ../clamtk-gnome.1
-
-		docinto nautilus
-		dodoc ../clamtk-gnome-${MY_PV_NAUTILUS}/CHANGES ../clamtk-gnome-${MY_PV_NAUTILUS}/DISCLAIMER ../clamtk-gnome-${MY_PV_NAUTILUS}/README.md
-	fi
-
-	if use nemo; then
-		insinto /usr/share/nemo/actions/
-		doins ../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.nemo_action
-
-		doman ../nemo-sendto-clamtk.1
-
-		docinto nemo
-		dodoc ../nemo-sendto-clamtk-${MY_PV_NEMO}/CHANGES ../nemo-sendto-clamtk-${MY_PV_NEMO}/DISCLAIMER ../nemo-sendto-clamtk-${MY_PV_NEMO}/README.md
-	fi
-
-	if use thunar; then
-		insinto /usr/share/Thunar/sendto
-		doins ../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.desktop
-
-		doman ../thunar-sendto-clamtk.1
-
-		docinto thunar
-		dodoc ../thunar-sendto-clamtk-${MY_PV_THUNAR}/CHANGES ../thunar-sendto-clamtk-${MY_PV_THUNAR}/DISCLAIMER ../thunar-sendto-clamtk-${MY_PV_THUNAR}/README
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-antivirus/clamtk/clamtk-6.00.ebuild b/app-antivirus/clamtk/clamtk-6.00.ebuild
index e9a228575eb4..fc33abfff0aa 100644
--- a/app-antivirus/clamtk/clamtk-6.00.ebuild
+++ b/app-antivirus/clamtk/clamtk-6.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="kde nautilus nemo +nls thunar"
 REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-antivirus/clamtk/files/change_icon_path.patch b/app-antivirus/clamtk/files/change_icon_path.patch
deleted file mode 100644
index 18e88f1429c8..000000000000
--- a/app-antivirus/clamtk/files/change_icon_path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/lib/GUI.pm	2017-02-18 10:38:18.000000000 +0100
-+++ b/lib/GUI.pm	2018-07-12 01:54:13.199186406 +0200
-@@ -33,9 +33,9 @@
-     # because it's missing an icon :|
-     # https://aur.archlinux.org/packages/clamtk/
-     my $theme = Gtk2::IconTheme->get_default;
--    $theme->append_search_path( '/usr/share/icons/gnome/24x24/actions' );
--    $theme->append_search_path( '/usr/share/icons/gnome/24x24/places' );
--    $theme->append_search_path( '/usr/share/icons/gnome/24x24/mimetypes' );
-+    $theme->append_search_path( '/usr/share/icons/Faenza/actions/24' );
-+    $theme->append_search_path( '/usr/share/icons/Faenza/places/24' );
-+    $theme->append_search_path( '/usr/share/icons/Faenza/mimetypes/24' );
- 
-     $window = Gtk2::Window->new;
-     $window->signal_connect(