gentoo resync : 22.05.2018

18 files changed, 264 insertions, 70 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 0a75db7c131f..3fafa54c60e6 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 145541c53dcc..8d237f1c8b13 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -1,7 +1,7 @@
 DIST bazel-0.10.1-dist.zip 92973197 BLAKE2B a1d681407e2c72a57b3dcbb5e2afc49e59670be65da3d7d038dc3b8593bc0ab5b4a06c8dd8fc8a617a92eef2fc26a049b6de9a1eab0d05f31efb2fbeeb9ce711 SHA512 1894c951fd39a084011f89dd0d458e182525c2bfd6c80da071865e981e21a8c2b8363530ab53af18e6deae4a488744d6d2b7a5a4acf04715c2e26560a01df707
 DIST bazel-0.13.0-dist.zip 90105262 BLAKE2B cb065025524123babef187bac2e1f54f43645d08cb1282a5fe8f8c8b090e595570646072e2380836e2c43403f7953f97321becc24b743d7b9ab43ad208cf2c2d SHA512 3c128e551cff1b685250a68892ca3e1ad6be8b152ee2b8eb527c94adbb8fd50c70e703a363bb938916275030ddb14d756c14e4dc238e7a7b40289c700c5d53c7
 DIST bazel-0.7.0-dist.zip 84669893 BLAKE2B 2f8bbe3a48224a797bdebdaad8f7c403c8b0232ada5eee8c8619f241e9670dda311b9280f48b5e2013079f959891d94f55aee2af0dfae9fc4f6a486663fa245d SHA512 039ab6a04fd4422bd14503187e6cc0d07301723b3ecae906606fa12ccea72190d82237899c103c1adfdf05dc8672887790780ddfb4cce87cd590adbde3d3f6d4
-EBUILD bazel-0.10.1.ebuild 2006 BLAKE2B d504972b5370261cdd09db5fd2e7f2cc87c0fcc0d256659c73b3c2114f8db095371456f2bd7e6367b23c6f91d22326e7041516e8d439489417fd21f1b02bcf93 SHA512 695034a4ee0a490b4f68371b60ad6b1864be19adf166b6d6d9dc5cf367767101862e5d207e91f2565bf0597345d0ce9a29db8d3aa198c49b54d8557fa300b375
-EBUILD bazel-0.13.0.ebuild 2006 BLAKE2B d504972b5370261cdd09db5fd2e7f2cc87c0fcc0d256659c73b3c2114f8db095371456f2bd7e6367b23c6f91d22326e7041516e8d439489417fd21f1b02bcf93 SHA512 695034a4ee0a490b4f68371b60ad6b1864be19adf166b6d6d9dc5cf367767101862e5d207e91f2565bf0597345d0ce9a29db8d3aa198c49b54d8557fa300b375
-EBUILD bazel-0.7.0.ebuild 1977 BLAKE2B 3ea58cf2048b9825a17a01853d56f1f28cd2b84e14137bb4ef52d1d895c8351723447ae15e9ac379c21b8cd658bd21030058045aede3415bfac4c2591859b4c2 SHA512 1ebbd3512a16af79b14cec5e365dd43cc280356cd9fe1bd9af10db2f81fc69ddabd337cab48a960731c9d5a9cde0d4fba8ed1cdf57356d9603b6a959edb67e76
+EBUILD bazel-0.10.1.ebuild 2099 BLAKE2B 33d61adacde597d2ce03a8d6ec40d56d774a48f542cc7eb72b5cc407389870b17773468b7164608294239c91d8cc9b346e4720da6770faff8d05884cb45c4672 SHA512 5d6d77837f203d2b4ed377a776935d21519605d06281b9abb906db4844f31beb40caa5d283537c94fe147b8d3d1f3b0de6142b28310f929da609927822c9c14d
+EBUILD bazel-0.13.0.ebuild 2099 BLAKE2B 33d61adacde597d2ce03a8d6ec40d56d774a48f542cc7eb72b5cc407389870b17773468b7164608294239c91d8cc9b346e4720da6770faff8d05884cb45c4672 SHA512 5d6d77837f203d2b4ed377a776935d21519605d06281b9abb906db4844f31beb40caa5d283537c94fe147b8d3d1f3b0de6142b28310f929da609927822c9c14d
+EBUILD bazel-0.7.0.ebuild 2070 BLAKE2B c9e36a90c5d0233f282608f645db158d5449a2d2305209ff5b2268fb64d8208295316641123fe749446b2775098b7da38ce0fe753af959599995ebb24508cc39 SHA512 25e3293a33aae17cfbe2b4f7c3106bac1ff4362e72bf6becc4cd040088d9dab2cf64b3dca61d5de80631f00925f89a2a3aa24f49ac7520af50dec00181aae0f1
 MISC metadata.xml 703 BLAKE2B a019fea848bd86537d64d63746c1d7459ec1b511ac77c0c8ca9caee9e2b888ad99c15cdb5aca00ad6d6bbbfcfb5a2da05632af4d67b40d231e2234484f2eeb11 SHA512 46c1f55e4949ef3b7d42d769e31e34fcc9bffbe4b36cf6a467a514f8471325597d417f3da5ff955203fdc880531502969cef4fcedb4536cc7bfc64d2b7e50c5d
