gentoo resync : 03.03.2021

3 files changed, 53 insertions, 13 deletions

diff --git a/net-misc/qtm/Manifest b/net-misc/qtm/Manifest
index 249024a94783..9ba61446145f 100644
--- a/net-misc/qtm/Manifest
+++ b/net-misc/qtm/Manifest
@@ -1,4 +1,5 @@
+AUX qtm-1.3.19-nomancompress.patch 1286 BLAKE2B 5503035fc1bda4a2043a1152925a3926d542aa94b4ca97d537adc5a0e83e75c904b61ed057c07140b3d2027bd5f5e07f34ae9992846cd910920c45bfd59dd639 SHA512 4f8677c4ba1f22c10aca4c139ec3ca2ead956ab0f880eae7dc3153e90f5fad61035e51987343a91f487bf209ae289c7d9b1896ed9ec52ba91b90910b51bbdea9
 AUX qtm-1.3.19-qt-5.11.patch 757 BLAKE2B f0bc6f3858e7864efa343193d8519a1e83444e69e4532219077f5d3e852bbd4d0bf979023fadbb53d817d41e1632244baf9232434f8b274dcb6d0eec06070ec3 SHA512 c4e886726686ea2fbf785aaaafd1238affbe778f20a0b11cea98360570f52c421a6942b03f27fe57bc08894a93c92427920509a1efac8b23d502464b353e6df0
 DIST qtm-1.3.19.tar.bz2 191559 BLAKE2B e193e75771f04b7ecf772a55305c5a0b923449570933c76716235912223417e1340462893b5c566a22c3d6689eb2fc66b7b41aa3148afcbbc4db65abfcc06545 SHA512 a56a5c1d6098213637806a8a8c3889bbfbd11cb5b1d568520197c6c21e51d99f95975359c18f63961aba945b58a5ce3abf3ff85f552a555b91965414934f9565
-EBUILD qtm-1.3.19.ebuild 1171 BLAKE2B 48d68f1e6fda9825833f4bf7b796ad12a26b64c063a8bcea4edb6fd4ed39ac8d9ec1d745e8364ee10ee0b465e97708bfd39988d65b68f02e08cf2d478380c4d4 SHA512 c011832aac96c820445ffa24149e26641b8f61bb48e583427ac7ca1d26a97c1c28d4ec56146d7195962a8abbc29a606832a040b7661cbc87fd0b0824b8c2315a
+EBUILD qtm-1.3.19-r1.ebuild 1162 BLAKE2B 89f64148dca8604caaaade233aaf226d06cd37c4b22c00f6a34d2c6d590ddbe5aac5ed3a93e4ca325363eb5ea6d4c0488e4b7b520568e5e6278dfd1b60f85beb SHA512 b0ceb5c708479ebee99e4055179888708adb28319dcbb9f9de7fbf0427823f5ca86967a3f9dc492f29c8a3669b6d85d0b001297ab8efc309ff113e7d40f21072
 MISC metadata.xml 323 BLAKE2B 9a2acba00a78ae523e8e0911a81237371b07ad64a6c9c508cb3bf8a7e092143cd512ea33a5ca5825edc81ee7d312a47385bb566bbbb876f8ca3c54592ee392a0 SHA512 f84bcb5a622eaf479bae92f367748cfb749b633fe3c5089db7a2dc6193a5ca103195ad12bc894fe2b05c5bb1de4eb3baee5bbcda8c018ca6968add97719748e2
