summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-10-08 06:27:41 +0000
committerUlrich Müller <ulm@gentoo.org>2013-10-08 06:27:41 +0000
commit15720d7e76bf8467082cff85966a32fa3d95bcad (patch)
tree3b20b1d468e5ebeb3841b41eb0bfa32be82c1a27 /x11-libs
parentUpdate dependency on X libraries. (diff)
downloadhistorical-15720d7e76bf8467082cff85966a32fa3d95bcad.tar.gz
historical-15720d7e76bf8467082cff85966a32fa3d95bcad.tar.bz2
historical-15720d7e76bf8467082cff85966a32fa3d95bcad.zip
Remove pkgconfig workaround.
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0x9433907D693FB5B8!
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/motif/ChangeLog4
-rw-r--r--x11-libs/motif/Manifest24
-rw-r--r--x11-libs/motif/motif-2.3.4-r1.ebuild10
3 files changed, 15 insertions, 23 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/Manifest b/x11-libs/motif/Manifest
index 6e9b6961c8c3..6ee306635319 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -7,20 +7,20 @@ DIST motif-2.3.4-src.tgz 9527040 SHA256 637efa09608e0b8f93465dbeb7c92e58ebb14c4b
DIST openMotif-2.2.3.tar.gz 5149785 SHA256 12fc0d1de53ff30307603e31826db9b63a442f6f743451aed2cb7cedb038d3d9 SHA512 322381faf50bde6bbd2253f1b52a25e5471df87a2b01fba4de7e0d1bb4c1267e2b0d358e13e1b924a60d9e85316959fa6b2be5a458964d03f47a936bb618eae8 WHIRLPOOL 970f3f20eefde787af9fa932dcbf77e870ca6ba248e2632c358bbb7d149c2c4fef31a33a64888bc2b2e891f1c66a803a12e1121378539a94599e0be753c04bad
DIST openmotif-2.2.3-patches-5.tar.xz 19972 SHA256 69e1b1e37023ce0aa65c1aa8bdb60a6b2ead3472df26f1d10bffae7386b24c35 SHA512 62c0489d1bda83952e1c8d39e8c8fe0ee5a4d2927f9139227cb80b2c58751d63d95b70fff3eb165219e75cdfdc299f92d90482124e6334a28781a13b174786c9 WHIRLPOOL e2f8abc439d25d631b8489e1007788e931ea4982957d50e0e3e1062b76a3d37b279140f30bac95ab378a76cc33d5a49c1c217a66c441959510d9a96d7409d4af
EBUILD motif-2.2.3-r12.ebuild 1906 SHA256 860bfaf6865e592ecf62d708f0476a7d8d5c915e10cbe7646815a4ec4d94825e SHA512 01dceb4775003dc3115837a29ee85d1a5b7d853f9eda8f4c0489b99891f9763c101379273e0ffea76c20729282d1cd5664b934639da3b66ae35e19d81b1c93b7 WHIRLPOOL 43b946ab1ad94ecc48844551fde2bd20e997654f4cfb3fe438e56fe82c29ffd4dc6c05f67e480d41a7399d584982d87b624091998e48cec5b3d249b0156ffad1
-EBUILD motif-2.3.4-r1.ebuild 4274 SHA256 785797f611497ec5050f0b5025acb579dc85ee5da18fc514f42830a16aad8e41 SHA512 b716231cbb15e3d358b85412ce7b1abda785cf5a61f2e1a80db6b56c92a8a1d38bf081e4160a1f4f631d61769e9bbff446eec1824fa01472a932b4fec4b527e4 WHIRLPOOL 7f105c1a641a6b9014d33fa30d5c0910567628cd81e03cdb26825ebed66243b62a4994eea0a07a61a064e3cd79a148116a6920ac106ca6599a4670e3a97d4a35
-MISC ChangeLog 47075 SHA256 25ef750dbdd6c9766dca0cdd908106b7b46ca98616cf941e6982ee957c1ec070 SHA512 c04892de6eb50c539af6b9765543f14b5c868133fbdd3af7a21050908bd15ad8ba421165709b74f65c344ec306d1677daaff53b3c492b74b639d6004d59d5010 WHIRLPOOL 1645cbb093fe7ab5f37395affd4c94fb53878d5f4684053b9853160d595d66c20f1bc24b58859b4d64f6a431150f2f28ec2ed2610acf6c0628d2cb1815cc5160
+EBUILD motif-2.3.4-r1.ebuild 4011 SHA256 0e21fb0e3a08d29bed588b306ec916cc78ed2779c5cb29a02b222eb8671f1fbc SHA512 278dc25e7254352c9f9c86f5747bd26c227bc917383536e41166d5076750aa89002a806699863cbaa48f1e307ee89c23854d93318791605cf2a87762e4489340 WHIRLPOOL 77320a0d9c0127dfdf8e42106853ed768d1151a77b92053c92c72aef2d8a360d96eb6838738adee8e70081313e6a22dfcd3d3f171c3ca5890d38c78160bbf0e9
+MISC ChangeLog 47104 SHA256 16bec87b28530447964bf3ec910065bccf75b28fd027920bec587cde649b46a6 SHA512 d2055aa097fa62ceff21973d39687cbac8e2da91c7f80ad1896189f770bf2fbb965d7a00e4a8a0918f3b97361cf18114001332894a527e9cece884bc11499648 WHIRLPOOL 4ecb87fcb21c79afd858176b0d6d91a5a16fad9253501eba982d68fc5f014374fb5cb8ff04e64039bac36f23b0f6153224873469b6c245586d9efecb269a570a
MISC metadata.xml 289 SHA256 3c01ca1c89b14ec531baa83995a170fb4eaf7072daea1f12a87c5fe3aaec81a5 SHA512 f80ef1bc9169c6027df0715e76c50786aedb1053a35c699c5cacffd2c3e4d0640e123d5ec67634cfcfb1bdc2de43dba6f6819b1a3bd5458d061da675a23ecb80 WHIRLPOOL dbbda9b74ae8b7ed91a3abab4398484706036c51c4fb8c0f1df3c4539c9c2a8c4075abdd172ef2c734d952d13202928870d32b0b6189bbd41fa2431b53de72c3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.21 (GNU/Linux)
-iQGcBAEBCAAGBQJSU6UCAAoJEJQzkH1pP7W4EQoL/i39LVGm2YN+Kjw3gPU5g3f6
-IW12KVG1AsOny5MGvME6c5dyR1NAHpzcbj2RGd52kTGqND1i+XfG5DpvPKK1CBy5
-gmPA5xqj646lQXTUnpwZ3OoOVQ3jef6S7WsqyBSGLi9E3so985o3bos7bii00c0x
-YwlsagtJ0ImqNIwn82SO86AaL59KBsy/c3hAKWjFb1sFWsFknpW5MS09MLyXHO2j
-y9efma0QbNVNsMuARkcdpOxfldb/6yrKLGpbaDoT4Em5taIMyEnWAjFtI1JyVrMx
-41Ni9b/ClfMG1wkFUg3hBKyBSIJjgtAdsiOjZmy5TIZqyIyMGVPDWq3C+HzxYjtq
-NzLzLIC86ZBF4xnpLEhyHSjA81vu9/rE2kgD7WtPXvZ3i/G7fvVu5FGYo4WlXfVz
-i8JpQMhbsn1hvsdZFbu1Xy+PUZYfvbxwSwSPlhnENFLO6TwbEXY4JtCVvQBeQhSf
-eTn1Jn2EqSHB6m0hLf9o+R+RAT6gPt2EKEHKUWztUg==
-=Z7QQ
+iQGcBAEBCAAGBQJSU6YIAAoJEJQzkH1pP7W47wQL/043FflXb3i8MmEZEjSQTzgC
+ChN4gD2PVjuQLfwcpjaayzBon1lTrN+F6B1c80egsMlJIWPk1tF5ySWM5W+tzjzF
+9olqsBWhIlQ6Vhb6zk8PTLhyNOLmxEUW+zsHS0FBtawazQ06MBYj8ApunQOtnaNM
+oTCrd7PzaphQzTfV9D+1+Sg6SLcucFTBHkvtiyjCpIPNO/2g/MyQdWOG1kOLyFAT
+Z5Yk7WqzOC3+FhIjvL+s3nIfqyQZz3gc3uBvrWE9vZSamKY6x+A5aEu8fi2VdzqS
+nO6QbLPYCgpuJB9N6gdZYwgNn0JFLPptB4Pc4yIpmtV+DIaUBZ7xG8tZovtO0e96
+W9bTwS3v7Edsx01xDmj4iyJEY0Hcq4mhmNlrAlH7gl7Kc6mM3qVTl2K67esiXEWN
+UP3xYFfvL4DwqRiwVZg3ot6aD2Wd6eGRf6J6HgUTDnxGIFQ33uoGZzY5D/pv3kZH
+fqeYqS+50OhMVnA+Fl6qmLJIPFNcHACR2tPBwOkarg==
+=YD5p
-----END PGP SIGNATURE-----
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