diff --git a/dev-util/bazel/bazel-0.10.1.ebuild b/dev-util/bazel/bazel-0.10.1.ebuild
index 5a238c7915f2..bb11e0536acc 100644
--- a/dev-util/bazel/bazel-0.10.1.ebuild
+++ b/dev-util/bazel/bazel-0.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit bash-completion-r1 java-pkg-2
+inherit bash-completion-r1 java-pkg-2 multiprocessing
 
 DESCRIPTION="Fast and correct automated build system"
 HOMEPAGE="http://bazel.io/"
@@ -36,11 +36,12 @@ src_compile() {
 	# R: /proc/24939/setgroups
 	# C: /usr/lib/systemd/systemd
 	addpredict /proc
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)"
 	VERBOSE=yes ./compile.sh || die
 	# Use standalone strategy to deactivate the bazel sandbox, since it
 	# conflicts with FEATURES=sandbox.
 	echo "build --verbose_failures --spawn_strategy=standalone --genrule_strategy=standalone" \
-		> "${T}/bazelrc" || die
+		"--jobs=$(makeopts_jobs)" > "${T}/bazelrc" || die
 	output/bazel --bazelrc="${T}/bazelrc" build scripts:bazel-complete.bash || die
 	mv bazel-bin/scripts/bazel-complete.bash output/ || die
 }
diff --git a/dev-util/bazel/bazel-0.13.0.ebuild b/dev-util/bazel/bazel-0.13.0.ebuild
index 5a238c7915f2..bb11e0536acc 100644
--- a/dev-util/bazel/bazel-0.13.0.ebuild
+++ b/dev-util/bazel/bazel-0.13.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit bash-completion-r1 java-pkg-2
+inherit bash-completion-r1 java-pkg-2 multiprocessing
 
 DESCRIPTION="Fast and correct automated build system"
 HOMEPAGE="http://bazel.io/"
@@ -36,11 +36,12 @@ src_compile() {
 	# R: /proc/24939/setgroups
 	# C: /usr/lib/systemd/systemd
 	addpredict /proc
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)"
 	VERBOSE=yes ./compile.sh || die
 	# Use standalone strategy to deactivate the bazel sandbox, since it
 	# conflicts with FEATURES=sandbox.
 	echo "build --verbose_failures --spawn_strategy=standalone --genrule_strategy=standalone" \
-		> "${T}/bazelrc" || die
+		"--jobs=$(makeopts_jobs)" > "${T}/bazelrc" || die
 	output/bazel --bazelrc="${T}/bazelrc" build scripts:bazel-complete.bash || die
 	mv bazel-bin/scripts/bazel-complete.bash output/ || die
 }
diff --git a/dev-util/bazel/bazel-0.7.0.ebuild b/dev-util/bazel/bazel-0.7.0.ebuild
index 4684dc2d3b48..0a5efcceeb51 100644
--- a/dev-util/bazel/bazel-0.7.0.ebuild
+++ b/dev-util/bazel/bazel-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit bash-completion-r1 java-pkg-2
+inherit bash-completion-r1 java-pkg-2 multiprocessing
 
 DESCRIPTION="Fast and correct automated build system"
 HOMEPAGE="http://bazel.io/"
