summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-08-21 21:08:12 +0000
committerUlrich Müller <ulm@gentoo.org>2013-08-21 21:08:12 +0000
commitc50dcf930895331743310d95816a91c3c925738f (patch)
tree1b76d7fd8bf595fb76918082cccaf085d9568e0f /app-editors
parentWarn people from enabling weird setup with USE="consolekit systemd" and havin... (diff)
downloadhistorical-c50dcf930895331743310d95816a91c3c925738f.tar.gz
historical-c50dcf930895331743310d95816a91c3c925738f.tar.bz2
historical-c50dcf930895331743310d95816a91c3c925738f.zip
Add ncurses[abi_x86_32] as alternative dependency on amd64.
Package-Manager: portage-2.2.0/cvs/Linux x86_64 Manifest-Sign-Key: 0x9433907D693FB5B8!
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs/ChangeLog5
-rw-r--r--app-editors/emacs/Manifest26
-rw-r--r--app-editors/emacs/emacs-18.59-r8.ebuild7
3 files changed, 22 insertions, 16 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 428b82ddc3ad..c3ca57f37bf8 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-editors/emacs
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.597 2013/08/14 06:25:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.598 2013/08/21 21:07:48 ulm Exp $
+
+ 21 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-18.59-r8.ebuild:
+ Add ncurses[abi_x86_32] as alternative dependency on amd64.
14 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-24.3-r2.ebuild:
Don't call configure with --program-transform-name, upstream bug #15091.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index e891444ed1c3..7429e4488590 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -16,26 +16,26 @@ DIST emacs-24.3-patches-1.tar.xz 1032 SHA256 6c783653ad86df30b36c7b5642d81e69403
DIST emacs-24.3-patches-3.tar.xz 2108 SHA256 225e49dea51f913abf0f98800451a2c61acf52a4abdd72ddb63634d2d2795b08 SHA512 2d1ff6cbc799658e520a56c87a9ea7d40bf233698130fd65e4142fb9a0d2a71492e1af76501ed08d1bd014db41331ecabe443400cb84b09a395ad7362a207d50 WHIRLPOOL 11946a808bd8bd830f9f31dcc1cadb7282fe901855f8a65425524878ab9299b42ff9938a822ec2cb531bc885ec10e36b0e59fb6d388ef3330a77332bbf03c7fc
DIST emacs-24.3.tar.xz 35565352 SHA256 70aa2942e9ae689ed17eddedfca5027c364ffbcc8b59968b1645e935f4c7058d SHA512 a1300fa10a9fba2db9735db3d01382bcda89ceec033976c4622796dfdf6d2748ed5fa73edf229182b368190c8acbf706810dd5f344542d2c0d294154bc2d0ca9 WHIRLPOOL 687ad4c7d69b41884bf28269bdea1808e03cdcec5a5218d0bac23c07cca3ced341ef98b4d5892149e2dbe899774a5e60edde9931d6c0fe41687995f530fb61d8
DIST leim-21.4.tar.gz 3291433 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b SHA512 c361996f7a3fcc550e7af30a7df3f692071ded2c9dce998e72f537b0e8011f319cfae1742d0be463608a86852046cba23037a29c3ecdcbaf5976807e1d1a1e2c WHIRLPOOL d7f25d5d491f323b80609567ce5cbcb5f20109cdd4671e9972c79279a3ca5338bbf67d35ae8f0bc627bc06917f545d71ab1f66a09c647f47ddaea26772bfc5c1
-EBUILD emacs-18.59-r8.ebuild 4670 SHA256 5e303bb4efdb6157153b2bc5397d786ad4f526b986e9bbd9beae907449c0574d SHA512 4ae8bf4cfd00e62b788a5370ccca09bd80d4a6908ca31a42627f91c3ffe612b65de927ca895e8d13d0e0dd29e6c12217096cf9098d883f866c1a49762103ef59 WHIRLPOOL 14a09d91aa0746f461945bf586f236e81a35833fb784cc0ad26e46762756a81b9bfca7da87b6b84d75c2687b0fbd3eb6c63b340a499c7c6c0e1b95fb7cbcd157
+EBUILD emacs-18.59-r8.ebuild 4714 SHA256 515f85f1b755e6465e75e1529a35eac70cb43615c2c90eae43a99cded14b65be SHA512 c1d089095bbe92370f2605b95d8a9f963a7c0417f18d198f1c8b186bf3becc8d88031705f6aa839e862b9bf3727a068b98bab6ca72a82dc77e9a05117f1ea810 WHIRLPOOL bfd8918d558fcd5d7645a793e7d706c50d6632d6b872d3b95f8e1957d3e8e88f891121b262b067f6453e8294a17f54d234b57c8cc1eb8ac5636b59efab4bbf19
EBUILD emacs-21.4-r24.ebuild 5286 SHA256 564082d9d96421342ec92f1d303ea07fb44ccf4c10aaf0d746a4fe8466ce7f74 SHA512 dd34062685d7c81e080d1ecc31de6c2da5ff6bf1e8f86794724c4edfad5dcd325e6f10e90f96a4700f48186bb4c887a962322a97ef15f57544aaab3250885b26 WHIRLPOOL d1baaf141b4833d23f12628b21b168f624a3f448b05103f123034744bd3de45d209369d6c3b91f038a31511e19990eeb0c1ac02ddb6da28123080726a579195a
EBUILD emacs-22.3-r10.ebuild 7738 SHA256 5a219fa5f170f33347f07f4fcd8f52e8290bb3cd0c0be2c4abdadefd311511f3 SHA512 35a1450f8cbaeee5a14b7a8fb5e428e473b86e3b31481fad0144168a07b5f3158c9b2c3e68e244f1c14b8b044b1d0736d66e249239482ca3aa4b8be4ad8cfdbd WHIRLPOOL ace481ef8a33d517cb153545fd310761658d592da4232ab8d58c79e4c42bb742436a44fbc99ad91f472b9586bd62c20549347cbca7418c133a7a5b92ee66ba0b
EBUILD emacs-23.4-r6.ebuild 10664 SHA256 23f281f4a84f70d0af8505fe55c06db51f2cb37dba030946afdff6a188660383 SHA512 1b38b8063103b5f1e2ad44a3731cc496a118eaa4d9151b5119ee84279fcd701ef45c8f2abc154ecb0f029633fdfa12103e43145fb5b043d735315b6c51eaa747 WHIRLPOOL 0e99ea5838535c69f2ac72957c557051ff86a49bab69afd51a62e46d141d72807982450c5bcf174cf4ae957abcaf8e2be3bb15ace17cb5f510af78d328ff4f5e
EBUILD emacs-24.2-r1.ebuild 11000 SHA256 c482a3c0e91ffc14241a7576fbe99342831f5aeb11ae8f714bb239b9cb416b7e SHA512 93ddb550c0fdc801206588f7009401305877c93e7c03ab72a53c8b44763dc5b078f272e10631949a189476a12677d6e2c0f6f69c793f93efff80607591bd74e4 WHIRLPOOL 3d058a2fc9d74e247f9b90028e8b0e7976a3de28ba51252e4da311761d5196094cf0295d020f4d02c9caa14a35f2535fdd36495694c73b10a4e9c0c766da070d
EBUILD emacs-24.3-r1.ebuild 10602 SHA256 f982e45c73886d257c8fb55329306d5ac2bbd7aeabfa7d0fad99be8830dc1ed6 SHA512 e929f5344ff227d4ba3d49efe5702a5e7cb8a0f67c98946609c2e08d05ed51e60c62ab1692b748ad7a39e11ccc60d1948870c2925dd59590c6e3c7b6a0668fba WHIRLPOOL c7f680fe421f7eeed51a3b592d7115ccc8c00881e575b8b4ffaeff4ad6958586dd712bee275172d19b276e6c51cdab2462989dad4290794b277a3214d983baea
EBUILD emacs-24.3-r2.ebuild 10650 SHA256 df393015777ce3bda50f05d1c5a7f78687b9a2e428a19f0fc826d38814f8f8cc SHA512 d61735653b1004a1433632c522b61dfece209d8e97e3632af5632e865287a850794127493e0395d7f1b57486f07e6efe90a7735a5d28fd7d60f70bfbd8543344 WHIRLPOOL edb594efeca7e1e996c05b892b636ae5c4c35a3edae17fc34a509284cd32817458d8a470cc4d37558df9b96c9741f95cd73818d549aa415abb8bdaaf3e68e31e
-MISC ChangeLog 82624 SHA256 2a3070bdb3e82b8ffdac7c6bf76bf88c0640adee958368c0d766970727b9898f SHA512 fc4ed722e77738844622748713538a662f59a8cbad72521e495af3cf036cdcd2e84677b9bd283324331735b44340b82016a56714672b31bb686bc870ab3292d0 WHIRLPOOL ea718fcaddd728b6a04ebb1217715c71fb2d472dc19fe3df242ef2516bbb0b66debc278412927179d78fa2793ca3e80c4acae88dfca7b8fab89af3f66744c82e
+MISC ChangeLog 82757 SHA256 85046d1cd7ff9e7c1cbe40e51bbece2d40c90b660d83f4e2cbbea68d722a2408 SHA512 7874abbe0a30eca42c03b391c62524635c73c3868db790a28fef3eb5a9d0a1075eb68b80d9b859ff28632f8c54521698282a60ad908340ba8036f0a5a2581559 WHIRLPOOL 06a34399738cb9457a11abc570c831442a0730cdb807114e40088dbb82c3ee113f752ca18fe51c5785d09e1f9ecf063f3a664e079f9bc66ad178bec563cacd6f
MISC metadata.xml 2554 SHA256 94ab92fa323dcb5747564f95bfd1e2a3eca2511cd3e95b48e4ca95ea40ac8238 SHA512 24207b2227969f1d87126bbca5046f10f848f22584fa9c2a23a88ebb854e4344cc564902be1e6e1b86ae8b9da416f65ccf6172d4595633d6063f78893f9ae0c1 WHIRLPOOL db5cb9f87e4804152bf0a41807497733f4a4c382dd634b2ba7cc41fb6bda07191adca7e68b11dcac79d681b3b17dc9a4d629d0b8d152cd8c148883e754385155
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
-iQGcBAEBCAAGBQJSCyNvAAoJEJQzkH1pP7W4k/0L/0867zOAYrX/0IqFyDmfImZL
-vWO6lA2DUV6lIyIe3AfDmmPMFDWow6tBkQe5SMussXoTk+rivybOUAj/oVGsAnpz
-1HlbWwE+lAyyHJ91bEpFGuiMC1VClbfqAA9s9phMtGsiuMcEeYVFWpYLnA8BPTmc
-lC2U6xYn98faT7zFmsDQAqArifVy/qJUb7W+cR+CSdL6JCO2iTDhfp/kZQadh8hj
-6JGwayAxFbiSf2YwR7G/O6pFC/HqRBlVQmbsDDrvwHSEMbk3jyAz7nL1AHNRwNi3
-272ZnJFCf1N3rfggDTjKlPWuW5WxQbtEKFagWc61pYN6Ds8ktyLKyxVa0x67ewXX
-QDJgcoZNO8DibAyeU1rT/+q0k+9vqv9H3dab0cOw5e8tBa9N7I6/W2Yd8aC7/GDK
-oh5URJvqaPfLiO6hFrAq+eF96wIw0i3vQnRSF+hE/BXd2wqZ0BLlT8C19JpJ+HHN
-qOm/bx9VNwsSvJup0/qLFN4y1GR+N15O0+zcFZpdyw==
-=PO9T
+iQGcBAEBCAAGBQJSFSyzAAoJEJQzkH1pP7W4kRoMAJr0NU0QYDm7SBpFRhmRLPRg
+rBw+FAeDyoR48/Hmd/HoM2ruG1X4UOvlh6HHMaorP+IXQ++XEBnKtr70gJKQR7p1
+KsrmDeyPr5Hac0xg8dpxOj5KhTFkUqiI4tf4bHPTnVTIoKK8ScDbYjgVhoSMEYUw
+gSfmFBUTYUAGFk0rGKkPgcMWtJVfxYcgs2R3btZFgfoCWsi4ZxqKjcP1w/H0iEAb
+PSgltQi9vJjyu5Qd6rFJ90MNX6s1ELUsagA4E6DxsEFlI9FwL3rJ1FvgiOPL7UHm
+hQcbs/1TtdMBRshY5YYWb6eTixErPIHNHO2gNzIHU5ftqAXW0yJC5vi281m7GjXR
+meCcuwImdD/o/dBIHpDfpRYPLh6HS0OSWYtu5eHc5mWcb/yt8lFaoESbxuhQoCUC
+SAIgwwYcpRXbPShKBCGQ2LuZJvuigvcjxjt+MeZtV5y2QgCO15aRfyoPopN+BVzM
+C368OF/mH+534Ras/y9gSx4aYLFv5uR9lnhZxrsilA==
+=GIED
-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-18.59-r8.ebuild b/app-editors/emacs/emacs-18.59-r8.ebuild
index e8996c9302d7..2afaff03acb2 100644
--- a/app-editors/emacs/emacs-18.59-r8.ebuild
+++ b/app-editors/emacs/emacs-18.59-r8.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/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.11 2013/08/06 10:54:22 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.12 2013/08/21 21:07:48 ulm Exp $
EAPI=4
@@ -20,7 +20,10 @@ IUSE=""
RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-1.2
amd64? ( !abi_x86_x32? (
- app-emulation/emul-linux-x86-baselibs[development]
+ || (
+ sys-libs/ncurses[abi_x86_32]
+ app-emulation/emul-linux-x86-baselibs[development]
+ )
) )"
# X? ( x11-libs/libX11[-xcb] )
DEPEND="${RDEPEND}