Add patch to fix .desktop validation wrt bug #457712. Migrate to EAPI 5. Correct dependencies. Remove old.

Package-Manager: portage-2.1.12.4/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 43 insertions, 27 deletions

diff --git a/net-ftp/qshare/ChangeLog b/net-ftp/qshare/ChangeLog
index acd41b49bb6b..badc1524c9a8 100644
--- a/net-ftp/qshare/ChangeLog
+++ b/net-ftp/qshare/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-ftp/qshare
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/qshare/ChangeLog,v 1.20 2013/03/02 22:51:15 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/qshare/ChangeLog,v 1.21 2013/06/12 12:53:56 kensington Exp $
+
+*qshare-2.1.5-r1 (12 Jun 2013)
+
+  12 Jun 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/qshare-2.1.5-desktop.patch, +qshare-2.1.5-r1.ebuild,
+  -qshare-2.1.4.ebuild:
+  Add patch to fix .desktop validation wrt bug #457712. Migrate to EAPI 5.
+  Correct dependencies. Remove old.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> qshare-2.1.4.ebuild,
   qshare-2.1.5.ebuild:
diff --git a/net-ftp/qshare/Manifest b/net-ftp/qshare/Manifest
index ad06acfb8d22..622378c9800e 100644
--- a/net-ftp/qshare/Manifest
+++ b/net-ftp/qshare/Manifest
@@ -1,28 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qshare-2.1.4-src.tar.bz2 772886 SHA256 9bf2b0f157ea556285a8617b9aada2ff0670adfba31dfadb6a48969833e04938 SHA512 934a8c394657ce7ad0697172f51d164d80b6ff61975966d9241d63e2ef35df979adfca1dcb61b34e3c92f6c4acd56f5cbf5a1783648fbf2dfdf808dbab312254 WHIRLPOOL eb29f5c902a295b2f84ae8cd9bb68e57159c7e5556be5face1cce15a6b4ecda9c2e92d401695d2a8d8ced1ee304ee3cc3d8e91117b41178b42a67cca2f0c639f
+AUX qshare-2.1.5-desktop.patch 758 SHA256 c6f95da42e769e588a8c4109ceae9cac39e397dab0b53a695750f55103c51087 SHA512 eb4ee8b9ee6004afbfa5601f9205b9712e1c68f656d5671b3e00ae1e361aa6d9fad2469a47f3d80f4035c088c8e0fc130da1707bfb26990bb629b72ee51709a2 WHIRLPOOL 434b7300d582ac1127aeb3cdfdec07fbb0790b58b1465096e381a70ee4990e9b3f771a21fe73ca02c84c2457a5575e1857ba9e2ec5b45042ed1b3dc82e5c3916
 DIST qshare-2.1.5-src.tar.bz2 770556 SHA256 9122ecd6f4b0091a24fe664ee6254ae16acada0e315b5e30bdf95828639fcde2 SHA512 5d1ca2ffaf93d1136a2549cb4b7525f4990182a53dbff0752d60c2d24b4022f4082d39c8df2758d97e3830bc59033da9018a80474f52dd83245a8830ec3b4c1f WHIRLPOOL d67e14a5dfaf230e43250ec3946e106d43d80177f696680c7672fdc29d03c292dbaf2e6ae7d98bdbae8dfd47c944309ec644a60eeb175ea2751c0665520a1cb8