@@ -36,11 +36,12 @@ src_compile() {
 	# R: /proc/24939/setgroups
 	# C: /usr/lib/systemd/systemd
 	addpredict /proc
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)"
 	VERBOSE=yes ./compile.sh || die
 	# Use standalone strategy to deactivate the bazel sandbox, since it
 	# conflicts with FEATURES=sandbox.
 	echo "build --verbose_failures --spawn_strategy=standalone --genrule_strategy=standalone" \
-		> "${T}/bazelrc" || die
+		"--jobs=$(makeopts_jobs)" > "${T}/bazelrc" || die
 	output/bazel --bazelrc="${T}/bazelrc" build scripts:bazel-complete.bash || die
 	mv bazel-bin/scripts/bazel-complete.bash output/ || die
 }
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index dd671ab36f2c..458df8c765ca 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -15,10 +15,12 @@ DIST cmake-3.10.2.tar.gz 7824452 BLAKE2B cc579f27d7d5668d1f375e7263e0b62212be119
 DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b714104dba1d470c8e1e487d8e6cc5d486febae88d4a71eb9419064bcf94f9bb2c779771323221c1f117baa693 SHA512 1ba6381321cb34c3c050548a1346d3b92d590a196d8aff7435c079cd485d01f7a6cd650ad97d00931aff424fcdc195bbaa6d9d7db679bf02f72f586c7b528ae4
 DIST cmake-3.11.0.tar.gz 7948287 BLAKE2B c56da8645d87bc06735e2afb9b8481918acd0a43e3fc96b6f58c1a311fa6a7a270a9be8d13d2106b3fcde802f8c084314717262edd760c7c7f06bd8c07f1fe69 SHA512 03b058483d236d4f4427c93cc41af77068c243fc4b6f24aeaf2daf97af215bc664bc1b733195463af4cfc94ec70076710f425661859d752ddf3b9610adca9834
 DIST cmake-3.11.1.tar.gz 7951125 BLAKE2B 157c2eac49900df554fb335c4a17484ca425a97e2c41b9539cf1f02cc09246e515d8c2b43549a7a395df378f1dd3f4757465edab6f1ea5d08d5835b6728b35d7 SHA512 d5df043453a9f9478a0e165ded6ce247a7b495fe8c4e56905bb523889a016fb8eb769455c2c2c5f6118c61bcffafe4e3e219ad99b2a85918323c2155f10089d8
+DIST cmake-3.11.2.tar.gz 7953913 BLAKE2B 2979f360fdd3727f571d84181a9f1064246871d7176cda7ca60766722eccfe738121fba498e46e502355cb54b9f88b7ec2a1a63a81688846fdc959dd7c11681b SHA512 c8ffa0885778ea942eb2533dab72da8719f67a212a33883913af047717c87368cb58e1d6c578b542d96d7dcc85d126abe81686214366c32174fd5553b399b69e
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
 EBUILD cmake-3.10.2.ebuild 5861 BLAKE2B bdbeccdd90de52f183d7a23bc70acc9bf181aec56d1d6515b0fb83d671f653acd24e847ca2eade51a083a31e2fade346d15922fba91e509596c0b312711f8115 SHA512 8661df8a255c2c7ead3c063bcf60504e587b8dde21e505e1adb5881890b4be47e18c67aa65ad14de514a2884459510405ec9656c77341d00dfe76dba4ee9a9d7
 EBUILD cmake-3.10.3.ebuild 5861 BLAKE2B bdbeccdd90de52f183d7a23bc70acc9bf181aec56d1d6515b0fb83d671f653acd24e847ca2eade51a083a31e2fade346d15922fba91e509596c0b312711f8115 SHA512 8661df8a255c2c7ead3c063bcf60504e587b8dde21e505e1adb5881890b4be47e18c67aa65ad14de514a2884459510405ec9656c77341d00dfe76dba4ee9a9d7
 EBUILD cmake-3.11.0.ebuild 5936 BLAKE2B c4db85bb1abf118c0606643fb0a3b453d9c5df8111475e37e32c2160987244afabe83bddaeebafc92f64d8ec90726545e35cb12ab537c0949b6bd1b188160211 SHA512 ba74ae4cb1c70ba0b8206a629312c0f2e0637b2585eef0acbf692d40c7519e6abb13f0091fafebb502b216ebd8eafb383fe02d1432ef2c0ee9390416aec43602
 EBUILD cmake-3.11.1.ebuild 5936 BLAKE2B c4db85bb1abf118c0606643fb0a3b453d9c5df8111475e37e32c2160987244afabe83bddaeebafc92f64d8ec90726545e35cb12ab537c0949b6bd1b188160211 SHA512 ba74ae4cb1c70ba0b8206a629312c0f2e0637b2585eef0acbf692d40c7519e6abb13f0091fafebb502b216ebd8eafb383fe02d1432ef2c0ee9390416aec43602
