removed openmotif-2.2; marked 2.1.30-r3 stable

8 files changed, 10 insertions, 410 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 332e98da2d51..e1efe4d754c5 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/openmotif
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.29 2003/12/23 13:39:32 lanius Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.30 2004/01/11 13:54:23 lanius Exp $
+
+  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org> openmotif-2.1.30-r3.ebuild,
+  openmotif-2.2.2-r1.ebuild, openmotif-2.2.2-r2.ebuild,
+  openmotif-2.2.2-r3.ebuild:
+  removed openmotif-2.2; marked 2.1.30-r3 stable
 
   16 Dec 2003; <agriffis@gentoo.org> openmotif-2.2.2-r3.ebuild:
   stable on ia64
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.2.2-r1 b/x11-libs/openmotif/files/digest-openmotif-2.2.2-r1
deleted file mode 100644
index 8ac1a71d0eb5..000000000000
--- a/x11-libs/openmotif/files/digest-openmotif-2.2.2-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 19cb43c657876624026a9e77c435a71e openMotif-2.2.2.tar.gz 5133178
-MD5 c7e020b2a0c13fd4394f171a453fa5b6 openMotif-cvs.diff.bz2 2907505
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.2.2-r2 b/x11-libs/openmotif/files/digest-openmotif-2.2.2-r2
deleted file mode 100644
index e91e220e3840..000000000000
--- a/x11-libs/openmotif/files/digest-openmotif-2.2.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19cb43c657876624026a9e77c435a71e openMotif-2.2.2.tar.gz 5133178
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.2.2-r3 b/x11-libs/openmotif/files/digest-openmotif-2.2.2-r3
deleted file mode 100644
index e91e220e3840..000000000000
--- a/x11-libs/openmotif/files/digest-openmotif-2.2.2-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19cb43c657876624026a9e77c435a71e openMotif-2.2.2.tar.gz 5133178
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild
index c3b26179759a..3591823b7866 100644
--- a/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild
+++ b/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild,v 1.8 2003/12/23 13:52:58 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild,v 1.9 2004/01/11 13:54:23 lanius Exp $
 
 MY_P=${P}-4_MLI.src
 S=${WORKDIR}/motif
@@ -8,7 +8,7 @@ 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.metrolink.com/openmotif/"
 LICENSE="MOTIF"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
 
 DEPEND="virtual/glibc
 	virtual/x11"
