gentoo resync : 15.11.2017

4 files changed, 71 insertions, 1 deletions

diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index 2d2572595c58..51131ad5ebff 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -2,6 +2,6 @@ DIST wsjtx-1.7.0.tgz 21293155 SHA256 e7b3f31dad87b2b9cfb0a39bbba466f7039200541d3
 DIST wsjtx-1.8.0-rc3.tgz 29051408 SHA256 916ede38c5056671fd00355c1a6d36d3098948f264ff59ac86ef08463e42261a SHA512 55d51d0dfd085ece8f856497e677fc31d2a6412a2b8f3e0f4acd22f51cee24cd7717c9836033c0db74d8b850e91aee2f204a9a2961b93424e47f51f8bcf1bf21 WHIRLPOOL bfa3df37d9f762245e63d9a8cb5ae607e9bcb4d87adc2305f757194746534acb9042f5e4886aa09e3b346da21041d31d8f6de3be23e558a70090429575de7ff1
 DIST wsjtx-1.8.0.tgz 29041865 SHA256 21603ad4d5f43cd9c79a6e8cf468bde88c554654012b2c6c1ef9144cfbf668ce SHA512 793e88604661b03e2e6d5a910ea4045f800b9c59174af3286fd8afdaf65d8a3ca7d1aeae557c6afc66d9bbe398be8c7030950dda03d6bc6279061c3a3107beaa WHIRLPOOL f9b6f048bd7596511c0b3339d32c1a45ce74a279e84d94badd2efca65f72bbe54001ab7cae9f861e93a98e339edf82b6cbed08a9212afc9581222cc8cfd9404b
 EBUILD wsjtx-1.7.0.ebuild 1080 SHA256 426230d329aba1c6787170d8a0f136dd7f37dfdcd4658dcded3e43cb36f93c8d SHA512 acc54abf722329a1abe498fbf7f97f29e22aaca72555afaf0a054db396a4e91f0d5f971df23ae64cfc3d5782e5217ec90050f78cdeccda2b6a7f2f4fbbc5723e WHIRLPOOL cd1325928ea748aabe50c469f546f3ed44d16aa38e5fba702e2f976f32d3994624338f652ad01b9ec219b13d089303debedddaece00fd0457af8c1f8cb7c68ee
-EBUILD wsjtx-1.8.0.ebuild 1068 SHA256 9034bb9cccfd8a4b26fddf23f7d9a835fbfef438f8661f596c5894384180f094 SHA512 c347dde6e0e80afb0168dfc90bbd1d3eeb0126d97b1cdb54acf62868870f6dd9726c4678879fc91438d5c28dc1d143b8d4b2ea23cc6787c12cc7beab1bda68b1 WHIRLPOOL 2931cc230db64bc7bedf0b8eaeaec01f9b7473deba82c55f8360010eb1e76e4fe35550ce9b6f818f125dadd163a9d56db2c98f5e1a0514aa4bf6e47b612dedd9
+EBUILD wsjtx-1.8.0.ebuild 1091 SHA256 6c64813e87e55811233bbc7f60cb628c621b85beee0a75f9c30ae7ad0947ce65 SHA512 449e3f4d6791758197d9bd4273fff10c76ec9e72807b43268956f77c5c6c8c5a82ee8002273b58239be681c2474ef77056b6af474a18bac8cec12aeaacc96cc6 WHIRLPOOL 3032f65da3d878872d3aaf960fd6113b5b9a51fbafeb4c98448e312407ef97549a78fb61636bb6b613b6369eaf3cd91e984e130c125b6c59f4fb55078f2ff334
 EBUILD wsjtx-1.8.0_rc3.ebuild 1068 SHA256 9034bb9cccfd8a4b26fddf23f7d9a835fbfef438f8661f596c5894384180f094 SHA512 c347dde6e0e80afb0168dfc90bbd1d3eeb0126d97b1cdb54acf62868870f6dd9726c4678879fc91438d5c28dc1d143b8d4b2ea23cc6787c12cc7beab1bda68b1 WHIRLPOOL 2931cc230db64bc7bedf0b8eaeaec01f9b7473deba82c55f8360010eb1e76e4fe35550ce9b6f818f125dadd163a9d56db2c98f5e1a0514aa4bf6e47b612dedd9
 MISC metadata.xml 316 SHA256 8d0dc88af8d06e797e14c9d66c32f6a094c5d6b5620cd13068ed73da7508b454 SHA512 9f17e47522a5e8191e5bed9228ada4db283684042593f0bc423bb6f5d2645d17875927081db81ff52b922c38dded9b584bbb1493f75a0f536295fe77e4af9b41 WHIRLPOOL 14678501065262f3d313486293b417096d379cfa49ecb826902a6415332bad89af3df40f33d397b65aec6034f3611d6d68425a0069eb04c1c1d32c710e8b7235