+EBUILD cmake-3.11.2.ebuild 5936 BLAKE2B c4db85bb1abf118c0606643fb0a3b453d9c5df8111475e37e32c2160987244afabe83bddaeebafc92f64d8ec90726545e35cb12ab537c0949b6bd1b188160211 SHA512 ba74ae4cb1c70ba0b8206a629312c0f2e0637b2585eef0acbf692d40c7519e6abb13f0091fafebb502b216ebd8eafb383fe02d1432ef2c0ee9390416aec43602
 EBUILD cmake-3.9.6.ebuild 5953 BLAKE2B db46745391e5a79484ba90e2dfa02e9dc69de0d84996b21166b53fe427555e57dbef2f37c927afcbcea9df113917bb1548fa6be15a2cce4f881678fef86ba2fa SHA512 f8f54d756d27df0d80bb2d0280af137dd41753fe999b6598fbef1a1f47fbab5e918ec4a828d7fe909ebf355dbe0956b0c746a0eee576a02df14e0fcc1c6d4acc
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.11.2.ebuild b/dev-util/cmake/cmake-3.11.2.ebuild
new file mode 100644
index 000000000000..6bab5d7c8c20
--- /dev/null
+++ b/dev-util/cmake/cmake-3.11.2.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs system-jsoncpp ncurses qt5"
+
+RDEPEND="
+	app-crypt/rhash
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/libuv-1.0.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+	if [ $? -eq 0 ]; then
+		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    Qt4Deploy, which tries to break sandbox and ignores prefix
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# disable Xcode hooks, bug #652134
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
+			Source/cmGlobalXCodeGenerator.cxx || die
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+	)
+
+	if use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/csup/Manifest b/dev-util/csup/Manifest
index e7290c3c93e2..853b89c2578d 100644
--- a/dev-util/csup/Manifest
+++ b/dev-util/csup/Manifest
@@ -1,5 +1,4 @@
 AUX csup-20060318-respectflags.patch 1374 BLAKE2B 45f3e110cc6607cf12962daf4d0a00ae831d1b91253c3a7b44be32f5523932a77eec86cdcd8f484d18461df6f4862fdb88cb28c5d8806bb4502968605f5897ff SHA512 e112fd37dae7f037e7700579ab59e8611b5f09f0d8351bd2c909e22e393b05f697a51348fab79ba95d31e28b727e62b4a4ce2f8dc22402ac16efcfa4204a1d8b
 DIST csup-snap-20060318.tgz 78968 BLAKE2B 9d257e5af438ed784402e427714fc652c5daa403f5cb2240147df5e8c68d2f81eee43da1242b80c82d6bbda3c5534e14c0d6e27ba57442d5b6c34ef1d69ed397 SHA512 60e40f6f903df81b1667af31397978ce99d33b6849dd2476232b325415a391e6840a29e70af85b928a3c7beea55cf3064d3b48d61b9c20c2280dc3f675adcd5a
 EBUILD csup-20060318-r1.ebuild 754 BLAKE2B df091d48f5382631f821da4633af208a8fcc250f13e6e19c420c1f514f17e755f949995c22dbb4daa99e50325be471b8f244346e0b7943eb048b449f573f2263 SHA512 c2257a971cac2266d2b4b197b0d1f08071613c4828eb86a0ec89061765c1c4cf76c75b2f06ff894f1f8c4375299b76566381f2acaedcca3c31be9f800af52852
