Fix QA warnings in .desktop file. Fix cabrillo import function.

Package-Manager: portage-2.1.12.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x762053D5

5 files changed, 38 insertions, 24 deletions

diff --git a/media-radio/xlog/ChangeLog b/media-radio/xlog/ChangeLog
index bc04003e9bca..f5b866200630 100644
--- a/media-radio/xlog/ChangeLog
+++ b/media-radio/xlog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-radio/xlog
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/ChangeLog,v 1.28 2013/05/23 17:23:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/ChangeLog,v 1.29 2013/05/24 07:12:30 tomjbe Exp $
+
+  24 May 2013; Thomas Beierlein <tomjbe@gentoo.org> xlog-2.0.7.ebuild,
+  +files/xlog-2.0.7-cabrillo.patch, +files/xlog-2.0.7-desktop.patch:
+  Fix QA warnings in .desktop file. Fix cabrillo import function.
 
   23 May 2013; Agostino Sarubbo <ago@gentoo.org> xlog-2.0.7.ebuild:
   Stable for amd64, wrt bug #470518
diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index a26b8bf61bcc..fefb007a399b 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -1,29 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX xlog-1.9-desktop-update.patch 1393 SHA256 c9f9afee6309420b875363a3a52a996e48e98c6d6d236c91c2c81c78ce21c13a SHA512 bad7c6f001ff31d051f9446604f3059b60fa1855af4edb92b979f13ac6675607f69af9e6de59767073ff062c1178b4afd5e46eabaec1f49ce81e5cb9c2b2281a WHIRLPOOL d6bbc166d4d18185319823ff6ed8b740bd667a9c56950cdcc7af80f024430980cbbf95adf35070742931894dcc8c5fa208d6f4e94c348ac4ae9c1da5fb5782fb
+AUX xlog-2.0.7-cabrillo.patch 372 SHA256 5134158e33de2b401987dee85feff7894ada238a8e42d3592e6b84eca08a33e5 SHA512 c8472ea7fa6738a7dc478960e10b1bcc40b1de5e4d92748f7aa6c6bda9360a593ff2f861ce19d11dfcc2096cadfbc2d40c45dde69a772f771d4113d0137cbdb2 WHIRLPOOL ce10e7ec6935bdbb4b38213de356e5f6ed92eeabdef586a101c3cae84e26afafd82183792fde360c1c16c4800d29bdc0eee78276afb9a7b7b6e97a718ffee74e
+AUX xlog-2.0.7-desktop.patch 435 SHA256 ad26e07d5d254a185d13b4484fb69341aa904fe1e2528bed1710e52e582bd5b0 SHA512 5119356e9635ca7b6d028d4bb3be12542636ce5d2967540b20ad9c22d62792b81a1a06fcd8722c7cbe8df706d8113e60b308d1db7c6fa8f3238bea039eb4b4f6 WHIRLPOOL 49cf7184131956a77664012853622b6cdf77ba047ccb25a9b09b78c793b719b37604a8a92b7202d81a98ed13c170f70d76d6e15bf3bc1b0279e2e53d35ceae60
 DIST xlog-2.0.5.tar.gz 11173514 SHA256 d8290377acbb57d51182e511c4d11a9ea10c73f4d45434da210dd4a5c1b1b09f SHA512 f2561e9d0f8f4c576f22f034e3903d21846d74ee08def17cacf7bb2c05ce26f13e71e91f0f4e5c4ed19d72b6ab734cc91c89c1c6cb856066dc6f89559257ef0e WHIRLPOOL 5efe130d00684d115c29406a2adbb984e4cb81ee282affc7bc91bba1276e441bb9ef3dd0bf19995d7c859806602c95ae72e77c64cfaa9951d9e21823a044e3db
 DIST xlog-2.0.6.tar.gz 11411800 SHA256 4e3bc99e28027ccfe9ba56bee39fb7783d678fc8bd695ee65002a82b2fccd83b SHA512 622457197ce6a30fd262bb6aa5bc02354d4f5be0123e53d9863a45487a76a42bb74993331eb0605c9ad141ee51ea65a53682bd023e25bd8bc01024184a98cf8c WHIRLPOOL 64080be102c00b5f310734f8baba67096e36dce3d82ac5af68eff36d6746493dabe8a10efc9a7ac5931b262f80039fd86a5e924dcf67143aab5f9fb13fe2235a
 DIST xlog-2.0.7.tar.gz 11412050 SHA256 17687e8e75b4797fd9cdf839fcda1ee05171f278b57cb9bf13e10a80cfc99be9 SHA512 c444d522c3c0bcaadd9cbe2ad52f52280a766ab6b999c3e8950c59ea8e077a1820672c0af2cc8e1163a9b8a7db902608fc0b3badc5d53abf587cd282a8030351 WHIRLPOOL 4dbddc76539765c9d8e059b61dd15974bc832d831535af44804b31863c639e84ec17976bd22640851dcb34baedf5db01db4a01c562478ff4c2b5c24e6bbf7471
 EBUILD xlog-2.0.5.ebuild 1195 SHA256 afe4a983e0ed5519d0db9961ab23b879874f58a7b1509dc436745e64a6bc81b7 SHA512 8756bd965ef5e383aee5a329bf6f963ccd53fc70c928e821a963d9dbcde32fa9cdd373fb4441589625b46702824e6372235a7a1eeba943473650d0f7cccd11a6 WHIRLPOOL 01f00877adf7b56b159ffd27f400eb9cdd55e9c036ec368e2598a0830a9533298b4879ea57ef5ea4181ab795247e1d981aced0da26bf2bef0960f56bffa0308f
 EBUILD xlog-2.0.6.ebuild 1251 SHA256 e71b29191bebd5eed16aef3dfc9257df2182fd14482709e94741b293fe995d9a SHA512 05b4ec4e51eb41ee3ea4ab141df32f37a17b61fff0c58bb1aaba40baafe29556d59ec4f92450fcf0a82213877399f2ac804c9c5fa6842280edcf7139bc0039c7 WHIRLPOOL 19c9846d72570cc911e57998dd9e01f06dd0f40e1f677bde32af73049b37f8b6423e1e32a69fb5cd42df3f8f7bf251538d1c6d5dd59a809792cc995b0152c65c
