Revision bump adds upstream patch which fixes build with bison3 spotted by Lars Wendler <polynomial-c@gentoo.org>, bug #486416.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 97 insertions, 15 deletions

diff --git a/dev-util/kdevelop-pg-qt/ChangeLog b/dev-util/kdevelop-pg-qt/ChangeLog
index 0a370c5f6792..90c1bb2945f1 100644
--- a/dev-util/kdevelop-pg-qt/ChangeLog
+++ b/dev-util/kdevelop-pg-qt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/kdevelop-pg-qt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-pg-qt/ChangeLog,v 1.12 2014/04/25 20:35:37 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-pg-qt/ChangeLog,v 1.13 2014/04/29 11:32:54 johu Exp $
+
+*kdevelop-pg-qt-1.0.0-r2 (29 Apr 2014)
+
+  29 Apr 2014; Johannes Huber <johu@gentoo.org>
+  +files/kdevelop-pg-qt-1.0.0-bison3.patch, +kdevelop-pg-qt-1.0.0-r2.ebuild:
+  Revision bump adds upstream patch which fixes build with bison3 spotted by
+  Lars Wendler <polynomial-c@gentoo.org>, bug #486416.
 
   25 Apr 2014; Johannes Huber <johu@gentoo.org> -kdevelop-pg-qt-1.0.0.ebuild,
   kdevelop-pg-qt-1.0.0-r1.ebuild:
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 3bcf879edd5c..e9773277167c 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kdevelop-pg-qt-1.0.0-bison3.patch 1535 SHA256 458a7a48418c7d6231d9c89e6e56447ab247d7e0d73ac39fe0fdcf4d78bf2075 SHA512 a8db79780cb9ebc8ce1a8334f0d002f9e7e16ab6a3859416c7a1b49336e38775214402946bee5f275618c16e1f3056bc39cb270711aa2b84a4d1cd82075e50df WHIRLPOOL 151f1b66694e9004bf7b3ce60bc036f5e5215f6f173af9b636661a3406cf650b5cdf1d3d4f513dbd21a1a0566e8be1218b80f8e7fb5db393ac115fef1bd9b3bd
 DIST kdevelop-pg-qt-1.0.0.tar.bz2 830040 SHA256 49b395f5b45bc0aa094d6a283627bc53581a5eaae7892fd850df2f97d68bcdcc SHA512 1e3a41cd5570a2bdba98ebdf55b89cc2992ddd4859bd672ea1b8215d47db2203ec685717787f90cf382168495b4b53cc42a9089c4a92e17286eca6cf17c1bb27 WHIRLPOOL 04ee7d992535713d99b77da888207ce5924f6409fafc363d6b00bd695fe39e3896dc8eb9433c71b60c4a45137593896b6eebbec2dde1386866c5c87223bda056
 EBUILD kdevelop-pg-qt-1.0.0-r1.ebuild 605 SHA256 ea324b8b1643f6d86ab51cd31db029df64a0ae468ab8dae202c9a8e2a6560649 SHA512 b13db7379f280ffb9b90054d20dba1fb82548c32d87ca2f8fbfce34f342e1051388f869ef381fc3acfadb7e9bf7df744900fbe2874d3f3ef1793e2fe80a7388c WHIRLPOOL 12b04c397f76f8e40bb1d926fe074ebb1e4af2c018f9a6a44c84a42119cdfe071992c099b4f0761621187cbaa0820bd24ae6a5be87c322cafcb8eb9b8862116c
