Call tc-getCC in src_prepare to get the name of the compiler for the native ABI....

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

diff --git a/x11-libs/motif/ChangeLog b/x11-libs/motif/ChangeLog
index d200f4a6a1da2a0abdcfc758bd78916be0f884e8..303219bd35885ad5d27c924d99434d65040f40de 100644 (file)
--- a/x11-libs/motif/ChangeLog
+++ b/x11-libs/motif/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/motif
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.55 2015/01/08 14:34:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.56 2015/01/10 20:13:35 ulm Exp $
+
+*motif-2.3.4-r3 (10 Jan 2015)
+
+  10 Jan 2015; Ulrich Müller <ulm@gentoo.org> +motif-2.3.4-r3.ebuild:
+  Call tc-getCC in src_prepare to get the name of the compiler for the native
+  ABI. Previously used tc-getBUILD_CC did not work with crossdev, bug 533678.
 
   08 Jan 2015; Justin Lecher <jlec@gentoo.org> motif-2.2.3-r12.ebuild,
   metadata.xml:

diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index 708900188e542d7f84705cb89a13a78eb3062dda..1b413ee79d37465ab235fa105a148cd14784ac50 100644 (file)
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -9,19 +9,20 @@ DIST openmotif-2.2.3-patches-5.tar.xz 19972 SHA256 69e1b1e37023ce0aa65c1aa8bdb60
 EBUILD motif-2.2.3-r12.ebuild 1975 SHA256 0f1d91c322a7dad1a3f5b98b96a13c55ad674c23fdf586718b1f8d79591825cf SHA512 707a82f3a6e7e3b45ecdbd35aee7b4517a135a97d9592ed4898fc16a871b25a38bdc3bd41fb655239f6d00a5a0f5aa935c8053e51dd7dac4d98dd2db1cafd59e WHIRLPOOL 74d5aa64ef0e1050b61987da669c89dbe34c5c825f5e22f6f6a7a9444d23581b023b8c90f3e8b3fd4570ae24d9dae48f39692f6059bbff9f0c1f0a736e1ecde1
 EBUILD motif-2.3.4-r1.ebuild 3854 SHA256 4f2b82370bccdd94cf75330fa942c3e0c8484831469d441a9f98374667dc6b7f SHA512 17f55650d719ab407afafd5dcd5e50748c3a08926043f79e4e7b543b83465834bd649be1e877fa2098e04e15fce91971ff9164d712da8361956b222f1a6b5465 WHIRLPOOL 61cc1052f647327b016dd8d6a9ea8d3431d5cfcce95ec56d69f279fa2f2ae69eec153582ddd86e8d4a652c5e74905c33d52cb261ed90c8e0bfa540da8ed2ed17
 EBUILD motif-2.3.4-r2.ebuild 3489 SHA256 0be68881eb41ce8004ea395ec84f1aca8ec4bc47496563a91bcf3fb1ce7fb53f SHA512 87c87ee04ed1e61f37f61d4bf8b85ed2c2e202bcc239fa5ee51281f7136ea24249298ead4b1f25ad251b2858a0b4f770287b773e5c878a6ca8bc16fc72bd55d5 WHIRLPOOL cf36101137bb17e719aa79bbad9be317281cf273dab28ba46179bd5b25964d8216d9d2d87d265b69354c94e37d1136f567ecc48104006796e741a3d1f59e4cd6
