fix bugs #85151, #84915

(Portage version: 2.0.51.19)

13 files changed, 97 insertions, 116 deletions

diff --git a/x11-libs/lesstif/ChangeLog b/x11-libs/lesstif/ChangeLog
index 88ad9a8f1133..6c78f210e574 100644
--- a/x11-libs/lesstif/ChangeLog
+++ b/x11-libs/lesstif/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/lesstif
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.58 2005/03/14 13:57:36 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.59 2005/03/23 18:43:43 lanius Exp $
+
+*lesstif-0.93.94-r3 (23 Mar 2005)
+
+  23 Mar 2005; Heinrich Wendel <lanius@gentoo.org> -lesstif-0.93.94-r2.ebuild,
+  +lesstif-0.93.94-r3.ebuild, -lesstif-0.94.0-r5.ebuild,
+  +lesstif-0.94.0-r6.ebuild:
+  fix bugs #85151, #84915
 
   14 Mar 2005; Heinrich Wendel <lanius@gentoo.org> lesstif-0.93.94-r2.ebuild,
   lesstif-0.94.0-r5.ebuild:
diff --git a/x11-libs/lesstif/Manifest b/x11-libs/lesstif/Manifest
index 250f23aea749..210b53ec962a 100644
--- a/x11-libs/lesstif/Manifest
+++ b/x11-libs/lesstif/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 af91b93d57f592e47b0655aab885f182 lesstif-0.93.94-r2.ebuild 2563
-MD5 6fba725731655535ef1b7df2d028ac30 lesstif-0.94.0-r5.ebuild 2426
+MD5 d4d8c4979cb48e1dc148458e81e1849c lesstif-0.94.0-r6.ebuild 2431
+MD5 ea89df5c3dbbb9496ac7e66ae9dc6914 lesstif-0.93.94-r3.ebuild 2573
 MD5 9b4f3806aa89a43b17fa8aac8775e889 lesstif-0.94.0-r2.ebuild 2111
-MD5 c0527c64ae92bbd2de9b35fdc0c4399b ChangeLog 7882
+MD5 866cb9081f4d170ef4c757d868d1e5b8 ChangeLog 8109
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 ca6ecc032ac0934b8c737650d6550162 lesstif-0.94.0.ebuild 2039
 MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0 68
 MD5 10373c1e87b0208cd26888011a4d92de files/CAN-2005-0605.patch 1194
-MD5 023d4c47c73d11f6668f99e0cbe9ed05 files/digest-lesstif-0.93.94-r2 142
+MD5 45fa63580e7de408204bea30102331f8 files/digest-lesstif-0.93.94-r3 144
 MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0-r2 68
-MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0-r5 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCNZhXevY57Fted3ERAs8iAJ418/wZ+EwHfX17PO1G6xS0k5CNDACfRG94
-1m4TNnzKQBxhgcDpJy//0bk=
-=Ref0
------END PGP SIGNATURE-----
+MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0-r6 68
diff --git a/x11-libs/lesstif/files/digest-lesstif-0.93.94-r2 b/x11-libs/lesstif/files/digest-lesstif-0.93.94-r2
deleted file mode 100644
index fd0e9211880c..000000000000
--- a/x11-libs/lesstif/files/digest-lesstif-0.93.94-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6ae7340d91ba0566676bd3abb3842203 lesstif-0.93.94.tar.bz2 3461827
-MD5 f1f9431b0d8830fb870dc6c52a08ad9c lesstif1-1_0.93.94-11.diff.gz 63422
diff --git a/x11-libs/lesstif/files/digest-lesstif-0.93.94-r3 b/x11-libs/lesstif/files/digest-lesstif-0.93.94-r3
new file mode 100644
index 000000000000..1ad7cd16a89f
--- /dev/null
+++ b/x11-libs/lesstif/files/digest-lesstif-0.93.94-r3
@@ -0,0 +1,2 @@
+MD5 6ae7340d91ba0566676bd3abb3842203 lesstif-0.93.94.tar.bz2 3461827
+MD5 411faaae59989c0cc06c5d5c5d1501ed lesstif1-1_0.93.94-11.1.diff.gz 63754
diff --git a/x11-libs/lesstif/files/digest-lesstif-0.94.0-r5 b/x11-libs/lesstif/files/digest-lesstif-0.94.0-r6
index 86a358232318..86a358232318 100644
--- a/x11-libs/lesstif/files/digest-lesstif-0.94.0-r5
+++ b/x11-libs/lesstif/files/digest-lesstif-0.94.0-r6
diff --git a/x11-libs/lesstif/lesstif-0.93.94-r2.ebuild b/x11-libs/lesstif/lesstif-0.93.94-r3.ebuild
index c0abe3b75d7c..aabadf76eda6 100644
--- a/x11-libs/lesstif/lesstif-0.93.94-r2.ebuild
+++ b/x11-libs/lesstif/lesstif-0.93.94-r3.ebuild
@@ -1,13 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.93.94-r2.ebuild,v 1.4 2005/03/14 13:57:36 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.93.94-r3.ebuild,v 1.1 2005/03/23 18:43:43 lanius Exp $
+
+# disable sandbox, needed for motif-config
+SANDBOX_DISABLED="1"
 
 inherit libtool flag-o-matic multilib
 
 DESCRIPTION="An OSF/Motif(R) clone"
 HOMEPAGE="http://www.lesstif.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mirror://debian/pool/main/l/lesstif1-1/lesstif1-1_0.93.94-11.diff.gz"
