summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2013-06-12 12:53:56 +0000
committerMichael Palimaka <kensington@gentoo.org>2013-06-12 12:53:56 +0000
commit0eea72bf28a441acd774654281c4faf620fc6cea (patch)
tree09755e550d6dbe154cd7a75da0356649bd5080a3
parentFile collision fix for #473054 (diff)
downloadgentoo-2-0eea72bf28a441acd774654281c4faf620fc6cea.tar.gz
gentoo-2-0eea72bf28a441acd774654281c4faf620fc6cea.tar.bz2
gentoo-2-0eea72bf28a441acd774654281c4faf620fc6cea.zip
Add patch to fix .desktop validation wrt bug #457712. Migrate to EAPI 5. Correct dependencies. Remove old.
(Portage version: 2.1.12.4/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
-rw-r--r--net-ftp/qshare/ChangeLog10
-rw-r--r--net-ftp/qshare/files/qshare-2.1.5-desktop.patch16
-rw-r--r--net-ftp/qshare/qshare-2.1.5-r1.ebuild (renamed from net-ftp/qshare/qshare-2.1.4.ebuild)14
3 files changed, 32 insertions, 8 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/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" )