Make openmotif actually respect USE flags when building (thanks to Jozef Siska); bug #201915

Package-Manager: portage-2.1.4_rc14

3 files changed, 23 insertions, 23 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index d34df6dd89d1..22fffec9ec66 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/openmotif
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.144 2007/12/30 17:06:32 betelgeuse Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.145 2008/01/05 21:07:43 halcy0n Exp $
+
+  05 Jan 2008; Mark Loeser <halcy0n@gentoo.org> openmotif-2.3.0.ebuild:
+  Make openmotif actually respect USE flags when building (thanks to Jozef
+  Siska); bug #201915
 
   30 Dec 2007; Petteri Räty <betelgeuse@gentoo.org>
   -files/openmotif-2.1.30-CAN-2004-0687-0688.patch,
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index d29c604ef56f..dcffcc9735d3 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -57,14 +57,14 @@ EBUILD openmotif-2.2.3-r9.ebuild 3665 RMD160 ff360947f706ae39ef3324a839427c97637
 MD5 f2744350e1c6100faf8a675b732f51a2 openmotif-2.2.3-r9.ebuild 3665
 RMD160 ff360947f706ae39ef3324a839427c9763700621 openmotif-2.2.3-r9.ebuild 3665
 SHA256 39e9f2336b0a0469108757436a5bd6dcc88cd0f28912009b75831f84c3a14b1a openmotif-2.2.3-r9.ebuild 3665
-EBUILD openmotif-2.3.0.ebuild 3330 RMD160 4b754d0759e127dd230b75de8b858dc0aec5f66c SHA1 5ebacd0357b66db4d029cfe800d51f9aa56536ee SHA256 91e3108ae350ab41a10ec7e480131e3a61ef977787fa85f7c2df2a2e3bba577e
-MD5 9431e14754aa39dfdd58b820fe83b5da openmotif-2.3.0.ebuild 3330
-RMD160 4b754d0759e127dd230b75de8b858dc0aec5f66c openmotif-2.3.0.ebuild 3330
-SHA256 91e3108ae350ab41a10ec7e480131e3a61ef977787fa85f7c2df2a2e3bba577e openmotif-2.3.0.ebuild 3330
-MISC ChangeLog 22541 RMD160 3f491c5dd053eb87f5cf5fbcd8d073f851487800 SHA1 36759bccf38fe10c681c676efc0cab09e6596488 SHA256 5c62152b4d4d75652c7c130ee36c854e091d31ec6f06dcce4226b47ef8f0c1e8
-MD5 fd4ee8cb87da06f6bf3ce6ab39d17782 ChangeLog 22541
-RMD160 3f491c5dd053eb87f5cf5fbcd8d073f851487800 ChangeLog 22541
-SHA256 5c62152b4d4d75652c7c130ee36c854e091d31ec6f06dcce4226b47ef8f0c1e8 ChangeLog 22541
+EBUILD openmotif-2.3.0.ebuild 3218 RMD160 bf9c38dbf78416e9fe36c275f7487e2186025877 SHA1 81e1274d2dc0e579f650b132bdd1e84e96677e1b SHA256 0ed174912ae29f652dea9d6a2fffc4290717269c28e9f777456d9b6bfcd63205
+MD5 cf266e851e5e80c823329a45f45fe15a openmotif-2.3.0.ebuild 3218
+RMD160 bf9c38dbf78416e9fe36c275f7487e2186025877 openmotif-2.3.0.ebuild 3218
+SHA256 0ed174912ae29f652dea9d6a2fffc4290717269c28e9f777456d9b6bfcd63205 openmotif-2.3.0.ebuild 3218
+MISC ChangeLog 22708 RMD160 a37e0f10d0e45052bfe64c0fbbedbd507d28de7e SHA1 eb4e2e848023cb0dc01d40f7acc48f1a95d14f7a SHA256 e8778dba6d84c48459754870586bdec317ba0084824ed9db96bac2677281200a
+MD5 17e94bf6b7441f4c31be3c3f5b86f335 ChangeLog 22708
+RMD160 a37e0f10d0e45052bfe64c0fbbedbd507d28de7e ChangeLog 22708
+SHA256 e8778dba6d84c48459754870586bdec317ba0084824ed9db96bac2677281200a ChangeLog 22708
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
@@ -76,9 +76,9 @@ MD5 d204dd93385f1c0d98206ca3d5cc0b9d files/digest-openmotif-2.3.0 524
 RMD160 9f60feec6d78065bbbf6d72396fe122a51fa5ea6 files/digest-openmotif-2.3.0 524
 SHA256 d4e170194bf377c3aad980affb3d3fc8d23aeb4b6fc1cebd7c2a74b3ddc951d5 files/digest-openmotif-2.3.0 524
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHd8+GcxLzpIGCsLQRAnzXAJ9Bi9tGcbgjHWfJI7zP/rSpvmOVVQCfT2G3
-vdaUcPLETEQoQ5mF/KnG+fc=
-=zXkY
+iEYEARECAAYFAkd/8akACgkQCRZPokWLroR+nwCfVFIyJoZ+w3JFvFyZZrUv+scl
+I4wAn0Aa2FpwJv+6hAKv5BtwrluDGH9g
+=KjYX
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/openmotif-2.3.0.ebuild b/x11-libs/openmotif/openmotif-2.3.0.ebuild
index 6a4ee3fc122e..3571c60c7ce6 100644
--- a/x11-libs/openmotif/openmotif-2.3.0.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild,v 1.7 2007/12/30 16:54:31 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild,v 1.8 2008/01/05 21:07:43 halcy0n Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.6"
@@ -38,8 +38,6 @@ pkg_setup() {
 }
 
 src_compile() {
-	local myconf
-
 	# get around some LANG problems in make (#15119)
 	unset LANG
 
@@ -48,12 +46,10 @@ src_compile() {
 
 	append-flags -fno-strict-aliasing
 
-	use xft && myconf="${myconf} `use_enable xft`"
-	use jpeg && myconf="${myconf} `use_enable jpeg`"
-	use png && myconf="${myconf} `use_enable png`"
-
 	econf --with-x \
-	    ${myconf} || die "configuration failed"
+	    $(use_enable xft) \
+		$(use_enable jpeg) \
+		$(use_enable png) || die "configuration failed"
 
 	emake -j1 || die "make failed, if you have lesstif installed removed it, compile openmotif and recompile lesstif"
 }