3 files changed, 2 insertions, 26 deletions
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index 19b40756e2b9..c731d7aa9545 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1,6 +1,5 @@
 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
-EBUILD imake-1.0.7-r1.ebuild 1160 BLAKE2B 147e956a4734d058b0460c16f25da38818b2467903a9a8218d7f497cb87ef19abe72849f67fddf0bf44c10b65fa3ea1adb838cdda8194c0cb79cdca2e3f6aca1 SHA512 95742cb8a5c43b4ad4fba7fb86f70662666011b84cdb32ffc0076e483eda7cadd7f355828e1299b8233f837740ad9ef960df38126c51106f6ff92a08d5cbe9ed
-EBUILD imake-1.0.7.ebuild 695 BLAKE2B babeab6a39b6abcdb2cfea2ad33a7a3bb904c579456aec83cd3afae75f034bb106b51edc1c14203f85a125b5580f58c5313bca6132cb7393cd1f2def734ff96f SHA512 6d99c87eb9899cb9e16bc827732fdfa4acba9e4db0d56dfdbc797976e727b3b065557748a140aa863f15489f6c93a6ca117d2a7b830d2ffcec6641358e7c4bf0
+EBUILD imake-1.0.7-r1.ebuild 1158 BLAKE2B cbc2d0a82cdc0202ef46b7c56c676edc160c0447f15ed4a92d0a771cb7674c06343d6c7b1542fe786d6cff06ffc006212cdebb7f908fa457add376a734756755 SHA512 e9aee670e8ef3ea3db798c98d01348f506befb3ad0aaec81981c9b17dffdf53a64cfe2986dd2aa5314084e8077122bc1972091a13608d14d23610b4fb24c93a8
 EBUILD imake-9999.ebuild 1170 BLAKE2B 4c9722b3260289f3244313ee6cb8cc352dfa8d419f40fc8d3332ea56916db9e66f8b40d7d911afd920ee05dc47b0493d95dc4bb0caed0e626fe39483b2b178f4 SHA512 89c11988a9d639352656d212d87e747c55d7e6fa8bdcbe34b84e45e4db08f8138d3d22fd9cf57b3fa2eccc112c4070fff0695fbbca3f28882a83139353cde921
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/imake/imake-1.0.7-r1.ebuild b/x11-misc/imake/imake-1.0.7-r1.ebuild
index df4b24e92c55..e58d443f1ed9 100644
--- a/x11-misc/imake/imake-1.0.7-r1.ebuild
+++ b/x11-misc/imake/imake-1.0.7-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	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"
+	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"
diff --git a/x11-misc/imake/imake-1.0.7.ebuild b/x11-misc/imake/imake-1.0.7.ebuild
deleted file mode 100644
index 58f52c2cf955..000000000000
--- a/x11-misc/imake/imake-1.0.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_STATIC=no
-inherit xorg-2
-
-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"
-IUSE=""
-
-RDEPEND="x11-misc/xorg-cf-files"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	# don't use Sun compilers on Solaris, we want GCC from prefix
-	sed -i \
-		-e "1s/^/#if defined(sun)\n# undef sun\n#endif/" \
-		imake.c imakemdep.h || die "sed failed"
-	xorg-2_src_prepare
-}