diff --git a/media-radio/wsjtx/wsjtx-1.8.0.ebuild b/media-radio/wsjtx/wsjtx-1.8.0.ebuild
index 3c7dc85c3039..b42afd5cd5fc 100644
--- a/media-radio/wsjtx/wsjtx-1.8.0.ebuild
+++ b/media-radio/wsjtx/wsjtx-1.8.0.ebuild
@@ -22,6 +22,7 @@ RDEPEND="dev-qt/qtcore:5
 	dev-qt/qtwidgets
 	dev-qt/qtconcurrent
 	dev-qt/qtserialport
+	dev-qt/qtprintsupport
 	virtual/libusb:1
 	media-libs/portaudio
 	sci-libs/fftw:3.0[threads]
diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index 5bec5afee8ef..2b89d852a346 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -1,8 +1,10 @@
 AUX xlog-2.0.13-desktop-update.patch 1393 SHA256 2d6ab82a00e4ec5adb55fecc0d8fefeb2309bcab5bfb4471d1929c4f5eb466dd SHA512 7e4f9f83eabf9a598e2e1382c6934240991f3743da50eb0da6b7532435d2dce3264e30aded7b6ca32a685b9b7c203f694268c500c89be76175194c0900296865 WHIRLPOOL 0ba5bbddb4253dfbc3fe82c62401d6d6ecba3a7881a7fd2aadcda477273ef8196f498221590684d93a190e15c5b2276259a93cd8d311aa7cfb59739f46f6ea4c
 AUX xlog-2.0.7-desktop.patch 435 SHA256 ad26e07d5d254a185d13b4484fb69341aa904fe1e2528bed1710e52e582bd5b0 SHA512 5119356e9635ca7b6d028d4bb3be12542636ce5d2967540b20ad9c22d62792b81a1a06fcd8722c7cbe8df706d8113e60b308d1db7c6fa8f3238bea039eb4b4f6 WHIRLPOOL 49cf7184131956a77664012853622b6cdf77ba047ccb25a9b09b78c793b719b37604a8a92b7202d81a98ed13c170f70d76d6e15bf3bc1b0279e2e53d35ceae60
 DIST xlog-2.0.14.tar.gz 11452537 SHA256 16407e016f9991cfe02d85e9841ced6112416e43800898be888a2cc44c368d58 SHA512 1f63e841191b81c477273777923bb4e537bac70b02cb5deca18b30adc44158369794435a0c1c22915bf42fc3fe2e46891cd531ad6ce2563d0f543a1012074660 WHIRLPOOL adacd6a75ca9db8cfa2069e72b7a6cb05fd93166ba67a4b4ce0689c2af4a4a022016037c5eac64256b3200c0e33e096c276c1c16d6ee3e62f6740461830568df
+DIST xlog-2.0.15.tar.gz 11461174 SHA256 52f0866530b7902128990318b713efe2c213164bd5466c11bffc0f8ef940c82a SHA512 58403d6cd05a222900236a9b165d1b51951f2efa668aba5989970036135a91955af64a4662a5cd6f6e7c4629e3353b3c93c79c3e14d81c7ae65a82cf9ade6397 WHIRLPOOL dd453d112a21ea2daf4123a00a5e9582b34b59038997f2a009fd491152ab0babf5b970803a867d364aaefd065e72cfb892ea0f48c5c0b42660d2aeb4b81bbc68
 EBUILD xlog-2.0.14-r1.ebuild 1734 SHA256 23d79fb9ad9d63d0aa96acd357ef984d26cfe1453b7154ad6fbc7eb1dba7ac98 SHA512 338f8e115061113a1c725000dfdf6c3acd2be504f041a981cffd27a8aa5fc7f4565986727c707fe07f656838dfbf448b67080b8f0a8d6bac5862ee6d2e5d39b4 WHIRLPOOL dc4e348bccfdc876f41e0acedf819f7a5321eb82524f2e9a2d682eecc2c6fc23627841bd0a8ab005f5c502ca5fb7f4d7a910940c685fbc236af5e150cf9de521
 EBUILD xlog-2.0.14.ebuild 1434 SHA256 1c5288db6f0e8b95461df9a48a2cc9a67d5c66ec8e647162028dd2f59ef2b506 SHA512 11ff98edad83e146e3d4bf63a91084218006e78c55f33a75ebd679d6f8e708419464e6dedcccbeca4a141c2c688d1db0c62ac0d1056dd2e9c3bc6ca25cdcbba4 WHIRLPOOL d110e90eb7bec0c39d422b31c64d2d63cae04088224964c8d2efc52457d6070528c1dab306b8190b443b73471e33e3e1c581f9e3f75e89fba1f35757ab5475fe
