10 files changed, 44 insertions, 185 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 10e388dff85b..c4e58a965791 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 1ea465710519..c0ced9d625a0 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -11,5 +11,5 @@ DIST boost_1_63_0.tar.bz2 81984414 BLAKE2B 227c4432bd3ca0eb390048ec85047958fcb6a
 DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
 EBUILD boost-build-1.62.0-r1.ebuild 3916 BLAKE2B 613816f7df3ca77952d7428e1669a06e49dad9652c0d26de99d3d37a7216c91259df10b7639161216428b31eaeabd8619053756e978de612c3891991b02b59ef SHA512 56673f5714aa82b4ad00be76b7937d332814c6ac3d4e2824861ffc1565aee1d7f79050a8e4201d8f6144acd1be08f5081c997b1453724c266fcae337894178e1
 EBUILD boost-build-1.63.0.ebuild 3841 BLAKE2B 715dc3661ea600d880979356697252ed07021d3a7e0fc02a06932fba12e85576f422d700a326f27c919b1556ff7ef0d6e22e900379d1303293a6016d31a73a9a SHA512 bfd275e90dc1bf4647029545c288fee3debabbc908bb590068be9c5c7e07624fef258de8d10d2025d3b8e74204b43cbba5bbc88085680937f8b05b9ebc8fd90c
-EBUILD boost-build-1.65.0.ebuild 3848 BLAKE2B 8fa42f4597830383c91947c7f719e906e705266f8adae5aa044b78e5de40c5e4f0010644ce7ec998dfb4b0cdce47814c01ec63e7a0b11f9a9876e452de0da547 SHA512 1dae78bcf22bd0aee970c0a8333728e7f7be414d4bb86f2e0936782aac70ae1dd1da5438c49deabafe5c675aa8b329932032b3e157d51be657ffcaf30bf32efd
+EBUILD boost-build-1.65.0.ebuild 3847 BLAKE2B 708fbd51c23984513df77fa1dad8b51ff228e4171d13c2657797293fada9f22dd58621c82bcee4a0986d75838308f88682e61b64cbf6425f75245c80c9467eaf SHA512 caa5a876648fb1fd0c1b17bb20147af9c5af9d4674253aa1034d3dcd91dd6e1cf277a8d9e9386e13da8b43f092825cf10ac80c9bd64d2d9ff5798a6c7bcb6d10
 MISC metadata.xml 334 BLAKE2B 09d121b81646b5e49bdeae195df0aecab1b0ca738a29c7a89e254efca4655a0a74c1a724003ece1e4cd3363c98496a16c38dda9707d6568861590c58049628e6 SHA512 bc1fa12d69f5711c380a938546914a325ac9dee1b35b2b75136144bbf90190fdc7e113a8eedf26a5c23d1564baf71f936141d71ad715ad6f212f32226601706e
diff --git a/dev-util/boost-build/boost-build-1.65.0.ebuild b/dev-util/boost-build/boost-build-1.65.0.ebuild
index 5fddbe7a45b3..f5eaeca2758f 100644
--- a/dev-util/boost-build/boost-build-1.65.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.65.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples python test"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 46a0c4e57317..6f9a5013bc59 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,6 +1,8 @@
 AUX checkbashisms-2.15.9-command-vV.patch 1269 BLAKE2B 78225d721d72871dd5512f2adc3f2d6e12c6aef55c5b712f925ecd4555eb5ebc26b865f17ee02181f1b01aa22b4cee8ff66afbfbbc69e1b337c7a6bacf129dcc SHA512 7b7966b2c5fc672b0a83f7949076af536a56e910853374b2ee876ad5032f847bd87c7d10c7836d9699e2a4412709b02f5769685acd392e94704549de639ea995
 DIST devscripts_2.17.10.tar.xz 706396 BLAKE2B 711a991bc958782e0003fd32b947dee8df829d5a3e24268160d1a507b39dea34d9e4ead3999103850c4388f2e4185f655c09c8d5f25d422107bef18eee9d0498 SHA512 eb2bcd29237696e0e768d2513fa895891cb2b368c41c6d611ad7db815400b22317324b8326d4e71b1ab511a8a7abafdf0a2f2641da955034ae58b3d4aad3fc77
 DIST devscripts_2.17.11.tar.xz 708508 BLAKE2B 54f9fccf54a760da1ce9619117040033510a48da815380f0e05beb4fb44a5d8ab9b959328fea11665b66ea36ce56a7810ac52a4010768a8ccf9753c4337c0703 SHA512 bcce427b551ba1ee19b794e4a8243ae6c8efdf7fb6f108b7cd0e43a93ce9a12bee99800fc40c2b8a2bbf6451adceaeadf6042752fa2e404cad2d014ff03474bf