diff --git a/net-misc/qtm/files/qtm-1.3.19-nomancompress.patch b/net-misc/qtm/files/qtm-1.3.19-nomancompress.patch
new file mode 100644
index 000000000000..a98ef2446003
--- /dev/null
+++ b/net-misc/qtm/files/qtm-1.3.19-nomancompress.patch
@@ -0,0 +1,34 @@
+--- a/CMakeLists.txt	2017-06-12 12:28:32.739628202 +0200
++++ b/CMakeLists.txt	2021-02-28 12:43:44.143779118 +0100
+@@ -123,20 +123,17 @@
+     set( MANPAGE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/man/man1 )
+   endif( NOT MANPAGE_DIRECTORY)
+ 
+-  add_custom_command( OUTPUT qtm.1.gz
++  add_custom_command( OUTPUT qtm.1
+     COMMAND touch qtm.1
+     COMMAND sh ${QTM_SOURCE_DIR}/qtm-manpage.sh ${QTM_VERSION} >${QTM_BINARY_DIR}/qtm.1
+-    COMMAND gzip -9 ${QTM_BINARY_DIR}/qtm.1
+     DEPENDS qtm-manpage.sh
+     COMMENT "Generating manpage"
+     )
+   add_custom_target( MANPAGE_FILE ALL
+-    DEPENDS qtm.1.gz
++    DEPENDS qtm.1
+     )
+ 
+   set_directory_properties( ADDITIONAL_MAKE_CLEAN_FILES 
+-		qtm.1
+-		qtm.1.gz
+ 	  qtm_version.h
+ 	  qtmico.o )
+   
+@@ -367,7 +364,7 @@
+ if(UNIX AND NOT APPLE)
+   install(FILES ${QTM_BINARY_DIR}/${DESKTOP_ENTRY} DESTINATION ${DESKTOP_ENTRY_PATH})
+   install( FILES ${APP_ICON} DESTINATION share/icons )
+-  install( FILES ${QTM_BINARY_DIR}/qtm.1.gz DESTINATION ${MANPAGE_DIRECTORY} )
++  install( FILES ${QTM_BINARY_DIR}/qtm.1 DESTINATION ${MANPAGE_DIRECTORY} )
+   if( UNITY_LAUNCHER )
+     install( FILES ${QTM_SOURCE_DIR}/qtm-new.py DESTINATION bin RENAME qtm-new )
+     install( FILES ${QTM_SOURCE_DIR}/qtm-choose.py DESTINATION bin RENAME qtm-choose )
diff --git a/net-misc/qtm/qtm-1.3.19.ebuild b/net-misc/qtm/qtm-1.3.19-r1.ebuild
index 24f10c68555e..27e97c211aa7 100644
--- a/net-misc/qtm/qtm-1.3.19.ebuild
+++ b/net-misc/qtm/qtm-1.3.19-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# CMAKE_IN_SOURCE_BUILD="1"
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Qt blogging client"
 HOMEPAGE="http://qtm.blogistan.co.uk"
@@ -17,7 +16,8 @@ KEYWORDS="amd64 x86"
 IUSE="dbus debug"
 RESTRICT="strip"
 
-RDEPEND="dev-lang/perl
+RDEPEND="
+	dev-lang/perl
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
@@ -27,17 +27,23 @@ RDEPEND="dev-lang/perl
 	dbus? ( dev-qt/qtdbus:5 )"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto
-	virtual/pkgconfig"
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 DOCS=( Changelog README )
 
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) # TODO: upstream
+PATCHES=(
+	"${FILESDIR}/${P}-qt-5.11.patch" # TODO: upstream
+	"${FILESDIR}/${P}-nomancompress.patch" # bug 740784
+)
 
 src_prepare() {
-	# bug 463810
-	sed -i -e '/Categories/s/Application;//' qtm-desktop.sh || die 'sed on qtm-desktop.sh failed'
+	cmake_src_prepare
 
-	cmake-utils_src_prepare
+	# bug 463810
+	sed -i -e '/Categories/s/Application;//' qtm-desktop.sh || die
 }
 
 src_configure() {
@@ -50,6 +56,5 @@ src_configure() {
 		-DDONT_USE_DBUS=$(usex !dbus)
 		-DQDEBUG=$(usex debug)
 	)
-
-	cmake-utils_src_configure
+	cmake_src_configure
 }