-MISC ChangeLog 1944 SHA256 7af8f637f0380b287eed1632c15ef7663abd57b56dc4071cb8c44c3aa6a59084 SHA512 1d3956fbb95bb5b7b8bd61c638f14087ac190ea325c0116b83a1c3e13ca56da3fcb171917b240224b04d3274142bf8c3a66af4c5e23296a45c06f2391420f776 WHIRLPOOL 97ec485e1eae46f6d417257423934d95289f71fd9cb13e139a774a770476621e207a16395a25337b0885467c07e05542414adecc1bd002c56ff487cc679285a6
+EBUILD kdevelop-pg-qt-1.0.0-r2.ebuild 652 SHA256 14d8b4a9bfd6b10c2cbdaf9468ca9b00c9606cc932e0d147dfe6a811a2a906f0 SHA512 e63b47307c7d92ffaef4a36c0c61c809459de97f548c4e7a846b1826d763a67b1049bb90b71306b13b05d652a7e48ecf7c9d73d6544a9f3b58e513b64347ab5d WHIRLPOOL f85f01a9c183c73747ec54d71581b3ad4da699c9d9c16e6ecb17dfd226c26e1da5f11d61a568c7abd194ec70d52f574a549ffccd1fa5431120d35ac33ed2fc20
+MISC ChangeLog 2242 SHA256 e909ab5c74784a90f0bbc4cea45eeffade9cc733a99c607c4fb35e571295dd6a SHA512 0d4fc02448d5edfeeae67af4e424b7fb3b701c11f921b36b790bab23e8b9da3150c57cb7c09e21dc85d7c28f120194a0ada247a5e22cb819f887fd504893e7af WHIRLPOOL de96b9db1df518f2f6b6362500b6720c20d169ce591e0d75c601ce01010230eba36240b89a540eafd8636e2fd7ae521763a9547ba96bd3a790e15d9b82d81571
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTWscaAAoJEGVpnaTzz9K97DMQAJ7z6sYORZ7j3dGlvAexgw2S
-AgCngkn3jE/VdabJlRO7b2Zzr8geHURA95t49UWuAlqHoiTjQDgJ8RjjSfXFRtOn
-MYBEBUmXdfcMAc/xbwRwDtJJ8CF1ficfaHdM3W+0fRalwyEYx6T4U5c6qPG1NDbA
-wAkSm7ibCcspT8snzx30eDHjbIIkiOPeGv5/GJ6oj3xbzPbThwUhh3TF5+I4QW7/
-c5yCanQ/BU7NJrbmCFfvv8uVL0pEvXioo+KQak17ovO49XhfHKCwsMmyT0sGrjZb
-gF81jmrYU3oKvy3piTY1ptBJeb/uuSYxVUsG1PcrRZHs3Avcn45ZrDXrbKl/q3TJ
-XJvgxVMKJb24nr3QCcg0V+gHV6moIa/5zbL0lKcTuier+Rc0MeKhC0Q5W6QWv/B8
-lUnYbk4DDnTbOa2dd0XQB3PiaQ4sP//e5DbeV9h5LycPy4bA3B2pPnJu5yviX++O
-RyIYsEhwCu3UvpWnvxbLNa2KqA3ODMPFZWVrXGxfR8EXLTfpnuLwGYgE5KLIBShK
-y+KHtxxowKysCY4qCc2LAhXLaaI2z57P1x+CnzPHzq/0zlB2rlxijO/MSkA2YfVl
-8jmZp+ksKhAtZMdFw9KsRT4lSOTTdxH0bVv9B35ely/hwd2044xALgL0YTHATBjm
-kfZ4Er27ikwF5u+k8nYH
-=5ioC
+iQIcBAEBCAAGBQJTX43qAAoJEGVpnaTzz9K9FE8QAJ0cf4HCMA7DdSiKFFENtpLZ
+WOMyOUHZs4nCMVubN3lmyim0Ndu1LTO+6JbtLFkTWJ+5HZzNQIYx1c5i8Ox0dJjL
+1L2u46iKMyB7nscM3HIGvuHOJDo8TXfIvQXt9YuCqzR0x7JDrcZR3NfrKQ4g29wR
+X17uF1D5cHzUrXP2XjeS5PfW05z1R8Eyi3BTU6vWwr7R4rFBa/HKdnwxNvTOGdLU
+34fJnZ5nZvimP4u8ldpFNkYCk+MBNcG2qR5XRTkfmydbnGmQPdXbSJHVDwXom+zI
+Vm9d/WSHe+u37RKejF0tzmtaDmoQU9y99yAO5frb/AvFcPwNXSVdGlANkwedp8Ez
+eF5wGNxaB28JLF4FinJHyIVcsalLkGGPmEv4KATCGZa+yplJFOdg/bDMwn0EPvs7
+kmU1H9KgPYMF8p3zi0S9eyR4fSdAn+twwC3JznUbWlONTq5E7yQm62WwJehQrLkh
+sYyXOL1JoNCm5DrpKSxwYSWqNoIhUeI9gW9khUFRaMlYT9iPTb+jMPuQ1sSGJi77
+8gEk1EypiClnIzZEPrPussZtWZk8BSTvBGL6mflf9VfPrD87TpsV2cyot6jrXx2X
+vozYDkl2JZ6zFlLRP3PIr/D0YUroMb8lKlw3fGKnx6l1y40Q3oMPeN+1Z+8BpXyw
+2t8HLJA1H0YmblatbAqw
+=we30
 -----END PGP SIGNATURE-----
