mark -r4 stable, remove all other versions

8 files changed, 8 insertions, 177 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index c8fcf78d1acb..c586ba3e05f0 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.35 2004/01/19 11:20:59 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.36 2004/01/27 20:46:35 lanius Exp $
+
+  27 Jan 2004; Heinrich Wendel <lanius@gentoo.org> openmotif-2.1.30-r3.ebuild,
+  openmotif-2.1.30-r4.ebuild, files/Mwm.defaults, files/animate-demo.diff,
+  files/include-order.diff, files/mwm-configdir.patch:
+  mark -r4 stable, remove all other versions
 
 *openmotif-2.1.30-r4 (19 Jan 2004)
 
diff --git a/x11-libs/openmotif/files/Mwm.defaults b/x11-libs/openmotif/files/Mwm.defaults
deleted file mode 100644
index ea91b6fb8d86..000000000000
--- a/x11-libs/openmotif/files/Mwm.defaults
+++ /dev/null
@@ -1,14 +0,0 @@
-Mwm*fontList:			variable
-Mwm*iconClick:			False
-Mwm*iconPlacement:		top left
-Mwm*moveOpaque:			True
-Mwm*rootButtonClick:		True
-Mwm*foreground:			#000000
-Mwm*background:			#B8B8C0
-Mwm*enableThinThickness:	True
-Mwm*enableEtchedInMenu:		True
-Mwm*menu*fontList:		-adobe-helvetica-medium-r-*--*-120-*-*-*-*-*-*
-Mwm*client*title*fontList:	-adobe-helvetica-bold-r-*--*-100-*-*-*-*-*-*
-Mwm*icon*fontList:		-adobe-helvetica-bold-r-*--*-80-*-*-*-*-*-*
-Mwm*feedback*fontList:		-adobe-helvetica-bold-r-*--*-100-*-*-*-*-*-*
-Mwm*multiClickTime:		300
diff --git a/x11-libs/openmotif/files/animate-demo.diff b/x11-libs/openmotif/files/animate-demo.diff
deleted file mode 100644
index bc2ccdb9ba71..000000000000
--- a/x11-libs/openmotif/files/animate-demo.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN openMotif-2.2.2/demos/programs/animate/Makefile.in openMotif-2.2.2-modified/demos/programs/animate/Makefile.in
---- openMotif-2.2.2/demos/programs/animate/Makefile.in	Thu Feb 14 08:15:51 2002
-+++ openMotif-2.2.2-modified/demos/programs/animate/Makefile.in	Fri Aug  9 15:18:21 2002
-@@ -96,7 +96,7 @@
-     README animate.help animate.man xmanimate.man
- 
- 
--animate_SOURCES = xmanimate.c animate.c
-+animate_SOURCES = xmanimate.c
- 
- CLEANFILES = dog.uid plane.uid superman.uid xmanimate.uid
- 
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r3 b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r3
deleted file mode 100644
index ead704e865e9..000000000000
--- a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 950f0d409e0ce508fa3995790c1106c7 openmotif-2.1.30-4_MLI.src.tar.gz 8645792
diff --git a/x11-libs/openmotif/files/include-order.diff b/x11-libs/openmotif/files/include-order.diff
deleted file mode 100644
index f3ca0a362c83..000000000000
--- a/x11-libs/openmotif/files/include-order.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN openMotif-2.2.2/tools/wml/Makefile.in openMotif-2.2.2-modified/tools/wml/Makefile.in
---- openMotif-2.2.2/tools/wml/Makefile.in	Thu Feb 14 08:15:49 2002
-+++ openMotif-2.2.2-modified/tools/wml/Makefile.in	Fri Aug 16 16:49:20 2002
-@@ -121,7 +121,7 @@
- 
- wmldbcreate_LDADD = ../../lib/Xm/libXm.la
- 
--INCLUDES = ${X_CFLAGS} -I$(srcdir)/../../lib -I$(srcdir)/../../include
-+INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../include ${X_CFLAGS}
- 
- noinst_LIBRARIES = libwml.a
- libwml_a_SOURCES = wmlparse.y wml.c wmloutkey.c wmlouth.c wmloutmm.c wmloutp1.c wmlresolve.c wmlsynbld.c wmlutils.c
diff --git a/x11-libs/openmotif/files/mwm-configdir.patch b/x11-libs/openmotif/files/mwm-configdir.patch
deleted file mode 100644
index c83f34aa9a27..000000000000
--- a/x11-libs/openmotif/files/mwm-configdir.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -urN openMotif-2.2.2.orig/clients/mwm/WmResParse.c openMotif-2.2.2/clients/mwm/WmResParse.c
---- openMotif-2.2.2.orig/clients/mwm/WmResParse.c	2002-01-10 21:55:37.000000000 +0100
-+++ openMotif-2.2.2/clients/mwm/WmResParse.c	2003-06-04 22:20:22.000000000 +0200
-@@ -2411,7 +2411,7 @@
- 	if (MwmBehavior)
- 	{
- 	    strcpy(cfileName, LIBDIR);
--	    strncat(cfileName, "/", MAXWMPATH-strlen(cfileName));
-+	    strncat(cfileName, "/mwm/", MAXWMPATH-strlen(cfileName));
- 	    strncat(cfileName, LANG, MAXWMPATH-strlen(cfileName));
- 	    strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
- 	}
-@@ -2427,7 +2427,7 @@
- 	* Try /$LANG/system.mwmrc within the install tree
- 	*/
- 	strcpy(cfileName, LIBDIR);
--	strncat(cfileName, "/", MAXWMPATH-strlen(cfileName));
-+	strncat(cfileName, "/mwm/", MAXWMPATH-strlen(cfileName));
- 	strncat(cfileName, LANG, MAXWMPATH-strlen(cfileName));
- 	strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
- #endif /* WSM */
-@@ -2449,7 +2449,7 @@
-     if (MwmBehavior)
-     {
- 	strcpy(cfileName, LIBDIR);
--	strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
-+	strncat(cfileName, "/mwm" SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
- #ifdef PANELIST
- 	fileP = fopen (cfileName, "r");
- #else /* PANELIST */
-@@ -2473,7 +2473,7 @@
-      * Try /system.mwmrc within the install tree
-      */
-     strcpy(cfileName, LIBDIR);
--    strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
-+    strncat(cfileName, "/mwm" SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
- 
-     if (LANG != NULL) 
-     {
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild
deleted file mode 100644
index 7faa05572fa6..000000000000
--- a/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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.13 2004/01/19 11:20:59 lanius Exp $
-
-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.metrolink.com/openmotif/"
-LICENSE="MOTIF"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
-
-DEPEND="virtual/glibc
-	virtual/x11"
-
-SLOT="0"
-
-# 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"
-
-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
-}
-
-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-r4.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r4.ebuild
index d4b96773e33b..0fbb036c1456 100644
--- a/x11-libs/openmotif/openmotif-2.1.30-r4.ebuild
+++ b/x11-libs/openmotif/openmotif-2.1.30-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-r4.ebuild,v 1.1 2004/01/19 11:20:59 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r4.ebuild,v 1.2 2004/01/27 20:46:35 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"