summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-08-05 21:27:45 +0000
committerUlrich Müller <ulm@gentoo.org>2013-08-05 21:27:45 +0000
commit32ea0bdee7bb86124665b34c4217c06b0c93c1dd (patch)
tree559acdc04f84e401df1f13eb4012c3ae24f64a56 /x11-libs/motif
parentVersion bump. Add static-libs USE flag (bug #461724), remove unnecessary .la ... (diff)
downloadgentoo-2-32ea0bdee7bb86124665b34c4217c06b0c93c1dd.tar.gz
gentoo-2-32ea0bdee7bb86124665b34c4217c06b0c93c1dd.tar.bz2
gentoo-2-32ea0bdee7bb86124665b34c4217c06b0c93c1dd.zip
Workaround for missing pkgconfig files, bug 479876.
(Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'x11-libs/motif')
-rw-r--r--x11-libs/motif/ChangeLog5
-rw-r--r--x11-libs/motif/motif-2.3.4-r1.ebuild12
2 files changed, 14 insertions, 3 deletions
diff --git a/x11-libs/motif/ChangeLog b/x11-libs/motif/ChangeLog
index 11a48b663b08..74c895472970 100644
--- a/x11-libs/motif/ChangeLog
+++ b/x11-libs/motif/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/motif
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.36 2013/08/04 18:36:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.37 2013/08/05 21:27:45 ulm Exp $
+
+ 05 Aug 2013; Ulrich Müller <ulm@gentoo.org> motif-2.3.4-r1.ebuild:
+ Workaround for missing pkgconfig files, bug 479876.
04 Aug 2013; Agostino Sarubbo <ago@gentoo.org> motif-2.2.3-r12.ebuild,
motif-2.3.4-r1.ebuild:
diff --git a/x11-libs/motif/motif-2.3.4-r1.ebuild b/x11-libs/motif/motif-2.3.4-r1.ebuild
index c752b1b46d6e..114c34bf72bc 100644
--- a/x11-libs/motif/motif-2.3.4-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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-r1.ebuild,v 1.23 2013/08/04 18:36:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.24 2013/08/05 21:27:45 ulm Exp $
EAPI=5
@@ -79,10 +79,18 @@ src_prepare() {
# feel free to fix properly if you care
append-flags -fno-strict-aliasing
- # For Solaris Xos_r.h :(
+ # for Solaris Xos_r.h :(
[[ ${CHOST} == *-solaris2.11 ]] \
&& append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
+ # workaround for missing pkgconfig files in emul-linux-x86-xlibs #479876
+ if use xft && use amd64 && use abi_x86_32 \
+ && has_version "app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]"
+ then
+ append-cppflags -I/usr/include/freetype2
+ append-ldflags -lXft
+ fi
+
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