new patch for CAN-20004-0914, bug #78111

Package-Manager: portage-2.0.51-r15

5 files changed, 54 insertions, 71 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index f9f7ce3956aa..7a67b49686e6 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,10 +1,17 @@
 # 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.75 2005/02/15 17:22:54 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.76 2005/02/16 13:43:12 lanius Exp $
 
   15 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> openmotif-2.1.30-r6.ebuild:
   Stable ppc-macos
 
+*openmotif-2.2.3-r2 (16 Feb 2005)
+
+  16 Feb 2005; Heinrich Wendel <lanius@gentoo.org>
+  +files/openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2,
+  openmotif-2.2.3-r1.ebuild, +openmotif-2.2.3-r2.ebuild:
+  new patch for CAN-20004-0914, bug #78111
+
   15 Feb 2005; Markus Rothe <corsair@gentoo.org> openmotif-2.1.30-r6.ebuild:
   Stable on ppc64; bug #81996
 
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 97060fc3ff42..64ac44f2fcd9 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,37 +1,38 @@
-MD5 60301170b0ed67e726c13d84447976a8 ChangeLog 11264
-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 2722bc4d45a90d96f3c396c0eb42ed24 openmotif-2.1.30-r7.ebuild 4780
-MD5 eab3883b5ac075833f15ad8b40e38cc0 openmotif-2.2.3-r1.ebuild 3634
 MD5 6fff264c20ad6310193b795730887894 openmotif-2.2.3.ebuild 3251
+MD5 b385c61765918c22c7effa1cb7c70076 openmotif-2.1.30-r5.ebuild 3705
+MD5 857765a311c1db686b7e2f975facbb0e openmotif-2.1.30-r7.ebuild 4781
+MD5 f4704a04776292a53963f2f1ed9761be ChangeLog 11507
+MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
+MD5 9b9944f935f1d0a18a551baa873adb53 openmotif-2.2.3-r1.ebuild 3267
+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 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 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 61fb956ff4bc34bc503cdb2226fd037b files/openmotif-2.1.30-darwin-netbsd.diff 16799
 MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r6 79
 MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r7 79
-MD5 8aaa33844cae66b12fcdce6b58bfe6df files/openmotif-2.1.30-xpm.diff 13134
-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 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 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
+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 ee3a092a933a6393bf14d5d7e6231934 files/openmotif-2.1.30-xpm2.diff 47085
+MD5 644560d15450d90e787bf12ac8e77638 files/openmotif-2.2.3-char_not_supported.patch 1014
+MD5 28350d5dab901ef8cd0dc92e578e3f45 files/openmotif-2.1.30-imake-tmpdir.patch 1083
+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/openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 b/x11-libs/openmotif/files/openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2
new file mode 100644
index 000000000000..f00beeaf390e
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.2.3-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
index e87587395239..6335e5f66ac9 100644
--- a/x11-libs/openmotif/openmotif-2.1.30-r7.ebuild
+++ b/x11-libs/openmotif/openmotif-2.1.30-r7.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-r7.ebuild,v 1.7 2005/02/15 15:40:07 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r7.ebuild,v 1.8 2005/02/16 13:43:12 lanius Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
 IUSE=""
 
 PROVIDE="virtual/motif"
diff --git a/x11-libs/openmotif/openmotif-2.2.3-r1.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r1.ebuild
index 72d307eb47a0..a799ad9df3ee 100644
--- a/x11-libs/openmotif/openmotif-2.2.3-r1.ebuild
+++ b/x11-libs/openmotif/openmotif-2.2.3-r1.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.2.3-r1.ebuild,v 1.4 2005/02/15 15:40:07 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r1.ebuild,v 1.5 2005/02/16 13:43:12 lanius Exp $
 
 inherit eutils libtool flag-o-matic multilib
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.motifzone.net/om${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="MOTIF"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc
@@ -20,13 +20,11 @@ DEPEND="virtual/libc
 	>=sys-apps/sed-4
 	!ppc-macos? ( =sys-devel/automake-1.4* )
 	=sys-devel/autoconf-2.5*
-	x11-libs/motif-config"
+	!virtual/motif"
 RDEPEND="virtual/libc
 	virtual/x11
-	x11-libs/motif-config"
-
+	!virtual/motif"
 PROVIDE="virtual/motif"
-SLOT="2.2"
 
 pkg_setup() {
 	# multilib includes don't work right in this package...
@@ -40,7 +38,7 @@ src_unpack() {
 	# various patches
 	epatch ${FILESDIR}/${P}-mwm-configdir.patch
 	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
 	epatch ${FILESDIR}/${P}-char_not_supported.patch
 	epatch ${FILESDIR}/${P}-pixel_length.patch
@@ -87,10 +85,10 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 
-	# cleanups
-	rm -fR ${D}/usr/$(get_libdir)/X11
-	rm -fR ${D}/usr/$(get_libdir)/X11/bindings
-	rm -fR ${D}/usr/include/X11/bitmaps/
+	# move system.mwmrc & create symlink & fix manpages
+	dodir "/etc/X11/mwm"
+	mv "${D}/usr/$(get_libdir)/X11/system.mwmrc" "${D}/etc/X11/mwm/system.mwmrc"
+	dosym "/etc/X11/mwm" "/usr/$(get_libdir)/X11/mwm"
 
 	list="/usr/share/man/man1/mwm.1 /usr/share/man/man4/mwmrc.4"
 	for f in $list; do
@@ -98,32 +96,13 @@ src_install() {
 		dosed 's:/usr/lib/X11/app-defaults:/etc/X11/app-defaults:g' "$f"
 	done
 
+	# app-defaults/Mwm isn't included anymore as of 2.2
+	insinto /etc/X11/app-defaults
+	newins ${FILESDIR}/${P}-Mwm.defaults Mwm
 
-	einfo "Fixing binaries"
-	for file in `ls ${D}/usr/bin`
-	do
-		mv ${D}/usr/bin/${file} ${D}/usr/bin/${file}-openmotif-2.2
-	done
-
-	einfo "Fixing libraries"
-	dodir /usr/$(get_libdir)/openmotif-2.2
-	mv ${D}/usr/$(get_libdir)/* ${D}/usr/$(get_libdir)/openmotif-2.2/
-
-	einfo "Fixing includes"
-	dodir /usr/include/openmotif-2.2/
-	mv ${D}/usr/include/* ${D}/usr/include/openmotif-2.2
-
-	einfo "Fixing man pages"
-	mans="1 3 4 5"
-	for man in $mans; do
-		dodir /usr/share/man/man${man}
-		for file in `ls ${D}/usr/share/man/man${man}`
-		do
-			file=${file/.${man}/}
-			mv ${D}/usr/share/man/man$man/${file}.${man} ${D}/usr/share/man/man${man}/${file}-openmotif-2.2.${man}
-		done
-	done
-
+	# remove unneeded files
+	rm -fR ${D}/usr/$(get_libdir)/X11/bindings
+	rm -fR ${D}/usr/include/X11/bitmaps/
 
 	# install docs
 	dodoc COPYRIGHT.MOTIF LICENSE
@@ -131,11 +110,7 @@ src_install() {
 	dodoc BUGREPORT TODO
 }
 
-# Profile stuff
 pkg_postinst() {
-	motif-config --install openmotif-2.2
-}
-
-pkg_prerm() {
-	motif-config --uninstall openmotif-2.2
+	ewarn "This breaks applications linked against libXm.so.2."
+	ewarn "You have to rebuild these applications with revdep-rebuild."
 }