gentoo resync : 04.05.2019

4 files changed, 2 insertions, 74 deletions

diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index 0806cd91cdeb..7e5743ca8fa8 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1,6 +1,3 @@
-AUX imake-1.0.7-sun-compiler.patch 462 BLAKE2B a1b0ce3d7776e855a9fc0d819f9338c4a4adab3f2491e52c7bfe674de1509120104ea7f042b2a6a61fa30ce1d5573289c01bfa63ff0826c9d76281ed927ada61 SHA512 c6eba0da6cc37702293273d762481b522467f3cd5ae7d216f397ff47657762db78deaa0780706c2e13d0010b739067e65d09b235ab9df379430a826c95e6fed8
-DIST imake-1.0.7.tar.bz2 156543 BLAKE2B 63e7f2fcd907ba5508e9e592602bd455d66ce134f82a3387ae9cee66a6b65190e38a0207980df62c2603d060acb5f380446dc6f117c75edc9c5c6f611d98dbe2 SHA512 b3527c8fead25c6e093e1fe4a39e60ff210212dcd323e206505b9e872a3f36d9db85f85cab5a6f0fa914fa5c558ef54b499b2b13ccd66739223e4e72ef805d08
 DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
-EBUILD imake-1.0.7-r1.ebuild 1169 BLAKE2B 9a7b575c8bcef987da07ebcfa6e8d9aea73d474dded2ef0898ed414b99e40f011b4687478f346be4eb7851d168c4ed1f7ee294905021b63540d1eb74d5890b33 SHA512 674bf165c5be1520af53e7876aa45603191e80fe3a4b418c6e551e6112db3405bdb4b05525e7ab18ab2eb9164a1555070ceaf7391c113424c1ef9c0a995c0f47
-EBUILD imake-1.0.8.ebuild 488 BLAKE2B 4a83a07b4738b9f9cbe39dacb2c106ae574c8aecf0677efc0e44415992429008d662f7257ce4a947bb5f1620ffc8eb7b521fc8100b1660d027d266c930df9cde SHA512 62024bf6406b37b97f9eca10022a5259e4120139d71dd553f8a6b1568dd8375da8accaf1e28a886efe8bd302845ec3b189396974297918b423ee84cfa3e64427
+EBUILD imake-1.0.8.ebuild 485 BLAKE2B ab9a0d08589a10d0123a3d5beeeb82575078850ecd35164ba4b6a090d2d84b47f295fc6da48e00ef9bf5b1cdfcd999a6b6268108b78df05231be64c474a5c35f SHA512 887073fbc522e06e446b4e987ed55162f2146959dd83f75dc82725c6fda179e717dfb36ebdd92545759a852ba58bd37b25fc2f2ea59836d198a1335353379adf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/imake/files/imake-1.0.7-sun-compiler.patch b/x11-misc/imake/files/imake-1.0.7-sun-compiler.patch
deleted file mode 100644
index 27fe234f99ac..000000000000
--- a/x11-misc/imake/files/imake-1.0.7-sun-compiler.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/imake.c
-+++ b/imake.c
-@@ -1,4 +1,6 @@
--
-+#if defined(sun)
-+#undef sun
-+#endif
- /***************************************************************************
-  *                                                                         *
-  *                                Porting Note                             *
---- a/imakemdep.h
-+++ b/imakemdep.h
-@@ -1,3 +1,6 @@
-+#if defined(sun)
-+#undef sun
-+#endif
- /*
- 
- Copyright (c) 1993, 1994, 1998  The Open Group
diff --git a/x11-misc/imake/imake-1.0.7-r1.ebuild b/x11-misc/imake/imake-1.0.7-r1.ebuild
deleted file mode 100644
index 4d2194fb2387..000000000000
--- a/x11-misc/imake/imake-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="C preprocessor interface to the make utility"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/imake"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/util/imake.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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	x11-misc/xorg-cf-files
-"
-DEPEND="
-	${LIVE_DEPEND}
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	# don't use Sun compilers on Solaris, we want GCC from prefix
-	"${FILESDIR}"/${PN}-1.0.7-sun-compiler.patch
-)
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--disable-selective-werror
-	)
-
-	econf "${econfargs[@]}"
-}
diff --git a/x11-misc/imake/imake-1.0.8.ebuild b/x11-misc/imake/imake-1.0.8.ebuild
index 2c4382704c3e..dfa4ff1d736c 100644
--- a/x11-misc/imake/imake-1.0.8.ebuild
+++ b/x11-misc/imake/imake-1.0.8.ebuild
@@ -7,7 +7,7 @@ XORG_STATIC=no
 inherit xorg-3
 
 DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-misc/xorg-cf-files"