+DIST devscripts_2.17.12.tar.xz 712676 BLAKE2B a0d04f042d5337ab89e5cdb7f16b4de306052e1f7517ed05ff7fab447d8425b44a37941e7672c69f36ce93b3c73c06d706bb6c0e8c0932d626789b0d141193f1 SHA512 21de10d8742c3f2c3c83fc2660ccb7aed112e78c7a7857de62c0fa1b84d7c03a9e488b60a291e5529e3c5632c3f5d206dc11e88ac133a7e84632e1885041e3c5
 EBUILD checkbashisms-2.17.10.ebuild 893 BLAKE2B b193886aa15f2deff05f513dd624bd72c00b8bcdb859ebb035abcc15ea711d034c06105d160bb851602c3ce0729ef30940aa1fdc7ec89d88d25be3141b806f7d SHA512 e4b7e855f6968adf3408c2ac96325833100c63c5ca51e9b81c0d4f679fa8e0a5e53a1ecb13b6f9dc643356ae8591da336d7fbb1bbdaca68809db9f63e8880e2f
 EBUILD checkbashisms-2.17.11.ebuild 895 BLAKE2B c2edf098e6795cfe7a59a2b73c74446886a1f120450a35469d85337c18bc6e6575c23ad52dd69f9e3cec2e0fb1d2d5184bee14de0d18d2720142829af48ad4c2 SHA512 6ae231efbf1bae391b85ca23bf231c66205bd4349014ececb8d22691882d6dc6593787745a79eb686238df10f4921daa41b65b7fc3438cfbd975f0a39ee0f986
+EBUILD checkbashisms-2.17.12.ebuild 895 BLAKE2B 52481361dbca66b0c706e80bc264dd3a8a15f461819df7ccb188c46d17e3aeb0a5e2de6833912e846ac0e21eae3e857486def02a07b95bf28c0d93822fc11c43 SHA512 f0a1ce1e79e0a480c1d901863a834b177cdc48b1457512f7904b0ec8ca1313767971f75d1f8a466e08f1d22f38a47656a64c372956b430c5131a67d473e6f7d2
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.17.12.ebuild b/dev-util/checkbashisms/checkbashisms-2.17.12.ebuild
new file mode 100644
index 000000000000..be58ae776f20
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.17.12.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="devscripts"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
+HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
+SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Requires python packages to check tools we don't need anyway
+RESTRICT="test"
+
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long
+	!<dev-util/rpmdevtools-8.3-r1"
+
+S="${WORKDIR}/${MY_P}/scripts"
+
+src_prepare() {
+	default
+
+	eapply -p2 "${FILESDIR}"/${PN}-2.15.9-command-vV.patch
+
+	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	newbin ${PN}.pl ${PN}
+	doman ${PN}.1
+}
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index c2f3d947bbae..98224f0f9f86 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,5 +1,3 @@
-DIST devhelp-3.22.0.tar.xz 491908 BLAKE2B ef10aa5030aeac01458e4762694bb7e9d51d2ca1b086de52a4c62b604a437c67eafab63f3b336fc8f0102b4eb0806a31f0bc0a48a4e70f06b15eb95576e881e5 SHA512 16d9853c4514d7b28381e3755e34682a2e9d64d666bb7d39094289d4990eb981efac041b7bf7f8beef5a018cab71c461ecd4e7b7a099fbc132f5b8f7b79749dc
 DIST devhelp-3.24.0.tar.xz 615460 BLAKE2B b81ac9b1453c0edff45fa746a556343345a150c6436d68db4d51f716704eca70e7aa1af4f3deb5b5c2747db65de619be119f36af807490aa8f95fd070c68cc39 SHA512 56b1eeaf9d3c3357d3140002bed5c29bf7b21953d964405190a1c9cad69d08000efa0220bbc36c67db4151b15ee37c37e061e6fa63c8a79f626e1ec0ce386062
