gentoo resync : 03.03.2021

5 files changed, 63 insertions, 15 deletions

diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index 9b47235980b8..30b21cd42267 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -1,4 +1,6 @@
-AUX converseen-0.9.6.2-gnuinstalldirs.patch 4784 BLAKE2B 245c5ddeff91bf4e1c74471cd8a9f3c93bf786e5c44c48b62560cdc34913aeb97b5392355421ba19e42074547a81f0a471899e19dab7294434b37b9f6ab8e0df SHA512 9e5abc254e1a1d1b2a92d5ba04f24640b90ea49f79222ed81c83fedb0f007adcffb371952db6074c18b3d1d853f81de21f45a3803df2b7fc4b18dc93ee7ab5e8
-DIST converseen-0.9.6.2.tar.gz 276879 BLAKE2B 3f41c8a85d275b2a2fb1c2c8971f92e447b0c7b236d5b90a07629400925b8627e1e9e837239e2114cd2e6f755941b4ef28adfbecf9813963d01b925af4e348e0 SHA512 897bcb4554ca05d92dc939837f74022fcc21e05273cb40445c0d02ce3e10e87f9e74eeccee69e4ed1bdf63ca3bd759d4d51769daee5ea34df7997114c7937f7c
-EBUILD converseen-0.9.6.2.ebuild 839 BLAKE2B f04a7d944709ae6bfc9ae32db9ac80ea94fbc84502f97d385ea10280ddb6c272c750b0b466425c25d65f3404b3485b6184181b214027daddd029e86f9ac0cb6b SHA512 761bf3c502adda2c29f4164da59fd95066be9c4cc1a8ce531bf403ff6dc8b8625fb5cb31ad0d9c55c54e637fa89f8ecb3c2ceb081e189546440e6631b0509101
+AUX converseen-0.9.9.0-appdata-path.patch 604 BLAKE2B ca524ae4a52f74b687e0e0246d758178d4287b3e866651293233c7055a38cdf6330fd2c2dfb0728c0b07f37b631dbd1c59159039b56be35fbc349d183dfd0dbd SHA512 411696d39dcca09a33119537600efd80bcf675714ea72548500f9c2a1112e61d53edc6d891cef770aac3cdd2cb881e169b4ab833521ae152859609871807066e
+AUX converseen-0.9.9.0-gnuinstalldirs.patch 5272 BLAKE2B b2f0faa57923c5d452e3a2ef2b397a743cc84c65d8ebee4ac415301669045190b1b3fb075ed51726e63bc016da7b32432f4b887b50dab823bab3a10bdc96fcc3 SHA512 97109e00cfdb9d1288bd04466e455a514cc7f8e3f5f40caaa819d0f886df71c259e18f66ef921ef60f7301c2ac745fb33869b1af486fd1acc2e2e7b034a2afa7
+AUX converseen-0.9.9.0-no-update.patch 540 BLAKE2B b8a7bcf561a4be48fdf9137a40c1f5b1451915a6cf4b2043f9adaf8dd1aa853b331ee1499bb34d05ae9e7da2d9f3f0515c62dca8146d4957126054557ebfcceb SHA512 b5ed008bd7a01cb99ec97faa6c9bd412009f1d438c420e201d2605c713ff57c346391d5389ed019c0538a263154d1ed36c4a581d0582d2c2eadf8dc77a67b97b
+DIST converseen-0.9.9.0.tar.gz 280547 BLAKE2B 978df93748cd5585b99f371f9538f9ae0a6fa683c9a452a8fb3eceb0c6a7b972423dbd396f8702a4db839852d39bb7c3b654603a08a5dc61481ed74c6aa3aa0b SHA512 8ec01de40fc32bc83c97b3e1d1d0400b9ae5c8c5f374dfae452a75f1bec648d6db26ea036103e15c84e4360ed83f27ce5d35a64592289de083e9701e6153ca63
+EBUILD converseen-0.9.9.0.ebuild 920 BLAKE2B 7073b3949153d19105683f128d80b5436e60ca1bf6fd1feeda01139c90393edfb5bb9fb5d619418b5150a9cc475e3e6e9fc87292ca5ae812b2a7f95e063c840e SHA512 f3653c59362910ede54693e14ca1d6d3ecbc0cca687e2dead3872bd30e25fe7196b277df2bed2998ad2aa1fe6dcd20c922bd854b0161d25e6cd4f46a57c75c7a
 MISC metadata.xml 252 BLAKE2B 85d312e9856476325a3b52f7e18559dc488db547c2a07da42e5e35921c22d893dd5b665fe34d18a391fc74ace49af2be8b60f59df208b83ae25a8ee1b36647dc SHA512 155ed9dbb0dd8e884779b634a9661de44f25cca743fd1b4e81164a1fa7bccf95b122f7492475a6648ac34230e1a4933d9d873204440f9d9ebce162aa0a707caa
