gentoo resync : 30.09.2018

3 files changed, 5 insertions, 35 deletions

diff --git a/x11-libs/libXaw3d/Manifest b/x11-libs/libXaw3d/Manifest
index 54d1c1631057..4be45a2146cc 100644
--- a/x11-libs/libXaw3d/Manifest
+++ b/x11-libs/libXaw3d/Manifest
@@ -1,5 +1,3 @@
-DIST libXaw3d-1.6.2.tar.bz2 551851 BLAKE2B 13a03eba7af518fcaa33e89e0cf7c0955c175866348d314210f15a291590fdea98e1b5b9628252932826069bb3a3e89b2377dd80f1adfe3a2bb06e6f82f85408 SHA512 11b15884e47efc139aa019f0a76086913535767fb2e20fcd837d810d3b6b4a7bda3408be5fa0cbe90ae16eeaebe5db9b0ec77a0e2b5767590662ef3a7c9c96ea
 DIST libXaw3d-1.6.3.tar.bz2 561594 BLAKE2B 85f3fb6d39a9a0ccb7d2c529eff84a4a9e85bf81be16487f2119da0a670e40c2d328e17b06ca237f69029e8d43daf6eeba8488029e6e4d2f56bc1093a2f305ad SHA512 f79f997ff8442563c74f38c7d76fab2c9253691743ca3143047ce698adb4c126d02dc968be7bdc79ab3052b785fd705375d2f01171e3a3266736beb531c91424
-EBUILD libXaw3d-1.6.2.ebuild 671 BLAKE2B c1b541170f716a2aeeb1b60243bb2e100c85e357e1f077980e7bf4786e56dfea1c0e511368d9c5bbbd129a5b04997e2bfb06a19b584362fbdc8631addc0735fd SHA512 1afa7f6c9b7ab380132c8b04ab88e410809e4d3871f1a46d35dd668f9c01d87fa4a2d2effcf4ca0dafcf6aaa56ee30ae5f1d30b865cd4300469209f767a1d960
-EBUILD libXaw3d-1.6.3.ebuild 718 BLAKE2B 1fcdf750847f96f5c3ad9ddb78ab5c36ded75e052f4e6b91e9223ebba8da133aee5d5c01ab9bc9d1d1dfc256a4778cff7b50bb9cc316dd1de47644e36aaa6791 SHA512 f9a8330b6386d566818b42baf35f47f68abb718d4ec943e0069c58a3f931e85e7b5c972363248b6f6119aeb431b92a4f8ec8c98c870ec92e7814a2a68ccb3e53
+EBUILD libXaw3d-1.6.3.ebuild 738 BLAKE2B ace50ccd6f9f0ce2eb7b0d516ff81a89cb269900e6c7b6618cd548ce1419ee1294dedacd1b0f5a471f7abb191186e6e6e1839bc898f7d65fbacbc29d8af1bf0e SHA512 6d1cbd7641a83360181cadcf88371a249860ce351cdea97556ca0bab9b730cf35deddb2b3032f1b40668389affcf03b25aae92ecfa1a8fa9fe209b07aa489f0a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild
deleted file mode 100644
index d1ee612e8a51..000000000000
--- a/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org Xaw3d library"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="unicode"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	x11-base/xorg-proto"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable unicode internationalization)
-		--enable-arrow-scrollbars
-		--enable-gray-stipples
-	)
-
-	xorg-2_pkg_setup
-}
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
index e608bc305b57..f034bea07daa 100644
--- a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
+++ b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,13 +6,14 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xaw3d library"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="unicode xpm"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu
-	x11-libs/libXt"
+	x11-libs/libXt
+	xpm? ( x11-libs/libXpm )"
 DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/yacc