[gentoo-commits] repo/gentoo:master commit in: net-misc/knutclient/, net-misc/knutclient/files/

[gentoo-commits] repo/gentoo:master commit in: net-misc/knutclient/, net-misc/knutclient/files/

[Andreas Sturmlechner]

commit:     bde91cad9f1ffa8b0c3454945ac1d30403ef8c70
Author:     Peter-Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Mon May  8 04:25:55 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May  8 05:53:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bde91cad

net-misc/knutclient: Fix building with GCC-6

Bug: https://bugs.gentoo.org/show_bug.cgi?id=612936
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4565

 net-misc/knutclient/files/knutclient-1.0.5-gcc6.patch | 18 ++++++++++++++++++
 net-misc/knutclient/knutclient-1.0.5.ebuild           |  8 ++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/net-misc/knutclient/files/knutclient-1.0.5-gcc6.patch b/net-misc/knutclient/files/knutclient-1.0.5-gcc6.patch
new file mode 100644
index 00000000000..f52f6b4b089
--- /dev/null
+++ b/net-misc/knutclient/files/knutclient-1.0.5-gcc6.patch
@@ -0,0 +1,18 @@
+Forwarded: no
+Description: Fix the build with gcc 6
+Author: Adrian Bunk <bunk@stusta.de>
+Bug-Debian: https://bugs.debian.org/811882
+
+--- a/src/knutprefdlg.cpp
++++ b/src/knutprefdlg.cpp
+@@ -957,9 +957,9 @@
+ 
+   QHBoxLayout *setFontLayout = new QHBoxLayout();
+   QStringList fontsList;
+   KFontChooser::getFontList(fontsList, KFontChooser::SmoothScalableFonts);
+-  m_fontWidget = new KFontChooser(mainPageWidget, false, fontsList);
++  m_fontWidget = new KFontChooser(mainPageWidget, KFontChooser::NoDisplayFlags, fontsList);
+   setFontLayout->addWidget (m_fontWidget ,0);
+   topLayout->addLayout(setFontLayout);
+ 
+   topLayout->addStretch( 20 );

diff --git a/net-misc/knutclient/knutclient-1.0.5.ebuild b/net-misc/knutclient/knutclient-1.0.5.ebuild
index c367772a3bd..3bdb40011a4 100644
--- a/net-misc/knutclient/knutclient-1.0.5.ebuild
+++ b/net-misc/knutclient/knutclient-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,11 @@ SLOT="4"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-desktop.patch"
+	"${FILESDIR}/${P}-gcc6.patch"
+)
+
 DOCS=( ChangeLog )
 
 S=${WORKDIR}/${MY_P}

[gentoo-commits] repo/gentoo:master commit in: net-misc/knutclient/, net-misc/knutclient/files/

[Andreas Sturmlechner]

commit:     878b48b7a180baa720a445520f2bcfb09ffb4254
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May  8 05:50:44 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May  8 05:54:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=878b48b7

net-misc/knutclient: Bump to EAPI 6

Fixed DESCRIPTION.
Indent metadata.xml

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 net-misc/knutclient/files/knutclient-1.0.5-desktop.patch | 4 ++--
 net-misc/knutclient/knutclient-1.0.5.ebuild              | 6 +++---
 net-misc/knutclient/metadata.xml                         | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/net-misc/knutclient/files/knutclient-1.0.5-desktop.patch b/net-misc/knutclient/files/knutclient-1.0.5-desktop.patch
index ea81f9aef5d..4548a44d39f 100644
--- a/net-misc/knutclient/files/knutclient-1.0.5-desktop.patch
+++ b/net-misc/knutclient/files/knutclient-1.0.5-desktop.patch
@@ -1,7 +1,7 @@
 Removes deprecated and useless items.
 
---- knutclient.desktop
-+++ knutclient.desktop
+--- a/knutclient.desktop
++++ b/knutclient.desktop
 @@ -6,9 +6,8 @@
  Comment[de]=
  Comment[cs]=Klient pro UPS syst� NUT

diff --git a/net-misc/knutclient/knutclient-1.0.5.ebuild b/net-misc/knutclient/knutclient-1.0.5.ebuild
index 3bdb40011a4..389a781a3bd 100644
--- a/net-misc/knutclient/knutclient-1.0.5.ebuild
+++ b/net-misc/knutclient/knutclient-1.0.5.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 KDE_LINGUAS="cs de es fr it pl pt_BR ru uk"
 KDE_HANDBOOK="optional"
 MY_P="knc${PV//./}"
 
 inherit kde4-base
 
-DESCRIPTION="A visual KDE client for UPS systems"
+DESCRIPTION="Visual client for UPS systems based on kdelibs-4"
 HOMEPAGE="https://sites.google.com/a/prynych.cz/knutclient/"
 SRC_URI="ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/${P}.tar.gz"
 
@@ -24,4 +24,4 @@ PATCHES=(
 
 DOCS=( ChangeLog )
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"

diff --git a/net-misc/knutclient/metadata.xml b/net-misc/knutclient/metadata.xml
index 0cf59224b00..2fdbf33d963 100644
--- a/net-misc/knutclient/metadata.xml
+++ b/net-misc/knutclient/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>kde@gentoo.org</email>
-	<name>Gentoo KDE Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>