cleanups

Package-Manager: portage-2.0.51.19

20 files changed, 13 insertions, 860 deletions

diff --git a/x11-libs/motif-config/ChangeLog b/x11-libs/motif-config/ChangeLog
index 776deb08a330..413586424c39 100644
--- a/x11-libs/motif-config/ChangeLog
+++ b/x11-libs/motif-config/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/motif-config
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif-config/ChangeLog,v 1.7 2005/03/07 13:38:08 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif-config/ChangeLog,v 1.8 2005/03/08 15:39:00 lanius Exp $
+
+  08 Mar 2005; Heinrich Wendel <lanius@gentoo.org> -motif-config-0.1.ebuild,
+  -motif-config-0.2-r1.ebuild, -motif-config-0.2.ebuild,
+  -motif-config-0.3.ebuild:
+  cleanups
 
 *motif-config-0.4 (07 Mar 2005)
 
diff --git a/x11-libs/motif-config/files/digest-motif-config-0.1 b/x11-libs/motif-config/files/digest-motif-config-0.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/x11-libs/motif-config/files/digest-motif-config-0.1
+++ /dev/null
diff --git a/x11-libs/motif-config/files/digest-motif-config-0.2 b/x11-libs/motif-config/files/digest-motif-config-0.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/x11-libs/motif-config/files/digest-motif-config-0.2
+++ /dev/null
diff --git a/x11-libs/motif-config/files/digest-motif-config-0.2-r1 b/x11-libs/motif-config/files/digest-motif-config-0.2-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/x11-libs/motif-config/files/digest-motif-config-0.2-r1
+++ /dev/null
diff --git a/x11-libs/motif-config/files/digest-motif-config-0.3 b/x11-libs/motif-config/files/digest-motif-config-0.3
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/x11-libs/motif-config/files/digest-motif-config-0.3
+++ /dev/null
diff --git a/x11-libs/motif-config/motif-config-0.1.ebuild b/x11-libs/motif-config/motif-config-0.1.ebuild
deleted file mode 100644
index 446d1d597377..000000000000
--- a/x11-libs/motif-config/motif-config-0.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif-config/motif-config-0.1.ebuild,v 1.7 2005/02/26 21:24:43 j4rg0n Exp $
-
-inherit multilib
-
-DESCRIPTION="Utility to change the default Motif library"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-
-RDEPEND="app-shells/bash"
-
-src_unpack(){
-	einfo "nothing to unpack"
-}
-
-src_compile() {
-	einfo "nothing to compile"
-}
-
-src_install () {
-	exeinto /usr/bin
-	newexe ${FILESDIR}/motif-config-0.1 motif-config
-	dosed "s:@@LIBDIR@@:$(get_libdir):g" /usr/bin/motif-config
-
-	# for profile
-	dodir /usr/$(get_libdir)/motif
-	keepdir /usr/$(get_libdir)/motif
-
-	# bitmaps
-	dodir /usr/include/X11/bitmaps
-	tar -xjf ${FILESDIR}/bitmaps.tbz2 -C ${D}/usr/include/X11/bitmaps
-	# bindings
-	dodir /usr/$(get_libdir)/X11/bindings
-	tar -xjf ${FILESDIR}/bindings.tbz2 -C ${D}/usr/$(get_libdir)/X11/bindings
-
-	# mwm default config
-	insinto /etc/X11/app-defaults
-	doins ${FILESDIR}/Mwm.defaults
-
-	insinto /etc/X11/mwm
-	doins ${FILESDIR}/system.mwmrc
-
-	dosym /etc/X11/mwm /usr/$(get_libdir)/X11/mwm
-}
diff --git a/x11-libs/motif-config/motif-config-0.2-r1.ebuild b/x11-libs/motif-config/motif-config-0.2-r1.ebuild
deleted file mode 100644
index fa6cf556bc25..000000000000
--- a/x11-libs/motif-config/motif-config-0.2-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif-config/motif-config-0.2-r1.ebuild,v 1.3 2005/03/02 23:11:33 j4rg0n Exp $
-
-inherit multilib
-
-DESCRIPTION="Utility to change the default Motif library"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-
-RDEPEND="app-shells/bash"
-
-src_unpack(){
-	einfo "nothing to unpack"
-}
-
-src_compile() {
-	einfo "nothing to compile"
-}
-
-src_install () {
-	exeinto /usr/bin
-	newexe ${FILESDIR}/${P} motif-config
-	dosed "s:@@LIBDIR@@:$(get_libdir):g" /usr/bin/motif-config
-
-	# for profile
-	dodir /usr/$(get_libdir)/motif
-	keepdir /usr/$(get_libdir)/motif
-
-	# bitmaps
-	dodir /usr/include/X11/bitmaps
-	tar -xjf ${FILESDIR}/bitmaps.tbz2 -C ${D}/usr/include/X11/bitmaps
-	# bindings
-	dodir /usr/$(get_libdir)/X11/bindings
-	tar -xjf ${FILESDIR}/bindings.tbz2 -C ${D}/usr/$(get_libdir)/X11/bindings
-
-	# mwm default config
-	insinto /etc/X11/app-defaults
-	doins ${FILESDIR}/Mwm.defaults
-
-	insinto /etc/X11/mwm
-	doins ${FILESDIR}/system.mwmrc
-
-	dosym /etc/X11/mwm /usr/$(get_libdir)/X11/mwm
-}
diff --git a/x11-libs/motif-config/motif-config-0.2.ebuild b/x11-libs/motif-config/motif-config-0.2.ebuild
deleted file mode 100644
index 5f18b3b376a9..000000000000
--- a/x11-libs/motif-config/motif-config-0.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif-config/motif-config-0.2.ebuild,v 1.3 2005/02/26 21:24:43 j4rg0n Exp $
-
-inherit multilib
-
-DESCRIPTION="Utility to change the default Motif library"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-
-RDEPEND="app-shells/bash"
-
-src_unpack(){
-	einfo "nothing to unpack"
-}
-
-src_compile() {
-	einfo "nothing to compile"
-}
-
-src_install () {
-	exeinto /usr/bin
-	newexe ${FILESDIR}/${P} motif-config
-	dosed "s:@@LIBDIR@@:$(get_libdir):g" /usr/bin/motif-config
-
-	# for profile
-	dodir /usr/$(get_libdir)/motif
-	keepdir /usr/$(get_libdir)/motif
-
-	# bitmaps
-	dodir /usr/include/X11/bitmaps
-	tar -xjf ${FILESDIR}/bitmaps.tbz2 -C ${D}/usr/include/X11/bitmaps
-	# bindings
-	dodir /usr/$(get_libdir)/X11/bindings
-	tar -xjf ${FILESDIR}/bindings.tbz2 -C ${D}/usr/$(get_libdir)/X11/bindings
-
-	# mwm default config
-	insinto /etc/X11/app-defaults
-	doins ${FILESDIR}/Mwm.defaults
-
-	insinto /etc/X11/mwm
-	doins ${FILESDIR}/system.mwmrc
-
-	dosym /etc/X11/mwm /usr/$(get_libdir)/X11/mwm
-}
diff --git a/x11-libs/motif-config/motif-config-0.3.ebuild b/x11-libs/motif-config/motif-config-0.3.ebuild
deleted file mode 100644
index a92d79391178..000000000000
--- a/x11-libs/motif-config/motif-config-0.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif-config/motif-config-0.3.ebuild,v 1.2 2005/03/02 23:11:33 j4rg0n Exp $
-
-inherit multilib
-
-DESCRIPTION="Utility to change the default Motif library"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-
-RDEPEND="app-shells/bash"
-
-src_unpack(){
-	einfo "nothing to unpack"
-}
-
-src_compile() {
-	einfo "nothing to compile"
-}
-
-src_install () {
-	exeinto /usr/bin
-	newexe ${FILESDIR}/${P} motif-config
-	dosed "s:@@LIBDIR@@:$(get_libdir):g" /usr/bin/motif-config
-
-	# for profile
-	dodir /usr/$(get_libdir)/motif
-	keepdir /usr/$(get_libdir)/motif
-
-	# bitmaps
-	dodir /usr/include/X11/bitmaps
-	tar -xjf ${FILESDIR}/bitmaps.tbz2 -C ${D}/usr/include/X11/bitmaps
-	# bindings
-	dodir /usr/$(get_libdir)/X11/bindings
-	tar -xjf ${FILESDIR}/bindings.tbz2 -C ${D}/usr/$(get_libdir)/X11/bindings
-
-	# mwm default config
-	insinto /etc/X11/app-defaults
-	doins ${FILESDIR}/Mwm.defaults
-
-	insinto /etc/X11/mwm
-	doins ${FILESDIR}/system.mwmrc
-
-	dosym /etc/X11/mwm /usr/$(get_libdir)/X11/mwm
-}
diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index ca1e2063d290..87bcc2606442 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.98 2005/03/07 13:36:48 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.99 2005/03/08 15:42:14 lanius Exp $
+
+  08 Mar 2005; Heinrich Wendel <lanius@gentoo.org>
+  -openmotif-2.1.30-r4.ebuild, -openmotif-2.1.30-r5.ebuild,
+  -openmotif-2.1.30-r8.ebuild, -openmotif-2.2.3-r1.ebuild,
+  -openmotif-2.2.3-r2.ebuild:
+  cleanups
 
 *openmotif-2.1.30-r11 (07 Mar 2005)
 
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r4 b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r4
deleted file mode 100644
index ead704e865e9..000000000000
--- a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 950f0d409e0ce508fa3995790c1106c7 openmotif-2.1.30-4_MLI.src.tar.gz 8645792
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r5 b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r5
deleted file mode 100644
index ead704e865e9..000000000000
--- a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 950f0d409e0ce508fa3995790c1106c7 openmotif-2.1.30-4_MLI.src.tar.gz 8645792
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r8 b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r8
deleted file mode 100644
index ead704e865e9..000000000000
--- a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 950f0d409e0ce508fa3995790c1106c7 openmotif-2.1.30-4_MLI.src.tar.gz 8645792
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r1 b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r1
deleted file mode 100644
index a6451299c75a..000000000000
--- a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94c96a0f94ee0d5e41d3dba2188b263d openMotif-2.2.3.tar.gz 5149785
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r2 b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r2
deleted file mode 100644
index a6451299c75a..000000000000
--- a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94c96a0f94ee0d5e41d3dba2188b263d openMotif-2.2.3.tar.gz 5149785
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r4.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r4.ebuild
deleted file mode 100644
index bdd85ddf2fbd..000000000000
--- a/x11-libs/openmotif/openmotif-2.1.30-r4.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r4.ebuild,v 1.14 2005/02/01 18:27:16 lanius Exp $
-
-inherit eutils
-
-MY_P=${P}-4_MLI.src
-S=${WORKDIR}/motif
-DESCRIPTION="Open Motif (Metrolink Bug Fix Release)"
-SRC_URI="ftp://ftp.metrolink.com/pub/openmotif/2.1.30-4/${MY_P}.tar.gz"
-HOMEPAGE="http://www.openmotif.org/"
-LICENSE="MOTIF"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 mips"
-IUSE=""
-DEPEND="virtual/libc
-	virtual/x11
-	>=sys-apps/sed-4"
-
-SLOT="0"
-
-PROVIDE="virtual/motif"
-
-# glibc-2.3.2-r1/gcc-3.2.3 /w `-mcpu=athlon-xp -O2', right-clicking
-# in nedit triggers DPMS monitor standby instead of popping up the 
-# context menu.  this doesn't happen on my `stable' test partition 
-# where everything is compiled i686, nor with most non-essential 
-# packages athlon-xp and only motif i686.  needs investigation.
-inherit flag-o-matic
-replace-flags "-mcpu=athlon-xp" "-mcpu=i686"
-
-pkg_setup() {
-	# multilib includes don't work right in this package...
-	[ -n "${ABI}" ] && append-flags "-I/usr/include/gentoo-multilib/${ABI}"
-}
-
-src_unpack() {
-	local cfg="${S}/config/cf/site.def"
-
-	unpack ${A}
-	cd ${S}
-	ebegin "adjusting file permissions"
-	chmod -R ug+w .
-	eend $? || die
-
-	ebegin "setting up site.def"
-	cp ${FILESDIR}/site.def ${S}/config/cf/ && \
-	echo >>$cfg && \
-	echo >>$cfg "#undef  OptimizedCDebugFlags" && \
-	echo >>$cfg "#define OptimizedCDebugFlags ${CFLAGS}" && \
-	echo >>$cfg "#undef  OptimizedCplusplusDebugFlags" && \
-	echo >>$cfg "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}"
-	eend $? || die
-
-	sed -i -e "s:#define USE_BYACC               YES:#undef USE_BYACC:" config/cf/host.def
-
-	# move `system.mwmrc' from `lib/X11' to `lib/X11/mwm' (but install into
-	# `/etc/X11/mwm')
-	ebegin "patching 'clients/mwm/Imakefile' (mwm confdir)"
-	LC_ALL="C" sed -i \
-	  -e 's:\(SpecialObjectRule.*WmResParse\.o.*/lib/X11\)\(.*\):\1/mwm\2:'\
-	  -e 's:\(InstallNonExecFile.system\.mwmrc,\).*/lib/X11\(.*\):\1/etc/X11/mwm\2:'\
-	    "${S}/clients/mwm/Imakefile"
-	eend $? || die
-	#
-
-	epatch ${FILESDIR}/${P}-imake-tmpdir.patch
-	# compile on gcc 2.9x
-	epatch ${FILESDIR}/${P}-imake-ansi.patch
-}
-
-src_compile() {
-	mkdir -p imports/x11
-	cd imports/x11
-	ln -s /usr/X11R6/bin bin
-	ln -s /usr/X11R6/include include
-	ln -s /usr/X11R6/lib lib
-	cd ${S}
-	make World || die
-}
-
-src_install() {
-	make DESTDIR=${D} VARDIR=${D}/var/X11/ install || die "make install"
-	make DESTDIR=${D} install.man || die "make install.man"
-
-	# these overlap with X11
-	local NOINSTBIN="imake lndir makedepend makeg mergelib mkdirhier xmkmf"
-	local NOINSTMAN1="imake lndir makedepend makeg mkdirhier xmkmf"
-
-	einfo "Cleaning up X11 stuff"
-	rm -fR ${D}/etc
-	for nib in ${NOINSTBIN}; do
-		f="${D}usr/X11R6/bin/${nib}"; rm "$f" || die "rm $f"
-	done
-	for nim in ${NOINSTMAN1}; do
-		f="${D}usr/X11R6/man/man1/${nim}.1x"; rm "$f" || die "rm $f"
-	done
-	rm -rf "${D}usr/X11R6/lib/X11" || die "rm config"
-	rm -rf "${D}usr/X11R6/lib/bindings" || die "rm bindings"
-
-	einfo "Fixing docs"
-	dodoc README COPYRIGHT.MOTIF RELEASE RELNOTES
-	dodoc BUGREPORT OPENBUGS CLOSEDBUGS
-}
-
-pkg_postinst() {
-	ewarn "This might break applications linked against libXm.so.3"
-	ewarn "Just rebuild these applications."
-}
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r5.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r5.ebuild
deleted file mode 100644
index 06977e8989f0..000000000000
--- a/x11-libs/openmotif/openmotif-2.1.30-r5.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r5.ebuild,v 1.22 2005/02/01 18:27:16 lanius Exp $
-
-inherit eutils flag-o-matic
-
-MY_P=${P}-4_MLI.src
-S=${WORKDIR}/motif
-DESCRIPTION="Open Motif (Metrolink Bug Fix Release)"
-HOMEPAGE="http://www.openmotif.org/"
-SRC_URI="ftp://ftp.metrolink.com/pub/openmotif/2.1.30-4/${MY_P}.tar.gz"
-
-LICENSE="MOTIF"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ppc-macos sparc x86"
-IUSE=""
-
-PROVIDE="virtual/motif"
-
-DEPEND="virtual/libc
-	virtual/x11
-	>=sys-apps/sed-4"
-
-pkg_setup() {
-	# multilib includes don't work right in this package...
-	[ -n "${ABI}" ] && append-flags "-I/usr/include/gentoo-multilib/${ABI}"
-}
-
-src_unpack() {
-	local cfg="${S}/config/cf/site.def"
-
-	unpack ${A}
-	cd ${S}
-	ebegin "adjusting file permissions"
-	chmod -R ug+w .
-	eend $? || die
-
-	ebegin "setting up site.def"
-	cp ${FILESDIR}/site.def.1 ${S}/config/cf/site.def && \
-	echo >>$cfg && \
-	echo >>$cfg "#undef  OptimizedCDebugFlags" && \
-	echo >>$cfg "#define OptimizedCDebugFlags ${CFLAGS}" && \
-	echo >>$cfg "#undef  OptimizedCplusplusDebugFlags" && \
-	echo >>$cfg "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}" &&\
-	echo >>$cfg "#undef  LinuxCLibMajorVersion" && \
-	echo >>$cfg "#define  LinuxCLibMajorVersion 6"
-	eend $? || die
-
-	sed -i -e "s:#define USE_BYACC               YES:#undef USE_BYACC:" config/cf/host.def
-
-	# move `system.mwmrc' from `lib/X11' to `lib/X11/mwm' (but install into
-	# `/etc/X11/mwm')
-	ebegin "patching 'clients/mwm/Imakefile' (mwm confdir)"
-	LC_ALL="C" sed -i \
-	  -e 's:\(SpecialObjectRule.*WmResParse\.o.*/lib/X11\)\(.*\):\1/mwm\2:'\
-	  -e 's:\(InstallNonExecFile.system\.mwmrc,\).*/lib/X11\(.*\):\1/etc/X11/mwm\2:'\
-	    "${S}/clients/mwm/Imakefile"
-	eend $? || die
-	#
-
-	epatch ${FILESDIR}/${P}-imake-tmpdir.patch
-	# compile on gcc 2.9x
-	epatch ${FILESDIR}/${P}-imake-ansi.patch
-	epatch ${FILESDIR}/${P}-uil-bad_grammar_fix.diff
-	use ppc-macos && epatch ${FILESDIR}/${P}-darwin-netbsd.diff
-}
-
-src_compile() {
-	# glibc-2.3.2-r1/gcc-3.2.3 /w `-mcpu=athlon-xp -O2', right-clicking
-	# in nedit triggers DPMS monitor standby instead of popping up the 
-	# context menu.  this doesn't happen on my `stable' test partition 
-	# where everything is compiled i686, nor with most non-essential 
-	# packages athlon-xp and only motif i686.  needs investigation.
-	replace-flags "-mcpu=athlon-xp" "-mcpu=i686"
-
-	# fails to copmile with -jx
-	export MAKEOPTS="${MAKEOPTS} -j1"
-
-	mkdir -p imports/x11
-	cd imports/x11
-	ln -s /usr/X11R6/bin bin
-	ln -s /usr/X11R6/include include
-	ln -s /usr/X11R6/lib lib
-	cd ${S}
-	make World || make World || die
-}
-
-src_install() {
-	make DESTDIR=${D} VARDIR=${D}/var/X11/ install || die "make install"
-	make DESTDIR=${D} install.man || die "make install.man"
-
-	# these overlap with X11
-	local NOINSTBIN="imake lndir makedepend makeg mergelib mkdirhier xmkmf"
-	local NOINSTMAN1="imake lndir makedepend makeg mkdirhier xmkmf"
-
-	einfo "Cleaning up X11 stuff"
-	rm -fR ${D}/etc
-	for nib in ${NOINSTBIN}; do
-		f="${D}usr/X11R6/bin/${nib}"; rm "$f" || die "rm $f"
-	done
-	for nim in ${NOINSTMAN1}; do
-		if useq ppc-macos || useq macos ; then
-			f="${D}usr/X11R6/man/man1/${nim}.1"
-		else
-			f="${D}usr/X11R6/man/man1/${nim}.1x"
-		fi
-		 rm "$f" || die "rm $f"
-	done
-	rm -rf "${D}usr/X11R6/lib/X11" || die "rm config"
-	rm -rf "${D}usr/X11R6/lib/bindings" || die "rm bindings"
-
-	einfo "Fixing docs"
-	dodoc README COPYRIGHT.MOTIF RELEASE RELNOTES
-	dodoc BUGREPORT OPENBUGS CLOSEDBUGS
-}
-
-pkg_postinst() {
-	ewarn "This might break applications linked against libXm.so.3"
-	ewarn "Just rebuild these applications."
-}
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r8.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r8.ebuild
deleted file mode 100644
index a912baa30297..000000000000
--- a/x11-libs/openmotif/openmotif-2.1.30-r8.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r8.ebuild,v 1.5 2005/03/02 17:01:34 lanius Exp $
-
-inherit eutils flag-o-matic multilib
-
-MY_P=${P}-4_MLI.src
-S=${WORKDIR}/motif
-DESCRIPTION="Open Motif (Metrolink Bug Fix Release)"
-HOMEPAGE="http://www.openmotif.org/"
-SRC_URI="ftp://ftp.metrolink.com/pub/openmotif/2.1.30-4/${MY_P}.tar.gz"
-
-LICENSE="MOTIF"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-PROVIDE="virtual/motif"
-
-RDEPEND="virtual/libc
-	virtual/x11
-	x11-libs/motif-config"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-SLOT="2.1"
-
-pkg_setup() {
-	# multilib includes don't work right in this package...
-	[ -n "${ABI}" ] && append-flags "-I/usr/include/gentoo-multilib/${ABI}"
-}
-
-src_unpack() {
-	local cfg="${S}/config/cf/site.def"
-
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch.bz2
-	epatch ${FILESDIR}/${P}-CAN-2004-0914-newer.patch.bz2
-	epatch ${FILESDIR}/${P}-CAN-2004-0914_sec8.patch
-	epatch ${FILESDIR}/CAN-2005-0605.patch
-
-	ebegin "adjusting file permissions"
-	chmod -R ug+w .
-	eend $? || die
-
-	ebegin "setting up site.def"
-	cp ${FILESDIR}/site.def ${S}/config/cf/site.def && \
-	echo >>$cfg && \
-	echo >>$cfg "#undef  OptimizedCDebugFlags" && \
-	echo >>$cfg "#define OptimizedCDebugFlags ${CFLAGS}" && \
-	echo >>$cfg "#undef  OptimizedCplusplusDebugFlags" && \
-	echo >>$cfg "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}" &&\
-	echo >>$cfg "#undef  LinuxCLibMajorVersion" && \
-	echo >>$cfg "#define  LinuxCLibMajorVersion 6"
-	eend $? || die
-
-
-	# move `system.mwmrc' from `lib/X11' to `lib/X11/mwm'
-	ebegin "patching 'clients/mwm/Imakefile' (mwm confdir)"
-	LC_ALL="C" sed -i \
-	  -e 's:\(SpecialObjectRule.*WmResParse\.o.*/lib/X11\)\(.*\):\1/mwm\2:'\
-	  -e 's:\(InstallNonExecFile.system\.mwmrc,\).*/lib/X11\(.*\):\1/etc/X11/mwm\2:'\
-	    "${S}/clients/mwm/Imakefile"
-	eend $? || die
-
-	epatch ${FILESDIR}/${PN}-2.1.30-imake-tmpdir.patch
-	# compile on gcc 2.9x
-	epatch ${FILESDIR}/${PN}-2.1.30-imake-ansi.patch
-	epatch ${FILESDIR}/${PN}-2.1.30-uil-bad_grammar_fix.diff
-	use ppc-macos && epatch ${FILESDIR}/${PN}-2.1.30-darwin-netbsd.diff
-}
-
-src_compile() {
-	# glibc-2.3.2-r1/gcc-3.2.3 /w `-mcpu=athlon-xp -O2', right-clicking
-	# in nedit triggers DPMS monitor standby instead of popping up the 
-	# context menu.  this doesn't happen on my `stable' test partition 
-	# where everything is compiled i686, nor with most non-essential 
-	# packages athlon-xp and only motif i686.  needs investigation.
-	replace-flags "-mcpu=athlon-xp" "-mcpu=i686"
-
-	# fails to copmile with -jx
-	export MAKEOPTS="${MAKEOPTS} -j1"
-
-	mkdir -p imports/x11
-	cd imports/x11
-	ln -s /usr/X11R6/bin bin
-	ln -s /usr/X11R6/include include
-	ln -s /usr/X11R6/lib lib
-	cd ${S}
-	make World || make World || die
-}
-
-src_install() {
-	make DESTDIR=${D} VARDIR=${D}/var install || die "make install"
-	make DESTDIR=${D} install.man || die "make install.man"
-
-	# cleanups
-	local NOINSTBIN="imake lndir makedepend makeg mergelib mkdirhier xmkmf"
-	local NOINSTMAN1="imake lndir makedepend makeg mkdirhier xmkmf"
-
-	rm -fR ${D}/etc
-	for nib in ${NOINSTBIN}; do
-		f="${D}/usr/X11R6/bin/${nib}"; rm "$f" || die "rm $f"
-	done
-	for nim in ${NOINSTMAN1}; do
-		if useq ppc-macos ; then
-			f="${D}/usr/X11R6/man/man1/${nim}.1"
-		else
-			f="${D}/usr/X11R6/man/man1/${nim}.1x"
-		fi
-		 rm "$f" || die "rm $f"
-	done
-	rm -rf "${D}/usr/X11R6/lib/X11" || die "rm config"
-	rm -rf "${D}/usr/X11R6/include/X11" || die "rm config"
-	rm -rf "${D}/usr/X11R6/lib/bindings" || die "rm bindings"
-
-	dodir /usr/share/man
-	mv ${D}/usr/X11R6/man/* ${D}/usr/share/man/
-	dodir /usr/bin
-	mv ${D}/usr/X11R6/bin/* ${D}/usr/bin/
-	dodir /usr/include
-	mv ${D}/usr/X11R6/include/* ${D}/usr/include/
-	dodir /usr/$(get_libdir)
-	mv ${D}/usr/X11R6/lib/* ${D}/usr/$(get_libdir)/
-	rm -fR ${D}/usr/X11R6
-
-
-	einfo "Fixing binaries"
-	for file in `ls ${D}/usr/bin`
-	do
-		mv ${D}/usr/bin/${file} ${D}/usr/bin/${file}-openmotif-2.1
-	done
-
-	einfo "Fixing libraries"
-	dodir /usr/$(get_libdir)/openmotif-2.1
-	mv ${D}/usr/$(get_libdir)/* ${D}/usr/$(get_libdir)/openmotif-2.1/
-
-	einfo "Fixing includes"
-	dodir /usr/include/openmotif-2.1/
-	mv ${D}/usr/include/* ${D}/usr/include/openmotif-2.1
-
-	einfo "Fixing man pages"
-	mans="1 3 5 7"
-	for man in $mans; do
-		dodir /usr/share/man/man${man}
-		for file in `ls ${D}/usr/share/man/man${man}`
-		do
-			file=${file/.${man}x/}
-			mv ${D}/usr/share/man/man$man/${file}.${man}x ${D}/usr/share/man/man${man}/${file}-openmotif-2.1.${man}
-		done
-	done
-
-	dodoc README COPYRIGHT.MOTIF RELEASE RELNOTES
-	dodoc BUGREPORT OPENBUGS CLOSEDBUGS
-}
-
-# Profile stuff
-pkg_postinst() {
-	motif-config --install openmotif-2.1
-}
-
-pkg_prerm() {
-	motif-config --uninstall openmotif-2.1
-}
diff --git a/x11-libs/openmotif/openmotif-2.2.3-r1.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r1.ebuild
deleted file mode 100644
index a81e2ed55f06..000000000000
--- a/x11-libs/openmotif/openmotif-2.2.3-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r1.ebuild,v 1.13 2005/02/21 18:35:28 lanius Exp $
-
-inherit eutils libtool flag-o-matic multilib
-
-MY_P=${P/m/M}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Open Motif"
-HOMEPAGE="http://www.motifzone.org/"
-SRC_URI="ftp://ftp.motifzone.net/om${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="MOTIF"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 mips ppc ppc64 ppc-macos sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	virtual/x11
-	>=sys-apps/sed-4
-	!ppc-macos? ( =sys-devel/automake-1.4* )
-	=sys-devel/autoconf-2.5*
-	!virtual/motif"
-RDEPEND="virtual/libc
-	virtual/x11
-	!virtual/motif"
-PROVIDE="virtual/motif"
-
-pkg_setup() {
-	# multilib includes don't work right in this package...
-	[ -n "${ABI}" ] && append-flags "-I/usr/include/gentoo-multilib/${ABI}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# various patches
-	epatch ${FILESDIR}/${P}-mwm-configdir.patch
-	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch.bz2
-	epatch ${FILESDIR}/${P}-CAN-2004-0914-newer.patch.bz2
-	epatch ${FILESDIR}/${P}-CAN-2004-0914_sec8.patch
-	epatch ${FILESDIR}/${P}-char_not_supported.patch
-	epatch ${FILESDIR}/${P}-pixel_length.patch
-	epatch ${FILESDIR}/${P}-popup_timeout.patch
-	epatch ${FILESDIR}/${P}-XmResizeHashTable.patch
-	epatch ${FILESDIR}/${P}-utf8.patch
-	epatch ${FILESDIR}/${P}-no_demos.patch
-	use ppc-macos && epatch ${FILESDIR}/${P}-automake.patch
-
-	# autotool stuff
-	export WANT_AUTOCONF=2.5
-
-	# Patched Makefile.am to work with version 1.6 on ppc-macos.
-	# Untested elsewhere
-	use ppc-macos || export WANT_AUTOMAKE=1.4
-
-	libtoolize --force --copy
-	aclocal || die
-	AUTOMAKE_OPTS="--foreign"
-	# For some reason ppc-macos complains about missing depcomp and compile
-	# files
-	use ppc-macos && AUTOMAKE_OPTS="-a -c -f ${AUTOMAKE_OPTS}"
-	automake ${AUTOMAKE_OPTS} || die
-	autoconf || die
-}
-
-
-src_compile() {
-	# get around some LANG problems in make (#15119)
-	unset LANG
-
-	# bug #80421
-	filter-flags -ftracer
-
-	econf --with-x || die "configuration failed"
-
-	emake -j1 || die "make failed, if you have lesstif installed removed it, compile openmotif and recompile lesstif"
-}
-
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	# move system.mwmrc & create symlink & fix manpages
-	dodir "/etc/X11/mwm"
-	mv "${D}/usr/$(get_libdir)/X11/system.mwmrc" "${D}/etc/X11/mwm/system.mwmrc"
-	dosym "/etc/X11/mwm" "/usr/$(get_libdir)/X11/mwm"
-
-	list="/usr/share/man/man1/mwm.1 /usr/share/man/man4/mwmrc.4"
-	for f in $list; do
-		dosed 's:/usr/lib/X11/\(.*system\\&\.mwmrc\):/etc/X11/mwm/\1:g' "$f"
-		dosed 's:/usr/lib/X11/app-defaults:/etc/X11/app-defaults:g' "$f"
-	done
-
-	# app-defaults/Mwm isn't included anymore as of 2.2
-	insinto /etc/X11/app-defaults
-	newins ${FILESDIR}/${P}-Mwm.defaults Mwm
-
-	# remove unneeded files
-	rm -fR ${D}/usr/$(get_libdir)/X11/bindings
-	rm -fR ${D}/usr/include/X11/bitmaps/
-
-	# install docs
-	dodoc COPYRIGHT.MOTIF LICENSE
-	dodoc README RELEASE RELNOTES
-	dodoc BUGREPORT TODO
-}
-
-pkg_postinst() {
-	ewarn "This breaks applications linked against libXm.so.2."
-	ewarn "You have to rebuild these applications with revdep-rebuild."
-}
diff --git a/x11-libs/openmotif/openmotif-2.2.3-r2.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r2.ebuild
deleted file mode 100644
index e28e80c29590..000000000000
--- a/x11-libs/openmotif/openmotif-2.2.3-r2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r2.ebuild,v 1.4 2005/02/26 21:21:51 j4rg0n Exp $
-
-inherit eutils libtool flag-o-matic multilib
-
-MY_P=${P/m/M}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Open Motif"
-HOMEPAGE="http://www.motifzone.org/"
-SRC_URI="ftp://ftp.motifzone.net/om${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="MOTIF"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	virtual/x11
-	>=sys-apps/sed-4
-	!ppc-macos? ( =sys-devel/automake-1.4* )
-	=sys-devel/autoconf-2.5*
-	x11-libs/motif-config"
-RDEPEND="virtual/libc
-	virtual/x11
-	x11-libs/motif-config"
-
-PROVIDE="virtual/motif"
-SLOT="2.2"
-
-pkg_setup() {
-	# multilib includes don't work right in this package...
-	[ -n "${ABI}" ] && append-flags "-I/usr/include/gentoo-multilib/${ABI}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# various patches
-	epatch ${FILESDIR}/${P}-mwm-configdir.patch
-	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch.bz2
-	epatch ${FILESDIR}/${P}-CAN-2004-0914-newer.patch.bz2
-	epatch ${FILESDIR}/${P}-CAN-2004-0914_sec8.patch
-	epatch ${FILESDIR}/${P}-char_not_supported.patch
-	epatch ${FILESDIR}/${P}-pixel_length.patch
-	epatch ${FILESDIR}/${P}-popup_timeout.patch
-	epatch ${FILESDIR}/${P}-XmResizeHashTable.patch
-	epatch ${FILESDIR}/${P}-utf8.patch
-	epatch ${FILESDIR}/${P}-no_demos.patch
-	use ppc-macos && epatch ${FILESDIR}/${P}-automake.patch
-
-	# autotool stuff
-	export WANT_AUTOCONF=2.5
-
-	# Patched Makefile.am to work with version 1.6 on ppc-macos.
-	# Untested elsewhere
-	use ppc-macos || export WANT_AUTOMAKE=1.4
-
-	libtoolize --force --copy
-	aclocal || die
-	AUTOMAKE_OPTS="--foreign"
-	# For some reason ppc-macos complains about missing depcomp and compile
-	# files
-	use ppc-macos && AUTOMAKE_OPTS="-a -c -f ${AUTOMAKE_OPTS}"
-	automake ${AUTOMAKE_OPTS} || die
-	autoconf || die
-}
-
-
-src_compile() {
-	# get around some LANG problems in make (#15119)
-	unset LANG
-
-	# bug #80421
-	filter-flags -ftracer
-
-	econf --with-x || die "configuration failed"
-
-	emake -j1 || die "make failed, if you have lesstif installed removed it, compile openmotif and recompile lesstif"
-}
-
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	# cleanups
-	rm -fR ${D}/usr/$(get_libdir)/X11
-	rm -fR ${D}/usr/$(get_libdir)/X11/bindings
-	rm -fR ${D}/usr/include/X11/
-
-	list="/usr/share/man/man1/mwm.1 /usr/share/man/man4/mwmrc.4"
-	for f in $list; do
-		dosed 's:/usr/lib/X11/\(.*system\\&\.mwmrc\):/etc/X11/mwm/\1:g' "$f"
-		dosed 's:/usr/lib/X11/app-defaults:/etc/X11/app-defaults:g' "$f"
-	done
-
-
-	einfo "Fixing binaries"
-	for file in `ls ${D}/usr/bin`
-	do
-		mv ${D}/usr/bin/${file} ${D}/usr/bin/${file}-openmotif-2.2
-	done
-
-	einfo "Fixing libraries"
-	dodir /usr/$(get_libdir)/openmotif-2.2
-	mv ${D}/usr/$(get_libdir)/* ${D}/usr/$(get_libdir)/openmotif-2.2/
-
-	einfo "Fixing includes"
-	dodir /usr/include/openmotif-2.2/
-	mv ${D}/usr/include/* ${D}/usr/include/openmotif-2.2
-
-	einfo "Fixing man pages"
-	mans="1 3 4 5"
-	for man in $mans; do
-		dodir /usr/share/man/man${man}
-		for file in `ls ${D}/usr/share/man/man${man}`
-		do
-			file=${file/.${man}/}
-			mv ${D}/usr/share/man/man$man/${file}.${man} ${D}/usr/share/man/man${man}/${file}-openmotif-2.2.${man}
-		done
-	done
-
-
-	# install docs
-	dodoc COPYRIGHT.MOTIF LICENSE
-	dodoc README RELEASE RELNOTES
-	dodoc BUGREPORT TODO
-}
-
-# Profile stuff
-pkg_postinst() {
-	motif-config --install openmotif-2.2
-}
-
-pkg_prerm() {
-	motif-config --uninstall openmotif-2.2
-}