diff --git a/x11-libs/openmotif/openmotif-2.2.2-r1.ebuild b/x11-libs/openmotif/openmotif-2.2.2-r1.ebuild
deleted file mode 100644
index 68b5b896f20e..000000000000
--- a/x11-libs/openmotif/openmotif-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.2-r1.ebuild,v 1.13 2003/12/16 12:33:16 gmsoft Exp $
-
-S=${WORKDIR}/openMotif-2.2.2
-
-DESCRIPTION="Open Motif"
-SRC_URI="ftp://ftp.sgi.com/other/motifzone/2.2/src/openMotif-2.2.2.tar.gz"
-HOMEPAGE="http://www.motifzone.org/"
-PROVIDE="virtual/motif"
-
-LICENSE="MOTIF"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc alpha amd64"
-
-DEPEND="virtual/glibc
-	virtual/x11"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/animate-demo.diff || die "patch failed"
-	patch -p1 < ${FILESDIR}/include-order.diff || die "patch failed"
-}
-
-src_compile() {
-	# get around some LANG problems in make (#15119)
-	unset LANG
-
-	./configure \
-		--prefix=/usr/X11R6 \
-		--sysconfdir=/etc/X11 \
-		--with-x \
-		--with-gnu-ld \
-		--host=${CHOST} || die "configuration failed"
-
-	make || die "make failed"
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} VARDIR=${D}/var/X11/ install || die "install failed"
-
-}
diff --git a/x11-libs/openmotif/openmotif-2.2.2-r2.ebuild b/x11-libs/openmotif/openmotif-2.2.2-r2.ebuild
deleted file mode 100644
index 271db9364e5b..000000000000
--- a/x11-libs/openmotif/openmotif-2.2.2-r2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.2-r2.ebuild,v 1.9 2003/11/30 12:17:51 lanius Exp $
-
-inherit libtool
-
-MY_P=${P/m/M}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Open Motif"
-HOMEPAGE="http://www.motifzone.org/"
-SRC_URI="ftp://ftp.sgi.com/other/motifzone/2.2/src/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MOTIF"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha"
-
-PROVIDE="virtual/motif"
-
-RDEPEND="virtual/x11"
-DEPEND=">=sys-apps/sed-4"
-
-src_unpack() {
-
-	local f list
-
-	unpack ${A}
-	cd ${S}
-
-	#
-	# Don't compile/install demo programs.
-	#   They're meant to demonstrate programming techniques and features
-	#   of motif, but are of limited to no use for end users.  Further,
-	#   those progs that demonstrate Uil/Mrm functionality won't even work
-	#   because their data(.uid) files are installed in nonstandard places,
-	#   /usr/X11R6/share/Xm/<progname> (see `man MrmOpenHierarchy' for
-	#   locations Mrm expects them to be).  Most of the demos also don't
-	#   have compiled in fallback resources and will not work correctly
-	#   without their app-defaults files installed.
-	#
-	#   So there a basically 4 choices:
-	#	a) add wrappers that set XAPPLRESDIR and UIDPATH,
-	#	b) clutter two more system directories with demo related files,
-	#	c) put sources, data, binaries AND wrappers in
-	#	   /usr/X11R6/share/Xm/ (move this to X11R6/lib/X11/Xm/demos ?),
-	#	OR
-	#	D) don't install them at all.
-	#
-	#
-	ebegin "patching configure.in (no-demos patch)..."
-	sed -i 's:^\(demos/.*\):dnl \1:g' configure.in
-	eend $?
-
-	ebegin "patching toplevel Makefile.am (no-demos patch)..."
-	sed -i -e 's/\(\s*doc\) \\$/\1/' -e '/\s*demos$/d' Makefile.am
-	eend $?
-
-	#
-	# fix include order (#6536):
-	#   This replaces `include-order.diff'.  Had to change this patch so
-	#   it modifies Makefile.am instead of Makefile.in because rerunning
-	#   autotools below would undo any changes made to Makefile.in.
-	#   Added `clients/mwm/WmWsmLib/' to the list.
-	#
-	ebegin "fixing include order..."
-	list="tools/wml/Makefile.am clients/mwm/WmWsmLib/Makefile.am"
-	for f in ${list}; do
-		einfo "    ...${f}"
-		sed -i 's:\(^INCLUDES =\) \(\${X_CFLAGS}\) \(.*\):\1 \3 \2:' ${f}
-	done
-	eend $?
-	unset f list
-
-	#
-	# move `system.mwmrc' from /usr/X11R6/lib/X11 to /etc/X11/mwm (FHS).
-	#   Just symlinking `system.mwmrc' isn't enough here because mwm
-	#   also looks for localized verions in `$LANG/system.mwmrc'.
-	#   Instead, this patch changes the default location from
-	#   `/usr/X11R6/lib/X11/' to `/usr/X11R6/lib/X11/mwm/', which will
-	#   be symlinked to /etc/X11/mwm/ in src_install().
-	#
-	epatch "$FILESDIR/mwm-configdir.patch"
-
-	#
-	# missing srcfile in demos/programs/animate
-	#
-	#einfo "creating missing file demos/programs/animate/animate.c"
-	#touch demos/programs/animate/animate.c
-
-	#
-	# Rebuild libtool (#15119, #20540, #21681)
-	#
-	elibtoolize
-
-	#
-	# Rebuild configure, Makefile.in
-	#
-	einfo "  ...aclocal..."
-	aclocal || die "aclocal failed"
-	einfo "  ...automake..."
-	automake --foreign || die "automake failed"
-	einfo "  ...autoconf..."
-	autoconf || die "autoconf failed"
-}
-
-
-src_compile() {
-	# get around some LANG problems in make (#15119)
-	unset LANG
-
-	./configure \
-		--prefix=/usr/X11R6 \
-		--sysconfdir=/etc/X11 \
-		--with-x \
-		--with-gnu-ld \
-		--host=${CHOST} || die "configuration failed"
-
-	make || die "make failed, if you have lesstif installed removed it, compile openmotif and recompile lesstif"
-}
-
-
-src_install() {
-
-	local f list
-
-	make \
-		DESTDIR=${D} \
-		VARDIR=${D}/var/X11/ install || die "make install failed"
-
-	#
-	# patch manpages to reflect actual location of configuration files
-	#
-	einfo "fixing manpages..."
-	list="/usr/X11R6/man/man1/mwm.1 /usr/X11R6/man/man4/mwmrc.4"
-	for f in $list; do
-		einfo "    ...${D}/$f"
-		dosed 's:/usr/X11R6/lib/X11/\(.*system\\&\.mwmrc\):/etc/X11/mwm/\1:g' "$f"
-		dosed 's:/usr/X11R6/lib/X11/app-defaults:/etc/X11/app-defaults:g' "$f"
-	done
-	unset f list
-
-	#
-	# prepallman looks for manpages in /usr/X11R6/share/man while X11 uses
-	# /usr/X11R6/man, so we'll have to compress them ourselves...
-	#
-	einfo "gzipping manpages..."
-	prepman "/usr/X11R6"
-
-	#
-	# move system.mwmrc & create symlink
-	#
-	einfo "moving system.mwmrc..."
-	dodir "/etc/X11/mwm"
-	mv "${D}/usr/X11R6/lib/X11/system.mwmrc" \
-	   "${D}/etc/X11/mwm/system.mwmrc" || die "mv system.mwmrc"
-	ln -s "../../../../etc/X11/mwm" \
-	      "${D}/usr/X11R6/lib/X11/mwm" || die "ln -s confdir"
-
-
-	#
-	# app-defaults/Mwm isn't included anymore as of 2.2.2
-	#
-	einfo "creating mwm app-defaults file..."
-	insinto /etc/X11/app-defaults
-	newins ${FILESDIR}/Mwm.defaults Mwm
-
-	einfo "installing docs..."
-	dodoc COPYRIGHT.MOTIF LICENSE
-	dodoc README RELEASE RELNOTES
-	dodoc BUGREPORT OPENBUGS CLOSEDBUGS
-}
diff --git a/x11-libs/openmotif/openmotif-2.2.2-r3.ebuild b/x11-libs/openmotif/openmotif-2.2.2-r3.ebuild
deleted file mode 100644
index 424e290bff96..000000000000
--- a/x11-libs/openmotif/openmotif-2.2.2-r3.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.2-r3.ebuild,v 1.9 2003/12/16 23:13:15 agriffis Exp $
-
-inherit libtool motif
-
-MY_P=${P/m/M}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Open Motif"
-HOMEPAGE="http://www.motifzone.org/"
-SRC_URI="ftp://ftp.sgi.com/other/motifzone/2.2/src/${MY_P}.tar.gz"
-
-SLOT="2.2"
-LICENSE="MOTIF"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~amd64 ia64"
-
-PROVIDE="virtual/motif"
-
-RDEPEND="virtual/x11"
-DEPEND=">=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	#
-	# Don't compile/install demo programs.
-	#   They're meant to demonstrate programming techniques and features
-	#   of motif, but are of limited to no use for end users.  Further,
-	#   those progs that demonstrate Uil/Mrm functionality won't even work
-	#   because their data(.uid) files are installed in nonstandard places,
-	#   /usr/X11R6/share/Xm/<progname> (see `man MrmOpenHierarchy' for
-	#   locations Mrm expects them to be).  Most of the demos also don't
-	#   have compiled in fallback resources and will not work correctly
-	#   without their app-defaults files installed.
-	#
-	#   So there a basically 4 choices:
-	#	a) add wrappers that set XAPPLRESDIR and UIDPATH,
-	#	b) clutter two more system directories with demo related files,
-	#	c) put sources, data, binaries AND wrappers in
-	#	   /usr/X11R6/share/Xm/ (move this to X11R6/lib/X11/Xm/demos ?),
-	#	OR
-	#	D) don't install them at all.
-	#
-	#
-	ebegin "patching configure.in (no-demos patch)..."
-	sed -i 's:^\(demos/.*\):dnl \1:g' configure.in
-	eend $?
-
-	ebegin "patching toplevel Makefile.am (no-demos patch)..."
-	sed -i -e 's/\(\s*doc\) \\$/\1/' -e '/\s*demos$/d' Makefile.am
-	eend $?
-
-	#
-	# fix include order (#6536):
-	#   This replaces `include-order.diff'.  Had to change this patch so
-	#   it modifies Makefile.am instead of Makefile.in because rerunning
-	#   autotools below would undo any changes made to Makefile.in.
-	#   Added `clients/mwm/WmWsmLib/' to the list.
-	#
-	ebegin "fixing include order..."
-	list="tools/wml/Makefile.am clients/mwm/WmWsmLib/Makefile.am"
-	for f in ${list}; do
-		einfo "    ...${f}"
-		sed -i 's:\(^INCLUDES =\) \(\${X_CFLAGS}\) \(.*\):\1 \3 \2:' ${f}
-	done
-	eend $?
-	unset f list
-
-	#
-	# move `system.mwmrc' from /usr/X11R6/lib/X11 to /etc/X11/mwm (FHS).
-	#   Just symlinking `system.mwmrc' isn't enough here because mwm
-	#   also looks for localized verions in `$LANG/system.mwmrc'.
-	#   Instead, this patch changes the default location from
-	#   `/usr/X11R6/lib/X11/' to `/usr/X11R6/lib/X11/mwm/', which will
-	#   be symlinked to /etc/X11/mwm/.
-	#
-	epatch "$FILESDIR/mwm-configdir.patch"
-
-	#
-	# Rebuild libtool (#15119, #20540, #21681)
-	#
-	elibtoolize
-
-	#
-	# Rebuild configure, Makefile.in
-	#
-	einfo "  ...aclocal..."
-	aclocal || die "aclocal failed"
-	einfo "  ...automake..."
-	automake --foreign || die "automake failed"
-	einfo "  ...autoconf..."
-	autoconf || die "autoconf failed"
-}
-
-
-src_compile() {
-	# get around some LANG problems in make (#15119)
-	unset LANG
-
-	./configure \
-		--prefix=/usr/X11R6 \
-		--sysconfdir=/etc/X11 \
-		--with-x \
-		--with-gnu-ld \
-		--host=${CHOST} || die "configuration failed"
-
-	make || die "make failed, if you have lesstif installed removed it, compile openmotif and recompile lesstif"
-}
-
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		VARDIR=${D}/var/X11/ install || die "make install failed"
-
-
-	einfo "Fixing includes"
-	dodir /usr/include/Mrm/2.2/Mrm
-	dodir /usr/include/Xm/2.2/Xm
-	dodir /usr/include/uil/2.2/uil
-
-	mv ${D}/usr/X11R6/include/Mrm/*.h ${D}/usr/include/Mrm/2.2/Mrm
-	mv ${D}/usr/X11R6/include/Xm/*.h ${D}/usr/include/Xm/2.2/Xm
-	mv ${D}/usr/X11R6/include/uil/*.h ${D}/usr/include/uil/2.2/uil
-
-
-	einfo "Fixing binaries"
-	dodir /usr/bin
-	for file in `ls ${D}/usr/X11R6/bin`
-	do
-		mv ${D}/usr/X11R6/bin/${file} ${D}/usr/bin/${file}-2.2
-	done
-
-
-	einfo "Fixing libraries"
-	dodir /usr/lib/motif/2.2
-	mv ${D}/usr/X11R6/lib/lib* ${D}/usr/lib/motif/2.2
-
-	for lib in libMrm.so.3 libMrm.so.3.0.1 \
-		libXm.so.3 libXm.so.3.0.1 \
-		libUil.so.3 libUil.so.3.0.1
-	do
-		dosym "/usr/lib/motif/2.2/${lib}"\
-			"/usr/lib/${lib}"
-	done
-
-
-	einfo "Fixing man pages"
-	dodir /usr/share/man/man1
-	dodir /usr/share/man/man3
-	dodir /usr/share/man/man4
-	dodir /usr/share/man/man5
-
-	for file in `ls ${D}/usr/X11R6/man/man1`
-	do
-		file=${file/.1/}
-		mv ${D}/usr/X11R6/man/man1/${file}.1 ${D}/usr/share/man/man1/${file}-22.1
-	done
-	for file in `ls ${D}/usr/X11R6/man/man3`
-	do
-		file=${file/.3/}
-		mv ${D}/usr/X11R6/man/man3/${file}.3 ${D}/usr/share/man/man3/${file}-22.3
-	done
-	for file in `ls ${D}/usr/X11R6/man/man4`
-	do
-		file=${file/.4/}
-		mv ${D}/usr/X11R6/man/man4/${file}.4 ${D}/usr/share/man/man4/${file}-22.4
-	done
-	for file in `ls ${D}/usr/X11R6/man/man5`
-	do
-		file=${file/.5/}
-		mv ${D}/usr/X11R6/man/man5/${file}.5 ${D}/usr/share/man/man5/${file}-22.5
-	done
-
-
-	einfo "Cleaning up"
-	rm -fR ${D}/usr/X11R6/
-
-
-	einfo "Fixing docs"
-	dodoc COPYRIGHT.MOTIF LICENSE
-	dodoc README RELEASE RELNOTES
-	dodoc BUGREPORT OPENBUGS CLOSEDBUGS
-}