gentoo resync : 22.04.2018

5 files changed, 2 insertions, 313 deletions

diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index 57dce5f4bf79..1a209bcd0023 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,11 +1,5 @@
 AUX Mwm.defaults 536 BLAKE2B 675abf74eaa86c9b8f1f9730c3216d06239a6e67cd3657245b4c4095a5e1fc552a0c9c59cd72d3537de71e7f26d10bca87c7d34723e5514890c7a044aa2674b2 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab
 DIST motif-2.3.6-patches-2.tar.xz 1600 BLAKE2B 03ef74773c581d09ad89f35f26e9d01ed01ec8b40344cd4d6aba106de80bfe0ce69d65551aafb4c53daf61cc31d1e703c9762c2b4a60729c73783b649a00e6c3 SHA512 09c857f7f2ec0d48660e6fff8afddec99416084e2b80a8793401e7641a3669fbe4eb10811e60f3d9dc106c828a87324dfdd27cc91a62bf3dedbd9154542c7619
-DIST motif-2.3.7.tar.gz 5715478 BLAKE2B 594aec6674c60e6c8f0e8abc830b934a11b7274fd5eb2d344943ceea9096caf047107523dc4429fed0023935935979e6af5a26b2481a593f3090807ad3fcd8ef SHA512 2485f6e111139d6815e8ac38630d082ac73474b033818b4a92b46f5e2213fa85030ef8095672b2e31b1ed5c207d3baf58f01ec5deec0cd3bd9527cb341f741f8
 DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
-DIST openMotif-2.2.3.tar.gz 5149785 BLAKE2B 60d1f4775f7a2a3477f005d713c75fbe093cbe50f9c7a632c618b81b90a9761cb06a944f15378673f22419e5e71ed975d18f95ba05ad366f88ddbca898dc08a6 SHA512 322381faf50bde6bbd2253f1b52a25e5471df87a2b01fba4de7e0d1bb4c1267e2b0d358e13e1b924a60d9e85316959fa6b2be5a458964d03f47a936bb618eae8
-DIST openmotif-2.2.3-patches-5.tar.xz 19972 BLAKE2B b237ff27f0bf363f2f46a5b81c50a3662ca39e4729e190fc989d9521b5770de8afe860f3a04efa1901b4f381d2bed1117d6b13c65a42fea77e6ac96145ac0d00 SHA512 62c0489d1bda83952e1c8d39e8c8fe0ee5a4d2927f9139227cb80b2c58751d63d95b70fff3eb165219e75cdfdc299f92d90482124e6334a28781a13b174786c9
-EBUILD motif-2.2.3-r12.ebuild 1833 BLAKE2B d6e581822fa7ecb133b2aa74d71c2737b78a4c273436ab23267a125137e70e64aeb40c40a7e22b37c4434bee8cc80d8a9dc3c3b5d276efcfb855b89a7270ab66 SHA512 50013e267d02ddf5b1dae145715661633eb93367334e32c47bab77c4d826e1155d6720e447f175277abae8df7dc299c9dc5507cc8a7bfb019551a9fc8e5e88bb
-EBUILD motif-2.3.7.ebuild 3475 BLAKE2B e263486fea11744e213542d5b5ba2b38dc892dfc3464236a6c7f5f63e195beb5511e61ce79c825a173e691da0d000069b1833dde8e42a70cc90fd16f4f6fc4b8 SHA512 3df30f2bc144cce54876ad0e3dc4599a52faeefa095b3394332672c4b1d00cd3bcb46d1836f9cc71060a676214d2fdfb18afa5989e1897adadc931b61957e3d9
-EBUILD motif-2.3.8-r1.ebuild 3367 BLAKE2B 293a104c270e4b63220107795ebc7f2208f4aa475f6432686cdac9706d27248279a646937ec42321987d1d6c1dfd5f41a487b7e5bed675cb3e1497f96a65700f SHA512 4c7a0ab99ceea872659664e7b1222f04d5a413c3e641444899fe684f46e989137e1ae2e1b77b73b248e3947d0cca81e4c9da3e92c0becd90ed4b168a16c1cb4e
-EBUILD motif-2.3.8.ebuild 3396 BLAKE2B b973221fbec5b9a59354d1da06891d75f610fee811081eef08a57866676d89603bc87de3ead2f12515dac5ce75fb6d8488b458d4f54db39056fede1703e15acb SHA512 94df476727be54e35defe9bf0a6d47ad017649d86d75a43645ce6abdb1b2a42047d503844dd1f8d79e55e289a0b1b66351c723a585fc1027738088673915b268
+EBUILD motif-2.3.8-r1.ebuild 3366 BLAKE2B 469019271c2d4572fb1ea7149d02ce02aa6f1cd3a1bba4ca02ce6050f961fb73bb255e83ec2794158ce823e81e387d4f940353cae026ac5d8473a6ad93732373 SHA512 b9d7e0ecebfa53883da90aae67f49cf8d54c8172f7e915443974b0b262bca7181d60f372d3ff2612403d8936f68b58befe9e61a270e6bc95e2e79fbd143a1880
 MISC metadata.xml 394 BLAKE2B 8302e867353fbe09f017b4d54ec2ad043f8872643914ef29002611b41f4f1c0639959da9c7e06b4317c8fec4d0a5fba72cc3927991054a65a1d42a1f4fb9da17 SHA512 5a2fd548df5d694acb6c1bf1d51c8e80adb49915d4328879478a6b7c5a76cfbf02f31e58103967bab2c4afd4873752ffafd9f8f0839f68d09868d7f501542d3c