diff --git a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-1.0.0-bison3.patch b/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-1.0.0-bison3.patch
new file mode 100644
index 000000000000..3651ec471603
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-1.0.0-bison3.patch
@@ -0,0 +1,45 @@
+commit ac587957cd0cabbc668604507e2cfebb6810ed09
+Author: Milian Wolff <mail@milianw.de>
+Date:   Thu Nov 29 15:56:40 2012 +0100
+
+    fix some warnings
+
+diff --git a/kdev-pg/kdev-pg-code-gen.cpp b/kdev-pg/kdev-pg-code-gen.cpp
+index e06c6be..badb461 100644
+--- a/kdev-pg/kdev-pg-code-gen.cpp
++++ b/kdev-pg/kdev-pg-code-gen.cpp
+@@ -51,7 +51,7 @@ namespace KDevPG
+ 
+   void generateCondition(const World::NodeSet& s, QTextStream& out)
+   {
+-    if(s.size() == 0 || s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0)
++    if(s.size() == 0 || (s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0))
+     {
+       out << "true /*epsilon*/";
+       return;
+diff --git a/kdev-pg/kdev-pg-lexer.ll b/kdev-pg/kdev-pg-lexer.ll
+index a0864af..9261d71 100644
+--- a/kdev-pg/kdev-pg-lexer.ll
++++ b/kdev-pg/kdev-pg-lexer.ll
+@@ -425,7 +425,7 @@ void appendLineBuffer()
+   strcpy(yyTextLine+currentOffset, yytext + (yymoreFlag ? lastTextLeng : 0)); /* append current */
+   /* strcpy is faster than strcat */
+   
+-  Q_ASSERT(strlen(yyTextLine) < yyTextLineLeng);
++  Q_ASSERT(strlen(yyTextLine) < size_t(yyTextLineLeng));
+   
+   lastTextLeng = strlen(yytext);
+   yymoreFlag = false;
+diff --git a/kdev-pg/kdev-pg-parser.yy b/kdev-pg/kdev-pg-parser.yy
+index d5a25f5..8f8d604 100644
+--- a/kdev-pg/kdev-pg-parser.yy
++++ b/kdev-pg/kdev-pg-parser.yy
+@@ -309,7 +309,7 @@ opt_lexer_action
+     | T_CONTINUE {
+         r = "\nlxCONTINUE;\n";
+       }
+-    | /* empty */ { r = "\nlxSKIP\n" }
++    | /* empty */ { r = "\nlxSKIP\n"; }
+     ;
+ 
+ regexp
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..1f871c136df3
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild,v 1.1 2014/04/29 11:32:54 johu Exp $
+
+EAPI=5
+
+inherit kde4-base
+
+if [[ $PV == *9999* ]]; then
+	KEYWORDS=""
+else
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A LL(1) parser generator used mainly by KDevelop language plugins"
+HOMEPAGE="http://www.kdevelop.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND=""
+DEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+PATCHES=( "${FILESDIR}/${P}-bison3.patch" )