fix CAN 2004-0914 in openmotif-2.1.30

(Portage version: 2.0.51-r15)

6 files changed, 172 insertions, 41 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 99ac3affbc46..44da78e178ec 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,13 @@
 # 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.80 2005/02/16 21:58:38 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.81 2005/02/17 13:23:00 lanius Exp $
+
+*openmotif-2.1.30-r7 (17 Feb 2005)
+
+  17 Feb 2005; Heinrich Wendel <lanius@gentoo.org>
+  +files/openmotif-2.1.30-CAN-2004-0914-newer.patch.bz2,
+  +openmotif-2.1.30-r7.ebuild, openmotif-2.1.30-r8.ebuild:
+  fix CAN 2004-0914 in openmotif-2.1.30
 
   16 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   openmotif-2.2.3-r1.ebuild:
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 2387cd9d8fcf..001f9d040aa7 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,50 +1,43 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 18a738af27482c9abb5153e4227db96d openmotif-2.1.30-r6.ebuild 3861
+MD5 820086a628aa4f4f203d54216134dec0 openmotif-2.1.30-r8.ebuild 4787
+MD5 6fff264c20ad6310193b795730887894 openmotif-2.2.3.ebuild 3251
+MD5 ee39dd4e6143e442d62c55303f341e67 openmotif-2.2.3-r2.ebuild 3632
+MD5 b385c61765918c22c7effa1cb7c70076 openmotif-2.1.30-r5.ebuild 3705
+MD5 303ee968ef6989104d9dde8d71717ea5 openmotif-2.1.30-r7.ebuild 3992
 MD5 9e5646a3df733235718714b80a889c4d ChangeLog 12047
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
-MD5 84da30838fedca094e625631fd6dbbaa openmotif-2.1.30-r4.ebuild 3288
-MD5 b385c61765918c22c7effa1cb7c70076 openmotif-2.1.30-r5.ebuild 3705
-MD5 18a738af27482c9abb5153e4227db96d openmotif-2.1.30-r6.ebuild 3861
-MD5 64be0d861260992fbfb09ca860cd668c openmotif-2.1.30-r8.ebuild 4781
 MD5 29270e0a0ee5d834b5ed28b4defbe0de openmotif-2.2.3-r1.ebuild 3266
-MD5 ee39dd4e6143e442d62c55303f341e67 openmotif-2.2.3-r2.ebuild 3632
-MD5 6fff264c20ad6310193b795730887894 openmotif-2.2.3.ebuild 3251
+MD5 84da30838fedca094e625631fd6dbbaa openmotif-2.1.30-r4.ebuild 3288
+MD5 ee3a092a933a6393bf14d5d7e6231934 files/openmotif-2.1.30-xpm2.diff 47085
+MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r1 68
+MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r2 68
+MD5 61fb956ff4bc34bc503cdb2226fd037b files/openmotif-2.1.30-darwin-netbsd.diff 16799
+MD5 339b1b38271b9dfdd8c476429b55787e files/openmotif-2.2.3-pixel_length.patch 450
+MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3 68
 MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r4 79
 MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r5 79
-MD5 61fb956ff4bc34bc503cdb2226fd037b files/openmotif-2.1.30-darwin-netbsd.diff 16799
-MD5 ed2738dd3cbdc87b0800fe9710092d18 files/openmotif-2.1.30-imake-ansi.patch 6554
-MD5 28350d5dab901ef8cd0dc92e578e3f45 files/openmotif-2.1.30-imake-tmpdir.patch 1083
-MD5 f586e24ce0a2b3eeea25a82c8ec1d3c4 files/openmotif-2.1.30-uil-bad_grammar_fix.diff 832
-MD5 7284e10e14cac30429821b824dd2f722 files/site.def 2062
-MD5 7284e10e14cac30429821b824dd2f722 files/site.def.1 2062
 MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r6 79
-MD5 8aaa33844cae66b12fcdce6b58bfe6df files/openmotif-2.1.30-xpm.diff 13134
+MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r7 79
 MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r8 79
-MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3 68
+MD5 6e392c40eacd6da7718bc94d55914d32 files/openmotif-2.1.30-CAN-2004-0914.patch.bz2 11702
 MD5 e408518ff6768e58a409938c473d23ce files/openmotif-2.2.3-CAN-2004-0687-0688.patch.bz2 3362
-MD5 81bc342197a88eb207901ec3ea8927c7 files/openmotif-2.2.3-CAN-2004-0914.patch.bz2 11770
-MD5 db318d4fb05541d70e7e451d46987bd1 files/openmotif-2.2.3-CAN-2004-0914_sec8.patch 491
-MD5 aaf04376f7011a2f68b7961100f611fb files/openmotif-2.2.3-Mwm.defaults 536
+MD5 8aaa33844cae66b12fcdce6b58bfe6df files/openmotif-2.1.30-xpm.diff 13134
 MD5 5f3081ba56f381a6c667c4677258d1c0 files/openmotif-2.2.3-XmResizeHashTable.patch 183