-EBUILD csup-20060318.ebuild 938 BLAKE2B 907a1ad12657f91eaa506d3dcae7245cb028937127084548b54171b3c516e7f17ab5f75754a3cdca2e0405f0df5602ad96f1ab82f97ef75311b9b5ca23c407be SHA512 ff5773160544a566d8faa10c9269ff25a723932752bc2735d50796e31633598edf8c11dfdd1e028895232a58950c5a6ac7991031e4af28b5915aaaafddb1ce42
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/dev-util/csup/csup-20060318.ebuild b/dev-util/csup/csup-20060318.ebuild
deleted file mode 100644
index a551390ed1b1..000000000000
--- a/dev-util/csup/csup-20060318.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="A rewrite of CVSup"
-HOMEPAGE="http://www.mu.org/~mux/csup.html"
-SRC_URI="http://mu.org/~mux/csup-snap-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-libs/openssl
-	sys-libs/zlib"
-
-RDEPEND="${DEPEND}
-	!>=sys-freebsd/freebsd-ubin-6.2_beta1"
-
-DEPEND="${DEPEND}
-	>=sys-devel/bison-2.1"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-respectflags.patch"
-}
-
-src_compile() {
-	# unable to work with yacc, but bison is ok.
-	emake \
-		CC="$(tc-getCC)" \
-		PREFIX=/usr YACC=bison || die "emake failed"
-}
-
-src_install() {
-	# instead of using make install, just copy the stuff directly
-	dobin csup || die "failed to install executable"
-	doman csup.1 || die "failed to install man page"
-	dodoc README
-}
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
index d114134b2ce1..843f71a4e472 100644
--- a/dev-util/cucumber-expressions/Manifest
+++ b/dev-util/cucumber-expressions/Manifest
@@ -3,11 +3,13 @@ DIST cucumber-expressions-5.0.13.gem 17408 BLAKE2B 113554f5350dc289dea2a97530e19
 DIST cucumber-expressions-5.0.14.gem 17920 BLAKE2B 623b1c328703d6f9919c9fc7ffab64d26b752fe8f75d21d5ff2323aa502fe49e9b65bfb5f9f0c64c4baee3189c28e5cf05a404fd499c72fa8cf95157492a0e6e SHA512 7e44de399250d21d017a38d72e15390e9e0dc48b03755508767c5c237aebec830623428420a500bcef1bbb9db2157994b59718a731e8baca4266d1393e0b5843
 DIST cucumber-expressions-5.0.15.gem 17920 BLAKE2B 83c741f985aee1fdb316693c70f519bd82e4cb373285f0bc9976405dad143ef562cbac92263e7fbf73254713a699270cf99080ed9d3a3f85a6b982caafebeb6d SHA512 0d50975fac9b94e17f7f0388b50cf1fe98775dc34887846f72d4b1f471ff957b466b9d567fd6e0da7561860d6e2d8364c2f3490ad9e8059ee0d1cd99ebc5f386
 DIST cucumber-expressions-5.0.17.gem 17920 BLAKE2B 4b90510f296d3affa659244948913618963204f80db95043924dfdb709e0654dfb5cef55b77c048cac7e7f3cb2af4a9a49150dd77c99f9a87b68d4dbf9f54f16 SHA512 2133e53733c2e68608885df650fed6c8975e310875079ea719c5bfee7635d7b49cc1c5bcc6946ca90323243b13606222993be31bc71da55cdd091b6b93e6567d
