gentoo resync : 04.08.2018

4 files changed, 122 insertions, 0 deletions

diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index 02a12e04d1b1..a7a7a7408e32 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1,3 +1,6 @@
+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 1181 BLAKE2B 7d73f32499f52d213ca8506e8991e6fccdf74178af7948313cbbf34db04600b6bfcac3fa1d7f9a812fddb243ec2264c901007b19b4060addedd41eea706e9008 SHA512 cb8170cd71b37487b2c81608d9485e85bc09e80d12d838c55802353ad052816bfff7703ddf5b1b7ab01a362b24aef70a78f697ceba35d47d2f749ef01f2bd346
 EBUILD imake-1.0.7.ebuild 706 BLAKE2B 71e4d7544364dee5831c4c7b81f68d8ed696b19cee1f4b876fb047a27b4c329b0230c8cf10d6e2d70a503e378dc2c455d1a6177082d4c225d801d4e3aaaa1bc7 SHA512 7a66beb7081f938f47223aa7233295a7eae5d39bb6652307ffd3892ea8a2688684108fc7096ee18f3ba62d2e23f38ceff89ef99f1b07154cd59eea74aae764e0
+EBUILD imake-9999.ebuild 1181 BLAKE2B 7d73f32499f52d213ca8506e8991e6fccdf74178af7948313cbbf34db04600b6bfcac3fa1d7f9a812fddb243ec2264c901007b19b4060addedd41eea706e9008 SHA512 cb8170cd71b37487b2c81608d9485e85bc09e80d12d838c55802353ad052816bfff7703ddf5b1b7ab01a362b24aef70a78f697ceba35d47d2f749ef01f2bd346
 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
new file mode 100644
index 000000000000..27fe234f99ac
--- /dev/null
+++ b/x11-misc/imake/files/imake-1.0.7-sun-compiler.patch
@@ -0,0 +1,19 @@
+--- 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
new file mode 100644
index 000000000000..a4ee1f9952ca
--- /dev/null
+++ b/x11-misc/imake/imake-1.0.7-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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://cgit.freedesktop.org/"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/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 ~arm-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-9999.ebuild b/x11-misc/imake/imake-9999.ebuild
new file mode 100644
index 000000000000..a4ee1f9952ca
--- /dev/null
+++ b/x11-misc/imake/imake-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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://cgit.freedesktop.org/"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/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 ~arm-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[@]}"
+}