motif-config-0.9

Package-Manager: portage-2.0.51.19

15 files changed, 97 insertions, 104 deletions

diff --git a/x11-libs/lesstif/ChangeLog b/x11-libs/lesstif/ChangeLog
index 1c7a965aab98..bde0628f28c0 100644
--- a/x11-libs/lesstif/ChangeLog
+++ b/x11-libs/lesstif/ChangeLog
@@ -1,6 +1,14 @@
 # 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.60 2005/04/01 19:01:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.61 2005/04/26 13:56:46 lanius Exp $
+
+*lesstif-0.94.4 (26 Apr 2005)
+*lesstif-0.93.94-r4 (26 Apr 2005)
+
+  26 Apr 2005; Heinrich Wendel <lanius@gentoo.org>
+  -lesstif-0.93.94-r3.ebuild, +lesstif-0.93.94-r4.ebuild,
+  -lesstif-0.94.0-r6.ebuild, +lesstif-0.94.0-r7.ebuild:
+  update to latest motif-config version
 
   01 Apr 2005; Aron Griffis <agriffis@gentoo.org> lesstif-0.94.0-r2.ebuild:
   stable on ia64
diff --git a/x11-libs/lesstif/Manifest b/x11-libs/lesstif/Manifest
index 2e1aad2f2817..14fcd6de46c1 100644
--- a/x11-libs/lesstif/Manifest
+++ b/x11-libs/lesstif/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ed8ed0bfe2466de324df14efaf19278e lesstif-0.94.0-r6.ebuild 2494
-MD5 112451f7e32410b51b0f47cdeaa7789f lesstif-0.93.94-r3.ebuild 2634
+MD5 40a6667db0b505b0893d92975a2b4a8b lesstif-0.93.94-r4.ebuild 2828
+MD5 0ba8aea0dd65c4fa21c98750643bd143 lesstif-0.94.4.ebuild 2432
 MD5 041d4da21c612ebce8ededeb533ecf8b lesstif-0.94.0-r2.ebuild 2112
-MD5 a6e1f758fc3698bd57185c5b86fd1469 ChangeLog 8205
+MD5 0016f98a3f47df5447016b03c72d5ad7 ChangeLog 8476
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 ca6ecc032ac0934b8c737650d6550162 lesstif-0.94.0.ebuild 2039
 MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0 68
+MD5 453b25066fafd67eb2452071e518c71b files/digest-lesstif-0.94.4 68
 MD5 10373c1e87b0208cd26888011a4d92de files/CAN-2005-0605.patch 1194
-MD5 45fa63580e7de408204bea30102331f8 files/digest-lesstif-0.93.94-r3 144
+MD5 c7b5275912acf7fd3ae16a24dca410ec files/digest-lesstif-0.93.94-r4 145
 MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0-r2 68
-MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0-r6 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCZOpaevY57Fted3ERAowAAJ96tFOvhTa5vl2/stuD2a6SKD/K6gCfdRZ6
-b4RIg0VrMmbFKXe0QoU6vZk=
-=Ou1p
------END PGP SIGNATURE-----
diff --git a/x11-libs/lesstif/files/digest-lesstif-0.93.94-r3 b/x11-libs/lesstif/files/digest-lesstif-0.93.94-r3
deleted file mode 100644
index 1ad7cd16a89f..000000000000
--- a/x11-libs/lesstif/files/digest-lesstif-0.93.94-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-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.93.94-r4 b/x11-libs/lesstif/files/digest-lesstif-0.93.94-r4
new file mode 100644
index 000000000000..ef64d7ddbc7a
--- /dev/null
+++ b/x11-libs/lesstif/files/digest-lesstif-0.93.94-r4
@@ -0,0 +1,2 @@
+MD5 6ae7340d91ba0566676bd3abb3842203 lesstif-0.93.94.tar.bz2 3461827
+MD5 a7ef671a2f9b5e83a082b223e33b986d lesstif1-1_0.93.94-11.2.diff.gz 110235
diff --git a/x11-libs/lesstif/files/digest-lesstif-0.94.0-r6 b/x11-libs/lesstif/files/digest-lesstif-0.94.0-r6
deleted file mode 100644
index 86a358232318..000000000000
--- a/x11-libs/lesstif/files/digest-lesstif-0.94.0-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 20f38a06c863e0c51ca0c862ef039601 lesstif-0.94.0.tar.bz2 2425210
diff --git a/x11-libs/lesstif/files/digest-lesstif-0.94.4 b/x11-libs/lesstif/files/digest-lesstif-0.94.4
new file mode 100644
index 000000000000..a157b92c057f
--- /dev/null
+++ b/x11-libs/lesstif/files/digest-lesstif-0.94.4
@@ -0,0 +1 @@
+MD5 3096ca456c0bc299d895974d307c82d8 lesstif-0.94.4.tar.bz2 2447156
diff --git a/x11-libs/lesstif/lesstif-0.93.94-r3.ebuild b/x11-libs/lesstif/lesstif-0.93.94-r4.ebuild
index cda640f6fdfd..f089efaca977 100644
--- a/x11-libs/lesstif/lesstif-0.93.94-r3.ebuild
+++ b/x11-libs/lesstif/lesstif-0.93.94-r4.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/lesstif/lesstif-0.93.94-r3.ebuild,v 1.5 2005/04/19 11:23:48 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.93.94-r4.ebuild,v 1.1 2005/04/26 13:56:47 lanius Exp $
 
 # disable sandbox, needed for motif-config
 SANDBOX_DISABLED="1"
