clean ebuild for openmotif 2.2

5 files changed, 176 insertions, 14 deletions

diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index eabb23f4fd1e..04dfdd72a0ad 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,10 +1,10 @@
 MD5 e07f6b89edd5ffa4a803816b7ce33336 openmotif-2.1.30-r1.ebuild 864
 MD5 55e52e621e48d9824ff551f2c48f8d82 openmotif-2.2.2-r1.ebuild 1051
-MD5 0c71f391d71b41a92493ea344a6ee276 openmotif-2.1.30-r3.ebuild 4179
-MD5 0b58f515cd287f2924483a5f3c1eef1e openmotif-2.2.2-r3.ebuild 4836
+MD5 05532bb247d1a82d701eb92d5e36fc67 openmotif-2.1.30-r3.ebuild 4077
+MD5 e060c9f27424a6cd3ff890088ae49a5c openmotif-2.2.2-r3.ebuild 4529
 MD5 d9ee153704ba81a8d4f9b50224f47f37 openmotif-2.1.30-r2.ebuild 2633
-MD5 a53bf144f4313a2f951132a4b5e36bfd openmotif-2.2.2-r2.ebuild 4806
-MD5 64bceee38177ba54f3ab563a7258a579 ChangeLog 3685
+MD5 2de6a2239e5ddfff902676aedaefb56c openmotif-2.2.2-r2.ebuild 4804
+MD5 a812cabb2065d2185f37f6bea1676749 ChangeLog 3825
 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
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.2.2-r3 b/x11-libs/openmotif/files/digest-openmotif-2.2.2-r3
new file mode 100644
index 000000000000..e91e220e3840
--- /dev/null
+++ b/x11-libs/openmotif/files/digest-openmotif-2.2.2-r3
@@ -0,0 +1 @@
+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 591fc042ca73..7e916dafd719 100644
--- a/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild
+++ b/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild
@@ -8,13 +8,10 @@ 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"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
 
 DEPEND="virtual/glibc
-	virtual/x11
-	dev-util/yacc
-	sys-devel/bison
-	sys-devel/flex"
+	virtual/x11"
 
 SLOT="2.1"
 
@@ -84,12 +81,10 @@ src_install() {
 	dodir /usr/include/Mrm/2.1/Mrm
 	dodir /usr/include/Xm/2.1/Xm
 	dodir /usr/include/uil/2.1/uil
-	dodir /usr/include/X11/bitmaps
 
 	mv ${D}/usr/X11R6/include/Mrm/*.h ${D}/usr/include/Mrm/2.1/Mrm
 	mv ${D}/usr/X11R6/include/Xm/*.h ${D}/usr/include/Xm/2.1/Xm
 	mv ${D}/usr/X11R6/include/uil/*.h ${D}/usr/include/uil/2.1/uil
-	mv ${D}/usr/X11R6/include/X11/bitmaps/* ${D}/usr/include/X11/bitmaps
 
 	# bin
 	dodir /usr/bin
@@ -137,7 +132,7 @@ src_install() {
 	for file in `ls ${D}/usr/X11R6/man/man7`
 	do
 		file=${file/.7x/}
-		mv ${D}/usr/X11R6/man/man7/${file}.7x ${D}/usr/share/man/man5/${file}-21.7
+		mv ${D}/usr/X11R6/man/man7/${file}.7x ${D}/usr/share/man/man7/${file}-21.7
 	done
 
 	# cleanups
diff --git a/x11-libs/openmotif/openmotif-2.2.2-r2.ebuild b/x11-libs/openmotif/openmotif-2.2.2-r2.ebuild
index cf4d989ace2b..271db9364e5b 100644
--- a/x11-libs/openmotif/openmotif-2.2.2-r2.ebuild
+++ b/x11-libs/openmotif/openmotif-2.2.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.8 2003/11/25 03:57:08 agriffis Exp $
+# $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
 
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha"
 
 PROVIDE="virtual/motif"
 
diff --git a/x11-libs/openmotif/openmotif-2.2.2-r3.ebuild b/x11-libs/openmotif/openmotif-2.2.2-r3.ebuild
new file mode 100644
index 000000000000..517350e6a101
--- /dev/null
+++ b/x11-libs/openmotif/openmotif-2.2.2-r3.ebuild
@@ -0,0 +1,166 @@
+# 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.3 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="2.2"
+LICENSE="MOTIF"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~amd64"
+
+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
+
+	#
+	# 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"
+
+	# move 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
+
+	# bin
+	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
+
+	# libs
+	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
+
+	# 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
+
+	# docs
+	dodoc COPYRIGHT.MOTIF LICENSE
+	dodoc README RELEASE RELNOTES
+	dodoc BUGREPORT OPENBUGS CLOSEDBUGS
+}