+	mirror://debian/pool/main/l/lesstif1-1/lesstif1-1_0.93.94-11.1.diff.gz"
 
 LICENSE="LGPL-2"
 SLOT="1.2"
@@ -16,14 +19,14 @@ IUSE="static"
 
 DEPEND="virtual/libc
 	virtual/x11
-	>=x11-libs/motif-config-0.5"
+	>=x11-libs/motif-config-0.6"
 
 PROVIDE="virtual/motif"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${DISTDIR}/lesstif1-1_0.93.94-11.diff.gz
+	epatch ${DISTDIR}/lesstif1-1_0.93.94-11.1.diff.gz
 }
 
 src_compile() {
@@ -87,27 +90,20 @@ src_install() {
 	rm -fR ${D}/usr/$(get_libdir)/lesstif-1.2/X11/
 	rm -fR ${D}/usr/$(get_libdir)/X11/
 
+	# profile stuff
+	motif-config --finish-install
 }
 
 # Profile stuff
 pkg_setup() {
 	motif-config --start-install
+	if has_version =x11-libs/lesstif-0.93.94*; then touch $T/upgrade; fi
 }
 
 pkg_postinst() {
-	motif-config --finish-install
 	motif-config --install lesstif-1.2
 }
 
-is_upgrade() {
-	vdb_path=`portageq vdb_path`
-	if [ "`grep -r SLOT $vdb_path/${CATEGORY}/${PN}* | grep $SLOT`" ]; then
-		return 0
-	else
-		return 1
-	fi
-}
-
 pkg_postrm() {
-	is_upgrade || motif-config --uninstall lesstif-1.2
+	[ -f $T/upgrade ] || motif-config --uninstall lesstif-1.2
 }
diff --git a/x11-libs/lesstif/lesstif-0.94.0-r5.ebuild b/x11-libs/lesstif/lesstif-0.94.0-r6.ebuild
index 72f4e3885d47..854c52b5d5d0 100644
--- a/x11-libs/lesstif/lesstif-0.94.0-r5.ebuild
+++ b/x11-libs/lesstif/lesstif-0.94.0-r6.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.94.0-r5.ebuild,v 1.4 2005/03/14 13:57:36 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.94.0-r6.ebuild,v 1.1 2005/03/23 18:43:43 lanius Exp $
+
+# disable sandbox, needed for motif-config
+SANDBOX_DISABLED="1"
 
 inherit libtool flag-o-matic multilib
 
@@ -83,27 +86,20 @@ src_install() {
 	rm -fR ${D}/usr/$(get_libdir)/lesstif-2.1/X11/
 	rm -fR ${D}/usr/$(get_libdir)/X11/
 
+	# profile stuff
+	motif-config --finish-install
 }
 
 # Profile stuff
 pkg_setup() {
 	motif-config --start-install
+	if has_version ">=x11-libs/lesstif-0.94.0"; then touch $T/upgrade; fi
 }
 
 pkg_postinst() {
-	motif-config --finish-install
 	motif-config --install lesstif-2.1
 }
 
-is_upgrade() {
-	vdb_path=`portageq vdb_path`
-	if [ "`grep -r SLOT $vdb_path/${CATEGORY}/${PN}* | grep $SLOT`" ]; then
-		return 0
-	else
-		return 1
-	fi
-}
-
 pkg_postrm() {
-	is_upgrade || motif-config --uninstall lesstif-2.1
+	[ -f $T/upgrade ] || motif-config --uninstall lesstif-2.1
 }
diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index b1d5f677bee5..d1bf7a2daff8 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.103 2005/03/21 21:50:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.104 2005/03/23 18:44:11 lanius Exp $
+
+*openmotif-2.2.3-r6 (23 Mar 2005)
+
+  23 Mar 2005; Heinrich Wendel <lanius@gentoo.org>
+  -openmotif-2.1.30-r11.ebuild, +openmotif-2.1.30-r12.ebuild,
+  -openmotif-2.2.3-r5.ebuild, +openmotif-2.2.3-r6.ebuild:
+  fix bugs #85151, #84915
 
   21 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
   openmotif-2.1.30-r11.ebuild:
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 7ee6b0b8a9fd..4eaeb20d682e 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,52 +1,44 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e59816ea0db96cd1902cb6eecc939136 ChangeLog 15449
-MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
-MD5 b75e3641e3d294eb0c899d4d6eb82bf8 openmotif-2.2.3-r5.ebuild 3870
-MD5 459687380ba71bba6e17cd677c6f9d60 openmotif-2.1.30-r7.ebuild 3986
+MD5 10ad67167f47b879441e9d90fd75cfb5 openmotif-2.1.30-r12.ebuild 5247
+MD5 d97af874221917fcce29fff3a1a63e48 openmotif-2.2.3-r3.ebuild 3238
 MD5 18a738af27482c9abb5153e4227db96d openmotif-2.1.30-r6.ebuild 3861
 MD5 adfb21d30974061a3fa839be7831ea77 openmotif-2.2.3.ebuild 3190
-MD5 557a7b68d6a0d7bdc01ba3b9fd64f3f6 openmotif-2.1.30-r11.ebuild 5242
+MD5 459687380ba71bba6e17cd677c6f9d60 openmotif-2.1.30-r7.ebuild 3986
+MD5 e59816ea0db96cd1902cb6eecc939136 ChangeLog 15449
+MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
+MD5 09879050efb7c0ee756c973acb87b7c4 openmotif-2.2.3-r6.ebuild 3882
 MD5 37febd986e265643fcd22394f41d92ac openmotif-2.1.30-r9.ebuild 3987
-MD5 d97af874221917fcce29fff3a1a63e48 openmotif-2.2.3-r3.ebuild 3238
+MD5 ee3a092a933a6393bf14d5d7e6231934 files/openmotif-2.1.30-xpm2.diff 47085
+MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r3 68
 MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r5 68
-MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r6 79
+MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r6 68
 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 8aaa33844cae66b12fcdce6b58bfe6df files/openmotif-2.1.30-xpm.diff 13134
-MD5 7284e10e14cac30429821b824dd2f722 files/site.def 2062
-MD5 7284e10e14cac30429821b824dd2f722 files/site.def.1 2062
-MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r7 79
+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-r6 79
+MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r7 79
+MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r9 79
+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 b38be118160b49f6b0f9e31d26f01594 files/CAN-2005-0605.patch 1118
+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 76aa44266e6ebef00c664b2f24822ce9 files/openmotif-2.1.30-CAN-2004-0687-0688.patch.bz2 3274
-MD5 5c49a886f108baeda96fc41f32647cf6 files/openmotif-2.1.30-CAN-2004-0914-newer.patch.bz2 12300
-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
-MD5 b38be118160b49f6b0f9e31d26f01594 files/CAN-2005-0605.patch 1118
+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 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r11 79
-MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r9 79
-MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r3 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCP0JxArHZZzCEUG0RAlL6AJ9kjSLO1FeSR+DVz5u8c+Ye3i0vAgCeJ2pV
-Re66cHCrryfdCT8xuof2jfY=
-=rS19
------END PGP SIGNATURE-----
+MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r12 79
+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-r11 b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r12
index ead704e865e9..ead704e865e9 100644
--- a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r11
+++ b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r12
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r5 b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r6
index a6451299c75a..a6451299c75a 100644
--- a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r5
+++ b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r6
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r11.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r12.ebuild
index 9056414f9f34..baecd8eb2083 100644
--- a/x11-libs/openmotif/openmotif-2.1.30-r11.ebuild
+++ b/x11-libs/openmotif/openmotif-2.1.30-r12.ebuild
@@ -1,6 +1,9 @@
 # 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-r11.ebuild,v 1.6 2005/03/21 21:50:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r12.ebuild,v 1.1 2005/03/23 18:44:11 lanius Exp $
+
+# disable sandbox, needed for motif-config
+SANDBOX_DISABLED="1"
 
 inherit eutils flag-o-matic multilib
 
@@ -155,27 +158,21 @@ src_install() {
 
 	dodoc README COPYRIGHT.MOTIF RELEASE RELNOTES
 	dodoc BUGREPORT OPENBUGS CLOSEDBUGS
+
+	# profile stuff
+	motif-config --finish-install
 }
 
 # Profile stuff
 pkg_setup() {
 	motif-config --start-install
+	if has_version =x11-libs/openmotif-2.1*; then touch $T/upgrade; fi
 }
 
 pkg_postinst() {
-	motif-config --finish-install
 	motif-config --install openmotif-2.1
 }
 
-is_upgrade() {
-	vdb_path=`portageq vdb_path`
-	if [ "`grep -r SLOT $vdb_path/${CATEGORY}/${PN}* | grep $SLOT`" ]; then
-		return 0
-	else
-		return 1
-	fi
-}
-
 pkg_postrm() {
-	is_upgrade || motif-config --uninstall openmotif-2.1
+	[ -f $T/upgrade ] || motif-config --uninstall openmotif-2.1
 }
diff --git a/x11-libs/openmotif/openmotif-2.2.3-r5.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r6.ebuild
index fd1e98ad284a..d17aab0d906b 100644
--- a/x11-libs/openmotif/openmotif-2.2.3-r5.ebuild
+++ b/x11-libs/openmotif/openmotif-2.2.3-r6.ebuild
@@ -1,6 +1,9 @@
 # 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-r5.ebuild,v 1.5 2005/03/14 13:57:30 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r6.ebuild,v 1.1 2005/03/23 18:44:11 lanius Exp $
+
+# disable sandbox, needed for motif-config
+SANDBOX_DISABLED="1"
 
 inherit eutils libtool flag-o-matic multilib
 
@@ -19,10 +22,10 @@ DEPEND="virtual/libc
 	>=sys-apps/sed-4
 	!ppc-macos? ( =sys-devel/automake-1.4* )
 	=sys-devel/autoconf-2.5*
-	>=x11-libs/motif-config-0.5"
+	>=x11-libs/motif-config-0.6"
 RDEPEND="virtual/libc
 	virtual/x11
-	>=x11-libs/motif-config-0.5"
+	>=x11-libs/motif-config-0.6"
 
 PROVIDE="virtual/motif"
 SLOT="2.2"
@@ -30,6 +33,10 @@ SLOT="2.2"
 pkg_setup() {
 	# multilib includes don't work right in this package...
 	[ -n "${ABI}" ] && append-flags "-I/usr/include/gentoo-multilib/${ABI}"
+
+	# profile stuff
+	motif-config --start-install
+	if has_version =x11-libs/openmotif-2.2*; then touch $T/upgrade; fi
 }
 
 src_unpack() {
@@ -126,27 +133,16 @@ src_install() {
 	dodoc COPYRIGHT.MOTIF LICENSE
 	dodoc README RELEASE RELNOTES
 	dodoc BUGREPORT TODO
-}
 
-# Profile stuff
-pkg_setup() {
-	motif-config --start-install
+	# finish installation
+	motif-config --finish-install
 }
 
+# Profile stuff
 pkg_postinst() {
-	motif-config --finish-install
 	motif-config --install openmotif-2.2
 }
 
-is_upgrade() {
-	vdb_path=`portageq vdb_path`
-	if [ "`grep -r SLOT $vdb_path/${CATEGORY}/${PN}* | grep $SLOT`" ]; then
-		return 0
-	else
-		return 1
-	fi
-}
-
 pkg_postrm() {
-	is_upgrade || motif-config --uninstall openmotif-2.2
+	[ -f $T/upgrade ] || motif-config --uninstall openmotif-2.2
 }