-EBUILD xlog-2.0.7.ebuild 1247 SHA256 fe002546a01dc60d8d9ce77656298b0b0143ef754cec752b7b1d6cc88b8a01bb SHA512 b523a57889b5e17ff3cbc6cfd25c9e3e77eb2ee73778b48ce434ca9ab7e4aa560a6c106c7971261e3d1300a4652a23c559b19c751d3d48066b6a0e40aba1f939 WHIRLPOOL 548c199e5e65b4ae6883abc61f63d8021c15afe327edd750f86c49bea555c2168c518e46e744c9acb5182552462a9597d765f69e8b190a7a2da94ff5b1e3c178
-MISC ChangeLog 2729 SHA256 b21d0c5b2460345a978d6eae2524c72d1edeb572fdcd13900a531d7bdd86f584 SHA512 919fc2ee812b7ac482ff2f5d6d31950264f8a75f8c0078a3401b848aaa7cae6434b9dabf8ba9079264a1d1f71f0908aaf22427383d803bdbe9df608126035130 WHIRLPOOL a583bf0ffa1487c4ace4aa06c9f20139998548f7adf22b701bef97390106633097780ecd327b589615b60023c9bc58ce5bd60044520ca987f41a36e8a8dafd43
+EBUILD xlog-2.0.7.ebuild 1330 SHA256 5a1555fe2101e28161a89f5f0a95c152b5efab5138e3e9916bab0f39e38a33b2 SHA512 9ddf03b926ebc7b665a5527ea6da94def24daa71936ef4027eec0f7ba3ab5ea106a39e5072c4fbce85330d81964c1e062f75ef19c711a51fdba2e8c9ec8f9c68 WHIRLPOOL 4fa4a75a7696d2f4bebdda325ab411436f6761a8bb5aa7cccc02bbf80705d0f458165a3b72eb8cf995ebe7ebf368ce07cfd8fca19d99ef7e13d5329ef09685ae
+MISC ChangeLog 2939 SHA256 e1803b8d7e8829d2588fe764d8ccd2f5a76b452c6e087108fa2fb8ea9b42f316 SHA512 209f9f172d44a9a55e12b78ca6a07bcbf829e4815da3253d0772394dd12cc16a554562741207427a429a684906b5410c0f7537245115931b43f3064412b3c62c WHIRLPOOL 6bd29c347420b9842f5317064d87381d843d5966b8366e94848a575ea01e723b600da5a93b32b7dd9bec9fa07f998e809fa4b6ee9619cf3f3db7ee5c0c4e972d
 MISC metadata.xml 231 SHA256 82b442533d9a6d51cad11e8ac81c9744f958281e42a3207a5430f375600795ae SHA512 dbb0072ccd780f03c543fbea6687a80979a0a023644209faacc915de1859c43d0285d6569cc088cb954d707183776301e6df884288d29fb71a5ea6d6a5c7d8bf WHIRLPOOL facfd7db2740e515b4f8c05fdcc446f4c100f927ea570c94eeeca57d6ccd2136ea6f170a8a54266ca5e86718cbea1d3840d047727ec3688d5a98ea69657b185f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCgAGBQJRnlCfAAoJELp701BxlEWf88MP/RfHtYG3sQhTb2Gp0tUPPIWg
