Remove old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

4 files changed, 16 insertions, 257 deletions

diff --git a/x11-libs/motif/ChangeLog b/x11-libs/motif/ChangeLog
index e4153b6ae330..9656a41996fc 100644
--- a/x11-libs/motif/ChangeLog
+++ b/x11-libs/motif/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/motif
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.66 2015/02/28 14:01:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.67 2015/04/01 01:46:59 ulm Exp $
+
+  01 Apr 2015; Ulrich Müller <ulm@gentoo.org> -motif-2.3.4-r1.ebuild,
+  -motif-2.3.4-r2.ebuild:
+  Remove old.
 
   28 Feb 2015; Agostino Sarubbo <ago@gentoo.org> motif-2.3.4-r3.ebuild:
   Stable for ia64, wrt bug #537004
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index 1889eb5e53fc..4d5e1ccf256d 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -7,25 +7,20 @@ DIST motif-2.3.4-src.tgz 9527040 SHA256 637efa09608e0b8f93465dbeb7c92e58ebb14c4b
 DIST openMotif-2.2.3.tar.gz 5149785 SHA256 12fc0d1de53ff30307603e31826db9b63a442f6f743451aed2cb7cedb038d3d9 SHA512 322381faf50bde6bbd2253f1b52a25e5471df87a2b01fba4de7e0d1bb4c1267e2b0d358e13e1b924a60d9e85316959fa6b2be5a458964d03f47a936bb618eae8 WHIRLPOOL 970f3f20eefde787af9fa932dcbf77e870ca6ba248e2632c358bbb7d149c2c4fef31a33a64888bc2b2e891f1c66a803a12e1121378539a94599e0be753c04bad
 DIST openmotif-2.2.3-patches-5.tar.xz 19972 SHA256 69e1b1e37023ce0aa65c1aa8bdb60a6b2ead3472df26f1d10bffae7386b24c35 SHA512 62c0489d1bda83952e1c8d39e8c8fe0ee5a4d2927f9139227cb80b2c58751d63d95b70fff3eb165219e75cdfdc299f92d90482124e6334a28781a13b174786c9 WHIRLPOOL e2f8abc439d25d631b8489e1007788e931ea4982957d50e0e3e1062b76a3d37b279140f30bac95ab378a76cc33d5a49c1c217a66c441959510d9a96d7409d4af
 EBUILD motif-2.2.3-r12.ebuild 1975 SHA256 0f1d91c322a7dad1a3f5b98b96a13c55ad674c23fdf586718b1f8d79591825cf SHA512 707a82f3a6e7e3b45ecdbd35aee7b4517a135a97d9592ed4898fc16a871b25a38bdc3bd41fb655239f6d00a5a0f5aa935c8053e51dd7dac4d98dd2db1cafd59e WHIRLPOOL 74d5aa64ef0e1050b61987da669c89dbe34c5c825f5e22f6f6a7a9444d23581b023b8c90f3e8b3fd4570ae24d9dae48f39692f6059bbff9f0c1f0a736e1ecde1
-EBUILD motif-2.3.4-r1.ebuild 3854 SHA256 4f2b82370bccdd94cf75330fa942c3e0c8484831469d441a9f98374667dc6b7f SHA512 17f55650d719ab407afafd5dcd5e50748c3a08926043f79e4e7b543b83465834bd649be1e877fa2098e04e15fce91971ff9164d712da8361956b222f1a6b5465 WHIRLPOOL 61cc1052f647327b016dd8d6a9ea8d3431d5cfcce95ec56d69f279fa2f2ae69eec153582ddd86e8d4a652c5e74905c33d52cb261ed90c8e0bfa540da8ed2ed17
-EBUILD motif-2.3.4-r2.ebuild 3489 SHA256 0be68881eb41ce8004ea395ec84f1aca8ec4bc47496563a91bcf3fb1ce7fb53f SHA512 87c87ee04ed1e61f37f61d4bf8b85ed2c2e202bcc239fa5ee51281f7136ea24249298ead4b1f25ad251b2858a0b4f770287b773e5c878a6ca8bc16fc72bd55d5 WHIRLPOOL cf36101137bb17e719aa79bbad9be317281cf273dab28ba46179bd5b25964d8216d9d2d87d265b69354c94e37d1136f567ecc48104006796e741a3d1f59e4cd6
 EBUILD motif-2.3.4-r3.ebuild 3519 SHA256 020c426ac9aa34504ec68a1ca35488ab804d97cf397d65e1090c494e79ddb1b0 SHA512 7b1c52edd0fbde52ef0f986152dc5e7b66a8a7236ce1949ca1578ffc644a3649d4d81160118ef67264a641b745cd4b71e414b8904f8b2bd6ee0bb613e4e02c89 WHIRLPOOL 5b240431b71c9951846372170bd1c7794a8c7cae1c40d35102d6293b0d31dc6aaa6c6a1ea71e5b93d81ae84b50918d1f561ced78c5c35974ffe77472cf9602ce