-EBUILD devhelp-3.22.0.ebuild 1455 BLAKE2B 9e2e0eb968f08fdcc02a739f59a9c860d834d3a3a1494f37c77a77edb31a73b80d3ed2f48527605283b644250a092b6865cc626c1ecd406b8e03fa9f1517c264 SHA512 3f5d630349d6eaadb41b14b3069dca5d87ac480758624844f56ff30a62172f37e6baf2dac562fea76aaf3a1b88fbc9d6249e997378894a8404c655533617a7ed
 EBUILD devhelp-3.24.0.ebuild 1620 BLAKE2B 3109dbca3591f2b8f5a3ff5bfeb8389bc91a0e07519892f900d68810f2a4780ffacd473f48e8fd79a6b21780da592a815504aa73cf0981f89a64c426770a2974 SHA512 886e1203fd56a94d812e5c870841b2e0078738299860fe70b861a6b9e0a7d4b9787242967c8fab66ac745f1a7b32d8bcce8add9f6e44cddcc636c8df7b525663
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.22.0.ebuild b/dev-util/devhelp/devhelp-3.22.0.ebuild
deleted file mode 100644
index 4630ddc6af96..000000000000
--- a/dev-util/devhelp/devhelp-3.22.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# gedit-3.8 is python3 only, this also per:
-# https://bugzilla.redhat.com/show_bug.cgi?id=979450
-PYTHON_COMPAT=( python{3_4,3_5} )
-
-inherit gnome2 python-single-r1 toolchain-funcs
-
-DESCRIPTION="An API documentation browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
-
-LICENSE="GPL-2+"
-SLOT="0/3-1" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="gedit"
-REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=x11-libs/gtk+-3.19.3:3
-	>=net-libs/webkit-gtk-2.6.0:4
-"
-RDEPEND="${COMMON_DEPEND}
-	gedit? (
-		${PYTHON_DEPS}
-		app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+[introspection] )
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use gedit && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if ! use gedit ; then
-		sed -e '/SUBDIRS/ s/gedit-plugin//' -i misc/Makefile.{am,in} || die
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	# ICC is crazy, silence warnings (bug #154010)
-	if [[ $(tc-getCC) == "icc" ]] ; then
-		myconf="--with-compile-warnings=no"
-	fi
-	gnome2_src_configure ${myconf}
-}
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
deleted file mode 100644
index 6b7a351be615..000000000000
--- a/dev-util/kdevplatform/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kdevplatform-5.1.2.tar.xz 2051776 BLAKE2B 3e7e91d5438b8a528e640671418399d302c8c9ee96d3e98cfe2ab68e64be63d7af98b1f4f11e512e9e79e17cddbd75731528d7dd9deab52c753a9f5be7dbce8e SHA512 cba58144b1c431789c6ceedee673f365af411a185944c5f6e2d8a8f46bf8bd817de0bbbb454d8ee6c2db28675a78940cb4293bb5e6430bdce77e4bd98e335889
-EBUILD kdevplatform-5.1.2.ebuild 2836 BLAKE2B 649f666faca1af531ce295e83771ab5e9b468525d2dfed0f894a8a3e6f6478f1de70678fd61b0dd68af3d8da168ea4a99ed486c9544eea7ac1102ae550891e13 SHA512 ecd1eb3c9b7b3c15d5a0b0fd4f31e6678403e322a31d19ab10930560db603eadcdc9a9c5975f7ee5da215accf3c0643c0af3969a09c97fc8a97522b46447c4fd
-MISC metadata.xml 421 BLAKE2B 7d76fad463237aca93b41fbf9a43bdbde848c5a0885b9b1a504a74500da9e1c04b9a9f0eb2ed17ad3999d435e9101880d4dfcd7767bce19b94717d26dc103486 SHA512 78367015dc92cfc16e5f10e2a57530e891339dcec777763f58d2ded933655c875c1e83402fa81a1c902a5c0765d7d43b00e2bb138b26148061d6584173681490
diff --git a/dev-util/kdevplatform/kdevplatform-5.1.2.ebuild b/dev-util/kdevplatform/kdevplatform-5.1.2.ebuild
deleted file mode 100644
index 78bfc95f5b5b..000000000000
--- a/dev-util/kdevplatform/kdevplatform-5.1.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.1"
-KDEBASE="kdevelop"
-KDE_TEST="true"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE development support libraries and apps"
-IUSE="cvs reviewboard subversion +welcomepage"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep threadweaver)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	reviewboard? ( dev-libs/purpose )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-	welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	cvs? ( dev-vcs/cvs )
-	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
-	!dev-util/kdevelop:4
-	!dev-util/kdevplatform:4
-"
-
-REQUIRED_USE="test? ( welcomepage )"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-	# root tests subdirectory actually does not contain tests, installs stuff
-	if ! use test; then
-		sed -i -e "/add_subdirectory(tests)/ s/#DONOTCOMPILE //" \
-			CMakeLists.txt || die "Failed to fix CMakeLists.txt"
-		sed -i -e '1s/^/find_package(Qt5Test \$\{QT_MIN_VERSION\})\n/' \
-			tests/CMakeLists.txt || die "Failed to fix tests/CMakeLists.txt"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_cvs=$(usex cvs)
-		$(cmake-utils_use_find_package reviewboard KDEExperimentalPurpose)
-		$(cmake-utils_use_find_package subversion SubversionLibrary)
-		$(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/konsole" ; then
-		echo
-		elog "For konsole view, please install kde-apps/konsole"
-		echo
-	fi
-}
diff --git a/dev-util/kdevplatform/metadata.xml b/dev-util/kdevplatform/metadata.xml
deleted file mode 100644
index 3017fcac6063..000000000000
--- a/dev-util/kdevplatform/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-	<use>
-		<flag name="reviewboard">Enable reviewboard support</flag>
-		<flag name="welcomepage">Enable welcome page, requires <pkg>dev-qt/qtdeclarative</pkg></flag>
-	</use>
-</pkgmetadata>