diff options
author | Ulrich Müller <ulm@gentoo.org> | 2013-10-08 06:27:35 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2013-10-08 06:27:35 +0000 |
commit | 478adf7ce6c465887c2ca715024e6b28d06489dc (patch) | |
tree | 8472f0c6ffb385e182ff7c99c0e768deff0d0817 /x11-libs/motif | |
parent | Update dependency on X libraries. (diff) | |
download | gentoo-2-478adf7ce6c465887c2ca715024e6b28d06489dc.tar.gz gentoo-2-478adf7ce6c465887c2ca715024e6b28d06489dc.tar.bz2 gentoo-2-478adf7ce6c465887c2ca715024e6b28d06489dc.zip |
Remove pkgconfig workaround.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'x11-libs/motif')
-rw-r--r-- | x11-libs/motif/ChangeLog | 4 | ||||
-rw-r--r-- | x11-libs/motif/motif-2.3.4-r1.ebuild | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/x11-libs/motif/ChangeLog b/x11-libs/motif/ChangeLog index 1100a90a11e0..8ffe8a29273d 100644 --- a/x11-libs/motif/ChangeLog +++ b/x11-libs/motif/ChangeLog @@ -1,10 +1,10 @@ # 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.41 2013/10/08 06:22:34 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.42 2013/10/08 06:27:35 ulm Exp $ 08 Oct 2013; Ulrich Müller <ulm@gentoo.org> motif-2.2.3-r12.ebuild, motif-2.3.4-r1.ebuild: - Update dependency on X libraries. + Update dependency on X libraries. Remove pkgconfig workaround. 23 Aug 2013; Ulrich Müller <ulm@gentoo.org> -motif-2.2.3-r11.ebuild, -motif-2.3.4.ebuild, -files/motif-2.3.2-sanitise-paths.patch, diff --git a/x11-libs/motif/motif-2.3.4-r1.ebuild b/x11-libs/motif/motif-2.3.4-r1.ebuild index edfeabcede81..40872d9b8704 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.28 2013/10/08 06:22:34 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.29 2013/10/08 06:27:35 ulm Exp $ EAPI=5 @@ -72,14 +72,6 @@ src_prepare() { [[ ${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-libs -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 |