-MD5 644560d15450d90e787bf12ac8e77638 files/openmotif-2.2.3-char_not_supported.patch 1014
-MD5 216193f922fae0747195fd851696b580 files/openmotif-2.2.3-mwm-configdir.patch 1549
-MD5 ae018b1d050619b521ce52cf1a822ef9 files/openmotif-2.2.3-no_demos.patch 3803
-MD5 339b1b38271b9dfdd8c476429b55787e files/openmotif-2.2.3-pixel_length.patch 450
-MD5 f89741373660d1834cb1063c06dda8fd files/openmotif-2.2.3-popup_timeout.patch 359
-MD5 214cd8f46dc88caf500e6307658abfbf files/openmotif-2.2.3-utf8.patch 2979
+MD5 7284e10e14cac30429821b824dd2f722 files/site.def 2062
+MD5 ed2738dd3cbdc87b0800fe9710092d18 files/openmotif-2.1.30-imake-ansi.patch 6554
 MD5 d5f7bbd57d8951fec70fac481f00a83e files/openmotif-2.2.3-automake.patch 275
-MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r1 68
-MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r2 68
 MD5 76aa44266e6ebef00c664b2f24822ce9 files/openmotif-2.1.30-CAN-2004-0687-0688.patch.bz2 3274
-MD5 6e392c40eacd6da7718bc94d55914d32 files/openmotif-2.1.30-CAN-2004-0914.patch.bz2 11702
-MD5 62870f12ebc148c6319223ec659c290f files/openmotif-2.1.30-CAN-2004-0914_sec8.patch 471
-MD5 ee3a092a933a6393bf14d5d7e6231934 files/openmotif-2.1.30-xpm2.diff 47085
+MD5 f586e24ce0a2b3eeea25a82c8ec1d3c4 files/openmotif-2.1.30-uil-bad_grammar_fix.diff 832
+MD5 ae018b1d050619b521ce52cf1a822ef9 files/openmotif-2.2.3-no_demos.patch 3803
 MD5 a6ffd504c7b34b3c24a2e9f45e864bbe files/openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCE8IQKRy60XGEcJIRAidbAJ4wN5tjM79X1kTkAua7W1OqwxLP2gCfWjhv
-O1owGLURNijQ41kdZx7hWSc=
-=hr/L
------END PGP SIGNATURE-----
+MD5 f89741373660d1834cb1063c06dda8fd files/openmotif-2.2.3-popup_timeout.patch 359
+MD5 62870f12ebc148c6319223ec659c290f files/openmotif-2.1.30-CAN-2004-0914_sec8.patch 471
+MD5 644560d15450d90e787bf12ac8e77638 files/openmotif-2.2.3-char_not_supported.patch 1014
+MD5 28350d5dab901ef8cd0dc92e578e3f45 files/openmotif-2.1.30-imake-tmpdir.patch 1083
+MD5 5c49a886f108baeda96fc41f32647cf6 files/openmotif-2.1.30-CAN-2004-0914-newer.patch.bz2 12300
+MD5 7284e10e14cac30429821b824dd2f722 files/site.def.1 2062
+MD5 81bc342197a88eb207901ec3ea8927c7 files/openmotif-2.2.3-CAN-2004-0914.patch.bz2 11770
+MD5 aaf04376f7011a2f68b7961100f611fb files/openmotif-2.2.3-Mwm.defaults 536
+MD5 db318d4fb05541d70e7e451d46987bd1 files/openmotif-2.2.3-CAN-2004-0914_sec8.patch 491
+MD5 214cd8f46dc88caf500e6307658abfbf files/openmotif-2.2.3-utf8.patch 2979
+MD5 216193f922fae0747195fd851696b580 files/openmotif-2.2.3-mwm-configdir.patch 1549
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r7 b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r7
new file mode 100644
index 000000000000..ead704e865e9
--- /dev/null
+++ b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r7
@@ -0,0 +1 @@
+MD5 950f0d409e0ce508fa3995790c1106c7 openmotif-2.1.30-4_MLI.src.tar.gz 8645792
diff --git a/x11-libs/openmotif/files/openmotif-2.1.30-CAN-2004-0914-newer.patch.bz2 b/x11-libs/openmotif/files/openmotif-2.1.30-CAN-2004-0914-newer.patch.bz2
new file mode 100644
index 000000000000..5fcca2427f93
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.1.30-CAN-2004-0914-newer.patch.bz2
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r7.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r7.ebuild
new file mode 100644
index 000000000000..4c2387c1e6b8
--- /dev/null
+++ b/x11-libs/openmotif/openmotif-2.1.30-r7.ebuild
@@ -0,0 +1,130 @@
+# 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-r7.ebuild,v 1.10 2005/02/17 13:23:00 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 ~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}
+
+	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
+
+	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"
+
+	# Install in /usr/lib
+	mv ${D}/usr/X11R6/lib ${D}usr/$(get_libdir)
+
+	dodir /usr/share
+	mv ${D}/usr/X11R6/man ${D}/usr/share
+
+	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
index eeeee8e6cdec..769f7cc16f7f 100644
--- a/x11-libs/openmotif/openmotif-2.1.30-r8.ebuild
+++ b/x11-libs/openmotif/openmotif-2.1.30-r8.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2005/02/16 13:47:54 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r8.ebuild,v 1.2 2005/02/17 13:23:00 lanius Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -37,7 +37,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch.bz2
-	epatch ${FILESDIR}/${P}-CAN-2004-0914.patch.bz2
+	epatch ${FILESDIR}/${P}-CAN-2004-0914-newer.patch.bz2
 	epatch ${FILESDIR}/${P}-CAN-2004-0914_sec8.patch
 
 	ebegin "adjusting file permissions"