-MISC ChangeLog 48739 SHA256 7f17f83f67009f69be621e01a58f9b6314fe312b0bba43ab8cb2fc77836696c7 SHA512 d6ec60729c9f82753823e71e888027c3967395b5d5bd2c17214be2568f7f627330352c7509bbea748ec994a5fd4a57322ed5330f047ba3149c73edc53e69c44b WHIRLPOOL a6908eccff28449b08adb6ffb10a0c4117e821c05a477d657493f72f108f08d312db19a7db8601e0a793403a0a21434e92e43fd73626cd02c0bce606ac5e3e22
+EBUILD motif-2.3.4-r3.ebuild 3533 SHA256 1fca0a06cad91810d570f21047ee8c42d009a93638e2a9432f89e283118d5dcd SHA512 a8f59eebd1613f547e8bbc7bd3899d8d61d621a9e0a55570126a3fe6feded367a6f13e83270edbdfefe333010ffb1c632996b2609f11cbfbc70832380fa1d9c7 WHIRLPOOL 3b606fcc64be8d6d16ebd21d29d737c8ef96f1271172b8fd97c0e0c40ada47324d5fc438b8b9a742f8c27287bfcdcfb7c5e717854afaa38fca7750a91600ae49
+MISC ChangeLog 48997 SHA256 7b8f6ecd97467a91a0e6b3e57fc5ab7af40cf5b53eaa8e0dd69ff599aa5a86e0 SHA512 a7067fa99078f19d379fcf45cb0171d9627fc2e6bd67d44e2982cda5a3baf6a3a28ea69d2d6a3006cca8ad924cc29afe2cc1aef83af36a8e8c3387db3e2fe685 WHIRLPOOL 943ef857a5ad73a446d2be6bc65dfbe24bea5a8773a5a9df3ff822b527e0761447abff772d023e9061160e6dcbc6a09ee96b541d62df489a064207e544372791
 MISC metadata.xml 289 SHA256 3c01ca1c89b14ec531baa83995a170fb4eaf7072daea1f12a87c5fe3aaec81a5 SHA512 f80ef1bc9169c6027df0715e76c50786aedb1053a35c699c5cacffd2c3e4d0640e123d5ec67634cfcfb1bdc2de43dba6f6819b1a3bd5458d061da675a23ecb80 WHIRLPOOL dbbda9b74ae8b7ed91a3abab4398484706036c51c4fb8c0f1df3c4539c9c2a8c4075abdd172ef2c734d952d13202928870d32b0b6189bbd41fa2431b53de72c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJUrxKpAAoJEJQzkH1pP7W4R3kL/17af8ADyNeoRovyqDkcwau3
