gentoo resync : 04.05.2019

3 files changed, 2 insertions, 48 deletions

diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index 61a7dfab255e..5c857fe2e8d0 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,5 +1,3 @@
-DIST makedepend-1.0.5.tar.bz2 143498 BLAKE2B 78a7911e1a433bd2839c2d1372883928dc018a2576781cc8e01ffea3d06ecaab494c11a9eb36045b36091f51c6363d4a903562431256abbab26dfbe7b3fb8289 SHA512 e28d71c3ce4f74ca6479771fcdd123c19ab18e3f2aa690a7798237f21f13fca4c4d66d7b7b1d708c2c214b8e17f8fe37e6cf5b75a4d2b88514c50addea2600cb
 DIST makedepend-1.0.6.tar.bz2 147616 BLAKE2B 6e9538e435d602ab3bcfb35a5398d6f11a23e4c9fa19bb2e3f651967d3fb1945557af2a5d84fae3e46112aae9ec411894cf8605e4856a46b120b660ff4b95ea4 SHA512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42
-EBUILD makedepend-1.0.5-r1.ebuild 1009 BLAKE2B c1b1dd08ebb9e2eab8f5abcc6a146c57e437798d650cb9258b8842cfc900975c00988b913e747799b7bf14a1296d7044a9fdc5f94e85fdeeb3b2252049bfef0c SHA512 47f120c4e76b28a0e7c5e1edac6ba5c60c7122def70a13cfd436afa6a1026cb908b3532baf5cb492875b33f1c0b2e560c5f0490e05a9b9c9f0c7ceddd9e3614a
-EBUILD makedepend-1.0.6.ebuild 441 BLAKE2B 35b74d8c4c5a402f48d118119813714b37be876ca0e68968e04ee807772c042e5bb94f47d8b0ca2ecc9e83ccdb2d00fc51968a471fb36ba8964ffc5b179b6249 SHA512 387575bc27fa5bfb6c38a7989aebf3486bc42766608346e9e67c85f3b81a92052ae1896d436bc47c2394f8a05a3e3101d52ca7017ef19265752e1fc8487d5e24
+EBUILD makedepend-1.0.6.ebuild 438 BLAKE2B a5846b4c23cf93d392b95c7157bc20bf5c8304ddfe25524b4535bdd56f2de9afb9bd01487a7c2ba6d222a536bdbcc1e1b257d2c213d2094cb8541a19b96ecccf SHA512 4ec9434da71002de86cb6f0bda41151136558298d9be9a420152f656eeddf1a486c1783ba4e123a860468e50ca771ec3ffb880297a5a837fa5725e8db548e154
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/makedepend/makedepend-1.0.5-r1.ebuild b/x11-misc/makedepend/makedepend-1.0.5-r1.ebuild
deleted file mode 100644
index 6dcb3c505d78..000000000000
--- a/x11-misc/makedepend/makedepend-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="create dependencies in makefiles"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/makedepend"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/util/makedepend.git"
-	inherit autotools git-r3
-	# x11-misc-util/macros only required on live ebuilds
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND=""
-DEPEND="
-	${LIVE_DEPEND}
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--disable-selective-werror
-	)
-
-	econf "${econfargs[@]}"
-}
diff --git a/x11-misc/makedepend/makedepend-1.0.6.ebuild b/x11-misc/makedepend/makedepend-1.0.6.ebuild
index 63e6f46c4964..7a08a112104e 100644
--- a/x11-misc/makedepend/makedepend-1.0.6.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.6.ebuild
@@ -6,7 +6,7 @@ XORG_STATIC=no
 inherit xorg-3
 
 DESCRIPTION="create dependencies in makefiles"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""