summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2014-02-07 19:51:21 +0000
committerUlrich Müller <ulm@gentoo.org>2014-02-07 19:51:21 +0000
commita0616ec9f18360f64f061284a6ba1f4093f3e5f5 (patch)
tree4c75d08f3dfdb4b1075ab4ee256d3ad81b87ccc8 /x11-libs
parentamd64/ppc64/ppc/x86 stable wrt bug #500270; Drop old. (diff)
downloadhistorical-a0616ec9f18360f64f061284a6ba1f4093f3e5f5.tar.gz
historical-a0616ec9f18360f64f061284a6ba1f4093f3e5f5.tar.bz2
historical-a0616ec9f18360f64f061284a6ba1f4093f3e5f5.zip
Remove alternative dependencies on emul-linux-x86-* packages.
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0x9433907D693FB5B8!
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/motif/ChangeLog7
-rw-r--r--x11-libs/motif/Manifest19
-rw-r--r--x11-libs/motif/motif-2.3.4-r1.ebuild23
3 files changed, 24 insertions, 25 deletions
diff --git a/x11-libs/motif/ChangeLog b/x11-libs/motif/ChangeLog
index c41b866999f6..add7edab232a 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.43 2013/10/21 13:56:09 grobian Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.44 2014/02/07 19:50:54 ulm Exp $
+
+ 07 Feb 2014; Ulrich Müller <ulm@gentoo.org> motif-2.3.4-r1.ebuild:
+ Remove alternative dependencies on emul-linux-x86-* packages.
21 Oct 2013; Fabian Groffen <grobian@gentoo.org> motif-2.3.4-r1.ebuild:
Marked ~x64-macos, bug #486818
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index adb373e6a449..de62585c7ae2 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -7,13 +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 4026 SHA256 f294e302662542c8ef0a09e868134406c2ce0cb332ee8701d43ab6c2bb179c59 SHA512 10a7389f0002fa50cee0f24e75ab4bf217e0cc188d4b44075d75bbc5d742615f2e46704db916b0ed8a2dfc58522a10be640dbfe979770ab2311db72c780414c1 WHIRLPOOL 3fb05da9fded5217861605c7112e04192446f4b469efcb4cb03cd535e0481ae3d37394fe8b9acf6457b6153d6e0a39d3d74dacee7b0844c691613841da019ff7
-MISC ChangeLog 47216 SHA256 4a0a8a34fe22df3738bbe01f983129299d66274089bfe8a29a69a4c5b4dafa75 SHA512 0349f4d7db9dafba785c4e70d662860b869f3eaefffdff4318898883b85359406b53849bab39046b25ff9f347214170e0d9afd9d3460b1c2effee4d02397c89b WHIRLPOOL bc58539a4f02014e094b04a512888e72c9d5dfca16d593c1bc8efae23a9e99f82371371768ae39b23bfc26706de4ff59ba476c74105f98f7b293c867816ce8c1
+EBUILD motif-2.3.4-r1.ebuild 3770 SHA256 c9d5bbcb90b0d00f7f347a1da92deaaf89fdb514510c55422269009ca64cbecf SHA512 b5409fec5326c3e0410b383714c07250774802b207f4f2f13cbeac966206640767d05cab5c4cdf2ba93874017e819aef7ec9f26c21b8e56babf2518a1df5a637 WHIRLPOOL 463e3608b6d23dbcb6b0e2e375ba366f7dd94bd00c3291029b00feedc9cb1121af2c38f9fa52f4aa09b17748ddfbd8723655f204971ee43eafb88f3100c91850
+MISC ChangeLog 47347 SHA256 12f487fa9110fc561753255fca7fd4fd31cf00fabb86bccfd4a44ca1ebca7c24 SHA512 ed505b8d623d743f64840743ac3c41207c819c23097bfeba46ea51510b9dcd1d857c1e0e7bc7e739f3f669eb733322816367bd3478e3e6ff1da4dd224eaf220c WHIRLPOOL f048392ed4993d5e3028f5b85b51ddd607d969c9479f0b40aafb343c5c436f77d11f86847dba72b79fa343410c48c6dea7bfd06d65dc9e9576869100e59f9e9e
MISC metadata.xml 289 SHA256 3c01ca1c89b14ec531baa83995a170fb4eaf7072daea1f12a87c5fe3aaec81a5 SHA512 f80ef1bc9169c6027df0715e76c50786aedb1053a35c699c5cacffd2c3e4d0640e123d5ec67634cfcfb1bdc2de43dba6f6819b1a3bd5458d061da675a23ecb80 WHIRLPOOL dbbda9b74ae8b7ed91a3abab4398484706036c51c4fb8c0f1df3c4539c9c2a8c4075abdd172ef2c734d952d13202928870d32b0b6189bbd41fa2431b53de72c3
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (SunOS)
+Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlJlMnoACgkQX3X2B8XHTonXFACgk2FNoruOVgpH0WD1Cam8plyS
-3d8An2ndFBqDN/h6QFQB6k9zm7kIVvbj
-=QEdC
+iQGcBAEBCAAGBQJS9TpmAAoJEJQzkH1pP7W4xxIL/148Al2gVzmUJSTdfZ8AtqTL
+0mdcaoAkPsrDdnorRNZ5DqTTxtL4eXOKTDRNT2yG9CbRO130AUsRJ98KKlJu4j95
+LokfEk1gL7yWKQtB5RNyZcudrYGw7IhppqzkK6FPrT3LkZzs5ynvAKnPudCXU8dy
+avHrkb4wf5GoLwReq6ZAy2dITi9CQF9WJ1gY/fCTUhfuqr8w3X/lHQzb0AE3WTB+
+ZGIHwgQCCvTJgfAiazaOkhqABszsUZ+1gAOAQqX1nD63bR/rm10TcNcRG+Cyn6Vw
+Cor55zE0Y6JqwLo4a1pHH+99cvMVytHx+eEe/WYsjj9b4ueD00AhuH93FssuwRIF
+TZCoiij5dc/MmcItDMEFEXo7wrFfjwUZTEeAkHVoSegFvBm4M6oBoDrxDcqKZd98
+SRQhrhlRSrNZ4n9ncjC1SjZ8Oo1zqfI0dcSUqWxcJj+ENJMj3vWbKNCr8Nmm7+IE
+GMjXypQ3SD9QkTIHP/u8U3JqSNmGRIZ6KhWPDnU2sA==
+=5tab
-----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 caaa1746f63a..a69bb2568728 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
+# Copyright 1999-2014 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.30 2013/10/21 13:56:09 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.31 2014/02/07 19:50:54 ulm Exp $
EAPI=5
@@ -23,24 +23,13 @@ RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] )
x11-libs/libXmu[${MULTILIB_USEDEP}]
x11-libs/libXp[${MULTILIB_USEDEP}]
x11-libs/libXt[${MULTILIB_USEDEP}]
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+ png? ( >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] )
+ unicode? ( virtual/libiconv[${MULTILIB_USEDEP}] )
xft? (
media-libs/fontconfig[${MULTILIB_USEDEP}]
x11-libs/libXft[${MULTILIB_USEDEP}]
- )
- || ( (
- unicode? ( virtual/libiconv[${MULTILIB_USEDEP}] )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] )
- )
- (
- unicode? ( virtual/libiconv )
- jpeg? ( virtual/jpeg:0= )
- png? ( >=media-libs/libpng-1.4:0= )
- abi_x86_32? ( amd64? (
- jpeg? ( app-emulation/emul-linux-x86-baselibs )
- png? ( app-emulation/emul-linux-x86-baselibs )
- ) )
- ) )"
+ )"
DEPEND="${RDEPEND}
sys-devel/flex