Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop-pg-qt/, dev-util/kdevelop-pg-qt/files/
Date: Sat, 06 May 2017 20:08:06
Message-Id: 1494100932.71f4d405c97982b726d646618b9f29c05c4c4bfe.asturm@gentoo
1 commit: 71f4d405c97982b726d646618b9f29c05c4c4bfe
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 6 18:34:41 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat May 6 20:02:12 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71f4d405
7
8 dev-util/kdevelop-pg-qt: Drop slot 4
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.1
11
12 dev-util/kdevelop-pg-qt/Manifest | 2 -
13 .../files/kdevelop-pg-qt-1.0.0-bison3.patch | 45 ----------------------
14 .../kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild | 27 -------------
15 .../kdevelop-pg-qt/kdevelop-pg-qt-1.1.0.ebuild | 26 -------------
16 4 files changed, 100 deletions(-)
17
18 diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
19 index dc093700f63..7edbbf86a0b 100644
20 --- a/dev-util/kdevelop-pg-qt/Manifest
21 +++ b/dev-util/kdevelop-pg-qt/Manifest
22 @@ -1,3 +1 @@
23 -DIST kdevelop-pg-qt-1.0.0.tar.bz2 830040 SHA256 49b395f5b45bc0aa094d6a283627bc53581a5eaae7892fd850df2f97d68bcdcc SHA512 1e3a41cd5570a2bdba98ebdf55b89cc2992ddd4859bd672ea1b8215d47db2203ec685717787f90cf382168495b4b53cc42a9089c4a92e17286eca6cf17c1bb27 WHIRLPOOL 04ee7d992535713d99b77da888207ce5924f6409fafc363d6b00bd695fe39e3896dc8eb9433c71b60c4a45137593896b6eebbec2dde1386866c5c87223bda056
24 -DIST kdevelop-pg-qt-1.1.0.tar.gz 1091846 SHA256 30f78dcf08e9da88bb0643629e17dd8e360afea40370b8772afff197cb2f1685 SHA512 e43f7be38ba50ced6c15988266ee6163cfdcf1fe1b26b02a1c4586394378234eb7a76d7fbc84fc9e395121e916515e4950de672959c9e1ebc72332a0ecdaf364 WHIRLPOOL 3830ce0e3b3ad27a9613efe07d7d4a19d88100cef393ca74af4bce54261e7f52a71dee0351f415e4ca26f7e95a0281ecc26713c02313732887272adcd0e4aa18
25 DIST kdevelop-pg-qt-2.0.tar.xz 635604 SHA256 2f778d324b7c0962e8bb5f62dd2643bac1a6f3ac971d145b6aace7cd61878993 SHA512 50eb540f16c0a32b78ecb1b53ce7005a70c53497f1ca755afd321eb09d12ab646fae216f34a1efc310510a5aa27cb3f895c34aa71e38bcc9c415ca36099e9022 WHIRLPOOL 0758f63b1da3fb607cffe6ea60177f61ba432da991540afd9aa3934a2c76c7206c2483cefb227e7c56d55c27766e5374ee3e9b4bc48611b914219371898c604a
26
27 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
28 deleted file mode 100644
29 index 3651ec47160..00000000000
30 --- a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-1.0.0-bison3.patch
31 +++ /dev/null
32 @@ -1,45 +0,0 @@
33 -commit ac587957cd0cabbc668604507e2cfebb6810ed09
34 -Author: Milian Wolff <mail@×××××××.de>
35 -Date: Thu Nov 29 15:56:40 2012 +0100
36 -
37 - fix some warnings
38 -
39 -diff --git a/kdev-pg/kdev-pg-code-gen.cpp b/kdev-pg/kdev-pg-code-gen.cpp
40 -index e06c6be..badb461 100644
41 ---- a/kdev-pg/kdev-pg-code-gen.cpp
42 -+++ b/kdev-pg/kdev-pg-code-gen.cpp
43 -@@ -51,7 +51,7 @@ namespace KDevPG
44 -
45 - void generateCondition(const World::NodeSet& s, QTextStream& out)
46 - {
47 -- if(s.size() == 0 || s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0)
48 -+ if(s.size() == 0 || (s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0))
49 - {
50 - out << "true /*epsilon*/";
51 - return;
52 -diff --git a/kdev-pg/kdev-pg-lexer.ll b/kdev-pg/kdev-pg-lexer.ll
53 -index a0864af..9261d71 100644
54 ---- a/kdev-pg/kdev-pg-lexer.ll
55 -+++ b/kdev-pg/kdev-pg-lexer.ll
56 -@@ -425,7 +425,7 @@ void appendLineBuffer()
57 - strcpy(yyTextLine+currentOffset, yytext + (yymoreFlag ? lastTextLeng : 0)); /* append current */
58 - /* strcpy is faster than strcat */
59 -
60 -- Q_ASSERT(strlen(yyTextLine) < yyTextLineLeng);
61 -+ Q_ASSERT(strlen(yyTextLine) < size_t(yyTextLineLeng));
62 -
63 - lastTextLeng = strlen(yytext);
64 - yymoreFlag = false;
65 -diff --git a/kdev-pg/kdev-pg-parser.yy b/kdev-pg/kdev-pg-parser.yy
66 -index d5a25f5..8f8d604 100644
67 ---- a/kdev-pg/kdev-pg-parser.yy
68 -+++ b/kdev-pg/kdev-pg-parser.yy
69 -@@ -309,7 +309,7 @@ opt_lexer_action
70 - | T_CONTINUE {
71 - r = "\nlxCONTINUE;\n";
72 - }
73 -- | /* empty */ { r = "\nlxSKIP\n" }
74 -+ | /* empty */ { r = "\nlxSKIP\n"; }
75 - ;
76 -
77 - regexp
78
79 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
80 deleted file mode 100644
81 index e0d777c6863..00000000000
82 --- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild
83 +++ /dev/null
84 @@ -1,27 +0,0 @@
85 -# Copyright 1999-2015 Gentoo Foundation
86 -# Distributed under the terms of the GNU General Public License v2
87 -
88 -EAPI=5
89 -
90 -inherit kde4-base
91 -
92 -if [[ $PV == *9999* ]]; then
93 - KEYWORDS=""
94 -else
95 - SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
96 - KEYWORDS="amd64 x86"
97 -fi
98 -
99 -DESCRIPTION="A LL(1) parser generator used mainly by KDevelop language plugins"
100 -HOMEPAGE="http://www.kdevelop.org"
101 -LICENSE="LGPL-2"
102 -SLOT="4"
103 -IUSE="debug"
104 -
105 -RDEPEND=""
106 -DEPEND="
107 - sys-devel/bison
108 - sys-devel/flex
109 -"
110 -
111 -PATCHES=( "${FILESDIR}/${P}-bison3.patch" )
112
113 diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.1.0.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.1.0.ebuild
114 deleted file mode 100644
115 index f637e82f765..00000000000
116 --- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.1.0.ebuild
117 +++ /dev/null
118 @@ -1,26 +0,0 @@
119 -# Copyright 1999-2015 Gentoo Foundation
120 -# Distributed under the terms of the GNU General Public License v2
121 -
122 -EAPI=5
123 -
124 -KDEBASE="kdevelop"
125 -inherit kde4-base
126 -
127 -if [[ $PV == *9999* ]]; then
128 - KEYWORDS=""
129 -else
130 - SRC_URI="https://quickgit.kde.org/?p=${PN}.git&a=snapshot&h=${PV%%.0} -> ${P}.tar.gz"
131 - KEYWORDS="~amd64 ~x86"
132 -fi
133 -
134 -DESCRIPTION="A LL(1) parser generator used mainly by KDevelop language plugins"
135 -LICENSE="LGPL-2"
136 -IUSE="debug"
137 -
138 -DEPEND="
139 - sys-devel/bison
140 - sys-devel/flex
141 -"
142 -RDEPEND="dev-util/kdevelop:4"
143 -
144 -S="${WORKDIR}/${PN}"