-EBUILD qshare-2.1.4.ebuild 613 SHA256 b4a0d51d9c7632d406310123bb9a5f930005687cb744e16fe54c76aa3a9ef2a0 SHA512 196f3e334869aa4f6dfda1c13d8ce31b2e90bca170fa2a1c9c185eb7903b4421e2168b4878d290de0cf32847ff05170919b26c23c721e80b406a9d3b2de4d02b WHIRLPOOL 807524c8e0d63197470d60e17e7397a91737e5a3a67ba8570a748d05e4f4ce7b4bf6b1cff3b4fd13999e8c8c8a9af8a738324b6211940beffe2bf63995180a8b
+EBUILD qshare-2.1.5-r1.ebuild 639 SHA256 c1432eb88cf197e03d5e42d15ed093600787cfebee28a0ef51be94998d46d79b SHA512 4b0a9e0ffd50f8e4317f579e3238b757da36814a5fa3acdbacb102a7c087e0571b67d2dd511526f365fafd82c3286b3c176b535a9d2f9206c56534c8c12812ee WHIRLPOOL 68a326759a113fd418fe4e8c3f99fe7ce5b45d91ab56b191c1cc64a4880704b9a952f6de6a4c41cffa059c1733e2698cf1eb13cb14a1021489f79cdff4718d9e
 EBUILD qshare-2.1.5.ebuild 613 SHA256 99e40a6a5c70fd392afae7509e66a10b4b1fc509f7c9be66f88639fc31e8d367 SHA512 7e41083c94942473b0d31e11124c3c15f194174d943ea5af7d8ca28bbd1ecc40d9ade5c039d31683a5f3a81ca8e621cf3cf809e622206a2942212b94c22b04ec WHIRLPOOL 7d90fe83cf260b1b8235345b35a30a746b94be21b9c69bf3c9c51a7792057615a43f7276962fee77051d80d5c4275b76c14e07bbdf0b4b2dd0e87374b0bd1c45
-MISC ChangeLog 2793 SHA256 9de899d672d15dc9b08a8602d790dba093d2f4f268dcc496d7564d4160e81731 SHA512 890e33c6514a4a4e3fb85e0f9692b9aa388468dedafc5b4c8dd0caa77bc61222a0b605a9052a3b3542b9f4d13874077947b1e23c32f671f89ad9b40505d78ca5 WHIRLPOOL d5b12493a18159be99a08239f9389c3c985151e77e9d353fba917604e6a10862870f62c3ed6f255dbf1cee7102b494e00902f98b2281e36cbb6756c516a0df51
+MISC ChangeLog 3081 SHA256 68781e447882cd47c3b1edb052b5aebfc62d5859a1fbe37439059a22e9a1474c SHA512 c5afaa1d11a86b78018a8d1cb3c6ea739aec0513966e8c324fd4936547991a1af98799d6e665c1404087a48b341fa343150e22add5f1b01d35e793a3a0ba96ca WHIRLPOOL f1e0870b54801db34b716f0b1e34aa1499ba30011181b4c4ccb7a12907c207af9b8af4b06af7849ea7376878da56e5c5d4df03b7ba75a17b61ad4498c8c9ff0f
 MISC metadata.xml 155 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7 SHA512 f05c8982778167c3667c9246b9730ba49fec2967731ed2c615e31a7fddc220fcea8c0843caa70a14957c8c4910892c512b6f2e00a9724d65e6032e1289f4562a WHIRLPOOL 25ccd49f04da07c8525fe18b21229764bb4104938abefc6c953bf9caa533dd5c10ae7b3f80a1251182e6c1520c09383d9f1d0ac1dc74832a99299c9be27406c4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMoJiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88K4gP/0vdjicc2mnZVZtMP82JfAtq
