gentoo resync : 02.08.2019

4 files changed, 47 insertions, 7 deletions

diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index 5c6346c56f47..cc90e421b342 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -1,4 +1,6 @@
 AUX wsjtx-2.0.1-hamlib.patch 479 BLAKE2B 6c77f178ab0aab9519c8e356d14f1d6050545e10d2bb2c25686afa1844107c5ddd86c9696ca1a9d8812e0c8a2194e23649ae02322555b7b9fc67f7e12a9fd623 SHA512 753b4c832f0cb442cbde73597ed5b9305e68328cb0fa69972d43be3bca480de6dab9e04906fad07abc431292bca4b0081ab65406e27e5bb688418a147e27afee
+AUX wsjtx-drop-docs.patch 425 BLAKE2B facdb48f573ef35d74b27b03abd9983a8df162d8843ca846285e2525fe86e4eef2892f0203c64939a9ca5478e27795415487d14eee8ca6cb0a79d0c15f9c0d6a SHA512 2c5000551313b6ee81e50841d286478bb0dba8b8df31e97cbd09ee84ae479ada8ee7fb84fb464c1524245d7b8a24a00f70fb8429a2c67e41842410d939e1800a
+AUX wsjtx-fix-unicode.patch 565 BLAKE2B 02d26dc1b1b51e9ac38feb866ecbf38e58b861c74b3a7dfb1f210d41945a8fa11ee62844416f3a6b0cccb847d393986ccd74a7db2d920382ce7c53e997d3a612 SHA512 ed3cf5972325aaccdffea7d99bd9ae4f32ecf80cf2ded57a738c491bbe0e75e538663342d3efbe7a35811d206652ae5939e2c7b2a65a4a22451b593ffa504dbf
 DIST wsjtx-1.8.0.tgz 29041865 BLAKE2B 3eb3d4e2711443a9e895c1b5771ae6378b13cccbe9b50dce97e9551218700a4e22ae10b618e346b52d2037ee26c5d41f1cf2376d8cc19d143d263db5c683a482 SHA512 793e88604661b03e2e6d5a910ea4045f800b9c59174af3286fd8afdaf65d8a3ca7d1aeae557c6afc66d9bbe398be8c7030950dda03d6bc6279061c3a3107beaa
 DIST wsjtx-1.9.1.tgz 29264406 BLAKE2B 0eb00737851a7877d894a21218c6a408eac30caa4114a0edd69400701f0c8c702d4c373adc5c9f7896a4d8f96c338a92e0a997e0270240917b5e236db36c9aa0 SHA512 16c84e7bb8cf9e6eff288b74ee1f9083e0133ff69fdefca7fbc986c912663f744a75db353242024fe8c64ff9e6e8558fd825b9b106abf02cdd4b43be91680557
 DIST wsjtx-2.0.0.tgz 42090145 BLAKE2B 8a439dc37daaa7e989dc1cbe007a9493268e2590282f1d88781f8f8bc40690511533a0c668654ada81a0504af880eb7d361b305ca523fc432603eafdcccc88eb SHA512 9cbda699345c4e18ae450415701700f19219f81b75080abf04a9136e40017d7113dd099bdff44414a1f0060c8687e46d6df2dd5cd15730c98eed36f9765ef82d
@@ -8,5 +10,5 @@ EBUILD wsjtx-1.8.0.ebuild 1108 BLAKE2B 2fd3b590d9c0aa4591d0387d504f74b8aeb772405
 EBUILD wsjtx-1.9.1.ebuild 1109 BLAKE2B b535dab45720a8e8fbded73f9a3588c646cb97dc85a0fb9cc3a60915b0e6cfebed69a6175fde38c6f9cdf51ced49955b5583fdc1c387930ff215d6f7e4c1647d SHA512 10b4488f2ca1ea778b03f212bfa5cc133da1168a22b8bba63160492f6ec09c3bf971baad310d053ba803afd6441cbb9cda985aa1c00d50c032a7cffc7241f80e
 EBUILD wsjtx-2.0.0-r1.ebuild 1218 BLAKE2B d7fc133d80b9f6643f8fbe5b07a9c95d8bbd614766afcbdeb1959e6f641e1239c7b50ca662d32ed13bff6c0d2e5d630807ea1a65ba0ea1332114844afacc2f3c SHA512 9fb29b0d3d446a780a8c6ee7adf6c5224e3f082adfe66d01e77d95c8884ebfead5d0319f469fd8dcfea2ba811f620d2d5293f25aa78afd9df22032097f8cf56a
 EBUILD wsjtx-2.0.1.ebuild 1263 BLAKE2B 14282820ed4dc26bcd98fdefc49416831775fff8c26d1a52268f600d72e7c51077a0b630257d9e5b8c3920cd612616f33aa0bdadd290959e612c6001ec55de5d SHA512 9a4c107ec4f6e43f07343565e239a41cbd04a6fd9e44f40bbd8aa4087b32f0944f1ac75aaa33a55fbb29e158fa6a44dbb5f154fd2648a535d934a02a2ecc4327
