Call dosym with proper second argument. Add static-libs USE flag.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index e0de4d8fff6b40c089998bf81ea6d6702e3d758b..dc450cce22588071cf129a4c1250f3aad0b1960d 100644 (file)
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.261 2011/03/07 11:04:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.262 2011/08/20 05:20:14 ulm Exp $
+
+  20 Aug 2011; Ulrich Mueller <ulm@gentoo.org> openmotif-2.3.2-r2.ebuild:
+  Call dosym with proper second argument. Add static-libs USE flag.
 
   07 Mar 2011; Ulrich Mueller <ulm@gentoo.org> openmotif-2.2.3-r11.ebuild,
   openmotif-2.3.2-r2.ebuild, openmotif-2.3.3.ebuild:

diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index f311577a72d9c7a5e29d4bd3f16a75692f4c152a..cc77faac30c8a9b0cfedbf7eef7b14c6e38f8ba9 100644 (file)
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -15,14 +15,14 @@ DIST openmotif-2.2.3-patches-4.tar.bz2 20601 RMD160 6f3f6492689b172e4ca4fb26510c
 DIST openmotif-2.3.2.tar.gz 5941784 RMD160 2346a93fcec57b9c18b6657d1cc681b6001cba28 SHA1 c98ac1bf3640ce57da34a0704bdeb2b12011ae1f SHA256 f786f3724d33133e8c4b3c9b368c89d680e981ca1c0e8c3280f496976b390c7d
 DIST openmotif-2.3.3.tar.gz 6051202 RMD160 015323e212e91ea3beaf039593de5ba75b01e4a6 SHA1 2a51e2f28078c4db7ff0c8517eb257001716b699 SHA256 c85f5545e218fa0c59a3789192132d472fc5a33e914a221a568eee4fc10cd103
 EBUILD openmotif-2.2.3-r11.ebuild 1689 RMD160 72917768fc77808514cf95cf20a19935a93b81b7 SHA1 bf58a269b857eb8dd00f16c3dc8f3c148d6c924d SHA256 61a7d065f9ea2a5f6c3f82dc20bafdcac44a0575865db04d2fccb84c92c4bc20
-EBUILD openmotif-2.3.2-r2.ebuild 5006 RMD160 f24deee5af2f0d8598b48572fc35a209d9b161de SHA1 3b1f26b3b46df70fe520c255264593bd39f75c85 SHA256 32cb76721b1f9082ce6667fb8cc0241797411e1b972695feffb08a2955b3c99a
+EBUILD openmotif-2.3.2-r2.ebuild 5140 RMD160 80896245165ecc4ce136cc6ee2e80f8ccc5de076 SHA1 d192e7482afd0c6f575e0133c27a4fc383800c14 SHA256 da8e5849680ffd6a8ebe1628c19b1d88dfd1dcc4b20bcf60bf1095765712a54c
 EBUILD openmotif-2.3.3.ebuild 4892 RMD160 c2fae19b622c43f8f95ef7f7036740cbb72ffd35 SHA1 f24b8e9874f64a7491f6baa442ba28a08e558ddd SHA256 5cf4fa5f9134eb0cc5d354d5b2f2169a0de66b2681981b217d71796ef06b4db5
-MISC ChangeLog 38552 RMD160 ee46ddcbc7e1626dea82a33c25f3ba17f3b17a41 SHA1 ec525c7bb3be4fcc6c0091a6fc7a7624ba8db14b SHA256 91708818c37bf2f2eadbd1980bbbc91de4de9abc1aeff4f6c86191fc40d230f9
+MISC ChangeLog 38695 RMD160 d99e270c99c1ce3869417a74ca2ce0d65b674a14 SHA1 612bee154d8b09f0b9d7ba27c725fb980b135669 SHA256 375d56b44cd0c54790b24c8ff24b094be859685d2adc906c8f752330c83000da
 MISC metadata.xml 219 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 SHA1 02c240887d922c73610257891793b3bdec27fc8e SHA256 c1572876b54cc63c7b7ecad4c9adf1b6460d166c41e84b1df0322c5df6497ffb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk10vVcACgkQOeoy/oIi7uwdjwCbBfR2assgWbhEOom6Bu0sMeuD
-YaEAni6o0MCy42POzpv35QfApvqx0BqN
-=pUuV
+iEYEARECAAYFAk5PRWwACgkQOeoy/oIi7uyKrQCfYRBdfXumlV5R0wMtZCigIKNa
+MmQAn2a4eMgjUr6rGE1EBDfiD48qMZU3
+=OlNm
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild b/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
index b12b23b98b3ad1ea63ff89b73828b3bd9e6e1fe5..4f3c34f198959d181271f94e3a8b53d621c80922 100644 (file)
--- a/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild,v 1.18 2011/03/07 11:04:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild,v 1.19 2011/08/20 05:20:14 ulm Exp $
 
 EAPI=3
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.ics.com/openmotif/${PV%.*}/${PV}/${P}.tar.gz"
 LICENSE="MOTIF MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples jpeg png unicode xft"
+IUSE="doc examples jpeg png static-libs unicode xft"
 # license allows distribution only for "open source operating systems"
 RESTRICT="!kernel_linux? (
        !kernel_FreeBSD? (
@@ -116,6 +116,7 @@ src_configure() {
        fi
 
        econf --with-x \
+               $(use_enable static-libs static) \
                $(use_enable unicode utf8) \
                $(use_enable xft) \
                $(use_enable jpeg) \
@@ -135,7 +136,7 @@ src_install() {
 
        dodir /etc/X11/mwm
        mv -f "${ED}"/usr/$(get_libdir)/X11/system.mwmrc "${ED}"/etc/X11/mwm
-       dosym /etc/X11/mwm/system.mwmrc /usr/$(get_libdir)/X11/
+       dosym /etc/X11/mwm/system.mwmrc /usr/$(get_libdir)/X11/system.mwmrc
 
        if use examples; then
                emake -j1 -C demos DESTDIR="${D}" install-data \
@@ -145,6 +146,9 @@ src_install() {
        fi
        rm -rf "${ED}"/usr/share/Xm
 
+       # don't install libtool archives
+       rm -f "${ED}"/usr/$(get_libdir)/*.la
+
        dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
 }