[gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/, net-ftp/filezilla/files/

[Lars Wendler]

commit:     32b3f457169b0689280038139c67012f92046b4c
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  7 18:11:14 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar  7 18:11:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32b3f457

net-ftp/filezilla: Revbump to fix broken desktop entry file (bug #611968).

Thanks to Francesco Turco for reporting this bug and pointing to the upstream
fix.

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 net-ftp/filezilla/files/filezilla-3.24.1-desktop_entry.patch      | 8 ++++++++
 .../{filezilla-3.24.1.ebuild => filezilla-3.24.1-r1.ebuild}       | 7 ++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/net-ftp/filezilla/files/filezilla-3.24.1-desktop_entry.patch b/net-ftp/filezilla/files/filezilla-3.24.1-desktop_entry.patch
new file mode 100644
index 00000000000..2a579e898cc
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.24.1-desktop_entry.patch
@@ -0,0 +1,8 @@
+--- FileZilla3/trunk/data/filezilla.desktop	2017/02/28 16:01:04	8248
++++ FileZilla3/trunk/data/filezilla.desktop	2017/03/03 15:38:01	8249
+@@ -1,4 +1,4 @@
+-[Desktop Entry]
++[Desktop Entry]
+ Name=FileZilla
+ GenericName=FTP client
+ GenericName[da]=FTP-klient

diff --git a/net-ftp/filezilla/filezilla-3.24.1.ebuild b/net-ftp/filezilla/filezilla-3.24.1-r1.ebuild
similarity index 93%
rename from net-ftp/filezilla/filezilla-3.24.1.ebuild
rename to net-ftp/filezilla/filezilla-3.24.1-r1.ebuild
index 1be888aca65..fc028119488 100644
--- a/net-ftp/filezilla/filezilla-3.24.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.24.1-r1.ebuild
@@ -37,6 +37,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${PN}-${MY_PV}
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.22.1-debug.patch
+	"${FILESDIR}"/${P}-desktop_entry.patch #466206
+)
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		if ! test-flag-CXX -std=c++14; then
@@ -49,7 +54,7 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.22.1-debug.patch
+	epatch "${PATCHES[@]}"
 	eautoreconf
 }