+DIST cucumber-expressions-5.0.18.gem 18432 BLAKE2B d5728a766ac568a0a2588dc99d45364579213e97517f0ce57a954f58533230e2ac362c2664567ba79ee3404d02d2a7811986dc66e6a8365572978da5832e1a96 SHA512 4016248cf116920512895a874f67331a84f782dfbe560dd4a9d64ef001fa8d66ea2663b96dce8e2fb561fd533e6a8a0d399dcb923cba451cc452f15c571e3288
 DIST cucumber-expressions-5.0.7.gem 17408 BLAKE2B 1f958063f276154bd75485e1f2b9beabfc41d26e4029ca7a7e89d6f6d81dc25bbd69626920dfbf1a9323f65b6eea105dab328f06daf15c290a11ea0c86dc69e4 SHA512 af83d028df20ac608ce3fd85850da451f1ec76de688f1d0bc71c1e6a0e70cdbb15f4df6710cccf6b736426f9a547b5a5ae0bb860cd626291237c2bc11371a24f
 EBUILD cucumber-expressions-4.0.4.ebuild 479 BLAKE2B b6d58cb994fcc741ba5c6f8d26531d01530c26803df4ef3a914882bc9eb440a9da4c2b84a593a622807616b8e2bb82191b827f08facad37521d83840bc53e6c3 SHA512 43d857be0ad1cf4cc39ce9852c8d032b65607331eec1402ed7f0ec92524621ec34bf4c2213e8c2bccc0763311a06b0db38b205baf13219cf8d49b63eb52b8f9d
 EBUILD cucumber-expressions-5.0.13.ebuild 479 BLAKE2B b7b1e29bb64e1bbc364b087cc8b5ff518fd17b1a8fbb47701e009f50782cc75b46b31a90ad513443e39c82efea30a14571a2fd72b64290a9d7f8116755228ff8 SHA512 2814a2862d56e9635b0065f0bfda264a93494dcd9f57d7df70c4bf03494b9fdbf95eda5f95e739f98b7b28623c2058445bf538efd31338b8c00d9f1160138daf
 EBUILD cucumber-expressions-5.0.14.ebuild 486 BLAKE2B be168b3065f738b734d610906cd70d4a78ede9d9f8ae244518d5c52ce8a3a9711a161a5b95439865c8a98edba86429d523f29430bc5aee3e712688381e0e5e6f SHA512 37280514dfabd2dbff86634558be5109245ebc799a860eb86616cf49b80f6cf4820502ef036732b42faf72abd6e8964a4829479891ba82e22c1093fdac80d33c
 EBUILD cucumber-expressions-5.0.15.ebuild 486 BLAKE2B be168b3065f738b734d610906cd70d4a78ede9d9f8ae244518d5c52ce8a3a9711a161a5b95439865c8a98edba86429d523f29430bc5aee3e712688381e0e5e6f SHA512 37280514dfabd2dbff86634558be5109245ebc799a860eb86616cf49b80f6cf4820502ef036732b42faf72abd6e8964a4829479891ba82e22c1093fdac80d33c
 EBUILD cucumber-expressions-5.0.17.ebuild 486 BLAKE2B be168b3065f738b734d610906cd70d4a78ede9d9f8ae244518d5c52ce8a3a9711a161a5b95439865c8a98edba86429d523f29430bc5aee3e712688381e0e5e6f SHA512 37280514dfabd2dbff86634558be5109245ebc799a860eb86616cf49b80f6cf4820502ef036732b42faf72abd6e8964a4829479891ba82e22c1093fdac80d33c
+EBUILD cucumber-expressions-5.0.18.ebuild 479 BLAKE2B cd32c66f95ec375ed5457e7ef41cf01537bc7074628379c887d39930c6ba8e999c0bfe85f3894ab0db0350912085eef5b53a26fe1e6d78010f01cb5316f2316c SHA512 02a0b11ec9e2e6de1178eebdc91b3f93fa6d6f834aed8f6e5fc969ef482653a8684ac84e26ec619fd53af74db2d8544745c3164fe6a1d3fe247bc081d1f4d131
 EBUILD cucumber-expressions-5.0.7.ebuild 479 BLAKE2B b7b1e29bb64e1bbc364b087cc8b5ff518fd17b1a8fbb47701e009f50782cc75b46b31a90ad513443e39c82efea30a14571a2fd72b64290a9d7f8116755228ff8 SHA512 2814a2862d56e9635b0065f0bfda264a93494dcd9f57d7df70c4bf03494b9fdbf95eda5f95e739f98b7b28623c2058445bf538efd31338b8c00d9f1160138daf
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-5.0.18.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-5.0.18.ebuild
new file mode 100644
index 000000000000..20efb11a7f95
--- /dev/null
+++ b/dev-util/cucumber-expressions/cucumber-expressions-5.0.18.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a simpler alternative to Regular Expressions"
+HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+SLOT="5.0"
diff --git a/dev-util/flawfinder/Manifest b/dev-util/flawfinder/Manifest
index a9ad384a71d1..e5db1746c548 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -1,3 +1,3 @@
 DIST flawfinder-1.31.tar.gz 174148 BLAKE2B f545a9d4dc8c0a9d7ae34fb5b26e06eb7c40a916155fdd738e4d56b6fccee4af1941935b6847d5f6c8f968ba45e95a8e9b44e5723b11a9c47fce725d1c27dcf1 SHA512 880919a05dbf0e29055f052b88c8bbfd403105504749bc65fb17675e6ebe0d84f9cd367e7a6efc68dc0d9209e0938185da4718b70f484007c507fe96b83e0355