diff --git a/media-gfx/converseen/converseen-0.9.6.2.ebuild b/media-gfx/converseen/converseen-0.9.9.0.ebuild
index 4432577b94d1..06de610772d2 100644
--- a/media-gfx/converseen/converseen-0.9.6.2.ebuild
+++ b/media-gfx/converseen/converseen-0.9.9.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Batch image converter and resizer based on ImageMagick"
 HOMEPAGE="https://converseen.fasterland.net/
@@ -24,10 +24,15 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	media-gfx/imagemagick:=[cxx]
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-qt/linguist-tools:5
 "
 
 S="${WORKDIR}/${P^}"
 
-PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-gnuinstalldirs.patch"
+	"${FILESDIR}/${P}-appdata-path.patch"
+	"${FILESDIR}/${P}-no-update.patch"
+)
diff --git a/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch b/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch
new file mode 100644
index 000000000000..127fc7ad926c
--- /dev/null
+++ b/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch
@@ -0,0 +1,17 @@
+Description: install appdata to package directory
+ The CMAKE_INSTALL_PREFIX was not set to install path and set its correct
+ location.
+Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Last-Update: 2018-08-21
+
+--- a/converseen.pro
++++ b/converseen.pro
+@@ -122,7 +122,7 @@ loc/converseen_uk_UA.qm
+  desktopFile.files = res/converseen.desktop
+  kdeservicemenu.path = $${SHARE_DIR}/kservices5/ServiceMenus
+  kdeservicemenu.files = res/converseen_import.desktop
+- appdata.path = /usr/share/appdata/
++ appdata.path = /usr/share/metainfo/
+  appdata.files = converseen.appdata.xml
+ 
+  isEmpty(QMAKE_LRELEASE) {
diff --git a/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch b/media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch
index 3b53d056948c..50ad7a01e8db 100644
--- a/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch
+++ b/media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch
@@ -1,15 +1,15 @@
-From ba62e29b7739c96ad073a7c14d4fdb5883dbe94c Mon Sep 17 00:00:00 2001
+From 6dbded67fdbe977719ded2a6ffdcdc87165dd541 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
 Date: Tue, 9 Jan 2018 02:06:09 +0100
 Subject: [PATCH] Use GNUInstalldirs
 
 No need to reinvent the wheel, make use of standards provided by cmake.
 ---
- CMakeLists.txt | 36 +++++++++++++++++++-----------------
- 1 file changed, 19 insertions(+), 17 deletions(-)
+ CMakeLists.txt | 40 +++++++++++++++++++++-------------------
+ 1 file changed, 21 insertions(+), 19 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a944102..de5e556 100755
+index f135b66..4bd8764 100755
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 2.6)
@@ -21,7 +21,7 @@ index a944102..de5e556 100755
  ADD_DEFINITIONS( ${OPTIMIZATION_FLAGS} )

    

  SET(converseen_UIS  

-@@ -129,20 +131,20 @@ ADD_EXECUTABLE(${GUI}
+@@ -131,22 +133,22 @@ ADD_EXECUTABLE(${GUI}
    

  TARGET_LINK_LIBRARIES(${GUI} ${Qt5Network_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${ImageMagick_LIBRARY} ${ImageMagick_Magick++_LIBRARY} ${ImageMagick_MagickCore_LIBRARY})

  

@@ -29,7 +29,7 @@ index a944102..de5e556 100755
 -install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)

 -install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)

 -install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kservices5/ServiceMenus)

--install(FILES converseen.appdata.xml DESTINATION /usr/share/appdata/)

+-install(FILES converseen.appdata.xml DESTINATION /usr/share/metainfo/)

 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

@@ -42,11 +42,13 @@ index a944102..de5e556 100755
 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_uk_UA.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_sv_SE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

 +install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_BINDIR})

 +install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)

 +install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps)

 +install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/kservices5/ServiceMenus)

-+install(FILES converseen.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata/)

++install(FILES converseen.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo/)

 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

@@ -59,6 +61,8 @@ index a944102..de5e556 100755
 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_uk_UA.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_sv_SE.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

 -- 
-2.15.1
+2.30.1
 
diff --git a/media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch b/media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch
new file mode 100644
index 000000000000..f4dad00586ab
--- /dev/null
+++ b/media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch
@@ -0,0 +1,20 @@
+Description: Don't check upstream versions
+ Don't check new versions page due to privacy concerns.
+Forwarded: no
+Last-Update: 2018-08-21
+Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Bug-Debian: https://bugs.debian.org/761944
+
+---
+
+--- a/src/mainwindowimpl.cpp
++++ b/src/mainwindowimpl.cpp
+@@ -1012,7 +1012,7 @@ void MainWindowImpl::openFlattrLink()
+ void MainWindowImpl::checkForUpdates()
+ {
+     UpdateChecker *up = new UpdateChecker();
+-    up->checkForUpdates();
++//    up->checkForUpdates();
+ }
+ 
+ void MainWindowImpl::bugReport()