-MISC ChangeLog 50103 SHA256 c2b3cfb189434a7264f0438319564ca043890ae09ed4c71f7c6af89c76d287ac SHA512 07e3fc6e49ee8ec68ad16bf1e1b2eba0f95291a043756a866d5369e58e740029b244e2cab5b7a0529239f9a61db28ef9a01dfbeff65a6cca946cceb6051d06cb WHIRLPOOL 4916f22e6077cb0e5f66bd87868f607a8994fca1cbed62afc65b35176f5d219407cba38c490a4ce91803a372eeb56a7c1e9c35e6501ea4e3a924094a795c226b
+MISC ChangeLog 50215 SHA256 9f5f5eb863c4de12d6700f6f0388cc231b0570bcffc067a66ae107d7e119e620 SHA512 a3092801a506bd293acae3b3ada5a838c78bd91a2b87b018942293c9b655bfc9ce2865f507723013f3e6cf898be704e2ca0fbcaebbe0cff7081691f7e51ee7ab WHIRLPOOL ad2665a5ec5849ad54b8a568048156d10e1a3986593fe6a7280a5f68dfc1af6f482d951eba968a3bb46981521ac0830e6c5f08d4f28ebcdb23e50b618a223e0e
 MISC metadata.xml 289 SHA256 3c01ca1c89b14ec531baa83995a170fb4eaf7072daea1f12a87c5fe3aaec81a5 SHA512 f80ef1bc9169c6027df0715e76c50786aedb1053a35c699c5cacffd2c3e4d0640e123d5ec67634cfcfb1bdc2de43dba6f6819b1a3bd5458d061da675a23ecb80 WHIRLPOOL dbbda9b74ae8b7ed91a3abab4398484706036c51c4fb8c0f1df3c4539c9c2a8c4075abdd172ef2c734d952d13202928870d32b0b6189bbd41fa2431b53de72c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU8coqAAoJELp701BxlEWfseQQAISFvpvsKIC/uQn7wvCH1uZ2