-EBUILD flawfinder-1.31.ebuild 722 BLAKE2B dfd92376b2606ee86abb5df697306affd9791d959f07435097b2664b3a52bbdeea64fefa4a1b989ca43b01be8562c4a809b8c13091c5ffb63d0dbfe9b5eab355 SHA512 337161a96385fe1c93ab4cd3287cde8f919b0749c8a2e5435baca94b0cd3fe7db152dffc2deee8fded56e41aa62f12a9e6b4d5b02ce8488a221da0dd7f99a4c7
+EBUILD flawfinder-1.31.ebuild 724 BLAKE2B 4441a55be26ce38da31944675d0203dac0028b27acbf99dadc1e733114d8e6a80500aa0c90a592f89b188831faa1ffc1160a7f11e96a7b940f9af01f518e164b SHA512 d4730fd182db2bcd39ff3b44c0036fa4dfd00d26b98ff5732c03d89980de5ced3a9a955d926dcf40f1afb829839f5aab0f635d4a60464d15fb603bc7190eba39
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/flawfinder/flawfinder-1.31.ebuild b/dev-util/flawfinder/flawfinder-1.31.ebuild
index 6faab65e58ae..6ef0a76bccb4 100644
--- a/dev-util/flawfinder/flawfinder-1.31.ebuild
+++ b/dev-util/flawfinder/flawfinder-1.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils python-single-r1
 
 DESCRIPTION="Examines C/C++ source code for security flaws"
-HOMEPAGE="http://www.dwheeler.com/flawfinder/"
-SRC_URI="http://www.dwheeler.com/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.dwheeler.com/flawfinder/"
+SRC_URI="https://www.dwheeler.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 42c910fbae75..c3b38987d655 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -3,7 +3,7 @@ DIST meson-0.45.1.tar.gz 1163287 BLAKE2B 820ab763193322c75ebf3a79cd38f49f9fa06f9
 DIST meson-0.46.0.tar.gz 1200258 BLAKE2B 8f1fdae2456d262abff6078084c8f3ca7a4163e709fe9cdf99fad4b9f42ee42750e66db4dd66728df5c26f2622b9a55388f6c165cbcc022513622df2ebcf7d72 SHA512 f2985bfd19477c2f6cd773d7cd0453084e850c0924e110261dcfe183d1534d9d1098ca032fac050d3913893c94a20a2277daa1c12f0cee4fe368a91d136a0c15
 DIST meson-0.46.1.tar.gz 1203731 BLAKE2B 3b6b78e24a4d1ff3166db5546dda80e8b29236babec51fd5f1e70ba4139f13c4e7b6d2985daccf9ef1bc2e33516b1278ab9c9ea4c7fce775d187450c2498dc76 SHA512 beacd5431f9d6abd85a72b2609cbd913f67829b2eef4712a5b9a151e2d0cad6e2c16b5e42819b93f986705305ed874d26211c315aa930b1695552a9e30de8b98
 EBUILD meson-0.44.1.ebuild 923 BLAKE2B bd78fd51af575678067d4fad1c4c240fb4582607ad1dd0eb9bc2c114ac61942956bc93b2b419bbf95edc0c6c7ba4326833aa01a39036a67bf0ff504e4b9054a5 SHA512 3b69e8a6d79476bc93185865c6795b239eb8c4b91d6aab48b8fe6dfb14288e7c53b59ec2418795270f1901debe0ebdcf1167e5817bffb37b62cb6f270df9a4a9
-EBUILD meson-0.45.1.ebuild 930 BLAKE2B 154e8d5e22c8373beaa69f3de30211b1b7ddf7ab903bcad89c109b906d8e871b299c64986601810a9e1a439ea64052b9bda9384ff17ac8012e9dee83c1da597f SHA512 19e017ab667339e0a5d3ac8b1a58130b2b43e342bee5323abbb765bd359bf242705d7f8a799a7e0ae7c5bc22016329685fe0a7f2cca9a2a77a0857ac874d4926
+EBUILD meson-0.45.1.ebuild 927 BLAKE2B f0b6b44ea26a22027bf53e448bf52ec9467ba152ea547d7222ce7a8fd4cc8f5ac0679621628f95a50a53d62528a10c346822f5e6535559964f43ac2549ae303a SHA512 1a24410ec9b34bbea207abc912a41a4b452f149c490fbaea78c81ddeb84d65679182742ef8685a8edc4ae62fc3b0395d540ce9a2af3dcbe972b0a74f6678899d
 EBUILD meson-0.46.0.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
 EBUILD meson-0.46.1.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
 EBUILD meson-9999.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