-nvKbqYIkMKfh60vv6qoqriW1DrHSSeAlXSy/5hfLJRgomOz8lDZW0bLSMov4zsBS
-m2Hovth/VUAZu5QmGS7oGFrJc8ygMos65p36oNbqh8P6Y932U1wBDOwwXK57mWFG
-VOt0cw87Zn4OTjyW0ZCqYFZURJpxFCxIguxPr/UVTfNLFoho4KnJsOG31OofttXS
-dC8qneDl7JoGzIJmYLzr5c/5uTW8WSjpj6iLymFgwaINel49WtV08Nh+9fWmyT8W
-N4IWUuCNqyjGu8UZeX4GYjSbfhoqDLCydT/oO7/8MrEznNODavx6j+YgpSRzqJCq
-Ny+KHIegFdfoMhPY9fUUL2ZxItwbOsD9PzY8NQCWqClwkyUsYhdY+ZQQpdWHtp31
-rThTylfwY+6eGN5fSTfr8GVsVg6IfWIfRXI2GYuRHNb37WkZ4mtejLSESgpsEuBS
-UmIv0Xusi3zz2Sz0hYFPfdZdL18xTnX4DUcLa2h98Y4+xYRJO1yRdO4hZqh4YhXE
-Hk/4t4kvMP9fZEeac77o/XUBXg/OG5NIMfB+cnJs07X7e8/bxIvMVPseWVyRQ1du
-Z6sUPv6M4A07Bm9y9FiWdc5zJaO4ezAh/a4ypiE4TcTCM0Z6969ZXdAG9S334paJ
-hzKOrHHfWzhP6jV1JWDW
-=ZKI3
------END PGP SIGNATURE-----
diff --git a/media-radio/xlog/files/xlog-2.0.7-cabrillo.patch b/media-radio/xlog/files/xlog-2.0.7-cabrillo.patch
new file mode 100644
index 000000000000..4ee6fdda9ba4
--- /dev/null
+++ b/media-radio/xlog/files/xlog-2.0.7-cabrillo.patch
@@ -0,0 +1,11 @@
+--- src/logfile/cabrillo3.c.old	2013-05-23 15:27:32.000000000 +0200
++++ src/logfile/cabrillo3.c	2013-05-23 15:27:40.000000000 +0200
+@@ -341,7 +341,7 @@
+ 							g_strdup_printf ("%d", khz/1000);
+ 					else
+ 						q[cabrillo_fields[i]] =
+-							g_strdup_printf ("%d.%d", khz/1000, khz%1000);
++							g_strdup_printf ("%d.%03d", khz/1000, khz%1000);
+ 				}
+ 				else
+ 				{
diff --git a/media-radio/xlog/files/xlog-2.0.7-desktop.patch b/media-radio/xlog/files/xlog-2.0.7-desktop.patch
new file mode 100644
index 000000000000..e124e062351c
--- /dev/null
+++ b/media-radio/xlog/files/xlog-2.0.7-desktop.patch
@@ -0,0 +1,14 @@
+--- data/desktop/xlog.desktop.orig	2013-05-24 08:23:25.000000000 +0200
++++ data/desktop/xlog.desktop	2013-05-24 08:24:47.000000000 +0200
+@@ -5,8 +5,8 @@
+ Comment[pl]=Dziennik łączności dla radioamatorów
+ TryExec=xlog
+ Exec=xlog %F
+-Icon=xlog-icon.png
++Icon=xlog-icon
+ Terminal=false
+ Type=Application
+-Categories=Utility;Database;HamRadio;GTK
+-MimeType=text/x-xlog
++Categories=Utility;Database;HamRadio;GTK;
++MimeType=text/x-xlog;
diff --git a/media-radio/xlog/xlog-2.0.7.ebuild b/media-radio/xlog/xlog-2.0.7.ebuild
index 2cf90538053f..d56bf7dd28c1 100644
--- a/media-radio/xlog/xlog-2.0.7.ebuild
+++ b/media-radio/xlog/xlog-2.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/xlog-2.0.7.ebuild,v 1.2 2013/05/23 17:23:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/xlog-2.0.7.ebuild,v 1.3 2013/05/24 07:12:30 tomjbe Exp $
 
 EAPI=4
 
@@ -26,6 +26,9 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-cabrillo.patch" \
+		"${FILESDIR}/${P}-desktop.patch"
+
 	# Let portage handle updating mime/desktop databases,
 	epatch "${FILESDIR}/${PN}-1.9-desktop-update.patch"
 	eautoreconf