+EBUILD xlog-2.0.15.ebuild 1436 SHA256 3d80a727a1cc7e8614bed64448b8a0e27b8ab9b70178362abb9d19ef13a80f1c SHA512 c68c2f42a60559c285f1604e0a8cca86c11c0ca8ad10b505037b57d7ad4b5638643c55119d03443ab1009d17163d12b70c0745f7a3030d7a16b9d6177d8f16ab WHIRLPOOL 61e79faee5eae6b2256f1b4eee97e82909dcdbbb208305f75f5419a767875e162e0bd660a8be7ba04f7cffc656f53ca5ea1b92d1e2d341ff0ecf03950c326557
 MISC ChangeLog 2829 SHA256 bd1878aae94d7073cbe7e5d510d9df707c4f5d4cf0f3bdf01cefffe37cd146b1 SHA512 6eef97521b5334c3a48e28cea946135c5d1db52a5773534669da653e1160b7dc0acd9e7fae73c450953cdba0bd7a33019654c1bf412a0ef929919e18cb4d9629 WHIRLPOOL 736545dc84515b5236e432f75b31586dd964d74813e12648e2149656835aea7276a0f3dea8e6cc7c2fc9d750acc9082f594cd05ef383eb7d7ad530257150448d
 MISC ChangeLog-2015 5148 SHA256 e4353a74e7122f005e63acc424e697492c7ad50b4ba1fd42f4b9fdfa0c5f984e SHA512 43e1d5fef0cfe688daf3b7d08881185b9ad0fe603bba9ea77bb319a7f4213df4ad49739c614e6c01cbfe2b05c5aded8bb69d317e96a573d72d6c8c156ae73f79 WHIRLPOOL 31aa4a88e1b338bc85cd0491ff25df628f2e9ade0c4fec2ac8eaca0c052a29c76e0a9d793a530497c390b9c5ef1c9496d17743ac16b398aae0907c636511a1d9
 MISC metadata.xml 245 SHA256 bb736aae6c66f655d4be02389ef1965d2dc112ef8506774fa76ea973fbefc7e2 SHA512 9289d414ccbc30198596601b290cf42a583a093bbd7c5f8889c8ac0e81d8570bc4d42dfcbfe210456120edb910ea8572d6806400adec144f4eeb95fa36ae6ef3 WHIRLPOOL 88960ec19ecaa6ebe43ede321dde18ad4b1dc2171b0d06e419ee347b77790815b0ba9c49c20d244a280011bcceb8959e61c21b23e1679f85f9312fcdeeebdbce
diff --git a/media-radio/xlog/xlog-2.0.15.ebuild b/media-radio/xlog/xlog-2.0.15.ebuild
new file mode 100644
index 000000000000..9dcc058a0ecc
--- /dev/null
+++ b/media-radio/xlog/xlog-2.0.15.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools fdo-mime toolchain-funcs
+MY_P=${P/_}
+
+DESCRIPTION="An amateur radio logging program"
+HOMEPAGE="http://www.nongnu.org/xlog"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/hamlib
+	dev-libs/glib:2
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS data/doc/THANKS NEWS README )
+
+src_prepare() {
+	eapply -p0 "${FILESDIR}/${PN}-2.0.7-desktop.patch"
+
+	# Let portage handle updating mime/desktop databases,
+	eapply -p0 "${FILESDIR}/${PN}-2.0.13-desktop-update.patch"
+	# Drop -Werror
+	sed -i -e "s:-Werror::" configure.ac || die
+	# fix underlinking
+	sed -i -e "s:HAMLIB_LIBS@:HAMLIB_LIBS@ -lm:g" src/Makefile.am || die
+	eautoreconf
+
+	eapply_user
+}
+
+src_configure() {
+	# mime-update causes file collisions if enabled
+	econf --disable-mime-update --disable-desktop-update \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	docompress -x /usr/share/doc/${PF}/{KEYS,ChangeLog,TODO,BUGS}
+	einstalldocs
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}