diff --git a/dev-util/meson/meson-0.45.1.ebuild b/dev-util/meson/meson-0.45.1.ebuild
index d788579bfe88..cabc6b2b4e6d 100644
--- a/dev-util/meson/meson-0.45.1.ebuild
+++ b/dev-util/meson/meson-0.45.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/obs-service-meta/Manifest b/dev-util/obs-service-meta/Manifest
index 3c5be576cec8..6fd1cd53811d 100644
--- a/dev-util/obs-service-meta/Manifest
+++ b/dev-util/obs-service-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD obs-service-meta-1.ebuild 962 BLAKE2B 4077ece14262b50049e24bc6f07f1b5240c5346d1fb1b397cba662f1e797850a4aa6b9249dd0c7c9b9050c5793d83f301e1495ef632c3644bb365b38b2724cc9 SHA512 bf62281d590f8ae898d768e4e17b95d02dc88eea838f0223f1b27d9b289b9dba6450460c705f447af6a6d1921ecdd8e37f3a9eea3a5cac581f6efae55522188e
-EBUILD obs-service-meta-2.ebuild 1105 BLAKE2B a81536911f3b6556e477ce986e61d84823e0c1b5aa359a589330f3fc6140d75797ffecbd74b4603a0ab9ed35a52037eff0e33a930511252779e8ce0f2b41b334 SHA512 c273c3b47355120c7b829885db2dbe07d9719d748eed913f17f7305fec23c566bfa19deddcc3d8719394eaf9e383213c85ed9f4aa405e0464fc7ebbdf8fcc54e
+EBUILD obs-service-meta-1.ebuild 963 BLAKE2B 7bb96e80dd9d9a1224ad6bcb679376e5ffc644f6c32fc5f9f3cdecfe0a16f312a56916049592e1ed5370462a58b3d8d7fdb7acd1599463471c982feb9c9a87d1 SHA512 72c265562247aa26cb837b44e71ffe7bfba602266711761aa24add9d41be61569b3246bf3f28db2009d1d3f7db6ea7e726b8f5cdb24f3ea141839cf7efecf651
+EBUILD obs-service-meta-2.ebuild 1106 BLAKE2B e0b3acbe8b5a2fb751bc3e8dded592b52b84c7c105a4c6a7ab84fe60f68cbd5255e22691a19324e3065fc889fad50dfbd8ab7d2a7eb3a2e15dfbd3cd847052b5 SHA512 0ba04465a112412e57d8fe5ec6762d466cc020d8b480c13749668df528f703cff64147769cf970c7eff96d6ea889ed5682771f2aee7037b77aa0909de1bb8b4e
 MISC metadata.xml 430 BLAKE2B 35bbe8e34562680edf5a62049fb63dacf82cca405e0ff782189d43f6ee3b5f138c21185383ddc652abf4451dff5db5c3f7910d4f7712157cfb1cb4219079a42b SHA512 02ec9efc9cc663b49d26135f1651abdb732b2850a2bf311fa16bc137364a15cd8762391a14e46c38f005dec215b9392026ad8ac085ba21e57be52d5406df2333
diff --git a/dev-util/obs-service-meta/obs-service-meta-1.ebuild b/dev-util/obs-service-meta/obs-service-meta-1.ebuild
index 8ecafcd30405..bf4526b1dbe5 100644
--- a/dev-util/obs-service-meta/obs-service-meta-1.ebuild
+++ b/dev-util/obs-service-meta/obs-service-meta-1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="Metapackage to pull all open build service services"
-HOMEPAGE="http://openbuildservice.org/"
+HOMEPAGE="https://openbuildservice.org/"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/dev-util/obs-service-meta/obs-service-meta-2.ebuild b/dev-util/obs-service-meta/obs-service-meta-2.ebuild
index baa4befba8cc..787e83740747 100644
--- a/dev-util/obs-service-meta/obs-service-meta-2.ebuild
+++ b/dev-util/obs-service-meta/obs-service-meta-2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="Metapackage to pull all open build service services"
-HOMEPAGE="http://openbuildservice.org/"
+HOMEPAGE="https://openbuildservice.org/"
 SRC_URI=""
 
 LICENSE="GPL-2"