@@ -10,26 +10,26 @@ 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.1.diff.gz"
+	mirror://debian/pool/main/l/lesstif1-1/lesstif1-1_0.93.94-11.2.diff.gz"
 
 LICENSE="LGPL-2"
 SLOT="1.2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~ppc-macos ~sparc ~x86 ~ia64"
 IUSE="static"
 
-DEPEND="virtual/libc
+RDEPEND="virtual/libc
 	virtual/x11
-	>=x11-libs/motif-config-0.6"
+	>=x11-libs/motif-config-0.9"
+
+DEPEND="dev-lang/perl
+	${RDEPEND}"
 
 PROVIDE="virtual/motif"
 
 src_unpack() {
-	# profile stuff
-	motif-config --start-install
-
 	unpack ${A}
 	cd ${S}
-	epatch ${DISTDIR}/lesstif1-1_0.93.94-11.1.diff.gz
+	epatch ${DISTDIR}/lesstif1-1_0.93.94-11.2.diff.gz
 }
 
 src_compile() {
@@ -48,10 +48,18 @@ src_compile() {
 	  --disable-build-21 \
 	  --with-x || die "./configure failed"
 
+	# fix linkage against already installed version
+	perl -pi -e 's/^(hardcode_into_libs)=.*/$1=no/' libtool
+
 	emake CFLAGS="${CFLAGS}" || die
 }
 
 src_install() {
+	# fix linkage against already installed version
+	for f in `find . -name \*.la -type f` ; do
+		perl -pi -e 's/^(relink_command=.*)/# $1/' $f
+	done
+
 	make DESTDIR=${D} install || die "make install"
 
 
@@ -94,18 +102,16 @@ src_install() {
 	rm -fR ${D}/usr/$(get_libdir)/X11/
 
 	# profile stuff
-	motif-config --finish-install
+	dodir /etc/env.d
+	echo "LDPATH=/usr/lib/lesstif-1.2" > ${D}/etc/env.d/15lesstif-1.2
+	dodir /usr/$(get_libdir)/motif
+	echo "PROFILE=lesstif-1.2" > ${D}/usr/$(get_libdir)/motif/lesstif-1.2
 }
 
-# Profile stuff
-#pkg_setup() {
-#	if has_version =x11-libs/lesstif-0.93.94*; then touch /tmp/lesstif-1.2; fi
-#}
-
 pkg_postinst() {
-	motif-config --install lesstif-1.2
+	motif-config -s
 }
 
-#pkg_prerm() {
-#	[ -f /tmp/lesstif-1.2 ] && rm -f /tmp/lesstif-1.2 || motif-config --uninstall lesstif-1.2
-#}
+pkg_postrm() {
+	motif-config -s
+}
diff --git a/x11-libs/lesstif/lesstif-0.94.0-r6.ebuild b/x11-libs/lesstif/lesstif-0.94.4.ebuild
index e2f121f8fde7..e74f78040978 100644
--- a/x11-libs/lesstif/lesstif-0.94.0-r6.ebuild
+++ b/x11-libs/lesstif/lesstif-0.94.4.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/lesstif/lesstif-0.94.0-r6.ebuild,v 1.5 2005/04/19 11:22:46 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.94.4.ebuild,v 1.1 2005/04/26 13:56:47 lanius Exp $
 
 # disable sandbox, needed for motif-config
 SANDBOX_DISABLED="1"
@@ -16,16 +16,16 @@ SLOT="2.1"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~ppc-macos ~sparc ~x86 ~ia64"
 IUSE="static"
 
-DEPEND="virtual/libc
+RDEPEND="virtual/libc
 	virtual/x11
-	>=x11-libs/motif-config-0.5"
+	>=x11-libs/motif-config-0.9"
+
+DEPEND="dev-lang/perl
+	${RDEPEND}"
 
 PROVIDE="virtual/motif"
 
 src_unpack() {
-	# profile stuff
-	motif-config --start-install
-
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/CAN-2005-0605.patch
@@ -90,18 +90,16 @@ src_install() {
 	rm -fR ${D}/usr/$(get_libdir)/X11/
 
 	# profile stuff
-	motif-config --finish-install
+	dodir /etc/env.d
+	echo "LDPATH=/usr/lib/lesstif-2.1" > ${D}/etc/env.d/15lesstif-2.1
+	dodir /usr/$(get_libdir)/motif
+	echo "PROFILE=lesstif-2.1" > ${D}/usr/$(get_libdir)/motif/lesstif-2.1
 }
 
-# Profile stuff
-#pkg_setup() {
-#	if has_version ">=x11-libs/lesstif-0.94.0"; then touch /tmp/lesstif-2.1; fi
-#}
-
 pkg_postinst() {
-	motif-config --install lesstif-2.1
+	motif-config -s
 }
 
-#pkg_prerm() {
-#	[ -f /tmp/lesstif-2.1 ] && rm -f /tmp/lesstif-2.1 || motif-config --uninstall lesstif-2.1
-#}
+pkg_postrm() {
+	motif-config -s
+}
diff --git a/x11-libs/motif-config/ChangeLog b/x11-libs/motif-config/ChangeLog
index a56d7db7017d..8ff51723a8e2 100644
--- a/x11-libs/motif-config/ChangeLog
+++ b/x11-libs/motif-config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/motif-config
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif-config/ChangeLog,v 1.12 2005/03/25 07:27:38 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif-config/ChangeLog,v 1.13 2005/04/26 13:56:50 lanius Exp $
+
+*motif-config-0.9 (26 Apr 2005)
+
+  26 Apr 2005; Heinrich Wendel <lanius@gentoo.org> +files/motif-config-0.9,
+  files/system.mwmrc, +motif-config-0.9.ebuild:
+  block old versions to prevent upgrade bugs; hopefully fix outstanding bugs
 
 *motif-config-0.8 (25 Mar 2005)
 
diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 015eab02194c..733a3ba3c175 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,14 @@
 # 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.105 2005/03/27 00:07:34 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.106 2005/04/26 13:56:43 lanius Exp $
+
+*openmotif-2.2.3-r7 (26 Apr 2005)
+*openmotif-2.1.30-r13 (26 Apr 2005)
+
+  26 Apr 2005; Heinrich Wendel <lanius@gentoo.org>
+  -openmotif-2.1.30-r12.ebuild, +openmotif-2.1.30-r13.ebuild,
+  -openmotif-2.2.3-r6.ebuild, +openmotif-2.2.3-r7.ebuild:
+  update to motif-config-0.9
 
   27 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
   openmotif-2.1.30-r9.ebuild:
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 8533df0c9d37..0cef4b9293c3 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,18 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 cb051187dcf2784c408af37bdbefe815 openmotif-2.1.30-r12.ebuild 5310
 MD5 820298e14c2fe7aa9d83621eb59a75ad openmotif-2.2.3-r3.ebuild 3239
 MD5 18a738af27482c9abb5153e4227db96d openmotif-2.1.30-r6.ebuild 3861
 MD5 adfb21d30974061a3fa839be7831ea77 openmotif-2.2.3.ebuild 3190
+MD5 bee52f32c8ad298f33bbe191441e9cd4 openmotif-2.2.3-r7.ebuild 3797
+MD5 15b023bfc27969a08a66f66ea4cc4b23 openmotif-2.1.30-r13.ebuild 5165
 MD5 459687380ba71bba6e17cd677c6f9d60 openmotif-2.1.30-r7.ebuild 3986
 MD5 24d889570bc059e0adfe8ab0b4df759d ChangeLog 15781
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
-MD5 76dec0d25643ff7cf10bb114f60f4b43 openmotif-2.2.3-r6.ebuild 3947
 MD5 223da65207cc5e34efb2119049d01097 openmotif-2.1.30-r9.ebuild 3985
 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-r6 68
+MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r7 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
@@ -35,6 +33,7 @@ MD5 f89741373660d1834cb1063c06dda8fd files/openmotif-2.2.3-popup_timeout.patch 3
 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-r12 79
+MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r13 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
@@ -43,10 +42,3 @@ 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCZOovevY57Fted3ERAorQAJ0cqE7Zk7M5UFWjKkE7ECAg4Q38xACffK5x
-TN6t1pOWExPZd0K6Oqmo7JM=
-=DTPq
------END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r12 b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r13
index ead704e865e9..ead704e865e9 100644
--- a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r12
+++ b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r13
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r6 b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r7
index a6451299c75a..a6451299c75a 100644
--- a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r6
+++ b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r7
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r12.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r13.ebuild
index 96c6def90920..57703e3d93f8 100644
--- a/x11-libs/openmotif/openmotif-2.1.30-r12.ebuild
+++ b/x11-libs/openmotif/openmotif-2.1.30-r13.ebuild
@@ -1,9 +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-r12.ebuild,v 1.5 2005/04/19 11:23:10 lanius Exp $
-
-# disable sandbox, needed for motif-config
-SANDBOX_DISABLED="1"
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r13.ebuild,v 1.1 2005/04/26 13:56:43 lanius Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -21,16 +18,13 @@ PROVIDE="virtual/motif"
 
 RDEPEND="virtual/libc
 	virtual/x11
-	>=x11-libs/motif-config-0.5"
+	>=x11-libs/motif-config-0.9"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
 SLOT="2.1"
 
 src_unpack() {
-	# profile stuff
-	motif-config --start-install
-
 	local cfg="${S}/config/cf/site.def"
 
 	unpack ${A}
@@ -163,18 +157,16 @@ src_install() {
 	dodoc BUGREPORT OPENBUGS CLOSEDBUGS
 
 	# profile stuff
-	motif-config --finish-install
+	dodir /etc/env.d
+	echo "LDPATH=/usr/lib/openmotif-2.1" > ${D}/etc/env.d/15openmotif-2.1
+	dodir /usr/$(get_libdir)/motif
+	echo "PROFILE=openmotif-2.1" > ${D}/usr/$(get_libdir)/motif/openmotif-2.1
 }
 
-# Profile stuff
-#pkg_setup() {
-#	if has_version =x11-libs/openmotif-2.1*; then touch /tmp/openmotif-2.1; fi
-#}
-
 pkg_postinst() {
-	motif-config --install openmotif-2.1
+	/usr/bin/motif-config -s
 }
 
-#pkg_prerm() {
-#	[ -f /tmp/openmotif-2.1 ] && rm -f /tmp/openmotif-2.1 || motif-config --uninstall openmotif-2.1
-#}
+pkg_postrm() {
+	/usr/bin/motif-config -s
+}
diff --git a/x11-libs/openmotif/openmotif-2.2.3-r6.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r7.ebuild
index fe716d186b54..7d818fbd98a8 100644
--- a/x11-libs/openmotif/openmotif-2.2.3-r6.ebuild
+++ b/x11-libs/openmotif/openmotif-2.2.3-r7.ebuild
@@ -1,9 +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-r6.ebuild,v 1.5 2005/04/19 11:23:10 lanius Exp $
-
-# disable sandbox, needed for motif-config
-SANDBOX_DISABLED="1"
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r7.ebuild,v 1.1 2005/04/26 13:56:43 lanius Exp $
 
 inherit eutils libtool flag-o-matic multilib
 
@@ -22,10 +19,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.6"
+	>=x11-libs/motif-config-0.9"
 RDEPEND="virtual/libc
 	virtual/x11
-	>=x11-libs/motif-config-0.6"
+	>=x11-libs/motif-config-0.9"
 
 PROVIDE="virtual/motif"
 SLOT="2.2"
@@ -33,15 +30,9 @@ 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
-	#if has_version =x11-libs/openmotif-2.2*; then touch /tmp/openmotif-2.2; fi
 }
 
 src_unpack() {
-	# profile stuff
-	motif-config --start-install
-
 	unpack ${A}
 	cd ${S}
 
@@ -136,15 +127,17 @@ src_install() {
 	dodoc README RELEASE RELNOTES
 	dodoc BUGREPORT TODO
 
-	# finish installation
-	motif-config --finish-install
+	# profile stuff
+	dodir /etc/env.d
+	echo "LDPATH=/usr/lib/openmotif-2.2" > ${D}/etc/env.d/15openmotif-2.2
+	dodir /usr/$(get_libdir)/motif
+	echo "PROFILE=openmotif-2.2" > ${D}/usr/$(get_libdir)/motif/openmotif-2.2
 }
 
-# Profile stuff
 pkg_postinst() {
-	motif-config --install openmotif-2.2
+	/usr/bin/motif-config -s
 }
 
-#pkg_prerm() {
-#	[ -f /tmp/openmotif-2.2 ] && rm -f /tmp/openmotif-2.2 || motif-config --uninstall openmotif-2.2
-#}
+pkg_postrm() {
+	/usr/bin/motif-config -s
+}