summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-01-20 18:19:41 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-01-20 18:19:41 +0000
commit8b1563b87e1917a9d2aae5f9f94c1a031058b734 (patch)
tree3f15aee42d7ac83808c78d992cb9651fc92eb919 /x11-libs
parentStable on alpha, bug 78249. (diff)
downloadhistorical-8b1563b87e1917a9d2aae5f9f94c1a031058b734.tar.gz
historical-8b1563b87e1917a9d2aae5f9f94c1a031058b734.tar.bz2
historical-8b1563b87e1917a9d2aae5f9f94c1a031058b734.zip
Multilib fixes.
Package-Manager: portage-2.0.51-r13
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/openmotif/Manifest8
-rw-r--r--x11-libs/openmotif/openmotif-2.1.30-r6.ebuild21
2 files changed, 17 insertions, 12 deletions
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index d366ef13809f..26402740ca17 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -5,8 +5,8 @@ MD5 6efd7f40488bb8fc36096654525419e4 ChangeLog 8783
MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
MD5 df1a40bb26c9fb49af02efaa48c8e005 openmotif-2.1.30-r4.ebuild 3267
MD5 0052a396e94ae5935dda29c00311174f openmotif-2.1.30-r5.ebuild 3684
-MD5 167f5f34f97e179dfd99d5e652b273b2 openmotif-2.1.30-r6.ebuild 3726
MD5 918533b15b57b0261c3d96fb5a876d92 openmotif-2.1.30-r7.ebuild 3900
+MD5 64f1230ad89da0a69d40f19b0bbffb00 openmotif-2.1.30-r6.ebuild 3845
MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r4 79
MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r5 79
MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r6 79
@@ -22,7 +22,7 @@ MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r7 79
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
-iD8DBQFB7/K5ArHZZzCEUG0RAhOlAJ9aFXe5oJ+fEsKUoe3ydcFDUOa0wwCdFcbr
-EoOm7zKlXOyS0uR/LujgzbM=
-=j/Hl
+iD8DBQFB7/ZLArHZZzCEUG0RAqlZAKCIfY/NHhuigOzW852WE4piFLjZDwCfdlho
+Qt0+UZF0dc2NNojBXs78Gu0=
+=sXcF
-----END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r6.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r6.ebuild
index 796efee3ba5d..7a9c618241fd 100644
--- a/x11-libs/openmotif/openmotif-2.1.30-r6.ebuild
+++ b/x11-libs/openmotif/openmotif-2.1.30-r6.ebuild
@@ -1,8 +1,8 @@
# 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-r6.ebuild,v 1.1 2005/01/18 08:59:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r6.ebuild,v 1.2 2005/01/20 18:19:41 eradicator Exp $
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic multilib
MY_P=${P}-4_MLI.src
S=${WORKDIR}/motif
@@ -97,20 +97,25 @@ src_install() {
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"
+ 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"
+ f="${D}/usr/X11R6/man/man1/${nim}.1"
else
- f="${D}usr/X11R6/man/man1/${nim}.1x"
+ 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"
+ 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
- einfo "Fixing docs"
dodoc README COPYRIGHT.MOTIF RELEASE RELNOTES
dodoc BUGREPORT OPENBUGS CLOSEDBUGS
}