-SZVQAt0s68ODXDyYsgoex9fL20Vk8aIhorDQZtXrjPcpBu0AC26YLjF+meWZIUkc
-k6+Xs/B3/DPvoIBguilhp0FwWurYQLrfPDS+XpAzfJA823dD9P+kHQEhRC+3/cXC
-8x3uJIpQ9ZATriT+Bf5PynmE18YC5gDpk/OOQ+XcBwHmI9cKJ5oo7NGoz8hA1PVA
-LV/QdVr4lIY//ImD9rK74rLfQtepc3EvKkA59nY9pFinbQXdhpjRweYpcg3OGUmr
-QfYROS4Zz8bfDTkNDVYC5JiwUFwWj2tpzF8ycvKRE+yIXk6ZlhKNZ4Poy8wihDxD
-GmzrAY/4T8vXqensr11LMOOZW+sMqBcVxNxcnPzaJmRyh084qKMmwhQ4FQyF34Pl
-Ng1Hn2X3P6eg6ZwYitPhLQBQR8lTj/0Xty14hSibeMWCGllrc/1tGeG59hFg6VVi
-Ki4GZOGmbcb2Hgq+VahA4KKc4GB4K5pBQR5Pvb/E+A==
-=a8F8
+iQGcBAEBCAAGBQJUsYlCAAoJEJQzkH1pP7W4334L/0bmhrxlsT9fcCLGLKg4/2k4
+3SMp9La9vp1mzapB5+IPGTnW+xempMHGMIYG12fVa1o1NLF/8FvaaTxGQOPfZETr
+MlMW+NiGy+TlrR2F5UzG9ctfhgRYy2j7xp5t2d+k+LGHOMF58pE1+FB/iTydZ4bN
+xlsLDH+4b5REBRMIbuN6ywsz7O0x1+PiWwFzGmXM1E+pEkW3eTibV82weLHoMhxo
+FY8/vXe7DaqfkVdnputPVxZfXapt4i7st9760Fx+hCfY2jsg++FkaxW7elt4A1HV
+W4MrMcHX7N9EKUvcwRPuIZMg4Qz4G3pptuzyhhAEN0HjBtHWzjh8gbl21u0nn+Wv
+szF/U+1r1KK06FaTpLpMQYw2yBdNeVgUPf9aKQlUgdyGtA7cnQ/0WZoTKPOPRjj2
+UjxfPUES3v1hpuIeTjr9x69z8sZzuz3EDHuZo+0v/3HmHh0TjWT0jdZfF5ewYAlz
+tFubYwglLci89+3nhi+VXYKtS7Jw7Ubk4TQ2+Z0PvQ==
+=vV9l
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/motif/motif-2.3.4-r3.ebuild b/x11-libs/motif/motif-2.3.4-r3.ebuild
new file mode 100644 (file)
index 0000000..1d7bda8
--- /dev/null
+++ b/x11-libs/motif/motif-2.3.4-r3.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r3.ebuild,v 1.1 2015/01/10 20:13:35 ulm Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="The Motif user interface component toolkit"
+HOMEPAGE="http://sourceforge.net/projects/motif/
+       http://motif.ics.com/"
+SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}-src.tgz
+       mirror://gentoo/${P}-patches-1.tar.xz"
+
+LICENSE="LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
+
+RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] )
+       >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+       >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+       >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+       >=x11-libs/libXp-1.0.2[${MULTILIB_USEDEP}]
+       >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+       jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+       png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+       unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+       xft? (
+               >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+               >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+       )"
+
+DEPEND="${RDEPEND}
+       sys-devel/flex
+       || ( dev-util/byacc sys-freebsd/freebsd-ubin )
+       x11-misc/xbitmaps"
+
+src_prepare() {
+       EPATCH_SUFFIX=patch epatch
+       epatch_user
+
+       # disable compilation of demo binaries
+       sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
+
+       # add X.Org vendor string to aliases for virtual bindings
+       echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
+
+       AT_M4DIR=. eautoreconf
+
+       # get around some LANG problems in make (#15119)
+       LANG=C
+
+       # bug #80421
+       filter-flags -ftracer
+
+       # feel free to fix properly if you care
+       append-flags -fno-strict-aliasing
+
+       # for Solaris Xos_r.h :(
+       [[ ${CHOST} == *-solaris2.11 ]] \
+               && append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
+
+       if use !elibc_glibc && use !elibc_uclibc && use unicode; then
+               # libiconv detection in configure script doesn't always work
+               # http://bugs.motifzone.net/show_bug.cgi?id=1423
+               export LIBS="${LIBS} -liconv"
+       fi
+
+       # "bison -y" causes runtime crashes #355795
+       export YACC=byacc
+
+       # remember the name of the C compiler for the native ABI
+       MY_NATIVE_CC=$(tc-getCC)
+}
+
+multilib_src_configure() {
+       ECONF_SOURCE="${S}" econf \
+               --with-x \
+               $(use_enable static-libs static) \
+               $(use_enable motif22-compatibility) \
+               $(use_enable unicode utf8) \
+               $(use_enable xft) \
+               $(use_enable jpeg) \
+               $(use_enable png)
+}
+
+multilib_src_compile() {
+       # The wmluiltok build tool is linked with libfl.a, so always
+       # compile it for the native ABI
+       emake -C tools/wml CC="${MY_NATIVE_CC}" LIBS="-lfl" wmluiltok
+       emake
+}
+
+multilib_src_install() {
+       emake DESTDIR="${D}" install
+
+       if multilib_is_native_abi && use examples; then
+               emake -C demos DESTDIR="${D}" install-data
+               dodir /usr/share/doc/${PF}/demos
+               mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
+       fi
+}
+
+multilib_src_install_all() {
+       # mwm default configs
+       insinto /usr/share/X11/app-defaults
+       newins "${FILESDIR}"/Mwm.defaults Mwm
+
+       # cleanup
+       rmdir "${ED}"/usr/share/Xm || die
+       prune_libtool_files
+
+       dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
+}