diff options
author | Ulrich Müller <ulm@gentoo.org> | 2014-06-07 10:19:08 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2014-06-07 10:19:08 +0000 |
commit | 252ebf2078899c5e32762b360469483d5c1b74e5 (patch) | |
tree | 70b1e442caf942f199e41344c45ea9de36c031b2 /app-editors | |
parent | Remove old, bug 394589. (diff) | |
download | historical-252ebf2078899c5e32762b360469483d5c1b74e5.tar.gz historical-252ebf2078899c5e32762b360469483d5c1b74e5.tar.bz2 historical-252ebf2078899c5e32762b360469483d5c1b74e5.zip |
Remove Emacs 21 and 22, bug 394589.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/emacs/ChangeLog | 6 | ||||
-rw-r--r-- | app-editors/emacs/Manifest | 33 | ||||
-rw-r--r-- | app-editors/emacs/emacs-21.4-r25.ebuild | 195 | ||||
-rw-r--r-- | app-editors/emacs/emacs-22.3-r12.ebuild | 253 | ||||
-rw-r--r-- | app-editors/emacs/metadata.xml | 2 |
5 files changed, 18 insertions, 471 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index e678b9650ac0..833abc4b7101 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/emacs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.624 2014/06/04 17:16:36 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.625 2014/06/07 10:19:07 ulm Exp $ + + 07 Jun 2014; Ulrich Müller <ulm@gentoo.org> -emacs-21.4-r25.ebuild, + -emacs-22.3-r12.ebuild, metadata.xml: + Remove Emacs 21 and 22, bug 394589. 04 Jun 2014; Ulrich Müller <ulm@gentoo.org> emacs-23.4-r11.ebuild: Avoid gcc -Wformat-security warning, bug 512426. diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 7cb76569bb08..d5165c17a32d 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -4,10 +4,6 @@ Hash: SHA256 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6 WHIRLPOOL cafaa0fb0d06058cac8e445a7a1b5cba145d23186477a9c681efdab8ca0f18a9675dec3a93851fd7138890701f83fab83300c28a548c8fc22478a0cfff95d5da DIST emacs-18.59-patches-8.tar.bz2 19667 SHA256 637542bf5ee07d4abac11b76e742598a60787f3869dbf377eed99ae005fbc59d SHA512 a6564bc16724bfdb22f77b0e21b6064ca5e0e1bc91f3223c1037c26f8a048f28ac7a5da6817dc940a5f00f1f39bbfcda2277645409cd7e143a55fabdc3d3fe5d WHIRLPOOL 6b81f978aef2b429262e79ab1d995cca9237dc9c9d98144d2dc3de07bc2cdcec8547adbaf5ad41d9cce3239554918c04c7b9ff783b7931582a3a7398eb2b66f1 DIST emacs-18.59.tar.gz 2962652 SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33 WHIRLPOOL 5e98e71518f665e2a8278afe54e0ace6d7fdd9df23ff0a3354ffc1d5cc25cd21b0dd4d82766fcb436d4f24e9291c933295e956e1ffea43cfeedf915175763be6 -DIST emacs-21.4-patches-13.tar.bz2 13287 SHA256 892764ff98f0640ca65b57099a24c76a43ebf1deb9122fbb3b324d3e72043650 SHA512 d44181946c271cb54db7e0e14f3e15b217dceb2cc52594ed6a77adc1347180da58287a647fb5e0ddc3f2e9ec336018c0044d54587cc3c99f8149518bc47a7ecd WHIRLPOOL 55f22b61fdbe137d75bdc5eaf6e5e4cfca8adc913472b2cb4c6deb37d700cef68fd49dac2a7f7a65b8907cc9a08d1249568e3ab075888605346f595df49f15bc -DIST emacs-21.4a.tar.gz 20403483 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 SHA512 6932db498e7b6b904d90f817e335690c5c681510812332c514af1d84d91b9841ea3eff0357429c7bf866a55ab94d03193fc9cdbf403a9fe4b71d2673c23b863e WHIRLPOOL e711032d23b0e0b33bf95e006d6fc518ddfde4780d23d589fde47ccd94e60687cc9b65b85e04e7af4e8c9161fd8faebf13d28f4f43eb94e7bb7520d537f28751 -DIST emacs-22.3-patches-8.tar.bz2 5974 SHA256 72a68bd14ce2efd52b0425c56649d735f4b3c0e630de73e0eb51ddf947d56ff7 SHA512 b3489e57db9b7c4d9202238acd6f956b6adeaf09ec161b639ad59e0eea8e2152d5fad24e777a486310eaed68be1c7bf77e474a9aced0041820e74582f7e2e73d WHIRLPOOL 85d127fb9b367d73d8f2674e21096a23b474faf54fa21f178ea0e0dadbb285d1d7c627b7609b7c92ba27590340cf76afc4df4a5c991c252a7ce80b2f6569cf06 -DIST emacs-22.3.tar.gz 39587396 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16 SHA512 6cba24921ba9bd27458334b92c6f8fcacc4d5af0f70a067d57ab068eb8d0925143f109847515548584f80c9439d96a9d05158d10a73dda917187bd16a6758584 WHIRLPOOL 74c612213b8f6fc1fc6e243adc27b5a5ff5528100f3c319925519e23477fe2c642d2cf7b382d7b70c8b2b9d7be508773193c95bbf14cb7c55046f76bf4b81225 DIST emacs-23.4-patches-10.tar.xz 4920 SHA256 0b8e8cf31b013995d4e4cab12636aeaf6f49d2c879eb929fa7fd8774d86a5a00 SHA512 552568fe9264c6e1fe57ec0b48adade34d15b1c768534d0f3e036849c938b18720121dad5ce2c83a4f4c61911d9f386a96f49cab10b641feb265e7eff8d2553e WHIRLPOOL 17dac888cf9120f66f1940eac6e99d34fa447702cb64e391a433829c61b4bc24017125d44bad2108f1bace14c9ae7b40d6aa39245feb9ea2fe215c287da6b100 DIST emacs-23.4-patches-12.tar.xz 8140 SHA256 17188d0cfaba417cc047fb9a9ba3f4d19a66792a3c123539036bf48a39a6e066 SHA512 d069849be69a14ab8dab11412914e31ba8faeb10d23731c6e476809cf3edeba57a13bbfecb42437636357df1165fce9c83f8a16c421f238e88caee8f32431d3d WHIRLPOOL 23c2aba6e0f91b42cd4d6daf3d4bfec5902c680c2ec0c5a2d0b5841d689b447b65426396fb006347c8d1da487c2ce1ca03f6d17cffd9a6d74820f6f0fc2d1fa7 DIST emacs-23.4-patches-14.tar.xz 12088 SHA256 c46406a32b53d6c8b68c007f8d990ceb18343056814c5025e8a6ad53587050a9 SHA512 37467b57174b8e7a56864fa7d68c18d5ffe4690a93bd90af04184c88688eea5c0f6b3b3b2662a512099b7b0bcce36a20256f04789072b61f5c9dc353ac2c04cb WHIRLPOOL 06045478595ad805826ae487ed99d663e7cd45944f5c6c8b1aedc1451fab7e442294de828052c2308f6aab57398038f06ffafc75680d477c536d4f23e028e73e @@ -15,28 +11,25 @@ DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd0929692519884 DIST emacs-24.3-patches-5.tar.xz 3260 SHA256 ed9928b23a8b73b3ad265ba6866f609cdf61524602dea3b9f57d397d13a6fcb6 SHA512 c5989a9920c5b8cf1935f2d1bea228262c7953516cf93f75dbf6b305fc7c66f0d22c4038931972c441b8c0508acc04a83c7a160e20bf18b2c2e25c10d20f6a5a WHIRLPOOL facb1dd20830a87c8ed0480168127822cfb961cc6592d5c51c9057dfba944adfd4d3211ac7af07873b46fd78580704325f56ab4a5dfb6f78790005b718f19364 DIST emacs-24.3-patches-7.tar.xz 6484 SHA256 167a004b3b528dada8f68d28ce98cfbf1f23a1e00e52d7b23e14352178e5eab7 SHA512 6e3f6f053ad66e6d298b4fd904c57a6c2a03269ec53e9dfc56f834672a42c8f48eeb20a7ed1bcfb534eb62e0cca6e01b4a1663bebb046a0ce7325b732a378868 WHIRLPOOL bb68a6874e682afe58fe4cdf60695bc7b8d763afd15ba40ffda3156e80a6cad318e969fed6f22cb6e484ffdc29daa1b6b64873bf6cf73de28cfa711172046138 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-r10.ebuild 4381 SHA256 7aff3e288a550a347d7257a2f1f33290f0a148a7d5df46c3a71b91e9d58e3059 SHA512 32dd6fce795b6eb999f76d2a8896f4e8af2850314f969fe5a9885f1adf7e9b0b7bbd879789491f99869c2a84aebddea7889804b3593258094625c06ad35a53c5 WHIRLPOOL 1a737882a91136a6093d30a6a6ffc28ceface46d91436ee7ed202e92626f23c6ee38b9c4cc6bf0951c4ec55a362c0305ba682c7e08086a68d2e46960c93fd920 -EBUILD emacs-21.4-r25.ebuild 5477 SHA256 130d6f9974e47bef70995dfa3b7e1ade026a4015d106c3008c481bfd9cb2403f SHA512 fb271e84cd7f871e59031a988671c0ff6dcf9c14f6f21151f20bdaae73dee5b9f31cb558f723754450a2fe51b835e687b20d7e21fda24026fd2f9dbb10239ebd WHIRLPOOL 8a0f499f08358a1c9bb139b7d71d84a9e5f58ce1feabee65a6484beda810898d4954dad073dd62d2dbbd00af5bdc53c751f8e5de36f8b14ec0ca77fc5c3c997c -EBUILD emacs-22.3-r12.ebuild 7989 SHA256 d6e16dc9cc82060a0a93aee3de30c49f096046e25170f636a5606ea7b4ae7df7 SHA512 6d29ba55e27073f46317353852fd07fa8a3e665ad24cd79e25d14c8b0cb4564169d757eed90aff649082eda53f593ce91f16a5c344d59e5b972577566781a8aa WHIRLPOOL 30847e61121aa183158a1755170982d885e8016267dd57a6e6a42b1214a9e09687b664c33559fe61d2e508419c1c47b0a9fab3aa6b6c87936bf52f863d26dee1 EBUILD emacs-23.4-r10.ebuild 11191 SHA256 fd789d021fd5a6c5aafcd8d775e38e724c161aa7a00144c29404689196464c11 SHA512 f4b68c28e3248990b989e3e34c36e36aa91d2796022d6faf9ba14499363705adb711ad2faa2964c157fd7ac3551289112c25886e0a12aae08d1b3c8a9d9dcaf0 WHIRLPOOL 15d5face8631b802b07e65666f54718ceedcb07ce1796174bc692b01a418023a3e41587c6e0792374d1fb6ae317c186dd881de7c6397ee5ef6c0dd624c3f1339 EBUILD emacs-23.4-r11.ebuild 11190 SHA256 09011d607de8a7c8b8e4c8ef63df5a9ee5ce05fa4f847521010839e84abeda64 SHA512 8f58e96ede83ab88e2be5c715a466577a006d5ecfeb734ecfbaa22795ddf65d744372bda091a63cda59153e49431abf0003c37eb9f785139990b66d46efbbf8c WHIRLPOOL 902ef921dd2a86a11734dc4d92c1b604a439681fc225062f0017252a68c82580c715b6956eb9b9a59c61a6a50e483f20ada5af70d943035b308bcc6de8bcfbe2 EBUILD emacs-23.4-r6.ebuild 10801 SHA256 b709e1eedfb142a0b62e70e917f5f41e10c932c8d92790bcf5e80953f4027efb SHA512 4d84c5bd07704c0541670f268c8ff69f4dcd2a3eb74d6210323a7c63b61fe8a6c4bab6521f84cd0aba0aea4b535e2510decbe46e735bdc79896d40229049145f WHIRLPOOL 4e83c5497e9b0f121de23a82b787270a7bf187c2ab43acfaa351f7eb963a4d355a21ee62af265b82b5fbb226dd65101ebcef1bc0cd65fadad8a27aa8ab50d7a4 EBUILD emacs-24.3-r2.ebuild 10786 SHA256 24ee66757397c4c8ba91873575ca196edb67e4e31732144ad344e02e3777cad9 SHA512 47a49c1dac01279af2272aec81347ae9d9e40c7879e8ba25070f315c0d342daaddd4bea457fdd021b07c3bf2ab677185bf9c4ce92ae0d0cca4ce3e5f4eae73f6 WHIRLPOOL d5449aa8296057c805b2bb79ee067098ea6809154e31a027468beeee965246725c5378b9ea9c84343c5ea8d7fa8df056e6d5bff16f5a73026ba841a5ea7930aa EBUILD emacs-24.3-r6.ebuild 11083 SHA256 1efa36a38ea64f40dd1f2bae65a6ba5c99eec16041dd22457cb6c4182b86aa75 SHA512 d30df5550630d1784084bd6d11230bf81fdcefa8156d334bf28830e2a12f2b5b80ac50f2b7ed6bb20dda2623e7f4061b452bb5a41b5157013422e3ea81aa2166 WHIRLPOOL 95bce6616c7780e91f7b0216bbdb9c33d2317f7c80851e626a64616d6be5f5873ab04116455d1718aa920b3e5440844fdabcffc86f78b9384f822131049d88fa -MISC ChangeLog 87125 SHA256 fb37bdcf201e3f904ae029e28a552c02bfc1fe42b2c9f141340374db4583aa09 SHA512 0eed3a57ea7f2edb4776bc0732f312d1199f86fe94af5626421a67f6f42720e6e689eb9ac21fef9b24070ad83d49e4b2dcb4c86051d23f6c0e30a797d4fb38b1 WHIRLPOOL 7785e40d7fd40a851d6bf0d0a07455bd1402a4205b26db039eb7ddd1d30d2b4365c9a17bfd57d12b93126d702e3c3fd1855ca9b3a3181885c2f0018461a6a64f -MISC metadata.xml 2554 SHA256 94ab92fa323dcb5747564f95bfd1e2a3eca2511cd3e95b48e4ca95ea40ac8238 SHA512 24207b2227969f1d87126bbca5046f10f848f22584fa9c2a23a88ebb854e4344cc564902be1e6e1b86ae8b9da416f65ccf6172d4595633d6063f78893f9ae0c1 WHIRLPOOL db5cb9f87e4804152bf0a41807497733f4a4c382dd634b2ba7cc41fb6bda07191adca7e68b11dcac79d681b3b17dc9a4d629d0b8d152cd8c148883e754385155 +MISC ChangeLog 87275 SHA256 57ab6a7372c1d940c5409e78cdadfcf23cf663f29fb01f11c6f9ad9d8cae6cd6 SHA512 e1b50871e749a76ef16e0484b6c08c66d74aff994c7e79055851fa593287d562013fd488805cfe82fef7ee40cd5fe87a5dddc5f51b867ef59b2e5cce287e8309 WHIRLPOOL e1a1938635b0736c7e46cb7f99e81d69b0416d644f2ae2db21ba5e150476c0570b2d33b935fe4e85f4717bcdcf385567802687f5159cb64e07fe6ee4fc37780d +MISC metadata.xml 2431 SHA256 f5b0a24ab6e525de4d80cffb7a635260e47c88552e7c2b3fe694b76b130d36f1 SHA512 9345b4871208b2cdc7b1ef4d1981cad54aae6da91ba3fe2aa482df8a242b87d7d1c1288f132ed70ef2cab0372418275a50754c7249bb06adc7f5a17403a40fe7 WHIRLPOOL 73f2ce2c94b5e0b83cd1d06ce975b83004d54f51d573f3330450d60c2e7c5220c4bf92ca0af403a322ed9a67806b3cb11190f81f93e135bf1f8e0d8dee0cf220 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iQGcBAEBCAAGBQJTj1S7AAoJEJQzkH1pP7W4EZ4L/jWUmzfaHMSzaX7dJt1AAncf -sX0Xxh1ybh2iF99CyyVGL6mih+DNyjKd18TzhLr/s3oX8O1XQqMwg+MH8Q70lkvO -uJpBDsFrnIs0oS/kg0iGPgVVjlNw3hBqHgZ9SyfAziDche4X/bglkRJBLS7JQ76T -eOeWteYMv2m+o8wgphIEQU6sx0GCnaWXcLakFBHYbWlmYTJJ02iSuIKowIQYbGlP -hXVRspaeOvVYUSC5qNi88rhwpn9/ljPshBEnkfW0tomSIR8re+5FlhPkqkoNbJ+Z -eqPRkr9A6VtyNEdxT4LB2RbWrGaU18QQGvTgrUnGORX4IXsA+AtJdmbX9pJ5sYj3 -591EbQLkCND9nRQjzh7/f1KIWqyzuYq5bplS3h91U4M046hdIO0pjzkCHp659I9M -A296ng1rc6xNjPZ245/vTN/76jCQAbFm2fHi3pJN+BSywBDx4UJlW3RUI5HxCAiT -CDHdgfhHp55gCUZrmYrxU6UpGasUlnCQYecvx2uJ6w== -=aCsR +iQGcBAEBCAAGBQJTkudaAAoJEJQzkH1pP7W4CwML/1sKJ/Bd2NU/0nF8Kz8RpLkh +9lMXzXDr6OsW+3e3uFIIVaT2SPzmjhHyaZX9zfGZE3aK+UF9qZ0cRgmMcvFS4CA8 +icIfTaXUL+ttNSrsOT2+l/hoaQKNBA7PUmJqUUoXtFQisjkqG+v7V9dWgBqaYGu0 +D60SbjURSGKch3BoAiVeNsAyi0lr4LR9BLOQYtruhUPbbWPvWP0/raL4uKoFjBpn +oGFKGEWuHikIeuvv0yYvxRxaDaRtuGaP9dTTVaLX5M1LDi9HZnhvqXBezJNd/n9q +WPMIjVO/yql7vZWfFQZVr0F1uDgzNqZXJ1DWFe4HOX0k3zkdBcB6Yia2Mqyfk6aP +uy0PJux1JNmLpSgWxLFlDhaXhuMzhIkjFLjeWhgTRHJmxVf8isrC50BCsEeMppsW +4T6dOB4LtDx9iM+mF/DBHyDfPOaJkqj0HUR9FU3H6knIo2j8SpstdcEeT532NLRg +PbcCsKyPoLHL2xSI8fBC0p+sn3xfzcvEBSWUN52L3g== +=EP6V -----END PGP SIGNATURE----- diff --git a/app-editors/emacs/emacs-21.4-r25.ebuild b/app-editors/emacs/emacs-21.4-r25.ebuild deleted file mode 100644 index 1434b3eb64f6..000000000000 --- a/app-editors/emacs/emacs-21.4-r25.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r25.ebuild,v 1.1 2014/04/04 18:08:44 ulm Exp $ - -EAPI=5 -WANT_AUTOMAKE="none" - -inherit elisp-common flag-o-matic eutils multilib toolchain-funcs autotools - -DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" -HOMEPAGE="http://www.gnu.org/software/emacs/" -SRC_URI="mirror://gnu/emacs/${P}a.tar.gz - mirror://gentoo/${P}-patches-13.tar.bz2 - leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )" - -LICENSE="GPL-2+ FDL-1.1+ BSD HPND MIT" -SLOT="21" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="X Xaw3d leim motif sendmail" - -DEPEND="sys-libs/ncurses - >=app-admin/eselect-emacs-1.16 - X? ( - x11-libs/libXext - x11-libs/libICE - x11-libs/libSM - x11-libs/libXmu - x11-libs/libXpm - x11-misc/xbitmaps - >=media-libs/giflib-4.1.0.1b - virtual/jpeg:0= - >=media-libs/tiff-3.5.5-r3 - >=media-libs/libpng-1.4:0= - Xaw3d? ( x11-libs/libXaw3d ) - !Xaw3d? ( motif? ( >=x11-libs/motif-2.3:0 ) ) - )" - -RDEPEND="${DEPEND} - >=app-emacs/emacs-common-gentoo-1.3[X?] - sendmail? ( virtual/mta )" - -src_prepare() { - EPATCH_SUFFIX=patch epatch - - sed -i \ - -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \ - -e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \ - "${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings" - - # This will need to be updated for X-Compilation - sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \ - "${S}/src/s/gnu-linux.h" || die - - sed -i -e "/^\\.so/s/etags/&-emacs-${SLOT}/" etc/ctags.1 \ - || die "unable to sed ctags.1" - - # custom aclocal.m4 was only needed for autoconf 2.13 and earlier - rm aclocal.m4 - eaclocal - eautoconf -} - -src_configure() { - # -fstack-protector gets internal compiler error at xterm.c (bug 33265) - filter-flags -fstack-protector -fstack-protector-all - - # emacs doesn't handle LDFLAGS properly (bug #77430 and bug #65002) - unset LDFLAGS - - # ever since GCC 3.2 - replace-flags "-O[3-9]" -O2 - - # -march is known to cause signal 6 on some environment - filter-flags "-march=*" - - local myconf - if use X ; then - myconf="${myconf} - --with-x - --with-xpm - --with-jpeg - --with-tiff - --with-gif - --with-png" - - if use Xaw3d ; then - einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit" - myconf="${myconf} --with-x-toolkit=athena" - use motif \ - && ewarn "USE flag \"motif\" ignored (superseded by \"Xaw3d\")" - elif use motif ; then - einfo "Configuring to build with Motif toolkit" - myconf="${myconf} --with-x-toolkit=motif" - else - # do not build emacs with any toolkit, bug 35300 - einfo "Configuring to build with no toolkit" - myconf="${myconf} --with-x-toolkit=no" - fi - else - myconf="${myconf} --without-x" - fi - - econf ${myconf} - - # leave this in src_configure - emake \ - locallisppath="/etc/emacs:${SITELISP}:/usr/share/emacs/${PV}/leim" \ - epaths-force -} - -src_compile() { - export SANDBOX_ON=0 - emake CC="$(tc-getCC)" - - einfo "Recompiling patched lisp files..." - (cd lisp; emake recompile) - (cd src; emake versionclean) - emake CC="$(tc-getCC)" -} - -src_install() { - local i m - - einstall infodir="${D}/usr/share/info/emacs-${SLOT}" - - for i in "${D}"/usr/bin/* ; do - mv "${i}" "${i}-emacs-${SLOT}" || die "mv ${i} failed" - done - mv "${D}"/usr/bin/emacs{-emacs,}-${SLOT} || die "mv emacs failed" - rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT} - - # move man pages to the correct place - for m in "${D}"/usr/share/man/man1/* ; do - mv "${m}" "${m%.1}-emacs-${SLOT}.1" || die "mv ${m} failed" - done - mv "${D}"/usr/share/man/man1/emacs{-emacs,}-${SLOT}.1 \ - || die "moving emacs man page failed" - - # move info dir to avoid collisions with the dir file generated by portage - mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} \ - || die "moving info dir failed" - touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir - docompress -x /usr/share/info/emacs-${SLOT}/dir.orig - - # avoid collision between slots - rm "${D}"/usr/share/emacs/site-lisp/subdirs.el - - # remove unused <version>/site-lisp dir - rm -rf "${D}"/usr/share/emacs/${PV}/site-lisp - - # fix permissions - find "${D}" -perm 664 |xargs chmod -f 644 2>/dev/null - find "${D}" -type d |xargs chmod -f 755 2>/dev/null - - keepdir /usr/share/emacs/${PV}/leim - - dodoc BUGS ChangeLog README -} - -pkg_preinst() { - # move Info dir file to correct name - local infodir=/usr/share/info/emacs-${SLOT} f - if [ -f "${D}"${infodir}/dir.orig ]; then - mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed" - elif [[ -d "${D}"${infodir} ]]; then - # this should not happen in EAPI 4 - ewarn "Regenerating Info directory index in ${infodir} ..." - rm -f "${D}"${infodir}/dir{,.*} - for f in "${D}"${infodir}/*; do - if [[ ${f##*/} != *[0-9].info* && -e ${f} ]]; then - install-info --info-dir="${D}"${infodir} "${f}" \ - || die "install-info failed" - fi - done - fi -} - -pkg_postinst() { - eselect emacs update ifunset - - if ! use sendmail && ! has_version "virtual/mta"; then - elog "You disabled sendmail support for Emacs. If you later install" - elog "a MTA then you will need to recompile Emacs. See Bug #11104." - fi - - if use X; then - elog "You need to install some fonts for Emacs." - elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's" - elog "machine would satisfy basic Emacs requirements under X11." - fi -} - -pkg_postrm() { - eselect emacs update ifunset -} diff --git a/app-editors/emacs/emacs-22.3-r12.ebuild b/app-editors/emacs/emacs-22.3-r12.ebuild deleted file mode 100644 index 7022d64c49bd..000000000000 --- a/app-editors/emacs/emacs-22.3-r12.ebuild +++ /dev/null @@ -1,253 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r12.ebuild,v 1.1 2014/05/05 07:06:01 ulm Exp $ - -EAPI=5 -WANT_AUTOMAKE="none" - -inherit autotools elisp-common eutils flag-o-matic - -DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" -HOMEPAGE="http://www.gnu.org/software/emacs/" -SRC_URI="mirror://gnu/emacs/${P}.tar.gz - mirror://gentoo/${P}-patches-8.tar.bz2" - -LICENSE="GPL-3+ FDL-1.2+ BSD HPND MIT" -SLOT="22" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="alsa games gif gtk gzip-el hesiod jpeg kerberos motif png sound source tiff toolkit-scroll-bars X Xaw3d +xpm" - -RDEPEND="sys-libs/ncurses - >=app-admin/eselect-emacs-1.16 - >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?] - net-libs/liblockfile - hesiod? ( net-dns/hesiod ) - kerberos? ( virtual/krb5 ) - alsa? ( media-libs/alsa-lib ) - X? ( - x11-libs/libXmu - x11-libs/libXt - x11-misc/xbitmaps - gif? ( media-libs/giflib ) - jpeg? ( virtual/jpeg:0= ) - png? ( >=media-libs/libpng-1.4:0= ) - tiff? ( media-libs/tiff ) - xpm? ( x11-libs/libXpm ) - gtk? ( x11-libs/gtk+:2 ) - !gtk? ( - Xaw3d? ( x11-libs/libXaw3d ) - !Xaw3d? ( motif? ( >=x11-libs/motif-2.3:0 ) ) - ) - )" - -DEPEND="${RDEPEND} - alsa? ( virtual/pkgconfig ) - X? ( gtk? ( virtual/pkgconfig ) ) - gzip-el? ( app-arch/gzip )" - -# FULL_VERSION keeps the full version number, which is needed in order to -# determine some path information correctly for copy/move operations later on -FULL_VERSION="${PV}" -EMACS_SUFFIX="emacs-${SLOT}" -SITEFILE="20${PN}-${SLOT}-gentoo.el" - -src_prepare() { - EPATCH_SUFFIX=patch epatch - - sed -i \ - -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \ - -e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \ - "${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings" - - sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" etc/ctags.1 \ - || die "unable to sed ctags.1" - - if ! use alsa; then - # ALSA is detected even if not requested by its USE flag. - # Suppress it by supplying pkg-config with a wrong library name. - sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \ - || die "unable to sed configure.in" - fi - if ! use gzip-el; then - # Emacs' build system automatically detects the gzip binary and - # compresses el files. We don't want that so confuse it with a - # wrong binary name - sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \ - || die "unable to sed configure.in" - fi - - eautoreconf -} - -src_configure() { - strip-flags - filter-flags -fstack-protector -fstack-protector-all #285778 - replace-flags "-O[3-9]" -O2 - sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die - - local myconf - - if use alsa && ! use sound; then - einfo "Although sound USE flag is disabled you chose to have alsa," - einfo "so sound is switched on anyway." - myconf="${myconf} --with-sound" - else - myconf="${myconf} $(use_with sound)" - fi - - if use X; then - myconf="${myconf} --with-x" - myconf="${myconf} $(use_with toolkit-scroll-bars)" - myconf="${myconf} $(use_with gif) $(use_with jpeg)" - myconf="${myconf} $(use_with png) $(use_with tiff)" - myconf="${myconf} $(use_with xpm)" - - # GTK+ is the default toolkit if USE=gtk is chosen with other - # possibilities. Emacs upstream thinks this should be standard - # policy on all distributions - if use gtk; then - einfo "Configuring to build with GIMP Toolkit (GTK+)" - myconf="${myconf} --with-x-toolkit=gtk" - elif use Xaw3d; then - einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit" - myconf="${myconf} --with-x-toolkit=athena" - myconf="${myconf} --without-gtk" - elif use motif; then - einfo "Configuring to build with Motif toolkit" - myconf="${myconf} --with-x-toolkit=motif" - myconf="${myconf} --without-gtk" - else - einfo "Configuring to build with no toolkit" - myconf="${myconf} --with-x-toolkit=no" - myconf="${myconf} --without-gtk" - fi - - local f tk= - for f in gtk Xaw3d motif; do - use ${f} || continue - [ "${tk}" ] \ - && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" - tk="${tk}${tk:+ }${f}" - done - else - myconf="${myconf} --without-x" - fi - - econf \ - --program-suffix=-${EMACS_SUFFIX} \ - --infodir=/usr/share/info/${EMACS_SUFFIX} \ - --localstatedir=/var \ - --enable-locallisppath="/etc/emacs:${SITELISP}" \ - --without-carbon \ - --with-gameuser="${GAMES_USER_DED:-games}" \ - $(use_with hesiod) \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - ${myconf} -} - -src_compile() { - export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 - emake CC="$(tc-getCC)" -} - -src_install () { - emake DESTDIR="${D}" install - - rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \ - || die "removing duplicate emacs executable failed" - mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \ - || die "moving emacs executable failed" - - # move man pages to the correct place - local m - mv "${D}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \ - || die "moving emacs man page failed" - for m in ctags emacsclient etags; do - mv "${D}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \ - || die "moving ${m} man page failed" - done - - # move info dir to avoid collisions with the dir file generated by portage - mv "${D}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ - || die "moving info dir failed" - touch "${D}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir - docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig - - # avoid collision between slots, see bug #169033 e.g. - rm "${D}"/usr/share/emacs/site-lisp/subdirs.el - rm -rf "${D}"/var - - # remove unused <version>/site-lisp dir - rm -rf "${D}"/usr/share/emacs/${FULL_VERSION}/site-lisp - - local c=";;" - if use source; then - insinto /usr/share/emacs/${FULL_VERSION}/src - # This is not meant to install all the source -- just the - # C source you might find via find-function - doins src/*.[ch] - c="" - fi - - sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF - X - ;;; ${PN}-${SLOT} site-lisp configuration - X - (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) - X ${c}(setq find-function-C-source-directory - X ${c} "/usr/share/emacs/${FULL_VERSION}/src") - X (let ((path (getenv "INFOPATH")) - X (dir "/usr/share/info/${EMACS_SUFFIX}") - X (re "\\\\\`/usr/share/info\\\\>")) - X (and path - X ;; move Emacs Info dir before anything else in /usr/share/info - X (let* ((p (cons nil (split-string path ":" t))) (q p)) - X (while (and (cdr q) (not (string-match re (cadr q)))) - X (setq q (cdr q))) - X (setcdr q (cons dir (delete dir (cdr q)))) - X (setq Info-directory-list (prune-directory-list (cdr p))))))) - EOF - elisp-site-file-install "${T}/${SITEFILE}" || die - - dodoc AUTHORS BUGS CONTRIBUTE README -} - -pkg_preinst() { - # move Info dir file to correct name - local infodir=/usr/share/info/${EMACS_SUFFIX} f - if [ -f "${D}"${infodir}/dir.orig ]; then - mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed" - elif [[ -d "${D}"${infodir} ]]; then - # this should not happen in EAPI 4 - ewarn "Regenerating Info directory index in ${infodir} ..." - rm -f "${D}"${infodir}/dir{,.*} - for f in "${D}"${infodir}/*; do - if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then - install-info --info-dir="${D}"${infodir} "${f}" \ - || die "install-info failed" - fi - done - fi -} - -pkg_postinst() { - elisp-site-regen - eselect emacs update ifunset - - if use X; then - elog "You need to install some fonts for Emacs." - elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's" - elog "machine would satisfy basic Emacs requirements under X11." - elog - fi - - elog "You can set the version to be started by /usr/bin/emacs through" - elog "the Emacs eselect module, which also redirects man and info pages." - elog "Therefore, several Emacs versions can be installed at the same time." - elog "\"man emacs.eselect\" for details." -} - -pkg_postrm() { - elisp-site-regen - eselect emacs update ifunset -} diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml index 4981aad93704..b68a93941698 100644 --- a/app-editors/emacs/metadata.xml +++ b/app-editors/emacs/metadata.xml @@ -30,12 +30,10 @@ <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag> <flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image processing</flag> - <flag name='leim'>Add support for Emacs input methods</flag> <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead of the internal Lisp implementations</flag> <flag name='pax_kernel'>Enable building under a PaX enabled kernel (<pkg>sys-apps/paxctl</pkg>)</flag> - <flag name='sendmail'>Build Emacs with MTA support</flag> <flag name='source'>Install C source files and make them available for find-function</flag> <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in |