changelog:P

5 files changed, 15 insertions, 183 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 52b762e736fb..fb7214d4e780 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,10 @@
 # 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.17 2003/10/11 18:18:35 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.18 2003/10/31 14:47:53 lanius Exp $
+
+  31 Oct 2003; Heinrich Wendel <lanius@gentoo.org> openmotif-2.1.30-r2.ebuild,
+  openmotif-2.2.2-r3.ebuild:
+  next cleanup version
 
 *openmotif-2.2.2-r3 (11 Oct 2003)
 
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 9ec689e2acf8..6875e127c074 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,17 +1,15 @@
-MD5 8faed23a369a8e7670ff603bc4380ca7 ChangeLog 3235
 MD5 e07f6b89edd5ffa4a803816b7ce33336 openmotif-2.1.30-r1.ebuild 864
 MD5 55e52e621e48d9824ff551f2c48f8d82 openmotif-2.2.2-r1.ebuild 1051
-MD5 4a97d5b22268afb582d558a2728b9c0d openmotif-2.1.30-r2.ebuild 2672
-MD5 be2d9f4c47a91d27037238fabf2787eb openmotif-2.2.2-r3.ebuild 4705
+MD5 d9ee153704ba81a8d4f9b50224f47f37 openmotif-2.1.30-r2.ebuild 2633
 MD5 fa0e521ff26821406c2e756ff5efe1f4 openmotif-2.2.2-r2.ebuild 4715
-MD5 aaf04376f7011a2f68b7961100f611fb files/Mwm.defaults 536
-MD5 d9fb88b149d0eb40279440b75183c850 files/animate-demo.diff 498
-MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r1 79
+MD5 c8a80a18df9cda9321ca8d265ce3d4a2 ChangeLog 3367
+MD5 216193f922fae0747195fd851696b580 files/mwm-configdir.patch 1549
 MD5 009fd49058dd31057e2cbdc0c5cbb6a5 files/digest-openmotif-2.2.2-r1 136
 MD5 e0b6cf2385221247e7204f63a199c6c3 files/digest-openmotif-2.2.2-r2 68
+MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r1 79
+MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r2 79
 MD5 de211ad75fe5ccc5bfb4794dec54157f files/include-order.diff 597
-MD5 216193f922fae0747195fd851696b580 files/mwm-configdir.patch 1549
 MD5 7284e10e14cac30429821b824dd2f722 files/site.def 2062
+MD5 d9fb88b149d0eb40279440b75183c850 files/animate-demo.diff 498
+MD5 aaf04376f7011a2f68b7961100f611fb files/Mwm.defaults 536
 MD5 28350d5dab901ef8cd0dc92e578e3f45 files/openmotif-2.1.30-imake-tmpdir.patch 1083
-MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r2 79
-MD5 e0b6cf2385221247e7204f63a199c6c3 files/digest-openmotif-2.2.2-r3 68
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-r2.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r2.ebuild
index 8f830998ccc6..bc19a1bfde13 100644
--- a/x11-libs/openmotif/openmotif-2.1.30-r2.ebuild
+++ b/x11-libs/openmotif/openmotif-2.1.30-r2.ebuild
@@ -8,14 +8,13 @@ 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 ~hppa ~alpha ~amd64"
-SLOT="2.1"
-
-PROVIDE="virtual/motif"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
 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 
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 56fbef39df16..000000000000
--- a/x11-libs/openmotif/openmotif-2.2.2-r3.ebuild
+++ /dev/null
@@ -1,168 +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.1 2003/10/11 18:18:35 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="2.2"
-LICENSE="MOTIF"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~amd64"
-
-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"
-}
-
-
-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
-}