-RGeshPbLciDPPBvHdCAqLaZ4td3yfP73fguv4hYED1R3Cf0FzcyMCL/h6b+864Op
-4IeTtJEo5+7/WEwkh849kDYk9WfAv+ZPkk7fuEcmorOKgu7rXCAa+4aVwDx1ne11
-nBTCZQKdbMCEKVCfxY6fUAmVo3eMvIn5fvJTvkIGyENqSvoadrlBRTvJ23R7TXJQ
-Wo+1ylYv7Y4kDTxzlf7O9V1ZNtzD+0CbyJvrUEy7kaqrvMK3gFcL/GxgCkHaJ6Nf
-gUqsztZgiCeV+3cCN7kpyaHcyvhvEn27sGIWo72uRhH6r/eJ7OiAWNwWF6sB6ATY
-8G9Yw/JMNKLQ6UfrFPj1bGMimazxCeDyoyF0zrsbuxNsIQOiHbh4jdqIHRORWq84
-nxFc9VaajrvvnXAx9/w6MS/VCD9ZJfsmD51y6gEYJJNQERRVWyR+miJwlmolJ+0f
-UZGGQBeY9Ej3cevi0zN22LlyHTVn2tAm/Fiy+HFMafYudkFi+Nd7hEbe2EjNTzFk
-OODcw6Og9h4Z2GanwJfInYRcWiDl/smVd1JmmCYca9LqgACy9CE3eAzCQXto42b8
-GHD8A/D7jgJ5zVoTEHe6jHnVS0D4LsuH8DRssPxSYd1oT9P9zod9Ix1IrZOcN45c
-NFWMycr0Hm6hz+XIoVwa
-=BtIR
+iQEcBAEBCAAGBQJRuG8OAAoJEMbwO6tnXQ0scSYH/imaV5P/G2m/PhamA4J3T7En
+YM18XGUG9GquQ6pkHQjAr0qKZYGbfe1DMwF9JQ3mczz1eIuIHz6GhZgeB2tSyfws
+UbJ3htC8YgYF5ZXiY+YJKwiLGDHBQbVLHcFsXfn24Q+VbTkfwZvbJOCVGbhgsXUN
+axp2jmK6WvIvt/bpbxjFNANjveBAUWESF7PkGt0ey2kFZOsDAeSzQUQQFy8SuWY/
+R6vVthWxVVF1QSeyGY52WhKEoxV0TC5CAnN8yZVLgxQAVxstlyWKbi29rJ4UlIl2
+jE8lECrY1cYlUIyX91AVFtNPIMTxzGjVwjGO17q1lb5AOTsHw931qK5G5EItddM=
+=S3eN
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/qshare/files/qshare-2.1.5-desktop.patch b/net-ftp/qshare/files/qshare-2.1.5-desktop.patch
new file mode 100644
index 000000000000..1c18e85e8db1
--- /dev/null
+++ b/net-ftp/qshare/files/qshare-2.1.5-desktop.patch
@@ -0,0 +1,16 @@
+Gentoo bug #457712.
+
+Index: distrib/linux/qshare.desktop
+===================================================================
+--- distrib/linux/qshare.desktop	(revision 90)
++++ distrib/linux/qshare.desktop	(working copy)
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Comment=Desktop FTP server without any configuration
+-Comment[ru_RU]Графический FTP-сервер без конфигурирования
+-Comment[uk_UA]Графічний FTP-сервер без конфігурування
++Comment[ru_RU]=Графический FTP-сервер без конфигурирования
++Comment[uk_UA]=Графічний FTP-сервер без конфігурування
+ Exec=qshare
+ GenericName=Personal FTP server
+ GenericName[fr]=Serveur FTP personnel
diff --git a/net-ftp/qshare/qshare-2.1.4.ebuild b/net-ftp/qshare/qshare-2.1.5-r1.ebuild
index 58e1d98c31a3..83637483a93a 100644
--- a/net-ftp/qshare/qshare-2.1.4.ebuild
+++ b/net-ftp/qshare/qshare-2.1.5-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/qshare/qshare-2.1.4.ebuild,v 1.4 2013/03/02 22:51:15 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/qshare/qshare-2.1.5-r1.ebuild,v 1.1 2013/06/12 12:53:56 kensington Exp $
 
-EAPI=4
+EAPI=5
 
-inherit eutils cmake-utils
+inherit cmake-utils
 
 DESCRIPTION="FTP server with a service discovery feature"
 HOMEPAGE="http://www.zuzuf.net/qshare/"
@@ -12,13 +12,13 @@ SRC_URI="http://www.zuzuf.net/qshare/files/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="net-dns/avahi[mdnsresponder-compat]
-	dev-qt/qtcore:4
+RDEPEND="dev-qt/qtcore:4
 	dev-qt/qtgui:4
-	dev-qt/qtwebkit:4"
+	net-dns/avahi[mdnsresponder-compat]"
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS README )
+PATCHES=( "${FILESDIR}/${P}-desktop.patch" )