diff --git a/x11-libs/motif/motif-2.2.3-r12.ebuild b/x11-libs/motif/motif-2.2.3-r12.ebuild
deleted file mode 100644
index feb4e6b11620..000000000000
--- a/x11-libs/motif/motif-2.2.3-r12.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib multilib-minimal
-
-MY_P=openMotif-${PV}
-DESCRIPTION="Legacy Open Motif libraries for old binaries"
-HOMEPAGE="http://motif.ics.com/"
-SRC_URI="ftp://ftp.ics.com/openmotif/2.2/${PV}/src/${MY_P}.tar.gz
-	mirror://gentoo/openmotif-${PV}-patches-5.tar.xz"
-
-LICENSE="MOTIF MIT"
-SLOT="2.2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXp-1.0.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	x11-libs/libXaw
-	x11-misc/xbitmaps"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	EPATCH_SUFFIX=patch epatch
-	epatch_user
-
-	# This replaces deprecated, obsoleted and now invalid AC_DEFINE
-	# with their proper alternatives.
-	sed -i -e 's:AC_DEFINE(\([^)]*\)):AC_DEFINE(\1, [], [\1]):g' \
-		configure.in acinclude.m4
-
-	# Build only the libraries
-	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/=.*/= lib clients/;}' Makefile.am
-	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/=.*/= uil/;}' clients/Makefile.am
-
-	mv configure.in configure.ac || die
-	AM_OPTS="--force-missing" eautoreconf
-
-	# get around some LANG problems in make (#15119)
-	unset LANG
-
-	# bug #80421
-	filter-flags -ftracer
-
-	# feel free to fix properly if you care
-	append-flags -fno-strict-aliasing
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf --with-x --disable-static
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_install() {
-	emake -j1 DESTDIR="${D}" install-exec
-}
-
-multilib_src_install_all() {
-	# cleanups
-	rm -rf "${ED}"/usr/bin
-	rm -f "${ED}"/usr/lib*/*.{so,la,a}
-
-	dodoc README RELEASE RELNOTES BUGREPORT TODO
-}
diff --git a/x11-libs/motif/motif-2.3.7.ebuild b/x11-libs/motif/motif-2.3.7.ebuild
deleted file mode 100644
index 74bb1bc3b032..000000000000
--- a/x11-libs/motif/motif-2.3.7.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic multilib toolchain-funcs multilib-minimal
-
-DESCRIPTION="The Motif user interface component toolkit"
-HOMEPAGE="https://sourceforge.net/projects/motif/
-	http://motif.ics.com/"
-SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz
-	https://dev.gentoo.org/~ulm/distfiles/${PN}-2.3.6-patches-2.tar.xz"
-
-LICENSE="LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
-
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXp-1.0.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	xft? (
-		>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	|| ( dev-util/byacc sys-freebsd/freebsd-ubin )
-	x11-misc/xbitmaps"
-
-src_prepare() {
-	eapply ../patch
-	eapply_user
-
-	# disable compilation of demo binaries
-	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
-
-	# add X.Org vendor string to aliases for virtual bindings
-	echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
-
-	# remove header file which shouldn't be in the tarball #578168
-	rm lib/Xm/Xm.h || die
-
-	AT_M4DIR=. eautoreconf
-
-	# get around some LANG problems in make (#15119)
-	LANG=C
-
-	# bug #80421
-	filter-flags -ftracer
-
-	# feel free to fix properly if you care
-	append-flags -fno-strict-aliasing
-
-	# for Solaris Xos_r.h :(
-	[[ ${CHOST} == *-solaris2.11 ]] \
-		&& append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
-
-	if use !elibc_glibc && use !elibc_uclibc && use !elibc_musl \
-			&& use unicode; then
-		# libiconv detection in configure script doesn't always work
-		# http://bugs.motifzone.net/show_bug.cgi?id=1423
-		export LIBS="${LIBS} -liconv"
-	fi
-
-	# "bison -y" causes runtime crashes #355795
-	export YACC=byacc
-
-	# remember the name of the C compiler for the native ABI
-	MY_NATIVE_CC=$(tc-getCC)
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--with-x \
-		$(use_enable static-libs static) \
-		$(use_enable motif22-compatibility) \
-		$(use_enable unicode utf8) \
-		$(use_enable xft) \
-		$(use_enable jpeg) \
-		$(use_enable png)
-}
-
-multilib_src_compile() {
-	# The wmluiltok build tool is linked with libfl.a, so always
-	# compile it for the native ABI
-	emake -C tools/wml CC="${MY_NATIVE_CC}" LIBS="-lfl" wmluiltok
-	emake
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use examples; then
-		emake -C demos DESTDIR="${D}" install-data
-		dodir /usr/share/doc/${PF}/demos
-		mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
-	fi
-}
-
-multilib_src_install_all() {
-	# mwm default configs
-	insinto /usr/share/X11/app-defaults
-	newins "${FILESDIR}"/Mwm.defaults Mwm
-
-	# cleanup
-	rm -rf "${ED}"/usr/share/Xm
-	find "${D}" -type f -name "*.la" -delete || die
-
-	dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
-}
diff --git a/x11-libs/motif/motif-2.3.8-r1.ebuild b/x11-libs/motif/motif-2.3.8-r1.ebuild
index bb869f9534be..1677a1ad6ac8 100644
--- a/x11-libs/motif/motif-2.3.8-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.t
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~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 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/motif/motif-2.3.8.ebuild b/x11-libs/motif/motif-2.3.8.ebuild
deleted file mode 100644
index 3c3dba0edf71..000000000000
--- a/x11-libs/motif/motif-2.3.8.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic multilib toolchain-funcs multilib-minimal
-
-DESCRIPTION="The Motif user interface component toolkit"
-HOMEPAGE="https://sourceforge.net/projects/motif/
-	http://motif.ics.com/"
-SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz
-	https://dev.gentoo.org/~ulm/distfiles/${PN}-2.3.6-patches-2.tar.xz"
-
-LICENSE="LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
-
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXp-1.0.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	xft? (
-		>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	|| ( dev-util/byacc sys-freebsd/freebsd-ubin )
-	x11-misc/xbitmaps"
-
-src_prepare() {
-	eapply ../patch
-	eapply_user
-
-	# disable compilation of demo binaries
-	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
-
-	# add X.Org vendor string to aliases for virtual bindings
-	echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
-
-	AT_M4DIR=. eautoreconf
-
-	# get around some LANG problems in make (#15119)
-	LANG=C
-
-	# bug #80421
-	filter-flags -ftracer
-
-	# feel free to fix properly if you care
-	append-flags -fno-strict-aliasing
-
-	# for Solaris Xos_r.h :(
-	[[ ${CHOST} == *-solaris2.11 ]] \
-		&& append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
-
-	if use !elibc_glibc && use !elibc_uclibc && use !elibc_musl \
-			&& use unicode; then
-		# libiconv detection in configure script doesn't always work
-		# http://bugs.motifzone.net/show_bug.cgi?id=1423
-		export LIBS="${LIBS} -liconv"
-	fi
-
-	# "bison -y" causes runtime crashes #355795
-	export YACC=byacc
-
-	# remember the name of the C compiler for the native ABI
-	MY_NATIVE_CC=$(tc-getCC)
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--with-x \
-		$(use_enable static-libs static) \
-		$(use_enable motif22-compatibility) \
-		$(use_enable unicode utf8) \
-		$(use_enable xft) \
-		$(use_enable jpeg) \
-		$(use_enable png)
-}
-
-multilib_src_compile() {
-	# The wmluiltok build tool is linked with libfl.a, so always
-	# compile it for the native ABI
-	emake -C tools/wml CC="${MY_NATIVE_CC}" LIBS="-lfl" wmluiltok
-	emake
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use examples; then
-		emake -C demos DESTDIR="${D}" install-data
-		dodir /usr/share/doc/${PF}/demos
-		mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
-	fi
-}
-
-multilib_src_install_all() {
-	# mwm default configs
-	insinto /usr/share/X11/app-defaults
-	newins "${FILESDIR}"/Mwm.defaults Mwm
-
-	# cleanup
-	rm -rf "${ED}"/usr/share/Xm
-	find "${D}" -type f -name "*.la" -delete || die
-
-	dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
-}