-27V6bJWsH8bofatrVtP+VAHWOQGmzG3nhCIq2MCYPB/xvpFsc2kbtplN+ZRg7/OW
-vffiaLEYSnVf+U5RayD97xlS8CTBIm5N8zUH0JTaVahHRvKp1pvHjunmyYQVGPsK
-hf8yQ6yCJ7yourQLPrpr/4nK8fGCqJYPRbYt+tyzIYfKKBASGx6j51JiWO9uqeee
-Za3zRgSu0f0Ds/Wh1ZkpREY7D/eBSucizK+ivzjDK1GzZ28mrv16afglr49pM04E
-oOruV5SUqMAf+cqHw+G4EQoFQxZYEbCIjuP3Obfwj+E2MWJWQPPyZhATmrRq/aDe
-QnVNH3G+rDIBu0VJtc2CXQ3L9HqudouMA1LHaSJAaPrtOmW4073UpriZP2nn4RVk
-9++f8kMMipI59Rzr5qMDpf7ODyoDEL05+aw4Me3zzp/j7KX1LcR/xcaDKT3az/kD
-OWcsrlUjKqzpsCjRv6OXSh5BRasE74aJtqw8RV3DUAPNHOCYGC6v4jP10EeWgQNj
-6cpNn9Yi1CVVJ8NQMYhIVzqrCxS10wEPgDMLU2e7DKwX0ckIFdpBX7yZemAJkXIz
-yifHpHAQjiffZ2EXbQ+R/qoEQN6e9orZvekO8bHo/wW8EtVXiF3ikVfWstNhH6hI
-ypbmgcG6eGMvcpzAgCpc
-=UbIV
+iQGcBAEBCAAGBQJVG04pAAoJEJQzkH1pP7W4/EkL/iuuGlN1lcH+wHjhQRkR5D4D
+eruAIYuigf8lwRYdR0qCDlFxmRyAONuUqA0txYkK4hMjIRrN/73x9Zb/NVsO/+6h
+wr/VUDumOLjaXVg8Kz+74jphbnAE1UgaeyvkLLq2IJ4VLTq/AAVeffj7yg+DtnwP
+hAjwgLEBFnxQ1UqUTAzOJmB2yD+lGRSRt9dfK7Yrs6mrf9taza5Fmv2G6bwjqrps
+0HZgy8Dnwc1YrlPEVbPGAuRd5TX/bxoGAKBDkz+7gT8RBTiQ+6ZHhZSCoLaI+5Jt
+2oX1wNIp3O974JAOpFDQP90uVXlQfgbfCoKBTqc1vjzSbAqq8mDNpzwaYM3q9F64
++GgUDrv672DCPXdHCKp+PTFKbJ6NG/b60yrYOGd92mAM8dtQsjOGBvf7XiT/RTj/
+p3wZ5zWnSLDja/CwNenLorWAyt+nixKz9XZVN7B1/zcjQkGM/W3FCOWzrOoER24b
+k28h385U21eluFOaku9yfEK9DapZ8K4+/uYdoNSgvQ==
+=5mWD
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/motif/motif-2.3.4-r1.ebuild b/x11-libs/motif/motif-2.3.4-r1.ebuild
deleted file mode 100644
index 4fa3e61a1848..000000000000
--- a/x11-libs/motif/motif-2.3.4-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.32 2014/06/18 21:14:36 mgorny Exp $
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib multilib-minimal
-
-DESCRIPTION="The Motif user interface component toolkit"
-HOMEPAGE="http://sourceforge.net/projects/motif/
-	http://motif.ics.com/"
-SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}-src.tgz
-	mirror://gentoo/${P}-patches-1.tar.xz"
-
-LICENSE="LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~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="abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] )
-	>=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() {
-	EPATCH_SUFFIX=patch epatch
-	epatch_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 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
-}
-
-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)
-}
-
-src_compile() {
-	local native_dir
-
-	# Motif has build-time tools in the tools/wml subdirectory that
-	# cannot be built for other ABIs because of missing external libs.
-	# So we build the native ABI first, and then replace the tools
-	# directory in other ABIs by the native one.
-
-	my_best_abi_compile() {
-		native_dir="${BUILD_DIR}"
-		emake -C "${BUILD_DIR}"
-	}
-	multilib_for_best_abi my_best_abi_compile
-
-	my_other_abi_compile() {
-		[[ ${BUILD_DIR} = "${native_dir}" ]] && return
-		rm -rf "${BUILD_DIR}"/tools
-		ln -s "${native_dir}"/tools "${BUILD_DIR}"/ || die
-		emake -C "${BUILD_DIR}"
-	}
-	multilib_foreach_abi my_other_abi_compile
-}
-
-multilib_src_install_all() {
-	# mwm default configs
-	insinto /usr/share/X11/app-defaults
-	newins "${FILESDIR}"/Mwm.defaults Mwm
-
-	if use examples; then
-		my_install_demos() {
-			emake -C "${BUILD_DIR}"/demos DESTDIR="${D}" install-data
-		}
-		multilib_for_best_abi my_install_demos
-		dodir /usr/share/doc/${PF}/demos
-		mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
-	fi
-	rm -rf "${ED}"/usr/share/Xm
-
-	prune_libtool_files
-
-	dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
-}
diff --git a/x11-libs/motif/motif-2.3.4-r2.ebuild b/x11-libs/motif/motif-2.3.4-r2.ebuild
deleted file mode 100644
index ec701b0d16ec..000000000000
--- a/x11-libs/motif/motif-2.3.4-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r2.ebuild,v 1.11 2014/08/13 09:23:32 ago Exp $
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-DESCRIPTION="The Motif user interface component toolkit"
-HOMEPAGE="http://sourceforge.net/projects/motif/
-	http://motif.ics.com/"
-SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}-src.tgz
-	mirror://gentoo/${P}-patches-1.tar.xz"
-
-LICENSE="LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~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="abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] )
-	>=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() {
-	EPATCH_SUFFIX=patch epatch
-	epatch_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 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
-}
-
-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() {
-	if ! multilib_is_native_abi; then
-		# The wmluiltok build tool is linked with libfl.a, therefore compile
-		# it for the build platform's ABI
-		emake -C tools/wml CC="$(tc-getBUILD_CC)" LIBS="-lfl" wmluiltok
-	fi
-	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
-	prune_libtool_files
-
-	dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
-}