gentoo resync : 17.12.2017

4 files changed, 2 insertions, 63 deletions

diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 82e6b6999c40..9361d705f2bb 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,6 +1,3 @@
-AUX kdevelop-pg-qt-2.0.0-flex263.patch 1044 BLAKE2B 02043fd314856ecd3046824ade72e1edc916d94c41f37a1d1f8b7af894611bb975d445d2489973cc441b44964ec8e871c0093a3e2fb7209783e1434bfaa0d33c SHA512 0d83880b042f9dfc07479e7d7ab8441ea83cef2e1c5585ba7f20052e81cc5c2e1dd59e5fc19e54c97adebdc7e57e6711423a924b7ff8b527172b976aa6be2d20
-DIST kdevelop-pg-qt-2.0.tar.xz 635604 BLAKE2B 3dd13de28b53aead0b4afbe4b6757e04d815e09488d9eb328a4a9e8e84a90ed79f1ed53fafdcf0e77e59909cf09fa8954b5829ae2e00b1af5907ba8697804539 SHA512 50eb540f16c0a32b78ecb1b53ce7005a70c53497f1ca755afd321eb09d12ab646fae216f34a1efc310510a5aa27cb3f895c34aa71e38bcc9c415ca36099e9022
 DIST kdevelop-pg-qt-2.1.0.tar.xz 660268 BLAKE2B 4cf890f5a3281cfefee14575c5ebc3d756f69f27af00fbe806aeac27aa1f2e5643a78dc415d9d5ea3c5434c5b08266aa114cb1d844002222cdc861f133e6b7b2 SHA512 0d0350c921a85ce6682219b0d67617aac21f5e3a95f6d50869c172200db02099e10cc025439ca5a08a93b711e21a3393c5bc50bc709fb4f6a57f19266c6f469d
-EBUILD kdevelop-pg-qt-2.0.0-r1.ebuild 594 BLAKE2B 269d71e069740fc051cfb2b903ef46224e5b9220620b818498493dd5c024cdd86f5e907c93cfff7631c52119179c69aa9e7efca41ac82631a77865453a7aadef SHA512 b3fa126efcdcd956b3493da83eecb922fd6a9a31d697f9036ac8cc79e71adffc04bc9f36b06495a05c7859976094124085bc9b31b43cb556d906a4574f2b93e5
-EBUILD kdevelop-pg-qt-2.1.0.ebuild 490 BLAKE2B b8f21765ca6bf73aa8ca69a7ec9742967175db47d51fced2a4f6fdd9917019e87ccf0a55344979e895f64bc2c7c8a4f3aac6230e8db82df8cf999d6941209344 SHA512 9dbe122e1b67a6c1cc249d61ffcdad73b0e88166d2b5d1dbd57654acb4ee4b55c45161da38baa987173c90298614194dc0d3d12affd9274112d6e73fc983e5bf
+EBUILD kdevelop-pg-qt-2.1.0.ebuild 489 BLAKE2B db137e6e9e0afca0484c28ddda0a309c31b7e3cc4a81a6307580001a755cd286ec183c6f87714c882d2d4fe4e1f5b5a385c6cb2b62909ba2288074e81f63e349 SHA512 2a715a11b24881f1829b717c46d4cdaf74a569f60056be30a7d8a6acb06f54ddddfbf72b2bed11daf6df93beff88999e300d17824030758b3a1fa1bbfedaf09e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.0.0-flex263.patch b/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.0.0-flex263.patch
deleted file mode 100644
index 2f2fbee903c7..000000000000
--- a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.0.0-flex263.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 7aa292e5c4b2dc2b8a420e7e8b8e32f61268fe5b
-Author: Leslie Zhai <xiangzhai83@gmail.com>
-Date:   Thu Jan 5 11:04:27 2017 +0100
-
-    Fix yymore_used_but_not_detected undefined issue
-    
-    flex-2.6.3 failed to
-    
-    ```
-      #define yymore() yymore_used_but_not_detected
-    ```
-    
-    throw yymore_used_but_not_detected undefined issue, so I simply added --yymore option for CMakeLists.txt
-    
-    REVIEW: 129766
-    BUG: 374523
-    FIXED-IN: 2.0.1
-
-diff --git a/kdev-pg/CMakeLists.txt b/kdev-pg/CMakeLists.txt
-index 5490835..19dc3a4 100644
---- a/kdev-pg/CMakeLists.txt
-+++ b/kdev-pg/CMakeLists.txt
-@@ -76,7 +76,7 @@ IF(FLEX_EXECUTABLE)
-         DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/kdev-pg-lexer.ll"
-                  ${OPTIONAL_PARSER_HEADER_DEPENDENCY}
-         COMMAND ${FLEX_EXECUTABLE}
--        ARGS    --nounistd -o"${CMAKE_CURRENT_BINARY_DIR}/kdev-pg-lexer.cc"
-+        ARGS    --yymore --nounistd -o"${CMAKE_CURRENT_BINARY_DIR}/kdev-pg-lexer.cc"
-                 "${CMAKE_CURRENT_SOURCE_DIR}/kdev-pg-lexer.ll"
-         )
- 
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild
deleted file mode 100644
index 60b9707f24d1..000000000000
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="2.0"
-KDEBASE="kdevelop"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${PN}-${PV%.0}.tar.xz"
-LICENSE="LGPL-2+ LGPL-2.1+"
-IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-DEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="
-	!dev-util/kdevelop-pg-qt:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-flex263.patch" )
-
-S="${WORKDIR}/${PN}-${PV%.0}"
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0.ebuild
index 171d3a64ab52..ee86aa1a4186 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 LICENSE="LGPL-2+ LGPL-2.1+"
 IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 x86"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
 
 DEPEND="
 	sys-devel/bison