-EBUILD wsjtx-2.1.0.ebuild 1270 BLAKE2B b1fa2fc3e666b87f919a20acdf4d9ef75615a1e8aaa5b6d6b93c1d8841077f6f1c4541240cde03389897a3f00b931525b4dbabd7c90d8c6c618e6e1421d410a1 SHA512 032369232c691d6dd33bb01406ba7eee064fc997cb0ca9a0f97d367dc75e6ff49a94fa6764d6b6e19dd8a7cd7b6d0ae6cbbdb27fa1302e774f457f2b8cd59daa
+EBUILD wsjtx-2.1.0.ebuild 1425 BLAKE2B b4b56b261ec2e82b4e2d062bddb8a09a18b5b8da409ab11d45ec9043524243c1561ab65f1374e82c1979f136ba46c5be73cbdc50e67bbe92ddcc61bcf27c3002 SHA512 8532b20f97fb1cd293a4d6532c573cf716245cf373f7857e52a68379ededcb8651c3b901a00952aac82dc8709150e9c13cf230e9bc07af23d79e58cfb4b43947
 MISC metadata.xml 411 BLAKE2B b18268ad951aaeb11cb490e4b02fa063915d2862f81e1a9f4ef69bf391c0628e75258d4bc66ce942a51d88369033b4e9dc8f5b8fff1c26bd33a4560ca493d70e SHA512 1b11819a29e25cf3ce3932bfb200ce65fd69c0872149acb54d3c67fb35d9977feee5d87e7412d75751cbc6a9b76010a2bcbc8b3a47a50d11a0c011abc5a83efc
diff --git a/media-radio/wsjtx/files/wsjtx-drop-docs.patch b/media-radio/wsjtx/files/wsjtx-drop-docs.patch
new file mode 100644
index 000000000000..50bd9cc095b8
--- /dev/null
+++ b/media-radio/wsjtx/files/wsjtx-drop-docs.patch
@@ -0,0 +1,21 @@
+--- a/CMakeLists.txt	2019-07-24 16:42:07.128890166 +0200
++++ b/CMakeLists.txt	2019-07-24 16:42:40.001023963 +0200
+@@ -1493,18 +1493,6 @@
+   )
+ 
+ install (FILES
+-  README
+-  COPYING
+-  AUTHORS
+-  THANKS
+-  NEWS
+-  INSTALL
+-  BUGS
+-  DESTINATION ${CMAKE_INSTALL_DOCDIR}
+-  #COMPONENT runtime
+-  )
+-
+-install (FILES
+   contrib/Ephemeris/JPLEPH
+   DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}
+   #COMPONENT runtime
diff --git a/media-radio/wsjtx/files/wsjtx-fix-unicode.patch b/media-radio/wsjtx/files/wsjtx-fix-unicode.patch
new file mode 100644
index 000000000000..925199863a11
--- /dev/null
+++ b/media-radio/wsjtx/files/wsjtx-fix-unicode.patch
@@ -0,0 +1,11 @@
+--- a/manpages/man1/jt65code.1.txt	2019-07-23 19:27:07.690602674 +0200
++++ b/manpages/man1/jt65code.1.txt	2019-07-23 19:27:22.098060819 +0200
+@@ -31,7 +31,7 @@
+ 
+ *jt65code*, *jt9code* and *jt4code* are utility programs that let you
+ explore the conversion of user-level messages into channel symbols or
+-“tone numbers.”  These programs can be useful to someone designing a
++"tone numbers."  These programs can be useful to someone designing a
+ beacon generator for JT9 or JT65, or for studying behavior of the
+ error-control codes for each of the protocols.
+ 
diff --git a/media-radio/wsjtx/wsjtx-2.1.0.ebuild b/media-radio/wsjtx/wsjtx-2.1.0.ebuild
index 4cba731ef520..15c7d5cf22d8 100644
--- a/media-radio/wsjtx/wsjtx-2.1.0.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.1.0.ebuild
@@ -31,11 +31,17 @@ RDEPEND="dev-qt/qtcore:5
 	virtual/fortran
 	app-text/asciidoc
 	doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools
+	"
 
 S=${WORKDIR}/wsjtx
 
-PATCHES=( "${FILESDIR}/${PN}-2.0.1-hamlib.patch" )
+PATCHES=( "${FILESDIR}/${PN}-2.0.1-hamlib.patch"
+		  "${FILESDIR}/${PN}-fix-unicode.patch"
+		  "${FILESDIR}/${PN}-drop-docs.patch" )
+
+DOCS=( AUTHORS BUGS NEWS README THANKS )
 
 src_unpack() {
 	unpack ${A}
@@ -43,9 +49,11 @@ src_unpack() {
 }
 
 src_configure() {
+	cmake_comment_add_subdirectory debian
+
 	local mycmakeargs=(
 		-DWSJT_GENERATE_DOCS="$(usex doc)"
-		-DWSJT_DOC_DESTINATION="/doc/${PF}"
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 	)
 	cmake-utils_src_configure
 }
@@ -57,7 +65,5 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 	rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
-	rm "${D}"/usr/share/man/man1/rigctl{,d}-wsjtx.1.gz || die
-	rm "${D}"/usr/share/doc/WSJT-X -R || die
-
+	rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1.gz || die
 }