diff --git a/app-arch/unshield/Manifest b/app-arch/unshield/Manifest index 3feb38161219..c823862b1b4c 100644 --- a/app-arch/unshield/Manifest +++ b/app-arch/unshield/Manifest @@ -3,7 +3,7 @@ DIST unshield-0.6_p20120308.tar.xz 31924 SHA256 5f857a496ff54b9e1121b8ce2ceaba78 DIST unshield-1.4.tar.gz 37199 SHA256 8ae91961212193a7d3d7973c1c9464f3cd1967c179d6099feb1bb193912f8231 SHA512 b09c29fa8e5785f2ca90b40105304802d00d201dde42ef4f5e4b5504ca8edf10da426c7ed1daa8c0685980f085eb20437162812a2068a0c03c0dfd240edbf944 WHIRLPOOL 886c6272d8666192e67fd0978f3d038b9a023ffc8456689b0e6ce6d2c0913f21a1ad8e2baa3d57991605cf64d59a5991a4f8ef3f8856ecabbaccb664bbc3c91d EBUILD unshield-0.6_p20120308-r1.ebuild 892 SHA256 399d154ecbfd664c37906fd79c8cee3c4f651e7e01d63aee60f610121882bb60 SHA512 bcb5e6cd9eaa85e89b2cc5cbf6f9fcef19d9b20a1c66fac5599623c796573f81774bccbc82316ba6ffa50962ea15dbefb80fe97118a666ef58c2d2d6f071f822 WHIRLPOOL b35dd1529c3e07596ae870bd7a5e66aac1e9fcaf73df3dad1c1f8e6278da82688a0f305d9f53afa0f846553c4528913a84c7361dc62ed9e4b03800624c91dcfd EBUILD unshield-0.6_p20120308.ebuild 827 SHA256 34d83726365d9a073ac965d33a52f5730eb9b08a8f39143e09e966d23a1bcda0 SHA512 add430ef3bb4b0839084b7d653a9a39cefacb723cae9868512387bd8ea4b07b43c6b5532fb0e716c9ab65276b7dd04f757a4fdfe02b2fa3090add0ed97951f32 WHIRLPOOL 42b79291eb6916bfbe6ec6d69373b7a8b7a676f09151bf0fd40c98612ec9e2537f621ce0557ac6860040265992970ab1d1d5ad94e4b96163d3fb4ea021555456 -EBUILD unshield-1.4.ebuild 941 SHA256 17452f825adf62fd5a48807c63906012081a77157098909b5be70a0364c449e6 SHA512 951a0a5b85d525f7426c81bd9cb5d8ee2f931148ca7d23e3636dae87d9290fa97d3007e4b2ff1dbb1559a306a32a9007541b3a0a0d6ee16150da1a9d6c374f75 WHIRLPOOL 73b4f1f82a38f53f9953c77f02f1b1eae111eaa8848080fb6a7a7bfbde97f22ddc279e08c5344c4ca26948e78e7342b03784d709d50c842fa32e00d67e88b15f +EBUILD unshield-1.4.ebuild 940 SHA256 a6d7527ae226373c6aa3579efa71c021a4cb355ad7db49271751e1a2c7f0df0a SHA512 127547166d9f1877785d8630317b1c733981241ed8f465b01e43c675ccad905eb302f3f5f2fea4933aa7d64026cf90278d8842f6d5fa9cea21f37d8d58bd268e WHIRLPOOL bea8c267a454f7282c0255e71b339b1e10a19ff4e92a38dea0f6db4f7607fd5500da67f1c38b4985163603377b17a1d578e2008b5f5cee4e5ef971e574d0b727 MISC ChangeLog 3948 SHA256 5b875027d626005a7dce9fa1caaebd4cc6fb8c2f8c3d90d263d58e933be7c20f SHA512 26c65bee23ff2e0486fa94fc41775ee7354f29f467c8a15649b6a61380d03bc0e36df07e4e54fc846807502b78f4777f842e7580957b380191ba6a48ec885a31 WHIRLPOOL 33cc1fa82faa5aa4018d05f52f852c3167149cac214131d07f3e2e5b51c767c6fe9ab68f1831763920bc75798f5fbc418601f5f25dff35ac188563785cd8b31c MISC ChangeLog-2015 3948 SHA256 1e3c07bd6e6e8736e66dc5ef1c511f3bee0ac43dce6d8f08f8c5b00346637bcf SHA512 f92a5feef0319fc288a62b8c025b7b4217571be0bd42a294cab498b4638eaec9003be893a7481154d1f99789daad25efa399a0d7b2a5aabc2ba51fc5737d561d WHIRLPOOL 495fd38350565d7907926822ed39ffaffedf4b0a6d9460d64cdfd0958f58f73f10a569ca7b912c1fa094ef295f4785479024cd8abbddc213cb913e41c87ac1bf MISC metadata.xml 276 SHA256 6637cfc43cae18e62da96e54c99b6d82827a6c89ea3a942c6d6d0214969f14c1 SHA512 a6aaf4eff5f90e0f2345af6768039c62daac8436eaf353060accd516f42162c6ef3cbb73048dcb239220b7c2b716f329644a70489443ac8a2c32d24a0c126721 WHIRLPOOL ba62f0e00c701ed6d4f4c47d002a1f277c4a5ea294f6d7da175eac6e20c50c51163dcdbf6dec991aa640d0cb4db6881c71485c7c1ebac42d37380ab754ea91d8 diff --git a/app-arch/unshield/unshield-1.4.ebuild b/app-arch/unshield/unshield-1.4.ebuild index 04c2fbec0758..47e94f9ecc17 100644 --- a/app-arch/unshield/unshield-1.4.ebuild +++ b/app-arch/unshield/unshield-1.4.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/twogood/unshield" SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~x86" +KEYWORDS="amd64 ~hppa ~ppc ~x86" # OpenSSL (or LibreSSL) is detected at build time, and used to determine # whether or not a hand-rolled md5 implementation is used. The build diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest index b67f4252f5f9..e13268ef8cf6 100644 --- a/app-arch/xar/Manifest +++ b/app-arch/xar/Manifest @@ -2,9 +2,9 @@ AUX xar-1.5.2-automagic_acl_and_bzip2.patch 1619 SHA256 2ac709aa38122395c6742e82 AUX xar-1.5.2-respect_ldflags.patch 1058 SHA256 a1b57b7ac48c37d472c1856cddd09c2401e0daef7786144b665c247569702956 SHA512 30c474cc51d7cd3a6ffcbda565867ee81fb619d9648a8d2502a020b98ab36f756096ce88244db7d370b3627da9a5a88129fb5575cc1a6073bcdf26eb857a95bd WHIRLPOOL 9b56379ced822c3793c82f82647f8260105abb51e6a27b3877cc9d58fa8cb5f420f6903a6e61722bf001b7aa406bc0972121ae3d1d344068d12007dcb5c1e355 DIST xar-1.5.2.tar.gz 137973 SHA256 4c5d5682803cdfab16d72365cf51fc4075d597c5eeaa8c7d1990fea98cdae3e6 SHA512 975861324ee31805eb107f51f2f6c43029b25601d4c1daa2dfee49ec7e25351e94798de9fb5c011b90d93dd6a3bbd3fe15c97ab0fc32f0b36b3000dd48cbf46b WHIRLPOOL b820921ab7412495bda671774338ca6eacb6666b2ae50ebc76c0ff5e965d24042ffa98dbe306ce46de71a375beb2ae8cbaf6814c085ee3b3b3a4efae897ebd5e DIST xar-1.6.1.tar.gz 180771 SHA256 ee46089968457cf710b8cf1bdeb98b7ef232eb8a4cdeb34502e1f16ef4d2153e SHA512 6ddf83130519006c4d8fe699cdf5a6e5e41b293f3411d4744bf3425fda21556ef54b95e46f60c13f9276070ccda94c8d95a543f1fda4cbd9e3087ab9b5d0b00b WHIRLPOOL e7e77de1ff8aa089fe12c6eca0565f5f639e1d97653f5bfe968994a5236e12e8267d3ee082aa84e91561e395dd4b0b805bd5861c6ebff904b7f02f6d6b4be89e -EBUILD xar-1.5.2-r1.ebuild 796 SHA256 b0dbf663ac6ff6f3a63c093087c47c201b1f1146718f28809b51437e50d0c7e1 SHA512 406a4259ad641cce843d293a7785d36b2ccace48993defc6bc20b75e25a4bf7b33aeabf1d00461904d55a76047407ff95cba8057f7e2cff4929313a52248bc9b WHIRLPOOL 40e3f12c500130620511bff318f2fc8af3980d4ce4f0bbfc56cf6392b86f8d87487a20b558dee60d69da23b535bf84c89c462b99b58dbbc339e8df74faa204b9 -EBUILD xar-1.5.2-r2.ebuild 862 SHA256 ddf602f8f211772a5cc222ea6213f0aaff0814dd4761a135f1bbcd0ea70f5049 SHA512 8744ea2cf3d51910d6e37a00b0f1e53186f8c5fb6e386a2416dcdee49cef1a5f41ec9b0dad172639737212c985fbcad66362ca48bb5a7b5104d153d28847dd22 WHIRLPOOL 93e461b7b1d919dbd0e6fbb86c59f46c8f815b3137f66355b5e64856f6d925a61e1b44556caab92bd93a2407ba13bdb7c622187e7b1b951166ee4e202525e585 +EBUILD xar-1.5.2-r1.ebuild 805 SHA256 82514a25d34db891b10c618dbf428be633ba48c81f7aaedcfd4a6b867831893e SHA512 7327078448f0250b3cb7b0931114391c002263d19f7a3540d6a320cac45c6f38187002052943b801007de15530af15e82d890131263ac0dd7c2f11272125bada WHIRLPOOL c8057b1d9e527f308886048c76c7fe21dcfc743244fc8adc29457b4bef7ddedc296a6ad969fd63111d925713e66a35e64491d62e85d47ac0b876b308f4143ccf +EBUILD xar-1.5.2-r2.ebuild 871 SHA256 8d7ffa479949bf5680ff06c0a00f86fb36218d8d357dc3b2c285766bdfb9593d SHA512 b5e092ec262e26d670934e13b737e917e99849f8816fa03d700bdb435e559689d06ed866d167c2eedecc0d95180ef5f68816155ecdf70cf8eeca1daff6192c41 WHIRLPOOL 666da705744638dfdd02798b7758b733ef429e5be7ea3becb95c58f96b7b5e9b7d43adaa7c409c70dd4a56656571c9da3f47d18de2750eaffecf541bb8aaa3a9 EBUILD xar-1.6.1.ebuild 703 SHA256 71b26b6f972a6c9867e17fe2f74188428b0666c3114bde030f89c55f651ab97f SHA512 2cbe17748cf9f6beb2f2b2bf6e5b4197cc65c863921eafed9bc3745a5a9de4cbfd6ad451af26e7a5635745219bef043bd97d233cb3b604bbbd116c9d3d3e733f WHIRLPOOL 79e5bb48e45a23273cf9e7c978cb9feb369bd98cca5e89167d1f4b9c559504dd6780f4903b728a4f33b9c8a3339331512b16e569f7a6466f43ad00422d771db6 MISC ChangeLog 3456 SHA256 22249b63ff209173b62b44a26cd4512b5b07a788652d3ce90f2d48fabd3d6d83 SHA512 f78d69e0b954d1be22474c5bc542b8bc100d405902bbfe792e6500e31fae2c0647b66dac11cc313968983834d236109008edd3ded76832b2a79d480c7be3f581 WHIRLPOOL fc212f748041489a546bc65c63f8513d2deff3f010d56e71d9b0c7410642759a328f468e83ed15923ffc3287da24a6573bce4922b7e4d1653e3eb328179d7b1d MISC ChangeLog-2015 3648 SHA256 91fc1b94278a158e22125eec47c6f296a78302e6c1f133a5a86c3e4ee99e9c05 SHA512 9ef30cd123c8c858f8f77c1884727debf1f0c28569ffb521e67f07e629db3ba170119909432f65fa227c9e5fe5ecc597cd8cbeec439aab60f8a508530554bf58 WHIRLPOOL 03fcab0f2a8562c8a684a540b9a8dea3863132ae9546ed242d194586bf90f7b842537b4dc84c94261d90a841204c3433d437a676916da53c24d7cdc466dc3222 -MISC metadata.xml 910 SHA256 c25ea9a400e501e312754afa59d95d2f382acfd7b9b1090e351060d7801761cd SHA512 ad74290730bffc7ce1ed3972253e4ed9b7b78152517ca5e75962ed80065d8419cebe38a48f0a2e7e723df911b575343071c487c808c191983ad20d7ac2feafed WHIRLPOOL b949b30a70df15eb53afe3b2934e45b48b6cb21b0c36e0a4504736f215d0d341b4f777d70075e07f6ae35d6cf0e4a0ad0ebc7d41328629357762d6e8a5755edf +MISC metadata.xml 913 SHA256 e8a05d256865e70fdeb5992f70c1f541600ab9f8f9555306b8a178e82a0c7b82 SHA512 18d544f82de8d9f59d73b2e22c0b9a48cb0fd77a4b0f999bb0a1fa8d734f4b191c78fcfb4603faa7e00655856a29bdd2832b6401e822c7db3bab3cb44395ef56 WHIRLPOOL be47a018dd13c7fb29a5e88c44e1bbb3fd3a9cec0e37a729332a902aacd0a0735f0031365f044f69ab484d5043fba144c1840330f36223a839727b11260a888a diff --git a/app-arch/xar/metadata.xml b/app-arch/xar/metadata.xml index bd2c5a8efcf9..0596745d09b9 100644 --- a/app-arch/xar/metadata.xml +++ b/app-arch/xar/metadata.xml @@ -14,6 +14,6 @@ content's rich meta-data. - xar + mackyle/xar diff --git a/app-arch/xar/xar-1.5.2-r1.ebuild b/app-arch/xar/xar-1.5.2-r1.ebuild index 9a37942b8e9a..d7eb6d9ae0cc 100644 --- a/app-arch/xar/xar-1.5.2-r1.ebuild +++ b/app-arch/xar/xar-1.5.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -7,8 +7,8 @@ EAPI=4 inherit autotools base eutils DESCRIPTION="An easily extensible archive format" -HOMEPAGE="https://code.google.com/p/xar" -SRC_URI="https://xar.googlecode.com/files/${P}.tar.gz" +HOMEPAGE="https://github.com/mackyle/xar" +SRC_URI="https://github.com/mackyle/${PN}/archive/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" diff --git a/app-arch/xar/xar-1.5.2-r2.ebuild b/app-arch/xar/xar-1.5.2-r2.ebuild index 16e909a35f34..6dac7a28326f 100644 --- a/app-arch/xar/xar-1.5.2-r2.ebuild +++ b/app-arch/xar/xar-1.5.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -7,8 +7,8 @@ EAPI="5" inherit autotools eutils DESCRIPTION="An easily extensible archive format" -HOMEPAGE="https://code.google.com/p/xar" -SRC_URI="https://xar.googlecode.com/files/${P}.tar.gz" +HOMEPAGE="https://github.com/mackyle/xar" +SRC_URI="https://github.com/mackyle/${PN}/archive/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest index e828490ced80..392b44807de7 100644 --- a/app-backup/snapper/Manifest +++ b/app-backup/snapper/Manifest @@ -1,10 +1,10 @@ AUX cron-confd.patch 916 SHA256 720b6842f0d6e61269156ee3405bf7db35788cd5c14fe8d00132ee5f6680ef6e SHA512 7f0872b14f1fa6b3c7990a9b219a0b2c0b941b1376fb89eda6e4fdf4b3b37818d0114febdb21d2432f5b1c08f1ba4354936d556c1c26953a0fe0f3196d699aa7 WHIRLPOOL cf3af5c39fcfbc9aa69cc223000487b765fc09d46b50e6f4e3c08d5351869772c462392fa4b730e8aa8513aa0c5f4c72b9a14e671986a5591b462a401e5698b6 DIST snapper-0.2.8.tar.bz2 475053 SHA256 a44608648ed21a1346f8ae9345044901c39ad01abb501806a22c9d4a771eadc5 SHA512 ce1529062943c34b9de2eafb62c6e28b39bda6f4afc23ec5df5ddd42f213cbaf0d77d94d11d982285114ceecd27bd48206436119af84b2769ed4792aab01c75d WHIRLPOOL 3463cf8beb7adb1f3869645b20928dc21fc9cb72f8ed5275688e0b53c97b8103d0536e3246f12fcdc90c1889d221d13ce131b1920c7298232212c003ea9abb6d DIST snapper-0.3.3.tar.bz2 545800 SHA256 e64f42417fffed65524ce125eb31b5dbdd802a519ef04dd88c9251ef2784fe10 SHA512 f24f6d121f9a613549899b7bf3751f6d9c101db716d7bc3858a2add9f90e08861fc46927ce0130efc232240a91e24934820d0c2b1b65f206ac80d04cdaaec39d WHIRLPOOL 8a55ec12330d13bb1c4a630584418eb0e4f64580324ec8ff9fe444a1d52a4eafddac6c6c6cefc8aec760d84336f24c389e3f6d79ff07d9a40bb69cedbf35c8b7 -DIST snapper-0.4.0.tar.bz2 570614 SHA256 3818e123c29ffb1e3c62104c7623643cdc1fcab9494ba2c7e71825fbf68f6c77 SHA512 e4e75b31932309fd4cd3abc462826414f727ae5eec4fd79922d34a6fecd80e3e7bd5d8da4d3e5ac6ede021a21e68cb2ca127559567e8089b9d4636b6e6b61711 WHIRLPOOL 7799aba8e26a46d333d801f1733299ca68161a465702a7666bc68780de773f265bfcddc62126c1c703fde21af8052c878ddd4a87a662f5ad48c5230939a16bc5 +DIST snapper-0.4.1.tar.bz2 570673 SHA256 db9cce7f61ed1197d2663dfca444d313b05d7fb2d50af5ab468c7bdba6dd660f SHA512 23d12a4685039ce629333854bc3e8a90a524bf1207590102ccfbc358473e7bef9ca6a723d2bc8a2f0f7466c4b34dce724b806d24762ae54b26292e730a10a70c WHIRLPOOL 7f6100bc2989c931a4d95dbca3bbb6d3b6b09e3f98a9d4f1121182ef8541b1b20484c6e6591568fba1cf4bdc9045879b50dbc38438ea3336fc387ed937f1bab8 EBUILD snapper-0.2.8-r1.ebuild 1550 SHA256 5198d2497c4d7b1b29f8193c2bf239d33224ce320e5e008e1237675382142786 SHA512 0f4bd110a2a3a6644bd04f76f103ba8ccef35b41c6a8037f121e30a485d04abedbc65f44fbcfab0bd40a008a4d22f30d985d754f861e379af714d681c3a870db WHIRLPOOL 0ea68cf31fb364fc40f358cd80ddd73882b5aef421d2f05635fbcd16e356f725900415bfe9c931d20ca802c3eb1117e863f17d8ba4d5d8e22c45342df7939001 EBUILD snapper-0.3.3.ebuild 1543 SHA256 062743d222dc294685bfb063055cf4bd8899803c9f81d46dee1caa67b37a37a3 SHA512 510a5c1bcc6bcab986d7480ee328ba046a4e006b47e6d85e2f29accfb20a3f286b98860c361f5767008438216e77a81bdab3a7de006eaa2b688d1f7b942ed91a WHIRLPOOL db794957dba9c4bf26970664a7be568a598b017b859840db8fce0df57ff9ab4f3b9be8ed5b00af4554e6a863f7022680ce83e91502abcc8b6d361787a89620df -EBUILD snapper-0.4.0.ebuild 1543 SHA256 062743d222dc294685bfb063055cf4bd8899803c9f81d46dee1caa67b37a37a3 SHA512 510a5c1bcc6bcab986d7480ee328ba046a4e006b47e6d85e2f29accfb20a3f286b98860c361f5767008438216e77a81bdab3a7de006eaa2b688d1f7b942ed91a WHIRLPOOL db794957dba9c4bf26970664a7be568a598b017b859840db8fce0df57ff9ab4f3b9be8ed5b00af4554e6a863f7022680ce83e91502abcc8b6d361787a89620df +EBUILD snapper-0.4.1.ebuild 1543 SHA256 062743d222dc294685bfb063055cf4bd8899803c9f81d46dee1caa67b37a37a3 SHA512 510a5c1bcc6bcab986d7480ee328ba046a4e006b47e6d85e2f29accfb20a3f286b98860c361f5767008438216e77a81bdab3a7de006eaa2b688d1f7b942ed91a WHIRLPOOL db794957dba9c4bf26970664a7be568a598b017b859840db8fce0df57ff9ab4f3b9be8ed5b00af4554e6a863f7022680ce83e91502abcc8b6d361787a89620df EBUILD snapper-9999.ebuild 1620 SHA256 997b54dc514008cebc77b783c4ea6730c2033fe3f36da6428f6261ca8a9f8db8 SHA512 4780e371ce3295c5c262288af11beffcf0ee639f85d81b8c6d173d25d0c51dbcefc8b6ca6993a5da379bd901569e7fac86786651124779f3db633fd408fce12e WHIRLPOOL 84f3569631474c186fb9051c0f6e2b6fdeca83f80ef35a9e1829a06cded3b590075b695339dd462a6f64a16f149a1462264ec1ac425fbdf88840cff535458298 MISC ChangeLog 4516 SHA256 0f3d83ebb2da1333097344907b99fb96607f6c38cc802d5a5c2c6618b4156df5 SHA512 15b43539a14c36bd6e7781ff4cd763f3630e88783cf047a7428bdd37e6583ac21690035a6f7fdac849c021a74c03e8bbc6935d43687ccd08a7617e39e6dc5fe4 WHIRLPOOL 2fa23c33d72cf569bad43fe3a2371fc028a5546634b01fc54337a36856d2c945f33fadb6264ad820d5a230491a0197286d6d0c60e127b789ef82f81e7139a7c3 MISC ChangeLog-2015 1635 SHA256 7768d4ee3ab43a214af7db2bca22072b3afff8e96aa6134d91f0679e10c4360c SHA512 f34a8cf54d6c6810c63886fbfe2cdaa383dc757c5ef2cf57fd0991360d16bd3dff3bcde6d3bc69dcb64ceec8871ff6e9e9e914d936836cd4da6660361d347969 WHIRLPOOL 3e082d13e26ad8fd03910138747f608d586c52529f67d1eb056a1830f7d054008d6603db841b3ac390d3122a3fbd031395306671761643701fbed69e79aaaeb9 diff --git a/app-backup/snapper/snapper-0.4.0.ebuild b/app-backup/snapper/snapper-0.4.1.ebuild similarity index 100% rename from app-backup/snapper/snapper-0.4.0.ebuild rename to app-backup/snapper/snapper-0.4.1.ebuild diff --git a/app-benchmarks/httperf/Manifest b/app-benchmarks/httperf/Manifest index 5595eabf9423..290a8b68d523 100644 --- a/app-benchmarks/httperf/Manifest +++ b/app-benchmarks/httperf/Manifest @@ -1,6 +1,8 @@ DIST httperf-0.9.0.tar.gz 425297 SHA256 e1a0bf56bcb746c04674c47b6cfa531fad24e45e9c6de02aea0d1c5f85a2bf1c SHA512 58ea6a3b8a82181a89e5df22fdf18d5be8c7b533c404108702cc03fc727fb1599a43e620d83d41630f8a951d80e48ed99d0c3dd8469ee1fc7626449b777971e1 WHIRLPOOL 7b36e636a063c9af7ff142f7a81947f5b693bb1a3bdbe98c5dfd1f5ac11edb380e97f19c3ad2a0a8d8505c0d63d8d714fe935a6e326f2373cbbb11a940431a7e +DIST httperf-0.9.1_p20161228.tar.gz 106357 SHA256 45cf5e92d30cd4191015fff2d0d066b780b54c45e614690bf0e70926633715ed SHA512 e5dbb400e4ab0db3cc1621731d99af9261574a8a1da4279c722ebbd80537d0aae2a3d662f4d51eb9130bc98823c2786710c7819a0144f4ae3f8cf153e28d7dfa WHIRLPOOL 2d0e5ee38b965f8d378cf45038c03782bb64d73981432a24968d6e0b870bacd64e947ee6c0120b2d7927780c4096cf3725ff1866f5f77042498f278cc84683d6 EBUILD httperf-0.9.0-r2.ebuild 705 SHA256 6f61973aed2a24a30f78788f21c310b3d162739efb34595944ea93e950049ca3 SHA512 4554f1f7ade730073e9561ea4430b0cca31b5b2b6ec097cf4df1e34eba0a0520d1db5349c71b8431c892c9b90a100949347143d79b8b950db5ba76fb67a40a7d WHIRLPOOL 14b310e86abb0e1138562f5a1aae8831475016ebddc719b9bec3c6498d488789413bfd4e4653453729e0cba75cca9bf57a43b40d940b9a19718569d649157d47 EBUILD httperf-0.9.0-r3.ebuild 764 SHA256 4fdc6a9c3a23be7bdf0cdd801aee0b2da2a541527301fe4fec8ec5f763d49e4c SHA512 2d7f05f1f54e3b95173f76136c86e9bce06225b015e93f0152624b795ca5e8dd866995c0fcd65b974b323091d82065176018082edeb995ae444951d52dd53141 WHIRLPOOL 6bc740ac6b6f3dd79821c96142f1a53f8c4d060646678caf9d247eeae9521dd265d7903dd05e82007abb599e890f90b6e83939a293ddec630760eca1a48b767e +EBUILD httperf-0.9.1_p20161228.ebuild 880 SHA256 ad8b0ff9d7e02e30a3e17806f5b8b6a8cb556bf4f5ae3f256f101ec9f4b03f1d SHA512 6219698fb5f7050b4324dd3a4268f7f62a5c73ba256bd0277e4b5dacc4365a979c461c58fac2c895cfed94bf9b7830e765f598f326056e45734e6e26a742324d WHIRLPOOL cd69f83242e173094d2f61d6120b38b142732f09ab5bddb6bfae0f5935428d565276ead46b00fa471dfeb27b4403c4e79c2a83f225a123137c5fd2e9c45702bd MISC ChangeLog 3639 SHA256 32893a69e0c5dc7599f00adee0e76d345c0b636787f42e170bf04ed1f906210c SHA512 a7fcd233ab9becc8c3114d71563f5ca556f61e96f0eeb38c85a5435098e4e3d2b2af6bcdedaf966dd5919f30fac25747fa509612f79a1d9607c82f715139b56c WHIRLPOOL a30772d48e562eb611864d10c2ccfe987b74e0e3d748c9df2c48e7a6aef5a31ace5b7468595ce683956bb1dace5465e087c9e45ec154eb018ca418ac736ade03 MISC ChangeLog-2015 2908 SHA256 dddf13382ad95365c2ee148c65cd5bd1c94df953dfc11a645fa1de6942112884 SHA512 9be189f9b5bfd0abd44eec5cfebefaa24a87fd2f5ba43df773e4fbbbfd4abd0e23275df1de5194e03e719b71bbdfde0105244383ed98e05d6b1e743fccb2c1e1 WHIRLPOOL 90a57ed8e92fa616bceccec367a81723e89dcd34141082464525ec554aaf5349584d40a496a13c181621ab001f465a1980e2de9a3c491f2ac20ee436df939db2 -MISC metadata.xml 985 SHA256 f6080ec3ff861b91214badf80cee62dfcb54076ab8cb13504e723948ae8c8f97 SHA512 24337709b41c8266423ca926f96bb3a21ef2080fcdf615385ae95c5a909a5d067edc00b523b38befa20829613e7536e7c43d9569dc942074859e9ff357cd527c WHIRLPOOL dfbabc49ec962b3ea2181bd29a3b00ee23ad16f522e7eb0b4fdd952e34efc6ea8276f02b52b3259f40feef9a609e6f8ec72256f6c5ee15fb3a79c5cb6fda37c8 +MISC metadata.xml 1063 SHA256 21815c6d874317d44f931c1deacaad94ede9be8275f16a745f54e44921005dbe SHA512 435c8e7a50cf64f411478ca7bc0a464c81fd492e159a4ddedd4daff0c9df0a2802241d9741cd7e1fb02c7b6211e04f714430e7b5cccd7f484a65387c386720ac WHIRLPOOL 7e2441e7608ca56643b5b0e637535eba207121dc0a4b3cd095833e7eecdd6abcd1523edbcba12d76e090ea8c292bfbbf747b115740b3b15c30b321728988dd1b diff --git a/app-benchmarks/httperf/httperf-0.9.1_p20161228.ebuild b/app-benchmarks/httperf/httperf-0.9.1_p20161228.ebuild new file mode 100644 index 000000000000..55a180082410 --- /dev/null +++ b/app-benchmarks/httperf/httperf-0.9.1_p20161228.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools vcs-snapshot + +MY_COMMIT_HASH="cc888437e4572ec29a4a7209f34fbd39c31600f5" + +DESCRIPTION="A tool from HP for measuring web server performance" +HOMEPAGE="https://github.com/httperf/httperf" +SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_COMMIT_HASH}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+-with-openssl-exception" +SLOT="0" +KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x64-macos" +IUSE="debug libressl idleconn" + +RDEPEND="!libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + idleconn? ( dev-libs/libevent:0= )" +DEPEND="${RDEPEND}" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --bindir="${EPREFIX}"/usr/bin + $(use_enable debug) + $(use_enable idleconn) + ) + + econf "${myeconfargs[@]}" +} diff --git a/app-benchmarks/httperf/metadata.xml b/app-benchmarks/httperf/metadata.xml index eb752516f0b8..63bcf7913a59 100644 --- a/app-benchmarks/httperf/metadata.xml +++ b/app-benchmarks/httperf/metadata.xml @@ -12,6 +12,9 @@ sustain server overload, support for the HTTP/1.1 and SSL protocols, and its extensibility to new workload generators and performance measurements. + + Build with the idleconn program + httperf httperf/httperf diff --git a/app-benchmarks/sysbench/Manifest b/app-benchmarks/sysbench/Manifest index d378d14ab316..1eaa6b529a01 100644 --- a/app-benchmarks/sysbench/Manifest +++ b/app-benchmarks/sysbench/Manifest @@ -2,7 +2,7 @@ DIST sysbench-0.4.12.tar.gz 421932 SHA256 83fa7464193e012c91254e595a89894d8e35b4 DIST sysbench-401c5a43aa40a0b89689747b278fae2adbc302db.tar.gz 283994 SHA256 d2ca2676b3417563d11eb071a0dbdbe3ec0bb0f43a0275f6505bc9682fa51523 SHA512 3764e6bea09fa52cc84bbd740b4da0d09fcbb9908a904ad983b66b64d739c0c051013095824b52799f738e1b863290b1b0cb1604add0d0500a95128ae49f4e47 WHIRLPOOL d6bc6115797a0a26426045c6d477488e807e319393eb71c9b5f5bf1248da2aaba9946fff6e977573d3bfb0a012635a1a0f1fafa61df509aa0b8c97fe86ce4a52 DIST sysbench-48124f838b00ff83a044fbf046a9d8d0b1602d90.tar.gz 281484 SHA256 d3619b4399e6a77a679932571402cfae85c9fd17541050a77006184b3cad155a SHA512 2dd9bb78343df27894094829708dc133009d8ee65399beafbf38ea88d42be311180a18bf7b76cd41b22482606b7de13840cbdf5fc5841a0d2ed59dd65e34cebe WHIRLPOOL 67874d43c2a1d6cda45f64edfe0961018c9b8f5b13cc68b35dfbcebc1f5c75d2bc0ecfc1cffdcc62fc783fcc8a4cabd0e1bbccea5546bcd907d649b6f3b17c71 EBUILD sysbench-0.4.12-r1.ebuild 872 SHA256 e6d303a4eb7697884952c9032ad58bba8aa62140b0bfe3c7152227b84017552d SHA512 10c0f07bd952d3a1d423910bae49484fc272cce4e1010d63cdc639df9cbfa5dd145ad438f785e0e167c73959485bbd256517e5d2e975dbd97910bb054fe96cd2 WHIRLPOOL 3493f4c42459c7dbb7021fbc25ae1c7f3275b1e83db773180f2b2e2e8792a33998ae2516f03629a784a24f35489dbae68129bc2f39f7653b758db9b97a02dd01 -EBUILD sysbench-1.0_pre20161017.ebuild 1174 SHA256 b7040ef425c5f59e46219786b04a0d7c42d3b4c8b44bb7c2ecb7791abb93d8a8 SHA512 b82be237c0dedf1ff72c64d13d23d289f9334986d618da3deead9aba2066a4b112e5074d6e8f6426b564f5b40c38b78716adf72650fb23b5568d34cbb71ba2da WHIRLPOOL 09a3564fbfdc1f13a8a3294e019eddd543e060bbf964a30d82a7868c638898673e54f049f363f07a1c2069cce948448ceb13e9668b3ad900cdf1365fe2b6da3d +EBUILD sysbench-1.0_pre20161017.ebuild 1173 SHA256 5ae59653890021158d8d6d6359d490e2a2590540d229826c2acf82b884ff937b SHA512 792ba6c92ce4634d8293b3af9a1deb2d0ff0adfa0f6afb520b15b6819bf5347eb801200f921c91d618c75b8a993905c865b824b36e5bb42aa311a2a9be89f6c5 WHIRLPOOL a4c974b49767689829803be05db9aff54590adfdae1caa4194d7d4a3b6bbb524b59a38bbf6f33cd35614bee530a39f8b3a9696a547ec6a7429df4dc41c8cfc05 EBUILD sysbench-1.0_pre20161223.ebuild 1174 SHA256 e4b16c9bf186f8d3024fcb7377b68f6cfda69336852421cbcf2c33250b163a3c SHA512 c0e3adb08590478253910feaba8e6a200a430aee639da1d45e3aa7475b5963ce68bfe0bc4617f3d02a53a04c162197e5c68a3da7b236ac2202d1b4e602ae4932 WHIRLPOOL d7ecc3ec03c77e873e06a8ab0240b9d02d211f232349cc54d50dbd6c76b2b40dbb17d23d6541f024a147db56b45012ad83b8c55ee15daf07074bde12bacc69a0 EBUILD sysbench-9999.ebuild 1051 SHA256 51095ca9bba5f402d9c2b0000b201bdcf0a1b535a3eb6241a0a13386e099802d SHA512 868b8b21f47b2653604b0e560ac08408c0e06a3429ad4c6d1798489e5f65463d0d65553c4e959016064d5c85e93c91483c03eca63a3ddf7328bc2b987576bfaf WHIRLPOOL 13e6ca45103a171053d2dacf241602b70109680d65d8df409fe4571de637845bb8d02e42abdcbd52ac9954e170ea97b21b7c6d4e640ce1a04cb6849ae90bf56a MISC ChangeLog 3361 SHA256 26df65fd9802faf1013eace20d1ba4b461bd1bebd4f1eb8eb30d68e6d15ea9a4 SHA512 a1917f434e0ce17032ae6557527005c2b348d255298362600f47d232c01e164bf56a48320b1a044506390022504a0fdbdb5468f3fa0a71fb9e6592340c2e49d8 WHIRLPOOL 28ee551701e83293fbed58f3e9161fe8817e95cbba042e95b1370b007b98e11daa519c4c5d191646adcf4162aed507f95109d4e7ead034473f730ff87c8a02f1 diff --git a/app-benchmarks/sysbench/sysbench-1.0_pre20161017.ebuild b/app-benchmarks/sysbench/sysbench-1.0_pre20161017.ebuild index a4772a055ff6..fe409088b0e1 100644 --- a/app-benchmarks/sysbench/sysbench-1.0_pre20161017.ebuild +++ b/app-benchmarks/sysbench/sysbench-1.0_pre20161017.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/akopytov/sysbench/archive/${GITHUB_REV}.tar.gz -> ${ LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="aio lua mysql postgres test" RDEPEND="aio? ( dev-libs/libaio ) diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest index 409d63b95523..f61afa6abeed 100644 --- a/app-editors/nano/Manifest +++ b/app-editors/nano/Manifest @@ -1,9 +1,9 @@ DIST nano-2.5.3.tar.gz 1967760 SHA256 b2b060129b9feff2d4870d803a441178c96531de9aed144ec0b83bd63ccb12ee SHA512 1d859f0bd88b9d907cfcaa84edc212bcaea4335c203922eb5b7378c2b45d88dffe1f3e4cb499a824d33781485834ef564997c58cf1fd92610d08f6ce8dcb67d5 WHIRLPOOL a2ca1c41d3cb26756cc9aba5b5fa0aeaea220626b98d0abfa1c5c4d4d57c3a5ef688d5edf00a6a00849ee25a67b2bbab93c4d454f6eb5a204b10fa01de3e298f DIST nano-2.6.3.tar.gz 2019354 SHA256 4f4054e12f2181c8e436163e931a0a565612242ff9e566c4d1adeda0f91fd503 SHA512 5079c0da976e3cfef9f3980e37c2501837bc66bb98fadd6fe7f02b061b83c99454678833fd43c74e6796cdc4ee9028ccba7a8a05e0f86e7a6517ba4d4c6bc95e WHIRLPOOL 94520ca9c7a11342133adfd3a1e9e9c77a6c07ab18b1b51bf39918b331abc6bd7ebeb937c2ec8ed3e59b8d0468e40f4e5811e66a8aecd469ad42c595c1b61fe4 -DIST nano-2.7.2.tar.gz 2050098 SHA256 89cc45dd630c6fb7276a14e1b3436a9972cf6d66eed15b14c3583af99070353c SHA512 faff964fda141c925f04528bd1f759b7cc16aec4642549134ab199850bd21e5d0d42bc564ce13bd9660f24bb6d2e5790185c8652b416dcd042b6ac9085f2acff WHIRLPOOL 43a1c6920e1c8e344192118eb826b0f0f00627ea8a98c760d997caf42e164ec3fb72fbabbdd5a672827da83f4ce83aa40def9b3c57f857a1ea562eff9f716ffb +DIST nano-2.7.3.tar.gz 2048675 SHA256 3574d4594d051f3b572c47d63bfc3763fb1148c50b811ba7a016bacd94887a88 SHA512 cd159cf193f05b37f770ac79e532fe96be158688d241ab7090861016fe0da9dde2ab504d0703b8feea8043e1deded3f10f0ab4dd5cceba99fe4a1dfcf5062b0b WHIRLPOOL 19b042c29be4c8afca33870e85f0b893aa9f9d958be3043272dcef5ad8d775dc3b43fe1a418efee283c89a301be1503b04b825758666be1a8e25596f3a36b8be EBUILD nano-2.5.3.ebuild 2360 SHA256 7085ba0f70834ba0c13ed54839f99b96d9496053a3ebc20e488d9bdb8f6668f1 SHA512 cd691e9d9615c9c9ba3537faa191eacc82543b38d7d9a46feb52c964e6a348593c6800dab4d336d101cf43e4510f53d468db8a241e3d717ba2e9068c6a5f6acc WHIRLPOOL ba5bf1f74e5a63e27fab7380a6ed0f98f291541b168c2e2884e2eb977b8450487f549b1d859f974d0ae20b5a157b2f6975248ef77bf56f6da522c080d0ae9036 EBUILD nano-2.6.3.ebuild 2351 SHA256 73dbf1d560da8d78988957656b04e8030fd45c8bf97f7d71daecb6164057ed3f SHA512 f3d868d8b39a9057b23cb3a15b10f9ee8795ef94b9df2e8dbace19136256d6f9e6653690861bc8daa9ff23672e72d3d574812e4c51f2cf5e7e66f6a7e8ea140e WHIRLPOOL 43cec6eaefd2f116d7fac6273be2dff9873dddfc7fa11c10879b92c649c633ec3eb48ec79ca8bde8b2482186448a02f9fd34244444ceb85f7a0496c9ca19b4bf -EBUILD nano-2.7.2.ebuild 2365 SHA256 ee9a83107fff68ce167d3e71b572c6085cae8b992052c98e74496ea0e04aa34d SHA512 b89397bbba6a7431da668cf1304dc2145a068dfdc3dcf60716b6c8473a580df1a0f778b0d6577519fbe3118623092386b04fbac5e8df1106d932611adf228fd8 WHIRLPOOL 2b7c9ad6c54df620935ba9c07ef1dcad8aa2946f73b7f146adf14e940c169a0c75eede57734ef0794360f026e7d8ac54d2b49ccf2ebd14a4324d762497c0a1f7 +EBUILD nano-2.7.3.ebuild 2364 SHA256 cddaca7d95a036f2de96114dc353e1cb63f06769e56ce13b210e07bf5b8e59ba SHA512 4239a3c8acc36b8f4196f9b43ec996a6b61d1789cbd485be7a399b16369190b3ef31414a74c67a34d4d4744c926786c5699f75d3e77394aa3de934852ad39811 WHIRLPOOL 9f3f2ca6f9db75394f7ef2a38ce723520eab45af81b238b4ad59c5afc5729d1f396eb581bb2bbac4b126461b6267662188d6d94807af38f17cc8734ded8df614 EBUILD nano-9999.ebuild 2365 SHA256 ee9a83107fff68ce167d3e71b572c6085cae8b992052c98e74496ea0e04aa34d SHA512 b89397bbba6a7431da668cf1304dc2145a068dfdc3dcf60716b6c8473a580df1a0f778b0d6577519fbe3118623092386b04fbac5e8df1106d932611adf228fd8 WHIRLPOOL 2b7c9ad6c54df620935ba9c07ef1dcad8aa2946f73b7f146adf14e940c169a0c75eede57734ef0794360f026e7d8ac54d2b49ccf2ebd14a4324d762497c0a1f7 MISC ChangeLog 9118 SHA256 2b695fd512e80590a25bbe7e113f537900b8bf3387e00c939aeaa03115b25c37 SHA512 5f108ff3320be5ef76383bdd9c584a15f594b283d262acbe14ade9d2b7b58e7e269087afdbcfcd9967d837f4207d4f2cefd1f983eecdab372b2d247deb8a22c7 WHIRLPOOL 6cad609527ef2b76ab9b188cdcaadc98120e7bc93f2a63b3f957b37e0bddd59d9292258d8668e1ba33b12d08c1b179fda64fe611f20b32d7b69ba824efda2e07 MISC ChangeLog-2015 37891 SHA256 7fd955021db0b6548c869b8f117bc473462f8fcdab64cf6c4253d5afd20ff512 SHA512 22346fa0910dd7d55d5f2115c43b4695ace54de4631478708a14a2c2fc37aff79c313dbd273fee6b9fb238bad8f24493826e362383ab75d8077e7312feb48e80 WHIRLPOOL ebf9bcdc7746753a65a66346aa151b350ea7b58e087e9a6e1580256828748516b30919808a5a884d875ad65ee3aa73293bdd20ae3ca274f3c3dd4fb83e19ea6a diff --git a/app-editors/nano/nano-2.7.2.ebuild b/app-editors/nano/nano-2.7.3.ebuild similarity index 99% rename from app-editors/nano/nano-2.7.2.ebuild rename to app-editors/nano/nano-2.7.3.ebuild index c75dad952a4f..ea75851bd6a5 100644 --- a/app-editors/nano/nano-2.7.2.ebuild +++ b/app-editors/nano/nano-2.7.3.ebuild @@ -1,8 +1,7 @@ # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=6 +EAPI="5" inherit eutils flag-o-matic if [[ ${PV} == "9999" ]] ; then @@ -36,7 +35,7 @@ src_prepare() { if [[ ${PV} == "9999" ]] ; then eautoreconf fi - default + epatch_user } src_configure() { diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 5cf9e847907f..a1ec1f19b4c9 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -33,7 +33,7 @@ AUX qemu-2.7.0-CVE-2016-9106.patch 835 SHA256 594213b4200ae109dfbc6ec8e536d275d7 AUX qemu-binfmt.initd-r1 7966 SHA256 5b4b432aa1e44f387c9eb789de0ec6322741fd36dd241f76520f17c6cd6ac49b SHA512 2ba0bff6eb2b6bac4ed440f793771ce9551cad48e38bddb6cf04f804faac2407e80879f66771910344ddcea45f0014095dcc8bfeb0aad5085ef048fd3612dbd8 WHIRLPOOL a2a1fb830a970757d1e203378c7d382b161b1040f3b8aaf0f22bb3b5e46467eff395474ff40d93c9f133bab307b345a6f75d63eae9f8dd8daf67324db41032f9 DIST qemu-2.7.0.tar.bz2 26867760 SHA256 326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 SHA512 654acaa7b3724a288e5d7e2a26ab780d9c9ed9f647fba00a906cbaffbe9d58fd666f2d962514aa2c5b391b4c53811ac3170d2eb51727f090bd19dfe45ca9a9db WHIRLPOOL dcb3e5f7da89dd8e14d636d7ebd476e076e0043880bb9ea3fb1c03cb4bcd4e5c7d3c4719da26c3ce521e3a3db5ae671e86f198ac1bc3474e774d75504fef8b8d EBUILD qemu-2.7.0-r7.ebuild 22214 SHA256 a7f8b5889bfc48862dc7bf1868c3edaf71c1dc234dc8a42b95cb5b223b028151 SHA512 4314c6d3fc6c627e0cb2795f764f739eb353e9cbad709bf2be352d1c0022842cab18bed315169dc7fb6b95018087b173b930074345c5113bd7a012cda66f10cc WHIRLPOOL 14616e86ea4b102c30af58d3ecb5834586c051a1a58778e6cb5fc08f79d9b5fbde2579d6e49e7a464d4906b4e3019b518f405b21c4b413de0cff83ab5050be43 -EBUILD qemu-9999.ebuild 20472 SHA256 5802d28fbfc1d398a154b4ef3d62e74bfe5166401d2b56c0c62f481a8bec4ef3 SHA512 96a34de1ce3fe58a16add1549e2c6233f8ffcc63f2b38dcfca9d941d147e3f9ff10dc0bfc9e4c92fbe3a108b23f59171d6cd311e5d99229f020198d0493a4b38 WHIRLPOOL cc4bdd1a001ab106e6ffb39612c7cabdca9faf8e7aceb07942c0f0440cf71cdb8bf96c23d71773d6e5d3e11234c1811c22f22f613fff5781c072e955a0a32f29 +EBUILD qemu-9999.ebuild 20472 SHA256 d6599d08d30b41f99580f0e265c437142b1aca9d5c7087807486bad35cc7643d SHA512 c68b74a1a222f8451b7fb6159542c61f65f268b3bf87b98fbe9c297ef07cff1c1517b54226d5121c106660c3c9cfb5c35159eb41e09bfeb7de50ad41f5b5557d WHIRLPOOL 219cb575cd27e90b2b295a1079d2f35718176b26a686d4442ae55a8a481e6002316c7c45fb29fb2c3dd7ac775e4ac9c5ca5b41d7a13063e85ce797c6649b9282 MISC ChangeLog 34977 SHA256 48c9a111a9eac22d5aef983a5c98fd2ce37cbb2df943a32638287d3a7477c6da SHA512 4a97d97960ad4accde6b48764a380160484427db586ded5d1699327a89e412760d9e7ed81a185f6900afed171f0023dd4c34dfc2148d98ff222e0c24c2af1649 WHIRLPOOL 75bd0f8453a37ad223f11f28971f195a54e003e973b6e44aa48f4b9b2532bb3dd39f35655c239d7b3b7a6fc0c4ff719ae5abab652b92da6664cd8bee523ef047 MISC ChangeLog-2015 58193 SHA256 60c1a4f4c85515520ab14da920bbbf4a6813491ce16b5357a0456ea588815a5c SHA512 ddfe8e75aabe59b731a4a8b31839d8c71fd516620306d2bc99d7641cc501652974e053104caafa7550c5ad33b6834295f6743a98b9419d292b8bf6f67918ccd3 WHIRLPOOL a6841f79c3ba1cbf76a8c7fde296a2912c46ddd251494dca3bf3bc13391c80595b6f80125c383823899942248008ede7065b0f5c8e43f9bc1d0464aa62cc187f MISC metadata.xml 3925 SHA256 d1c219b7da0cbf77919cd1e055acbb3f6788a574fd802c98a43c89a411697b36 SHA512 3ff45d1c8ede12b4eedc7d01f39777b76a1cbd0ba9364299dec99d4b4a05cade5784d6f6e50197d5b5ae1f1b8e831c49da195eb53263c49b7d16aec8ee28b6e6 WHIRLPOOL bc25783fac0f3f13318834cc535404af9af20de16c7aeec222e59dc2ed7740ac5e767b329a5bcd6356d0cbae2428e278515f1446aa8ecb87a873bf4dbe04bf41 diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index a33eb05c08f2..48599905edd7 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -34,9 +34,9 @@ static-user systemtap tci test +threads usb usbredir +uuid vde +vhost-net \ virgl virtfs +vnc vte xattr xen xfs" COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips -mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32 +mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 x86_64" -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb tricore xtensa xtensaeb" +IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb tricore unicore32 xtensa xtensaeb" IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx" use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest index 90fa7bb5e80d..9bb7c64d479d 100644 --- a/app-emulation/xen-pvgrub/Manifest +++ b/app-emulation/xen-pvgrub/Manifest @@ -8,13 +8,10 @@ DIST lwip-1.3.0.tar.gz 398933 SHA256 772e4d550e07826665ed0528c071dd5404ef7dbe182 DIST newlib-1.16.0.tar.gz 12024353 SHA256 db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3 WHIRLPOOL 47f7afd525f482d79d9e964f0e75ee8a77e59551bd19cd94f9b95ac3af9406afa381c9d8d224f76eb568441ab613b2b194f8e5be50aa222f9ed2d9b9761829db DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 WHIRLPOOL ce801947fcf7ba0b56710029f25e746d3e03a80699af9d3570efcd417b12b546264f286b2e78b1402cca766c08e35bdd0ff0a692ab4ad419295f00bcfe91130e DIST polarssl-1.1.4-gpl.tgz 611340 SHA256 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad WHIRLPOOL 39448c00dda142a836a78381b446c7b586272a44d8afc867a7ea702228f105bb2adffe757bd6c23af090cff64ef32e7af0c373dccc5145ff4c11552cf3f28383 -DIST xen-4.6.4.tar.gz 19709274 SHA256 b795d5631a85fb68295361067195ecd00003656dacede4ec57533fce33ab5109 SHA512 e6278061a16829628030579e115a500970ff575eb6796189bfa1e2d7a8cbbf8aec2c2bd04c77cdc87226d6cc5eaee59d6c62cacb4e74b06e1f1379734b872938 WHIRLPOOL a982f7bbf2ba16781ac0f310ef27a32e9115596e91117609d22827bc1999facb12df4f33d1ba0b7015cbfae90a24302243d508e8c38ba45ea998341b76ba0567 DIST xen-4.7.1.tar.gz 20706864 SHA256 e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a771cda46bbcd4d0d671ffe SHA512 eb03244f5fa7b54402fcc1d38f1e69c0ea4536d5ab2f9859b41b5e94920ad9db20fb146e3c3d3635e9ca1d12e93ce0429e57f24bf53d4a2c4b69babc76ec724e WHIRLPOOL 5d7ba29ea58bdedb6a237f7cb1c0aacf361dc35ebb07ec8e55773e07b1f38c1b151615b526e14daeca7c2db235114bde0b6d124219e8818c6e529873b5151fec DIST xen-4.8.0.tar.gz 22499917 SHA256 1e15c713ab7ba3bfda8b4a285ed973529364fd1100e6dd5a61f29583dc667b04 SHA512 70b95553f9813573b12e52999a4df8701dec430f23c36a8dc70d25a46bb4bc9234e5b7feb74a04062af4c8d6b6bcfe947d90b2b172416206812e54bac9797454 WHIRLPOOL 1296c25a05e3ab81730a2587ea1c07c7c022f05cfefc580224185c8d5fc9853531031c1292f69eff944ae2752492c4b95f13e160be3c449a7626aeadf1a21102 DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276 -EBUILD xen-pvgrub-4.6.4.ebuild 4436 SHA256 3440843e78ea4001d72a125f671107dda8a7a0354fe86e9deb6be3f5c9189caa SHA512 6736f601abb3ceca01c2aca78560e7a2e3fbc896f34df542618dde657116cebfa5e0adf30d468dca9cf3a01d1bcc08b422f13bfbd19ebf3e094666adc9856fd6 WHIRLPOOL 84c85a6714ba9fb8f215a5f03ec3847430e303c8d3c0b189a23c5258b21aa9edf80f8bb15cf64edbe6e75c24c8b1198941de270019e38e242e93dd0a7dec7a4b EBUILD xen-pvgrub-4.7.1-r1.ebuild 4914 SHA256 f43849fd1405fe3dcfba421a85d39d5f291182f040e7da07b31508f5bfd620b7 SHA512 b35d1cff29690865f82378a9c588d80115cff30617d615aa01dd95e1d3d3991b104cdf424d65107114d0f2fecdfc3ab9afbaad850e91f9da47ed4d99a936e0c1 WHIRLPOOL 0884667093c78ca06fef70d78054d5b67870dfc9c3d6c87c0384b930106ea288a47ef7d403aa52a1d40bbfc399788b7a82fb6245d3856e1dcb6744b7fd8f3304 -EBUILD xen-pvgrub-4.7.1.ebuild 4848 SHA256 3ea22286797023c6433e043df15461224a8997f1b86de3e9827bc6eba36ce268 SHA512 644722c065e427f7c477faedaca90b0c6fbf2da34009ad78bf0e09736cc72af6aeaf4b24cd8a838589b7713bc3c31d86180c8216117267cbdae6ab5b79995c24 WHIRLPOOL 9660e831e7e523acef6bbc7233ddac6a05f0dadb59799e63ff6449c7d2fd793600270f190a96d847ef0b080fb534428a02a3abed0f032a68c8f28edf2c644fc5 EBUILD xen-pvgrub-4.8.0.ebuild 4848 SHA256 e455210674040fb70e0ad704eafba4cda7d64d014c551f1166ac4105cb96d5f4 SHA512 8fd0dfb33beee21ee18a48076fdce454c9e20e2b7ff575e38df3036dd033fc6f97f9a49cf261d134d7bf0578994d67e10b3239ed36ac05ef3183894b2be576e3 WHIRLPOOL 660cff9429162da2f747f1d8ccf7e8a2749c288ffe5fa7df2dca4373281758de1cdf0f1b119ab9e7480a2387f81bd81c4eba261262940a5caad2e0dbb3081469 MISC ChangeLog 7852 SHA256 ad4918f5c2385e0cdce11a5a4dd3025138389a2cdb2242b111d4d2318bd62975 SHA512 182aac066289033e565c50fe3ed620a6d123ffb9570e55fcfe1834f59f172a758a9238e160b7a9525512f94887617ff89165df1519d752fe26df84ef0016405b WHIRLPOOL c77c268d908fd4dd26888841e295eabc2040598a7651e36e712ae9a94149ebdd28b778895a76eb804276f791da832360c02559fd70c2973a8f88fce62d2cfa6c MISC ChangeLog-2015 15121 SHA256 729879428f3b9ee1f4d94eea1e3e3eaab4875658088799cfefe49eae3755fdcf SHA512 55627fe8e88dd3af475d65c33f28766ce475919add045bbf82a950729b4eec4df2ca02534cd39eba07dafb77b02c82d773d6540c05fa144ce96bc624c7bb915b WHIRLPOOL e66c52cf6783b0d77865b20074a3e2d4b8da4f3c37340e3f8ef96fbd9fbaf04ef2f8adcc0e21fa164bb2da1bab7ae5d664544080fa968f3d83e1d1461c3f27dc diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.6.4.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.6.4.ebuild deleted file mode 100644 index ca7ab7448a66..000000000000 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.6.4.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='xml,threads' - -inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs - -XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles" -LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci -GRUB_URL=mirror://gnu-alpha/grub -SRC_URI=" - http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz - $GRUB_URL/grub-0.97.tar.gz - $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz - $LIBPCI_URL/pciutils-2.2.9.tar.bz2 - $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz - $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz - $XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz" - -S="${WORKDIR}/xen-${PV}" - -DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem" -HOMEPAGE="http://xen.org/" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="custom-cflags" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="sys-devel/gettext - sys-devel/bin86 - sys-apps/texinfo - x11-libs/pixman" - -RDEPEND=">=app-emulation/xen-tools-${PV}" - -pkg_setup() { - python-single-r1_pkg_setup -} - -retar-externals() { - # Purely to unclutter src_prepare - local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz" - - # epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative - sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \ - -i "${WORKDIR}"/zlib-1.2.3/configure - sed -e 's:^AR=ar rc:AR=ar:' \ - -e s':$(AR) $@:$(AR) rc $@:' \ - -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} - einfo "zlib Makefile edited" - - cd "${WORKDIR}" - tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz - tar czp grub-0.97 -f grub-0.97.tar.gz - tar czp lwip -f lwip-1.3.0.tar.gz - tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz - tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz - mv $set "${S}"/stubdom/ - einfo "tarballs moved to source" -} - -src_prepare() { - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - # try and remove all the default custom-cflags - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} \; - fi - - # Patch the unmergeable newlib, fix most of the leftover gcc QA issues - cp "${FILESDIR}"/newlib-implicits.patch stubdom || die - - # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading - epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch - - # fix jobserver in Makefile - epatch "${FILESDIR}"/${PN}-4.2-jserver.patch - - #Substitute for internal downloading. pciutils copied only due to the only .bz2 - cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom" - retar-externals || die "re-tar procedure failed" - - epatch_user -} - -src_configure() { - local myconf="--prefix=${PREFIX}/usr \ - --libdir=${PREFIX}/usr/$(get_libdir) \ - --libexecdir=${PREFIX}/usr/libexec \ - --disable-werror \ - --disable-xen" - - econf ${myconf} -} - -src_compile() { - use custom-cflags || unset CFLAGS - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include - - if use x86; then - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ - XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub - elif use amd64; then - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ - XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub - if has_multilib_profile; then - multilib_toolchain_setup x86 - emake CC="$(tc-getCC)" AR="$(tc-getAR)" \ - XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub - fi - fi -} - -src_install() { - if use x86; then - emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub - fi - if use amd64; then - emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub - if has_multilib_profile; then - emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub - fi - fi -} - -pkg_postinst() { - elog "Official Xen Guide and the offical wiki page:" - elog "https://wiki.gentoo.org/wiki/Xen" - elog "http://wiki.xen.org/wiki/Main_Page" -} diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.7.1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.7.1.ebuild deleted file mode 100644 index 67b78b12f77f..000000000000 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.7.1.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='xml,threads' - -inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs - -XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles" -LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci -GRUB_URL=mirror://gnu-alpha/grub - -UPSTREAM_VER= -[[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" - -SRC_URI=" - http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz - $GRUB_URL/grub-0.97.tar.gz - $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz - $LIBPCI_URL/pciutils-2.2.9.tar.bz2 - $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz - $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz - $XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz - ${UPSTREAM_PATCHSET_URI}" - -S="${WORKDIR}/xen-${PV}" - -DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem" -HOMEPAGE="http://xen.org/" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="custom-cflags" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="sys-devel/gettext - sys-devel/bin86 - sys-apps/texinfo - x11-libs/pixman" - -RDEPEND=">=app-emulation/xen-tools-${PV}" - -pkg_setup() { - python-single-r1_pkg_setup -} - -retar-externals() { - # Purely to unclutter src_prepare - local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz" - - # epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative - sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \ - -i "${WORKDIR}"/zlib-1.2.3/configure - sed -e 's:^AR=ar rc:AR=ar:' \ - -e s':$(AR) $@:$(AR) rc $@:' \ - -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} - einfo "zlib Makefile edited" - - cd "${WORKDIR}" - tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz - tar czp grub-0.97 -f grub-0.97.tar.gz - tar czp lwip -f lwip-1.3.0.tar.gz - tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz - tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz - mv $set "${S}"/stubdom/ - einfo "tarballs moved to source" -} - -src_prepare() { - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - einfo "Try to apply Xen Upstream patch set" - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - # try and remove all the default custom-cflags - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} \; - fi - - # Patch the unmergeable newlib, fix most of the leftover gcc QA issues - cp "${FILESDIR}"/newlib-implicits.patch stubdom || die - - # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading - epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch - - # fix jobserver in Makefile - epatch "${FILESDIR}"/${PN}-4.2-jserver.patch - - #Substitute for internal downloading. pciutils copied only due to the only .bz2 - cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom" - retar-externals || die "re-tar procedure failed" - - epatch_user -} - -src_configure() { - local myconf="--prefix=${PREFIX}/usr \ - --libdir=${PREFIX}/usr/$(get_libdir) \ - --libexecdir=${PREFIX}/usr/libexec \ - --disable-werror \ - --disable-xen" - - econf ${myconf} -} - -src_compile() { - use custom-cflags || unset CFLAGS - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include - - if use x86; then - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ - XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub - elif use amd64; then - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ - XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub - if has_multilib_profile; then - multilib_toolchain_setup x86 - emake CC="$(tc-getCC)" AR="$(tc-getAR)" \ - XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub - fi - fi -} - -src_install() { - if use x86; then - emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub - fi - if use amd64; then - emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub - if has_multilib_profile; then - emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub - fi - fi -} - -pkg_postinst() { - elog "Official Xen Guide and the offical wiki page:" - elog "https://wiki.gentoo.org/wiki/Xen" - elog "http://wiki.xen.org/wiki/Main_Page" -} diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index be1411a98f0f..d3c5b94a0ea3 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -15,21 +15,16 @@ AUX xenstored.initd 1058 SHA256 6c6f62143b1c3b14c3c3cfc57fb3c86ba904cd83cdad467f DIST ovmf-20151110.tar.bz2 27518370 SHA256 74199f6b5c6f756881323242742c396c52096db5f61700a4eb839343f9ab0604 SHA512 dda185af2fc0b9a8d5fc7e1e96db6aa31807782fe77d38491896164d125c30d2277db3d71a7dce7bbd569723b344b97dfebbc78ddddca0a095721f6b1ae3a1d3 WHIRLPOOL 145fb1c873cce96b81b269b44800987ca1b7350425b682fd5a5799648b0270c6c17bb337ad7e06650e6b66a9ac6eef8d9c9239f1478a687be4af187e60c3f3f5 DIST seabios-1.10.0.tar.gz 588213 SHA256 8976fc4c1ebcda66ac96689762247dfc99115a5f7acb3a7d4e18d18ff5de12a9 SHA512 f1b83ce37b59070b488e19f98c95ca9f413cf4969663331b631c3ccb884c90b2db793d32a779ef05cead538c2fd123be4b73391ad2fa20c900a1f14237178d8c WHIRLPOOL 77718eac01a59f94c3fa81195925ae09c19e11f80f107b3387e910408d88d3ffc93eaca3b73d6a52b67514538c0e020b0f4078db8277a5ee6361fd0d3ada8598 DIST seabios-1.8.2.tar.gz 538497 SHA256 f59479307fdae840de398b75aacb2333c8eba24a5964d68c77e32ca6c987ee61 SHA512 798d222d5f5725a805cde9e6000b5ce714d0551fd4a3c2642cc6e77b2bdab1a9e239939a358a23bbe0e00112f5ad70696c87d20b90655463c835541fc04e1a00 WHIRLPOOL 9cda0ad502a59dd718c543b759ac3fcf5acb4adee70c3da9bfea95ab188415acf6425827de77f45421ec3be8fd9e0c37fb486e62828217ba3e83f88d942a3f4a -DIST xen-4.6.4-upstream-patches-0.tar.xz 15280 SHA256 0f2d55e44e2c98fb7caf76997c05f44fe1efdbf7eaa971a4bf234ea3bc95e244 SHA512 26be1b03af1ac0d6a413b0ab8a30d59c733d6d5c4e29ce3b5b90818a1589cbb5c46a50b9ee42b273ef3b37df8ff403241d68e1e2221ce969054fb7e5f13516ab WHIRLPOOL 52420897c49cd1bcfd8896df45a1f9c8df6337cb68dd7a6ff962361e7ab2eab1e6d6699ae8236b105e6b700b5d5b6c8da302ff477ac6493a60a665e4225cff02 -DIST xen-4.6.4.tar.gz 19709274 SHA256 b795d5631a85fb68295361067195ecd00003656dacede4ec57533fce33ab5109 SHA512 e6278061a16829628030579e115a500970ff575eb6796189bfa1e2d7a8cbbf8aec2c2bd04c77cdc87226d6cc5eaee59d6c62cacb4e74b06e1f1379734b872938 WHIRLPOOL a982f7bbf2ba16781ac0f310ef27a32e9115596e91117609d22827bc1999facb12df4f33d1ba0b7015cbfae90a24302243d508e8c38ba45ea998341b76ba0567 DIST xen-4.7.1-upstream-patches-0.tar.xz 16420 SHA256 cb4724fedadc408ec390f99e9928a44ec75e793fb55cb97793f09980855b6a32 SHA512 79e117c48c6cc3d5783c818218ac11ec494735ce89755b5e263a64c23fb1f0a425bc65b567a24ce2e348b6e3839b26133c7e2c36411e5cc7acb54b855149dfbe WHIRLPOOL 982165da62cbb28cd72d32662c366ca7dac91a511b356eb58bced4b4af5cbc0d94c7e280a2400e5d9c92938d2afee86abd7c688926c2b9cb191d4554be828844 DIST xen-4.7.1.tar.gz 20706864 SHA256 e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a771cda46bbcd4d0d671ffe SHA512 eb03244f5fa7b54402fcc1d38f1e69c0ea4536d5ab2f9859b41b5e94920ad9db20fb146e3c3d3635e9ca1d12e93ce0429e57f24bf53d4a2c4b69babc76ec724e WHIRLPOOL 5d7ba29ea58bdedb6a237f7cb1c0aacf361dc35ebb07ec8e55773e07b1f38c1b151615b526e14daeca7c2db235114bde0b6d124219e8818c6e529873b5151fec DIST xen-4.8.0.tar.gz 22499917 SHA256 1e15c713ab7ba3bfda8b4a285ed973529364fd1100e6dd5a61f29583dc667b04 SHA512 70b95553f9813573b12e52999a4df8701dec430f23c36a8dc70d25a46bb4bc9234e5b7feb74a04062af4c8d6b6bcfe947d90b2b172416206812e54bac9797454 WHIRLPOOL 1296c25a05e3ab81730a2587ea1c07c7c022f05cfefc580224185c8d5fc9853531031c1292f69eff944ae2752492c4b95f13e160be3c449a7626aeadf1a21102 DIST xen-gentoo-patches-7.tar.xz 24148 SHA256 859fb6b69125c0a1079b35a74bb004dce1b04827b05f056a746cc42c1b187557 SHA512 faf2b0ecd67d545366e2af7e7ecab5f808d02354d07f23cbffe1c3cb80dbb5f88cc4aa140d928ad269612e55c41740ff5bf2af3f0a1f16e375d404c3ffa712b1 WHIRLPOOL d75c35fa10dd1f1567a82c5d5cd7ddabc72def6d74ef7095b7bca9ce9adad2b6ff9c88b55bad7cdefe88da027e5c742f9b9dcafce457cf15f408ea35652546f6 -DIST xen-gentoo-patches-8.tar.xz 24732 SHA256 6e114f3d3bde31f8595a51bd67fafdbb56cbd60793bafad7061fcaaef67f36fb SHA512 05da32f8fca0a9a43d419c2edd01d0c4abe233c0a8cc02e18caf6490ae9938c4302e8e61f7c67339f5fddab412be69504e1f05de895b73ac8b540914745fefd9 WHIRLPOOL 43d5114f455d2465995e9a1bffe5fff1e722540994348d05a3bac5504a970ad6af447f783ddf271a183207c21e75a0b77b6aed0a8ec8c89446e99ec1b377bcbe DIST xen-gentoo-patches-9.tar.xz 27456 SHA256 67c410d12ef4628a8c0a931e5868b425f2eb4b2f0e307304a75384cbe509734b SHA512 9a797be9dd2392c34b3f6561c2274e116b4f5b114f4520dbbd0b51818c774479ceabb45aa916f93c1a2bc49787f4ca6e6c83bc743baa6bdeef91d77276b20f36 WHIRLPOOL c41cde532726bb55acd05d558b35d575b229d2ee64eba7438f7b196df313f0e44154148c1e47bf6e8c810667b3b237bcfa410371b4bb6f097b981f6b2637ead3 DIST xen-ovmf-patches-2.tar.xz 4344 SHA256 495d61d718440057f8b0b54fb57061450dd764c6e87fe5f8bda1785bcddba770 SHA512 0bdc83029a01b613f5c1ca029bd45aebe211c332f09db91a0cc7d6b6f85a81dbbfdc20c62f0d20e973ee41b155a6551a4fad518cb792e1d508bf070e23d6a1d3 WHIRLPOOL 8346d68fa5d2a8e8a5c007b55e2b85cf48df045cc8c4818f09c756d28a52dd856671f37b4a53478e9b96ca9d2eca0c67fd15f009a94d1d2dfed8e83e596d9633 DIST xen-security-patches-19.tar.xz 3336 SHA256 497a01fbd20fa45df19b41d337be0a87f4808101ac33cc9649461726abf43720 SHA512 d8a4a8ceeab9e2efedf880e7a2007b312a7f528cdb8fb1f748096621bbdc447ff8ee09b8fbe1aae657ccd7b2557e436cf60f6e70dcaef65e8959204e91f3ec57 WHIRLPOOL 26473bc9d7c2648f78f1fbf722e1ebcf42983d9d0e04d40f66eaad73c5a7ec232a397392dd5f66adb1258c571238a8faf0497ceb468674b93f7f86b91539f9b9 -EBUILD xen-tools-4.6.4-r4.ebuild 14037 SHA256 ff33ab9220a51a9c7b2ae39b5f55216352731f77f82b0210907bfae5f84c8e96 SHA512 489d69a500e177d655f93ef7fde2471619c6c9d414c7c2d1f68f0ef9cac61337e6f50aa15620f2fd751f091976266acec9a34159aae725f5131133a43c0c572c WHIRLPOOL a7a56e737ca484abe59b75c5b5e048f6acd9214c12490aed23f48447757db6c3876baeaee762c09a6df567016c3b8a286bb843efee0bfa73438165ff5ba7ae8e EBUILD xen-tools-4.7.1-r4.ebuild 14044 SHA256 cd1f63419cfc7fed889f531fdb180a9b9e3d15c97bc4a4783365f00a639db1f1 SHA512 dd0eb1ac446b5d0fef7571c8408b0b503f40cd26ba3e06383368bfada44baecfa6cf8665ec4c61f5d83d5cae6120f7f322bb5ff2d4c6aa532702d11af00c012f WHIRLPOOL 028935c6d1112bc1cbfe053f99db1a1f5bdc0b3ff57724e06347ce205bab3dd04e192ffa11ccc8987e3dbc48e66f440e571ddfdf4515a0d39332cef40113cdb8 EBUILD xen-tools-4.7.1-r5.ebuild 14046 SHA256 bf0abadad96df89c5001c5caf6733be4e0d697b32ef4893d217cf567de7e5f5e SHA512 23689090d53b8ae3c592b2203e4c35e1a448c979ed65c02d811f33e518e54620bfa16ba205c280a97522609835f19d3522433371b481aec2e46fb3882b832cfd WHIRLPOOL b3771b16ef8dc780ab86e2c25d66881d90735e4a083e7364ad7bd921fb642a7ba41aec1db3bbccc78bd793b62e7396352ce0b521ac90863d487078cb050b68dd EBUILD xen-tools-4.8.0-r1.ebuild 13969 SHA256 53276adb58374b5544926385505aa8452796eb5c372e987547a37346a9804472 SHA512 abfc8484a5301f5841c15b5fa48c351196849a0720d08b77939e3cdffb5ef32b84a0e016a6ff999ae1176e5da9a24ae8667fc55bdba1d1c0537469e11f20668b WHIRLPOOL a9a3fddab3afdf1fbc0f5bf5b07e79cf2126156670a161e3b2fcf4c3c8894090c505d01224839fabb900bf79bcb27181e217809ab80a88cd73ce51bde9972c1c -EBUILD xen-tools-4.8.0.ebuild 13969 SHA256 181535d96c41f788c0fc09c3419aa630092c62c0a6882cd4035e680e18111bf5 SHA512 264fc3f5db462bce346f7a3032fd61cbbf14b3358fc7affec6db6453ccd9556f23aa2694d3518d3f3588f7d93cfd07f7937645906b10ac36d34ac9e0959f4049 WHIRLPOOL 3bf8fc6f6814739efd9c1c3c421801fae84c7521ee20fc9a64bd368cacbb33bd71192003aaf4e5603726fdd7ebceeb805d4ab42359ac68cb6c10f9f1d2642cb8 MISC ChangeLog 22964 SHA256 15c6bdb3723570f38291c42047455516934b7d0e29969a0b7ac0176309d09509 SHA512 29a5c27e3fc0dba37b6b54a7834e39e34d3056d999b0a0ac0278607d7ac7adf7a924b054b941390c06643fabf873d559d627c0a026f1c6352c0732289ebf6707 WHIRLPOOL 2ecd5711ccdb9823c04cc4ed68392f8d1743c7070f34dbfe9bb0c264651bdf51d65210b4879e303ac550caf1fbd9ec6c2913feaaf5cfb96dd14b40e04af02a05 MISC ChangeLog-2015 70841 SHA256 e2535b416e2777d7e80d7d96a388c50ab42fb18cd2dd242feb09e339726574ef SHA512 ea9f464a5cf37ce8e7872934f46794a23dec950d6de7d81610e3410356b9a9916dab7d6a7a114819ebe678517e60f53b3debb692383274c74e04adbb59368069 WHIRLPOOL fc0e6610406053b81d3d4258ca0f3117c552f3ab8a33ee282ba31aa69f8b07d196374c74b4f97a8f60422d53dae27fbd02e4cfea1940bc14b7b5ec995d825b07 MISC metadata.xml 1267 SHA256 9b8b03030ebd3202c071833297728c7801dff40b2cf05f74dc22e167f3eb467e SHA512 c4e947a8cff20e4c5e77f5764fe26ee86a5674cc24ba2eedb7867476f9805ca47b895fcee92e8f353bb4bce877d32832318f8f7fd9514103fb2a963d6ea74647 WHIRLPOOL 12cf733a342cdffbfeb8ca6be598b9d4d0cdaa8d027a6174f0e06e3e4d91df976759d89f6a62d68875c944c416cfdbc62bfccc241f621a14cee95315729a6b61 diff --git a/app-emulation/xen-tools/xen-tools-4.6.4-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.6.4-r4.ebuild deleted file mode 100644 index 7ac147cba18c..000000000000 --- a/app-emulation/xen-tools/xen-tools-4.6.4-r4.ebuild +++ /dev/null @@ -1,461 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='ncurses,xml,threads' - -inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs versionator - -MY_PV=${PV/_/-} -MAJOR_V="$(get_version_component_range 1-2)" - -if [[ $PV == *9999 ]]; then - inherit git-r3 - KEYWORDS="" - REPO="xen.git" - EGIT_REPO_URI="git://xenbits.xen.org/${REPO}" - S="${WORKDIR}/${REPO}" -else - KEYWORDS="amd64 ~arm ~arm64 x86" - UPSTREAM_VER=0 - SECURITY_VER=19 - # xen-tools's gentoo patches tarball - GENTOO_VER=7 - # xen-tools's gentoo patches version which apply to this specific ebuild - GENTOO_GPV=1 - # xen-tools ovmf's patches - OVMF_VER=2 - - SEABIOS_VER=1.8.2 - # OVMF upstream 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d - OVMF_PV=20151110 - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${SECURITY_VER} ]] && \ - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz" - [[ -n ${OVMF_VER} ]] && \ - OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz" - - SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz - http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz - https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz - ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2 - ${OVMF_PATCHSET_URI} ) - ${UPSTREAM_PATCHSET_URI} - ${SECURITY_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" - - S="${WORKDIR}/xen-${MY_PV}" -fi - -DESCRIPTION="Xen tools including QEMU and xl" -HOMEPAGE="http://xen.org/" -DOCS=( README docs/README.xen-bugtool ) - -LICENSE="GPL-2" -SLOT="0/${MAJOR_V}" -# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make -# >=dev-lang/ocaml-4 stable -# Masked in profiles/eapi-5-files instead -IUSE="api custom-cflags debug doc flask hvm +qemu ocaml ovmf +qemu-traditional +pam python pygrub screen sdl static-libs system-qemu system-seabios" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - pygrub? ( python ) - ovmf? ( hvm ) - ^^ ( qemu system-qemu )" - -COMMON_DEPEND=" - dev-libs/lzo:2 - dev-libs/glib:2 - dev-libs/yajl - dev-libs/libaio - dev-libs/libgcrypt:0 - sys-libs/zlib -" - -DEPEND="${COMMON_DEPEND} - dev-python/lxml[${PYTHON_USEDEP}] - x86? ( sys-devel/dev86 - sys-power/iasl ) - pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) - ${PYTHON_DEPS} - api? ( dev-libs/libxml2 - net-misc/curl ) - ovmf? ( - !arm? ( dev-lang/nasm ) - $(python_gen_impl_dep sqlite) - ) - !amd64? ( >=sys-apps/dtc-1.4.0 ) - amd64? ( sys-devel/bin86 - system-seabios? ( sys-firmware/seabios ) - sys-firmware/ipxe - sys-devel/dev86 - sys-power/iasl ) - dev-lang/perl - app-misc/pax-utils - doc? ( - app-doc/doxygen - dev-python/markdown[${PYTHON_USEDEP}] - dev-tex/latex2html[png,gif] - media-gfx/graphviz - dev-tex/xcolor - media-gfx/transfig - dev-texlive/texlive-latexextra - virtual/latex-base - dev-tex/latexmk - dev-texlive/texlive-latex - dev-texlive/texlive-pictures - dev-texlive/texlive-latexrecommended - ) - hvm? ( x11-proto/xproto - !net-libs/libiscsi ) - qemu? ( - x11-libs/pixman - sdl? ( media-libs/libsdl[X] ) - ) - system-qemu? ( app-emulation/qemu[xen] ) - ocaml? ( dev-ml/findlib - >=dev-lang/ocaml-4 )" - -RDEPEND="${COMMON_DEPEND} - sys-apps/iproute2[-minimal] - net-misc/bridge-utils - screen? ( - app-misc/screen - app-admin/logrotate - )" - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD="usr/lib/xen/boot/hvmloader - usr/share/qemu-xen/qemu/s390-ccw.img" - -RESTRICT="test" - -pkg_setup() { - python_setup - export "CONFIG_LOMOUNT=y" - - #bug 522642, disable compile tools/tests - export "CONFIG_TESTS=n" - - if has_version dev-libs/libgcrypt:0; then - export "CONFIG_GCRYPT=y" - fi - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64 ; then - export XEN_TARGET_ARCH="x86_64" - elif use arm; then - export XEN_TARGET_ARCH="arm32" - elif use arm64; then - export XEN_TARGET_ARCH="arm64" - else - die "Unsupported architecture!" - fi - fi -} - -src_prepare() { - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - einfo "Try to apply Xen Upstream patch set" - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi - - # Security patchset - if [[ -n ${SECURITY_VER} ]]; then - einfo "Try to apply Xen Security patch set" - # apply main xen patches - # Two parallel systems, both work side by side - # Over time they may concdense into one. This will suffice for now - EPATCH_SUFFIX="patch" - EPATCH_FORCE="yes" - - source "${WORKDIR}"/patches-security/${PV}.conf - - for i in ${XEN_SECURITY_MAIN}; do - epatch "${WORKDIR}"/patches-security/xen/$i - done - - # apply qemu-xen/upstream patches - pushd "${S}"/tools/qemu-xen/ > /dev/null - for i in ${XEN_SECURITY_QEMUU}; do - epatch "${WORKDIR}"/patches-security/qemuu/$i - done - popd > /dev/null - - # apply qemu-traditional patches - pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null - for i in ${XEN_SECURITY_QEMUT}; do - epatch "${WORKDIR}"/patches-security/qemut/$i - done - popd > /dev/null - fi - - # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err - mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die - pushd tools/firmware/ > /dev/null - ln -s seabios-dir-remote seabios-dir || die - popd > /dev/null - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then - einfo "Try to apply Gentoo specific patch set" - source "${FILESDIR}"/gentoo-patches.conf - _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} - for i in ${!_gpv}; do - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo/$i - done - fi - - # Ovmf's patchset - if use ovmf; then - if [[ -n ${OVMF_VER} ]];then - einfo "Try to apply Ovmf patch set" - pushd "${WORKDIR}"/ovmf-*/ > /dev/null - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-ovmf - popd > /dev/null - fi - mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die - fi - - mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die - - # Fix texi2html build error with new texi2html, qemu.doc.html - sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die - - use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die - sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ - -i tools/firmware/Makefile || die - - # Drop .config, fixes to gcc-4.6 - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - - # try and remove all the default cflags - find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \ - -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} + || die "failed to re-set custom-cflags" - else - unset CFLAGS - unset LDFLAGS - unset ASFLAGS - unset CPPFLAGS - fi - - if ! use pygrub; then - sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die - fi - - if ! use python; then - sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die - fi - - if ! use hvm; then - sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die - # Bug 351648 - elif ! use x86 && ! has x86 $(get_all_abis); then - mkdir -p "${WORKDIR}"/extra-headers/gnu || die - touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die - export CPATH="${WORKDIR}"/extra-headers - fi - - if use qemu; then - if use sdl; then - sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \ - tools/Makefile || die - else - sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \ - tools/qemu-xen-traditional/xen-setup || die - sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \ - tools/Makefile || die - fi - else - # Don't bother with qemu, only needed for fully virtualised guests - sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die - fi - - # Reset bash completion dir; Bug 472438 - sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \ - -i Config.mk || die - sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die - - # xencommons, Bug #492332, sed lighter weight than patching - sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ - -i tools/hotplug/Linux/init.d/xencommons.in || die - - # respect multilib, usr/lib/libcacard.so.0.0.0 - sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \ - -i tools/qemu-xen/configure || die - - #bug 518136, don't build 32bit exactuable for nomultilib profile - if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then - sed -i -e "/x86_emulator/d" tools/tests/Makefile || die - fi - - # use /var instead of /var/lib, consistat with previous ebuild - sed -i -e "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \ - m4/paths.m4 configure tools/configure || die - # use /run instead of /var/run - sed -i -e "/XEN_RUN_DIR=/s/\$localstatedir//g" \ - m4/paths.m4 configure tools/configure || die - - # uncomment lines in xl.conf - sed -e 's:^#autoballoon=:autoballoon=:' \ - -e 's:^#lockfile=:lockfile=:' \ - -e 's:^#vif.default.script=:vif.default.script=:' \ - -i tools/examples/xl.conf || die - - # Bug #575868 converted to a sed statement, typo of one char - sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die - - epatch_user -} - -src_configure() { - local myconf="--prefix=${PREFIX}/usr \ - --libdir=${PREFIX}/usr/$(get_libdir) \ - --libexecdir=${PREFIX}/usr/libexec \ - --disable-werror \ - --disable-xen \ - --enable-tools \ - --enable-docs \ - $(use_with system-qemu) \ - $(use_enable pam) \ - $(use_enable api xenapi) \ - $(use_enable ovmf) \ - $(use_enable ocaml ocamltools) \ - --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \ - " - - use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin" - use qemu || myconf+=" --with-system-qemu" - use amd64 && myconf+=" $(use_enable qemu-traditional)" - econf ${myconf} -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - local myopt - use debug && myopt="${myopt} debug=y" - - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} - - use doc && emake -C docs txt html - emake -C docs man-pages -} - -src_install() { - # Override auto-detection in the build system, bug #382573 - export INITD_DIR=/tmp/init.d - export CONFIG_LEAF_DIR=../tmp/default - - # Let the build system compile installed Python modules. - local PYTHONDONTWRITEBYTECODE - export PYTHONDONTWRITEBYTECODE - - emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ - XEN_PYTHON_NATIVE_INSTALL=y install-tools - - # Fix the remaining Python shebangs. - python_fix_shebang "${D}" - - # Remove RedHat-specific stuff - rm -rf "${D}"tmp || die - - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs - - dohtml -r docs/ - docinto pdf - dodoc ${DOCS[@]} - [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html - fi - - rm -rf "${D}"/usr/share/doc/xen/ - doman docs/man?/* - - newconfd "${FILESDIR}"/xendomains.confd xendomains - newconfd "${FILESDIR}"/xenstored.confd xenstored - newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled - newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains - newinitd "${FILESDIR}"/xenstored.initd xenstored - newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled - newinitd "${FILESDIR}"/xencommons.initd xencommons - newconfd "${FILESDIR}"/xencommons.confd xencommons - newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev - newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die - keepdir /var/log/xen-consoles - fi - - # For -static-libs wrt Bug 384355 - if ! use static-libs; then - rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a - fi - - # for xendomains - keepdir /etc/xen/auto - - # Remove files failing QA AFTER emake installs them, avoiding seeking absent files - find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ - -o -name openbios-ppc -o -name palcode-clipper \) -delete || die -} - -pkg_postinst() { - elog "Official Xen Guide and the offical wiki page:" - elog "https://wiki.gentoo.org/wiki/Xen" - elog "http://wiki.xen.org/wiki/Main_Page" - elog "" - elog "Recommended to utilise the xencommons script to config sytem At boot" - elog "Add by use of rc-update on completion of the install" - - if ! use hvm; then - echo - elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" - elog "support enable the hvm use flag." - elog "An x86 or amd64 system is required to build HVM support." - fi - - if use qemu; then - elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" - elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" - elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" - elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" - fi -} diff --git a/app-emulation/xen-tools/xen-tools-4.8.0.ebuild b/app-emulation/xen-tools/xen-tools-4.8.0.ebuild deleted file mode 100644 index 6a2c8dc71c25..000000000000 --- a/app-emulation/xen-tools/xen-tools-4.8.0.ebuild +++ /dev/null @@ -1,456 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='ncurses,xml,threads' - -inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs versionator - -MY_PV=${PV/_/-} -MAJOR_V="$(get_version_component_range 1-2)" - -if [[ $PV == *9999 ]]; then - inherit git-r3 - KEYWORDS="" - REPO="xen.git" - EGIT_REPO_URI="git://xenbits.xen.org/${REPO}" - S="${WORKDIR}/${REPO}" -else - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - UPSTREAM_VER= - SECURITY_VER= - # xen-tools's gentoo patches tarball - GENTOO_VER=8 - # xen-tools's gentoo patches version which apply to this specific ebuild - GENTOO_GPV=0 - # xen-tools ovmf's patches - OVMF_VER=2 - - SEABIOS_VER=1.10.0 - # OVMF upstream 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d - OVMF_PV=20151110 - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${SECURITY_VER} ]] && \ - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz" - [[ -n ${OVMF_VER} ]] && \ - OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz" - - SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz - http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz - https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz - ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2 - ${OVMF_PATCHSET_URI} ) - ${UPSTREAM_PATCHSET_URI} - ${SECURITY_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" - - S="${WORKDIR}/xen-${MY_PV}" -fi - -DESCRIPTION="Xen tools including QEMU and xl" -HOMEPAGE="http://xen.org/" -DOCS=( README docs/README.xen-bugtool ) - -LICENSE="GPL-2" -SLOT="0/${MAJOR_V}" -# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make -# >=dev-lang/ocaml-4 stable -# Masked in profiles/eapi-5-files instead -IUSE="api custom-cflags debug doc flask hvm +qemu ocaml ovmf +qemu-traditional +pam python pygrub screen sdl static-libs system-qemu system-seabios" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - pygrub? ( python ) - ovmf? ( hvm ) - ^^ ( qemu system-qemu )" - -COMMON_DEPEND=" - dev-libs/lzo:2 - dev-libs/glib:2 - dev-libs/yajl - dev-libs/libaio - dev-libs/libgcrypt:0 - sys-libs/zlib -" - -DEPEND="${COMMON_DEPEND} - dev-python/lxml[${PYTHON_USEDEP}] - x86? ( sys-devel/dev86 - sys-power/iasl ) - pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) - ${PYTHON_DEPS} - api? ( dev-libs/libxml2 - net-misc/curl ) - ovmf? ( - !arm? ( dev-lang/nasm ) - $(python_gen_impl_dep sqlite) - ) - !amd64? ( >=sys-apps/dtc-1.4.0 ) - amd64? ( sys-devel/bin86 - system-seabios? ( sys-firmware/seabios ) - sys-firmware/ipxe - sys-devel/dev86 - sys-power/iasl ) - dev-lang/perl - app-misc/pax-utils - doc? ( - app-doc/doxygen - dev-python/markdown[${PYTHON_USEDEP}] - dev-tex/latex2html[png,gif] - media-gfx/graphviz - dev-tex/xcolor - media-gfx/transfig - dev-texlive/texlive-latexextra - virtual/latex-base - dev-tex/latexmk - dev-texlive/texlive-latex - dev-texlive/texlive-pictures - dev-texlive/texlive-latexrecommended - ) - hvm? ( x11-proto/xproto - !net-libs/libiscsi ) - qemu? ( - x11-libs/pixman - sdl? ( media-libs/libsdl[X] ) - ) - system-qemu? ( app-emulation/qemu[xen] ) - ocaml? ( dev-ml/findlib - >=dev-lang/ocaml-4 )" - -RDEPEND="${COMMON_DEPEND} - sys-apps/iproute2[-minimal] - net-misc/bridge-utils - screen? ( - app-misc/screen - app-admin/logrotate - )" - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD="usr/lib/xen/boot/hvmloader - usr/share/qemu-xen/qemu/s390-ccw.img" - -RESTRICT="test" - -pkg_setup() { - python_setup - export "CONFIG_LOMOUNT=y" - - #bug 522642, disable compile tools/tests - export "CONFIG_TESTS=n" - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64 ; then - export XEN_TARGET_ARCH="x86_64" - elif use arm; then - export XEN_TARGET_ARCH="arm32" - elif use arm64; then - export XEN_TARGET_ARCH="arm64" - else - die "Unsupported architecture!" - fi - fi -} - -src_prepare() { - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - einfo "Try to apply Xen Upstream patch set" - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi - - # Security patchset - if [[ -n ${SECURITY_VER} ]]; then - einfo "Try to apply Xen Security patch set" - # apply main xen patches - # Two parallel systems, both work side by side - # Over time they may concdense into one. This will suffice for now - EPATCH_SUFFIX="patch" - EPATCH_FORCE="yes" - - source "${WORKDIR}"/patches-security/${PV}.conf - - for i in ${XEN_SECURITY_MAIN}; do - epatch "${WORKDIR}"/patches-security/xen/$i - done - - # apply qemu-xen/upstream patches - pushd "${S}"/tools/qemu-xen/ > /dev/null - for i in ${XEN_SECURITY_QEMUU}; do - epatch "${WORKDIR}"/patches-security/qemuu/$i - done - popd > /dev/null - - # apply qemu-traditional patches - pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null - for i in ${XEN_SECURITY_QEMUT}; do - epatch "${WORKDIR}"/patches-security/qemut/$i - done - popd > /dev/null - fi - - # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err - mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die - pushd tools/firmware/ > /dev/null - ln -s seabios-dir-remote seabios-dir || die - popd > /dev/null - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then - einfo "Try to apply Gentoo specific patch set" - source "${FILESDIR}"/gentoo-patches.conf - _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} - for i in ${!_gpv}; do - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo/$i - done - fi - - # Ovmf's patchset - if use ovmf; then - if [[ -n ${OVMF_VER} ]];then - einfo "Try to apply Ovmf patch set" - pushd "${WORKDIR}"/ovmf-*/ > /dev/null - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-ovmf - popd > /dev/null - fi - mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die - fi - - mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die - - # Fix texi2html build error with new texi2html, qemu.doc.html - sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die - - use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die - sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ - -i tools/firmware/Makefile || die - - # Drop .config, fixes to gcc-4.6 - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - - # try and remove all the default cflags - find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \ - -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} + || die "failed to re-set custom-cflags" - else - unset CFLAGS - unset LDFLAGS - unset ASFLAGS - unset CPPFLAGS - fi - - if ! use pygrub; then - sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die - fi - - if ! use python; then - sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die - fi - - if ! use hvm; then - sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die - # Bug 351648 - elif ! use x86 && ! has x86 $(get_all_abis); then - mkdir -p "${WORKDIR}"/extra-headers/gnu || die - touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die - export CPATH="${WORKDIR}"/extra-headers - fi - - if use qemu; then - if use sdl; then - sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \ - tools/Makefile || die - else - sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \ - tools/qemu-xen-traditional/xen-setup || die - sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \ - tools/Makefile || die - fi - else - # Don't bother with qemu, only needed for fully virtualised guests - sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die - fi - - # Reset bash completion dir; Bug 472438 - sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \ - -i Config.mk || die - sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die - - # xencommons, Bug #492332, sed lighter weight than patching - sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ - -i tools/hotplug/Linux/init.d/xencommons.in || die - - # respect multilib, usr/lib/libcacard.so.0.0.0 - sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \ - -i tools/qemu-xen/configure || die - - #bug 518136, don't build 32bit exactuable for nomultilib profile - if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then - sed -i -e "/x86_emulator/d" tools/tests/Makefile || die - fi - - # use /var instead of /var/lib, consistat with previous ebuild - sed -i -e "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \ - m4/paths.m4 configure tools/configure || die - # use /run instead of /var/run - sed -i -e "/XEN_RUN_DIR=/s/\$localstatedir//g" \ - m4/paths.m4 configure tools/configure || die - - # uncomment lines in xl.conf - sed -e 's:^#autoballoon=:autoballoon=:' \ - -e 's:^#lockfile=:lockfile=:' \ - -e 's:^#vif.default.script=:vif.default.script=:' \ - -i tools/examples/xl.conf || die - - # Bug #575868 converted to a sed statement, typo of one char - sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die - - epatch_user -} - -src_configure() { - local myconf="--prefix=${PREFIX}/usr \ - --libdir=${PREFIX}/usr/$(get_libdir) \ - --libexecdir=${PREFIX}/usr/libexec \ - --disable-werror \ - --disable-xen \ - --enable-tools \ - --enable-docs \ - $(use_enable pam) \ - $(use_enable api xenapi) \ - $(use_enable ovmf) \ - $(use_enable ocaml ocamltools) \ - --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \ - " - - use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin" - use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64" - use amd64 && myconf+=" $(use_enable qemu-traditional)" - econf ${myconf} -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - local myopt - use debug && myopt="${myopt} debug=y" - - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} - - use doc && emake -C docs txt html - emake -C docs man-pages -} - -src_install() { - # Override auto-detection in the build system, bug #382573 - export INITD_DIR=/tmp/init.d - export CONFIG_LEAF_DIR=../tmp/default - - # Let the build system compile installed Python modules. - local PYTHONDONTWRITEBYTECODE - export PYTHONDONTWRITEBYTECODE - - emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ - XEN_PYTHON_NATIVE_INSTALL=y install-tools - - # Fix the remaining Python shebangs. - python_fix_shebang "${D}" - - # Remove RedHat-specific stuff - rm -rf "${D}"tmp || die - - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs - - dohtml -r docs/ - docinto pdf - dodoc ${DOCS[@]} - [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html - fi - - rm -rf "${D}"/usr/share/doc/xen/ - doman docs/man?/* - - newconfd "${FILESDIR}"/xendomains.confd xendomains - newconfd "${FILESDIR}"/xenstored.confd xenstored - newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled - newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains - newinitd "${FILESDIR}"/xenstored.initd xenstored - newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled - newinitd "${FILESDIR}"/xencommons.initd xencommons - newconfd "${FILESDIR}"/xencommons.confd xencommons - newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev - newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die - keepdir /var/log/xen-consoles - fi - - # For -static-libs wrt Bug 384355 - if ! use static-libs; then - rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a - fi - - # for xendomains - keepdir /etc/xen/auto - - # Remove files failing QA AFTER emake installs them, avoiding seeking absent files - find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ - -o -name openbios-ppc -o -name palcode-clipper \) -delete || die -} - -pkg_postinst() { - elog "Official Xen Guide and the offical wiki page:" - elog "https://wiki.gentoo.org/wiki/Xen" - elog "http://wiki.xen.org/wiki/Main_Page" - elog "" - elog "Recommended to utilise the xencommons script to config sytem At boot" - elog "Add by use of rc-update on completion of the install" - - if ! use hvm; then - echo - elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" - elog "support enable the hvm use flag." - elog "An x86 or amd64 system is required to build HVM support." - fi - - if use qemu; then - elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" - elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" - elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" - elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" - fi -} diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index b01c74acdb08..11799a24367d 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -1,14 +1,8 @@ AUX xen-4.6-efi.patch 1954 SHA256 6ac4fc1fc99e89a16838a54c8b0657a84caa296d739d1ce9443bf4f10cbe57db SHA512 361af33159cf49626e92d2815fd4422ea5b1d696a32ce2695ce75205fbbfb89d96b64a8af7332fffdc4a4390000bf52d3730403dfc2334af0da0bea59d58b689 WHIRLPOOL 2a2a306e8ab6c57c169b2adc46ac9e00208e8adf294e5da407406e392da0177c47e84bd21832147e665135ec618e2dd161f6f32c280d82c7f4583ff39bc532e2 -DIST xen-4.6.4-upstream-patches-0.tar.xz 15280 SHA256 0f2d55e44e2c98fb7caf76997c05f44fe1efdbf7eaa971a4bf234ea3bc95e244 SHA512 26be1b03af1ac0d6a413b0ab8a30d59c733d6d5c4e29ce3b5b90818a1589cbb5c46a50b9ee42b273ef3b37df8ff403241d68e1e2221ce969054fb7e5f13516ab WHIRLPOOL 52420897c49cd1bcfd8896df45a1f9c8df6337cb68dd7a6ff962361e7ab2eab1e6d6699ae8236b105e6b700b5d5b6c8da302ff477ac6493a60a665e4225cff02 -DIST xen-4.6.4.tar.gz 19709274 SHA256 b795d5631a85fb68295361067195ecd00003656dacede4ec57533fce33ab5109 SHA512 e6278061a16829628030579e115a500970ff575eb6796189bfa1e2d7a8cbbf8aec2c2bd04c77cdc87226d6cc5eaee59d6c62cacb4e74b06e1f1379734b872938 WHIRLPOOL a982f7bbf2ba16781ac0f310ef27a32e9115596e91117609d22827bc1999facb12df4f33d1ba0b7015cbfae90a24302243d508e8c38ba45ea998341b76ba0567 DIST xen-4.7.1-upstream-patches-0.tar.xz 16420 SHA256 cb4724fedadc408ec390f99e9928a44ec75e793fb55cb97793f09980855b6a32 SHA512 79e117c48c6cc3d5783c818218ac11ec494735ce89755b5e263a64c23fb1f0a425bc65b567a24ce2e348b6e3839b26133c7e2c36411e5cc7acb54b855149dfbe WHIRLPOOL 982165da62cbb28cd72d32662c366ca7dac91a511b356eb58bced4b4af5cbc0d94c7e280a2400e5d9c92938d2afee86abd7c688926c2b9cb191d4554be828844 DIST xen-4.7.1.tar.gz 20706864 SHA256 e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a771cda46bbcd4d0d671ffe SHA512 eb03244f5fa7b54402fcc1d38f1e69c0ea4536d5ab2f9859b41b5e94920ad9db20fb146e3c3d3635e9ca1d12e93ce0429e57f24bf53d4a2c4b69babc76ec724e WHIRLPOOL 5d7ba29ea58bdedb6a237f7cb1c0aacf361dc35ebb07ec8e55773e07b1f38c1b151615b526e14daeca7c2db235114bde0b6d124219e8818c6e529873b5151fec DIST xen-4.8.0.tar.gz 22499917 SHA256 1e15c713ab7ba3bfda8b4a285ed973529364fd1100e6dd5a61f29583dc667b04 SHA512 70b95553f9813573b12e52999a4df8701dec430f23c36a8dc70d25a46bb4bc9234e5b7feb74a04062af4c8d6b6bcfe947d90b2b172416206812e54bac9797454 WHIRLPOOL 1296c25a05e3ab81730a2587ea1c07c7c022f05cfefc580224185c8d5fc9853531031c1292f69eff944ae2752492c4b95f13e160be3c449a7626aeadf1a21102 -DIST xen-security-patches-19.tar.xz 3336 SHA256 497a01fbd20fa45df19b41d337be0a87f4808101ac33cc9649461726abf43720 SHA512 d8a4a8ceeab9e2efedf880e7a2007b312a7f528cdb8fb1f748096621bbdc447ff8ee09b8fbe1aae657ccd7b2557e436cf60f6e70dcaef65e8959204e91f3ec57 WHIRLPOOL 26473bc9d7c2648f78f1fbf722e1ebcf42983d9d0e04d40f66eaad73c5a7ec232a397392dd5f66adb1258c571238a8faf0497ceb468674b93f7f86b91539f9b9 DIST xen-security-patches-20.tar.xz 5608 SHA256 5bb4b6d93a07a3aa74497848ecdc9b7f0729f38d8a3e90d964c9aa85851ebfba SHA512 17171ca9f212153e49636c84455ec034b08e73be26f912e43995ac245d1927e6d4aa97a160f96d55f05e2c19c44d7ed8617ad10d8f4f27dc75f8f936624f73ce WHIRLPOOL 68e6f0033102298c31bdca88ac426fbcf3ee986250795404cead9e7577cf9bdb73c153f01d40b5cac31a2e845d862fe1dfcbb9022b550abb00779cf784f9b523 -EBUILD xen-4.6.4-r3.ebuild 5384 SHA256 f93136605e7e9cd8de57b12aa044d8d56cf6fe2932d3cee6ccda17fb975f8707 SHA512 cf1247952d3ded18c50635928c5dc1e3a63f9f813a4e1efb1db6adaf3a5fce6da4cb26ae17b3e78ea3a97bd95e7461e0abab51e373e7b4b4ac7943820d4d4836 WHIRLPOOL e3a4b296488adba34908daff46db67730ee7bc5346c299c8e80b651b97a2e6d1c169e326e1e28b624e93bce5c534c5d48da1927b727109cee98948c0ecb4cbc2 -EBUILD xen-4.6.4-r4.ebuild 5384 SHA256 560c9f46c5cb33b5304b220cb8a5372895f7d4a17df262b70735ee447faff756 SHA512 35d530265a3a10c1e902fd32eb58f8e18c575c3cefa8d2b93ccb2cc13304215d0d62306be9471fd700d2ea1459eeee6710d022517a6078e3af4f9bdd086710ba WHIRLPOOL a72dc552cbe368b8e703d9dd44bfa192d38b0d5bd698a237b48f117bbe26e473f7e7fe89551fcbaf163e29be9fa6ee41361e01cd1908d5acddb9c101a05f9c8f -EBUILD xen-4.7.1-r3.ebuild 5384 SHA256 f93136605e7e9cd8de57b12aa044d8d56cf6fe2932d3cee6ccda17fb975f8707 SHA512 cf1247952d3ded18c50635928c5dc1e3a63f9f813a4e1efb1db6adaf3a5fce6da4cb26ae17b3e78ea3a97bd95e7461e0abab51e373e7b4b4ac7943820d4d4836 WHIRLPOOL e3a4b296488adba34908daff46db67730ee7bc5346c299c8e80b651b97a2e6d1c169e326e1e28b624e93bce5c534c5d48da1927b727109cee98948c0ecb4cbc2 EBUILD xen-4.7.1-r4.ebuild 5384 SHA256 560c9f46c5cb33b5304b220cb8a5372895f7d4a17df262b70735ee447faff756 SHA512 35d530265a3a10c1e902fd32eb58f8e18c575c3cefa8d2b93ccb2cc13304215d0d62306be9471fd700d2ea1459eeee6710d022517a6078e3af4f9bdd086710ba WHIRLPOOL a72dc552cbe368b8e703d9dd44bfa192d38b0d5bd698a237b48f117bbe26e473f7e7fe89551fcbaf163e29be9fa6ee41361e01cd1908d5acddb9c101a05f9c8f EBUILD xen-4.8.0-r1.ebuild 5384 SHA256 f17804b36cfc2f0b07f0a43ba06527256002a439949fe3f193f84c0254b94699 SHA512 25ec1e6b66136d9a67772cc9b822c0914b1a422410b08356a851726b3b5e10b9cbe02bc5ee30b98a09b84553e8bdd237afcfc588f0f6e9efe18854d514e73e92 WHIRLPOOL 6ea889a27f6c2c8c9894df0e0a5377d13755d54522bdf43da8cd576a624ec1bd209f2acd926bb925c2707abde6546186dc59ccd3504d8639203032898da2e41d MISC ChangeLog 19246 SHA256 ae107ab371c71d67ccbbb373a29add15e6203ecd6e42fbbce8d37ece1b186fc9 SHA512 b51269964858e15797062599b5b0329686c202da6aeeefeb3f72bec596f35080221ce7591db7a662d973eb1e17d80af8de953a27e1df70e365b9538e1d311bef WHIRLPOOL 72136dd18b3e3341e0fdad7abe3d75f633588c800c647a7a165c5a11741d6c98e492d22eaae4da40ce1d105c96db4ee9071ed0955ef2c376bb0d2e4415581339 diff --git a/app-emulation/xen/xen-4.6.4-r3.ebuild b/app-emulation/xen/xen-4.6.4-r3.ebuild deleted file mode 100644 index 785a28565926..000000000000 --- a/app-emulation/xen/xen-4.6.4-r3.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs - -MY_PV=${PV/_/-} -MY_P=${PN}-${PV/_/-} - -if [[ $PV == *9999 ]]; then - inherit git-r3 - KEYWORDS="" - EGIT_REPO_URI="git://xenbits.xen.org/xen.git" - SRC_URI="" -else - KEYWORDS="amd64 ~arm -x86" - UPSTREAM_VER=0 - SECURITY_VER=19 - GENTOO_VER= - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${SECURITY_VER} ]] && \ - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" - SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz - ${UPSTREAM_PATCHSET_URI} - ${SECURITY_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" -fi - -DESCRIPTION="The Xen virtual machine monitor" -HOMEPAGE="http://xen.org/" -LICENSE="GPL-2" -SLOT="0" -IUSE="custom-cflags debug efi flask" - -DEPEND="${PYTHON_DEPS} - efi? ( >=sys-devel/binutils-2.22[multitarget] ) - !efi? ( >=sys-devel/binutils-2.22 )" -RDEPEND="" -PDEPEND="~app-emulation/xen-tools-${PV}" - -# no tests are available for the hypervisor -# prevent the silliness of /usr/lib/debug/usr/lib/debug files -# prevent stripping of the debug info from the /usr/lib/debug/xen-syms -RESTRICT="test splitdebug strip" - -# Approved by QA team in bug #144032 -QA_WX_LOAD="boot/xen-syms-${PV}" - -REQUIRED_USE="arm? ( debug )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - python-any-r1_pkg_setup - if [[ -z ${XEN_TARGET_ARCH} ]]; then - if use amd64; then - export XEN_TARGET_ARCH="x86_64" - elif use arm; then - export XEN_TARGET_ARCH="arm32" - elif use arm64; then - export XEN_TARGET_ARCH="arm64" - else - die "Unsupported architecture!" - fi - fi - - if use flask ; then - export "XSM_ENABLE=y" - export "FLASK_ENABLE=y" - fi -} - -src_prepare() { - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi - - # Security patchset - if [[ -n ${SECURITY_VER} ]]; then - einfo "Try to apply Xen Security patch set" - # apply main xen patches - # Two parallel systems, both work side by side - # Over time they may concdense into one. This will suffice for now - EPATCH_SUFFIX="patch" - EPATCH_FORCE="yes" - - source "${WORKDIR}"/patches-security/${PV}.conf - - for i in ${XEN_SECURITY_MAIN}; do - epatch "${WORKDIR}"/patches-security/xen/$i - done - fi - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo - fi - - epatch "${FILESDIR}"/${PN}-4.6-efi.patch - - # Drop .config - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" - - if use efi; then - export EFI_VENDOR="gentoo" - export EFI_MOUNTPOINT="boot" - fi - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - # try and remove all the default custom-cflags - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} \; || die "failed to re-set custom-cflags" - fi - - # remove -Werror for gcc-4.6's sake - find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \ - xargs sed -i 's/ *-Werror */ /' - # not strictly necessary to fix this - sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" - - # Bug #575868 converted to a sed statement, typo of one char - sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die - - epatch_user -} - -src_configure() { - use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" - - use debug && myopt="${myopt} debug=y" - - if use custom-cflags; then - filter-flags -fPIE -fstack-protector - replace-flags -O3 -O2 - else - unset CFLAGS - unset LDFLAGS - unset ASFLAGS - fi -} - -src_compile() { - # Send raw LDFLAGS so that --as-needed works - emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} -} - -src_install() { - local myopt - use debug && myopt="${myopt} debug=y" - - # The 'make install' doesn't 'mkdir -p' the subdirs - if use efi; then - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die - fi - - emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install - - # make install likes to throw in some extra EFI bits if it built - use efi || rm -rf "${D}/usr/$(get_libdir)/efi" -} - -pkg_postinst() { - elog "Official Xen Guide and the unoffical wiki page:" - elog " https://wiki.gentoo.org/wiki/Xen" - elog " http://en.gentoo-wiki.com/wiki/Xen/" - - use efi && einfo "The efi executable is installed in boot/efi/gentoo" - - elog "You can optionally block the installation of /boot/xen-syms by an entry" - elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK" - elog "e.g. echo ${msg} > /etc/portage/env/xen.conf" -} diff --git a/app-emulation/xen/xen-4.6.4-r4.ebuild b/app-emulation/xen/xen-4.6.4-r4.ebuild deleted file mode 100644 index e91c520b8317..000000000000 --- a/app-emulation/xen/xen-4.6.4-r4.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs - -MY_PV=${PV/_/-} -MY_P=${PN}-${PV/_/-} - -if [[ $PV == *9999 ]]; then - inherit git-r3 - KEYWORDS="" - EGIT_REPO_URI="git://xenbits.xen.org/xen.git" - SRC_URI="" -else - KEYWORDS="amd64 ~arm -x86" - UPSTREAM_VER=0 - SECURITY_VER=20 - GENTOO_VER= - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${SECURITY_VER} ]] && \ - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" - SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz - ${UPSTREAM_PATCHSET_URI} - ${SECURITY_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" -fi - -DESCRIPTION="The Xen virtual machine monitor" -HOMEPAGE="http://xen.org/" -LICENSE="GPL-2" -SLOT="0" -IUSE="custom-cflags debug efi flask" - -DEPEND="${PYTHON_DEPS} - efi? ( >=sys-devel/binutils-2.22[multitarget] ) - !efi? ( >=sys-devel/binutils-2.22 )" -RDEPEND="" -PDEPEND="~app-emulation/xen-tools-${PV}" - -# no tests are available for the hypervisor -# prevent the silliness of /usr/lib/debug/usr/lib/debug files -# prevent stripping of the debug info from the /usr/lib/debug/xen-syms -RESTRICT="test splitdebug strip" - -# Approved by QA team in bug #144032 -QA_WX_LOAD="boot/xen-syms-${PV}" - -REQUIRED_USE="arm? ( debug )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - python-any-r1_pkg_setup - if [[ -z ${XEN_TARGET_ARCH} ]]; then - if use amd64; then - export XEN_TARGET_ARCH="x86_64" - elif use arm; then - export XEN_TARGET_ARCH="arm32" - elif use arm64; then - export XEN_TARGET_ARCH="arm64" - else - die "Unsupported architecture!" - fi - fi - - if use flask ; then - export "XSM_ENABLE=y" - export "FLASK_ENABLE=y" - fi -} - -src_prepare() { - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi - - # Security patchset - if [[ -n ${SECURITY_VER} ]]; then - einfo "Try to apply Xen Security patch set" - # apply main xen patches - # Two parallel systems, both work side by side - # Over time they may concdense into one. This will suffice for now - EPATCH_SUFFIX="patch" - EPATCH_FORCE="yes" - - source "${WORKDIR}"/patches-security/${PV}.conf - - for i in ${XEN_SECURITY_MAIN}; do - epatch "${WORKDIR}"/patches-security/xen/$i - done - fi - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo - fi - - epatch "${FILESDIR}"/${PN}-4.6-efi.patch - - # Drop .config - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" - - if use efi; then - export EFI_VENDOR="gentoo" - export EFI_MOUNTPOINT="boot" - fi - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - # try and remove all the default custom-cflags - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} \; || die "failed to re-set custom-cflags" - fi - - # remove -Werror for gcc-4.6's sake - find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \ - xargs sed -i 's/ *-Werror */ /' - # not strictly necessary to fix this - sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" - - # Bug #575868 converted to a sed statement, typo of one char - sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die - - epatch_user -} - -src_configure() { - use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" - - use debug && myopt="${myopt} debug=y" - - if use custom-cflags; then - filter-flags -fPIE -fstack-protector - replace-flags -O3 -O2 - else - unset CFLAGS - unset LDFLAGS - unset ASFLAGS - fi -} - -src_compile() { - # Send raw LDFLAGS so that --as-needed works - emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} -} - -src_install() { - local myopt - use debug && myopt="${myopt} debug=y" - - # The 'make install' doesn't 'mkdir -p' the subdirs - if use efi; then - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die - fi - - emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install - - # make install likes to throw in some extra EFI bits if it built - use efi || rm -rf "${D}/usr/$(get_libdir)/efi" -} - -pkg_postinst() { - elog "Official Xen Guide and the unoffical wiki page:" - elog " https://wiki.gentoo.org/wiki/Xen" - elog " http://en.gentoo-wiki.com/wiki/Xen/" - - use efi && einfo "The efi executable is installed in boot/efi/gentoo" - - elog "You can optionally block the installation of /boot/xen-syms by an entry" - elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK" - elog "e.g. echo ${msg} > /etc/portage/env/xen.conf" -} diff --git a/app-emulation/xen/xen-4.7.1-r3.ebuild b/app-emulation/xen/xen-4.7.1-r3.ebuild deleted file mode 100644 index 785a28565926..000000000000 --- a/app-emulation/xen/xen-4.7.1-r3.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs - -MY_PV=${PV/_/-} -MY_P=${PN}-${PV/_/-} - -if [[ $PV == *9999 ]]; then - inherit git-r3 - KEYWORDS="" - EGIT_REPO_URI="git://xenbits.xen.org/xen.git" - SRC_URI="" -else - KEYWORDS="amd64 ~arm -x86" - UPSTREAM_VER=0 - SECURITY_VER=19 - GENTOO_VER= - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${SECURITY_VER} ]] && \ - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" - SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz - ${UPSTREAM_PATCHSET_URI} - ${SECURITY_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" -fi - -DESCRIPTION="The Xen virtual machine monitor" -HOMEPAGE="http://xen.org/" -LICENSE="GPL-2" -SLOT="0" -IUSE="custom-cflags debug efi flask" - -DEPEND="${PYTHON_DEPS} - efi? ( >=sys-devel/binutils-2.22[multitarget] ) - !efi? ( >=sys-devel/binutils-2.22 )" -RDEPEND="" -PDEPEND="~app-emulation/xen-tools-${PV}" - -# no tests are available for the hypervisor -# prevent the silliness of /usr/lib/debug/usr/lib/debug files -# prevent stripping of the debug info from the /usr/lib/debug/xen-syms -RESTRICT="test splitdebug strip" - -# Approved by QA team in bug #144032 -QA_WX_LOAD="boot/xen-syms-${PV}" - -REQUIRED_USE="arm? ( debug )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - python-any-r1_pkg_setup - if [[ -z ${XEN_TARGET_ARCH} ]]; then - if use amd64; then - export XEN_TARGET_ARCH="x86_64" - elif use arm; then - export XEN_TARGET_ARCH="arm32" - elif use arm64; then - export XEN_TARGET_ARCH="arm64" - else - die "Unsupported architecture!" - fi - fi - - if use flask ; then - export "XSM_ENABLE=y" - export "FLASK_ENABLE=y" - fi -} - -src_prepare() { - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi - - # Security patchset - if [[ -n ${SECURITY_VER} ]]; then - einfo "Try to apply Xen Security patch set" - # apply main xen patches - # Two parallel systems, both work side by side - # Over time they may concdense into one. This will suffice for now - EPATCH_SUFFIX="patch" - EPATCH_FORCE="yes" - - source "${WORKDIR}"/patches-security/${PV}.conf - - for i in ${XEN_SECURITY_MAIN}; do - epatch "${WORKDIR}"/patches-security/xen/$i - done - fi - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo - fi - - epatch "${FILESDIR}"/${PN}-4.6-efi.patch - - # Drop .config - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" - - if use efi; then - export EFI_VENDOR="gentoo" - export EFI_MOUNTPOINT="boot" - fi - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - # try and remove all the default custom-cflags - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} \; || die "failed to re-set custom-cflags" - fi - - # remove -Werror for gcc-4.6's sake - find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \ - xargs sed -i 's/ *-Werror */ /' - # not strictly necessary to fix this - sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" - - # Bug #575868 converted to a sed statement, typo of one char - sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die - - epatch_user -} - -src_configure() { - use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" - - use debug && myopt="${myopt} debug=y" - - if use custom-cflags; then - filter-flags -fPIE -fstack-protector - replace-flags -O3 -O2 - else - unset CFLAGS - unset LDFLAGS - unset ASFLAGS - fi -} - -src_compile() { - # Send raw LDFLAGS so that --as-needed works - emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} -} - -src_install() { - local myopt - use debug && myopt="${myopt} debug=y" - - # The 'make install' doesn't 'mkdir -p' the subdirs - if use efi; then - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die - fi - - emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install - - # make install likes to throw in some extra EFI bits if it built - use efi || rm -rf "${D}/usr/$(get_libdir)/efi" -} - -pkg_postinst() { - elog "Official Xen Guide and the unoffical wiki page:" - elog " https://wiki.gentoo.org/wiki/Xen" - elog " http://en.gentoo-wiki.com/wiki/Xen/" - - use efi && einfo "The efi executable is installed in boot/efi/gentoo" - - elog "You can optionally block the installation of /boot/xen-syms by an entry" - elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK" - elog "e.g. echo ${msg} > /etc/portage/env/xen.conf" -} diff --git a/app-misc/lfm/Manifest b/app-misc/lfm/Manifest index 515fd5c9453d..809407032969 100644 --- a/app-misc/lfm/Manifest +++ b/app-misc/lfm/Manifest @@ -1,6 +1,6 @@ AUX lfm-2.3-no-doc.patch 418 SHA256 f4aef9c57938c953e7e0798d3207920c86e6cb84ffec2a82ccd29da7801e4e8e SHA512 d914da807c56a8ba38a9c9c2d6ac8c1ab5a9ec935cc55fd0a8ca5d12ecda571fd64a41938942586c9cc0e80a53a8d83cecc347decc66ebec719f78ce9a0b0d3b WHIRLPOOL 964bd6dc6491c545948f3ca5a9e588cfc37af6bffaa394ade6f8bc3d22da7bd356f84e937520decf557c12b5f20c4abb610aba5527f4d3d15a28c2d85638ff61 DIST lfm-2.3.tar.gz 119120 SHA256 e8df188c17d4d676cf41ccae9f6bf82aa0c5ff3942d5aad985990ad1446c9504 SHA512 d244cd03ebf4b145c0d364d9d7038a2b640010e7e6bc413a3613d4519afac4856ee7694a962176d7693bef6503b80703685b1cefab1eda0f8d0768ae10abf6c7 WHIRLPOOL 559bfd2bda0438709f53a7c22f285aeb932e6929b7c0e16af2684088c65f21a068440e5888e772a0b67bd45c2541a2441a5a22ab13011aa8eb97dd7bd5fc591f -EBUILD lfm-2.3-r1.ebuild 486 SHA256 b21d9b3417a5f21538d67cafc5dab99c1e9d1686b2451b880c22194d51974134 SHA512 37b50e2d82d6e890baaa0f8aadb3681e4567b683e7ba58cf8f35d2cb19c6c3916813bd5e75c2dad8cc4d23c01208c6c8e415beb3b1650ee25267048d2bc8a178 WHIRLPOOL 6b01d7c78b69ba50fc0b3c287445699cbc2e5f5baf86c5c39bb365ba0cd10a90476458c49a14711bcc50967cd17fbd5b845ab26a54bb844b8880ea65cc066d6a +EBUILD lfm-2.3-r1.ebuild 494 SHA256 5168b3019aaeb6e38895bb07954dbf57a3a400e215fc66c24b289d54c3cfde26 SHA512 ec233f9f28436d83e222e686e4e7df4947640006f337db60c296fa1643d70c72625ca49a168a13745e7c58f1905370c099001fb6f790bc5c41facfc337725b64 WHIRLPOOL 1bbe84b0eca339a09c7c83a99f95249531ca2e89299b2b2d9eea9bfa3539226108f787d17421be23b5d946b65e311d08852c75a64ddee015bd3a341499e72153 MISC ChangeLog 3246 SHA256 b6bee7dfadeab272a20a81cdc3c534301e6e529e70502f7972fc801995ab2641 SHA512 60dfadc7022863b7d316bf4796dd551114c29b54992586a931165b6179ea5b301eb9767597a60211bbe062ea21fcb4e655068a5eccc33e485c875abbed1e12bd WHIRLPOOL 483ebc77a909a8720161d9a4b5c8c8bb40f828083a0b8f5a37bcf75bcfb84a1939f35cc309da5a7704358543ca8ab57f09678e4b1c9e3e930e1db79b9a95be09 MISC ChangeLog-2015 867 SHA256 1c6febe3c90959b431ffa35440bb6a4c2cb1e56ac2a6eaa6d4d6ffdcd774ec36 SHA512 ae87b794fb2375a2af2fd2eb05ce5a62952a17069c06cd01a713b2097df617e1f447b8315ae87d485ad994276b1c4a75143efda8451e0a5709a089815c648a9c WHIRLPOOL ea3343e0ea7fe7ecbe41858dd270f9df831c9b96c1adfc5b086f193c0b63425d33b64b61844c890e63baf24a3ba1fee247dff52929b0bfe8391bf334d39ee41c MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968 diff --git a/app-misc/lfm/lfm-2.3-r1.ebuild b/app-misc/lfm/lfm-2.3-r1.ebuild index 8eeb4c6bbea4..06327ae77c5b 100644 --- a/app-misc/lfm/lfm-2.3-r1.ebuild +++ b/app-misc/lfm/lfm-2.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -10,10 +10,10 @@ PYTHON_REQ_USE="ncurses" inherit distutils-r1 eutils DESCRIPTION="Last File Manager is a powerful file manager for the console" -HOMEPAGE="https://code.google.com/p/lfm/" -SRC_URI="https://lfm.googlecode.com/files/${P}.tar.gz" +HOMEPAGE="https://inigo.katxi.org/devel/lfm/" +SRC_URI="https://inigo.katxi.org/devel/${PN}/${P}.tar.gz" -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" diff --git a/app-misc/ytree/Manifest b/app-misc/ytree/Manifest index 5aae71d6a305..ba82f85c4e5d 100644 --- a/app-misc/ytree/Manifest +++ b/app-misc/ytree/Manifest @@ -1,7 +1,7 @@ AUX ytree-1.94-bindir.patch 433 SHA256 00aecc45bc46950448fecdab16348960a06633a94c9d1ad50957787aa4c294f7 SHA512 b10a4a6c0bc8b06817a859498dad4ba789393d41f3f87ef457ce58bb4a209623c299ab81de229a1c03866632a749fff56c2933e35859ca22c6c7becaaa67110a WHIRLPOOL 90c233fd64cd775f70d8f2261692e6b969ea31bbd3990e382d1f7d31f84776eafbe24a8c86f35ff47e9d6e6ccea795372cd0b8605b37b9a570c59aa4ffa528a0 DIST ytree-1.98.tar.gz 122610 SHA256 e7264e1c112bf62aba1f6ed0078308930cd8f01317a157ed1718b8dac09195c5 SHA512 b75f3b04af72270e2b4db6dc7448435fdf2d197d98bd2f4fdf6d3131091c8c3a697f8b0cabc1625502c616cee4e27ae6aa6fa2bfc082beeae1b6ecad9921dbef WHIRLPOOL 292da20c8c918eb468ccab6d0a5e09ecef8c44dad990326e2366eac81f11c039d1461308b053b54d751a7fb883dac9dda28d6abe6d12f2682c4b58dc58390665 DIST ytree-1.99pl1.tar.gz 122996 SHA256 763e8c2af528174cd738ed8f2eca62579e3edef57ccbd242be7cf181ae15d251 SHA512 3d2ffae5cccf973bb06ec64917dc8f5b69e0ab95910144c5058b166479334fc563807a813ef608678463a032a8d2234f1006b820baa04aa95e77b06888af81fc WHIRLPOOL a1541789d9ec4230db6ffc8d60d32849ade4e4af36e9be7124b05d3575fd59306e5ebfe8778245a32d5f036076a8c0a2d8114de773fd198d4bb23d47ad173c27 -EBUILD ytree-1.98-r1.ebuild 622 SHA256 eaf8c654984ec6711356b7c7f16fca7acfb2eda04d8486fef31ad7c2191aec5b SHA512 ad34d98813f9c5617a5d5cada8b7847f17ffabe7537fcab4c0d80e703d1ecd8a29ebf33d30b44142df8ea659e3c01c348cb18b295930099115bb459f9bd2be35 WHIRLPOOL d03f139bdcc34f01909a6638fb08052712d31e8d4d2e95315acfc736f22dd5fcd3c48ef2007c18b791d3b494620238fc8ff777fba73bfdbbe5ecbac35348f22a +EBUILD ytree-1.98-r1.ebuild 614 SHA256 cf30a42d2cf3862c854802fdac8b6f63ca69f8d7c00dc53862d058ebde051302 SHA512 79092576248bc55886b8116f054f554b5622006e7dc733b5296b692a82b98beeeeb1b6310ee47681476a411c4e18de5c65757d016be1f8e3d976b472cfa42641 WHIRLPOOL e4572d0c1c321f28a125d7b24ba8d645de802dc1e2af00ff925aa5d833dac41fc0136a0e5eb1ef09a327340ad88b653bf1c953d5521d3669e7fcfa8854241e43 EBUILD ytree-1.99_p1.ebuild 656 SHA256 e82df0638b50f8ceb07677916941dcdcebddd918f24750f4b28238525b384ddb SHA512 f947cad0e200d8577d366b312f001f12124b2cecbab286f4a1177cf2414b7524c5a3d3d940e96ce86eb11df16ad599dbd6117f2389600e42167aa7ee4f05035d WHIRLPOOL c8695782fd0b2e1097e5d7eebbf8dc748022dd03ebd05832f09e620a687e0ef859c67631c38937a79b37200b6a9bd05c131bf63600c2955bcad41195fac581df MISC ChangeLog 3191 SHA256 53a7d123e4753fec58c5a6775303f6296aeb69f35161384b488a4444e5c81e2f SHA512 5e253ee2ea6e95f5023a48df6f53b3a92c5670485ff37eab0197ae58c5240e79a910c075b85449878046c4ed251e66ded1554f29db903aa52296364e8fd3e375 WHIRLPOOL 2d15bae3e6e5b8339b82f76564d96d17a20eedd6d67184db50eb5db7a8b85aa900f51750266d0588ec7d4373c471d5a273e36e07fdbee2dc7253b7989f2bab7a MISC ChangeLog-2015 2704 SHA256 7d1e43dd28900440cafb5af941ccf597cfa1dd84167bf39fd1d721c085c75aac SHA512 b31f1e7116c7a6e52c54a39f738fd83043dcac5ab609b2a61c49af0bb29f0bf351d89b87945880775a87b15959dea33cf8f1b7f0a91134f50bdc45d19129440c WHIRLPOOL ca8b6af6b6ae5018acbe42d3c65759f92acd3126fb17767ac6eb4035f151df4d520df039b32b9f738a642a417cd37efd11df4abd16baa2cb4cfeaf75277181d0 diff --git a/app-misc/ytree/ytree-1.98-r1.ebuild b/app-misc/ytree/ytree-1.98-r1.ebuild index 51e78ae2b420..10efd7f568db 100644 --- a/app-misc/ytree/ytree-1.98-r1.ebuild +++ b/app-misc/ytree/ytree-1.98-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.han.de/~werner/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND=" @@ -21,10 +21,9 @@ DEPEND=" " RDEPEND="${DEPEND}" -src_prepare() { - default - epatch "${FILESDIR}"/${PN}-1.94-bindir.patch -} +PATCHES=( "${FILESDIR}"/${PN}-1.94-bindir.patch ) + +DOCS=( CHANGES README THANKS ytree.conf ) pkg_setup() { tc-export CC @@ -32,5 +31,5 @@ pkg_setup() { src_install() { emake DESTDIR="${D}usr" install - dodoc CHANGES README THANKS ytree.conf + einstalldocs } diff --git a/app-text/jabref-bin/Manifest b/app-text/jabref-bin/Manifest index 5103240ab2e9..91ab6323ab2e 100644 --- a/app-text/jabref-bin/Manifest +++ b/app-text/jabref-bin/Manifest @@ -7,6 +7,7 @@ DIST JabRef-3.3.jar 24456650 SHA256 4c81e72a8585c800a3d5728f15ed2db425a48e14f089 DIST JabRef-3.4.jar 24390719 SHA256 0dbe96ea837ce35a624ddad65458916dee2245b12985b8612ae18b42429735de SHA512 310993160888f31d0ad644b562a7f643abfca18c7c3479a7f24db5620ebbdc04f8285bbaa47f46964aab5b61308f337a334b05200214a1084e0def0c0d32f490 WHIRLPOOL bfaab04c205306d519af71e455228d810065047ef16913e3b309c79274fe084d7aa88f865774d511dbf7d6bfee9bde536817a29bb15743876b6b777df86fd888 DIST JabRef-3.6.jar 25421252 SHA256 85792b7c7200b7a371e5fbcb4f996d63a0ab1963d3bc976f1b8670e7788f0e90 SHA512 756f02fe76b9d04c6a6db149d8f9c6a3365be0922e2bd2af9fba0dd7bc88bbda7ce7843e862e295fc58c1d8c0c95c0d5dee88f024ce51405f09159c308880237 WHIRLPOOL 31dd53db79d850a2892d6092064765026f856dbc4035e8461e6a0950acb6ec79d471165c38cbe93a9c1692403585b000becacafaa74c5aa3021b15ed2bca3d5f DIST JabRef-3.7.jar 36702576 SHA256 1475552e2956b7a94cbab7b6c8671fc391be0d42cfa1ece3aed75dd0a8c1ecf3 SHA512 74ed9fcfa3e6e4a3facf588d8fa2d73374137d9796ba79aa9c97df6807348af5f5ca9b8670e8909d06847f8501c9a344e300172be444be9b2bd773cd4d6314c4 WHIRLPOOL e482b83bdb7209a802868309cd27dc55f4e645b60a32b27f41cca05d4fb823e65ace0012fe80e9cb706337e8b867a28964680c683892d2508160c021890e9f97 +DIST JabRef-3.8.1.jar 36739725 SHA256 8fa5f317a8be62c714dff6d88e3aa3fea5c3b6b1e59f20a221b87d72aa775a85 SHA512 9241fb586da7bc6047dc6eb6e5b31800003bf31d6262033b54629e0c81856b56234a5c671ce7ab87d3b7332a70551c81c2275354e97607ad9f513686c5826780 WHIRLPOOL 90e692b9559b123c4a36694e3e1216ea207650c6073bed57ac9a7d45b27a53f409970a87c818b5129b7a53c7d936cc24570a8762fdec4bf31bf8c37e06567ea1 DIST JabRef-3.8.jar 36714920 SHA256 13bcfd10ab3d2dbe21dfad06ecf4dbf1cd08e4e1fe6a6a93293d844b4c5c3a98 SHA512 15805d06c7a566b60c28035e0f9a1d525b68774395a618e43ed7fdcc053d21e61f5930c658155d2e4ff739821789f2f988ce6e9a5502bd5536ce0a672ee19854 WHIRLPOOL 289997ea41ea77f774034a32b08bb07739b8dc86e69892c611b38d7728d87936a0738d0fde1ccb7bac49b0960659c057093aff4ddb08583a8f788b19d5b2e0e6 EBUILD jabref-bin-2.10.ebuild 610 SHA256 07b0a8101db8615cbdf9701d9a1e4839e2b4ceac85e906c67d62a123b7b1f57d SHA512 5eda7291cd53b8546816b7c9ddd651ef21b4ea437071eb534a8677a8055af2c69939c1daf8a59f8c6f8fd8c025772e26e9a04e458db3c6250797bb1509954b5d WHIRLPOOL 5149c32ff941459fdfc4a1aa019f2d36713fac915a04512619a54df9d703c05b254c1ca21fd2d0a9772f4b88220425a6a36a3d8205d3dbd4acb4eab242805d86 EBUILD jabref-bin-2.11.1.ebuild 835 SHA256 c7c4dde11a787f6eb013a99895de9232da7dc28baca177f25b5cd4340d6ef466 SHA512 470c5946524f6641ea224a4aac826cf30861d657db0e74f856bc9091ee3191fc9f55683c07320ecfe6865da737eb48d72c3b906abbe6f5e273ef8fa7977e2ac6 WHIRLPOOL 2a64b152a17d4e3bd98c21960b38a460a90d7b96da8ce3017f65813cd479ccd478c66a2cd9898d9645ab65490a3edf9bd8d399b7a27886d33a86839af188f773 @@ -17,7 +18,8 @@ EBUILD jabref-bin-3.3.ebuild 869 SHA256 aeef06b40feafcb7dc4444bfb1ae8ca24ce11b96 EBUILD jabref-bin-3.4.ebuild 872 SHA256 dcbab4efba73b933256c18cc8c2517cac017d5f8788fd2e244c6552be54d99bc SHA512 e836b68cb6aa46e73c4638a988f622a0e09d93a698f51b2ed62e8ab40e19f53bc71832e78168592070b294c542031ebc1f545ed5506c24e38740dc1b3dab2806 WHIRLPOOL ec9e945577a34777fded56c1b47c4286e2263b0b25c92431757d06ffc1d364e1cf18a0a171db94d4648f5ca3aa3ea8343e3f74f969ea71f46de931f7b135db45 EBUILD jabref-bin-3.6.ebuild 873 SHA256 e9ffa2d81f9ac13b500a8ec351a1c63f2a8c111ba2265ac3b674b0054d2d7a73 SHA512 a6875dcc81f8a37f2cacfb0eb3be7002bb0276087f4cf080de8756244744651e94448d8f16e819c9addfb417c800d22ee27debc7cd92360ba9ce556d056acd8d WHIRLPOOL 277bf8a5a5c58500c25cfe510ca0777fcbe888bc5b121de89ee00afd0a6ad0158a6656d26a835cfe8248f34065208da4c4b210e983189d1ab413859a5a0ca140 EBUILD jabref-bin-3.7.ebuild 872 SHA256 2bb2d86c198a8fd6890708f074fc13cb9348b116c2e5627f6fe4219915de63c5 SHA512 6cf5287dbc2dca92289d5d964151eb52bc82a0d0f7ef4a4a3e6dc1580c4b11a02018d3c5707f35c932e71adcf55eb3ce44add2ce8e99a84666083c017244f215 WHIRLPOOL a8dc8a7454cb16c4aee51a0bb92623594127a89b153409c1469559b0489987074c1efce85020859bc72763c197be0d8659c162f7554bbd9951b54e2af62734f9 +EBUILD jabref-bin-3.8.1.ebuild 958 SHA256 7208ef1c688a20b9a3f154435b52ba4ac1be0a96e459acd306e1c19ee5b1d8b7 SHA512 85a579503c2ae4dd40ebfd42de2fa69368d3f7b2196e4b2714e0eb95b021f1eff0ec8d0b5b7abea5ac35f99ba381b0956389bcf202e372cbdca4498c2e6c4d00 WHIRLPOOL 8b9194259548a8c4ab7b9697f38069ae2ea07855a82f783734993efda73e0841ae99306b78c4b2cf50629a17733a8953a441d356e755e5dbc99fc07c74185617 EBUILD jabref-bin-3.8.ebuild 963 SHA256 bb1a79a9ec947a6f50c700f2ff3052b1244a66fd720b829fa9dfb994acf12f0d SHA512 f77c7574054524c2549dd3ccf6c61d8a41be45a363836d894e673d94e35e439c16200f9b742afd35a8dae9264d8d05291319ea3e894f74713f9e3eabe2f8d072 WHIRLPOOL 93732c34785d8536df56b7e73d22e416552dd7ad3dbf59e34cb2581185ae162ef217b14fa2c85ad650108f0f60b1a81bf32700a1b22a3206dd422eb3931d80b3 MISC ChangeLog 6179 SHA256 2ded29d71e74422e71644639b0552a2ad2b16e5f865b917bfbcb3e39f6e4b56a SHA512 0e72d7494e5cc56699ec4dc63b3ee40c4c2aa4fd0351828b99fe1b3003e0e8326c92313154863918c38f48b02b9abfab12cb659cadacdb0bd86b380501ede9f5 WHIRLPOOL 2ab3b0307abc8e378644dfedf72c5314b9a46ef05b30460459acff798c50903dc402ae62f1307298ded3fc2d54d858014a36183cb4af5466b6a241312af000b4 MISC ChangeLog-2015 1106 SHA256 ee587b34ef9ffa585089c57bbd8dfb4c51b50dffb590d4982a1a126ec04cfb5d SHA512 2855bd32273bdc948e20052168b52da82376a47c077a49fd6f7733e747660f690019b6b74a191c4eb5f7d77997ef66a38f8b38ee2095024c23cb5498f4c2b412 WHIRLPOOL f16c439fce25a059db2d30f4e88b70b224b5cb0faef0b35b161a54dd07dd4ce95e3b0576c54cf0258e7af85e24da791b553d8243c9bbc6924679a8e003ee7d78 -MISC metadata.xml 856 SHA256 2ccc751950693d00c8da5a2ef1d33b7c962ac74359b6996b75ce8a432192e710 SHA512 2b9a6053109faf6886e72b4cd6866c47ef9c41e1c93dc4022e4173969c2dcb6de60b3626ad2169309a26cb5ac697435b01d2f60c3a51bab1b5137930193ca8cc WHIRLPOOL ae61ba3e64ce7d7432dd8d694e43b354df555f754d2d263e90a1ad23e43dcec77d506b8c59c39a17ab58448364489639632d78532e71848a1f41f2ee6f002cdf +MISC metadata.xml 858 SHA256 3667cd675912fada70c4ab9f6d550be268d7123f7b321a7fa545f45060d9012d SHA512 58f64088c2841364ea4bf6730d4b93e2d065a24912095cb9bbef7d506d37e72372039b5e7504e9889a7e27d81221d8f4127b7d147594a4265ac28d410338e2a6 WHIRLPOOL f9cd58d7fe613de91595128cfe9e77adc30caa03a6c3b610bc2c618aaf031c59e187cb66fbb00412e91a2b12ed32c844f637a67548514aab594be3f5d8b56eeb diff --git a/app-text/jabref-bin/jabref-bin-3.8.1.ebuild b/app-text/jabref-bin/jabref-bin-3.8.1.ebuild new file mode 100644 index 000000000000..a4e2b5729851 --- /dev/null +++ b/app-text/jabref-bin/jabref-bin-3.8.1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils java-pkg-2 + +MY_PV_1="${PV/_beta/b}" +MY_PV="${MY_PV_1/_rc/}" +MY_URI_PV_1="${PV/rc/}" +MY_URI_PV="${MY_URI_PV_1//_/%20}" + +DESCRIPTION="Java GUI for managing BibTeX and other bibliographies" +HOMEPAGE="http://www.jabref.org/" +# SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar" +SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="app-arch/unzip" + +RDEPEND=">=virtual/jre-1.8" + +S="${WORKDIR}" + +src_unpack() { + cp -v "${DISTDIR}/${A}" . || die + unzip ${A} images/icons/JabRef-icon-48.png || die +} + +src_install() { + java-pkg_newjar "JabRef-${MY_PV}.jar" + java-pkg_dolauncher "${PN}" --jar "${PN}.jar" + newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png + make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office +} diff --git a/app-text/jabref-bin/metadata.xml b/app-text/jabref-bin/metadata.xml index e9e49dece42a..172dffe5497c 100644 --- a/app-text/jabref-bin/metadata.xml +++ b/app-text/jabref-bin/metadata.xml @@ -20,7 +20,7 @@ jabref - https://github.com/JabRef/jabref/blob/v3.8/CHANGELOG.md + https://github.com/JabRef/jabref/blob/master/CHANGELOG.md http://help.jabref.org/ diff --git a/app-text/libebook/Manifest b/app-text/libebook/Manifest index 12bd422b1a9a..5858c71a634c 100644 --- a/app-text/libebook/Manifest +++ b/app-text/libebook/Manifest @@ -1,6 +1,7 @@ AUX libebook-0.1.2-boost-1.59-makefile.patch 335 SHA256 37220b3816187d3148c4dcc9ff6b126be6647b3aa57a1bf14665e583002085a6 SHA512 fe435d531d0b4646d8642dfa471352519e3e606b31c3fe727ebbd1ebecdeef58663aadbd7ae95ac902055074b550b659c7eb5cc981a078315462da9a892abe43 WHIRLPOOL 8ad328c223802fcba88b1a4daac19e1f8ffc6930fd32d3ae0233fea3c4538b924150ad054d696f93123e4fecb78374701bf8807863ecd7394683083ec9ee6a5d +AUX libebook-0.1.2-tests.patch 784 SHA256 d57cf762cffac8eca76b278332ae57fc1b060fd0cdb70aff1fd492560573ef38 SHA512 e176746ed85e0564332b7ed6e375f0869931e7f489d734dc1ecbd685af595ce1247f933a82736c239df322d57505c40cd23af434db711b8087ee77e26de2c1ad WHIRLPOOL b436b7efaf3d43ca494a890a773139280788aa0cca1cda71e27623455e0f121a7f561b6c4cc392538e58209c1cf7c7192613e0a6a01139100ca9558bd176ec03 DIST libe-book-0.1.2.tar.bz2 465922 SHA256 b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850 SHA512 82982874f9c0f5e400166e9367a4b6017cf11bbd69e2e79240137385a5d68ddea08f13676f8c5d0e983f441de17cda9f4b5f7c90c5cb3515e319de638edf3a38 WHIRLPOOL 068e8ed47ea5ad231c47d8848157db6c0bdd03425f87f181c2b3ce23c8006a9d7e6848d9dee960d3ad0fd5dbc24f8e7a4d15249056a0ae58debbb653d10a8228 -EBUILD libebook-0.1.2-r1.ebuild 989 SHA256 11b748b51a62d899ba16f91e62f268f3ffdd7bdad614d255a9b5bf54252005a9 SHA512 c7fe7bb34213df8ac83b6a95b71bee6b60834e6b2e615acd270219f4875da456d0f4c6b85b325e962a1bc14bbe9e6712cd2a2b34f16cf3e8dfdf491f1e2c0b34 WHIRLPOOL 6ef788e544cb790734c37dbfbc3a0555bf8b671037a8938b6f727413faeff3839cece4e22b411cbba518e9f0b56cd52ffca936daafb7cce0617c78b4eeb8a4eb +EBUILD libebook-0.1.2-r1.ebuild 1022 SHA256 e209b10d4bfe6a70136ce26eed36252f45e8f1bc667b37025d3b41fea92722d2 SHA512 5dfe1c53dd8061dba8562473baafe90eec04286ef8c3b32379832d14c186f87a6c3048fae17c8f886fb74abf679799bbb7c1953f0fcdc844d46cf18bff1be321 WHIRLPOOL 0eca1726287c76bd7f2f5852e9e2022a43c8acb628fb4545e1d113c02854ae80acb36c612451c60b9217d0efa12cb67498463749dce3e4d07ea9492fe1b55c9f MISC ChangeLog 3846 SHA256 c081f18240b0cf40c80712ab591cea0b1cce2b028748563178cd23df5a0a0bea SHA512 abed11bee4f32fbd0e4fe136ae11e9e54b8280850a45b487daacbd48a64870377f1d382454c2023e7a5072945310e07313ef297bbcea3b6e54844c1a69b3ab67 WHIRLPOOL 6019e40f4fc48477eb419aa0a37953dd4b312fa2f01a957492be9c34a31d1393ff63e8abb26f4581429672a6e8bf3c6aa6260a3c6c7bd27fcd1813869fcea43f MISC ChangeLog-2015 1690 SHA256 4638521243736b69681fb65f65199aa43493885c908ef5c871c9b5fed12b3e63 SHA512 f3392683e4424553ab7ed27fdc1338bb69ab8dcf4591f9490bff97902a102a1ea5abb6290adfdb1a004dd84e26b61eac6551d15e9b774186117bca84a4c2ea4d WHIRLPOOL 85175b19fb57765484ecf9a472ba270f0cb1c577be1609a5fca086d7893d9ee9fe1cb28a49630c50870ac70a5d965f0ad04d7708e130d9e84486a554706fa111 MISC metadata.xml 404 SHA256 78d0db7664597969309b877588ff861f3b50f5d4cc3fb2b2b803b2b2b1e86114 SHA512 8e0679b60d1fd56fcb165fd7b5a8e1367f4ee472d7a58e157e6bb1445b502b1fee56b18d099837dcabaa35f7b18f52515cbb51f7bfe9c4c2a824210e4003a275 WHIRLPOOL bc437183142cbb27819aa0088f6f0ffd7b240cf77e0e6faae7429ab92c9fd47b50ecd1e39aac64d7b80743497c89497a3b7d1385b3105ba7a9d65fd66a72d752 diff --git a/app-text/libebook/files/libebook-0.1.2-tests.patch b/app-text/libebook/files/libebook-0.1.2-tests.patch new file mode 100644 index 000000000000..624051a757aa --- /dev/null +++ b/app-text/libebook/files/libebook-0.1.2-tests.patch @@ -0,0 +1,27 @@ +From 263d95ce191421a51d4b2d088297700032a8987b Mon Sep 17 00:00:00 2001 +From: eroen +Date: Mon, 19 Dec 2016 19:53:15 +0100 +Subject: [PATCH] Check for librevenge-stream if tests are enabled + +X-Gentoo-Bug: 603098 +X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=603098 +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 6e00ed5..ecbd14b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -357,6 +357,8 @@ AS_IF([test "x$with_tools" = "xyes"],[ + PKG_CHECK_MODULES([REVENGE_GENERATORS],[ + librevenge-generators-0.0 + ]) ++]) ++AS_IF([test "x$with_tools" = "xyes" || test "x$enable_tests" = "xyes"],[ + PKG_CHECK_MODULES([REVENGE_STREAM],[ + librevenge-stream-0.0 + ]) +-- +2.11.0 + diff --git a/app-text/libebook/libebook-0.1.2-r1.ebuild b/app-text/libebook/libebook-0.1.2-r1.ebuild index 53db1d633613..deaff8a86be0 100644 --- a/app-text/libebook/libebook-0.1.2-r1.ebuild +++ b/app-text/libebook/libebook-0.1.2-r1.ebuild @@ -35,7 +35,10 @@ RDEPEND="${RDEPEND}" S="${WORKDIR}/${MY_P}" -PATCHES=( "${FILESDIR}/${P}-boost-1.59-makefile.patch" ) +PATCHES=( + "${FILESDIR}/${P}-boost-1.59-makefile.patch" + "${FILESDIR}/${P}-tests.patch" +) src_prepare() { default diff --git a/app-text/logmerge/Manifest b/app-text/logmerge/Manifest index ddbb38a1f6a8..e4eaa2554403 100644 --- a/app-text/logmerge/Manifest +++ b/app-text/logmerge/Manifest @@ -1,5 +1,5 @@ -DIST logmerge-0.4-beta.zip 2270 SHA256 9e17f0a52608b83e882d65ca759520a623fad94dd09b780a32ce440ead4e4be5 SHA512 314b2ffc1f07fe32f17ac2f20861abbf8e43b635fded83ba096ee8b99858e219026b86926c5d3ed693fe1f6e1edd96fd69a2a71dedb7cb63da0aae816a945720 WHIRLPOOL eacd5c4f7d3bbb319271a04269c82d541fdfd8018ca909d2560bc83894131f631838ccc30e7e833f871c795d5184db0710dc23006d5ea0610964834866760525 -EBUILD logmerge-0.4_beta.ebuild 517 SHA256 4304aa66dc7afe5d90d1b8e65a84b6cb06f091b5181cfc578d2d9eab419bbd44 SHA512 9bdff4d0d716555b3d14711c9206f6db9fb8c29f5b0401457b450ea16d513d162c8a634f67fdb91c42556cbbe414b59cf61d21f9942c535a6680cc9d816b118d WHIRLPOOL 77fc4a687ad796a2a7a37fae366ac57665e5b89144b030e712ea6d1478cc07b45ec8d8b884d5c6b0cdc135490bb94612a0c585d7f03c1878e8d85aeffe159750 +DIST logmerge-0.5.2b.tar.gz 3407 SHA256 f24fe4f6f1c2cb543012e1be360a02eeb9119a1cb2ccc0afe7b5d8edc7ebfdf8 SHA512 9185d52c62d2ea68fee0e1c6fa798cda60b4a2b621436f5060d7c9b3e5b15363fdb1c9fb40351f66dc48173498f3b18035c46fcf58fa3063bad0008b9bb5946f WHIRLPOOL ea469ca6dbf5e51e1ddc98988510f094bac9c69a79e12799399bd7d07b586d2a7269fb6d91fa5e97c9007ecc5d4bca69a7c36af975bd4f787f57fac5991c2866 +EBUILD logmerge-0.5.2b.ebuild 457 SHA256 23bb1aee29db59407870a8250dd8449a735b02bc3e91959445f8878e414656af SHA512 c3d557e1743181b7e063427bac8ba1660dcf8dcc0279ec6a9981fdb7df88d45737ae8196cac8e5ce8a08e040513f08506beeae3285d6ffa049e359b0ecd9282c WHIRLPOOL 1d26146d46b3fda4ed4bc3468ea8a244fab1e118cb81021042dbef17555087c14de9acc4def128254da6e81eff6ab337a44d62a5a50db08d03cc7eed37f670e9 MISC ChangeLog 2850 SHA256 c25df6ce0bc7628eb9bcd06cd6c406c8b564d9ae0801fd3b08d3a40a8a4228c4 SHA512 c5dc48220eb7b87fef8bdf3c3626129d6900eb91af8e8f77c434263c046e4e8d4d72077e86ed8d5c16bcdd43eda77ad963ab47d42c319a61f1d1286dff36509a WHIRLPOOL 8eeef777dafee6321059a5ce6ca98f9a90d02ca7acec426758bfe5ff995a38a3a2f0c581bfd0632b482ad76b39a12532a79008a28bfc23a8e6b2ad5b0709e5fb MISC ChangeLog-2015 786 SHA256 ef13aed14ec11af2a66bcb9ddd1f5aff46346577404644944a0efb5ae0e331c8 SHA512 f99d1a30e5f93c20dbc44f2c92e16806112c92feb829ab6e4378fd321e0ee2f1114d671d9f7a89df565700d403534c904265b6932879db9a82e71e8528954208 WHIRLPOOL cc3df89c26db1cabde213e9ef013678a7dd5bfd6b46b2967cda401ec34c883fccbd762425877998f9b1ccf3c121d3fe2a62f9dd7c2388f92832f716392144f3e MISC metadata.xml 404 SHA256 dcbcb9d9dbd7ebf50b4abe0dc7682889581f3445112434d2983377f4456a74fd SHA512 f35a08d3fc5d52a61e91ec28c1b15cb1fbaec77f1a5652b4cc44d7f12b675526111349f3b96519d705b42d2198ab545d81fbfc8c4fdd56e4a3ee11346dd85d24 WHIRLPOOL fe515171a2a9c95fe43fdd59d09de88146d267f0d4aeacaf303957ea038b410f14ee3efbba1a0ba4e2a0a3e4b6f4b55704e3f2da7d9fc4923b629609d5c9da08 diff --git a/app-text/logmerge/logmerge-0.4_beta.ebuild b/app-text/logmerge/logmerge-0.4_beta.ebuild deleted file mode 100644 index 024b2d0f7b29..000000000000 --- a/app-text/logmerge/logmerge-0.4_beta.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -MY_PV="${PV/_/-}" -DESCRIPTION="Merge multiple logs such that multilined entries appear in chronological order without breaks" -HOMEPAGE="https://github.com/ildar-shaimordanov/logmerge" -SRC_URI="https://${PN}.googlecode.com/files/${PN}-${MY_PV}.zip" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -S="${WORKDIR}" - -DEPEND="app-arch/unzip" -RDEPEND="dev-lang/perl" - -src_install() { - dobin ${PN} -} diff --git a/app-text/logmerge/logmerge-0.5.2b.ebuild b/app-text/logmerge/logmerge-0.5.2b.ebuild new file mode 100644 index 000000000000..ad066c606fda --- /dev/null +++ b/app-text/logmerge/logmerge-0.5.2b.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +DESCRIPTION="Small and powerful script to merge two or more logfiles" +HOMEPAGE="https://github.com/ildar-shaimordanov/logmerge" +SRC_URI="https://github.com/ildar-shaimordanov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="dev-lang/perl" + +src_install() { + default + dobin ${PN} +} diff --git a/dev-embedded/mcu8051ide/Manifest b/dev-embedded/mcu8051ide/Manifest new file mode 100644 index 000000000000..1fd83e4d11e7 --- /dev/null +++ b/dev-embedded/mcu8051ide/Manifest @@ -0,0 +1,3 @@ +DIST mcu8051ide-1.4.10.tar.gz 5928583 SHA256 8b9d282b8921ae3d064cc60c2c2a0eb0584ed3c2feb024f96bbf4c39493e85c4 SHA512 686c2b7054475aa38bbbe73ef745303141f038e2d6eca86d548317c130febb6b12d7c0e0737a9b15d2c3f4890bcd0238fffae030c689f8367f3b54821ab52866 WHIRLPOOL ee9b70949378f292a368c778b4240365a44217e338f8d28b262b33c2ac33784c8ae45c04a208e324e100ea3c7edc3703fe710b297d5bfee97d095797f360ac64 +EBUILD mcu8051ide-1.4.10.ebuild 805 SHA256 f6b634e830ce84c6c0fae02035dbac0884ec8c5b2c64bfb05a7a345f5f0a3d8d SHA512 d4ca6c1b4df9814184e2b5be9d1185dc1bace2bd85a404983c9954fa1f099e45b9294d9f2dcadbe2b8829730cd5e173522123c267643d1b526c6fc78a8a66d12 WHIRLPOOL e146f423495426618247d39d83167a330174227199e650435e98fc7f2422c7cc379b85bf4861f581a6e415cd36e955a4be8c80f4e42d14d565d0e28f26203417 +MISC metadata.xml 393 SHA256 60362dae60651cfc664059375ede2bda7e8f9e645e29bbd7d0c43e929ce72194 SHA512 e9e7445c6d80b7569e188151007f9110a8b322c54b71b059b78073f47c4937c7e5f3b21e24709ae894d167e9012f0c2f4516848a5e0c18012a92c21827e612d2 WHIRLPOOL 5589a60d5f4b78c3a09f8e33ff482e94ce89385ff431e3a3aedc80036375c45a57f35c4f9b7bc58a7703eb1ab532a65887aafb7dd621b923b494d3db8992f98f diff --git a/dev-embedded/mcu8051ide/mcu8051ide-1.4.10.ebuild b/dev-embedded/mcu8051ide/mcu8051ide-1.4.10.ebuild new file mode 100644 index 000000000000..2eea3c603afd --- /dev/null +++ b/dev-embedded/mcu8051ide/mcu8051ide-1.4.10.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +inherit cmake-utils + +DESCRIPTION="Graphical IDE for microcontrollers based on 8051." +HOMEPAGE="http://www.moravia-microsystems.com/mcu-8051-ide/" +SRC_URI="http://www.moravia-microsystems.com/download/${PN}/${PN}/${PV}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64" + +# The doxygen dependency is suspect, but it appears to be used at runtime. +RDEPEND=">=dev-embedded/sdcc-2.5[mcs51] + >=app-doc/doxygen-1.7 + >=dev-util/indent-2.2 + >=app-text/hunspell-1.3 + >=dev-tcltk/bwidget-1.8 + >dev-tcltk/itcl-3.3 + >=dev-lang/tcl-8.5.9:* + >=dev-tcltk/tdom-0.8 + >=dev-tcltk/tcllib-1.11 + >=dev-lang/tk-8.5.9:* + >=dev-tcltk/tkimg-1.4 + >=dev-tcltk/tclx-8.4" +DEPEND="${RDEPEND}" diff --git a/dev-embedded/mcu8051ide/metadata.xml b/dev-embedded/mcu8051ide/metadata.xml new file mode 100644 index 000000000000..2b85317c5087 --- /dev/null +++ b/dev-embedded/mcu8051ide/metadata.xml @@ -0,0 +1,14 @@ + + + + + flameeyes@gentoo.org + + + + + martin.osmera@gmail.com + Martin Osmera + + + diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest index 0e911c071209..7093f5aba97a 100644 --- a/dev-haskell/cabal/Manifest +++ b/dev-haskell/cabal/Manifest @@ -1,12 +1,8 @@ -DIST Cabal-1.14.0.tar.gz 276517 SHA256 72540a9db8b329121b7815ef207098f4b394f76d11d154d36baf54054327abe4 SHA512 6e31f44cfafd44e1e3987ed0b116a52e12495228cb1de89e9f4ded8dbc06a0d1537bf647c4576c606d623b7d58d10367d243258b500b8c8329db6c48afd9eee3 WHIRLPOOL 22225d5923bc454e2fa24bcc9fe845b07c41c56ea67f45a0815597f0dffc4d60027117d38bdd1eccd4e61cd24d682bd8b3f4026cfaf62481712234fc9cea5321 -DIST Cabal-1.16.0.3.tar.gz 284665 SHA256 ef27629d540e46c77cabac08c008583abee4e4a04ed5a5ecb1a84725dbc39f86 SHA512 7dd365c44b5ea489fcc990e0deca8ffcfdd6b867a35b85b422fc0fe9e3c70739df393cacf425575e5e4977729ef875eb0737aaa13a0f20cfaff9d22b39027a85 WHIRLPOOL 84fbe4c41c14377685c89a93b79e03920d19e65c3c8c51a4ef590bfb8ad331e1ae85d224c1cd820e90262a579131c823510a2e62f4566d452af8e67d5cf26be2 DIST Cabal-1.18.1.2.tar.gz 323545 SHA256 594ef792c085f00f06728dad0a02dd63450b49b5ac394484be6c6a0a484b6f5d SHA512 a91abbdb86bcb7a47e871e9b9a2cb4720b41f2cf6998416cc557460ff821e9b711cf8c346bf16c7b07c180815cb901f7b27e5cda3701f3ace554613ceb27e3c6 WHIRLPOOL cfc3872b944ce5209ebc0429e5561ba3fd5ddecf1256aa47e8d4968727bd3498a6dd23f6417161e7a570259728e6f66098d045d7d7b4c7e87f721c5b2edf0f73 DIST Cabal-1.18.1.3.tar.gz 705715 SHA256 25c436290dd9d05b588b6b002f0357302a9b0bf8c2630b8b069c300d803335d4 SHA512 3c6f2d3be36384140007ca1146edcca5461bf0e93cde8d2b32bd9d69f74df51975bfbc91ec7cce92d9c78929f91f9e7e8b595488bc1c328dbed313a6fcd76708 WHIRLPOOL 4679e7e0f6b9f1a887f3bbc9bdd5eccfac0bed8d62fd13cb516a51b7e8d1efe2d654c78fd38207a9678152629f60ff2528080a6fb857e7a05dd349f7c3f5f417 DIST Cabal-1.18.1.5.tar.gz 706722 SHA256 2a5f14599e390e4ed6fc78ad05e16792a671bd5c5b479c6834aa1a000ff45237 SHA512 a5bb21bcb0a95f22572a1d6d4338415bf00eab9b77c2fb4775c81f7554d282fea9160646687bd903197cb5d429f0fcd28b30b577a8915ec92740a91fa13c68ef WHIRLPOOL de3dc78ba6f99107746c75cedbdefd5661dea773cff5362ec73695b1de3ed247f0e034551da5fa39e46084ed81ee6fabbba1907f199a12c4599d66db2f7fb974 DIST Cabal-1.20.0.2.tar.gz 717941 SHA256 234d2299bcf580f727cd3fa649448ff84b304d1f270e3b6836f8e2211d11bf02 SHA512 6dfe30ebe5859ccd934f76fc32bd4757d89e3bcb02a528bebaa0a63f22c0494eb4a941b2fed2e004671875586fed113860e82413bed99f70be565f4f343ac3d3 WHIRLPOOL 38ccfaded54fb86bedca33dd48742f06763b6b7dc89444dac6846102dec27fe61acefef3b1f0a3e4053751e88f79ab523e89264f070eddc999ca9810b47cce9b DIST Cabal-1.22.8.0.tar.gz 405552 SHA256 2a42a2ddecb6450f87ed3a2b37af81dcc573dfde8f0db16f695c78674a80a34e SHA512 3666e8a66751ea8ae93109c1e33c2909c00c65ddcd77458c41303481e06ebd7230215e12c133cc2fca47ba352c61411ff72ca0994b6d45b5987156bce2fbcdf3 WHIRLPOOL 33b409ac997a1ef18f395a03707ee7dc7c1cfe8cf155f10d7116267e0502c733bf4a0c0b5de9a7075b364855cf3b8151af245b34cfb1f717191fb199328544f3 -EBUILD cabal-1.14.0.ebuild 1167 SHA256 fe458bb3be9827915eb0c1eca7f727c65a6cc3b95d84d7224857c5fcccd00948 SHA512 2473c964af61dd0bf2e4758a1315d67a7aa2964ad889524eeff8e31d7344f63da5c9535f99f2839a99ed21a024ae0acbb6e62d9069e08b2ca1cb94ca20d42157 WHIRLPOOL 7891a8d2eedfecce63c08b22b851b2f10c10baeb53fbbcc08eeb43bb03b6fab4065199e875f06fb864a36058d868fd4767e80f4c9c0c415e9e22ad5d1648ab38 -EBUILD cabal-1.16.0.3.ebuild 1337 SHA256 e90c6e708ed281baae845ab4d8516be46531bf4096bf6a4a66d052e2d9263c17 SHA512 6ad4c7b9c4caf3170d6db538798e223e615da6e9e83948fce08838cafc11b7c6a95ede5be80565fbe3083d4073f27e43b57e3900fb59a51bb0580b6b2e1457b8 WHIRLPOOL b3148082ac399e59f6eacb681fdeae715a5c8fd96cf3a3486749d7ae98cbfdead5bddd85868df55abedd24a7455fb29947de33774c077a853641c96f3dd207b8 EBUILD cabal-1.18.1.2.ebuild 1330 SHA256 514fec3075bfc4c9636033800f3c144b05213ce971f9e15253eba45dbbd07486 SHA512 f73fae181c785fba2086efe8bf5a931d628d0c1693483ddc19ac6c9250e5efdba2e9bc659a4f0d207b7d0c2a96b1e1be18fde0c3bf84857d708025006f5f14b8 WHIRLPOOL da4cdfd47f7e1955ee9b6cfa3b5cf4e4af1f446b1b74bfd3a7073e32ee5fd68875a0ff298478c58d08486a7bd6010140d28315490f53a0d042caa666294a3374 EBUILD cabal-1.18.1.3.ebuild 1509 SHA256 ed9deb41bfa0ae0baba2a6da2bd358140a4cabe2784c35868898c6329be0a9df SHA512 ddf11038b688602332f0e639522930588bf6083f358cce8baeed178972fb151ef287d0be9095677094db9e84c4c2e13c0f56527fe59ea774ac935d2bf5a2014b WHIRLPOOL f97e3b9ad00759c6e72dde2165073d691f8b9a4c662ab29daabd7bd3f30e3f2d76dbb5ba0800e51fa64bf1c09fa184e902c351952aae71e5ea8a7df392aabc35 EBUILD cabal-1.18.1.5.ebuild 1524 SHA256 532b27b218c4dbd3ba2723b3983f9f17bb856d987442052999e41ec1a06d95cd SHA512 e89ae915e6ed2e86e4558b50cfe0f020e9a90fb4f7d9d6c34c38e679563d7743437f8a97f07f8de97e44ab059060894304cce48d48f60439e7cf517b0fc3c1cc WHIRLPOOL c7ef77ec5f145c8584ab68bc86b3af749a27f51e270f9af9df2f53a3b0fd5c1cd96612718a4a0dffca4712f0c55dac9c0d9b80add249641ca99e7ebc0dde05c9 diff --git a/dev-haskell/cabal/cabal-1.14.0.ebuild b/dev-haskell/cabal/cabal-1.14.0.ebuild deleted file mode 100644 index 1bdf7c3ad40f..000000000000 --- a/dev-haskell/cabal/cabal-1.14.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# ebuild generated by hackport 0.2.12 - -EAPI="4" - -CABAL_FEATURES="bootstrap lib profile" -inherit haskell-cabal eutils versionator - -MY_PN="Cabal" -MY_PV=$(get_version_component_range '1-3') -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A framework for packaging Haskell software" -HOMEPAGE="http://www.haskell.org/cabal/" -SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="doc" - -RESTRICT="test" # avoid circular deps - -DEPEND=">=dev-lang/ghc-6.10.1 - [] -- AlexError _ -> error "lexical error" -+ AlexError _ -> [] - AlexSkip inp' _ -> go inp' sc - AlexToken inp'@(pos',_,_) len act -> act pos (take len str) sc (\sc -> go inp' sc) dflags - ---- haddock-2.10.0-orig/dist/build/haddock/haddock-tmp/Haddock/Lex.hs 2012-03-04 03:21:21.000000000 +1100 -+++ haddock-2.10.0/dist/build/haddock/haddock-tmp/Haddock/Lex.hs 2012-05-30 22:23:40.209770708 +1000 -@@ -131,7 +131,7 @@ - go inp@(pos, _, str) sc = - case alexScan inp sc of - AlexEOF -> [] -- AlexError _ -> error "lexical error" -+ AlexError _ -> [] - AlexSkip inp' _ -> go inp' sc - AlexToken inp'@(pos',_,_) len act -> act pos (take len str) sc (\sc -> go inp' sc) dflags - diff --git a/dev-haskell/haddock/files/haddock-2.10.0-drop-tools.patch b/dev-haskell/haddock/files/haddock-2.10.0-drop-tools.patch deleted file mode 100644 index f7f7f4a3ee1e..000000000000 --- a/dev-haskell/haddock/files/haddock-2.10.0-drop-tools.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/haddock.cabal b/haddock.cabal -index 84d3c2a..9587450 100644 ---- a/haddock.cabal -+++ b/haddock.cabal -@@ -78,10 +78,6 @@ flag test - - executable haddock - default-language: Haskell2010 -- -- In a GHC tree - in particular, in a source tarball - we don't -- -- require alex or happy -- if !flag(in-ghc-tree) -- build-tools: alex >= 2.3, happy >= 1.18 - build-depends: - base >= 4.3 && < 4.6, - filepath, -@@ -140,10 +136,6 @@ executable haddock - - library - default-language: Haskell2010 -- -- In a GHC tree - in particular, in a source tarball - we don't -- -- require alex or happy -- if !flag(in-ghc-tree) -- build-tools: alex >= 2.3, happy >= 1.18 - build-depends: - base >= 4.3 && < 4.6, - filepath, diff --git a/dev-haskell/haddock/files/haddock-2.10.0-ticket-202.patch b/dev-haskell/haddock/files/haddock-2.10.0-ticket-202.patch deleted file mode 100644 index 744609006da7..000000000000 --- a/dev-haskell/haddock/files/haddock-2.10.0-ticket-202.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- haddock-2.10.0-orig/src/Haddock/Interface/Create.hs 2012-03-04 03:21:18.000000000 +1100 -+++ haddock-2.10.0/src/Haddock/Interface/Create.hs 2012-06-27 00:05:37.874840635 +1000 -@@ -35,6 +35,7 @@ - import Name - import Bag - import RdrName (GlobalRdrEnv) -+import TcRnTypes - - - -- | Use a 'TypecheckedModule' to produce an 'Interface'. -@@ -50,6 +51,8 @@ - instances = modInfoInstances mi - exportedNames = modInfoExports mi - -+ (TcGblEnv {tcg_rdr_env = gre}, _) = tm_internals_ tm -+ - -- The renamed source should always be available to us, but it's best - -- to be on the safe side. - (group_, mayExports, mayDocHeader) <- -@@ -59,10 +62,6 @@ - return (emptyRnGroup, Nothing, Nothing) - Just (x, _, y, z) -> return (x, y, z) - -- -- The pattern-match should not fail, because createInterface is only -- -- done on loaded modules. -- Just gre <- liftGhcToErrMsgGhc $ lookupLoadedHomeModuleGRE (moduleName mdl) -- - opts0 <- liftErrMsg $ mkDocOpts (haddockOptions dflags) flags mdl - let opts - | Flag_IgnoreAllExports `elem` flags = OptIgnoreExports : opts0 diff --git a/dev-haskell/haddock/files/haddock-2.13.1-drop-tools.patch b/dev-haskell/haddock/files/haddock-2.13.1-drop-tools.patch deleted file mode 100644 index f8e4365674c4..000000000000 --- a/dev-haskell/haddock/files/haddock-2.13.1-drop-tools.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- haddock-2.13.1-orig/haddock.cabal 2012-10-11 21:56:14.000000000 +1100 -+++ haddock-2.13.1/haddock.cabal 2012-10-11 22:21:37.594323046 +1100 -@@ -108,10 +108,6 @@ - - library - default-language: Haskell2010 -- -- In a GHC tree - in particular, in a source tarball - we don't -- -- require alex or happy -- if !flag(in-ghc-tree) -- build-tools: alex >= 2.3, happy >= 1.18 - build-depends: - base >= 4.3 && < 4.7, - filepath, diff --git a/dev-haskell/haddock/files/haddock-2.13.1-renameType.patch b/dev-haskell/haddock/files/haddock-2.13.1-renameType.patch deleted file mode 100644 index 1a4abab0cbe9..000000000000 --- a/dev-haskell/haddock/files/haddock-2.13.1-renameType.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- haddock-2.13.1-orig/src/Haddock/Interface/Rename.hs 2012-10-11 21:56:13.000000000 +1100 -+++ haddock-2.13.1/src/Haddock/Interface/Rename.hs 2013-01-04 10:55:06.725718923 +1100 -@@ -271,9 +271,20 @@ - - HsTyLit x -> return (HsTyLit x) - -+ HsWrapTy a b -> HsWrapTy a <$> renameType b -+ HsRecTy a -> HsRecTy <$> mapM renameConDeclFieldField a -+ HsCoreTy a -> pure (HsCoreTy a) -+ HsExplicitListTy a b -> HsExplicitListTy a <$> mapM renameLType b -+ HsExplicitTupleTy a b -> HsExplicitTupleTy a <$> mapM renameLType b -+ HsQuasiQuoteTy a -> HsQuasiQuoteTy <$> renameHsQuasiQuote a -+ HsSpliceTy _ _ _ -> error "renameType: HsSpliceTy" -+ - _ -> error "renameType" - - -+renameHsQuasiQuote :: HsQuasiQuote Name -> RnM (HsQuasiQuote DocName) -+renameHsQuasiQuote (HsQuasiQuote a b c) = HsQuasiQuote <$> rename a <*> pure b <*> pure c -+ - renameLTyVarBndrs :: LHsTyVarBndrs Name -> RnM (LHsTyVarBndrs DocName) - renameLTyVarBndrs (HsQTvs { hsq_kvs = _, hsq_tvs = tvs }) - = do { tvs' <- mapM renameLTyVarBndr tvs -@@ -398,22 +409,25 @@ - return (decl { con_name = lname', con_qvars = ltyvars', con_cxt = lcontext' - , con_details = details', con_res = restype', con_doc = mbldoc' }) - where -- renameDetails (RecCon fields) = return . RecCon =<< mapM renameField fields -+ renameDetails (RecCon fields) = return . RecCon =<< mapM renameConDeclFieldField fields - renameDetails (PrefixCon ps) = return . PrefixCon =<< mapM renameLType ps - renameDetails (InfixCon a b) = do - a' <- renameLType a - b' <- renameLType b - return (InfixCon a' b') - -- renameField (ConDeclField name t doc) = do -- name' <- renameL name -- t' <- renameLType t -- doc' <- mapM renameLDocHsSyn doc -- return (ConDeclField name' t' doc') -- - renameResType (ResTyH98) = return ResTyH98 - renameResType (ResTyGADT t) = return . ResTyGADT =<< renameLType t - -+ -+renameConDeclFieldField :: ConDeclField Name -> RnM (ConDeclField DocName) -+renameConDeclFieldField (ConDeclField name t doc) = do -+ name' <- renameL name -+ t' <- renameLType t -+ doc' <- mapM renameLDocHsSyn doc -+ return (ConDeclField name' t' doc') -+ -+ - renameSig :: Sig Name -> RnM (Sig DocName) - renameSig sig = case sig of - TypeSig lnames ltype -> do diff --git a/dev-haskell/haddock/haddock-2.10.0-r2.ebuild b/dev-haskell/haddock/haddock-2.10.0-r2.ebuild deleted file mode 100644 index d3524d6832f8..000000000000 --- a/dev-haskell/haddock/haddock-2.10.0-r2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep" -inherit eutils haskell-cabal pax-utils - -DESCRIPTION="A documentation-generation tool for Haskell libraries" -HOMEPAGE="http://www.haskell.org/haddock/" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -# ia64 lost as we don't have ghc-7 there yet -# ppc64 needs to be rekeyworded due to xhtml not being keyworded -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" -IUSE="" - -RDEPEND="dev-haskell/ghc-paths[profile?] - =dev-haskell/xhtml-3000.2*[profile?] - >=dev-lang/ghc-7.4" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.14" - -RESTRICT="test" # avoid depends on QC - -CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts" - -src_prepare() { - # we would like to avoid happy and alex depends - epatch "${FILESDIR}"/${P}-drop-tools.patch - # http://www.mail-archive.com/cvs-ghc@haskell.org/msg37186.html - epatch "${FILESDIR}"/${P}-dont-crash-on-unicode-strings-in-doc-comments.patch - # http://trac.haskell.org/haddock/ticket/202 fixed by upstream in ghc-7.4 - # branch only (fix is not in master branch on 20120626) - epatch "${FILESDIR}/${P}-ticket-202.patch" - - for f in Lex Parse; do - rm "src/Haddock/$f."* - mv "dist/build/haddock/haddock-tmp/Haddock/$f.hs" src/Haddock/ - done -} - -src_configure() { - # create a fake haddock executable. it'll set the right version to cabal - # configure, but will eventually get overwritten in src_compile by - # the real executable. - local exe="${S}/dist/build/haddock/haddock" - mkdir -p $(dirname "${exe}") - echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}" - chmod +x "${exe}" - - # we use 'nocabaldep' to use ghc's bundled Cabal - # as external one is likely to break our haddock - # (known to work on 1.16.0 and breaks on 1.16.0.1!) - haskell-cabal_src_configure \ - --with-haddock="${exe}" \ - --constraint="Cabal == $(cabal-version)" -} - -src_compile() { - # when building the (recursive..) haddock docs, change the datadir to the - # current directory, as we're using haddock inplace even if it's built to be - # installed into the system first. - haddock_datadir="${S}" haskell-cabal_src_compile -} - -src_install() { - cabal_src_install - # haddock uses GHC-api to process TH source. - # TH requires GHCi which needs mmap('rwx') (bug #299709) - pax-mark -m "${D}/usr/bin/${PN}" -} diff --git a/dev-haskell/haddock/haddock-2.13.1-r2.ebuild b/dev-haskell/haddock/haddock-2.13.1-r2.ebuild deleted file mode 100644 index 8979b4f0d0d3..000000000000 --- a/dev-haskell/haddock/haddock-2.13.1-r2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep" -inherit eutils haskell-cabal pax-utils - -DESCRIPTION="A documentation-generation tool for Haskell libraries" -HOMEPAGE="http://www.haskell.org/haddock/" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -# ia64 lost as we don't have ghc-7 there yet -# ppc64 needs to be rekeyworded due to xhtml not being keyworded -KEYWORDS="~alpha ~amd64 -ia64 ~ppc ~sparc ~x86 ~x86-fbsd" -IUSE="" - -RDEPEND="dev-haskell/ghc-paths:=[profile?] - =dev-haskell/xhtml-3000.2*:=[profile?] - >=dev-lang/ghc-7.6:= =dev-haskell/cabal-1.14" - -RESTRICT="test" # avoid depends on QC - -CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts" - -src_prepare() { - # we would like to avoid happy and alex depends - epatch "${FILESDIR}"/${PN}-2.13.1-drop-tools.patch - # Fix: Ticket #213 Haddock fails when advanced typesystem features are used - epatch "${FILESDIR}"/${PN}-2.13.1-renameType.patch -} - -src_configure() { - # create a fake haddock executable. it'll set the right version to cabal - # configure, but will eventually get overwritten in src_compile by - # the real executable. - local exe="${S}/dist/build/haddock/haddock" - mkdir -p $(dirname "${exe}") - echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}" - chmod +x "${exe}" - - # we use 'nocabaldep' to use ghc's bundled Cabal - # as external one is likely to break our haddock - # (known to work on 1.16.0 and breaks on 1.16.0.1!) - haskell-cabal_src_configure \ - --with-haddock="${exe}" \ - --constraint="Cabal == $(cabal-version)" -} - -src_compile() { - # when building the (recursive..) haddock docs, change the datadir to the - # current directory, as we're using haddock inplace even if it's built to be - # installed into the system first. - haddock_datadir="${S}" haskell-cabal_src_compile -} - -src_install() { - cabal_src_install - # haddock uses GHC-api to process TH source. - # TH requires GHCi which needs mmap('rwx') (bug #299709) - pax-mark -m "${D}/usr/bin/${PN}" -} diff --git a/dev-haskell/haddock/haddock-2.13.2-r1.ebuild b/dev-haskell/haddock/haddock-2.13.2-r1.ebuild deleted file mode 100644 index 23279a44173b..000000000000 --- a/dev-haskell/haddock/haddock-2.13.2-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep" -inherit eutils haskell-cabal pax-utils - -DESCRIPTION="A documentation-generation tool for Haskell libraries" -HOMEPAGE="http://www.haskell.org/haddock/" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz - https://dev.gentoo.org/~qnikst/patches/dev-haskell-${PN}/${P}-pregenerated-files.patch - " - -LICENSE="BSD" -SLOT="0/${PV}" -# ia64 lost as we don't have ghc-7 there yet -# ppc64 needs to be rekeyworded due to xhtml not being keyworded -# x86-fbsd is lost due xhtml -KEYWORDS="amd64 -ia64 x86" -IUSE="" - -RDEPEND="dev-haskell/ghc-paths:=[profile?] - =dev-haskell/xhtml-3000.2*:=[profile?] - >=dev-lang/ghc-7.6:= =dev-haskell/cabal-1.14" - -RESTRICT="test" # avoid depends on QC - -CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts" - -src_prepare() { - # we would like to avoid happy and alex depends - epatch "${DISTDIR}"/${P}-pregenerated-files.patch - epatch "${FILESDIR}"/${PN}-2.13.1-drop-tools.patch - # Fix: Ticket #213 Haddock fails when advanced typesystem features are used - # epatch "${FILESDIR}"/${PN}-2.13.1-renameType.patch - if use doc && [ ! -e "${S}/html" ]; then - ln -s "${S}/resources/html" "${S}/html" || die "Could not create symbolic link ${S}/html" - fi -} - -src_configure() { - # create a fake haddock executable. it'll set the right version to cabal - # configure, but will eventually get overwritten in src_compile by - # the real executable. - local exe="${S}/dist/build/haddock/haddock" - mkdir -p $(dirname "${exe}") - echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}" - chmod +x "${exe}" - - # we use 'nocabaldep' to use ghc's bundled Cabal - # as external one is likely to break our haddock - # (known to work on 1.16.0 and breaks on 1.16.0.1!) - haskell-cabal_src_configure \ - --with-haddock="${exe}" \ - --constraint="Cabal == $(cabal-version)" -} - -src_compile() { - # when building the (recursive..) haddock docs, change the datadir to the - # current directory, as we're using haddock inplace even if it's built to be - # installed into the system first. - haddock_datadir="${S}" haskell-cabal_src_compile -} - -src_install() { - cabal_src_install - # haddock uses GHC-api to process TH source. - # TH requires GHCi which needs mmap('rwx') (bug #299709) - pax-mark -m "${D}/usr/bin/${PN}" -} diff --git a/dev-haskell/haddock/haddock-2.13.2.1.ebuild b/dev-haskell/haddock/haddock-2.13.2.1.ebuild deleted file mode 100644 index 860799ca84d6..000000000000 --- a/dev-haskell/haddock/haddock-2.13.2.1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep test-suite" -inherit eutils haskell-cabal pax-utils - -DESCRIPTION="A documentation-generation tool for Haskell libraries" -HOMEPAGE="http://www.haskell.org/haddock/" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -# ia64 lost as we don't have ghc-7 there yet -# ppc64 needs to be rekeyworded due to xhtml not being keyworded -# x86-fbsd is lost due xhtml -KEYWORDS="~amd64 -ia64 ~x86" -IUSE="" - -RDEPEND="dev-haskell/ghc-paths:=[profile?] - =dev-haskell/xhtml-3000.2*:=[profile?] - >=dev-lang/ghc-7.6:= =dev-haskell/cabal-1.14" - -CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts" - -src_prepare() { - # we would like to avoid happy and alex depends - epatch "${FILESDIR}"/${PN}-2.13.1-drop-tools.patch - # pick pregenerated files - for f in Lex Parse; do - rm "src/Haddock/$f."* || die - mv "dist/build/haddock/haddock-tmp/Haddock/$f.hs" src/Haddock/ || die - done - rm -r "dist/build/"* || die - - # Fix: Ticket #213 Haddock fails when advanced typesystem features are used - # epatch "${FILESDIR}"/${PN}-2.13.1-renameType.patch - if [[ ! -e "${S}/html" ]]; then - ln -s resources/html "${S}/html" || die "Could not create symbolic link ${S}/html" - fi -} - -src_configure() { - # create a fake haddock executable. it'll set the right version to cabal - # configure, but will eventually get overwritten in src_compile by - # the real executable. - local exe="${S}/dist/build/haddock/haddock" - mkdir -p $(dirname "${exe}") - echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}" - chmod +x "${exe}" - - # we use 'nocabaldep' to use ghc's bundled Cabal - # as external one is likely to break our haddock - # (known to work on 1.16.0 and breaks on 1.16.0.1!) - haskell-cabal_src_configure \ - --with-haddock="${exe}" \ - --constraint="Cabal == $(cabal-version)" -} - -src_compile() { - # when building the (recursive..) haddock docs, change the datadir to the - # current directory, as we're using haddock inplace even if it's built to be - # installed into the system first. - haddock_datadir="${S}" haskell-cabal_src_compile -} - -src_install() { - cabal_src_install - # haddock uses GHC-api to process TH source. - # TH requires GHCi which needs mmap('rwx') (bug #299709) - pax-mark -m "${D}/usr/bin/${PN}" -} diff --git a/dev-haskell/haddock/haddock-2.13.2.ebuild b/dev-haskell/haddock/haddock-2.13.2.ebuild deleted file mode 100644 index ade1581a50fc..000000000000 --- a/dev-haskell/haddock/haddock-2.13.2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep" -inherit eutils haskell-cabal pax-utils - -DESCRIPTION="A documentation-generation tool for Haskell libraries" -HOMEPAGE="http://www.haskell.org/haddock/" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -# ia64 lost as we don't have ghc-7 there yet -# ppc64 needs to be rekeyworded due to xhtml not being keyworded -# x86-fbsd is lost due xhtml -KEYWORDS="~amd64 -ia64 ~x86" -IUSE="" - -RDEPEND="dev-haskell/ghc-paths:=[profile?] - =dev-haskell/xhtml-3000.2*:=[profile?] - >=dev-lang/ghc-7.6:= =dev-haskell/cabal-1.14" - -RESTRICT="test" # avoid depends on QC - -CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts" - -src_prepare() { - # we would like to avoid happy and alex depends - epatch "${FILESDIR}"/${PN}-2.13.1-drop-tools.patch - # Fix: Ticket #213 Haddock fails when advanced typesystem features are used - # epatch "${FILESDIR}"/${PN}-2.13.1-renameType.patch - if use doc && [ ! -e "${S}/html" ]; then - ln -s "${S}/resources/html" "${S}/html" || die "Could not create symbolic link ${S}/html" - fi -} - -src_configure() { - # create a fake haddock executable. it'll set the right version to cabal - # configure, but will eventually get overwritten in src_compile by - # the real executable. - local exe="${S}/dist/build/haddock/haddock" - mkdir -p $(dirname "${exe}") - echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}" - chmod +x "${exe}" - - # we use 'nocabaldep' to use ghc's bundled Cabal - # as external one is likely to break our haddock - # (known to work on 1.16.0 and breaks on 1.16.0.1!) - haskell-cabal_src_configure \ - --with-haddock="${exe}" \ - --constraint="Cabal == $(cabal-version)" -} - -src_compile() { - # when building the (recursive..) haddock docs, change the datadir to the - # current directory, as we're using haddock inplace even if it's built to be - # installed into the system first. - haddock_datadir="${S}" haskell-cabal_src_compile -} - -src_install() { - cabal_src_install - # haddock uses GHC-api to process TH source. - # TH requires GHCi which needs mmap('rwx') (bug #299709) - pax-mark -m "${D}/usr/bin/${PN}" -} diff --git a/dev-haskell/vector/Manifest b/dev-haskell/vector/Manifest index b72e9611af6d..606daff07237 100644 --- a/dev-haskell/vector/Manifest +++ b/dev-haskell/vector/Manifest @@ -1,6 +1,4 @@ -DIST vector-0.10.0.1.tar.gz 102426 SHA256 ece945058b01a77c5fff31e89bbea76ac619677041c41286a2da5e8b515508af SHA512 2595bee97295a62471de26748c0b598f40a9c5a75571e645c24a8f2bc4eef1d7a3e29d576e7ba9a9dca0fb071f0c178a5a3757e063219d1cf25d8c484e645754 WHIRLPOOL 24617c62582a4eb490e263dc69289e4b24ad18ab6dc6191b3fff52bbcb816cfda9d909c6a62b388daa1f7dd68d7bc9318d1c7618ff7a1a3db0b9cd631cc0ae4b DIST vector-0.10.12.3.tar.gz 103617 SHA256 0f765ce0238d89ffdb67656a364f7bf5012d68de9642da6bb2a425b61f88e89a SHA512 2b2c98f1fbaaf4f5e7243e18a08e373e85acb06dddf73a48d34b966bfd736efc72880babec9c47859bd8d6d6928a28ac9acd9134eb0ef61b2f88fa31bf18811b WHIRLPOOL b572031197f4992ad322c0d47843dbe20dc48372c0e3d1d53a6a0fe03a0c0c3d8f99ce7f13994bb5f5998bb8e9ee1fc225a67b15e63421484a8c371aebec5021 -EBUILD vector-0.10.0.1.ebuild 1150 SHA256 3286c943c35302365b8895108348b37916ac13ae2b56a29e4b2ed4851e711854 SHA512 81b68459cccf5cc4b20316eb3109aebe7e90292cb897a04f464e02d4dd5a2710410a2612d83c6f57a909fd10e101b2afde736f3c90d7452059e3cc0cb1c665a8 WHIRLPOOL ab28ac494528d01c9974baf6adccb160dc3b87c615e0f9c28869c40a6f7605ba89a85d532ffac4af5c8eda7063dc2d30e020983fa5c8b87ebc179491334434f3 EBUILD vector-0.10.12.3.ebuild 1612 SHA256 4d6d155901368d8a1320c01f88f76d72474aab4c8ba950fa87fcd2fa90681bce SHA512 9c3c4f4ca795ffd9957f3d35b9cb8395b76f278584eefb50f44db964f736ea9ecbeac828857dbe7b5310714a99cd727b3cf060ca0485f01f24f7e9236af7d3b9 WHIRLPOOL a21ff2af82307ead6af624bbcab6e77572903bbac52c26e77de4c770f3162401a1ae9bbf3b963f6835279d8df54380068911be035b2916c6d8a374e0bb0a9221 MISC ChangeLog 2665 SHA256 93b605d54e73871db0b269362186536e18c4b0e41817b08517147a12541671ce SHA512 476d5d16f912ed175d73064096c14ac530ee4b6a53a948326acde765be733519f6f4407ff6d6a4f17ad9a2bbe32e4e54efefa23788b93ce71fa4420b24cf5ded WHIRLPOOL 12e349446f185e2cbb24469d4504a4434369e735816fd4b9770e850ce45be090d99d7e81c2659f58059fc0330d981270ab2a6b732fd3e83d4215b595eb867db3 MISC ChangeLog-2015 3918 SHA256 b5e28a9f6c175a863e7b92064a04102d957d5774a631149ed75bc0fb5ce1665b SHA512 f73dde5c4e0954e1a12b7adfd31ee3ecdb0a4ce9b5c81a9df589ce2c71cefa9b11da479b4e22754755499e853f25485b1591313a3a70e8746027f8db58de0190 WHIRLPOOL 3330df681d7afa15d23318248a71f833221721e77581a8164c53bfbaa928f1becb1439a0184177d5d3a1268ca21beb6bc4fb03279411c070b198330e87b054b6 diff --git a/dev-haskell/vector/vector-0.10.0.1.ebuild b/dev-haskell/vector/vector-0.10.0.1.ebuild deleted file mode 100644 index 790626a2e2db..000000000000 --- a/dev-haskell/vector/vector-0.10.0.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# ebuild generated by hackport 0.3.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="Efficient Arrays" -HOMEPAGE="http://code.haskell.org/vector" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="" - -RDEPEND=">=dev-haskell/primitive-0.5.0.1:=[profile?] =dev-lang/ghc-6.12.3:= =dev-lang/ghc-7.6.1 ) -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.2.3" - -src_prepare() { - local can_spec_const="yes" - - ghc-supports-interpreter || can_spec_const="no" - - # ghci-less GHC can't do ANN #482960 - if [[ ${can_spec_const} == "no" ]]; then - einfo "Disabling 'ForceSpecConstr' due to bug #482960" - sed -e 's/{-# ANN type SPEC ForceSpecConstr #-}/{- # ANN type SPEC ForceSpecConstr #-}/' \ - -i Data/Vector/Fusion/Stream/Monadic.hs || die - fi -} diff --git a/dev-java/sbt/Manifest b/dev-java/sbt/Manifest index 403eda24a950..86689c3023a0 100644 --- a/dev-java/sbt/Manifest +++ b/dev-java/sbt/Manifest @@ -7,16 +7,22 @@ DIST sbt-0.13.11-gentoo-binary.tar.bz2 144170371 SHA256 ca13e6d5751de14ac0fe3542 DIST sbt-0.13.11-ivy2-deps.tar.bz2 139796284 SHA256 d8ad25a99e1dd8ebbc29955844543a1cee8bbd845cca9bb4fa92b62c27673a29 SHA512 e431e00884dbf58ca911d64da726b41b8aeae9987ae2725705c9c45b4601162e45d310f933e4214cf8a4d21ba9e7207365d9ba352cbe1511ce09f59cd33da033 WHIRLPOOL b56ba91892ee2dbb1d9d9609ffd8417184e291fa8c03f8a115757301c412a8d141a17ae315ac916067bab5b49d74f16cb82da497c8790c212f3ccc068721e24f DIST sbt-0.13.11-sbt-deps.tar.bz2 38783848 SHA256 c2059a2513cbee50afe506d1fb0511b384df99757273d941b136e5bb3155ca7e SHA512 53020538eac11d6ae268436987d98093f017f421750496080908fad36eb9148a4cce41ab1a231ff1a35868c5c07cc8e338f1793fc91d044802b3e95b900e9cc8 WHIRLPOOL 0e4617b728536be9adfcf683b1575a522c5c0f073098c7f685003f0a340bfc4fff06031252016227b8af38f666296185815508b89bb7e82334276e55c707e16e DIST sbt-0.13.11-src.tar.bz2 35163092 SHA256 1b987725b4e57d6139b02c9d43b18d6ec43880681cccdfca3a29c803e79f6494 SHA512 95065c452fbbf2a206ad8d8518f083abe608e8bad1075848fa7a4ad797e8a10e4127823cdb8502f4d9bd0eb01867298af7d69895eb1470bf71deba354871dd86 WHIRLPOOL 652ba691ea2dccf6eb22ea2b43d9b96e15597cb8ce2325eacd912752a60854f982e1a6fec8c049e144042c10e98b888a66b3fe923c63447ef46e6582786e4a81 +DIST sbt-0.13.13-gentoo-binary.tar.xz 58011476 SHA256 5d24c07945c713e265e40634b5e4bf8ff34ecfed2e87df1f5f65e8d907b4a268 SHA512 9763b67ac4838e6ccac1848c17a03608bed61669671a10c93afc4c81d6dad06a3463ac4e4a9b7b3fb91325df5df6e0148847669d482e3cacf4fde957c110ccc1 WHIRLPOOL c1b30ccc325a11b9886de9c0d2ffcd71acd7b15a352faea20e7c8cd2ae0a2a7b7a933f7b795a417f6a64837912a2b287b5e3e91e1c428ce604c708c3549362f3 +DIST sbt-0.13.13-ivy2-deps.tar.xz 121677604 SHA256 71dc4487a7fb203750230fb7ddbda5b2b12dad6d1e9f2ed5d2bec36df962799b SHA512 3301447a563e9a83431bb67a6281a6045630669012f1cc5cdde7a2cbae3f7db75f87abed003ecf8243fd230e2adea2ba3666468358ae29c51e346940235f5ed5 WHIRLPOOL a6e66fb56e85b923142cf2fdb9867fe8f75200db01285c5e7f32f391573bf39c68be7f022f80eb679b15442c4425e87111878d0c93e8ddc0e7d4dca1f11eb909 +DIST sbt-0.13.13-sbt-deps.tar.xz 34750700 SHA256 a5897a610393c0d2004badbf82ebd40469f85f29b5d29f6a3d76b8ecfbe73776 SHA512 0bfd35a6926545da7340f7ee72e420121f2bb2f83d98d420b7f65b465d207b1b30a48788914e7b1fdf575a4fee870f2632b0717f1a7a2c19e2f2d5794d08b4da WHIRLPOOL 6b1b70b705ea613074a111e7a6cfbc2b31fd91645701f0018120ced4bd678c71e8a785922ece74111648d6ada89bfe714a4e95cb9b513fb409349967ed60d779 +DIST sbt-0.13.13-src.tar.xz 35911028 SHA256 1344e49fe870f755ab872f51368f9d939a0076e24c03bd1f7f600e10db8210be SHA512 351f18108a23014ee7ffd5c4713f390728fb98b742efdc139e094e64df7800f399d088600d245631635b0f6f4cb69c6cd327aafa3b0bf8a233fcbf0cb4ac5702 WHIRLPOOL 7998c7e95bd9c85c3b25a2c9ea584cab7651508e90e30304ede1744ca56d41d25b2b095e397c3af52025683e6cf3fb54b6992f438545f3fc8d5afc54308c33d2 DIST sbt-0.13.8-gentoo-binary.tar.bz2 1048674 SHA256 4a2b22c9d9fbe922d5a5336d88ca21f18b2545850fec16485c824aee43df53e1 SHA512 9a5707601387d604b746ea21145a3c7735dd4b6d36541111b47519b66e5abc929ecc96ff52e144ed39a3db947204a1956e19394a1848e3fd8904f9a98ec24816 WHIRLPOOL 4fb1bde15ab57260a25b0a4a1634122af2e2b9d6cd35d3a9c693d9bba6c398bee489f05bf29a763a60d7a04f54823bdd9fc54ec5a2809900b28f890930649fc7 DIST sbt-0.13.8-ivy2-deps.tar.bz2 124672043 SHA256 565ba7434316a3ab2f61f58b4bc57317e5c2ae7c9ee95061c39cfddd5767a355 SHA512 47b2f235b7d5883086f8246265e9081a50dcdaede43550a1c0de1c85a9ebf24b47e1331b662aa5c0faebaf22a37849ffb2c1f25a7592c461e62f582984ad4b70 WHIRLPOOL f92b2cd087d51f0ae31d5ac93d1dca7214ace6df8c06b050287007f05697e81ac14758368730e6df45043ba80167b9581e636b0364d5ba3a5c7352fafd7e5007 DIST sbt-0.13.8-sbt-deps.tar.bz2 88352931 SHA256 d0eab3858f389e201277d1ead68352172830b17dd8343f09e0e63e4880a5e20e SHA512 a6e886f5f18821c26df28a2e8cf2773b4841854fc1bd4dfa43924089966020da5affd635da96a8e13efc7c06be6a5bf53697ca91f5fbf41efcdf8dda00e8428d WHIRLPOOL 54744676b33b11ffb350b5a543986efd5cd629594ce4bac5154a78df233619a92a2a4842659acf9c15533e764d24333183372f136b3b1f7463bbe55347c41b8f DIST sbt-0.13.8-src.tar.bz2 32766054 SHA256 5225864c54e5718dc68cfcd554a7215bd028947d61ed9522e2ad9d0a19cbdd83 SHA512 f6c834c6294c957e8d5b89a3a616f23a980cca1f882695d09a6e0080d1013227ba3bac86942b39c13e49fb6ac9fb72c3478df24ec8549b8b9812ea352932fff8 WHIRLPOOL 5054578505fe35b6c5f269c72b921920cf232a1efed18da5cd1833457d46f4e4342988be46539001b4dcfcfc6c807785915f4d0791af939dc83018ffcc03effe DIST sbt-0.13.8-test-deps.tar.bz2 40704285 SHA256 7cb252d69b5868905e0592df7ef9a83ce09f75cb10a72bc9dcd649286bb524a3 SHA512 a79ea9c81abc436168f04f674ffef4fee6f7c7a5dede5a3060e2e2bd9a9863dd5f1c7b31c02f3823fb5a67b2bb43c44d306efb59468f625e4db277cface47cd0 WHIRLPOOL 268ea150c5ca2fe1988317e0616262de814e2aa7213f64b99baf389c3e67e2093a04765ac27f08bd585fe33c77d9dd8c7a0ba8d3bd77d937d9a7260dab72c23a DIST sbt-launch-0.13.11.jar 1210231 SHA256 c63ade35a7a7aa0d8e3bdc7c2353ce79b045083cfabf6bc6fab88584f6100bc1 SHA512 9db3d3e953e4246b09ce2265b76463b6000c6d1c9d1328eb0deb1b67e9c955816ef67f6aeaeca22dc46e27cc71ba833545ab39c5351b8230609c021ca9e818b9 WHIRLPOOL 6650144da7aef195779c4d23c594fee9c7f79e7b2758bb2c98c83732f75656b0143ec73023a98677201502a813c0e37bbec48cebbc6fe520484ec6bd53fb4019 +DIST sbt-launch-0.13.13.jar 1210231 SHA256 9cd7d56eabfb15b5fe68c39116c4cfe6379b5b260d63086d4f5c69fa62521c13 SHA512 78e7ce21c610e83a532b04491e13d53b4193205328adce473252d523fe0ca0f3892dba900f01ff6e28d94a17c3ba1ebbe7d85fd6ce9900c48263bc4816da37ef WHIRLPOOL 20e0cd1bd836cee2b4aaee8af8d1e29812211dc5e9ecda4b058a64c26c607c7645285949751f84ea95e68cee2bfaa4cce14b14c2d602e40d9db967bf8a094217 DIST sbt-launch-0.13.7.jar 1208385 SHA256 6570bb03df6138ffaa7ac0bbe35eb4ea79062d1146b6929c75cf238d14dd9158 SHA512 ddc62dd85b552a7157ae0c19d0161d77a929adeb4ea81042a3a38c3d979e32674b9174aef47d458e9a7c8ea7942c08f1a7177b9bc739f7cd9e0484aef9915204 WHIRLPOOL 63841a401739aa3eab24632fcec41dc5c186502f4b80fe782106a0c6448b1da2321bf2a7a0b0f83473f7c073cce2ac8f5f85440d955acc191a73bd95200cb2cf DIST sbt-launch-0.13.9.jar 1210236 SHA256 4fddf384322c8aa02671ab89e229ab1e703613eee350e3af6c7790916d43f96d SHA512 c447e7be5b18689e4821dbde699fba230214a34059aa38441dcff13938d3cb351f1bd4266d99a2dcd40a80a7c623a14483755a461417750ab60635ab73c2fdde WHIRLPOOL 61806d9140b9b64b8a60f5f6a0e5d16bb6b16e643185b874780af0b3b32a9e62311d86e4a3fc3526735eb590a1a98f00881e60789c5b079521da660aea319171 EBUILD sbt-0.13.10_rc2.ebuild 5646 SHA256 a32718b09ff49f4575607d0bf00cb9f891bb2afcad4736cb121aed00aac50e44 SHA512 975a28c47cfd91527a78c636da6224ea759b8793587a09e680bd21d3a4941449a0e5d101b1c2fcc2cbabd4f2b87ce04a2ad9234c7ad2633a626dbbda17fed8b7 WHIRLPOOL cc2c72aea7eca27098f5dc9484fc9f928855bdd4bd86ebc060e2d7e8e9b62887a3bbef1b586b4c13bb7e696d31ec4f62c83490224bade0b0277e4d8e5e817de8 EBUILD sbt-0.13.11.ebuild 5731 SHA256 06bfb046b13c24f87aa5ee8d375812706805081b35f94a0dc78e6c9659055e07 SHA512 c48ded5ae4e3ba28dc11abad5f2190174ddf4dc87f1ffdbd8fd3389eb669405c4ebdd272aacaad16404841dd042b73ce25378ff8b9d6577b15bdb0c44a0d1c4d WHIRLPOOL 0027a0e28d8b473a9a202fe07c8927232e242ac7672c0837f113af9988f1731734f9e13f271b961466411fb30b7435e194ffa57c1684f123bfdc34e64fb500c9 +EBUILD sbt-0.13.13.ebuild 5729 SHA256 ba36c43ecfd7d772037cd298978fcea8e64561b32b496823cdd8e01b42e059e4 SHA512 ab0cce95653b169affc8458fe67bcafe74527093372d8e4003c867f54e3bf0166117b27e7835ba6046101aa94c8d82ab5786aa363890093b462184606bdb6ef3 WHIRLPOOL 8c1cd55cd8fe8ece0385bee52765a551bc27f4859bed4cee5b778567844c19a2ead679ae4d83caa2a805e6cd2175815c32cf331e16f47ce9c4ab1e13e187c4d8 EBUILD sbt-0.13.8-r1.ebuild 5210 SHA256 5f2654f1ab24071330d6bc7e19dc3b330fd56e879654278cc93dedfd54507d7a SHA512 310294023dc7851a5cd61fb3169bb4249f6f21880f4a1844840a3d9e5873e8d11fa8d95d1b4d12056aa89539bf1c69eb60f9b8637faffe0a1c0530a511d88d59 WHIRLPOOL 1caf8a7dd30ca3afff8ae09c8b48e6c0bd3c474307b86e1e330faef0e3335f6d19163328baa95a4c1865e9d24f65c887daa69cc9f31f4fd4c3f88fb98eb95f98 MISC ChangeLog 4113 SHA256 f281e266498997f6ce2cf0015ac400cee62c547489ad9caaceef3e801f34409b SHA512 195f7c790abfd59759080556fe9dc79258f902e5d7fc8210aa3813631aa2eab5c8d0d861a8a11fcce7303e4eb7fed09e9237cc67411815f6ad00b2bb4200a3c4 WHIRLPOOL 778b3082afc485d5712edbf2a0aeda9f1d7adf1f6e6b9bf5ed2498d64a43834b8252f4fdb0c808e76178dcd3bfbfd6bf96d691a8813ecf70dc52d56e59c02437 MISC ChangeLog-2015 738 SHA256 9e90757fa035dc535fa93e078bcfb9f76a730cb420f3c0a230b4575b0366c0bd SHA512 23b6ceaf069cf83a1634673d5636b7fca05a79a11e39d55e00f7c68efc80dae2fc1e3c0702a976bb18ef35aae49de99fed16defc14d4cd4fa0fc6a9d12385c94 WHIRLPOOL dd24694a3fb9d0ac63a064df400649ac0361de4ec8152026594b6641378f2e787d716a351011641b858d4a4ceec343856ed51ec2c548af5ffb616a5adf17de8a diff --git a/dev-java/sbt/sbt-0.13.13.ebuild b/dev-java/sbt/sbt-0.13.13.ebuild new file mode 100644 index 000000000000..a6753ad7194c --- /dev/null +++ b/dev-java/sbt/sbt-0.13.13.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +# repoman gives LIVEVCS.unmasked even with EGIT_COMMIT, so create snapshot +inherit eutils java-pkg-2 # git-r3 + +L_PN="sbt-launch" +L_P="${L_PN}-${PV}" + +SV="2.11" + +DESCRIPTION="sbt is a build tool for Scala and Java projects that aims to do the basics well" +HOMEPAGE="http://www.scala-sbt.org/" +EGIT_COMMIT="v${PV}" +EGIT_REPO_URI="https://github.com/sbt/sbt.git" +SRC_URI=" + !binary? ( + https://dev.gentoo.org/~gienah/snapshots/${P}-src.tar.xz + https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.xz + https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz + http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${PV}/${L_PN}.jar -> ${L_P}.jar + ) + binary? ( + https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz + )" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="binary" + +DEPEND=">=virtual/jdk-1.8 + >=dev-lang/scala-2.11.8:${SV}" +RDEPEND=">=virtual/jre-1.8 + >=dev-lang/scala-2.11.8:${SV}" + +# test hangs or fails +RESTRICT="test" + +JAVA_GENTOO_CLASSPATH="scala-${SV}" + +# Note: to bump sbt, some things to try are: +# 1. Create the sbt src snapshot: +# git clone https://github.com/sbt/sbt.git ${P} +# cd ${P} +# git checkout v${PV} +# cd .. +# XZ_OPT=-9 tar --owner=portage --group=portage \ +# -cJf /usr/portage/distfiles/${P}-src.tar.xz ${P} +# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.xz +# https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz and +# binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz ) +# from SRC_URI +# 3. Comment the sbt publishLocal line in src_compile. +# 4. try: +# FEATURES='noclean -test' emerge -v -1 dev-java/sbt +# It should fail in src_install since the sbt publishLocal is not done. +# Check if it downloads more stuff in +# src_compile to ${WORKDIR}/.ivy2 and ${WORKDIR}/.sbt. +# 5. If some of the downloads fail, it might be necessary to run the sbt compile +# again manually to obtain all the dependencies, if so: +# cd to ${S} +# export EROOT=/ +# export WORKDIR='/var/tmp/portage/dev-java/${P}/work' +# export SV="2.11" +# export L_P=${P} +# export PATH="/usr/share/scala-${SV}/bin:${WORKDIR}/${L_P}:${PATH}" +# sbt compile +# cd ${WORKDIR} +# find .ivy2 .sbt -uid 0 -exec chown portage:portage {} \; +# 6. cd ${WORKDIR} +# XZ_OPT=-9 tar --owner=portage --group=portage \ +# -cJf /usr/portage/distfiles/${P}-ivy2-deps.tar.xz .ivy2/cache +# XZ_OPT=-9 tar --owner=portage --group=portage \ +# -cJf /usr/portage/distfiles/${P}-sbt-deps.tar.xz .sbt +# Uncomment the sbt publishLocal line in src_compile. +# 7. It *might* download more dependencies for src_test, however the presence +# of some of these may cause the src_compile to fail. So download them +# seperately as root so we can identify the +# additional files. As root: +# cd ${S} +# ${S}/${P} test +# cd ${WORKDIR} +# XZ_OPT=-9 tar --owner=portage --group=portage \ +# -cJf /usr/portage/distfiles/${P}-test-deps.tar.xz \ +# $(find .ivy2/cache .sbt -uid 0 -type f -print) +# Note: It might not download anything in src_test, in which case +# ${P}-test-deps.tar.xz is not required. +# 8. Create the binary +# cd $WORDKIR +# XZ_OPT=-9 tar --owner=portage --group=portage \ +# -cJf /usr/portage/distfiles/${P}-gentoo-binary.tar.xz ${P} .ivy2/local +# 9. Undo the earlier temporary edits to the ebuild. + +src_unpack() { + # if ! use binary; then + # git-r3_src_unpack + # fi + # Unpack tar files only. + for f in ${A} ; do + [[ ${f} == *".tar."* ]] && unpack ${f} + done +} + +src_prepare() { + default + if ! use binary; then + mkdir "${WORKDIR}/${L_P}" || die + cp -p "${DISTDIR}/${L_P}.jar" "${WORKDIR}/${L_P}/${L_PN}.jar" || die + cat <<- EOF > "${WORKDIR}/${L_P}/sbt" + #!/bin/sh + SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled" + java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${WORKDIR}/${L_P}/sbt-launch.jar" "\$@" + EOF + cat <<- EOF > "${S}/${P}" + #!/bin/sh + SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled" + java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${S}/launch/target/sbt-launch.jar" "\$@" + EOF + chmod u+x "${WORKDIR}/${L_P}/sbt" "${S}/${P}" || die + sed -e "s@scalaVersion := scala210,@scalaVersion := scala${SV/./},\n scalaHome := Some(file(\"${EROOT}usr/share/scala-${SV}\")),@" \ + -i "${S}/build.sbt" || die + + # suppress this warning in build.log: + # [warn] Credentials file /var/tmp/portage/dev-java/${P}/work/.bintray/.credentials does not exist + mkdir -p "${WORKDIR}/.bintray" || die + cat <<- EOF > "${WORKDIR}/.bintray/.credentials" + realm = Bintray API Realm + host = api.bintray.com + user = + password = + EOF + fi +} + +src_compile() { + if ! use binary; then + export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${L_P}:${PATH}" + einfo "=== sbt compile ..." + "${WORKDIR}/${L_P}/sbt" -Dsbt.log.noformat=true compile || die + einfo "=== sbt publishLocal with jdk $(java-pkg_get-vm-version) ..." + cat <<- EOF | "${WORKDIR}/${L_P}/sbt" -Dsbt.log.noformat=true || die + set every javaVersionPrefix in javaVersionCheck := Some("$(java-pkg_get-vm-version)") + publishLocal + EOF + fi +} + +src_test() { + export PATH="${EROOT}usr/share/scala-${SV}/bin:${S}:${PATH}" + "${S}/${P}" -Dsbt.log.noformat=true test || die +} + +src_install() { + # Place sbt-launch.jar at the end of the CLASSPATH + java-pkg_dojar $(find "${WORKDIR}"/.ivy2/local -name \*.jar -print | grep -v sbt-launch.jar) \ + $(find "${WORKDIR}"/.ivy2/local -name sbt-launch.jar -print) + local ja="-Dsbt.version=${PV} -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled" + java-pkg_dolauncher sbt --jar sbt-launch.jar --java_args "${ja}" +} diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest index cda6f7c82f2d..24abd89157f6 100644 --- a/dev-lang/ghc/Manifest +++ b/dev-lang/ghc/Manifest @@ -1,46 +1,21 @@ AUX ghc-7.0.4-CHOST-prefix.patch 272 SHA256 83942dfcbe1968c7f5e0ae09e4d84d77d85778839814fca1689e168cad3a4f66 SHA512 e969478289c9bb99e24ce73acc8da866e2d2944405849fe10308999a386c57c2058037e142ab8c6548f1f4e01b7722efe4af9fa6c375f0988ff5a023bd2a96dc WHIRLPOOL a8ea4c41a895fab20c7db9bddec330d2a9192785d5a0b488dee622a8a739d37c187d5585f57d98c78379a1dea21dea7cf8f0c3a58dd1c44de2fcbdc11f732427 -AUX ghc-7.0.4-darwin8.patch 486 SHA256 b0857679f29aab3719df5538a2f104924cf5df913927a2748be3f77d2c8ea481 SHA512 9e3b5c36a85fe4dc63d0917639925b9edaa58363ad63e6bfd97adcddc5d5644ed0176bf019ffcbe8acf2487f014c29b9a5e51c8a83d58349a70bcdc3a7be2d07 WHIRLPOOL f2c8938e55fdd4ead4a472ecada906040242ecabeebbfbb8339d9b7d70cd2370f5e0eb057c3f96dfe07d48de42c409071e57f9dd663a5d03d827b465ef1719ad -AUX ghc-7.10.1-T10590-dequeue.patch 3649 SHA256 6fa50a39e616b4a688054e4019e6924f099d3540aeb0dbac353421aa1c575350 SHA512 308b96fe647f0ac00f0dd4a2e4e807ef812d426699a44cf9d1f73baaa1ce04c41b224b403accba2df6d8693a60db7a12acc0750a40e82f06512d5ac05cd6eda5 WHIRLPOOL a2babd06faa01dcce6a2a52055aa83f8a014a6d94f57340471aacc912ba4535573bf9b08c7b40572f3bb5a37a0783e79f912b3d6ff655297885b5c927997226f AUX ghc-7.10.1-rc3-ghc-7.10-bootstrap.patch 2648 SHA256 5a071e103187750f4945a66855558d908c08b6f1add70b9de0a28161e0f8fafd SHA512 ea2c9cd8fde754803950e29b2eea113227ca5504c58392847090e13640bdfa6b39ef714eff985947aa27e66c2506ef2a2867696f68a7ff34418a7fbf49765d48 WHIRLPOOL 2b45342e670df1a170a53246cdd5bb2de0692c2864154d8565515d122eb97c40a6eaa0d36c5c3c3776f1b9b8064e074257a326f12826572b1651f03038fda579 AUX ghc-7.10.3-hardfloat.patch 747 SHA256 338d86fa83460da1ec0504616509626022fe3930360dfd883edf4820a0dc8a7d SHA512 a9a186ff62236d63b4b841bcfb1da1a902b3f300eb7d768c5316b5d636190d58fc71177f2d1670df261d0b681b104621f98cfdd76b30a0fb6917525874759264 WHIRLPOOL 2b4753ea0962b4c7407e81b01f1c2c6e3bd7a0020535c21fd2d81853c0be77d5673fd7e0810ffd28c20a5f82294c4a57cec4bf8e9438587cab5fc06c4155068a AUX ghc-7.10.3-relnotes.patch 1584 SHA256 c0d9cf98b61f7326db6aff5b2c48826b99c0bab8ea2a48eacf818fc626f985c8 SHA512 20d61d9f73bd0efa39c920897bdb18b69cff453f5ab24193aa3f7fafa70a9aa346ab4402604f81471f989c2401ca28d901fb85b8862577790559a35cfa3d3f05 WHIRLPOOL 29133ebe027e6cfce91556f9b907cbb014af8bb282049efbc660f7e3028df1fc977a08d7919d7f69945f534ec82f75a4714dee5fe3d32374a49fdbb08450e8e4 -AUX ghc-7.2.1-freebsd-CHOST.patch 472 SHA256 f9538a6d3fc3e9023fa1647ccb05ac3f93cdc285c4e8cd2cb7fd5f53262dbabb SHA512 abb19147a6754c7b926c6f1320df5d623a78b6702a0337d18c1acf20734bd85e3b4116d4ad48f5314f1be1061b3d9f0e20c6714187fc7de7602c39bf5cb6b3ef WHIRLPOOL 68132b52542dc8f46a99e9684946520f7a438f523c947549d26d5f4753b13fac335525cc9cf68aad501c76b08caaea1807235fc25cff1a82d773b5c7ace6827f -AUX ghc-7.4-rc2-macos-prefix-respect-gcc.patch 776 SHA256 7ffcbfc1822408cf8ed17f2f35c192e56967fc1e83265764aa414b868b69f463 SHA512 9b1a6dcceb7872138c793d2fafcf47fc3dce02938378172b8c57ef8742b31a0458bcc349e469dab5effa10a66d3f2bf861f92edfa9da582edc2218e129a0d756 WHIRLPOOL 7181704e710f2c1c056a3820aea4bc70f5dd7e137f78d7b1bd22160af058fade843026dd72d70323df7f1c2c74148704f219e6e7dc77ab70f8fda9b43f28bcfd -AUX ghc-7.4.1-darwin-CHOST.patch 461 SHA256 0ab369e4f3dd0ffd15e9ea48a3b0e45350cae6831e58a82a1fbe0d745d0f7839 SHA512 ea8381354b703df86e91f73a0767078047876153748ec2a49c28ca102d3aac4ac39ee211c75e7eeffc16f60b31aee618ff6e581fb36a2e5151a179af154d78a1 WHIRLPOOL dbede3f9785947acfd46763f93a6f7672fbae971a23c5c7ae1935ff7e1576ac211399344a5aab442fb183a2c67e454f9c65dce9b0e572f3e57c54edaee0ffaf1 -AUX ghc-7.4.1-ticket-7339-fix-unaligned-unreg.patch 1035 SHA256 2a3915285a013c2373c4462b94a4c0be08c3694014cc80f011a8b8f8e332afe6 SHA512 f510f413dc6039baa620c2ec7a74f3e3e0d2c5b93515f64ad1a483dc3fe88305d0e048713fe91a9bc435d368fbdec0f188cfb5abb9a0965ca4336105f8177c79 WHIRLPOOL 30a9ffea8e0d5affbea6c4fff562791c54fe7bbd2b7e3aac6934b6bf054c85f940b0dd4d6a8a2bb8d6396c44af81d07247ffb542f6b00e1be02df8bf84645a45 -AUX ghc-7.4.2-system-libffi.patch 4348 SHA256 12c1c60401fcaed156aa67ff4a26fbcd9ea6089f75d5c6cf75fe90a6b640d028 SHA512 7999bdc8825d80713729931c6c6b183ddbc7e08f98fa381f0cbefc27777031dc2787f4ab2dbdc50d790beb1689ff74cc5626fcccef7bc43396e30296cf1d9820 WHIRLPOOL 6a2817edd83f1aac8aae11acadea32f24eb13948aea5f22de79cb9e1e217eb8e6a43ed778ff0c28e0d61c2006d6c8847098b1d975f23a112c0272feb856e5754 -AUX ghc-7.5.20120505-system-libffi.patch 3519 SHA256 817b7938720497dfa8706a058e50c34f09482989fcd042f9783c5d3c6b9d4dbd SHA512 fefa7c3de2912aab7f037a6ef1d3fc4e36cdc128f96079c12a22613efacc2474f805b10784f01cc81742df72d7041a6c24add2b107223d7680cbb83e26c7f1c7 WHIRLPOOL bdcc1fbf7d7ed93cee7b235eeab3e61da1468f573ff8bcf48aab8fb70df10e2c8376016c935e08135a43dc6ffe5d319b27ce34e58762c974a45859110fce94cc -AUX ghc-7.6.2-integer-simple-div-mod.patch 2264 SHA256 20c1bd20c329d12b0aea00b92fd07585d88e4ef4d454525eab8234d4158a6866 SHA512 2f5a4ab52bf9d624f2e17aa4eb431e4a970454b1e4a71635ecfa918495518a5dabdf53b33be4c868976a2435b0e526c12615f9a65ca6544a036583c9dbd0e984 WHIRLPOOL 24d636540e208bf13afa63ea57e62bee68b3ebb333692d9d120bf08e84c3ea295787ce8d5c55cfa6d4af70d24061ca6414fe599091d2ee9b8fc7f7cead65d04a AUX ghc-7.6.3-preserve-inplace-xattr.patch 495 SHA256 45e04a186e594ef4b550541fa43f9ed5ed7f83974ecac954f952279499de3c5b SHA512 98504e3b72446607deb520521c4abdd15e41e4ff69ad64e2ad13faca396bd7c7784b92c2bc7b5d8190668da480d5b1dd886f5e47e2e192d76b7fbbd58a42d44b WHIRLPOOL 3d634c6279d91df16653ede2b87edc4ac89256d34793abd6eac1bae7ec3e7986d87894ce88ac7a350b131d0e32fba3bed96af225329cb049126d708239965df0 -AUX ghc-7.6.3-trac-3333-weak-syms.patch 14378 SHA256 cdbf32550b5eb273e35fda3277284efe8bea496251f4c91b64c5cbae7c2e3d64 SHA512 9c0a3755c94124605fe1ab0fcaa60b95ecb0b6eb82d3dcd0be21c695458b4ae68512bab4a36cc09a9f2578ffa82a75664b1245eb4e4b06efe0080ab4a2501d6f WHIRLPOOL 6baebc6df6cb38cc7f990970ade199788d4a73d97a966e2c45f83f8170bc8ffe7421050d8d97ed45519ba671d783d414919894251231b86e1081b80718a41859 AUX ghc-7.8.1_rc1-libbfd.patch 2771 SHA256 d3d27bc0d161df7b9c7c64aca0138f04f0a2317f1e7194d549a8865848026071 SHA512 e232596342675769c6bf97686aff0fa7a8991e1edd3bf607068482cd0d0c9f9a9500e5b15f176a2025732474c9e547c0bae603d373c81b374c96787d46bbfa4a WHIRLPOOL 1fff73527c348a9561583f36e232cbb15c8e681b5b2ba81b786783ec5486db6c31b1d445201d9e56701a32d1210d5d2b47fa4b48e1688913b0c0111a080cbb57 AUX ghc-7.8.2-cgen-constify.patch 1173 SHA256 604738d87e786b8b52e8e5a7059213fd7231f7998e76e125a0a0962e18931653 SHA512 3e1bca7d7f9062d231c45a6765485291871df833da31b0a5573bb04639791c554dd5c0d8fe33bab05455fe06d3f36fe81dd1db6d3819c739284a3af5c4ec8fb0 WHIRLPOOL c246ef43917caff35d85b80f3231de54fa5ff703cf6ebf3a6822406ec2b28e5b650736bc7688e4823fa16d40c700ca3db615c346435e79db89b7f1e09f472fc8 -AUX ghc-7.8.3-cc-lang.patch 4622 SHA256 2cd1eb1ef369a34d6d528e5efb4bd67bd1f785b5fb287f2cee65c3776c478078 SHA512 6f4ab7343b908b0e2dc44c527628d130da75a7939e9d74b0e7fcecf78558f5b9bcb9d16029e8ad273ae3f08750f385bbc79ee2c797d86fb9e55a7e484bd2540c WHIRLPOOL 0753b4b928c919c32eea7d2a6ac001a2d05ae0f74bfe5a2dd0992d0aa22099202b1355f4b11778d14acd1207c861fbce674b13ba1a69b45bdba282cbbbd33e31 -AUX ghc-7.8.3-deRefStablePtr.patch 1910 SHA256 e3f285c54ac57d2fd44ff34846fb1854c04c4fc4a1bc5c5a5bb5c4c6264ab94d SHA512 4ca2a8396a6e47fb5b47b8874b73038ba5fbed1913ce6bbe98361cc3da1098fdf51603e26c7f51441993d9ea1061eb7d8847a51a9dc253ee5a5e8609b4a74c26 WHIRLPOOL e0bac0f66eeebf5df0c3823be57d44f6930552974dfcf4b2f2d259f4c1014fa44933c1caa5b3ac25cf3b6656dc3cae1dbd4f31bec76efebfbcc01b303cdde380 -AUX ghc-7.8.3-ia64-prim.patch 2528 SHA256 9e154f87cd89cbf524b4143b4f4ba0362060a9f2c73e17c2ce9f8ea5625978f7 SHA512 c3e63037d43cfb30f8231575694cf153a91bf95b58e2fb47e8d58e3f049189cf1b79f525b882c28e2150be496fe51784d8b4e5f11f317c31e0fa8256bf3ee10d WHIRLPOOL 3f04975404870d84c94526228d5f8e2e2b4aeabad92db6de55d8657465f8918d2fcc98d00faaa6b3bb18c51b205b397048984161475c402e191913c9ad262937 AUX ghc-7.8.3-linker-warn.patch 1317 SHA256 0beacf4d6a43784fc77b95c5b8d0dd752261ba442501e72177b59e1a628242eb SHA512 3b0ece4a6536ef43f15e97e723d036401dcf41d47c15e29dd8fe30c9f1563894102922617982db7b6c7cf3ed8aea64458b540ef92ffe690ff72994b1246834c9 WHIRLPOOL 0e17c8d0d675b330f4bdea3ab60d6b17ac68eb4421fb8cd919d5924c269be3761335c2712270800e84c1d1d43918e9a53b49233c67a7f7fd85d3962c2f429667 -AUX ghc-7.8.3-pic-asm.patch 4227 SHA256 ca59c8ecab4196b37410e12550d4781cee9744bd7450d2bf1ee4396d064f21bd SHA512 9bcfd043b0a194eec86f700c315799581920e37a9789a7f02e5ef5a8d13f1ec6509e194d89afaf410357abb77893e14f8c09c13bc6fd878eeb81d249818c4625 WHIRLPOOL 7c2605300fafe83c28e5f807135ab693ce78423bb83de6f3052cd5fcf754cd4cca18ce983a585c4b64d4a6eb67a033ef1bd45666cd86fdddcef2b58d48e4f6ca AUX ghc-7.8.3-pic-sparc.patch 1007 SHA256 71a77d9d43c76a5bb712bbd4bc00892058f51944157684b00758219e379cb2e7 SHA512 d3d81142a1e606c85c22127e2fbb26ceaeb2116435bf0bbc3743273577f04991e28c38a375a78b3f633a9b0e25f10951146d1f322e0ad7972089c1e5d977d16b WHIRLPOOL aebaa832e59ff50bbfb5447f89b9df0394167228bdab3da15399f9604cdfef5252bbc647c001af0b8b5753b34e5b554304e21f5cab7e65a30e8891e00045c000 AUX ghc-7.8.3-ppc32-fPIC.patch 14549 SHA256 413638aeec8e7cf35495f163e584d459870ea001e74360c546419e801eb36b57 SHA512 aa6f13e04a52e7f25db456c02031b63c01b71adf41262361b36ca97aec18965f618ebba73494b4283ad3c0224f15d5c80dbd43076553e604d86a07baf7fa86db WHIRLPOOL 98b008bf28280b878446f3aab83176334c4dc27c759d408eff2a6a52e84d8d7f002f3cb15be8022e6c8ebdb3d364067db0738a9ca96c4159c213eaa925ea63e6 AUX ghc-7.8.3-prim-lm.patch 444 SHA256 c147880c5c9f784cd731749589009a777317bd32b80b63f508730854025fcb7e SHA512 6979e002589a54c870c70eee8357dad4feb55b4e5102350cc09a466145677dacaa1bab5ebe4818cf0d3cd8ab50ee0ec2ab642ab0fb3fd34f4a266e5e90f9f389 WHIRLPOOL e33b43f42fa5e408d7879822c5081c89688cb924fadea32bb3c7ba426661c6b345e2051aac29e5f73ec2c7eafd63ae87413b4d52228e7e345308f5f816e1117a -AUX ghc-7.8.3-unreg-lit.patch 3248 SHA256 dd7dc819e0211f936c8bc450adb90c433ca7e37596898c97698c93dae7c4011a SHA512 c16361d3bf04839106221e18f9b1d861cf52da8091276fd4e6347f24e0707093b94e4d384bd452e1d7ef772392b8ce0103e42d68d91ec583f26250bb9af2be9e WHIRLPOOL 94194d10dd6b5ca9d624071bc455a1d76b4323f2cbc229bcb4cc9f41089903d7405cfa2e1000bb24b5828bcd5bdf1a44defe5c95a26e8d470c899906f2be0784 AUX ghc-7.8.4-gold.patch 1025 SHA256 632b044022c6ec60038164274250a34a3aaee9bd419e6f53ffe17d22ac145f06 SHA512 3087084d8b6a202496fc7ac71fadde06f7d1622d0e3f44f1b52fd04f1451d690f54b6bd8ee0da85663d252c6110340402bd1864f746117e59ce7b02e0247ec94 WHIRLPOOL 725031bcfaadd54b426600915ca4ef7a8815b6882ba0c723acf3a93c3a804282ea30c188954b4c4e1d869f4b9769f79b0db19718946279b256fc8ef5ecaf33db AUX ghc-7.8.4-ia64-CLOSUREs.patch 2243 SHA256 557841c6a05d7148235aa2290d19e0e7927de2451182dce04a7a83493eb8ac27 SHA512 9981d13f294fe0a28d1cabfd4db98bfb18110c6adb390f509667e3166a931c7d9f7b4b0079dfb1a22c174556944fef62f0e67ec855a9c3bccc5b54b0d0952c09 WHIRLPOOL c8d8f52e9c063106cb972e402966be8095c7a2761126cdc7dfe5e2584ab5d3e5fa11fae64db7b15fabdbd161123f1db4d5477f5653557ba22273cfce8da2ba3b AUX ghc-bash-completion 6496 SHA256 82a862bea2c9248e06fcf74d307de07b05a55f9eb95f412762bd02e53fece822 SHA512 ede79ccf23555f60f48297d29bd98e3ccfd67d2cf27462153e00beb930398cb497e34ba8316e91df44c577ed11fdbe5606f7c6a2777e35d5e783590e49ccfeb5 WHIRLPOOL 271dc4159ac500beb53981259e4b154b1f96e2909bb7cc43b7364f4fd4f86ce65df04611a46043c14079f699226195a002532fbb1e4ec01715e07e8469f9a7a4 -AUX terminfo-0.3.2.5-tinfo.patch 1217 SHA256 dfbb8d5c9ca133837e6f6be766fa8e3af2715e39d8994e56a4a84d6cdc15f9b3 SHA512 60552b163295c565d506b1d3c9624d6d0e94e814c37bb38d0cf0911e153c593c2bd13418306b44fbe611b7fd9064307a201860ed1e2ce5f2a7bb16618bd0b615 WHIRLPOOL 2c06869486a8eb08ff63f7bacebfddfdf68cf0c0dd94ef3578c5dbc49b4374b2ba8c0de9ac2ed4731a3ad27466a4169d2bd13d1c208a8d0aa1226770bcb30847 -DIST binary-0.7.5.0.tar.gz 45764 SHA256 4709c5aa7cc99cb4a465a68de1648968208d0c60c368e2fece476d977530ef19 SHA512 232e7c3da1c0055f3e9f211a86e81c76bc44ab1b70cabd23c93634dbaa42eed8bd9314fbedc16b9703d3ca92b0bbf232e6c30bb1384687dad0e6e85c9abb8947 WHIRLPOOL 1d8dcf9d5125ff398375f4024c0e43fa168004811db7824e2739ec5c0451b38dae9ad74f757c7708427deed0044580b182e35d1c7ecffec25f7b10c70bd32075 DIST binary-0.7.6.1.tar.gz 47086 SHA256 8f85cafc15be660757878a665d024ce595d4422fead174e20a501c9ec8f81067 SHA512 655daa93a52b845a85d440810452933d7bc3398ad1b51e1e955b2d19a0a32679325a0d1751ad50d252531e493528262e14dab32af4b9a515855fe7f64e0730b2 WHIRLPOOL 6853eb2c817e8ae792226c6c7764ce495833f965c3d503fe7e39c0502019d12f7bd46309b72dfdb276c7dbce8c004cb59fdea4936d69ede0a7c8b487acda2702 -DIST ghc-7.10.2-src.tar.bz2 12651156 SHA256 908a01ca86238318f4e880fda400ea399d0a0008d699c912b85d0e0f746e5689 SHA512 e3f99a9e848c12b728212da24bf9029ec8cde88cdfa7eeb4ee2ea223ad8bcaae3e7c27456d09d60a3d21efa8f907ccd2490caf5630ca5fe3ce87f04901275a66 WHIRLPOOL dee757e79de8ac6bcf127212703985282ce96d050be50e78c3f249f13dc0212c9fd96899502748ceb26b9fc3a804379a456e19a9bedfef72f6890992b00492da DIST ghc-7.10.3-src.tar.bz2 13281867 SHA256 3e29a56a74ed6a74d3ee2a6db9389f2462837da46ca6dce9d2965f9c152f0c15 SHA512 97a8282d8a75399c78d85d6faab7ac253a993dc69f1840358572f1878b8fd1a527c28801e5823c8200b5690e268e4a0c00941945ada13790852c75a83b612c17 WHIRLPOOL 04af6ea2738a1cc9e266efbb0e1b41b70d4cd915b48ca1265fade62b1c56cd51056fd1a82fc14cebc19a0c16782609a991c1a181ebe59574f1a10b4f26ad830d -DIST ghc-7.4.2-src.tar.bz2 25836446 SHA256 f2ee1289a33cc70539287129841acc7eaf16112bb60c59b5a6ee91887bfd836d SHA512 5a3d06a36702fa7e337b482c9de92ce1f84a68f18d8560bcc11f3617d6d46f93167fee27e786de6483a9ef0eab3b1ac6909a71dd53908d36156df4e465075050 WHIRLPOOL 61865eed2bf92728e7c4c4a0c48be44081bf728cfd824760d643e2fad838d96c19e173052d3aac073e0795b5efa3720ba5ddf13cca1ec7952b7524bbe1f204bc -DIST ghc-7.6.3-src.tar.bz2 110763823 SHA256 bd43823d31f6b5d0b2ca7b74151a8f98336ab0800be85f45bb591c9c26aac998 SHA512 ac86f18b4feeb0bdc9e867261600b210caf62740d73ae657259bbe8149b8c2c4f5a73d09d74d944d4e50f85cc87503485365f0a0ae65befe8d2b6844e5e1253a WHIRLPOOL 0fe1f5f2987699067494559e6a679d28f027eee8fb2a00c683161dbce5443b1faeebfb51572209b75231cee24c7f0c929cabbc82a93f70e16d05e351fdfe2eaf -DIST ghc-7.8.3-src.tar.xz 9160092 SHA256 b0cd96a549ba3b5e512847a4a8cd1a3174e4b2b75dadfc41c568fb812887b958 SHA512 2cc8c2aa6f18ba565c1e2aa637045e246f1214c2a77e95c2a97dfb97203b8983e4ad3cc13178b4b51aff70c58d59a1f68f94cd813d043745cb02411bad04bb00 WHIRLPOOL 3a2e8eea0db7a150e4732efed488a3a5eb56da00a9a90a3379afcb4090323925a2a7485fec6676e784139f112d7c825e8d18a576c34c760af4a7f3adb22c021a DIST ghc-7.8.4-ia64-CLOSUREs-regenerated.patch.gz 13268 SHA256 3bdff22e654aee6f942d43edf1bf6cf70404c0152c4fcf89276f10d2c4c5b4b9 SHA512 a655713e06324b56f0041edf70837487e296d28e6f3ee35fe116b9938765aaf3469d25e92645e0940655ed3607dff27d3826fe0f995c84e81b51bfc956816e7d WHIRLPOOL d2cb53bdc6debc0278d554168ea3ab22b0fd8314adac81444637278a92d21b766280fedfb4b7d1b4540c7381c7962dec6b13a799ab2fee4d456fe2875d5c6a5b DIST ghc-7.8.4-src.tar.bz2 10600755 SHA256 59e3bd514a1820cc1c03e1808282205c0b8518369acae12645ceaf839e6f114b SHA512 079a53891d8ebd8d9b88da96170e60981608a619f8282e4b7948f35244e99bd87277649ac7fcebc227a61a4d21960db8d5e5b9e92f2c69c82d8d68d7fd0a41d3 WHIRLPOOL a9be7641adbd237ed6e0f644c312e655e98be9566097aee5e2c0022e8756d5b2236e42dd86d76c638a001b5ca3f67307e89ec0cd003a92cd112a5d6d3e3d8467 -DIST ghc-bin-7.10.2-amd64.tbz2 112028560 SHA256 536297ac402da44ec1aafb1a937960883d12d192db16715ca34ab6469773a4c7 SHA512 207d8032c99d52bf4215ddeea2dbcd5816bb8d4caf2c3c31190e3ca92b49667d98a4f97aaf4cd6b40090f150854d520f75b5420dfe1ade7f036cf35d3dcb5100 WHIRLPOOL 8e43956a61c2c0fead242e3b179cde4918c04f3db7dbb27cc986f00f981261d98028ead82548b87d183d8da928635d5db4aa62ff1161f4077e5370483530a316 -DIST ghc-bin-7.10.2-r1-amd64-noncurses.tbz2 111863814 SHA256 782a68a13343ac8d6ed97540b411f714c4e826ccc3d152724198548c9240aceb SHA512 b154dbd7fb4fefc4283ec337b0c6ce6b6b6b3a62e9d889ca9c5dd5b5e5987f811a1c87845239ca94941afea630fc8bf1d8db94eb11a4023abd4b1d772dfb17c1 WHIRLPOOL 1e1f1ec82c831d115cd5f0b27f1914da94d92a9eca9af634210eb5f72b54281de6e08ea8e304bebaec8a456659b40866b9f0e24ef0e72c3f5a63d85296eb172a -DIST ghc-bin-7.10.2-r1-x86-noncurses.tbz2 113572461 SHA256 3ad1e2888d26b6858cd1efe0e9863bc325b97c47be19fdd2e8dd5bbc86f7266b SHA512 573b7228b576a47ca1c3796cc2d4180a6c9dcaff58555cf52fc85a9b487920fc19487ff9ee8e0b6c33d6196ba05b9908f0d984bf3a4c0d91f52667e7389580a5 WHIRLPOOL 2c8cda95d04e9f345aa2f20fe8758761dd35648b788b7bf9b8f571687a8aae92456552883684d83ec2d2acaf22a002121643316df3c82349400c7de3d0300f7d -DIST ghc-bin-7.10.2-x86.tbz2 113900477 SHA256 eefb7a3002e3dcdd6d936b2b2826eadf3cd100352babad4c9a355b944064240a SHA512 61dae4b9c80bfef6b1e0550c77b70f25d11f4a9fbe3b57d6c4ad451b4b584884432405d39dc32b9f85f3a5ad9d02657356ae0ebd99518848f3d330314c74b595 WHIRLPOOL da0d7eb62d2ee2aeb80a3f495da2ff123e29151b7517fbcd212f83ab3722638f10019511f4f237e8e001c68dd957ed2817fb0f1a2b42c2710239343f1d801496 DIST ghc-bin-7.10.3-alpha.tbz2 183558856 SHA256 780ac45b9b38fb40f08eeb7dae741649ac19dce2271df4bc764cac9be6c5c225 SHA512 08709fe9b4036ab41715c9a637a2a160104e3ab9e0ed9efaaf73428e3cfe19619e50c42b72c60bbbd27be2b9c2ea68f63d72c1a27d4519756e7c0d909f724230 WHIRLPOOL f488ecc945c6100ba86b9ae25eb6a472693556be0205a6c8634f2c235e779fe17b391ced7fec5d89c0c6c3d21583fe9f9b80bf628f3307890becf3f3ffb57a96 DIST ghc-bin-7.10.3-amd64.tbz2 112040431 SHA256 c3c71aff288f7de2785d1c3d54f0fd636144eb3dcb590bdda087b0775203e517 SHA512 e1554b3944edbe8e16537de5a29132dc6a22d780d9a700cdc9b76387b94191164398d6f2242bf8199527802572e2bb02545569d4f0930a0ee0dbfdeb25978558 WHIRLPOOL c2497a9565abf7d37e7928f508f7bf7241dd529aa252da708517f9f067e3d016341b7a73cac34888b99c9b84a8d01fd9e8d76f2b332d53e0d708b078f20ee807 DIST ghc-bin-7.10.3-ia64.tbz2 238680956 SHA256 0da9b5966f0920341f4cf041b814817e1ed06060e8a491481ab19a68153767db SHA512 3694011aec8a6dc37889418b318993cb82f9b46a5175dd837713f396c8f59a19a920e0b0669fe3b4ec37d5bd8837c115264c0a8fc97c5a4ce06a3bdd52fcfce5 WHIRLPOOL 9e059a953607b6477ea7c27bf55175d838c6aa3c57fcf92f13fa6112e9e728037073047be300a5a757395d759d30545546cb46816ec879a2d31c3c0a78868e42 @@ -48,22 +23,6 @@ DIST ghc-bin-7.10.3-ppc.tbz2 125832171 SHA256 67817636f5b91e04ecf94972c0bfe8e4e9 DIST ghc-bin-7.10.3-ppc64.tbz2 142469712 SHA256 c8fa2ea861d4c5373f7f67fd3a29db4e48593d669c8616c2f349592af7e4846f SHA512 eb59d3abc8b10010311d59df9473c5ea649eb0dd7f9ad41a1929a540a0ef8c20abaccd68254f8abab037fb1fc94d824f474e18e4316b8f2a7a954d0645a2a2a4 WHIRLPOOL 14ccfbcf818a80f1daf39b44dc7562304af925e548407ce0deecd2d4593f4e138da38cfe63d4e5b8b0303c0237c678c27eaac4331288ee9b9dcbcf8be7390f74 DIST ghc-bin-7.10.3-sparc.tbz2 163105069 SHA256 b9ef4179d87f4a56e9a786b28b0674f817118c73784b0dce283affadab296875 SHA512 d467a42487378d7dee311eb33aa1c151f5c16a6e7a4ab5bd8177df229f474adf19da3e1ca1064943a40abafcab6852b0589dd34413da82b33a03ede1ac17bf5d WHIRLPOOL 26ecb662f1d0eae524388008c24b3d25f954668aba781e997afd934c10b379b32e3376bc3a1232b066de84d3e1d1ad838dcef667b0f7606d0ac52acd7ef78a72 DIST ghc-bin-7.10.3-x86.tbz2 113877175 SHA256 a06d54e7256292123b49c4d429761794b53d2440d2efeb98bcfe79920c65b044 SHA512 75096fe9106d975c15e646b0a559c544621fd02791f491bce54926efabf0e55b97150069ddfa7a9f02cc30bb6975d3d3121a82207a9f67b8dda5ebfe17ec4744 WHIRLPOOL 63fea83be14ae317f313251b7c952c974a8e4f9671d78d1b3ef77c3ab317d2194faddc8d71431c5e1fc42215abed1842913f2f40ba383288784e984c47cd27f0 -DIST ghc-bin-7.4.2-alpha.tbz2 130483507 SHA256 cd8e72e569574f137bf10fcdb4337bb0dc320deb2a2c4d72529a821735c53ae6 SHA512 6fb99dea706965afa60f4aeb68da3da1c69dda477f5fcfb4e67b73d75b78583193148ce9f623a356679a57f1a740f8010f28a22f08e56ace50f3fcd42142f83f WHIRLPOOL e5ec69ab24dc963ac709f13928c0e35931d5d50ca6b21dfb0aa79f9088c0ce1196b64bb4d9668e35d73dcdf9e2df9c3da59c95eaf3db8b793a6bb65b1f4ba6c0 -DIST ghc-bin-7.4.2-amd64-stable-glibc.tbz2 93139900 SHA256 f06dff00585cc1a8ecc8ac29aeca7fdc601d272eed29d7613f7a2f2924cad585 SHA512 9b725f2613dd9013851a16eaea4000ea424c51cbafa97d3860f120fdb9936247f8c65208775a80a2f49b74946ddda2e843a54dec00b78c521197374aa3dd2d50 WHIRLPOOL 9e2630b1de40a059c324be38a1fe68b16ea484bc7afc2a397ea05192263d1964aed1d29fde543622ceab12ed2df111204576fdc72b7e35b2bbf9c6b9519901d1 -DIST ghc-bin-7.4.2-ia64.tbz2 155787636 SHA256 a1d89221645832cc5d11cde4937cce75d564e6a79eba334b92a4c465eb3f161f SHA512 c7138ed8eaf40ee7e7559b6063096351b64fc35cbd1adb4c734b2f2c6b77fb98368b1296fcb67c1a0b21b0faf053a82f8f98c3656b89c593e677ce78165d0c74 WHIRLPOOL 7ff2db2932a6d56961dcca386c9ec8f8eb1ee12e1b84230fbb089ff137eeb216117eecaa37b33b4c037ebee0063a07cd380077b754e64ef0219759b54a4f7fe2 -DIST ghc-bin-7.4.2-ppc.tbz2 89396808 SHA256 ebf6083a1f3256a978a9408cffa2562e837b641136e5d6ad41a8ab5c2f50e804 SHA512 d7abd4a2612f26b6937dd20c11d2081b2c846178347a8e09f4ef5d8b1ef2ad3eabb9d5429fd0c214f6c5bd53eb194ccf199745904d6b861650c9eef681a48bc1 WHIRLPOOL e2f8a4c8e3209432a744fd8587be39591d7b4fb026dca36755933f49e6f650e1b34e6087d9260aee65206a700f9d70e2fb6cbe42d29645b52f060729845a347e -DIST ghc-bin-7.4.2-ppc64.tbz2 105431655 SHA256 d0aecf47749a9862085aec6403f25197465d99a02a3c721dffd5314bf81d74eb SHA512 f220fb91b1856da37f72166fe050d4908049845eec03626d09c5b6e88701b0002835c3343c3584baf9f9d9efb5c7cbc210eb64c6eb711a58764d0fea92e8ac9f WHIRLPOOL e27022a72c254fd189995fd1b39629d5328927b83237ae4e61e97ab5efb5c451c92fe77f944c724bf9d14130d5a6cd2e0896a7cd6052de1ef7091531aa39fa0f -DIST ghc-bin-7.4.2-sparc.tbz2 121224130 SHA256 e5eaf1f31ddc4790e0226f0075236af340ec9674d98701452d5c51455ca1cb52 SHA512 a3647d82bbb36fe0ca55185ebc9479a264e785eb5a8a33be6c37b8a6cbcf8c55373374801c685eef004de78db5aa1c96760b2bedb2ca0ac9097d39fe286984e9 WHIRLPOOL d2d5f8c5abb001fb5425e68d3d26d941569b832c373e40b5a96aaa11f589db9e2b72eb1cbcf8df7b8d4473e2cc1c61498b284d8b006cc20822c3a203fd0fe2cd -DIST ghc-bin-7.4.2-x86-stable-glibc.tbz2 92394017 SHA256 2c42257a60aec03ae622c1a600cd210a6094f26ac310fbd307006e7f2260e2a4 SHA512 9e8ef72d2aeb5681e6bb71e2eb875587ddd51089cfc3443c33c69f93274a29e5680de4bf4884af05cd84f0e9cea13d66d20f1e89994460137910cbc987b64359 WHIRLPOOL 5722824af91f1191e6a38a8eb4696e765468e3bf54ad411b1d387ae4bcc7cd4cb772bdf2054d7013a3cff41feaaf5607f051b3c0d9f609ca19f1a1f92dd02586 -DIST ghc-bin-7.6.3-amd64.tbz2 94441516 SHA256 3ef747e96a40c9d5021e88b8afee0a97838c27b00619d9187783d95279c31779 SHA512 89f6c693d83d6309a0e44fcc68e30279c858adb0a0ea9317dd168b2e632c22a8507da78ed953523f5d7156db98e06c6df56d6edc19c0c50b3941ea578263dc64 WHIRLPOOL 891dfbfc9d88fa579b6a837651f7cc6d9aecef8b8752ec7bcebbdfef2a6d8929d0edaceff27ec61d6160d36d1b0e8406b7829a04a858ed64210b5c57b9c98940 -DIST ghc-bin-7.6.3-r1-alpha.tbz2 123486983 SHA256 fb6828d9dff7b90563cc7b3277ed38801907930aebd6042a7e5ba61e5f50db73 SHA512 7821bdf7490283dc062be090d224138dd34641e014cc6742edaa51dcc9cb1de9724d575955b596c9273b878dfe79023daf172b132b124f67567132649cf9a30d WHIRLPOOL 4e51a7e7f54fcb4aeb7a4ade4140533413348f9aacf04f683fe7cc5e20843dc6a95bdd6d79a995e5e1085747be9e584df6ada61430662f06eb600abae0c7eabd -DIST ghc-bin-7.6.3-r1-ia64.tbz2 154480728 SHA256 9a176312f796a189c0354deab9a7c446db274f75f40554963c2f86597a5951fb SHA512 2aa945cebcd3d0c26af5ddb53cf2002ec6d263d071173495905dd52898bd2ab6605370b0025554c1f6afbd28e276abc708708e4add9a9b8cb08b4bb39f8f50a1 WHIRLPOOL 6371531141e707618577e924c01102481a12d91e2c85e24694ba64f9b2545869c248999138146f63ca379a4243ccd0dfa322ea01a23d222b9757584787c5a899 -DIST ghc-bin-7.6.3-r1-ppc.tbz2 91800558 SHA256 c9b2262957585c9f02136014aa05423e1b7674c8eb0731a6d991e400e053e33a SHA512 2a101a30a4324780f1a614e044ba614f9094cd57d026c56f2b3ba514ae049c26ce8e4acbc89e93229da451b6fbe05ba0980b500cdd785bb2bce968a60434403a WHIRLPOOL 3a3b7e1eb945be01ab195880c7709514d2d11d25bab12fc15c2257207da48a37e6d6d7699c9ed5c1cc32d01057240a4d795e43cdf9d9d2748a1d94b93fb283ed -DIST ghc-bin-7.6.3-r1-ppc64.tbz2 121213680 SHA256 7d820988a762dc56ec471c9fcb5510f2e0bb47560181aa7dea8a934e73952477 SHA512 17fb269a2eae326db927b8734cd8326061b059ecd50a377c51c37cd657380be1ae61964df299009259de6e4e00aa71a525a9224f8fa607d6cc7994c221848358 WHIRLPOOL 76e9664a535e6be54c5288be683959ab6aadafb04d03c5d2f08f8ee663868b3ed390e2a0c8e6d233a532af694709e03dc0f78d16dfe51b87e201655219da4704 -DIST ghc-bin-7.6.3-r1-sparc.tbz2 121641337 SHA256 0fb31b9584c1c6caafb44a51158bfd3d85c28d2313f8201855f58c019a1692c0 SHA512 d71efc47769efb091f93cb288b54a1fadfd4184053149b1cd7c219a0c9c95ed97c32b101c712e20643fea12546357b70a11f2852bebeac2141e961a3e4bf8764 WHIRLPOOL 37d320e01d8e43ecba6e90f8d0a9c440d30ea31ff79d9094a8205d9ce892570f81b8641080034215fdddf71131de1acc364e2a485383af8346190c36201c1e91 -DIST ghc-bin-7.6.3-x86.tbz2 93718672 SHA256 a55024f66a048437fcd6ef0f33cdb994a43628998a2f0fe4d094cc9ba83d1615 SHA512 624f2a3238dee15853018d45632d1363e42d34099a77e5e9ce5c8da976cb4c33578144f7c39dbf25ee68c17d8d42910db2347186849eeeda6bc20053ce2be990 WHIRLPOOL bc646fc19906b59416358fb7558b6e2c3f7ad069c2fcf443be36b621894cfcecb0844acf5b5f9c383e034dfff3e24d312a7da0d7a629836134ec5dc1ecd6f139 -DIST ghc-bin-7.8.3-amd64.tbz2 100786052 SHA256 af49f547336a4f9f13cd625155d5a6a998e52ae7da8bbbddc856f88b00b6aff4 SHA512 b1826095b67fa2028678057f70909bff4e082b82f3b70f1aedbc91073efad54334fa1864bc8248c9249eec6edab3671dc38ac1650be86f1245e2fecf92528952 WHIRLPOOL 5b44fff77a0d79c6f7c5c8ca792eb6b36987d1de58d5ebc0a9b05da9c19a2c312eca6b9d40e7e63437742b7f9c28c925feb3bea7f9803dda95fac7acaa7a3132 -DIST ghc-bin-7.8.3-x86.tbz2 102583755 SHA256 c67f0d2471e594b4fdfc5b219bb6b61e57e6ba75132aa3f63d171550af8cbe3c SHA512 badabbba2f46b5ab3a2601e53997ce6533162afeec7dc36eeb877a62680a9f599aeb05dd3682f45d3e273d71d28b8bd01eee37dcad3c7354e8f83b7be4e58536 WHIRLPOOL 7b99b6bbeb4ad6d203f270d8446285825ad0857a8ab058d8c126155b49e8819e0efc2f6c42b5ff775dc0ece5488e97fcc7ae2459fe87fdceef43d63a75443430 DIST ghc-bin-7.8.4-alpha.tbz2 210691009 SHA256 23c9e5ef97b444fa87d3b9509a7b2b7b68c526ca4139739dd60c08fb1279d48a SHA512 f08230de82f0c4112da9d0b48227ca74d5d0b4a84046d746b023557b7aeeb9678f5ac037fe89a863178df4b9036e5c5c63182d14dfbb42c772011de883e3966f WHIRLPOOL d624b4d5eac8aa68f389b81e68d7fa2ea960c9b9c5fabb27ddf4da5140c18fd0ee9080725fb645e2c532bb0a01ade32da2cf6aac08707f9d89a94ea9752b8e72 DIST ghc-bin-7.8.4-amd64.tbz2 100573133 SHA256 bd9d144c08caa0ff345ada8d7eed7592531b8f8b9ef2f94d0b9a42fd747440aa SHA512 e4416d6dae3c644f74bafb3aecf1a123f985427aba32d0e0c43143a137d64a9220fc5947cd9bde8a3bc44555ae71184fc06a3f7df7976aadd065ad5681b90954 WHIRLPOOL ab0bd6219d68e08cb473cf2f3f15538d65940f28e84f026361032c3a6bc09f7820faf67629e915f27c2afda7de41fa9c6010a1b5cd487df0936d968c7e58a3a4 DIST ghc-bin-7.8.4-ia64.tbz2 222789275 SHA256 8bbbc11ba64d08bad691593afafc4c6a7cf078b10cf33cb8508bf0a0b3ccf523 SHA512 2d8b89e399cbe9bfeae29cf3ceea736bfaa65ea21483fa2ee95d9814e122fcfbb67ce22ad8175493fab088e9a9d0139610c67e9d5c8b4f797b5e14846df32b6e WHIRLPOOL 181d48bbb53d181c8febf63ddae620bec1a6c212a5b5bf938228689df2ff45ba68d7d4a99ebb1b68aa516d5633be41125321e3f8fdef6e5f0cd1e4a7f9b8774c @@ -71,16 +30,10 @@ DIST ghc-bin-7.8.4-ppc.tbz2 112803496 SHA256 a47e0fb17137878af1e7b5a166046bee20d DIST ghc-bin-7.8.4-ppc64.tbz2 129284515 SHA256 1e8a350af39d1db1e58a74c9bc4a4c57765eceb33e5b32751fb31340b9ff02ff SHA512 53974e15c26cf6b62d8f838607abd209ec57cf0f45fcc48b90ad62736f5e4e7ff263dcd326ae03d8d5557a22eb9730e5eb8ae4eda55e52dd3d973bc73c84935e WHIRLPOOL adaaa92323d319f6576423ac41678f7d263f36e0e30d89fc14ee89104b006772c26d7b408be7f85225d1bddaf5f15ebdcbb7136f5c8bf7bda4bb0938eefbe6c2 DIST ghc-bin-7.8.4-sparc.tbz2 147340595 SHA256 1cde749ce3c47016c5c7a7179423d0aa2b174ddae4af0392ae3b7f57b098ec0c SHA512 ee5f0b2f1cf2693a0f2be9df71ef61b52bc2327225d40b8be955c1584b9901ffc6aaab63c1e46bf9bb352633b605c98378f8fd3e6cd71aef1c089007e4110217 WHIRLPOOL 27d55a016ffb49852553f920c29929c3bdf383e28b4b806ceb9ffc8b46a59b438801101402e498b069aa6eb56870b70a00ba7b1f4098f3fd8d8ddf1b20caa626 DIST ghc-bin-7.8.4-x86.tbz2 102312459 SHA256 4c53148836e5a1ba55b8db5bb7c3eb915103e0955fb503b2facdc5a72f12a974 SHA512 cabc5bd6d8760ce4120e7053f6c1dffca7d161ba454b6201087760096c037c932e3ff8c82e53346c8278855bf0cff1c2f5fb8046242ca4d8307355b060a9556e WHIRLPOOL 0171d67dc1b63381a491e1577a783eb0e8f53cb579ba96a9b4fdf6685d494d78eb2be780f77ff33422d3b7c320ed102d9b48f6e954f8fee5532982575001a4a5 -DIST hoopl-3.10.1.0.tar.gz 241582 SHA256 7af615dfd4051670dccf31e5a7e1e71a9ae5f301e6a0668557fd84f61f6bc2d4 SHA512 943fe7034c89f4f914617cf1bccf7f66c3e660328fbbd9ae40f78a3f78a4a5b6fdd86c2afd40c11d4c4c4a34bc8fd47ab7e6227cdf9f3f4887b5cc796720e7aa WHIRLPOOL 3a410081f70c4ebbb563a48d71ec6f1e226a13b965ea12d01ca521b32041308394c7da6d3b3e36e75d1322c188b81fc08f4b2bf6037df5d8ac4998a944326be2 DIST hoopl-3.10.2.0.tar.gz 241940 SHA256 6740814c774e51815e8260ae1b4ac8af6ab69f02e112904450f689c4792f1121 SHA512 083baa8a5eb53247aff8d5b9b2144e0f63adb9400934297bbd80bfcec607dd90a34def4301045a60472ef10b0fb90ab84692fc08f786e7f806c28afdab1ef66a WHIRLPOOL 761e7440d2bc32b594ab55ea967c5b075bb638b2fdba6606beaf9c31a90e20031e914146828004b3d11203668210a6994be9fabc3b0ebb428d516b57cae9ee68 DIST transformers-0.4.3.0.tar.gz 28632 SHA256 b3d0a797e815ca50d411e20c02f781efe7751308007d880af7f0b5c4365c3a9d SHA512 c3ec0893ebba4fbd6087c3202e919552c4a9bff3350b5c0589e7ebb18751a515d98b8cac15b0a3252906ea72b5a0eb09b7fe88c8da88b09d6ce4fbf0f50b2780 WHIRLPOOL 89591781926b1d025056dedcfc5de61705056c1e3a8eba72f2e89789e78d2ed4d8909f84d6560dfc66bc0b360f98cb3dc3835f3a05c2325f747498373c88aa4b -EBUILD ghc-7.10.2-r1.ebuild 21434 SHA256 15a2cc2129b0fb3bff14aee9a77febd638b130fcdb3f85eb8448ea0a14d2f09d SHA512 5308caf4b9a95877077e904cba55e2d6a6c546f16663c4a941df01b9b0e9ee9618ae6e36e4eba2a1ceb61988c209c8ac8135459ae402d1ad53d12f89023c2f54 WHIRLPOOL 04c66c2c4f46822c44fc59e9d0e756425bb8803efba6bb63c1307f29142fce328aa2a736f8b27cd9b2fc3d6decbaf86f6a9c4ca7b5f37176a30e698fd9a25e92 -EBUILD ghc-7.10.2.ebuild 20953 SHA256 34865d6913189daf38fd53b609eb13d4e968543b6a23b2f70ea47c30bd8488d0 SHA512 b0a0b2208aea433688fd8ab4bd5211caf5ab1fa95b9f03dcdf107b604cf27403754f9c2fb00a80154693c2c30df5ffafe0fa3ea43a9ebb32a7e36d092c015148 WHIRLPOOL a5ff01ae1c82a26dacfd4014c13433493e8e8f00b00be772911ab8dc8da25e7c344730c02657ac1a6fae0a2ed73ea368452ab1b43ee1dca68a98e09493c90221 -EBUILD ghc-7.10.3.ebuild 21884 SHA256 1e2824c2c8ba187c2988292aa2a297065e0fdd42b0e5eb92e015ed0d87266677 SHA512 654949f9c0cdc628e5b690d62e9fdf067ce13197008833b4b02935d33abc9e30c99ece841531cba87fde1c0fcb6f386d57cc53ba7b1417a7502dbce238245282 WHIRLPOOL 99343a75f1cec8d7801e54887809a686e3a0b6b8359361149b067e51243aeb21490a323911f4eb0b0b3e2f70c30248650a4b80fb6c8772a86f2a26670f0dc8d8 -EBUILD ghc-7.4.2.ebuild 22036 SHA256 00f85dbc097a3bac27ccbf825e7d63c1aa80a43471dadd56ef6b9e6a8389b3dc SHA512 00380d5b63de0ceccf1f9df47e933f62e3cbdade73da428e960215642935d4a66dc0d2ac5026516540731785d202a5441f668ca430bad9811b74b1a620101d23 WHIRLPOOL be9e51acf321d5ee3298a39761441137453a1db95dcd96b50f7988cf2ec33bb1fef5b4f76ef57c6230f967d2cab62644d156f708c333bf3dc259fb356c9470a1 -EBUILD ghc-7.6.3-r1.ebuild 28942 SHA256 ead286f6e582e24a65c1d7a73f5f4ab6154b5b22949ca3cfbd0ffcc20c1b7f62 SHA512 0f0f21ec524f319a9ff7c0f39d72b7fd4ad876dff9341b9ce0085c0e0d9f534d050e3eba546ebd93811de2f96d0418907109436bfe123955fec5dc27805770c5 WHIRLPOOL 4c418b6e5535bf1d3965ebbc0604ab9246f5fdb05e98807d8744adf7a3db945fed33fe4569f3ff71eb367313195fbf64a0d506a83d783dc105c61892156ff563 -EBUILD ghc-7.8.3.ebuild 20586 SHA256 e2a20d692cb0efb5745c6bc2414472ce4ee8c79d871e9bcb9e1632ec5bdc0a3c SHA512 199826b2c896a987d879986c61250334610acf19d49896b52809651223de61c1b3119a5b2965d672d8f062b21da155a2827ec60190ef09e33c261f0e8a7de2fa WHIRLPOOL 8616e7310b3fb8b78e4cac1cfdbe424a490eb67d1ec3a5a3c448b565a0be42d01eaee3ac0d8cf42c4b005e04fc5abc8265777c35f9c9351d0d98a5be361927a2 -EBUILD ghc-7.8.4.ebuild 20730 SHA256 7e2ca99fbe8d23081138c12494e8d54ec443d8cda81bd7a4e815e38c901cee1d SHA512 7bf74e7da104fc6993351a0a158a7561e7b72d861295b798ad46f9192d82c252acca19e87b7ddc27d7ee563b2374c078b883b94e4a3d1eed7a941e23d4f41ead WHIRLPOOL 89bb8e7599909868eda68cf21e94b8060195c6b18ab5207f7befe64969fc3285d7b07bdb308a215a6faa01808bca8cec50f302f5482727fc3dfd322677684236 +EBUILD ghc-7.10.3.ebuild 21876 SHA256 08c0b25cda4c4f1d3aa951e941b2eb98bb27f3d50637d3e816b360d09afc7a32 SHA512 054178999b7c1a444932296cbbc6e6853d9166894f7f4624d5e98e90ebbd1d2ce353e5571f096e71e498084022648587b7deece86f258f1c5dc69a8d0df5f3f7 WHIRLPOOL b73cadb9da68ef8718def8aef10364159bf4ef47780dfb2ab2118b6786a83197b00abe9e558a12cc210ca456408d6143308dc31efb1cd5b1473bbac073a4a008 +EBUILD ghc-7.8.4.ebuild 20728 SHA256 b1bd41c2768a12251cf56e87dff04abbc31980a66db857c2d3b704a0210e9fa5 SHA512 53cbe971cb9196fb2f47ecf2939b3a2f52d41ae6abe4be79971cc841c5fa5016e05fe70aa901f1a016d79ca4c8f5662016d01c2765a5e9898801c62c062d7c8b WHIRLPOOL abd472872a145751103db6d5677a1d0e876744aee18acf4d1788d415c594482627dde64e45e3150fb6b20bb5cd291c16ff7130464007174626b66d0a93cc01fb MISC ChangeLog 6712 SHA256 edb50720c9aabde7fe6a43923903005fdc456d6e7553ec352b9a5e1d4a6a2671 SHA512 dfd4cb4838bc5c9e829f130df499f33782650cb5315cbdd84025677d4b428d4c301dbb32374de69cea95e62e15070659b774d97aaaee0e306217ee11d459b872 WHIRLPOOL 02c53782c7f98222bf6c5496f8795648460890ee1a51108a324c3a6bc0b6b7d014b3ffbf4050507fb477218ee5517397713c9b45d9b1a06b202897423711993e MISC ChangeLog-2015 52851 SHA256 feddaa2305430f9f381bc36281fc3c3b3a4c0a60ce00f6de9a00bf9bf6b1ff62 SHA512 db3d92c600335d49cdbe77cfa0863c9ca025359dff8e58b2d792598e95edb03ab5dbbf2399a54ea5fec96b2d72d5c5b33d0447cf8409c73722e575a178d41970 WHIRLPOOL 650bb4225e167a478586daa1d1305f17fcb84306c512974b93d1f0ae1b859056233955ee5b0563405221093ffa3ac948565422228d7ef9967d12124b9fd6d8a6 -MISC metadata.xml 649 SHA256 1d98552508fbf21bb454e73a0b87f12d7f040b8dd36e167d13d089a8a9fdbd83 SHA512 6971f70254bbaa41777adac167f515ae6c857e5e5ae578148c3439f64900e42d7e9cb3467907044c7309a1d6f6bfc1052fd1894e7f9fe3f6fadf9ed5d2083b8c WHIRLPOOL 84886149382d2c69c3ea39360f637c72f9e88fb43e5e8a68fd762fd5e9d49e8419fe9170544183793f5f92f59f1b0788c33edc2351eeb7442f1042c5dd0258f8 +MISC metadata.xml 577 SHA256 c015496208354e95808fac7ec7b8f5a8383e7a3065bd33bf8e95e8e070abd918 SHA512 7484ae45b530169fd0cf616af4f87bb0d551aadb7784dbde24ff4a63f7346cf0c94550240a7d22599cfb04a72ef4ec984edc325ce7e0b787709681ef10193873 WHIRLPOOL 56d0df6aead35b637669b54eb3c401b8dee2d0189d92dfc764182cf9785b4eaf2c5cfddce5115de6be2e48e1ba87f87f7b59cd91043767f52b4a70e50652fe39 diff --git a/dev-lang/ghc/files/ghc-7.0.4-darwin8.patch b/dev-lang/ghc/files/ghc-7.0.4-darwin8.patch deleted file mode 100644 index bfbee41b4f93..000000000000 --- a/dev-lang/ghc/files/ghc-7.0.4-darwin8.patch +++ /dev/null @@ -1,18 +0,0 @@ -Workaround headers problem in Darwin 8 as well. - ---- rts/PosixSource.h -+++ rts/PosixSource.h -@@ -11,6 +11,13 @@ - - #include - -+#if defined(darwin_HOST_OS) -+/* unfortunately the hack below only works for Darwin 9 and -+ * above, so as hack include sys/types early (before setting -+ * _POSIX_C_SOURCE) (this obviously obsoletes the hack below) */ -+#include -+#endif -+ - #if defined(freebsd_HOST_OS) - #define _POSIX_C_SOURCE 200112L - #define _XOPEN_SOURCE 600 diff --git a/dev-lang/ghc/files/ghc-7.10.1-T10590-dequeue.patch b/dev-lang/ghc/files/ghc-7.10.1-T10590-dequeue.patch deleted file mode 100644 index be0f7a05b1e3..000000000000 --- a/dev-lang/ghc/files/ghc-7.10.1-T10590-dequeue.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/rts/RaiseAsync.c b/rts/RaiseAsync.c -index 3b206ff..08c031c 100644 ---- a/rts/RaiseAsync.c -+++ b/rts/RaiseAsync.c -@@ -56,7 +56,8 @@ static void throwToSendMsg (Capability *cap USED_IF_THREADS, - - static void - throwToSingleThreaded__ (Capability *cap, StgTSO *tso, StgClosure *exception, -- rtsBool stop_at_atomically, StgUpdateFrame *stop_here) -+ rtsBool stop_at_atomically, StgUpdateFrame *stop_here, -+ rtsBool dequeue) - { - // Thread already dead? - if (tso->what_next == ThreadComplete || tso->what_next == ThreadKilled) { -@@ -64,7 +65,9 @@ throwToSingleThreaded__ (Capability *cap, StgTSO *tso, StgClosure *exception, - } - - // Remove it from any blocking queues -- removeFromQueues(cap,tso); -+ if (dequeue) { -+ removeFromQueues(cap,tso); -+ } - - raiseAsync(cap, tso, exception, stop_at_atomically, stop_here); - } -@@ -72,20 +75,26 @@ throwToSingleThreaded__ (Capability *cap, StgTSO *tso, StgClosure *exception, - void - throwToSingleThreaded (Capability *cap, StgTSO *tso, StgClosure *exception) - { -- throwToSingleThreaded__(cap, tso, exception, rtsFalse, NULL); -+ throwToSingleThreaded__(cap, tso, exception, rtsFalse, NULL, rtsTrue); -+} -+ -+void -+throwToSingleThreadedNoDequeue (Capability *cap, StgTSO *tso, StgClosure *exception) -+{ -+ throwToSingleThreaded__(cap, tso, exception, rtsFalse, NULL, rtsFalse); - } - - void - throwToSingleThreaded_ (Capability *cap, StgTSO *tso, StgClosure *exception, - rtsBool stop_at_atomically) - { -- throwToSingleThreaded__ (cap, tso, exception, stop_at_atomically, NULL); -+ throwToSingleThreaded__ (cap, tso, exception, stop_at_atomically, NULL, rtsTrue); - } - - void // cannot return a different TSO - suspendComputation (Capability *cap, StgTSO *tso, StgUpdateFrame *stop_here) - { -- throwToSingleThreaded__ (cap, tso, NULL, rtsFalse, stop_here); -+ throwToSingleThreaded__ (cap, tso, NULL, rtsFalse, stop_here, rtsTrue); - } - - /* ----------------------------------------------------------------------------- -diff --git a/rts/RaiseAsync.h b/rts/RaiseAsync.h -index 6bfed8d..2e8a7a3 100644 ---- a/rts/RaiseAsync.h -+++ b/rts/RaiseAsync.h -@@ -23,6 +23,10 @@ void throwToSingleThreaded (Capability *cap, - StgTSO *tso, - StgClosure *exception); - -+void throwToSingleThreadedNoDequeue (Capability *cap, -+ StgTSO *tso, -+ StgClosure *exception); -+ - void throwToSingleThreaded_ (Capability *cap, - StgTSO *tso, - StgClosure *exception, -diff --git a/rts/posix/Select.c b/rts/posix/Select.c -index 4b19235..6889499 100644 ---- a/rts/posix/Select.c -+++ b/rts/posix/Select.c -@@ -412,8 +412,12 @@ awaitEvent(rtsBool wait) - IF_DEBUG(scheduler, - debugBelch("Killing blocked thread %lu on bad fd=%i\n", - (unsigned long)tso->id, fd)); -- throwToSingleThreaded(&MainCapability, tso, -- (StgClosure *)blockedOnBadFD_closure); -+ /* -+ * We can't use throwToSingleThreaded() here -+ * as 'RTS_FD_IS_READY' breaks blocked_queue_hd list -+ */ -+ throwToSingleThreadedNoDequeue(&MainCapability, tso, -+ (StgClosure *)blockedOnBadFD_closure); - break; - case RTS_FD_IS_READY: - IF_DEBUG(scheduler, diff --git a/dev-lang/ghc/files/ghc-7.2.1-freebsd-CHOST.patch b/dev-lang/ghc/files/ghc-7.2.1-freebsd-CHOST.patch deleted file mode 100644 index da59cd789f99..000000000000 --- a/dev-lang/ghc/files/ghc-7.2.1-freebsd-CHOST.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/aclocal.m4 b/aclocal.m4 -index 11bb003..52df243 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -1545,7 +1545,7 @@ case "$1" in - freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku) - $2="$1" - ;; -- freebsd8) # like i686-gentoo-freebsd8 -+ freebsd*) # like i686-gentoo-freebsd8 or i686-gentoo-freebsd8.2 - $2="freebsd" - ;; - darwin*) diff --git a/dev-lang/ghc/files/ghc-7.4-rc2-macos-prefix-respect-gcc.patch b/dev-lang/ghc/files/ghc-7.4-rc2-macos-prefix-respect-gcc.patch deleted file mode 100644 index 770fd650606b..000000000000 --- a/dev-lang/ghc/files/ghc-7.4-rc2-macos-prefix-respect-gcc.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/aclocal.m4 b/aclocal.m4 -index a377cb9..4f8fd69 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -1950,17 +1950,7 @@ AC_DEFUN([XCODE_VERSION],[ - # -------------------------------- - # Finds where gcc is - AC_DEFUN([FIND_GCC],[ -- if test "$TargetOS_CPP" = "darwin" && -- test "$XCodeVersion1" -eq 4 && -- test "$XCodeVersion2" -lt 2 -- then -- # In Xcode 4.1, 'gcc-4.2' is the gcc legacy backend (rather -- # than the LLVM backend). We prefer the legacy gcc, but in -- # Xcode 4.2 'gcc-4.2' was removed. -- FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc-4.2]) -- else -- FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc]) -- fi -+ FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc]) - export CC - WhatGccIsCalled="$CC" - AC_SUBST(WhatGccIsCalled) diff --git a/dev-lang/ghc/files/ghc-7.4.1-darwin-CHOST.patch b/dev-lang/ghc/files/ghc-7.4.1-darwin-CHOST.patch deleted file mode 100644 index 348158882aaf..000000000000 --- a/dev-lang/ghc/files/ghc-7.4.1-darwin-CHOST.patch +++ /dev/null @@ -1,18 +0,0 @@ -like the other CHOST patches, but this one catches another case where -$host is used (instead of the cannonicalised variables) - ---- aclocal.m4 -+++ aclocal.m4 -@@ -93,10 +93,10 @@ - exeext='.exe' - soext='.dll' - ;; -- i386-apple-darwin|powerpc-apple-darwin) -+ i386-apple-darwin*|powerpc-apple-darwin*) - soext='.dylib' - ;; -- x86_64-apple-darwin) -+ x86_64-apple-darwin*) - soext='.dylib' - ;; - esac diff --git a/dev-lang/ghc/files/ghc-7.4.1-ticket-7339-fix-unaligned-unreg.patch b/dev-lang/ghc/files/ghc-7.4.1-ticket-7339-fix-unaligned-unreg.patch deleted file mode 100644 index f2f19f1bbab4..000000000000 --- a/dev-lang/ghc/files/ghc-7.4.1-ticket-7339-fix-unaligned-unreg.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 26f8466507bd9383e0a7d1e62e397eca4a13822a Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Tue, 13 Nov 2012 01:39:14 +0300 -Subject: [PATCH] Fix unaligned access on alpha and friends (ticket #7339) - -Assume unknown arch (alpha and mips) an alignment sensitive target. -Otherwise on alpha it causes ghc-7.4.1 to generate invalud lexers. - -Signed-off-by: Sergei Trofimovich ---- - compiler/cmm/PprC.hs | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs -index 21826f8..8cdcde6 100644 ---- a/compiler/cmm/PprC.hs -+++ b/compiler/cmm/PprC.hs -@@ -963,6 +963,7 @@ cLoad platform expr rep - | otherwise - = char '*' <> parens (cCast platform (machRepPtrCType rep) expr) - where -- On these platforms, unaligned loads are known to cause problems -+ bewareLoadStoreAlignment ArchUnknown = True -- like alpha or mips - bewareLoadStoreAlignment (ArchARM {}) = True - bewareLoadStoreAlignment _ = False - --- -1.8.0 - diff --git a/dev-lang/ghc/files/ghc-7.4.2-system-libffi.patch b/dev-lang/ghc/files/ghc-7.4.2-system-libffi.patch deleted file mode 100644 index 73c4aa278dd8..000000000000 --- a/dev-lang/ghc/files/ghc-7.4.2-system-libffi.patch +++ /dev/null @@ -1,119 +0,0 @@ -Make ghc use the libffi installed on the system instead of the bundled one. - -This patch is based on the one used by Debian and Fedora, but was -augmented by additional lines to identify the libffi include directory -using pkg-config, as libffi on Gentoo installs into a subdirectory of -the system include directory. - -2012-04-24 Martin von Gagern - -References: -https://bugs.gentoo.org/411925 -http://hackage.haskell.org/trac/ghc/ticket/5743 - -Index: ghc-7.4.1/ghc.mk -=================================================================== ---- ghc-7.4.1.orig/ghc.mk -+++ ghc-7.4.1/ghc.mk -@@ -579,7 +579,6 @@ BUILD_DIRS += \ - driver/ghci \ - driver/ghc \ - driver/haddock \ -- libffi \ - includes \ - rts - -Index: ghc-7.4.1/rts/ghc.mk -=================================================================== ---- ghc-7.4.1.orig/rts/ghc.mk -+++ ghc-7.4.1/rts/ghc.mk -@@ -86,8 +86,7 @@ - ALL_RTS_DEF_LIBNAMES = base ghc-prim - ALL_RTS_DEF_LIBS = \ - rts/dist/build/win32/libHSbase.dll.a \ -- rts/dist/build/win32/libHSghc-prim.dll.a \ -- libffi/build/inst/lib/libffi.dll.a -+ rts/dist/build/win32/libHSghc-prim.dll.a - - # -- import libs for the regular Haskell libraries - define make-importlib-def # args $1 = lib name -@@ -172,12 +171,12 @@ - # Making a shared library for the RTS. - ifneq "$$(findstring dyn, $1)" "" - ifeq "$$(HOSTPLATFORM)" "i386-unknown-mingw32" --$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend rts/dist/build/libffi-5.dll -+$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend - "$$(RM)" $$(RM_OPTS) $$@ - "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \ - -no-auto-link-packages -Lrts/dist/build -lffi-5 `cat rts/libs.depend` $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) -o $$@ - else --$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend rts/dist/build/libffi$$(soext) -+$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend - "$$(RM)" $$(RM_OPTS) $$@ - "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \ - -no-auto-link-packages -Lrts/dist/build -lffi `cat rts/libs.depend` $$(rts_$1_OBJS) \ -@@ -188,9 +187,9 @@ - endif - endif - else --$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) $$(rts_ffi_objs_stamp) -+$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) - "$$(RM)" $$(RM_OPTS) $$@ -- echo $$(rts_ffi_objs) $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR_STAGE1)" \ -+ echo $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR_STAGE1)" \ - $$(AR_OPTS_STAGE1) $$(EXTRA_AR_ARGS_STAGE1) $$@ - endif - -@@ -403,6 +402,12 @@ - rts/dist/build/sm/Evac_thr_CC_OPTS += -DPARALLEL_GC -Irts/sm - rts/dist/build/sm/Scav_thr_CC_OPTS += -DPARALLEL_GC -Irts/sm - -+# Use system libffi -+libffi_include_flags:=$(shell pkg-config --cflags-only-I libffi) -+rts/Adjustor_CC_OPTS += $(libffi_include_flags) -+rts/Interpreter_CC_OPTS += $(libffi_include_flags) -+rts/sm/Storage_CC_OPTS += $(libffi_include_flags) -+ - #----------------------------------------------------------------------------- - # Add PAPI library if needed - -@@ -504,10 +509,8 @@ - # installing - - INSTALL_LIBS += $(ALL_RTS_LIBS) --INSTALL_LIBS += $(wildcard rts/dist/build/libffi$(soext)*) --INSTALL_LIBS += $(wildcard rts/dist/build/libffi-5.dll) - --install: install_libffi_headers -+install: - - .PHONY: install_libffi_headers - install_libffi_headers : -Index: ghc-7.4.1/rts/package.conf.in -=================================================================== ---- ghc-7.4.1.orig/rts/package.conf.in -+++ ghc-7.4.1/rts/package.conf.in -@@ -24,8 +24,9 @@ - hs-libraries: "HSrts" - - extra-libraries: -+ "ffi" - #ifdef HAVE_LIBM -- "m" /* for ldexp() */ -+ , "m" /* for ldexp() */ - #endif - #ifdef HAVE_LIBRT - , "rt" -Index: ghc-7.4.1/compiler/ghc.mk -=================================================================== ---- ghc-7.4.1.orig/compiler/ghc.mk -+++ ghc-7.4.1/compiler/ghc.mk -@@ -260,6 +260,8 @@ - - compiler_CPP_OPTS += -I$(GHC_INCLUDE_DIR) - compiler_CPP_OPTS += ${GhcCppOpts} -+libffi_include_flags := $(shell pkg-config --cflags-only-I libffi) -+compiler/ghci/LibFFI_HSC2HS_OPTS += $(addprefix --cflag=,$(libffi_include_flags)) - - $(PRIMOPS_TXT) compiler/parser/Parser.y: %: %.pp compiler/stage1/$(PLATFORM_H) - $(CPP) $(RAWCPP_FLAGS) -P $(compiler_CPP_OPTS) -x c $< | grep -v '^#pragma GCC' > $@ diff --git a/dev-lang/ghc/files/ghc-7.5.20120505-system-libffi.patch b/dev-lang/ghc/files/ghc-7.5.20120505-system-libffi.patch deleted file mode 100644 index f3b0c71c5454..000000000000 --- a/dev-lang/ghc/files/ghc-7.5.20120505-system-libffi.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- ghc-7.5.20120505-orig/ghc.mk 2012-05-06 03:01:29.000000000 +1000 -+++ ghc-7.5.20120505/ghc.mk 2012-05-06 17:22:01.023416003 +1000 -@@ -584,7 +584,6 @@ - $(MAYBE_GHCI) \ - driver/ghc \ - driver/haddock \ -- libffi \ - includes \ - rts - ---- ghc-7.5.20120505-orig/rts/ghc.mk 2012-05-06 03:01:30.000000000 +1000 -+++ ghc-7.5.20120505/rts/ghc.mk 2012-05-06 17:28:31.925897226 +1000 -@@ -171,12 +171,12 @@ - # Making a shared library for the RTS. - ifneq "$$(findstring dyn, $1)" "" - ifeq "$$(HostOS_CPP)" "mingw32" --$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend rts/dist/build/$$(LIBFFI_DLL) -+$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend - "$$(RM)" $$(RM_OPTS) $$@ - "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \ - -no-auto-link-packages -Lrts/dist/build -l$(LIBFFI_WINDOWS_LIB) `cat rts/libs.depend` $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) -o $$@ - else --$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend rts/dist/build/libffi$$(soext) -+$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend - "$$(RM)" $$(RM_OPTS) $$@ - "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \ - -no-auto-link-packages -Lrts/dist/build -lffi `cat rts/libs.depend` $$(rts_$1_OBJS) \ -@@ -187,9 +187,9 @@ - endif - endif - else --$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) $$(rts_ffi_objs_stamp) -+$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) - "$$(RM)" $$(RM_OPTS) $$@ -- echo $$(rts_ffi_objs) $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR_STAGE1)" \ -+ echo $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR_STAGE1)" \ - $$(AR_OPTS_STAGE1) $$(EXTRA_AR_ARGS_STAGE1) $$@ - endif - -@@ -407,6 +407,12 @@ - rts/dist/build/sm/Evac_thr_CC_OPTS += -DPARALLEL_GC -Irts/sm - rts/dist/build/sm/Scav_thr_CC_OPTS += -DPARALLEL_GC -Irts/sm - -+# Use system libffi -+libffi_include_flags:=$(shell pkg-config --cflags-only-I libffi) -+rts/Adjustor_CC_OPTS += $(libffi_include_flags) -+rts/Interpreter_CC_OPTS += $(libffi_include_flags) -+rts/sm/Storage_CC_OPTS += $(libffi_include_flags) -+ - #----------------------------------------------------------------------------- - # Add PAPI library if needed - -@@ -508,10 +514,8 @@ - # installing - - INSTALL_LIBS += $(ALL_RTS_LIBS) --INSTALL_LIBS += $(wildcard rts/dist/build/libffi$(soext)*) --INSTALL_LIBS += $(wildcard rts/dist/build/$(LIBFFI_DLL)) - --install: install_libffi_headers -+install: - - .PHONY: install_libffi_headers - install_libffi_headers : ---- ghc-7.5.20120505-orig/rts/package.conf.in 2012-05-06 03:01:30.000000000 +1000 -+++ ghc-7.5.20120505/rts/package.conf.in 2012-05-06 17:22:01.025416056 +1000 -@@ -24,8 +24,9 @@ - hs-libraries: "HSrts" - - extra-libraries: -+ "ffi" - #ifdef HAVE_LIBM -- "m" /* for ldexp() */ -+ , "m" /* for ldexp() */ - #endif - #ifdef HAVE_LIBRT - , "rt" ---- ghc-7.5.20120505-orig/compiler/ghc.mk 2012-05-06 03:01:29.000000000 +1000 -+++ ghc-7.5.20120505/compiler/ghc.mk 2012-05-06 17:22:01.026416083 +1000 -@@ -260,6 +260,8 @@ - - compiler_CPP_OPTS += $(addprefix -I,$(GHC_INCLUDE_DIRS)) - compiler_CPP_OPTS += ${GhcCppOpts} -+libffi_include_flags := $(shell pkg-config --cflags-only-I libffi) -+compiler/ghci/LibFFI_HSC2HS_OPTS += $(addprefix --cflag=,$(libffi_include_flags)) - - $(PRIMOPS_TXT) compiler/parser/Parser.y: %: %.pp compiler/stage1/$(PLATFORM_H) - $(CPP) $(RAWCPP_FLAGS) -P $(compiler_CPP_OPTS) -x c $< | grep -v '^#pragma GCC' > $@ diff --git a/dev-lang/ghc/files/ghc-7.6.2-integer-simple-div-mod.patch b/dev-lang/ghc/files/ghc-7.6.2-integer-simple-div-mod.patch deleted file mode 100644 index 0dc5391678f2..000000000000 --- a/dev-lang/ghc/files/ghc-7.6.2-integer-simple-div-mod.patch +++ /dev/null @@ -1,57 +0,0 @@ -commit de13417726b90b0945aaaf0b9cfbaf8ab975d8b5 -Author: Gabor Greif -Date: Tue Jul 24 14:31:36 2012 +0200 - - track integer-gmp and add 'divInteger', 'modInteger' - -diff --git a/libraries/integer-simple/GHC/Integer.hs b/libraries/integer-simple/GHC/Integer.hs -index c9b50a7..4122d38 100644 ---- a/libraries/integer-simple/GHC/Integer.hs -+++ b/libraries/integer-simple/GHC/Integer.hs -@@ -4,7 +4,7 @@ - ----------------------------------------------------------------------------- - -- | - -- Module : GHC.Integer ---- Copyright : (c) Ian Lynagh 2007-2008 -+-- Copyright : (c) Ian Lynagh 2007-2012 - -- License : BSD3 - -- - -- Maintainer : igloo@earth.li -@@ -27,6 +27,7 @@ module GHC.Integer ( - plusInteger, minusInteger, timesInteger, negateInteger, - eqInteger, neqInteger, absInteger, signumInteger, - leInteger, gtInteger, ltInteger, geInteger, compareInteger, -+ divInteger, modInteger, - divModInteger, quotRemInteger, quotInteger, remInteger, - encodeFloatInteger, decodeFloatInteger, floatFromInteger, - encodeDoubleInteger, decodeDoubleInteger, doubleFromInteger, -diff --git a/libraries/integer-simple/GHC/Integer/Type.hs b/libraries/integer-simple/GHC/Integer/Type.hs -index c3d812c..67ed19c 100644 ---- a/libraries/integer-simple/GHC/Integer/Type.hs -+++ b/libraries/integer-simple/GHC/Integer/Type.hs -@@ -7,7 +7,7 @@ - ----------------------------------------------------------------------------- - -- | - -- Module : GHC.Integer.Type ---- Copyright : (c) Ian Lynagh 2007-2008 -+-- Copyright : (c) Ian Lynagh 2007-2012 - -- License : BSD3 - -- - -- Maintainer : igloo@earth.li -@@ -370,6 +370,16 @@ n `divModInteger` d = - then (# q `minusInteger` oneInteger, r `plusInteger` d #) - else (# q, r #) - -+{-# NOINLINE divInteger #-} -+divInteger :: Integer -> Integer -> Integer -+n `divInteger` d = quotient -+ where (# quotient, _ #) = n `divModInteger` d -+ -+{-# NOINLINE modInteger #-} -+modInteger :: Integer -> Integer -> Integer -+n `modInteger` d = modulus -+ where (# _, modulus #) = n `divModInteger` d -+ - {-# NOINLINE quotRemInteger #-} - quotRemInteger :: Integer -> Integer -> (# Integer, Integer #) - Naught `quotRemInteger` (!_) = (# Naught, Naught #) diff --git a/dev-lang/ghc/files/ghc-7.6.3-trac-3333-weak-syms.patch b/dev-lang/ghc/files/ghc-7.6.3-trac-3333-weak-syms.patch deleted file mode 100644 index c3184a68c1e7..000000000000 --- a/dev-lang/ghc/files/ghc-7.6.3-trac-3333-weak-syms.patch +++ /dev/null @@ -1,387 +0,0 @@ -The patch set adds support for weak symbols to ghci. - -For gentoo it fixes nonworking ghci / template haskell -for package base. - -Steps to reproduce: - 1. CFLAGS=-Os emerge ghc - 2. ghci -package base - Loading package base ... linking ... ghc: /usr/lib64/ghc-7.6.3/base-4.6.0.1/HSbase-4.6.0.1.o: unknown symbol `stat' - -When built with -O2 weak 'stat' resolved to '__xstat' and we don't see any errors. -But on olwer optimization levels 'stat' remains. - -Patches-by: akio -Gentoo-bug: http://bugs.gentoo.org/452442 -Upstream-bug: http://ghc.haskell.org/trac/ghc/ticket/3333 - -From 500d57d3a18412c78cab5abc4d91f1564edc964d Mon Sep 17 00:00:00 2001 -From: Takano Akio -Date: Sat, 29 Dec 2012 11:47:22 +0900 -Subject: [PATCH 1/3] Linker.c: remove stablehash, which is no longer used - ---- - includes/rts/Linker.h | 3 --- - rts/Linker.c | 31 ++----------------------------- - 2 files changed, 2 insertions(+), 32 deletions(-) - -diff --git a/includes/rts/Linker.h b/includes/rts/Linker.h -index e900e85..d20ebc2 100644 ---- a/includes/rts/Linker.h -+++ b/includes/rts/Linker.h -@@ -23,9 +23,6 @@ typedef char pathchar; - /* initialize the object linker */ - void initLinker( void ); - --/* insert a stable symbol in the hash table */ --void insertStableSymbol(pathchar* obj_name, char* key, StgPtr data); -- - /* insert a symbol in the hash table */ - void insertSymbol(pathchar* obj_name, char* key, void* data); - -diff --git a/rts/Linker.c b/rts/Linker.c -index fa1de89..513fe3f 100644 ---- a/rts/Linker.c -+++ b/rts/Linker.c -@@ -30,1 +30,0 @@ --#include "Stable.h" -@@ -150,9 +149,6 @@ int dynamicByDefault = 0; - /* Hash table mapping symbol names to Symbol */ - static /*Str*/HashTable *symhash; - --/* Hash table mapping symbol names to StgStablePtr */ --static /*Str*/HashTable *stablehash; -- - /* List of currently loaded objects */ - ObjectCode *objects = NULL; /* initially empty */ - -@@ -1126,1 +1126,0 @@ typedef struct _RtsSymbolVal { -- SymI_HasProto(insertStableSymbol) \ -@@ -1488,7 +1483,6 @@ initLinker( void ) - #if defined(THREADED_RTS) && (defined(OBJFORMAT_ELF) || defined(OBJFORMAT_MACHO)) - initMutex(&dl_mutex); - #endif -- stablehash = allocStrHashTable(); - symhash = allocStrHashTable(); - - /* populate the symbol table with stuff from the RTS */ -@@ -1817,17 +1811,6 @@ error: - } - - /* ----------------------------------------------------------------------------- -- * insert a stable symbol in the hash table -- */ -- --void --insertStableSymbol(pathchar* obj_name, char* key, StgPtr p) --{ -- ghciInsertStrHashTable(obj_name, stablehash, key, getStablePtr(p)); --} -- -- --/* ----------------------------------------------------------------------------- - * insert a symbol in the hash table - */ - void -@@ -4749,8 +4732,6 @@ do_Elf_Rel_relocations ( ObjectCode* oc, char* ehdrC, - #ifdef i386_HOST_ARCH - Elf_Addr value; - #endif -- StgStablePtr stablePtr; -- StgPtr stableVal; - #ifdef arm_HOST_ARCH - int is_target_thm=0, T=0; - #endif -@@ -4773,16 +4754,8 @@ do_Elf_Rel_relocations ( ObjectCode* oc, char* ehdrC, - - } else { - symbol = strtab + sym.st_name; -- stablePtr = (StgStablePtr)lookupHashTable(stablehash, (StgWord)symbol); -- if (NULL == stablePtr) { -- /* No, so look up the name in our global table. */ -- S_tmp = lookupSymbol( symbol ); -- S = (Elf_Addr)S_tmp; -- } else { -- stableVal = deRefStablePtr( stablePtr ); -- S_tmp = stableVal; -- S = (Elf_Addr)S_tmp; -- } -+ S_tmp = lookupSymbol( symbol ); -+ S = (Elf_Addr)S_tmp; - } - if (!S) { - errorBelch("%s: unknown symbol `%s'", oc->fileName, symbol); --- -1.7.9.5 - -From 2e5e0f7a90dd390adc5ae5fb2a3bc6e879aa42d6 Mon Sep 17 00:00:00 2001 -From: Takano Akio -Date: Sat, 29 Dec 2012 11:59:34 +0900 -Subject: [PATCH 2/3] ghci: add support for ELF weak symbols - ---- - rts/Linker.c | 102 ++++++++++++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 78 insertions(+), 24 deletions(-) - -diff --git a/rts/Linker.c b/rts/Linker.c -index 513fe3f..5105085 100644 ---- a/rts/Linker.c -+++ b/rts/Linker.c -@@ -146,7 +146,13 @@ int dynamicByDefault = 1; - int dynamicByDefault = 0; - #endif - --/* Hash table mapping symbol names to Symbol */ -+typedef struct _RtsSymbolInfo { -+ void *value; -+ const ObjectCode *owner; -+ HsBool weak; -+} RtsSymbolInfo; -+ -+/* Hash table mapping symbol names to RtsSymbolInfo */ - static /*Str*/HashTable *symhash; - - /* List of currently loaded objects */ -@@ -1415,15 +1421,31 @@ static RtsSymbolVal rtsSyms[] = { - * Insert symbols into hash tables, checking for duplicates. - */ - --static void ghciInsertStrHashTable ( pathchar* obj_name, -- HashTable *table, -- char* key, -- void *data -- ) -+static void ghciInsertSymbolTable( -+ pathchar* obj_name, -+ HashTable *table, -+ char* key, -+ void *data, -+ HsBool weak, -+ ObjectCode *owner) - { -- if (lookupHashTable(table, (StgWord)key) == NULL) -+ RtsSymbolInfo *pinfo = lookupStrHashTable(table, key); -+ if (!pinfo) /* new entry */ -+ { -+ pinfo = stgMallocBytes(sizeof (*pinfo), "ghciInsertToSymbolTable"); -+ pinfo->value = data; -+ pinfo->owner = owner; -+ pinfo->weak = weak; -+ insertStrHashTable(table, key, pinfo); -+ return; -+ } else if ((!pinfo->weak || pinfo->value) && weak) { -+ return; /* duplicate weak symbol, throw it away */ -+ } else if (pinfo->weak) /* weak symbol is in the table */ - { -- insertStrHashTable(table, (StgWord)key, data); -+ /* override the weak definition with the non-weak one */ -+ pinfo->value = data; -+ pinfo->owner = owner; -+ pinfo->weak = HS_BOOL_FALSE; - return; - } - debugBelch( -@@ -1444,6 +1466,32 @@ static void ghciInsertStrHashTable ( pathchar* obj_name, - ); - stg_exit(1); - } -+ -+static HsBool ghciLookupSymbolTable(HashTable *table, -+ const char *key, void **result) -+{ -+ RtsSymbolInfo *pinfo = lookupStrHashTable(table, key); -+ if (!pinfo) { -+ *result = NULL; -+ return HS_BOOL_FALSE; -+ } -+ if (pinfo->weak) -+ IF_DEBUG(linker, debugBelch("lookup: promoting %s\n", key)); -+ /* Once it's looked up, it can no longer be overridden */ -+ pinfo->weak = HS_BOOL_FALSE; -+ -+ *result = pinfo->value; -+ return HS_BOOL_TRUE; -+} -+ -+static void ghciRemoveSymbolTable(HashTable *table, const char *key, -+ ObjectCode *owner) -+{ -+ RtsSymbolInfo *pinfo = lookupStrHashTable(table, key); -+ if (!pinfo || owner != pinfo->owner) return; -+ removeStrHashTable(table, key, NULL); -+ stgFree(pinfo); -+} - /* ----------------------------------------------------------------------------- - * initialize the object linker - */ -@@ -1487,8 +1535,8 @@ initLinker( void ) - - /* populate the symbol table with stuff from the RTS */ - for (sym = rtsSyms; sym->lbl != NULL; sym++) { -- ghciInsertStrHashTable(WSTR("(GHCi built-in symbols)"), -- symhash, sym->lbl, sym->addr); -+ ghciInsertSymbolTable(WSTR("(GHCi built-in symbols)"), -+ symhash, sym->lbl, sym->addr, HS_BOOL_FALSE, NULL); - IF_DEBUG(linker, debugBelch("initLinker: inserting rts symbol %s, %p\n", sym->lbl, sym->addr)); - } - # if defined(OBJFORMAT_MACHO) && defined(powerpc_HOST_ARCH) -@@ -1816,7 +1864,7 @@ error: - void - insertSymbol(pathchar* obj_name, char* key, void* data) - { -- ghciInsertStrHashTable(obj_name, symhash, key, data); -+ ghciInsertSymbolTable(obj_name, symhash, key, data, HS_BOOL_FALSE, NULL); - } - - /* ----------------------------------------------------------------------------- -@@ -1829,9 +1877,8 @@ lookupSymbol( char *lbl ) - IF_DEBUG(linker, debugBelch("lookupSymbol: looking up %s\n", lbl)); - initLinker() ; - ASSERT(symhash != NULL); -- val = lookupStrHashTable(symhash, lbl); - -- if (val == NULL) { -+ if (!ghciLookupSymbolTable(symhash, lbl, &val)) { - IF_DEBUG(linker, debugBelch("lookupSymbol: symbol not found\n")); - # if defined(OBJFORMAT_ELF) - return internal_dlsym(dl_prog_handle, lbl); -@@ -1903,7 +1950,7 @@ void ghci_enquire ( char* addr ) - if (sym == NULL) continue; - a = NULL; - if (a == NULL) { -- a = lookupStrHashTable(symhash, sym); -+ ghciLookupSymbolTable(symhash, sym, (void **)&a); - } - if (a == NULL) { - // debugBelch("ghci_enquire: can't find %s\n", sym); -@@ -2715,7 +2762,7 @@ unloadObj( pathchar *path ) - int i; - for (i = 0; i < oc->n_symbols; i++) { - if (oc->symbols[i] != NULL) { -- removeStrHashTable(symhash, oc->symbols[i], NULL); -+ ghciRemoveSymbolTable(symhash, oc->symbols[i], oc); - } - } - } -@@ -3802,7 +3849,8 @@ ocGetNames_PEi386 ( ObjectCode* oc ) - ASSERT(i >= 0 && i < oc->n_symbols); - /* cstring_from_COFF_symbol_name always succeeds. */ - oc->symbols[i] = (char*)sname; -- ghciInsertStrHashTable(oc->fileName, symhash, (char*)sname, addr); -+ ghciInsertSymbolTable(oc->fileName, symhash, (char*)sname, addr, -+ HS_BOOL_FALSE, oc); - } else { - # if 0 - debugBelch( -@@ -4595,6 +4643,7 @@ ocGetNames_ELF ( ObjectCode* oc ) - for (j = 0; j < nent; j++) { - - char isLocal = FALSE; /* avoids uninit-var warning */ -+ HsBool isWeak = HS_BOOL_FALSE; - char* ad = NULL; - char* nm = strtab + stab[j].st_name; - int secno = stab[j].st_shndx; -@@ -4615,6 +4664,7 @@ ocGetNames_ELF ( ObjectCode* oc ) - else - if ( ( ELF_ST_BIND(stab[j].st_info)==STB_GLOBAL - || ELF_ST_BIND(stab[j].st_info)==STB_LOCAL -+ || ELF_ST_BIND(stab[j].st_info)==STB_WEAK - ) - /* and not an undefined symbol */ - && stab[j].st_shndx != SHN_UNDEF -@@ -4638,7 +4688,8 @@ ocGetNames_ELF ( ObjectCode* oc ) - ad = ehdrC + shdr[ secno ].sh_offset + stab[j].st_value; - if (ELF_ST_BIND(stab[j].st_info)==STB_LOCAL) { - isLocal = TRUE; -- } else { -+ isWeak = FALSE; -+ } else { /* STB_GLOBAL or STB_WEAK */ - #ifdef ELF_FUNCTION_DESC - /* dlsym() and the initialisation table both give us function - * descriptors, so to be consistent we store function descriptors -@@ -4649,6 +4700,7 @@ ocGetNames_ELF ( ObjectCode* oc ) - IF_DEBUG(linker,debugBelch( "addOTabName(GLOB): %10p %s %s\n", - ad, oc->fileName, nm )); - isLocal = FALSE; -+ isWeak = (ELF_ST_BIND(stab[j].st_info)==STB_WEAK); - } - } - -@@ -4661,7 +4713,7 @@ ocGetNames_ELF ( ObjectCode* oc ) - if (isLocal) { - /* Ignore entirely. */ - } else { -- ghciInsertStrHashTable(oc->fileName, symhash, nm, ad); -+ ghciInsertSymbolTable(oc->fileName, symhash, nm, ad, isWeak, oc); - } - } else { - /* Skip. */ -@@ -6306,11 +6358,13 @@ ocGetNames_MachO(ObjectCode* oc) - else - { - IF_DEBUG(linker, debugBelch("ocGetNames_MachO: inserting %s\n", nm)); -- ghciInsertStrHashTable(oc->fileName, symhash, nm, -+ ghciInsertSymbolTable(oc->fileName, symhash, nm, - image - + sections[nlist[i].n_sect-1].offset - - sections[nlist[i].n_sect-1].addr -- + nlist[i].n_value); -+ + nlist[i].n_value, -+ HS_BOOL_FALSE, -+ oc); - oc->symbols[curSymbol++] = nm; - } - } -@@ -6341,8 +6395,8 @@ ocGetNames_MachO(ObjectCode* oc) - nlist[i].n_value = commonCounter; - - IF_DEBUG(linker, debugBelch("ocGetNames_MachO: inserting common symbol: %s\n", nm)); -- ghciInsertStrHashTable(oc->fileName, symhash, nm, -- (void*)commonCounter); -+ ghciInsertSymbolTable(oc->fileName, symhash, nm, -+ (void*)commonCounter, HS_BOOL_FALSE, oc); - oc->symbols[curSymbol++] = nm; - - commonCounter += sz; -@@ -6466,7 +6520,7 @@ machoInitSymbolsWithoutUnderscore(void) - - #undef SymI_NeedsProto - #define SymI_NeedsProto(x) \ -- ghciInsertStrHashTable("(GHCi built-in symbols)", symhash, #x, *p++); -+ ghciInsertSymbolTable("(GHCi built-in symbols)", symhash, #x, *p++, HS_BOOL_FALSE, NULL); - - RTS_MACHO_NOUNDERLINE_SYMBOLS - --- -1.7.9.5 - -From 916d7713b34b529ae7ec24eaa836a4eaca7724fc Mon Sep 17 00:00:00 2001 -From: Takano Akio -Date: Sun, 6 Jan 2013 17:51:19 +0900 -Subject: [PATCH 3/3] Linker.c: add dso_handle to the symbol table - ---- - rts/Linker.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/rts/Linker.c b/rts/Linker.c -index 5105085..0b2bf63 100644 ---- a/rts/Linker.c -+++ b/rts/Linker.c -@@ -1542,6 +1542,13 @@ initLinker( void ) - # if defined(OBJFORMAT_MACHO) && defined(powerpc_HOST_ARCH) - machoInitSymbolsWithoutUnderscore(); - # endif -+ /* GCC defines a special symbol __dso_handle which is resolved to NULL if -+ referenced from a statically linked module. We need to mimic this, but -+ we cannot use NULL because we use it to mean nonexistent symbols. So we -+ use an arbitrary (hopefully unique) address here. -+ */ -+ ghciInsertSymbolTable(WSTR("(GHCi special symbols)"), -+ symhash, "__dso_handle", (void *)0x12345687, HS_BOOL_FALSE, NULL); - - # if defined(OBJFORMAT_ELF) || defined(OBJFORMAT_MACHO) - # if defined(RTLD_DEFAULT) --- -1.7.9.5 - diff --git a/dev-lang/ghc/files/ghc-7.8.3-cc-lang.patch b/dev-lang/ghc/files/ghc-7.8.3-cc-lang.patch deleted file mode 100644 index 032dc9a67624..000000000000 --- a/dev-lang/ghc/files/ghc-7.8.3-cc-lang.patch +++ /dev/null @@ -1,129 +0,0 @@ -commit 4d4d07704ee78221607a18b8118294b0aea1bac4 -Author: Sergei Trofimovich -Date: Tue Sep 2 00:06:56 2014 +0300 - - systools: fix gcc version detecton on non-english locale - - Summary: - ghc runs 'gcc -v' to check if we run under vanilla gcc - or disaguised clang by checking for string - - "gcc version " - - But this check does not always work as gcc has that string - localized via gettext mechanism: - - (some gcc's locale strings) - be.po-msgstr "версія gcc %s\n" - da.po-msgstr "GCC version %s\n" - de.po-msgstr "gcc-Version %s %s\n" - el.po-msgstr "έκδοση gcc %s\n" - ... - - To ping gcc to English locale we now override environment - variable with 'LANGUAGE=en' value. - - Fixes Issue #8825 - - Signed-off-by: Sergei Trofimovich - - Test Plan: validate - - Reviewers: austin - - Reviewed By: austin - - Subscribers: simonmar, ezyang, carter - - Differential Revision: https://phabricator.haskell.org/D185 - - GHC Trac Issues: #8825 - -diff --git a/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs -index 72fa19b..67926f5 100644 ---- a/compiler/main/SysTools.lhs -+++ b/compiler/main/SysTools.lhs -@@ -492,6 +492,51 @@ readCreateProcess proc = do - - return (ex, output) - -+readProcessEnvWithExitCode -+ :: String -- ^ program path -+ -> [String] -- ^ program args -+ -> [(String, String)] -- ^ environment to override -+ -> IO (ExitCode, String, String) -- ^ (exit_code, stdout, stderr) -+readProcessEnvWithExitCode prog args env_update = do -+ current_env <- getEnvironment -+ let new_env = env_update ++ [ (k, v) -+ | let overriden_keys = map fst env_update -+ , (k, v) <- current_env -+ , k `notElem` overriden_keys -+ ] -+ p = proc prog args -+ -+ (_stdin, Just stdoh, Just stdeh, pid) <- -+ createProcess p{ std_out = CreatePipe -+ , std_err = CreatePipe -+ , env = Just new_env -+ } -+ -+ outMVar <- newEmptyMVar -+ errMVar <- newEmptyMVar -+ -+ _ <- forkIO $ do -+ stdo <- hGetContents stdoh -+ _ <- evaluate (length stdo) -+ putMVar outMVar stdo -+ -+ _ <- forkIO $ do -+ stde <- hGetContents stdeh -+ _ <- evaluate (length stde) -+ putMVar errMVar stde -+ -+ out <- takeMVar outMVar -+ hClose stdoh -+ err <- takeMVar errMVar -+ hClose stdeh -+ -+ ex <- waitForProcess pid -+ -+ return (ex, out, err) -+ -+-- Don't let gcc localize version info string, #8825 -+en_locale_env :: [(String, String)] -+en_locale_env = [("LANGUAGE", "en")] - - -- If the -B option is set, add to PATH. This works around - -- a bug in gcc on Windows Vista where it can't find its auxiliary -@@ -746,8 +791,9 @@ getLinkerInfo' dflags = do - _ -> do - -- In practice, we use the compiler as the linker here. Pass - -- -Wl,--version to get linker version info. -- (exitc, stdo, stde) <- readProcessWithExitCode pgm -- ["-Wl,--version"] "" -+ (exitc, stdo, stde) <- readProcessEnvWithExitCode pgm -+ ["-Wl,--version"] -+ en_locale_env - -- Split the output by lines to make certain kinds - -- of processing easier. In particular, 'clang' and 'gcc' - -- have slightly different outputs for '-Wl,--version', but -@@ -802,7 +848,8 @@ getCompilerInfo' dflags = do - - -- Process the executable call - info <- catchIO (do -- (exitc, stdo, stde) <- readProcessWithExitCode pgm ["-v"] "" -+ (exitc, stdo, stde) <- -+ readProcessEnvWithExitCode pgm ["-v"] en_locale_env - -- Split the output by lines to make certain kinds - -- of processing easier. - parseCompilerInfo (lines stdo) (lines stde) exitc -@@ -952,7 +999,8 @@ readElfSection _dflags section exe = do - prog = "readelf" - args = [Option "-p", Option section, FileOption "" exe] - -- -- r <- readProcessWithExitCode prog (filter notNull (map showOpt args)) "" -+ r <- readProcessEnvWithExitCode prog (filter notNull (map showOpt args)) -+ en_locale_env - case r of - (ExitSuccess, out, _err) -> return (doFilter (lines out)) - _ -> return Nothing diff --git a/dev-lang/ghc/files/ghc-7.8.3-deRefStablePtr.patch b/dev-lang/ghc/files/ghc-7.8.3-deRefStablePtr.patch deleted file mode 100644 index 8deec21edc5c..000000000000 --- a/dev-lang/ghc/files/ghc-7.8.3-deRefStablePtr.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit 104a66a461f4f89b8e5ad9c829923bb7ca8ceddb -Author: Sergei Trofimovich -Date: Sat Aug 23 13:11:23 2014 +0300 - - rts/Linker.c: declare 'deRefStablePtr' as an exported 'rts' symbol - - $ inplace/bin/ghc-stage2 -fforce-recomp -dcore-lint -dcmm-lint -dno-debug-output -no-user-package-db -rtsopts -optc-fno-builtin -fno-ghci-history \ - testsuite/tests/ffi/should_run/T4038.hs --interactive -v0 -ignore-dot-ghci +RTS -I0.1 -RTS - - *Main> main - : /tmp/ghc16668_0/ghc16668_5.o: unknown symbol `deRefStablePtr' - - The reference to 'deRefStablePtr' is generated by 'compiler/deSugar/DsForeign.lhs': - the_cfun - = case maybe_target of - Nothing -> text "(StgClosure*)deRefStablePtr(the_stableptr)" - Just hs_fn -> char '&' <> ppr hs_fn <> text "_closure" - - Patch fixes all broken tests using 'import wrapper': - TEST="ffi013 ffi010 ffi011 ffi005 ffi020 ffi006 ffi019 fed001 T1679 T4038" - - Tests manifested as broken only in DYNAMIC_GHC_PROGRAMS=NO builds, - where GHCi's custom linker is used instead of system's linker. - - Signed-off-by: Sergei Trofimovich - -diff --git a/rts/Linker.c b/rts/Linker.c -index e97580d..b24be58 100644 ---- a/rts/Linker.c -+++ b/rts/Linker.c -@@ -1092,6 +1092,7 @@ typedef struct _RtsSymbolVal { - SymI_HasProto(__word_encodeFloat) \ - SymI_HasProto(stg_atomicallyzh) \ - SymI_HasProto(barf) \ -+ SymI_HasProto(deRefStablePtr) \ - SymI_HasProto(debugBelch) \ - SymI_HasProto(errorBelch) \ - SymI_HasProto(sysErrorBelch) \ diff --git a/dev-lang/ghc/files/ghc-7.8.3-ia64-prim.patch b/dev-lang/ghc/files/ghc-7.8.3-ia64-prim.patch deleted file mode 100644 index 9026ecfdf4b1..000000000000 --- a/dev-lang/ghc/files/ghc-7.8.3-ia64-prim.patch +++ /dev/null @@ -1,69 +0,0 @@ -commit e2a8801b9779949010f30db6f6ef66f3c3a70776 -Author: Sergei Trofimovich -Date: Thu Sep 4 17:50:45 2014 +0300 - - pprC: declare extern cmm primitives as functions, not data - - Summary: - The commit fixes incorrect code generation of - integer-gmp package on ia64 due to C prototype mismatch. - Before patch prototype was - StgWord poizh[]; - After patch it became - StgFunPtr poizh(); - - Long story: - - Consider the following simple example: - - {-# LANGUAGE MagicHash, GHCForeignImportPrim, UnliftedFFITypes #-} - module M where - import GHC.Prim -- Int# - foreign import prim "poizh" poi# :: Int# -> Int# - - Before the patch Unregisterised build generated the - following 'poizh' reference: - EI_(poizh); /* StgWord poizh[]; */ - FN_(M_poizh_entry) { - // ... - JMP_((W_)&poizh); - } - - After the patch it looks this way: - EF_(poizh); /* StgFunPtr poizh(); */ - FN_(M_poizh_entry) { - // ... - JMP_((W_)&poizh); - } - - On ia64 it leads to different relocation types being generated: - incorrect one: - addl r14 = @ltoffx(poizh#) - ld8.mov r14 = [r14], poizh# - correct one: - addl r14 = @ltoff(@fptr(poizh#)), gp - ld8 r14 = [r14] - - '@fptr(poizh#)' basically instructs assembler to creates - another obect consisting of real address to 'poizh' instructions - and module address. That '@fptr' object is used as a function "address". - This object is different for every module referencing 'poizh' symbol. - - All indirect function calls expect '@fptr' object. That way - call site can read real destination address and set destination - module address in 'gp' register. - - Signed-off-by: Sergei Trofimovich - -diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs -index 02ad026..0f2c0ae 100644 ---- a/compiler/cmm/CLabel.hs -+++ b/compiler/cmm/CLabel.hs -@@ -813,6 +813,7 @@ labelType (CmmLabel _ _ CmmClosure) = GcPtrLabel - labelType (CmmLabel _ _ CmmCode) = CodeLabel - labelType (CmmLabel _ _ CmmInfo) = DataLabel - labelType (CmmLabel _ _ CmmEntry) = CodeLabel -+labelType (CmmLabel _ _ CmmPrimCall) = CodeLabel - labelType (CmmLabel _ _ CmmRetInfo) = DataLabel - labelType (CmmLabel _ _ CmmRet) = CodeLabel - labelType (RtsLabel (RtsSelectorInfoTable _ _)) = DataLabel diff --git a/dev-lang/ghc/files/ghc-7.8.3-pic-asm.patch b/dev-lang/ghc/files/ghc-7.8.3-pic-asm.patch deleted file mode 100644 index 10c41d5b29f6..000000000000 --- a/dev-lang/ghc/files/ghc-7.8.3-pic-asm.patch +++ /dev/null @@ -1,107 +0,0 @@ -commit a93ab43ab5f40cadbedea2f6342b93c245e91434 -Author: Sergei Trofimovich -Date: Wed Aug 27 22:19:52 2014 +0300 - - driver: pass '-fPIC' option to assembler as well - - Summary: - Before the patch '-fPIC' was passed only to C compiler, - but not to assembler itself. - - It led to runtime crash in GHC_DYNAMIC_PROGRAMS=YES mode - on sparc32. - - Technical details are in 'Note [-fPIC for assembler]'. - - Signed-off-by: Sergei Trofimovich - - Test Plan: validate on sparc - - Reviewers: simonmar, austin, kgardas - - Reviewed By: austin - - Subscribers: simonmar, ezyang, carter - - Differential Revision: https://phabricator.haskell.org/D177 - -diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs -index 183f435..5a18e6e 100644 ---- a/compiler/main/DriverPipeline.hs -+++ b/compiler/main/DriverPipeline.hs -@@ -1199,6 +1199,7 @@ runPhase (RealPhase (As with_cpp)) input_fn dflags - - as_prog <- whichAsProg - let cmdline_include_paths = includePaths dflags -+ let pic_c_flags = picCCOpts dflags - - next_phase <- maybeMergeStub - output_fn <- phaseOutputFilename next_phase -@@ -1212,6 +1213,9 @@ runPhase (RealPhase (As with_cpp)) input_fn dflags - = liftIO $ as_prog dflags - ([ SysTools.Option ("-I" ++ p) | p <- cmdline_include_paths ] - -+ -- See Note [-fPIC for assembler] -+ ++ map SysTools.Option pic_c_flags -+ - -- We only support SparcV9 and better because V8 lacks an atomic CAS - -- instruction so we have to make sure that the assembler accepts the - -- instruction set. Note that the user can still override this -@@ -1253,6 +1257,8 @@ runPhase (RealPhase SplitAs) _input_fn dflags - osuf = objectSuf dflags - split_odir = base_o ++ "_" ++ osuf ++ "_split" - -+ let pic_c_flags = picCCOpts dflags -+ - -- this also creates the hierarchy - liftIO $ createDirectoryIfMissing True split_odir - -@@ -1286,6 +1292,9 @@ runPhase (RealPhase SplitAs) _input_fn dflags - then [SysTools.Option "-mcpu=v9"] - else []) ++ - -+ -- See Note [-fPIC for assembler] -+ map SysTools.Option pic_c_flags ++ -+ - [ SysTools.Option "-c" - , SysTools.Option "-o" - , SysTools.FileOption "" (split_obj n) -@@ -2203,3 +2212,38 @@ haveRtsOptsFlags dflags = - isJust (rtsOpts dflags) || case rtsOptsEnabled dflags of - RtsOptsSafeOnly -> False - _ -> True -+ -+-- Note [-fPIC for assembler] -+-- When compiling .c source file GHC's driver pipeline basically -+-- does the following two things: -+-- 1. ${CC} -S 'PIC_CFLAGS' source.c -+-- 2. ${CC} -x assembler -c 'PIC_CFLAGS' source.S -+-- -+-- Why do we need to pass 'PIC_CFLAGS' both to C compiler and assembler? -+-- Because on some architectures (at least sparc32) assembler also choses -+-- relocation type! -+-- Consider the following C module: -+-- -+-- /* pic-sample.c */ -+-- int v; -+-- void set_v (int n) { v = n; } -+-- int get_v (void) { return v; } -+-- -+-- $ gcc -S -fPIC pic-sample.c -+-- $ gcc -c pic-sample.s -o pic-sample.no-pic.o # incorrect binary -+-- $ gcc -c -fPIC pic-sample.s -o pic-sample.pic.o # correct binary -+-- -+-- $ objdump -r -d pic-sample.pic.o > pic-sample.pic.o.od -+-- $ objdump -r -d pic-sample.no-pic.o > pic-sample.no-pic.o.od -+-- $ diff -u pic-sample.pic.o.od pic-sample.no-pic.o.od -+-- -+-- Most of architectures won't show any difference in this test, but on sparc32 -+-- the following assembly snippet: -+-- -+-- sethi %hi(_GLOBAL_OFFSET_TABLE_-8), %l7 -+-- -+-- generates two kinds or relocations, only 'R_SPARC_PC22' is correct: -+-- -+-- 3c: 2f 00 00 00 sethi %hi(0), %l7 -+-- - 3c: R_SPARC_PC22 _GLOBAL_OFFSET_TABLE_-0x8 -+-- + 3c: R_SPARC_HI22 _GLOBAL_OFFSET_TABLE_-0x8 diff --git a/dev-lang/ghc/files/ghc-7.8.3-unreg-lit.patch b/dev-lang/ghc/files/ghc-7.8.3-unreg-lit.patch deleted file mode 100644 index 632696d6fde7..000000000000 --- a/dev-lang/ghc/files/ghc-7.8.3-unreg-lit.patch +++ /dev/null @@ -1,84 +0,0 @@ -commit a6ea05e21e175407dc9e45f18c56c1d727fd0f26 -Author: Sergei Trofimovich -Date: Fri Aug 22 23:24:32 2014 +0300 - - UNREG: fix emission of large Integer literals in C codegen - - Summary: - On amd64/UNREG build there is many failing tests trying - to deal with 'Integer' types. - - Looking at 'overflow1' test I've observed invalid C code generated by - GHC. - - Cmm code - CInt a = -1; (a == -1) - yields 'False' with optimisations enabled via the following C code: - StgWord64 a = (StgWord32)0xFFFFffffFFFFffffu; (a == 0xFFFFffffFFFFffffu) - - The patch fixes it by shrinking emitted literals to required sizes: - StgWord64 a = (StgWord32)0xFFFFffffu; (a == 0xFFFFffffu) - - Thanks to Reid Barton for tracking down and fixing the issue. - - Signed-off-by: Sergei Trofimovich - - Test Plan: validate on UNREG build (amd64) - - Reviewers: simonmar, rwbarton, austin - - Subscribers: simonmar, ezyang, carter - - Differential Revision: https://phabricator.haskell.org/D173 - -diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs -index 93a5d06..8605988 100644 ---- a/compiler/cmm/PprC.hs -+++ b/compiler/cmm/PprC.hs -@@ -1221,8 +1221,9 @@ commafy xs = hsep $ punctuate comma xs - pprHexVal :: Integer -> Width -> SDoc - pprHexVal 0 _ = ptext (sLit "0x0") - pprHexVal w rep -- | w < 0 = parens (char '-' <> ptext (sLit "0x") <> go (-w) <> repsuffix rep) -- | otherwise = ptext (sLit "0x") <> go w <> repsuffix rep -+ | w < 0 = parens (char '-' <> -+ ptext (sLit "0x") <> intToDoc (-w) <> repsuffix rep) -+ | otherwise = ptext (sLit "0x") <> intToDoc w <> repsuffix rep - where - -- type suffix for literals: - -- Integer literals are unsigned in Cmm/C. We explicitly cast to -@@ -1237,10 +1238,33 @@ pprHexVal w rep - else panic "pprHexVal: Can't find a 64-bit type" - repsuffix _ = char 'U' - -+ intToDoc :: Integer -> SDoc -+ intToDoc i = go (truncInt i) -+ -+ -- We need to truncate value as Cmm backend does not drop -+ -- redundant bits to ease handling of negative values. -+ -- Thus the following Cmm code on 64-bit arch, like amd64: -+ -- CInt v; -+ -- v = {something}; -+ -- if (v == %lobits32(-1)) { ... -+ -- leads to the following C code: -+ -- StgWord64 v = (StgWord32)({something}); -+ -- if (v == 0xFFFFffffFFFFffffU) { ... -+ -- Such code is incorrect as it promotes both operands to StgWord64 -+ -- and the whole condition is always false. -+ truncInt :: Integer -> Integer -+ truncInt i = -+ case rep of -+ W8 -> i `rem` (2^(8 :: Int)) -+ W16 -> i `rem` (2^(16 :: Int)) -+ W32 -> i `rem` (2^(32 :: Int)) -+ W64 -> i `rem` (2^(64 :: Int)) -+ _ -> panic ("pprHexVal/truncInt: C backend can't encode " -+ ++ show rep ++ " literals") -+ - go 0 = empty - go w' = go q <> dig - where - (q,r) = w' `quotRem` 16 - dig | r < 10 = char (chr (fromInteger r + ord '0')) - | otherwise = char (chr (fromInteger r - 10 + ord 'a')) -- diff --git a/dev-lang/ghc/files/terminfo-0.3.2.5-tinfo.patch b/dev-lang/ghc/files/terminfo-0.3.2.5-tinfo.patch deleted file mode 100644 index ca10da2e03ae..000000000000 --- a/dev-lang/ghc/files/terminfo-0.3.2.5-tinfo.patch +++ /dev/null @@ -1,25 +0,0 @@ -http://bugs.gentoo.org/454216 - -Mon Jan 7 16:34:47 FET 2013 Judah Jacobson - * Search for terminfo in libtinfo; fixes GHC #7281. - - Patch from Paul Johnson. -diff -rN -u old-terminfo/configure.ac new-terminfo/configure.ac ---- old-terminfo/configure.ac 2013-02-14 00:16:11.816111434 +0300 -+++ new-terminfo/configure.ac 2013-02-14 00:16:11.819111434 +0300 -@@ -39,10 +39,11 @@ - TERMINFO_INCLUDES="$CursesIncludes term.h" - fi - --AC_CHECK_LIB(ncursesw, setupterm, HaveLibCurses=YES; LibCurses=ncursesw, -- [AC_CHECK_LIB(ncurses, setupterm, HaveLibCurses=YES; LibCurses=ncurses, -- [AC_CHECK_LIB(curses, setupterm, HaveLibCurses=YES; LibCurses=curses, -- HaveLibCurses=NO; LibCurses=not-installed)])]) -+AC_CHECK_LIB(tinfo, setupterm, HaveLibCurses=YES; LibCurses=tinfo, -+ [AC_CHECK_LIB(ncursesw, setupterm, HaveLibCurses=YES; LibCurses=ncursesw, -+ [AC_CHECK_LIB(ncurses, setupterm, HaveLibCurses=YES; LibCurses=ncurses, -+ [AC_CHECK_LIB(curses, setupterm, HaveLibCurses=YES; LibCurses=curses, -+ HaveLibCurses=NO; LibCurses=not-installed)])])]) - - if test "x$HaveLibCurses" = "xNO" ; then - AC_MSG_FAILURE([curses library not found, so this package cannot be built]) diff --git a/dev-lang/ghc/ghc-7.10.2-r1.ebuild b/dev-lang/ghc/ghc-7.10.2-r1.ebuild deleted file mode 100644 index c010b36d0746..000000000000 --- a/dev-lang/ghc/ghc-7.10.2-r1.ebuild +++ /dev/null @@ -1,653 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# to make make a crosscompiler use crossdev and symlink ghc tree into -# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc' -# -# 'CTARGET' definition and 'is_crosscompile' are taken from 'toolchain.eclass' -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} = ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi - -inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package -inherit multilib pax-utils toolchain-funcs versionator - -DESCRIPTION="The Glasgow Haskell Compiler" -HOMEPAGE="http://www.haskell.org/ghc/" - -# we don't have any binaries yet -arch_binaries="" - -# sorted! -#arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )" -#arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )" -arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PVR}-amd64-noncurses.tbz2 )" -#arch_binaries="$arch_binaries ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )" -#arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-ppc.tbz2 )" -#arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )" -#arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )" -arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-${PVR}-x86-noncurses.tbz2 )" - -# various ports: -#arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )" - -# 0 - yet -yet_binary() { - case "${ARCH}" in - #alpha) return 0 ;; - #arm) - # ewarn "ARM binary is built on armv5tel-eabi toolchain. Use with caution." - # return 0 - #;; - amd64) return 0 ;; - #ia64) return 0 ;; - #ppc) return 0 ;; - #ppc64) return 0 ;; - #sparc) return 0 ;; - x86) return 0 ;; - *) return 1 ;; - esac -} - -GHC_PV=${PV} -#GHC_PV=7.10.1.20150630 # uncomment only for -rc ebuilds -GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct - -#SRC_URI="!binary? ( http://downloads.haskell.org/~ghc/${PV/_rc/-rc}/${GHC_P}-src.tar.bz2 )" -# Upstream tarball was repackaged and inplace-updated. CDN cached old version for -# many users -SRC_URI="!binary? ( http://dev.gentoo.org/~slyfox/distfiles/${GHC_P}-src.tar.bz2 )" -S="${WORKDIR}"/${GHC_P} - -[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )" - -BUMP_LIBRARIES=( - # "hackage-name hackage-version" - "binary 0.7.5.0" - "hoopl 3.10.1.0" - "transformers 0.4.3.0" -) - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc ghcbootstrap ghcmakebinary +gmp" -IUSE+=" binary" -IUSE+=" elibc_glibc" # system stuff - -RDEPEND=" - >=dev-lang/perl-5.6.1 - >=dev-libs/gmp-5:= - sys-libs/ncurses:=[unicode] - !ghcmakebinary? ( virtual/libffi:= ) - !kernel_Darwin? ( >=sys-devel/gcc-2.95.3:* ) - kernel_linux? ( >=sys-devel/binutils-2.17:* ) - kernel_SunOS? ( >=sys-devel/binutils-2.17:* ) -" - -# force dependency on >=gmp-5, even if >=gmp-4.1 would be enough. this is due to -# that we want the binaries to use the latest versioun available, and not to be -# built against gmp-4 - -# similar for glibc. we have bootstrapped binaries against glibc-2.17 -DEPEND="${RDEPEND} - doc? ( app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - >=dev-libs/libxslt-1.1.2 ) - !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) )" - -PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )" - -REQUIRED_USE="?? ( ghcbootstrap binary )" - -# haskell libraries built with cabal in configure mode, #515354 -QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc" - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -append-ghc-cflags() { - local persistent compile assemble link - local flag ghcflag - - for flag in $*; do - case ${flag} in - persistent) persistent="yes";; - compile) compile="yes";; - assemble) assemble="yes";; - link) link="yes";; - *) - [[ ${compile} ]] && ghcflag="-optc${flag}" CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" && - [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}" - [[ ${assemble} ]] && ghcflag="-opta${flag}" CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" && - [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}" - [[ ${link} ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" && - [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}" - ;; - esac - done -} - -# $1 - lib name (under libraries/) -# $2 - lib version -# example: bump_lib "transformers" "0.4.2.0" -bump_lib() { - local pn=$1 pv=$2 - local p=${pn}-${pv} - local f - - einfo "Bumping ${pn} up to ${pv}" - - for f in ghc.mk GNUmakefile; do - mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die - done - mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die - mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die -} - -update_SRC_URI() { - local p pn pv - for p in "${BUMP_LIBRARIES[@]}"; do - set -- $p - pn=$1 pv=$2 - - SRC_URI+=" mirror://hackage/package/${pn}/${pn}-${pv}.tar.gz" - done -} - -update_SRC_URI - -bump_libs() { - local p pn pv - for p in "${BUMP_LIBRARIES[@]}"; do - set -- $p - pn=$1 pv=$2 - - bump_lib "${pn}" "${pv}" - done -} - -ghc_setup_cflags() { - if is_crosscompile; then - export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"} - export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"} - einfo "Crosscompiling mode:" - einfo " CHOST: ${CHOST}" - einfo " CTARGET: ${CTARGET}" - einfo " CFLAGS: ${CFLAGS}" - einfo " LDFLAGS: ${LDFLAGS}" - return - fi - # We need to be very careful with the CFLAGS we ask ghc to pass through to - # gcc. There are plenty of flags which will make gcc produce output that - # breaks ghc in various ways. The main ones we want to pass through are - # -mcpu / -march flags. These are important for arches like alpha & sparc. - # We also use these CFLAGS for building the C parts of ghc, ie the rts. - strip-flags - strip-unsupported-flags - - # Cmm can't parse line numbers #482086 - replace-flags -ggdb[3-9] -ggdb2 - - GHC_FLAGS="" - GHC_PERSISTENT_FLAGS="" - for flag in ${CFLAGS}; do - case ${flag} in - - # Ignore extra optimisation (ghc passes -O to gcc anyway) - # -O2 and above break on too many systems - -O*) ;; - - # Arch and ABI flags are what we're really after - -m*) append-ghc-cflags compile assemble ${flag};; - - # Sometimes it's handy to see backtrace of RTS - # to get an idea what happens there - -g*) append-ghc-cflags compile ${flag};; - - # Ignore all other flags, including all -f* flags - esac - done - - for flag in ${LDFLAGS}; do - append-ghc-cflags link ${flag} - done - - # hardened-gcc needs to be disabled, because the mangler doesn't accept - # its output. - gcc-specs-pie && append-ghc-cflags persistent compile link -nopie - gcc-specs-ssp && append-ghc-cflags persistent compile -fno-stack-protector - - # prevent from failind building unregisterised ghc: - # http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html - use ppc64 && append-ghc-cflags persistent compile -mminimal-toc - # fix the similar issue as ppc64 TOC on ia64. ia64 has limited size of small data - # currently ghc fails to build haddock - # http://osdir.com/ml/gnu.binutils.bugs/2004-10/msg00050.html - use ia64 && append-ghc-cflags persistent compile -G0 -} - -# substitutes string $1 to $2 in files $3 $4 ... -relocate_path() { - local from=$1 - local to=$2 - shift 2 - local file= - for file in "$@" - do - sed -i -e "s|$from|$to|g" \ - "$file" || die "path relocation failed for '$file'" - done -} - -# changes hardcoded ghc paths and updates package index -# $1 - new absolute root path -relocate_ghc() { - local to=$1 - - # libdir for prebuilt binary and for current system may mismatch - # It does for prefix installation for example: bug #476998 - local bin_ghc_prefix=${WORKDIR}/usr - local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*) - local bin_libdir=${bin_libpath#${bin_ghc_prefix}/} - - # backup original script to use it later after relocation - local gp_back="${T}/ghc-pkg-${GHC_PV}-orig" - cp "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" "$gp_back" || die "unable to backup ghc-pkg wrapper" - - if [[ ${bin_libdir} != $(get_libdir) ]]; then - einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)" - # moving the dir itself is not strictly needed - # but then USE=binary would result in installing - # in '${bin_libdir}' - mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die - - relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \ - "${WORKDIR}/usr/bin/ghc-${GHC_PV}" \ - "${WORKDIR}/usr/bin/ghci-${GHC_PV}" \ - "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \ - "${WORKDIR}/usr/bin/hsc2hs" \ - "${WORKDIR}/usr/bin/runghc-${GHC_PV}" \ - "$gp_back" \ - "${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"* - fi - - # Relocate from /usr to ${EPREFIX}/usr - relocate_path "/usr" "${to}/usr" \ - "${WORKDIR}/usr/bin/ghc-${GHC_PV}" \ - "${WORKDIR}/usr/bin/ghci-${GHC_PV}" \ - "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \ - "${WORKDIR}/usr/bin/hsc2hs" \ - "${WORKDIR}/usr/bin/runghc-${GHC_PV}" \ - "${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"* - - # this one we will use to regenerate cache - # so it should point to current tree location - relocate_path "/usr" "${WORKDIR}/usr" "$gp_back" - - if use prefix; then - # and insert LD_LIBRARY_PATH entry to EPREFIX dir tree - # TODO: add the same for darwin's CHOST and it's DYLD_ - local new_ldpath='LD_LIBRARY_PATH="'${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)'${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"\nexport LD_LIBRARY_PATH' - sed -i -e '2i'"$new_ldpath" \ - "${WORKDIR}/usr/bin/ghc-${GHC_PV}" \ - "${WORKDIR}/usr/bin/ghci-${GHC_PV}" \ - "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \ - "${WORKDIR}/usr/bin/hsc2hs" \ - "${WORKDIR}/usr/bin/runghc-${GHC_PV}" \ - "$gp_back" \ - "${WORKDIR}/usr/bin/hsc2hs" \ - || die "Adding LD_LIBRARY_PATH for wrappers failed" - fi - - # regenerate the binary package cache - "$gp_back" recache || die "failed to update cache after relocation" - rm "$gp_back" -} - -pkg_setup() { - # quiet portage about prebuilt binaries - use binary && QA_PREBUILT="*" - - [[ ${MERGE_TYPE} == binary ]] && return - - if use ghcbootstrap; then - ewarn "You requested ghc bootstrapping, this is usually only used" - ewarn "by Gentoo developers to make binary .tbz2 packages." - - [[ -z $(type -P ghc) ]] && \ - die "Could not find a ghc to bootstrap with." - else - if ! yet_binary; then - eerror "Please try emerging with USE=ghcbootstrap and report build" - eerror "sucess or failure to the haskell team (haskell@gentoo.org)" - die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap" - fi - fi -} - -src_unpack() { - # Create the ${S} dir if we're using the binary version - use binary && mkdir "${S}" - - # the Solaris and Darwin binaries from ghc (maeder) need to be - # unpacked separately, so prevent them from being unpacked - local ONLYA=${A} - case ${CHOST} in - *-darwin* | *-solaris*) ONLYA=${GHC_P}-src.tar.bz2 ;; - esac - unpack ${ONLYA} - - if [[ -d "${S}"/libraries/dph ]]; then - # Sometimes dph libs get accidentally shipped with ghc - # but they are not installed unless user requests it. - # We never install them. - elog "Removing 'libraries/dph'" - rm -rf "${S}"/libraries/dph - fi -} - -src_prepare() { - ghc_setup_cflags - - if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then - # Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS. - # See bug #313635. - sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \ - "${WORKDIR}/usr/bin/ghc-${GHC_PV}" - - # allow hardened users use vanilla binary to bootstrap ghc - # ghci uses mmap with rwx protection at it implements dynamic - # linking on it's own (bug #299709) - pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${GHC_P}/bin/ghc" - fi - - if use binary; then - if use prefix; then - relocate_ghc "${EPREFIX}" - fi - - # Move unpacked files to the expected place - mv "${WORKDIR}/usr" "${S}" - else - if ! use ghcbootstrap; then - case ${CHOST} in - *-darwin* | *-solaris*) - # UPDATE ME for ghc-7 - mkdir "${WORKDIR}"/ghc-bin-installer || die - pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die - use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2 - use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2 - use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2 - use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2 - popd > /dev/null - - pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die - # fix the binaries so they run, on Solaris we need an - # LD_LIBRARY_PATH which has our prefix libdirs, on - # Darwin we need to replace the frameworks with our libs - # from the prefix fix before installation, because some - # of the tools are actually used during configure/make - if [[ ${CHOST} == *-solaris* ]] ; then - export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}" - elif [[ ${CHOST} == *-darwin* ]] ; then - local readline_framework=GNUreadline.framework/GNUreadline - local gmp_framework=/opt/local/lib/libgmp.10.dylib - local ncurses_file=/opt/local/lib/libncurses.5.dylib - for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do - install_name_tool -change \ - ${readline_framework} \ - "${EPREFIX}"/lib/libreadline.dylib \ - ${binary} || die - install_name_tool -change \ - ${gmp_framework} \ - "${EPREFIX}"/usr/lib/libgmp.dylib \ - ${binary} || die - install_name_tool -change \ - ${ncurses_file} \ - "${EPREFIX}"/usr/lib/libncurses.dylib \ - ${binary} || die - done - # we don't do frameworks! - sed -i \ - -e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \ - -e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \ - rts/package.conf.in || die - fi - - # it is autoconf, but we really don't want to give it too - # much arguments, in fact we do the make in-place anyway - ./configure --prefix="${WORKDIR}"/usr || die - make install || die - popd > /dev/null - ;; - *) - relocate_ghc "${WORKDIR}" - ;; - esac - fi - - sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \ - "${S}/ghc/ghc.wrapper" - - cd "${S}" # otherwise epatch will break - - epatch "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch - - epatch "${FILESDIR}"/${PN}-7.8.2-cgen-constify.patch - epatch "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch - epatch "${FILESDIR}"/${PN}-7.10.1-rc3-ghc-7.10-bootstrap.patch - epatch "${FILESDIR}"/${PN}-7.10.1-T10590-dequeue.patch - # Since ${S}/packages does not include base, etc. add them to gen_contents_index - sed -e 's@\(for REPO in .*\)@\1 base integer-gmp integer-gmp2 integer-simple template-haskell@' \ - -i libraries/gen_contents_index || die - - if use prefix; then - # Make configure find docbook-xsl-stylesheets from Prefix - sed -e '/^FP_DIR_DOCBOOK_XSL/s:\[.*\]:['"${EPREFIX}"'/usr/share/sgml/docbook/xsl-stylesheets/]:' \ - -i utils/haddock/doc/configure.ac || die - fi - - bump_libs - - # as we have changed the build system - eautoreconf - fi -} - -src_configure() { - if ! use binary; then - # initialize build.mk - echo '# Gentoo changes' > mk/build.mk - - # Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV} - echo "docdir = ${EPREFIX}/usr/share/doc/${P}" >> mk/build.mk - echo "htmldir = ${EPREFIX}/usr/share/doc/${P}" >> mk/build.mk - - # We also need to use the GHC_FLAGS flags when building ghc itself - echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk - echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk - echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk - - # We can't depend on haddock except when bootstrapping when we - # must build docs and include them into the binary .tbz2 package - # app-text/dblatex is not in portage, can not build PDF or PS - echo "BUILD_DOCBOOK_PDF = NO" >> mk/build.mk - echo "BUILD_DOCBOOK_PS = NO" >> mk/build.mk - if use doc; then - echo "BUILD_DOCBOOK_HTML = YES" >> mk/build.mk - else - echo "BUILD_DOCBOOK_HTML = NO" >> mk/build.mk - fi - - # this controls presence on 'xhtml' and 'haddock' in final install - echo "HADDOCK_DOCS = YES" >> mk/build.mk - - # allows overriding build flavours for libraries: - # v - vanilla (static libs) - # p - profiled - # dyn - shared libraries - # example: GHC_LIBRARY_WAYS="v dyn" - if [[ -n ${GHC_LIBRARY_WAYS} ]]; then - echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk - fi - - # Get ghc from the unpacked binary .tbz2 - # except when bootstrapping we just pick ghc up off the path - if ! use ghcbootstrap; then - export PATH="${WORKDIR}/usr/bin:${PATH}" - fi - - if use gmp; then - echo "INTEGER_LIBRARY=integer-gmp2" >> mk/build.mk - else - echo "INTEGER_LIBRARY=integer-simple" >> mk/build.mk - fi - - # don't strip anything. Very useful when stage2 SIGSEGVs on you - echo "STRIP_CMD = :" >> mk/build.mk - - local econf_args=() - - # GHC embeds 'gcc' it was built by and uses it later. - # Don't allow things like ccache or versioned binary slip. - # We use stable thing across gcc upgrades. - is_crosscompile || econf_args+=(--with-gcc=${CHOST}-gcc) - - if use ghcmakebinary; then - # When building booting libary we are trying to - # bundle or restrict most of external depends - # with unstable ABI: - # - embed libffi (default GHC behaviour) - # - disable ncurses support for ghci (via haskeline) - # https://bugs.gentoo.org/557478 - # - disable ncurses support for ghc-pkg - echo "libraries/haskeline_CONFIGURE_OPTS += --flag=-terminfo" >> mk/build.mk - echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk - else - econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@')) - fi - - elog "Final mk/build.mk:" - cat mk/build.mk || die - - econf ${econf_args[@]} --enable-bootstrap-with-devel-snapshot - - if [[ ${PV} == *9999* ]]; then - GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')" - GHC_P=${PN}-${GHC_PV} - fi - GHC_TPF="$(grep 'S\[\"TargetPlatformFull\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')" - fi # ! use binary -} - -src_compile() { - if ! use binary; then - # 1. build compiler binary first - emake ghc/stage2/build/tmp/ghc-stage2 - # 2. pax-mark (bug #516430) - pax-mark -m ghc/stage2/build/tmp/ghc-stage2 - # 3. and then all the rest - emake all - fi # ! use binary -} - -src_install() { - if use binary; then - use prefix && mkdir -p "${ED}" - mv "${S}/usr" "${ED}" - else - - emake -j1 install DESTDIR="${D}" - dodoc "distrib/README" "ANNOUNCE" "LICENSE" "VERSION" - - # rename ghc-shipped files to avoid collision - # of external packages. Motivating example: - # user had installed: - # dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0) - # dev-haskell/transformers-0.4.2.0 - # then user tried to update to - # dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0) - # this will lead to single .conf file collision. - local shipped_conf renamed_conf - local package_confdir="${ED}/usr/$(get_libdir)/${GHC_P}/package.conf.d" - for shipped_conf in "${package_confdir}"/*.conf; do - # rename 'pkg-ver-id.conf' to 'pkg-ver-id-gentoo-${PF}.conf' - renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf - mv "${shipped_conf}" "${renamed_conf}" || die - done - - # remove link, but leave 'haddock-${GHC_P}' - rm -f "${ED}"/usr/bin/haddock - - if [[ ! -f "${S}/VERSION" ]]; then - echo "${GHC_PV}" > "${S}/VERSION" \ - || die "Could not create file ${S}/VERSION" - fi - newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg - newbashcomp utils/completion/ghc.bash ghc - fi - - # path to the package.cache - local package_confdir="${ED}/usr/$(get_libdir)/${GHC_P}/package.conf.d" - PKGCACHE="${package_confdir}"/package.cache - # copy the package.conf.d, including timestamp, save it so we can help - # users that have a broken package.conf.d - cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d" - - # copy the package.conf, including timestamp, save it so we later can put it - # back before uninstalling, or when upgrading. - cp -p "${PKGCACHE}"{,.shipped} \ - || die "failed to copy package.conf.d/package.cache" -} - -pkg_preinst() { - # have we got an earlier version of ghc installed? - if has_version "<${CATEGORY}/${PF}"; then - haskell_updater_warn="1" - fi -} - -pkg_postinst() { - ghc-reregister - - # path to the package.cache - PKGCACHE="${EROOT}/usr/$(get_libdir)/${GHC_P}/package.conf.d/package.cache" - - # give the cache a new timestamp, it must be as recent as - # the package.conf.d directory. - touch "${PKGCACHE}" - - if [[ "${haskell_updater_warn}" == "1" ]]; then - ewarn - ewarn "\e[1;31m************************************************************************\e[0m" - ewarn - ewarn "You have just upgraded from an older version of GHC." - ewarn "You may have to run" - ewarn " 'haskell-updater'" - ewarn "to rebuild all ghc-based Haskell libraries." - ewarn - ewarn "\e[1;31m************************************************************************\e[0m" - ewarn - fi -} - -pkg_prerm() { - PKGCACHE="${EROOT}/usr/$(get_libdir)/${GHC_P}/package.conf.d/package.cache" - rm -rf "${PKGCACHE}" - - cp -p "${PKGCACHE}"{.shipped,} -} - -pkg_postrm() { - ghc-package_pkg_postrm -} diff --git a/dev-lang/ghc/ghc-7.10.2.ebuild b/dev-lang/ghc/ghc-7.10.2.ebuild deleted file mode 100644 index 719778ce02fe..000000000000 --- a/dev-lang/ghc/ghc-7.10.2.ebuild +++ /dev/null @@ -1,643 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# to make make a crosscompiler use crossdev and symlink ghc tree into -# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc' -# -# 'CTARGET' definition and 'is_crosscompile' are taken from 'toolchain.eclass' -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} = ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi - -inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package -inherit multilib pax-utils toolchain-funcs versionator - -DESCRIPTION="The Glasgow Haskell Compiler" -HOMEPAGE="http://www.haskell.org/ghc/" - -# we don't have any binaries yet -arch_binaries="" - -# sorted! -#arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )" -#arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )" -arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PV}-amd64.tbz2 )" -#arch_binaries="$arch_binaries ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )" -#arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-ppc.tbz2 )" -#arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )" -#arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )" -arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-${PV}-x86.tbz2 )" - -# various ports: -#arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )" - -# 0 - yet -yet_binary() { - case "${ARCH}" in - #alpha) return 0 ;; - #arm) - # ewarn "ARM binary is built on armv5tel-eabi toolchain. Use with caution." - # return 0 - #;; - amd64) return 0 ;; - #ia64) return 0 ;; - #ppc) return 0 ;; - #ppc64) return 0 ;; - #sparc) return 0 ;; - x86) return 0 ;; - *) return 1 ;; - esac -} - -GHC_PV=${PV} -#GHC_PV=7.10.1.20150630 # uncomment only for -rc ebuilds -GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct - -#SRC_URI="!binary? ( http://downloads.haskell.org/~ghc/${PV/_rc/-rc}/${GHC_P}-src.tar.bz2 )" -# Upstream tarball was repackaged and inplace-updated. CDN cached old version for -# many users -SRC_URI="!binary? ( https://dev.gentoo.org/~slyfox/distfiles/${GHC_P}-src.tar.bz2 )" -S="${WORKDIR}"/${GHC_P} - -[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )" - -BUMP_LIBRARIES=( - # "hackage-name hackage-version" - "binary 0.7.5.0" - "hoopl 3.10.1.0" - "transformers 0.4.3.0" -) - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc ghcbootstrap ghcmakebinary +gmp" -IUSE+=" binary" -IUSE+=" elibc_glibc" # system stuff - -RDEPEND=" - >=dev-lang/perl-5.6.1 - >=dev-libs/gmp-5:= - sys-libs/ncurses:=[unicode] - !ghcmakebinary? ( virtual/libffi:= ) - !kernel_Darwin? ( >=sys-devel/gcc-2.95.3:* ) - kernel_linux? ( >=sys-devel/binutils-2.17:* ) - kernel_SunOS? ( >=sys-devel/binutils-2.17:* ) -" - -# force dependency on >=gmp-5, even if >=gmp-4.1 would be enough. this is due to -# that we want the binaries to use the latest versioun available, and not to be -# built against gmp-4 - -# similar for glibc. we have bootstrapped binaries against glibc-2.17 -DEPEND="${RDEPEND} - doc? ( app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - >=dev-libs/libxslt-1.1.2 ) - !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) )" - -PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )" - -REQUIRED_USE="?? ( ghcbootstrap binary )" - -# haskell libraries built with cabal in configure mode, #515354 -QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc" - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -append-ghc-cflags() { - local persistent compile assemble link - local flag ghcflag - - for flag in $*; do - case ${flag} in - persistent) persistent="yes";; - compile) compile="yes";; - assemble) assemble="yes";; - link) link="yes";; - *) - [[ ${compile} ]] && ghcflag="-optc${flag}" CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" && - [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}" - [[ ${assemble} ]] && ghcflag="-opta${flag}" CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" && - [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}" - [[ ${link} ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" && - [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}" - ;; - esac - done -} - -# $1 - lib name (under libraries/) -# $2 - lib version -# example: bump_lib "transformers" "0.4.2.0" -bump_lib() { - local pn=$1 pv=$2 - local p=${pn}-${pv} - local f - - einfo "Bumping ${pn} up to ${pv}" - - for f in ghc.mk GNUmakefile; do - mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die - done - mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die - mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die -} - -update_SRC_URI() { - local p pn pv - for p in "${BUMP_LIBRARIES[@]}"; do - set -- $p - pn=$1 pv=$2 - - SRC_URI+=" mirror://hackage/package/${pn}/${pn}-${pv}.tar.gz" - done -} - -update_SRC_URI - -bump_libs() { - local p pn pv - for p in "${BUMP_LIBRARIES[@]}"; do - set -- $p - pn=$1 pv=$2 - - bump_lib "${pn}" "${pv}" - done -} - -ghc_setup_cflags() { - if is_crosscompile; then - export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"} - export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"} - einfo "Crosscompiling mode:" - einfo " CHOST: ${CHOST}" - einfo " CTARGET: ${CTARGET}" - einfo " CFLAGS: ${CFLAGS}" - einfo " LDFLAGS: ${LDFLAGS}" - return - fi - # We need to be very careful with the CFLAGS we ask ghc to pass through to - # gcc. There are plenty of flags which will make gcc produce output that - # breaks ghc in various ways. The main ones we want to pass through are - # -mcpu / -march flags. These are important for arches like alpha & sparc. - # We also use these CFLAGS for building the C parts of ghc, ie the rts. - strip-flags - strip-unsupported-flags - - # Cmm can't parse line numbers #482086 - replace-flags -ggdb[3-9] -ggdb2 - - GHC_FLAGS="" - GHC_PERSISTENT_FLAGS="" - for flag in ${CFLAGS}; do - case ${flag} in - - # Ignore extra optimisation (ghc passes -O to gcc anyway) - # -O2 and above break on too many systems - -O*) ;; - - # Arch and ABI flags are what we're really after - -m*) append-ghc-cflags compile assemble ${flag};; - - # Sometimes it's handy to see backtrace of RTS - # to get an idea what happens there - -g*) append-ghc-cflags compile ${flag};; - - # Ignore all other flags, including all -f* flags - esac - done - - for flag in ${LDFLAGS}; do - append-ghc-cflags link ${flag} - done - - # hardened-gcc needs to be disabled, because the mangler doesn't accept - # its output. - gcc-specs-pie && append-ghc-cflags persistent compile link -nopie - gcc-specs-ssp && append-ghc-cflags persistent compile -fno-stack-protector - - # prevent from failind building unregisterised ghc: - # http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html - use ppc64 && append-ghc-cflags persistent compile -mminimal-toc - # fix the similar issue as ppc64 TOC on ia64. ia64 has limited size of small data - # currently ghc fails to build haddock - # http://osdir.com/ml/gnu.binutils.bugs/2004-10/msg00050.html - use ia64 && append-ghc-cflags persistent compile -G0 -} - -# substitutes string $1 to $2 in files $3 $4 ... -relocate_path() { - local from=$1 - local to=$2 - shift 2 - local file= - for file in "$@" - do - sed -i -e "s|$from|$to|g" \ - "$file" || die "path relocation failed for '$file'" - done -} - -# changes hardcoded ghc paths and updates package index -# $1 - new absolute root path -relocate_ghc() { - local to=$1 - - # libdir for prebuilt binary and for current system may mismatch - # It does for prefix installation for example: bug #476998 - local bin_ghc_prefix=${WORKDIR}/usr - local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*) - local bin_libdir=${bin_libpath#${bin_ghc_prefix}/} - - # backup original script to use it later after relocation - local gp_back="${T}/ghc-pkg-${GHC_PV}-orig" - cp "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" "$gp_back" || die "unable to backup ghc-pkg wrapper" - - if [[ ${bin_libdir} != $(get_libdir) ]]; then - einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)" - # moving the dir itself is not strictly needed - # but then USE=binary would result in installing - # in '${bin_libdir}' - mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die - - relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \ - "${WORKDIR}/usr/bin/ghc-${GHC_PV}" \ - "${WORKDIR}/usr/bin/ghci-${GHC_PV}" \ - "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \ - "${WORKDIR}/usr/bin/hsc2hs" \ - "${WORKDIR}/usr/bin/runghc-${GHC_PV}" \ - "$gp_back" \ - "${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"* - fi - - # Relocate from /usr to ${EPREFIX}/usr - relocate_path "/usr" "${to}/usr" \ - "${WORKDIR}/usr/bin/ghc-${GHC_PV}" \ - "${WORKDIR}/usr/bin/ghci-${GHC_PV}" \ - "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \ - "${WORKDIR}/usr/bin/hsc2hs" \ - "${WORKDIR}/usr/bin/runghc-${GHC_PV}" \ - "${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"* - - # this one we will use to regenerate cache - # so it should point to current tree location - relocate_path "/usr" "${WORKDIR}/usr" "$gp_back" - - if use prefix; then - # and insert LD_LIBRARY_PATH entry to EPREFIX dir tree - # TODO: add the same for darwin's CHOST and it's DYLD_ - local new_ldpath='LD_LIBRARY_PATH="'${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)'${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"\nexport LD_LIBRARY_PATH' - sed -i -e '2i'"$new_ldpath" \ - "${WORKDIR}/usr/bin/ghc-${GHC_PV}" \ - "${WORKDIR}/usr/bin/ghci-${GHC_PV}" \ - "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \ - "${WORKDIR}/usr/bin/hsc2hs" \ - "${WORKDIR}/usr/bin/runghc-${GHC_PV}" \ - "$gp_back" \ - "${WORKDIR}/usr/bin/hsc2hs" \ - || die "Adding LD_LIBRARY_PATH for wrappers failed" - fi - - # regenerate the binary package cache - "$gp_back" recache || die "failed to update cache after relocation" - rm "$gp_back" -} - -pkg_setup() { - # quiet portage about prebuilt binaries - use binary && QA_PREBUILT="*" - - [[ ${MERGE_TYPE} == binary ]] && return - - if use ghcbootstrap; then - ewarn "You requested ghc bootstrapping, this is usually only used" - ewarn "by Gentoo developers to make binary .tbz2 packages." - - [[ -z $(type -P ghc) ]] && \ - die "Could not find a ghc to bootstrap with." - else - if ! yet_binary; then - eerror "Please try emerging with USE=ghcbootstrap and report build" - eerror "sucess or failure to the haskell team (haskell@gentoo.org)" - die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap" - fi - fi -} - -src_unpack() { - # Create the ${S} dir if we're using the binary version - use binary && mkdir "${S}" - - # the Solaris and Darwin binaries from ghc (maeder) need to be - # unpacked separately, so prevent them from being unpacked - local ONLYA=${A} - case ${CHOST} in - *-darwin* | *-solaris*) ONLYA=${GHC_P}-src.tar.bz2 ;; - esac - unpack ${ONLYA} - - if [[ -d "${S}"/libraries/dph ]]; then - # Sometimes dph libs get accidentally shipped with ghc - # but they are not installed unless user requests it. - # We never install them. - elog "Removing 'libraries/dph'" - rm -rf "${S}"/libraries/dph - fi -} - -src_prepare() { - ghc_setup_cflags - - if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then - # Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS. - # See bug #313635. - sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \ - "${WORKDIR}/usr/bin/ghc-${GHC_PV}" - - # allow hardened users use vanilla binary to bootstrap ghc - # ghci uses mmap with rwx protection at it implements dynamic - # linking on it's own (bug #299709) - pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${GHC_P}/bin/ghc" - fi - - if use binary; then - if use prefix; then - relocate_ghc "${EPREFIX}" - fi - - # Move unpacked files to the expected place - mv "${WORKDIR}/usr" "${S}" - else - if ! use ghcbootstrap; then - case ${CHOST} in - *-darwin* | *-solaris*) - # UPDATE ME for ghc-7 - mkdir "${WORKDIR}"/ghc-bin-installer || die - pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die - use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2 - use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2 - use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2 - use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2 - popd > /dev/null - - pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die - # fix the binaries so they run, on Solaris we need an - # LD_LIBRARY_PATH which has our prefix libdirs, on - # Darwin we need to replace the frameworks with our libs - # from the prefix fix before installation, because some - # of the tools are actually used during configure/make - if [[ ${CHOST} == *-solaris* ]] ; then - export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}" - elif [[ ${CHOST} == *-darwin* ]] ; then - local readline_framework=GNUreadline.framework/GNUreadline - local gmp_framework=/opt/local/lib/libgmp.10.dylib - local ncurses_file=/opt/local/lib/libncurses.5.dylib - for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do - install_name_tool -change \ - ${readline_framework} \ - "${EPREFIX}"/lib/libreadline.dylib \ - ${binary} || die - install_name_tool -change \ - ${gmp_framework} \ - "${EPREFIX}"/usr/lib/libgmp.dylib \ - ${binary} || die - install_name_tool -change \ - ${ncurses_file} \ - "${EPREFIX}"/usr/lib/libncurses.dylib \ - ${binary} || die - done - # we don't do frameworks! - sed -i \ - -e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \ - -e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \ - rts/package.conf.in || die - fi - - # it is autoconf, but we really don't want to give it too - # much arguments, in fact we do the make in-place anyway - ./configure --prefix="${WORKDIR}"/usr || die - make install || die - popd > /dev/null - ;; - *) - relocate_ghc "${WORKDIR}" - ;; - esac - fi - - sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \ - "${S}/ghc/ghc.wrapper" - - cd "${S}" # otherwise epatch will break - - epatch "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch - - epatch "${FILESDIR}"/${PN}-7.8.2-cgen-constify.patch - epatch "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch - epatch "${FILESDIR}"/${PN}-7.10.1-rc3-ghc-7.10-bootstrap.patch - epatch "${FILESDIR}"/${PN}-7.10.1-T10590-dequeue.patch - # Since ${S}/packages does not include base, etc. add them to gen_contents_index - sed -e 's@\(for REPO in .*\)@\1 base integer-gmp integer-gmp2 integer-simple template-haskell@' \ - -i libraries/gen_contents_index || die - - if use prefix; then - # Make configure find docbook-xsl-stylesheets from Prefix - sed -e '/^FP_DIR_DOCBOOK_XSL/s:\[.*\]:['"${EPREFIX}"'/usr/share/sgml/docbook/xsl-stylesheets/]:' \ - -i utils/haddock/doc/configure.ac || die - fi - - bump_libs - - # as we have changed the build system - eautoreconf - fi -} - -src_configure() { - if ! use binary; then - # initialize build.mk - echo '# Gentoo changes' > mk/build.mk - - # Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV} - echo "docdir = ${EPREFIX}/usr/share/doc/${P}" >> mk/build.mk - echo "htmldir = ${EPREFIX}/usr/share/doc/${P}" >> mk/build.mk - - # We also need to use the GHC_FLAGS flags when building ghc itself - echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk - echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk - echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk - - # We can't depend on haddock except when bootstrapping when we - # must build docs and include them into the binary .tbz2 package - # app-text/dblatex is not in portage, can not build PDF or PS - echo "BUILD_DOCBOOK_PDF = NO" >> mk/build.mk - echo "BUILD_DOCBOOK_PS = NO" >> mk/build.mk - if use doc; then - echo "BUILD_DOCBOOK_HTML = YES" >> mk/build.mk - else - echo "BUILD_DOCBOOK_HTML = NO" >> mk/build.mk - fi - - # this controls presence on 'xhtml' and 'haddock' in final install - echo "HADDOCK_DOCS = YES" >> mk/build.mk - - # allows overriding build flavours for libraries: - # v - vanilla (static libs) - # p - profiled - # dyn - shared libraries - # example: GHC_LIBRARY_WAYS="v dyn" - if [[ -n ${GHC_LIBRARY_WAYS} ]]; then - echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk - fi - - # Get ghc from the unpacked binary .tbz2 - # except when bootstrapping we just pick ghc up off the path - if ! use ghcbootstrap; then - export PATH="${WORKDIR}/usr/bin:${PATH}" - fi - - if use gmp; then - echo "INTEGER_LIBRARY=integer-gmp2" >> mk/build.mk - else - echo "INTEGER_LIBRARY=integer-simple" >> mk/build.mk - fi - - # don't strip anything. Very useful when stage2 SIGSEGVs on you - echo "STRIP_CMD = :" >> mk/build.mk - - elog "Final mk/build.mk:" - cat mk/build.mk || die - - local econf_args=() - - # GHC embeds 'gcc' it was built by and uses it later. - # Don't allow things like ccache or versioned binary slip. - # We use stable thing across gcc upgrades. - is_crosscompile || econf_args+=(--with-gcc=${CHOST}-gcc) - - if ! use ghcmakebinary; then - econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@')) - fi - - econf ${econf_args[@]} --enable-bootstrap-with-devel-snapshot - - if [[ ${PV} == *9999* ]]; then - GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')" - GHC_P=${PN}-${GHC_PV} - fi - GHC_TPF="$(grep 'S\[\"TargetPlatformFull\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')" - fi # ! use binary -} - -src_compile() { - if ! use binary; then - # 1. build compiler binary first - emake ghc/stage2/build/tmp/ghc-stage2 - # 2. pax-mark (bug #516430) - pax-mark -m ghc/stage2/build/tmp/ghc-stage2 - # 3. and then all the rest - emake all - fi # ! use binary -} - -src_install() { - if use binary; then - use prefix && mkdir -p "${ED}" - mv "${S}/usr" "${ED}" - else - - emake -j1 install DESTDIR="${D}" - dodoc "distrib/README" "ANNOUNCE" "LICENSE" "VERSION" - - # rename ghc-shipped files to avoid collision - # of external packages. Motivating example: - # user had installed: - # dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0) - # dev-haskell/transformers-0.4.2.0 - # then user tried to update to - # dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0) - # this will lead to single .conf file collision. - local shipped_conf renamed_conf - local package_confdir="${ED}/usr/$(get_libdir)/${GHC_P}/package.conf.d" - for shipped_conf in "${package_confdir}"/*.conf; do - # rename 'pkg-ver-id.conf' to 'pkg-ver-id-gentoo-${PF}.conf' - renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf - mv "${shipped_conf}" "${renamed_conf}" || die - done - - # remove link, but leave 'haddock-${GHC_P}' - rm -f "${ED}"/usr/bin/haddock - - if [[ ! -f "${S}/VERSION" ]]; then - echo "${GHC_PV}" > "${S}/VERSION" \ - || die "Could not create file ${S}/VERSION" - fi - newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg - newbashcomp utils/completion/ghc.bash ghc - fi - - # path to the package.cache - local package_confdir="${ED}/usr/$(get_libdir)/${GHC_P}/package.conf.d" - PKGCACHE="${package_confdir}"/package.cache - # copy the package.conf.d, including timestamp, save it so we can help - # users that have a broken package.conf.d - cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d" - - # copy the package.conf, including timestamp, save it so we later can put it - # back before uninstalling, or when upgrading. - cp -p "${PKGCACHE}"{,.shipped} \ - || die "failed to copy package.conf.d/package.cache" -} - -pkg_preinst() { - # have we got an earlier version of ghc installed? - if has_version "<${CATEGORY}/${PF}"; then - haskell_updater_warn="1" - fi -} - -pkg_postinst() { - ghc-reregister - - # path to the package.cache - PKGCACHE="${EROOT}/usr/$(get_libdir)/${GHC_P}/package.conf.d/package.cache" - - # give the cache a new timestamp, it must be as recent as - # the package.conf.d directory. - touch "${PKGCACHE}" - - if [[ "${haskell_updater_warn}" == "1" ]]; then - ewarn - ewarn "\e[1;31m************************************************************************\e[0m" - ewarn - ewarn "You have just upgraded from an older version of GHC." - ewarn "You may have to run" - ewarn " 'haskell-updater'" - ewarn "to rebuild all ghc-based Haskell libraries." - ewarn - ewarn "\e[1;31m************************************************************************\e[0m" - ewarn - fi -} - -pkg_prerm() { - PKGCACHE="${EROOT}/usr/$(get_libdir)/${GHC_P}/package.conf.d/package.cache" - rm -rf "${PKGCACHE}" - - cp -p "${PKGCACHE}"{.shipped,} -} - -pkg_postrm() { - ghc-package_pkg_postrm -} diff --git a/dev-lang/ghc/ghc-7.10.3.ebuild b/dev-lang/ghc/ghc-7.10.3.ebuild index 78ebfbf12d46..ac9989cf6e5c 100644 --- a/dev-lang/ghc/ghc-7.10.3.ebuild +++ b/dev-lang/ghc/ghc-7.10.3.ebuild @@ -83,9 +83,15 @@ RDEPEND=" >=dev-libs/gmp-5:= sys-libs/ncurses:=[unicode] !ghcmakebinary? ( virtual/libffi:= ) - !kernel_Darwin? ( >=sys-devel/gcc-2.95.3:* ) - kernel_linux? ( >=sys-devel/binutils-2.17:* ) - kernel_SunOS? ( >=sys-devel/binutils-2.17:* ) +" +# gentoo binaries are built against ncurses-5 +RDEPEND+=" + binary? ( + || ( + sys-libs/ncurses:0/5 + sys-libs/ncurses:5/5 + ) + ) " # force dependency on >=gmp-5, even if >=gmp-4.1 would be enough. this is due to diff --git a/dev-lang/ghc/ghc-7.4.2.ebuild b/dev-lang/ghc/ghc-7.4.2.ebuild deleted file mode 100644 index 366f1d473b1a..000000000000 --- a/dev-lang/ghc/ghc-7.4.2.ebuild +++ /dev/null @@ -1,640 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# Brief explanation of the bootstrap logic: -# -# Previous ghc ebuilds have been split into two: ghc and ghc-bin, -# where ghc-bin was primarily used for bootstrapping purposes. -# From now on, these two ebuilds have been combined, with the -# binary USE flag used to determine whether or not the pre-built -# binary package should be emerged or whether ghc should be compiled -# from source. If the latter, then the relevant ghc-bin for the -# arch in question will be used in the working directory to compile -# ghc from source. -# -# This solution has the advantage of allowing us to retain the one -# ebuild for both packages, and thus phase out virtual/ghc. - -# Note to users of hardened gcc-3.x: -# -# If you emerge ghc with hardened gcc it should work fine (because we -# turn off the hardened features that would otherwise break ghc). -# However, emerging ghc while using a vanilla gcc and then switching to -# hardened gcc (using gcc-config) will leave you with a broken ghc. To -# fix it you would need to either switch back to vanilla gcc or re-emerge -# ghc (or ghc-bin). Note that also if you are using hardened gcc-3.x and -# you switch to gcc-4.x that this will also break ghc and you'll need to -# re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between -# gcc-3.x and 4.x with no problems. - -EAPI="5" - -inherit base autotools bash-completion-r1 eutils flag-o-matic multilib toolchain-funcs ghc-package versionator pax-utils - -DESCRIPTION="The Glasgow Haskell Compiler" -HOMEPAGE="http://www.haskell.org/ghc/" - -# we don't have any binaries yet -arch_binaries="" - -# sorted! -arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )" -#arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )" -arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PV}-amd64-stable-glibc.tbz2 )" -arch_binaries="$arch_binaries ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64.tbz2 )" -arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-ppc.tbz2 )" -arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )" -arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )" -arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-${PV}-x86-stable-glibc.tbz2 )" - -# various ports: -#arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )" - -# 0 - yet -yet_binary() { - case "${ARCH}" in - alpha) return 0 ;; - #arm) - # ewarn "ARM binary is built on armv5tel-eabi toolchain. Use with caution." - # return 0 - #;; - amd64) return 0 ;; - ia64) return 0 ;; - ppc) return 0 ;; - ppc64) return 0 ;; - sparc) return 0 ;; - x86) return 0 ;; - *) return 1 ;; - esac -} - -SRC_URI="!binary? ( http://www.haskell.org/ghc/dist/${PV}/${P}-src.tar.bz2 )" -[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )" -LICENSE="BSD" -SLOT="0/${PV}" -# ghc on ia64 needs gcc to support -mcmodel=medium (or some dark hackery) to avoid TOC overflow -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="doc ghcbootstrap ghcmakebinary +gmp llvm" -IUSE+=" binary" # don't forget about me later! -IUSE+=" elibc_glibc" # system stuff - -RDEPEND=" - !kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) - kernel_linux? ( >=sys-devel/binutils-2.17 ) - kernel_SunOS? ( >=sys-devel/binutils-2.17 ) - >=dev-lang/perl-5.6.1 - >=dev-libs/gmp-5 - virtual/libffi - !=gmp-5, even if >=gmp-4.1 would be enough. this is due to -# that we want the binaries to use the latest versioun available, and not to be -# built against gmp-4 - -# similar for glibc. we have bootstrapped binaries against glibc-2.14 -DEPEND="${RDEPEND} - ghcbootstrap? ( - doc? ( app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - >=dev-libs/libxslt-1.1.2 ) ) - !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.14 ) ) )" - -PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )" -PDEPEND=" - ${PDEPEND} - llvm? ( sys-devel/llvm )" - -# ia64 fails to return from STG GMP primitives (stage2 always SIGSEGVs) -REQUIRED_USE="ia64? ( !gmp )" - -append-ghc-cflags() { - local flag compile assemble link - for flag in $*; do - case ${flag} in - compile) compile="yes";; - assemble) assemble="yes";; - link) link="yes";; - *) - [[ ${compile} ]] && GHC_FLAGS="${GHC_FLAGS} -optc${flag}" CFLAGS="${CFLAGS} ${flag}" - [[ ${assemble} ]] && GHC_FLAGS="${GHC_FLAGS} -opta${flag}" CFLAGS="${CFLAGS} ${flag}" - [[ ${link} ]] && GHC_FLAGS="${GHC_FLAGS} -optl${flag}" FILTERED_LDFLAGS="${FILTERED_LDFLAGS} ${flag}";; - esac - done -} - -ghc_setup_cflags() { - # We need to be very careful with the CFLAGS we ask ghc to pass through to - # gcc. There are plenty of flags which will make gcc produce output that - # breaks ghc in various ways. The main ones we want to pass through are - # -mcpu / -march flags. These are important for arches like alpha & sparc. - # We also use these CFLAGS for building the C parts of ghc, ie the rts. - strip-flags - strip-unsupported-flags - - # Cmm can't parse line numbers #482086 - replace-flags -ggdb[3-9] -ggdb2 - - GHC_FLAGS="" - for flag in ${CFLAGS}; do - case ${flag} in - - # Ignore extra optimisation (ghc passes -O to gcc anyway) - # -O2 and above break on too many systems - -O*) ;; - - # Arch and ABI flags are what we're really after - -m*) append-ghc-cflags compile assemble ${flag};; - - # Debugging flags don't help either. You can't debug Haskell code - # at the C source level and the mangler discards the debug info. - -g*) ;; - - # Ignore all other flags, including all -f* flags - esac - done - - FILTERED_LDFLAGS="" - for flag in ${LDFLAGS}; do - case ${flag} in - # Pass the canary. we don't quite respect LDFLAGS, but we have an excuse! - "-Wl,--hash-style="*) append-ghc-cflags link ${flag};; - - # Ignore all other flags - esac - done - - # hardened-gcc needs to be disabled, because the mangler doesn't accept - # its output. - gcc-specs-pie && append-ghc-cflags compile link -nopie - gcc-specs-ssp && append-ghc-cflags compile -fno-stack-protector - - # prevent from failind building unregisterised ghc: - # http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html - use ppc64 && append-ghc-cflags compile -mminimal-toc - # fix the similar issue as ppc64 TOC on ia64. ia64 has limited size of small data - # currently ghc fails to build haddock - # http://osdir.com/ml/gnu.binutils.bugs/2004-10/msg00050.html - use ia64 && append-ghc-cflags compile -G0 - - # Unfortunately driver/split/ghc-split.lprl is dumb - # enough to preserve stack marking for each split object - # and it flags stack marking violation: - # * !WX --- --- usr/lib64/ghc-7.4.1/base-4.5.0.0/libHSbase-4.5.0.0.a:Fingerprint__1.o - # * !WX --- --- usr/lib64/ghc-7.4.1/base-4.5.0.0/libHSbase-4.5.0.0.a:Fingerprint__2.o - # * !WX --- --- usr/lib64/ghc-7.4.1/base-4.5.0.0/libHSbase-4.5.0.0.a:Fingerprint__3.o - case $($(tc-getAS) -v 2>&1 /dev/null || die - use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2 - use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2 - use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2 - use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2 - popd > /dev/null - - pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die - # fix the binaries so they run, on Solaris we need an - # LD_LIBRARY_PATH which has our prefix libdirs, on - # Darwin we need to replace the frameworks with our libs - # from the prefix fix before installation, because some - # of the tools are actually used during configure/make - if [[ ${CHOST} == *-solaris* ]] ; then - export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}" - elif [[ ${CHOST} == *-darwin* ]] ; then - local readline_framework=GNUreadline.framework/GNUreadline - local gmp_framework=/opt/local/lib/libgmp.10.dylib - local ncurses_file=/opt/local/lib/libncurses.5.dylib - for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do - install_name_tool -change \ - ${readline_framework} \ - "${EPREFIX}"/lib/libreadline.dylib \ - ${binary} || die - install_name_tool -change \ - ${gmp_framework} \ - "${EPREFIX}"/usr/lib/libgmp.dylib \ - ${binary} || die - install_name_tool -change \ - ${ncurses_file} \ - "${EPREFIX}"/usr/lib/libncurses.dylib \ - ${binary} || die - done - # we don't do frameworks! - sed -i \ - -e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \ - -e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \ - rts/package.conf.in || die - fi - - # it is autoconf, but we really don't want to give it too - # much arguments, in fact we do the make in-place anyway - ./configure --prefix="${WORKDIR}"/usr || die - make install || die - popd > /dev/null - ;; - *) - relocate_ghc "${WORKDIR}" - ;; - esac - fi - - sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_FLAGS}|" \ - "${S}/ghc/ghc.wrapper" - - cd "${S}" # otherwise epatch will break - - epatch "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch - - epatch "${FILESDIR}"/${PN}-7.0.4-darwin8.patch - # failed to apply. FIXME - #epatch "${FILESDIR}"/${PN}-6.12.3-mach-o-relocation-limit.patch - - epatch "${FILESDIR}"/${PN}-7.4-rc2-macos-prefix-respect-gcc.patch - epatch "${FILESDIR}"/${PN}-7.4.1-darwin-CHOST.patch - epatch "${FILESDIR}"/${PN}-7.2.1-freebsd-CHOST.patch - - we_want_libffi_workaround() { - use ghcmakebinary && return 1 - - # pick only registerised arches - # https://bugs.gentoo.org/463814 - use amd64 && return 0 - use x86 && return 0 - return 1 - } - # one mode external depend with unstable ABI be careful to stash it - # avoid external libffi runtime when we build binaries - we_want_libffi_workaround && epatch "${FILESDIR}"/${PN}-7.4.2-system-libffi.patch - - epatch "${FILESDIR}"/${PN}-7.4.1-ticket-7339-fix-unaligned-unreg.patch - - if use prefix; then - # Make configure find docbook-xsl-stylesheets from Prefix - sed -i -e '/^FP_DIR_DOCBOOK_XSL/s:\[.*\]:['"${EPREFIX}"'/usr/share/sgml/docbook/xsl-stylesheets/]:' utils/haddock/doc/configure.ac || die - fi - - cd "${S}"/libraries/terminfo - # bug #454216 - epatch "${FILESDIR}"/terminfo-0.3.2.5-tinfo.patch - - cd "${S}" - # as we have changed the build system - eautoreconf - fi -} - -src_configure() { - if ! use binary; then - - # initialize build.mk - echo '# Gentoo changes' > mk/build.mk - - # Put docs into the right place, ie /usr/share/doc/ghc-${PV} - echo "docdir = ${EPREFIX}/usr/share/doc/${P}" >> mk/build.mk - echo "htmldir = ${EPREFIX}/usr/share/doc/${P}" >> mk/build.mk - - # We also need to use the GHC_FLAGS flags when building ghc itself - echo "SRC_HC_OPTS+=${GHC_FLAGS}" >> mk/build.mk - echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk - echo "SRC_LD_OPTS+=${FILTERED_LDFLAGS}" >> mk/build.mk - - # We can't depend on haddock except when bootstrapping when we - # must build docs and include them into the binary .tbz2 package - if use ghcbootstrap && use doc; then - echo "BUILD_DOCBOOK_PDF = NO" >> mk/build.mk - echo "BUILD_DOCBOOK_PS = NO" >> mk/build.mk - echo "BUILD_DOCBOOK_HTML = YES" >> mk/build.mk - echo "HADDOCK_DOCS = YES" >> mk/build.mk - else - echo "BUILD_DOCBOOK_PDF = NO" >> mk/build.mk - echo "BUILD_DOCBOOK_PS = NO" >> mk/build.mk - echo "BUILD_DOCBOOK_HTML = NO" >> mk/build.mk - echo "HADDOCK_DOCS = NO" >> mk/build.mk - fi - - # circumvent a very strange bug that seems related with ghc producing - # too much output while being filtered through tee (e.g. due to - # portage logging) reported as bug #111183 - echo "SRC_HC_OPTS+=-w" >> mk/build.mk - - # some arches do not support ELF parsing for ghci module loading - # PPC64: never worked (should be easy to implement) - # alpha: never worked - # arm: unimplemented or never worked - if use alpha || use ppc64 || use arm; then - echo "GhcWithInterpreter=NO" >> mk/build.mk - fi - - # we have to tell it to build unregisterised on some arches - # ppc64: EvilMangler currently does not understand some TOCs - # ia64: EvilMangler bitrot - if use alpha || use ia64 || use ppc64; then - echo "GhcUnregisterised=YES" >> mk/build.mk - echo "GhcWithNativeCodeGen=NO" >> mk/build.mk - echo "SplitObjs=NO" >> mk/build.mk - echo "GhcRTSWays := debug" >> mk/build.mk - echo "GhcNotThreaded=YES" >> mk/build.mk - fi - - # arm: no EvilMangler support, no NCG support - if use arm; then - echo "GhcUnregisterised=YES" >> mk/build.mk - echo "GhcWithNativeCodeGen=NO" >> mk/build.mk - fi - - # Have "ld -r --relax" problem with split-objs on sparc: - if use sparc; then - echo "SplitObjs=NO" >> mk/build.mk - fi - - if ! use llvm; then - echo "GhcWithLlvmCodeGen=NO" >> mk/build.mk - fi - - # allows overriding build flavours for libraries: - # v - vanilla (static libs) - # p - profiled - # dyn - shared libraries - # example: GHC_LIBRARY_WAYS="v dyn" - if [[ -n ${GHC_LIBRARY_WAYS} ]]; then - echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk - fi - - # Get ghc from the unpacked binary .tbz2 - # except when bootstrapping we just pick ghc up off the path - if ! use ghcbootstrap; then - export PATH="${WORKDIR}/usr/bin:${PATH}" - fi - - if use gmp; then - echo "INTEGER_LIBRARY=integer-gmp" >> mk/build.mk - else - echo "INTEGER_LIBRARY=integer-simple" >> mk/build.mk - fi - - # Since GHC 6.12.2 the GHC wrappers store which GCC version GHC was - # compiled with, by saving the path to it. The purpose is to make sure - # that GHC will use the very same gcc version when it compiles haskell - # sources, as the extra-gcc-opts files contains extra gcc options which - # match only this GCC version. - # However, this is not required in Gentoo, as only modern GCCs are used - # (>4). - # Instead, this causes trouble when for example ccache is used during - # compilation, but we don't want the wrappers to point to ccache. - # Due to the above, we simply set GCC to be "gcc". When compiling ghc it - # might point to ccache, once installed it will point to the users - # regular gcc. - - econf --with-gcc=gcc || die "econf failed" - fi # ! use binary -} - -src_compile() { - if ! use binary; then - limit_jobs() { - if [[ -n ${I_DEMAND_MY_CORES_LOADED} ]]; then - ewarn "You have requested parallel build which is known to break." - ewarn "Please report all breakages upstream." - return - fi - echo $@ - } - # ghc massively parallel make: #409631, #409873 - # but let users screw it by setting 'I_DEMAND_MY_CORES_LOADED' - emake $(limit_jobs -j1) all - fi # ! use binary -} - -src_install() { - if use binary; then - use prefix && mkdir -p "${ED}" - mv "${S}/usr" "${ED}" - - # Remove the docs if not requested - if ! use doc; then - rm -rf "${ED}/usr/share/doc/${P}/*/" \ - "${ED}/usr/share/doc/${P}/*.html" \ - || die "could not remove docs (P vs PF revision mismatch?)" - fi - else - local insttarget="install" - - # We only built docs if we were bootstrapping, otherwise - # we copy them out of the unpacked binary .tbz2 - if use doc && ! use ghcbootstrap; then - mkdir -p "${ED}/usr/share/doc" - mv "${WORKDIR}/usr/share/doc/${P}" "${ED}/usr/share/doc" \ - || die "failed to copy docs" - else - dodoc "${S}/README" "${S}/ANNOUNCE" "${S}/LICENSE" "${S}/VERSION" - fi - - emake -j1 ${insttarget} \ - DESTDIR="${D}" \ - || die "make ${insttarget} failed" - - # remove wrapper and linker - rm -f "${ED}"/usr/bin/haddock* - - # ghci uses mmap with rwx protection at it implements dynamic - # linking on it's own (bug #299709) - # so mark resulting binary - pax-mark -m "${ED}/usr/$(get_libdir)/${P}/ghc" - - dobashcomp "${FILESDIR}/ghc-bash-completion" - - fi - - # path to the package.cache - local package_confdir="${ED}/usr/$(get_libdir)/${P}/package.conf.d" - PKGCACHE="${package_confdir}"/package.cache - - cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d" - - # copy the package.conf, including timestamp, save it so we later can put it - # back before uninstalling, or when upgrading. - cp -p "${PKGCACHE}"{,.shipped} \ - || die "failed to copy package.conf.d/package.cache" -} - -pkg_preinst() { - # have we got an earlier version of ghc installed? - if has_version "<${CATEGORY}/${PF}"; then - haskell_updater_warn="1" - fi -} - -pkg_postinst() { - ghc-reregister - - # path to the package.cache - PKGCACHE="${EROOT}/usr/$(get_libdir)/${P}/package.conf.d/package.cache" - - # give the cache a new timestamp, it must be as recent as - # the package.conf.d directory. - touch "${PKGCACHE}" - - if [[ "${haskell_updater_warn}" == "1" ]]; then - ewarn - ewarn "\e[1;31m************************************************************************\e[0m" - ewarn - ewarn "You have just upgraded from an older version of GHC." - ewarn "You may have to run" - ewarn " 'haskell-updater --upgrade'" - ewarn "to rebuild all ghc-based Haskell libraries." - ewarn - ewarn "\e[1;31m************************************************************************\e[0m" - ewarn - fi -} - -pkg_prerm() { - # Be very careful here... Call order when upgrading is (according to PMS): - # * src_install for new package - # * pkg_preinst for new package - # * pkg_postinst for new package - # * pkg_prerm for the package being replaced - # * pkg_postrm for the package being replaced - # so you'll actually be touching the new packages files, not the one you - # uninstall, due to that or installation directory ${P} will be the same for - # both packages. - - # Call order for reinstalling is (according to PMS): - # * src_install - # * pkg_preinst - # * pkg_prerm for the package being replaced - # * pkg_postrm for the package being replaced - # * pkg_postinst - - # Overwrite the modified package.cache with a copy of the - # original one, so that it will be removed during uninstall. - - PKGCACHE="${EROOT}/usr/$(get_libdir)/${P}/package.conf.d/package.cache" - rm -rf "${PKGCACHE}" - - cp -p "${PKGCACHE}"{.shipped,} -} - -pkg_postrm() { - ghc-package_pkg_postrm -} diff --git a/dev-lang/ghc/ghc-7.6.3-r1.ebuild b/dev-lang/ghc/ghc-7.6.3-r1.ebuild deleted file mode 100644 index c5c2e89c41d5..000000000000 --- a/dev-lang/ghc/ghc-7.6.3-r1.ebuild +++ /dev/null @@ -1,829 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# Brief explanation of the bootstrap logic: -# -# Previous ghc ebuilds have been split into two: ghc and ghc-bin, -# where ghc-bin was primarily used for bootstrapping purposes. -# From now on, these two ebuilds have been combined, with the -# binary USE flag used to determine whether or not the pre-built -# binary package should be emerged or whether ghc should be compiled -# from source. If the latter, then the relevant ghc-bin for the -# arch in question will be used in the working directory to compile -# ghc from source. -# -# This solution has the advantage of allowing us to retain the one -# ebuild for both packages, and thus phase out virtual/ghc. - -# Note to users of hardened gcc-3.x: -# -# If you emerge ghc with hardened gcc it should work fine (because we -# turn off the hardened features that would otherwise break ghc). -# However, emerging ghc while using a vanilla gcc and then switching to -# hardened gcc (using gcc-config) will leave you with a broken ghc. To -# fix it you would need to either switch back to vanilla gcc or re-emerge -# ghc (or ghc-bin). Note that also if you are using hardened gcc-3.x and -# you switch to gcc-4.x that this will also break ghc and you'll need to -# re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between -# gcc-3.x and 4.x with no problems. - -EAPI="5" - -# to make make a crosscompiler use crossdev and symlink ghc tree into -# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc' -# -# 'CTARGET' definition and 'is_crosscompile' are taken from 'toolchain.eclass' -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} = ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi - -inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package -inherit multilib multiprocessing pax-utils toolchain-funcs versionator - -DESCRIPTION="The Glasgow Haskell Compiler" -HOMEPAGE="http://www.haskell.org/ghc/" - -# we don't have any binaries yet -arch_binaries="" - -# sorted! -arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-r1-alpha.tbz2 )" -#arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )" -arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PV}-amd64.tbz2 )" -arch_binaries="$arch_binaries ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-r1-ia64.tbz2 )" -arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-r1-ppc.tbz2 )" -arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-r1-ppc64.tbz2 )" -arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-r1-sparc.tbz2 )" -arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-${PV}-x86.tbz2 )" - -# various ports: -#arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )" - -# 0 - yet -yet_binary() { - case "${ARCH}" in - alpha) return 0 ;; - #arm) - # ewarn "ARM binary is built on armv5tel-eabi toolchain. Use with caution." - # return 0 - #;; - amd64) return 0 ;; - ia64) return 0 ;; - ppc) return 0 ;; - ppc64) return 0 ;; - sparc) return 0 ;; - x86) return 0 ;; - *) return 1 ;; - esac -} - -SRC_URI="!binary? ( http://www.haskell.org/ghc/dist/${PV}/${P}-src.tar.bz2 )" -[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )" -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="doc ghcbootstrap ghcmakebinary +gmp llvm" -IUSE+=" binary" # don't forget about me later! -IUSE+=" elibc_glibc" # system stuff - -RDEPEND=" - !kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) - kernel_linux? ( >=sys-devel/binutils-2.17 ) - kernel_SunOS? ( >=sys-devel/binutils-2.17 ) - >=dev-lang/perl-5.6.1 - >=dev-libs/gmp-5 - virtual/libffi - !=gmp-5, even if >=gmp-4.1 would be enough. this is due to -# that we want the binaries to use the latest versioun available, and not to be -# built against gmp-4 - -# similar for glibc. we have bootstrapped binaries against glibc-2.14 -DEPEND="${RDEPEND} - ghcbootstrap? ( - doc? ( app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - >=dev-libs/libxslt-1.1.2 ) ) - !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.15 ) ) )" - -PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )" -PDEPEND=" - ${PDEPEND} - llvm? ( sys-devel/llvm )" - -# ia64 fails to return from STG GMP primitives (stage2 always SIGSEGVs) -REQUIRED_USE="ia64? ( !gmp )" - -# haskell libraries built with cabal in configure mode, #515354 -QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc" - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -append-ghc-cflags() { - local flag compile assemble link - for flag in $*; do - case ${flag} in - compile) compile="yes";; - assemble) assemble="yes";; - link) link="yes";; - *) - [[ ${compile} ]] && GHC_FLAGS="${GHC_FLAGS} -optc${flag}" CFLAGS="${CFLAGS} ${flag}" - [[ ${assemble} ]] && GHC_FLAGS="${GHC_FLAGS} -opta${flag}" CFLAGS="${CFLAGS} ${flag}" - [[ ${link} ]] && GHC_FLAGS="${GHC_FLAGS} -optl${flag}" FILTERED_LDFLAGS="${FILTERED_LDFLAGS} ${flag}";; - esac - done -} - -ghc_setup_cflags() { - if is_crosscompile; then - export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"} - export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"} - einfo "Crosscompiling mode:" - einfo " CHOST: ${CHOST}" - einfo " CTARGET: ${CTARGET}" - einfo " CFLAGS: ${CFLAGS}" - einfo " LDFLAGS: ${LDFLAGS}" - return - fi - # We need to be very careful with the CFLAGS we ask ghc to pass through to - # gcc. There are plenty of flags which will make gcc produce output that - # breaks ghc in various ways. The main ones we want to pass through are - # -mcpu / -march flags. These are important for arches like alpha & sparc. - # We also use these CFLAGS for building the C parts of ghc, ie the rts. - strip-flags - strip-unsupported-flags - - # Cmm can't parse line numbers #482086 - replace-flags -ggdb[3-9] -ggdb2 - - GHC_FLAGS="" - for flag in ${CFLAGS}; do - case ${flag} in - - # Ignore extra optimisation (ghc passes -O to gcc anyway) - # -O2 and above break on too many systems - -O*) ;; - - # Arch and ABI flags are what we're really after - -m*) append-ghc-cflags compile assemble ${flag};; - - # Sometimes it's handy to see backtrace of RTS - # to get an idea what happens there - -g*) append-ghc-cflags compile ${flag};; - - # Ignore all other flags, including all -f* flags - esac - done - - FILTERED_LDFLAGS="" - for flag in ${LDFLAGS}; do - case ${flag} in - # Pass the canary. we don't quite respect LDFLAGS, but we have an excuse! - "-Wl,--hash-style="*) append-ghc-cflags link ${flag};; - - # Ignore all other flags - esac - done - - # hardened-gcc needs to be disabled, because the mangler doesn't accept - # its output. - gcc-specs-pie && append-ghc-cflags compile link -nopie - gcc-specs-ssp && append-ghc-cflags compile -fno-stack-protector - - # prevent from failind building unregisterised ghc: - # http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html - use ppc64 && append-ghc-cflags compile -mminimal-toc - # fix the similar issue as ppc64 TOC on ia64. ia64 has limited size of small data - # currently ghc fails to build haddock - # http://osdir.com/ml/gnu.binutils.bugs/2004-10/msg00050.html - use ia64 && append-ghc-cflags compile -G0 -Os - - # Unfortunately driver/split/ghc-split.lprl is dumb - # enough to preserve stack marking for each split object - # and it flags stack marking violation: - # * !WX --- --- usr/lib64/ghc-7.4.1/base-4.5.0.0/libHSbase-4.5.0.0.a:Fingerprint__1.o - # * !WX --- --- usr/lib64/ghc-7.4.1/base-4.5.0.0/libHSbase-4.5.0.0.a:Fingerprint__2.o - # * !WX --- --- usr/lib64/ghc-7.4.1/base-4.5.0.0/libHSbase-4.5.0.0.a:Fingerprint__3.o - case $($(tc-getAS) -v 2>&1 /dev/null || die - use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2 - use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2 - use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2 - use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2 - popd > /dev/null - - pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die - # fix the binaries so they run, on Solaris we need an - # LD_LIBRARY_PATH which has our prefix libdirs, on - # Darwin we need to replace the frameworks with our libs - # from the prefix fix before installation, because some - # of the tools are actually used during configure/make - if [[ ${CHOST} == *-solaris* ]] ; then - export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}" - elif [[ ${CHOST} == *-darwin* ]] ; then - local readline_framework=GNUreadline.framework/GNUreadline - local gmp_framework=/opt/local/lib/libgmp.10.dylib - local ncurses_file=/opt/local/lib/libncurses.5.dylib - for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do - install_name_tool -change \ - ${readline_framework} \ - "${EPREFIX}"/lib/libreadline.dylib \ - ${binary} || die - install_name_tool -change \ - ${gmp_framework} \ - "${EPREFIX}"/usr/lib/libgmp.dylib \ - ${binary} || die - install_name_tool -change \ - ${ncurses_file} \ - "${EPREFIX}"/usr/lib/libncurses.dylib \ - ${binary} || die - done - # we don't do frameworks! - sed -i \ - -e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \ - -e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \ - rts/package.conf.in || die - fi - - # it is autoconf, but we really don't want to give it too - # much arguments, in fact we do the make in-place anyway - ./configure --prefix="${WORKDIR}"/usr || die - make install || die - popd > /dev/null - ;; - *) - relocate_ghc "${WORKDIR}" - ;; - esac - fi - - sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_FLAGS}|" \ - "${S}/ghc/ghc.wrapper" - - cd "${S}" # otherwise epatch will break - - epatch "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch - - # epatch "${FILESDIR}"/${PN}-7.0.4-darwin8.patch - # failed to apply. FIXME - #epatch "${FILESDIR}"/${PN}-6.12.3-mach-o-relocation-limit.patch - - # epatch "${FILESDIR}"/${PN}-7.4-rc2-macos-prefix-respect-gcc.patch - # epatch "${FILESDIR}"/${PN}-7.2.1-freebsd-CHOST.patch - - we_want_libffi_workaround() { - use ghcmakebinary && return 1 - - # pick only registerised arches - # https://bugs.gentoo.org/463814 - use amd64 && return 0 - use x86 && return 0 - return 1 - } - # one mode external depend with unstable ABI be careful to stash it - # avoid external libffi runtime when we build binaries - we_want_libffi_workaround && epatch "${FILESDIR}"/${PN}-7.5.20120505-system-libffi.patch - - epatch "${FILESDIR}"/${PN}-7.4.1-ticket-7339-fix-unaligned-unreg.patch - epatch "${FILESDIR}"/${PN}-7.6.2-integer-simple-div-mod.patch - # ghc-7.8 changed linker code and likely fixed it - epatch "${FILESDIR}"/${PN}-7.6.3-trac-3333-weak-syms.patch - # bug 518734 - epatch "${FILESDIR}"/${PN}-7.6.3-preserve-inplace-xattr.patch - - if use prefix; then - # Make configure find docbook-xsl-stylesheets from Prefix - sed -e '/^FP_DIR_DOCBOOK_XSL/s:\[.*\]:['"${EPREFIX}"'/usr/share/sgml/docbook/xsl-stylesheets/]:' \ - -i utils/haddock/doc/configure.ac || die - fi - - # as we have changed the build system - eautoreconf - fi -} - -src_configure() { - GHC_PV=${PV} # overrided in live ebuilds - - if ! use binary; then - # initialize build.mk - echo '# Gentoo changes' > mk/build.mk - - # Put docs into the right place, ie /usr/share/doc/ghc-${PV} - echo "docdir = ${EPREFIX}/usr/share/doc/${P}" >> mk/build.mk - echo "htmldir = ${EPREFIX}/usr/share/doc/${P}" >> mk/build.mk - - # We also need to use the GHC_FLAGS flags when building ghc itself - echo "SRC_HC_OPTS+=${GHC_FLAGS}" >> mk/build.mk - echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk - echo "SRC_LD_OPTS+=${FILTERED_LDFLAGS}" >> mk/build.mk - - # We can't depend on haddock except when bootstrapping when we - # must build docs and include them into the binary .tbz2 package - # app-text/dblatex is not in portage, can not build PDF or PS - if use ghcbootstrap && use doc; then - echo "BUILD_DOCBOOK_PDF = NO" >> mk/build.mk - echo "BUILD_DOCBOOK_PS = NO" >> mk/build.mk - echo "BUILD_DOCBOOK_HTML = YES" >> mk/build.mk - if is_crosscompile; then - # TODO this is a workaround for this build error with the live ebuild with haddock: - # make[1]: *** No rule to make target `compiler/stage2/build/Module.hi', - # needed by `utils/haddock/dist/build/Main.o'. Stop. - echo "HADDOCK_DOCS = NO" >> mk/build.mk - else - echo "HADDOCK_DOCS = YES" >> mk/build.mk - fi - else - echo "BUILD_DOCBOOK_PDF = NO" >> mk/build.mk - echo "BUILD_DOCBOOK_PS = NO" >> mk/build.mk - echo "BUILD_DOCBOOK_HTML = NO" >> mk/build.mk - echo "HADDOCK_DOCS = NO" >> mk/build.mk - fi - - # circumvent a very strange bug that seems related with ghc producing - # too much output while being filtered through tee (e.g. due to - # portage logging) reported as bug #111183 - echo "SRC_HC_OPTS+=-w" >> mk/build.mk - - # some arches do not support ELF parsing for ghci module loading - # PPC64: never worked (should be easy to implement) - # alpha: never worked - # arm: http://hackage.haskell.org/trac/ghc/changeset/27302c9094909e04eb73f200d52d5e9370c34a8a - if use alpha || use ppc64; then - echo "GhcWithInterpreter=NO" >> mk/build.mk - fi - - # we have to tell it to build unregisterised on some arches - # ppc64: EvilMangler currently does not understand some TOCs - # ia64: EvilMangler bitrot - # set GHC_IS_UNREG if you like to build slow unregisterised - # host compiler. Handy if you plan to user resulting - # host compiler as a booting compiler for crosscompiler - # which can work only in unregisterised mode. - if use alpha || use ia64 || use ppc64 || [[ -n ${GHC_IS_UNREG} ]]; then - echo "GhcUnregisterised=YES" >> mk/build.mk - echo "GhcWithNativeCodeGen=NO" >> mk/build.mk - echo "SplitObjs=NO" >> mk/build.mk - echo "GhcRTSWays := debug" >> mk/build.mk - echo "GhcNotThreaded=YES" >> mk/build.mk - fi - - # arm: no EvilMangler support, no NCG support - if use arm; then - echo "GhcUnregisterised=YES" >> mk/build.mk - echo "GhcWithNativeCodeGen=NO" >> mk/build.mk - fi - - # Have "ld -r --relax" problem with split-objs on sparc: - if use sparc; then - echo "SplitObjs=NO" >> mk/build.mk - fi - - if ! use llvm; then - echo "GhcWithLlvmCodeGen=NO" >> mk/build.mk - fi - - # allows overriding build flavours for libraries: - # v - vanilla (static libs) - # p - profiled - # dyn - shared libraries - # example: GHC_LIBRARY_WAYS="v dyn" - if [[ -n ${GHC_LIBRARY_WAYS} ]]; then - echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk - fi - - # Get ghc from the unpacked binary .tbz2 - # except when bootstrapping we just pick ghc up off the path - if ! use ghcbootstrap; then - export PATH="${WORKDIR}/usr/bin:${PATH}" - fi - - if use gmp; then - echo "INTEGER_LIBRARY=integer-gmp" >> mk/build.mk - else - echo "INTEGER_LIBRARY=integer-simple" >> mk/build.mk - fi - - # Since GHC 6.12.2 the GHC wrappers store which GCC version GHC was - # compiled with, by saving the path to it. The purpose is to make sure - # that GHC will use the very same gcc version when it compiles haskell - # sources, as the extra-gcc-opts files contains extra gcc options which - # match only this GCC version. - # However, this is not required in Gentoo, as only modern GCCs are used - # (>4). - # Instead, this causes trouble when for example ccache is used during - # compilation, but we don't want the wrappers to point to ccache. - # Due to the above, we simply set GCC to be "gcc". When compiling ghc it - # might point to ccache, once installed it will point to the users - # regular gcc. - - local econf_args=() - - is_crosscompile || econf_args+=--with-gcc=${CHOST}-gcc - - econf ${econf_args[@]} --enable-bootstrap-with-devel-snapshot \ - || die "econf failed" - - [[ ${PV} == *9999* ]] && GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')" - GHC_TPF="$(grep 'S\[\"TargetPlatformFull\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')" - fi # ! use binary -} - -src_compile() { - if ! use binary; then - limit_jobs() { - local user_jobs=$(makeopts_jobs) - local max_nonbreaking_jobs=$1 - - [[ ${user_jobs} -le ${max_nonbreaking_jobs} ]] && return - - if [[ -n ${I_DEMAND_MY_CORES_LOADED} ]]; then - ewarn "You have requested parallel build which is known to break." - ewarn "Please report all breakages upstream." - return - else - ewarn "Limiting MAKEOPTS -j${user_jobs} -> -j${max_nonbreaking_jobs} (bug #456386)" - user_jobs=${max_nonbreaking_jobs} - fi - echo -j${user_jobs} - } - # ghc massively parallel make: #409631, #409873 - # but let users screw it by setting 'I_DEMAND_MY_CORES_LOADED' - # 4 parallel jobs usually does not break - - # 1. build compiler binary first - emake $(limit_jobs 4) ghc/stage2/build/tmp/ghc-stage2 V=1 - # 2. pax-mark (bug #516430) - pax-mark -m ghc/stage2/build/tmp/ghc-stage2 - # 3. and then all the rest - emake $(limit_jobs 4) all V=1 - - if is_crosscompile; then - # runghc does not work for a stage1 compiler, we can build it anyway - # so it will print the error message: not built for interactive use - pushd "${S}/utils/runghc" || die "Could not cd to utils/runghc" - if [ ! -f Setup.hs ]; then - echo 'import Distribution.Simple; main = defaultMainWithHooks defaultUserHooks' \ - > Setup.hs || die "failed to create default Setup.hs" - fi - ghc -o setup --make Setup.hs || die "setup build failed" - ./setup configure || die "runghc configure failed" - sed -e "s@VERSION@\"${GHC_PV}\"@" -i runghc.hs - ./setup build || die "runghc build failed" - popd - fi - fi # ! use binary -} - -add-c_nonshared-to-ghci-libs() { - local ghci_lib - local nonshared_dir=${T}/libc_nonshared_objects - - is_crosscompile && return - use elibc_glibc || return - use prefix && return - - # we expect 'libc.a' bits be self-sufficient - if gcc-specs-pie; then - use x86 && return # but on x86 pie means linker support: #486140 - fi - - get-nonshared-objects() { - # ns - 'nonshared' - local ns_objects=" " - local ns_sym - local ns_srco - local ns_dsto - - # extract - mkdir "${nonshared_dir}" || die - pushd "${nonshared_dir}" >/dev/null || die - $(tc-getAR) x "${ROOT}"/usr/$(get_libdir)/libc.a - popd >/dev/null || die - - # they are mostly contents of /usr/$(get_libdir)/libc_nonstahed.a - # but 'c_nonstahed' contains PIC variants of symbols. - # ghci uses non-PIC ones - for ns_sym in \ - stat fstat lstat mknod \ - stat64 fstat64 lstat64 \ - fstatat fstatat64 mknodat - do - ns_srco=${nonshared_dir}/${ns_sym}.o - ns_dsto=${nonshared_dir}/${ns_sym}_weakened.o - [[ -f ${ns_srco} ]] || continue - # here we do The Magic: - # 1. --keep-global-symbol= hides everything to adoid double definition - # of stuff like __stat, __fstat and - # 2. --weaken converts exported symbols to weak symbols to be available - # for redefinition - $(tc-getOBJCOPY) \ - --weaken --keep-global-symbol=${ns_sym} \ - "${ns_srco}" "${ns_dsto}" || die - - ns_objects+=" ${ns_dsto}" - done - - echo "${ns_objects}" - } - # bug #452442: when building libraries for ghci - # ghc basically glues them together: - # $ ld -r -o result foo.o bar.o ... - # that way some symbols defined in libc_nonshared.a - # do not get included into final HS*.o files - # We piggyback on one of early loaded wired-in library - # loaded before 'base'. - while read ghci_lib - do - einfo "relinking '${ghci_lib}' with c_includes" - mv "${ghci_lib}" "${ghci_lib}".unrelinked.o || die - $(tc-getLD) -r -o "${ghci_lib}" \ - "${ghci_lib}".unrelinked.o \ - $(get-nonshared-objects) || die - rm -r "${nonshared_dir}" || die - rm "${ghci_lib}".unrelinked.o || die - done < <(find "${ED}"/usr/$(get_libdir)/${P}/ -name 'HSghc-prim*.o') -} - -src_install() { - if use binary; then - use prefix && mkdir -p "${ED}" - mv "${S}/usr" "${ED}" - - # Remove the docs if not requested - if ! use doc; then - rm -rf "${ED}/usr/share/doc/${P}/*/" \ - "${ED}/usr/share/doc/${P}/*.html" \ - || die "could not remove docs (P vs PF revision mismatch?)" - fi - else - local insttarget="install" - - # We only built docs if we were bootstrapping, otherwise - # we copy them out of the unpacked binary .tbz2 - if use doc && ! use ghcbootstrap; then - mkdir -p "${ED}/usr/share/doc" - mv "${WORKDIR}/usr/share/doc/${P}" "${ED}/usr/share/doc" \ - || die "failed to copy docs" - else - dodoc "${S}/README" "${S}/ANNOUNCE" "${S}/LICENSE" "${S}/VERSION" - fi - - emake -j1 ${insttarget} \ - DESTDIR="${D}" \ - || die "make ${insttarget} failed" - - # remove wrapper and link - rm -f "${ED}"/usr/bin/haddock* - - add-c_nonshared-to-ghci-libs - - if [[ ! -f "${S}/VERSION" ]]; then - echo "${GHC_PV}" > "${S}/VERSION" \ - || die "Could not create file ${S}/VERSION" - fi - dobashcomp "${FILESDIR}/ghc-bash-completion" - - fi - - # path to the package.cache - local package_confdir="${ED}/usr/$(get_libdir)/${PN}-${GHC_PV}/package.conf.d" - PKGCACHE="${package_confdir}"/package.cache - # copy the package.conf.d, including timestamp, save it so we can help - # users that have a broken package.conf.d - cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d" - - # copy the package.conf, including timestamp, save it so we later can put it - # back before uninstalling, or when upgrading. - cp -p "${PKGCACHE}"{,.shipped} \ - || die "failed to copy package.conf.d/package.cache" -} - -pkg_preinst() { - # have we got an earlier version of ghc installed? - if has_version "<${CATEGORY}/${PF}"; then - haskell_updater_warn="1" - fi -} - -pkg_postinst() { - ghc-reregister - - # path to the package.cache - PKGCACHE="${EROOT}/usr/$(get_libdir)/${P}/package.conf.d/package.cache" - - # give the cache a new timestamp, it must be as recent as - # the package.conf.d directory. - touch "${PKGCACHE}" - - if [[ "${haskell_updater_warn}" == "1" ]]; then - ewarn - ewarn "\e[1;31m************************************************************************\e[0m" - ewarn - ewarn "You have just upgraded from an older version of GHC." - ewarn "You may have to run" - ewarn " 'haskell-updater --upgrade'" - ewarn "to rebuild all ghc-based Haskell libraries." - ewarn - ewarn "\e[1;31m************************************************************************\e[0m" - ewarn - fi - if is_crosscompile; then - ewarn - ewarn "\e[1;31m************************************************************************\e[0m" - ewarn - ewarn "GHC built as a cross compiler. The interpreter, ghci and runghc, do" - ewarn "not work for a cross compiler." - ewarn "For the ghci error: \": not built for interactive use\" see:" - ewarn "http://www.haskell.org/haskellwiki/GHC:FAQ#When_I_try_to_start_ghci_.28probably_one_I_compiled_myself.29_it_says_ghc-5.02:_not_built_for_interactive_use" - ewarn - ewarn "\e[1;31m************************************************************************\e[0m" - ewarn - fi -} - -pkg_prerm() { - # Be very careful here... Call order when upgrading is (according to PMS): - # * src_install for new package - # * pkg_preinst for new package - # * pkg_postinst for new package - # * pkg_prerm for the package being replaced - # * pkg_postrm for the package being replaced - # so you'll actually be touching the new packages files, not the one you - # uninstall, due to that or installation directory ${P} will be the same for - # both packages. - - # Call order for reinstalling is (according to PMS): - # * src_install - # * pkg_preinst - # * pkg_prerm for the package being replaced - # * pkg_postrm for the package being replaced - # * pkg_postinst - - # Overwrite the modified package.cache with a copy of the - # original one, so that it will be removed during uninstall. - - PKGCACHE="${EROOT}/usr/$(get_libdir)/${P}/package.conf.d/package.cache" - rm -rf "${PKGCACHE}" - - cp -p "${PKGCACHE}"{.shipped,} -} - -pkg_postrm() { - ghc-package_pkg_postrm -} diff --git a/dev-lang/ghc/ghc-7.8.3.ebuild b/dev-lang/ghc/ghc-7.8.3.ebuild deleted file mode 100644 index 8bc6574929bf..000000000000 --- a/dev-lang/ghc/ghc-7.8.3.ebuild +++ /dev/null @@ -1,615 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# to make make a crosscompiler use crossdev and symlink ghc tree into -# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc' -# -# 'CTARGET' definition and 'is_crosscompile' are taken from 'toolchain.eclass' -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} = ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi - -inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package -inherit multilib pax-utils toolchain-funcs versionator - -DESCRIPTION="The Glasgow Haskell Compiler" -HOMEPAGE="http://www.haskell.org/ghc/" - -# we don't have any binaries yet -arch_binaries="" - -# sorted! -#arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )" -#arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )" -arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PV}-amd64.tbz2 )" -#arch_binaries="$arch_binaries ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )" -#arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-ppc.tbz2 )" -#arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )" -#arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )" -arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-${PV}-x86.tbz2 )" - -# various ports: -#arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )" - -# 0 - yet -yet_binary() { - case "${ARCH}" in - #alpha) return 0 ;; - #arm) - # ewarn "ARM binary is built on armv5tel-eabi toolchain. Use with caution." - # return 0 - #;; - amd64) return 0 ;; - #ia64) return 0 ;; - #ppc) return 0 ;; - #ppc64) return 0 ;; - #sparc) return 0 ;; - x86) return 0 ;; - *) return 1 ;; - esac -} - -GHC_PV=${PV} -#GHC_PV=7.8.0.20140228 # uncomment only for -rc ebuilds -GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct - -SRC_URI="!binary? ( http://www.haskell.org/ghc/dist/${PV/_rc/-rc}/${GHC_P}-src.tar.xz )" -S="${WORKDIR}"/${GHC_P} - -[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )" -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc ghcbootstrap ghcmakebinary +gmp" -IUSE+=" binary" -IUSE+=" elibc_glibc" # system stuff - -RDEPEND=" - >=dev-lang/perl-5.6.1 - >=dev-libs/gmp-5:= - sys-libs/ncurses:=[unicode] - !ghcmakebinary? ( virtual/libffi:= ) - !kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) - kernel_linux? ( >=sys-devel/binutils-2.17 ) - kernel_SunOS? ( >=sys-devel/binutils-2.17 ) -" - -# force dependency on >=gmp-5, even if >=gmp-4.1 would be enough. this is due to -# that we want the binaries to use the latest versioun available, and not to be -# built against gmp-4 - -# similar for glibc. we have bootstrapped binaries against glibc-2.17 -DEPEND="${RDEPEND} - ghcbootstrap? ( - doc? ( app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - >=dev-libs/libxslt-1.1.2 ) ) - !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) )" - -PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )" - -REQUIRED_USE="?? ( ghcbootstrap binary )" - -# haskell libraries built with cabal in configure mode, #515354 -QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc" - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -append-ghc-cflags() { - local persistent compile assemble link - local flag ghcflag - - for flag in $*; do - case ${flag} in - persistent) persistent="yes";; - compile) compile="yes";; - assemble) assemble="yes";; - link) link="yes";; - *) - [[ ${compile} ]] && ghcflag="-optc${flag}" CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" && - [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}" - [[ ${assemble} ]] && ghcflag="-opta${flag}" CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" && - [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}" - [[ ${link} ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" && - [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}" - ;; - esac - done -} - -ghc_setup_cflags() { - if is_crosscompile; then - export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"} - export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"} - einfo "Crosscompiling mode:" - einfo " CHOST: ${CHOST}" - einfo " CTARGET: ${CTARGET}" - einfo " CFLAGS: ${CFLAGS}" - einfo " LDFLAGS: ${LDFLAGS}" - return - fi - # We need to be very careful with the CFLAGS we ask ghc to pass through to - # gcc. There are plenty of flags which will make gcc produce output that - # breaks ghc in various ways. The main ones we want to pass through are - # -mcpu / -march flags. These are important for arches like alpha & sparc. - # We also use these CFLAGS for building the C parts of ghc, ie the rts. - strip-flags - strip-unsupported-flags - - # Cmm can't parse line numbers #482086 - replace-flags -ggdb[3-9] -ggdb2 - - GHC_FLAGS="" - GHC_PERSISTENT_FLAGS="" - for flag in ${CFLAGS}; do - case ${flag} in - - # Ignore extra optimisation (ghc passes -O to gcc anyway) - # -O2 and above break on too many systems - -O*) ;; - - # Arch and ABI flags are what we're really after - -m*) append-ghc-cflags compile assemble ${flag};; - - # Sometimes it's handy to see backtrace of RTS - # to get an idea what happens there - -g*) append-ghc-cflags compile ${flag};; - - # Ignore all other flags, including all -f* flags - esac - done - - for flag in ${LDFLAGS}; do - append-ghc-cflags link ${flag} - done - - # hardened-gcc needs to be disabled, because the mangler doesn't accept - # its output. - gcc-specs-pie && append-ghc-cflags persistent compile link -nopie - gcc-specs-ssp && append-ghc-cflags persistent compile -fno-stack-protector - - # prevent from failind building unregisterised ghc: - # http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html - use ppc64 && append-ghc-cflags persistent compile -mminimal-toc - # fix the similar issue as ppc64 TOC on ia64. ia64 has limited size of small data - # currently ghc fails to build haddock - # http://osdir.com/ml/gnu.binutils.bugs/2004-10/msg00050.html - use ia64 && append-ghc-cflags persistent compile -G0 -Os -} - -# substitutes string $1 to $2 in files $3 $4 ... -relocate_path() { - local from=$1 - local to=$2 - shift 2 - local file= - for file in "$@" - do - sed -i -e "s|$from|$to|g" \ - "$file" || die "path relocation failed for '$file'" - done -} - -# changes hardcoded ghc paths and updates package index -# $1 - new absolute root path -relocate_ghc() { - local to=$1 - - # libdir for prebuilt binary and for current system may mismatch - # It does for prefix installation for example: bug #476998 - local bin_ghc_prefix=${WORKDIR}/usr - local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*) - local bin_libdir=${bin_libpath#${bin_ghc_prefix}/} - - # backup original script to use it later after relocation - local gp_back="${T}/ghc-pkg-${GHC_PV}-orig" - cp "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" "$gp_back" || die "unable to backup ghc-pkg wrapper" - - if [[ ${bin_libdir} != $(get_libdir) ]]; then - einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)" - # moving the dir itself is not strictly needed - # but then USE=binary would result in installing - # in '${bin_libdir}' - mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die - - relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \ - "${WORKDIR}/usr/bin/ghc-${GHC_PV}" \ - "${WORKDIR}/usr/bin/ghci-${GHC_PV}" \ - "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \ - "${WORKDIR}/usr/bin/hsc2hs" \ - "${WORKDIR}/usr/bin/runghc-${GHC_PV}" \ - "$gp_back" \ - "${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"* - fi - - # Relocate from /usr to ${EPREFIX}/usr - relocate_path "/usr" "${to}/usr" \ - "${WORKDIR}/usr/bin/ghc-${GHC_PV}" \ - "${WORKDIR}/usr/bin/ghci-${GHC_PV}" \ - "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \ - "${WORKDIR}/usr/bin/hsc2hs" \ - "${WORKDIR}/usr/bin/runghc-${GHC_PV}" \ - "${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"* - - # this one we will use to regenerate cache - # so it should point to current tree location - relocate_path "/usr" "${WORKDIR}/usr" "$gp_back" - - if use prefix; then - # and insert LD_LIBRARY_PATH entry to EPREFIX dir tree - # TODO: add the same for darwin's CHOST and it's DYLD_ - local new_ldpath='LD_LIBRARY_PATH="'${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)'${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"\nexport LD_LIBRARY_PATH' - sed -i -e '2i'"$new_ldpath" \ - "${WORKDIR}/usr/bin/ghc-${GHC_PV}" \ - "${WORKDIR}/usr/bin/ghci-${GHC_PV}" \ - "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \ - "${WORKDIR}/usr/bin/hsc2hs" \ - "${WORKDIR}/usr/bin/runghc-${GHC_PV}" \ - "$gp_back" \ - "${WORKDIR}/usr/bin/hsc2hs" \ - || die "Adding LD_LIBRARY_PATH for wrappers failed" - fi - - # regenerate the binary package cache - "$gp_back" recache || die "failed to update cache after relocation" - rm "$gp_back" -} - -pkg_setup() { - # quiet portage about prebuilt binaries - use binary && QA_PREBUILT="*" - - if use ghcbootstrap; then - ewarn "You requested ghc bootstrapping, this is usually only used" - ewarn "by Gentoo developers to make binary .tbz2 packages." - - [[ -z $(type -P ghc) ]] && \ - die "Could not find a ghc to bootstrap with." - else - if ! yet_binary; then - eerror "Please try emerging with USE=ghcbootstrap and report build" - eerror "sucess or failure to the haskell team (haskell@gentoo.org)" - die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap" - fi - fi -} - -src_unpack() { - # Create the ${S} dir if we're using the binary version - use binary && mkdir "${S}" - - # the Solaris and Darwin binaries from ghc (maeder) need to be - # unpacked separately, so prevent them from being unpacked - local ONLYA=${A} - case ${CHOST} in - *-darwin* | *-solaris*) ONLYA=${GHC_P}-src.tar.bz2 ;; - esac - unpack ${ONLYA} - - if [[ -d "${S}"/libraries/dph ]]; then - # Sometimes dph libs get accidentally shipped with ghc - # but they are not installed unless user requests it. - # We never install them. - elog "Removing 'libraries/dph'" - rm -rf "${S}"/libraries/dph - fi -} - -src_prepare() { - ghc_setup_cflags - - if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then - # Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS. - # See bug #313635. - sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \ - "${WORKDIR}/usr/bin/ghc-${GHC_PV}" - - # allow hardened users use vanilla binary to bootstrap ghc - # ghci uses mmap with rwx protection at it implements dynamic - # linking on it's own (bug #299709) - pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${GHC_P}/bin/ghc" - fi - - if use binary; then - if use prefix; then - relocate_ghc "${EPREFIX}" - fi - - # Move unpacked files to the expected place - mv "${WORKDIR}/usr" "${S}" - else - if ! use ghcbootstrap; then - case ${CHOST} in - *-darwin* | *-solaris*) - # UPDATE ME for ghc-7 - mkdir "${WORKDIR}"/ghc-bin-installer || die - pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die - use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2 - use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2 - use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2 - use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2 - popd > /dev/null - - pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die - # fix the binaries so they run, on Solaris we need an - # LD_LIBRARY_PATH which has our prefix libdirs, on - # Darwin we need to replace the frameworks with our libs - # from the prefix fix before installation, because some - # of the tools are actually used during configure/make - if [[ ${CHOST} == *-solaris* ]] ; then - export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}" - elif [[ ${CHOST} == *-darwin* ]] ; then - local readline_framework=GNUreadline.framework/GNUreadline - local gmp_framework=/opt/local/lib/libgmp.10.dylib - local ncurses_file=/opt/local/lib/libncurses.5.dylib - for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do - install_name_tool -change \ - ${readline_framework} \ - "${EPREFIX}"/lib/libreadline.dylib \ - ${binary} || die - install_name_tool -change \ - ${gmp_framework} \ - "${EPREFIX}"/usr/lib/libgmp.dylib \ - ${binary} || die - install_name_tool -change \ - ${ncurses_file} \ - "${EPREFIX}"/usr/lib/libncurses.dylib \ - ${binary} || die - done - # we don't do frameworks! - sed -i \ - -e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \ - -e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \ - rts/package.conf.in || die - fi - - # it is autoconf, but we really don't want to give it too - # much arguments, in fact we do the make in-place anyway - ./configure --prefix="${WORKDIR}"/usr || die - make install || die - popd > /dev/null - ;; - *) - relocate_ghc "${WORKDIR}" - ;; - esac - fi - - sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \ - "${S}/ghc/ghc.wrapper" - - cd "${S}" # otherwise epatch will break - - epatch "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch - - epatch "${FILESDIR}"/${PN}-7.8.1_rc1-libbfd.patch - - epatch "${FILESDIR}"/${PN}-7.8.2-cgen-constify.patch - epatch "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch - # bug 518734 - epatch "${FILESDIR}"/${PN}-7.6.3-preserve-inplace-xattr.patch - epatch "${FILESDIR}"/${PN}-7.8.3-unreg-lit.patch - - # upstream backports - epatch "${FILESDIR}"/${PN}-7.8.3-linker-warn.patch - epatch "${FILESDIR}"/${PN}-7.8.3-deRefStablePtr.patch - epatch "${FILESDIR}"/${PN}-7.8.3-pic-asm.patch - epatch "${FILESDIR}"/${PN}-7.8.3-pic-sparc.patch - epatch "${FILESDIR}"/${PN}-7.8.3-cc-lang.patch - epatch "${FILESDIR}"/${PN}-7.8.3-ia64-prim.patch - - if use prefix; then - # Make configure find docbook-xsl-stylesheets from Prefix - sed -e '/^FP_DIR_DOCBOOK_XSL/s:\[.*\]:['"${EPREFIX}"'/usr/share/sgml/docbook/xsl-stylesheets/]:' \ - -i utils/haddock/doc/configure.ac || die - fi - - # as we have changed the build system - eautoreconf - fi -} - -src_configure() { - if ! use binary; then - # initialize build.mk - echo '# Gentoo changes' > mk/build.mk - - # Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV} - echo "docdir = ${EPREFIX}/usr/share/doc/${P}" >> mk/build.mk - echo "htmldir = ${EPREFIX}/usr/share/doc/${P}" >> mk/build.mk - - # We also need to use the GHC_FLAGS flags when building ghc itself - echo "SRC_HC_OPTS+=${GHC_FLAGS}" >> mk/build.mk - echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk - echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk - - # We can't depend on haddock except when bootstrapping when we - # must build docs and include them into the binary .tbz2 package - # app-text/dblatex is not in portage, can not build PDF or PS - if use ghcbootstrap && use doc; then - echo "BUILD_DOCBOOK_PDF = NO" >> mk/build.mk - echo "BUILD_DOCBOOK_PS = NO" >> mk/build.mk - echo "BUILD_DOCBOOK_HTML = YES" >> mk/build.mk - echo "HADDOCK_DOCS = YES" >> mk/build.mk - else - echo "BUILD_DOCBOOK_PDF = NO" >> mk/build.mk - echo "BUILD_DOCBOOK_PS = NO" >> mk/build.mk - echo "BUILD_DOCBOOK_HTML = NO" >> mk/build.mk - echo "HADDOCK_DOCS = NO" >> mk/build.mk - fi - - # allows overriding build flavours for libraries: - # v - vanilla (static libs) - # p - profiled - # dyn - shared libraries - # example: GHC_LIBRARY_WAYS="v dyn" - if [[ -n ${GHC_LIBRARY_WAYS} ]]; then - echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk - fi - - # Get ghc from the unpacked binary .tbz2 - # except when bootstrapping we just pick ghc up off the path - if ! use ghcbootstrap; then - export PATH="${WORKDIR}/usr/bin:${PATH}" - fi - - if use gmp; then - echo "INTEGER_LIBRARY=integer-gmp" >> mk/build.mk - else - echo "INTEGER_LIBRARY=integer-simple" >> mk/build.mk - fi - - # don't strip anything. Very useful when stage2 SIGSEGVs on you - echo "STRIP_CMD = :" >> mk/build.mk - - local econf_args=() - - # GHC embeds 'gcc' it was built by and uses it later. - # Don't allow things like ccache or versioned binary slip. - # We use stable thing across gcc upgrades. - is_crosscompile || econf_args+=(--with-gcc=${CHOST}-gcc) - - if ! use ghcmakebinary; then - econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@')) - fi - - econf ${econf_args[@]} --enable-bootstrap-with-devel-snapshot - - if [[ ${PV} == *9999* ]]; then - GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')" - GHC_P=${PN}-${GHC_PV} - fi - GHC_TPF="$(grep 'S\[\"TargetPlatformFull\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')" - fi # ! use binary -} - -src_compile() { - if ! use binary; then - # 1. build compiler binary first - emake ghc/stage2/build/tmp/ghc-stage2 - # 2. pax-mark (bug #516430) - pax-mark -m ghc/stage2/build/tmp/ghc-stage2 - # 3. and then all the rest - emake all - fi # ! use binary -} - -src_install() { - if use binary; then - use prefix && mkdir -p "${ED}" - mv "${S}/usr" "${ED}" - - # Remove the docs if not requested - if ! use doc; then - rm -rf "${ED}/usr/share/doc/${P}/*/" \ - "${ED}/usr/share/doc/${P}/*.html" \ - || die "could not remove docs (P vs PF revision mismatch?)" - fi - else - # We only build docs if we were bootstrapping, otherwise - # we copy them out of the unpacked binary .tbz2 - if use doc && ! use ghcbootstrap; then - mkdir -p "${ED}/usr/share/doc" - mv "${WORKDIR}/usr/share/doc/${P}" "${ED}/usr/share/doc" \ - || die "failed to copy docs" - else - dodoc "${S}/distrib/README" "${S}/ANNOUNCE" "${S}/LICENSE" "${S}/VERSION" - fi - - emake -j1 install DESTDIR="${D}" - - # remove link, but leave 'haddock-${GHC_P}' - rm -f "${ED}"/usr/bin/haddock - - if [[ ! -f "${S}/VERSION" ]]; then - echo "${GHC_PV}" > "${S}/VERSION" \ - || die "Could not create file ${S}/VERSION" - fi - dobashcomp "${FILESDIR}/ghc-bash-completion" - - fi - - # path to the package.cache - local package_confdir="${ED}/usr/$(get_libdir)/${GHC_P}/package.conf.d" - PKGCACHE="${package_confdir}"/package.cache - # copy the package.conf.d, including timestamp, save it so we can help - # users that have a broken package.conf.d - cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d" - - # copy the package.conf, including timestamp, save it so we later can put it - # back before uninstalling, or when upgrading. - cp -p "${PKGCACHE}"{,.shipped} \ - || die "failed to copy package.conf.d/package.cache" -} - -pkg_preinst() { - # have we got an earlier version of ghc installed? - if has_version "<${CATEGORY}/${PF}"; then - haskell_updater_warn="1" - fi -} - -pkg_postinst() { - ghc-reregister - - # path to the package.cache - PKGCACHE="${EROOT}/usr/$(get_libdir)/${GHC_P}/package.conf.d/package.cache" - - # give the cache a new timestamp, it must be as recent as - # the package.conf.d directory. - touch "${PKGCACHE}" - - if [[ "${haskell_updater_warn}" == "1" ]]; then - ewarn - ewarn "\e[1;31m************************************************************************\e[0m" - ewarn - ewarn "You have just upgraded from an older version of GHC." - ewarn "You may have to run" - ewarn " 'haskell-updater --upgrade'" - ewarn "to rebuild all ghc-based Haskell libraries." - ewarn - ewarn "\e[1;31m************************************************************************\e[0m" - ewarn - fi -} - -pkg_prerm() { - # Be very careful here... Call order when upgrading is (according to PMS): - # * src_install for new package - # * pkg_preinst for new package - # * pkg_postinst for new package - # * pkg_prerm for the package being replaced - # * pkg_postrm for the package being replaced - # so you'll actually be touching the new packages files, not the one you - # uninstall, due to that or installation directory ${GHC_P} will be the same for - # both packages. - - # Call order for reinstalling is (according to PMS): - # * src_install - # * pkg_preinst - # * pkg_prerm for the package being replaced - # * pkg_postrm for the package being replaced - # * pkg_postinst - - # Overwrite the modified package.cache with a copy of the - # original one, so that it will be removed during uninstall. - - PKGCACHE="${EROOT}/usr/$(get_libdir)/${GHC_P}/package.conf.d/package.cache" - rm -rf "${PKGCACHE}" - - cp -p "${PKGCACHE}"{.shipped,} -} - -pkg_postrm() { - ghc-package_pkg_postrm -} diff --git a/dev-lang/ghc/ghc-7.8.4.ebuild b/dev-lang/ghc/ghc-7.8.4.ebuild index aa9c5ccff19a..33f4a99bc644 100644 --- a/dev-lang/ghc/ghc-7.8.4.ebuild +++ b/dev-lang/ghc/ghc-7.8.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -76,9 +76,15 @@ RDEPEND=" >=dev-libs/gmp-5:= sys-libs/ncurses:=[unicode] !ghcmakebinary? ( virtual/libffi:= ) - !kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) - kernel_linux? ( >=sys-devel/binutils-2.17 ) - kernel_SunOS? ( >=sys-devel/binutils-2.17 ) +" +# gentoo binaries are built against ncurses-5 +RDEPEND+=" + binary? ( + || ( + sys-libs/ncurses:0/5 + sys-libs/ncurses:5/5 + ) + ) " # force dependency on >=gmp-5, even if >=gmp-4.1 would be enough. this is due to diff --git a/dev-lang/ghc/metadata.xml b/dev-lang/ghc/metadata.xml index a654b9b864fe..521a174394e8 100644 --- a/dev-lang/ghc/metadata.xml +++ b/dev-lang/ghc/metadata.xml @@ -9,6 +9,5 @@ Install the binary version directly, rather than using it to build the source version. Bootstrap from an existing GHC installation. Build with less runtime depends (bundle libffi for building bootstrap binaries). - Enable llvm code generator for ghc (-fllvm). diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest index fa36742a7d58..fe4edc3dd381 100644 --- a/dev-lang/moarvm/Manifest +++ b/dev-lang/moarvm/Manifest @@ -1,23 +1,10 @@ AUX Configure-2016.04.patch 5439 SHA256 b680d3ce8a53f9ac69a82a15c6415cfc0db12c372cbd2f599f152b93c6f93303 SHA512 00c177aae969805e8041544ed6d1b0dfdc6c76d5bba712c418f3c02357bdfba1f3a1792fef948c7125a7f9dc68e545c977daf2c8656fb4ece5701bc5f3f760db WHIRLPOOL c5f94a6e180c26c94f5a3ac01a108b6c2c8f9c2692334ed4f5b74853622482fb272cb4f8da855a0ac344b159a8acf97af201c7ae2d16a86d5fc7d917174d915b -DIST MoarVM-2016.03.tar.gz 3318299 SHA256 dfc3914e609f30ff06f14267bcbb4fcc6da3d85782d35c1838701a5ea41d8f2f SHA512 358c48f6b1803e39841e9f287f2fe3cdde743962d9d9c34e629c18b1b7290fd8a713917f24233dd092ed68adf9a6d0aadb25bda22b3e353d40bd57ae58d70216 WHIRLPOOL e68dfbc40bda23a49c28089fe8396e5a182afc0ac2550f9ab5d9f1564943af163fcc68b466feaf0778a2df57cd472c87f0853d47882b9b625434c7740ec5aec4 -DIST MoarVM-2016.04.tar.gz 3332850 SHA256 6fe9000daada59535747f2557cc73573241ba8a6044271caf1647aa37be33c6d SHA512 ef22145c9f7c32d7d12192cee63f286544500adff40fc2dbaad677d57108bc6efedc348fe8ddf460fe12d2c6b282e885bcb74fb3bcaa1e06b7719754175afe7d WHIRLPOOL e314f80cd785d31768630798647d7f445831bb29aaded88ef32326df3f4705a5d3fba2da00fce6888a2256b57aeb838922e94c3096250d30112f2be2bfacbb92 -DIST MoarVM-2016.05.tar.gz 3343486 SHA256 d59e3b366cd788a9e9aaa747dc0883dc6f41d97cb76a8fb2815bd565ef75498a SHA512 0cc946962b56cd9075013074228cee008c98b43da9bdaadd8ce91aa06d94510df1c4a2877d36945aff30dada01f3bf66c0ef1028c59967d09c0aec662aa87f99 WHIRLPOOL 1681538cb1a2919bfb49e51fe29877392ee0900d38daed1bbdae92d57332de84888f6ecae3bfbfba5b8132f186ebdfa3151a7cd038f10538e09c97ddae953adc -DIST MoarVM-2016.06.tar.gz 3345856 SHA256 5bf567890139cce09ade3ad4979908a7cdb36608b1670f958879ea4c4bb2bb41 SHA512 3c4b0357d5f6a0a8edfe7cf716916b08b733f4c522891d7e21be1cb97d55d4071c8798f3f1e614d400f20294db73f225014214e92e511a35cbb8fcc9bafa12d1 WHIRLPOOL fb78bc0689e21ae898ace27ec30e8774ed4bead1178924bf90df17892487cc5c70c4acf20f8ac2098863182da0017a7abc0df5c78f550454f818ef78e11616b2 -DIST MoarVM-2016.07.tar.gz 3349812 SHA256 6b78e25a5399744d3e6dc98e896849234dab1760cd618c07cf94a50caac06a6f SHA512 9437b3156556b2363e039e00ab3bcbf3b2436b641bb52edfac16fcbf7d02db2b139a1426ac7d4e1c5387271634a6395160348da492e1be39364d9556af6fb20d WHIRLPOOL a45a5aa7d1c1853be262999cbb0b84441dca3884a4605bc8324c5fd3a6717312a1e3c1636a4f8d28fc28bd3b87734b197ef33d5e8a62b7e78f3b92d942d5e41c -DIST MoarVM-2016.08.tar.gz 3350663 SHA256 8e57d3b89c1d92f37d7d8037306b7a20f09e28dc33f47759fc87bf785490746e SHA512 efbd5807684724c99015aee4a42041f5a1843838a09da71df4c9f2c316316a0f76e3d7ed4adddce8965924e633526bec31bff83c56d5f1c921760c396f6f5035 WHIRLPOOL d40109b8dec4f35ad36c35b6e7128c348df07ef1beabac6c9c7f8826df6fe747b4e0d69e97e291d1122666cfaffd5491dd245c7c4e3c6c966c4ff839a11a0217 -DIST MoarVM-2016.09.tar.gz 3355117 SHA256 12816e61a7cf94e984db81718baaa731b65b16393a4e90e1c60e099ff10a1079 SHA512 b74681943bb07a597b6911161cb3e4e4a4428a6940e9431b2a7225f7cdb44c0fde0c0155d1c6a3d2aff3577b816bb3b977d2273a46e3afaa8637b7a0ddc1e1bc WHIRLPOOL ce1e4a91719102b097a56f20b8ca55d87b17b0ea4cc471da953fcdce2cc2655487f3926c4956453d51d758f9cb4e45d428c78298adfa226351479362221cec79 DIST MoarVM-2016.10.tar.gz 3386119 SHA256 d8cb9fe74267dd933c3e405b098dea99cb9c0561aedb06e8efd8ddaef43396d0 SHA512 f8bd5ee1cd8206642408fde92b6f042c18f1ed6513fa52062d1882414ae58c2a601eafcc405f4e82d7d56d7a3d26dd13df2292ab77d26a92880b73334f139157 WHIRLPOOL 723a118d4a9e5c72c306b82efe0593458c5de83ed7fe7844a7c470c1b1d7d499b835a995083c61db53a16b13d061575aab7166c135ce5cf2911c1c139f6f5285 DIST MoarVM-2016.11.tar.gz 3402963 SHA256 5eaa8ff47b1c25e023a900947f88222fffe0884ce74652659ecd2265ae2d1387 SHA512 b049f0031a57c468189dcd4f6fd1a5e37e2572b026a769d564cb48e9b4e3e72c28049396481adae03b4e52d1112a24f65871316c67029293f3b024ad65eb2c00 WHIRLPOOL 738b05dd8bb769e392bb0fe567198a6b8f48b8b374455121cdae580d8c87766dc961146068c0e3987db05c48198e7a65cb08e5430637a36c2c9702bd86d61474 -EBUILD moarvm-2016.03.ebuild 575 SHA256 beeb6ada19c1445fe7cb5a61aed7a6092437c58dabd2f1c137b32629d7803229 SHA512 780e61ef41a47ad5bfe57d366b044ff1498b9f0d1cf27e25bf76043b17c2619b1779d4b3d44ced38e6f42fd74dde7fc2de0a848ff51a6d588b1f4668a0ab414c WHIRLPOOL 968ab0adfaee3cab0d945a8b6b34643615e1cc099e277e3993f26df3a5d41da6a0cb17bf7b1cefe2644e8ca9843bcb5e907984347adbeb5ec380b819be3d9788 -EBUILD moarvm-2016.04-r2.ebuild 1526 SHA256 c9d4931de31ae87e00fd20e2674a43fbfcf3f4f8065da9ff4f33131597b8576b SHA512 7dab1043dc6bb6dc7e5741926ceba811774d1cfad5e1a8f96b57fe5d12a00322776d2c0ad42038e1d73244938679eceafaea983834c4cf54811af3c2dec5c22e WHIRLPOOL 14b0c6ae70745c87de16a9c2c297438f8c1651f3fdf4e8f47f03967c8b66c74ee2fa654153bb220b5618ca6e668062abe457bdff83179be45306ae1b262614f1 -EBUILD moarvm-2016.04.ebuild 688 SHA256 f3f93468b6e2ae681822c13c6a8a115ddd8a550acd6fb44741bb2290bb931237 SHA512 de4902a88720ddbfb690f0c349d0db0f5e9236cf1a727d9f30d30aa272c28dfdee0059d065f76efa4f0c531b2acf503c1be15aefa66dd6cd9705d65412d9ddb9 WHIRLPOOL 9d9e1ce158d02dcb78922c2f47d03831f775e05445c0246f0c6298f30515b80f1589c1423224f6aac243d52ddcf4178d05f29f51950ef17d9f7958d1fffa6903 -EBUILD moarvm-2016.05.ebuild 1476 SHA256 1c54742fdbb55192a9f426aeed49de342fe2e095f895df80fcd0e0877cf34b51 SHA512 a62750541616ae083b6afbd884b6bebb5c847fbf98158e751c0cf4072112eda90d3765180f05061b0dd169f89fb91cb8f654de79b59116d4d13b16aee007c712 WHIRLPOOL 90a7d3a20d72768e922a77c46956cf7de35019725ca8a2e22fb425dbd17aab6e6e742369f5fe4936bcc3bfa678411f3125a44b0d26bf4592602e64facc3c78db -EBUILD moarvm-2016.06.ebuild 1476 SHA256 1c54742fdbb55192a9f426aeed49de342fe2e095f895df80fcd0e0877cf34b51 SHA512 a62750541616ae083b6afbd884b6bebb5c847fbf98158e751c0cf4072112eda90d3765180f05061b0dd169f89fb91cb8f654de79b59116d4d13b16aee007c712 WHIRLPOOL 90a7d3a20d72768e922a77c46956cf7de35019725ca8a2e22fb425dbd17aab6e6e742369f5fe4936bcc3bfa678411f3125a44b0d26bf4592602e64facc3c78db -EBUILD moarvm-2016.07.ebuild 1476 SHA256 1c54742fdbb55192a9f426aeed49de342fe2e095f895df80fcd0e0877cf34b51 SHA512 a62750541616ae083b6afbd884b6bebb5c847fbf98158e751c0cf4072112eda90d3765180f05061b0dd169f89fb91cb8f654de79b59116d4d13b16aee007c712 WHIRLPOOL 90a7d3a20d72768e922a77c46956cf7de35019725ca8a2e22fb425dbd17aab6e6e742369f5fe4936bcc3bfa678411f3125a44b0d26bf4592602e64facc3c78db -EBUILD moarvm-2016.08.ebuild 1476 SHA256 1c54742fdbb55192a9f426aeed49de342fe2e095f895df80fcd0e0877cf34b51 SHA512 a62750541616ae083b6afbd884b6bebb5c847fbf98158e751c0cf4072112eda90d3765180f05061b0dd169f89fb91cb8f654de79b59116d4d13b16aee007c712 WHIRLPOOL 90a7d3a20d72768e922a77c46956cf7de35019725ca8a2e22fb425dbd17aab6e6e742369f5fe4936bcc3bfa678411f3125a44b0d26bf4592602e64facc3c78db -EBUILD moarvm-2016.09.ebuild 1476 SHA256 1c54742fdbb55192a9f426aeed49de342fe2e095f895df80fcd0e0877cf34b51 SHA512 a62750541616ae083b6afbd884b6bebb5c847fbf98158e751c0cf4072112eda90d3765180f05061b0dd169f89fb91cb8f654de79b59116d4d13b16aee007c712 WHIRLPOOL 90a7d3a20d72768e922a77c46956cf7de35019725ca8a2e22fb425dbd17aab6e6e742369f5fe4936bcc3bfa678411f3125a44b0d26bf4592602e64facc3c78db +DIST MoarVM-2016.12.tar.gz 3409704 SHA256 70abf2f9aca87fecb73603843137016dd29aa40b92af0e3e06c608561ecf9721 SHA512 af1db57818fbe3f11a0b8fbe329cb81d953da42bb1e4e6284a79620bdd4fb3fdadf44274420f9e2be254e2642adc7a773e7c9e2d0638242077743a35c46a146e WHIRLPOOL 916431a779a5987bd8e74362dff553908c3f5a17e4d4c733c822909264747a307731bef99f0e7e37fc29772e594546bb517b5a1751640de82b9729670af2f1a1 EBUILD moarvm-2016.10.ebuild 1476 SHA256 1c54742fdbb55192a9f426aeed49de342fe2e095f895df80fcd0e0877cf34b51 SHA512 a62750541616ae083b6afbd884b6bebb5c847fbf98158e751c0cf4072112eda90d3765180f05061b0dd169f89fb91cb8f654de79b59116d4d13b16aee007c712 WHIRLPOOL 90a7d3a20d72768e922a77c46956cf7de35019725ca8a2e22fb425dbd17aab6e6e742369f5fe4936bcc3bfa678411f3125a44b0d26bf4592602e64facc3c78db EBUILD moarvm-2016.11.ebuild 1476 SHA256 1c54742fdbb55192a9f426aeed49de342fe2e095f895df80fcd0e0877cf34b51 SHA512 a62750541616ae083b6afbd884b6bebb5c847fbf98158e751c0cf4072112eda90d3765180f05061b0dd169f89fb91cb8f654de79b59116d4d13b16aee007c712 WHIRLPOOL 90a7d3a20d72768e922a77c46956cf7de35019725ca8a2e22fb425dbd17aab6e6e742369f5fe4936bcc3bfa678411f3125a44b0d26bf4592602e64facc3c78db +EBUILD moarvm-2016.12.ebuild 1476 SHA256 1c54742fdbb55192a9f426aeed49de342fe2e095f895df80fcd0e0877cf34b51 SHA512 a62750541616ae083b6afbd884b6bebb5c847fbf98158e751c0cf4072112eda90d3765180f05061b0dd169f89fb91cb8f654de79b59116d4d13b16aee007c712 WHIRLPOOL 90a7d3a20d72768e922a77c46956cf7de35019725ca8a2e22fb425dbd17aab6e6e742369f5fe4936bcc3bfa678411f3125a44b0d26bf4592602e64facc3c78db EBUILD moarvm-9999.ebuild 1476 SHA256 1c54742fdbb55192a9f426aeed49de342fe2e095f895df80fcd0e0877cf34b51 SHA512 a62750541616ae083b6afbd884b6bebb5c847fbf98158e751c0cf4072112eda90d3765180f05061b0dd169f89fb91cb8f654de79b59116d4d13b16aee007c712 WHIRLPOOL 90a7d3a20d72768e922a77c46956cf7de35019725ca8a2e22fb425dbd17aab6e6e742369f5fe4936bcc3bfa678411f3125a44b0d26bf4592602e64facc3c78db MISC ChangeLog 6921 SHA256 e2b30048966639138c517398a0c714521c8eefd737993c7ff7b3dfdba9b97da0 SHA512 42e01406c8379d65ec686ad0e7942fab96df3d36d8de96de7d6f2c9cd5a803ed3b9b15f3b22394cce0605fe2d5783c23199dce8dce284ae4454b53b96e5d02c1 WHIRLPOOL 54f852fbb17192681795fce561bb7145434d135a937eb45722811c616454e7057315a5f7be0ca0e3354f274e30b94ddc2b75e8e7b07072a84d8efb475c837824 MISC ChangeLog-2015 4400 SHA256 6e59f19096f30a6f33646aa8f9a1ef2ff10d978efab06fd3994a927c0b2bf6d6 SHA512 bd1c48512d42279de6a9d130cba987640b8aec313e688bfc69ab08fcdba879f0b655e51c21a0e8696399151ccdd6a74783d73aab4e732104d78bc0bab6e2f62c WHIRLPOOL d0b61997f7a901cc94d23bd1dc5de49e591313f58856f4e5ab9349646b6d70013d8e0b39e4c07d84d9f9c215d06e7eba7f9c553ced6ce458cc8d9b6c01c51b84 diff --git a/dev-lang/moarvm/moarvm-2016.03.ebuild b/dev-lang/moarvm/moarvm-2016.03.ebuild deleted file mode 100644 index 0e7c088bae43..000000000000 --- a/dev-lang/moarvm/moarvm-2016.03.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils multilib - -MY_PN="MoarVM" - -DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" -HOMEPAGE="http://moarvm.org" -SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz" -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -RDEPEND="dev-libs/libuv" -DEPEND="${RDEPEND} - dev-lang/perl" - -S="${WORKDIR}/MoarVM-${PV}" - -src_configure() { - perl Configure.pl --prefix="/usr"|| die -} - -src_install() { - emake DESTDIR="${D}" install -} diff --git a/dev-lang/moarvm/moarvm-2016.04-r2.ebuild b/dev-lang/moarvm/moarvm-2016.04-r2.ebuild deleted file mode 100644 index 6c0815b7962b..000000000000 --- a/dev-lang/moarvm/moarvm-2016.04-r2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit flag-o-matic - -MY_PN="MoarVM" -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" - inherit git-r3 - KEYWORDS="" - S="${WORKDIR}/${P}" -else - SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" -HOMEPAGE="http://moarvm.org" -LICENSE="Artistic-2" -SLOT="0" -IUSE="asan clang debug doc +jit static-libs optimize ubsan" - -RDEPEND="dev-libs/libatomic_ops - dev-libs/libtommath - dev-libs/libuv - jit? ( dev-lang/lua:0[deprecated] - dev-lua/LuaBitOp ) - virtual/libffi" -DEPEND="${RDEPEND} - clang? ( >=sys-devel/clang-3.1 ) - dev-lang/perl" - -PATCHES=( "${FILESDIR}/Configure-2016.04.patch" ) -DOCS=( CREDITS README.markdown ) - -# Tests are conducted via nqp -RESTRICT=test - -src_configure() { - use doc && DOCS+=( docs/* ) - local myconfigargs=( - "--prefix=/usr" - "--has-libtommath" - "--has-libuv" - "--has-libatomic_ops" - "--has-libffi" - "--libdir=$(get_libdir)" - "--compiler=$(usex clang clang gcc)" - "$(usex asan --asan)" - "$(usex debug --debug --no-debug)" - "$(usex jit --lua=/usr/bin/lua --no-jit)" - "$(usex optimize --optimize= --no-optimize)" - "$(usex static-libs --static)" - "$(usex ubsan --ubsan)" - ) - use optimize && filter-flags '-O*' - - perl Configure.pl "${myconfigargs[@]}" || die -} diff --git a/dev-lang/moarvm/moarvm-2016.04.ebuild b/dev-lang/moarvm/moarvm-2016.04.ebuild deleted file mode 100644 index 9ce8da2ab607..000000000000 --- a/dev-lang/moarvm/moarvm-2016.04.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils multilib - -MY_PN="MoarVM" - -DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" -HOMEPAGE="http://moarvm.org" -SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz" -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -RDEPEND="dev-libs/libuv - dev-libs/libtommath - dev-libs/libatomic_ops - dev-libs/libuv - " -DEPEND="${RDEPEND} - dev-lang/perl" - -S="${WORKDIR}/MoarVM-${PV}" - -src_configure() { - perl Configure.pl --prefix="/usr" --has-libtommath --has-libatomic_ops --has-libuv || die -} - -src_install() { - emake DESTDIR="${D}" install -} diff --git a/dev-lang/moarvm/moarvm-2016.06.ebuild b/dev-lang/moarvm/moarvm-2016.06.ebuild deleted file mode 100644 index 5e0452988700..000000000000 --- a/dev-lang/moarvm/moarvm-2016.06.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit flag-o-matic - -MY_PN="MoarVM" -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" - inherit git-r3 - KEYWORDS="" - S="${WORKDIR}/${P}" -else - SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" -HOMEPAGE="http://moarvm.org" -LICENSE="Artistic-2" -SLOT="0" -IUSE="asan clang debug doc +jit static-libs optimize ubsan" - -RDEPEND="dev-libs/libatomic_ops - dev-libs/libtommath - dev-libs/libuv - jit? ( dev-lang/lua:0[deprecated] - dev-lua/LuaBitOp ) - virtual/libffi" -DEPEND="${RDEPEND} - clang? ( >=sys-devel/clang-3.1 ) - dev-lang/perl" - -DOCS=( CREDITS README.markdown ) - -# Tests are conducted via nqp -RESTRICT=test - -src_configure() { - use doc && DOCS+=( docs/* ) - local myconfigargs=( - "--prefix=/usr" - "--has-libtommath" - "--has-libuv" - "--has-libatomic_ops" - "--has-libffi" - "--libdir=$(get_libdir)" - "--compiler=$(usex clang clang gcc)" - "$(usex asan --asan)" - "$(usex debug --debug --no-debug)" - "$(usex jit --lua=/usr/bin/lua --no-jit)" - "$(usex optimize --optimize= --no-optimize)" - "$(usex static-libs --static)" - "$(usex ubsan --ubsan)" - ) - use optimize && filter-flags '-O*' - - perl Configure.pl "${myconfigargs[@]}" || die -} diff --git a/dev-lang/moarvm/moarvm-2016.07.ebuild b/dev-lang/moarvm/moarvm-2016.07.ebuild deleted file mode 100644 index 5e0452988700..000000000000 --- a/dev-lang/moarvm/moarvm-2016.07.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit flag-o-matic - -MY_PN="MoarVM" -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" - inherit git-r3 - KEYWORDS="" - S="${WORKDIR}/${P}" -else - SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" -HOMEPAGE="http://moarvm.org" -LICENSE="Artistic-2" -SLOT="0" -IUSE="asan clang debug doc +jit static-libs optimize ubsan" - -RDEPEND="dev-libs/libatomic_ops - dev-libs/libtommath - dev-libs/libuv - jit? ( dev-lang/lua:0[deprecated] - dev-lua/LuaBitOp ) - virtual/libffi" -DEPEND="${RDEPEND} - clang? ( >=sys-devel/clang-3.1 ) - dev-lang/perl" - -DOCS=( CREDITS README.markdown ) - -# Tests are conducted via nqp -RESTRICT=test - -src_configure() { - use doc && DOCS+=( docs/* ) - local myconfigargs=( - "--prefix=/usr" - "--has-libtommath" - "--has-libuv" - "--has-libatomic_ops" - "--has-libffi" - "--libdir=$(get_libdir)" - "--compiler=$(usex clang clang gcc)" - "$(usex asan --asan)" - "$(usex debug --debug --no-debug)" - "$(usex jit --lua=/usr/bin/lua --no-jit)" - "$(usex optimize --optimize= --no-optimize)" - "$(usex static-libs --static)" - "$(usex ubsan --ubsan)" - ) - use optimize && filter-flags '-O*' - - perl Configure.pl "${myconfigargs[@]}" || die -} diff --git a/dev-lang/moarvm/moarvm-2016.08.ebuild b/dev-lang/moarvm/moarvm-2016.08.ebuild deleted file mode 100644 index 5e0452988700..000000000000 --- a/dev-lang/moarvm/moarvm-2016.08.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit flag-o-matic - -MY_PN="MoarVM" -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" - inherit git-r3 - KEYWORDS="" - S="${WORKDIR}/${P}" -else - SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" -HOMEPAGE="http://moarvm.org" -LICENSE="Artistic-2" -SLOT="0" -IUSE="asan clang debug doc +jit static-libs optimize ubsan" - -RDEPEND="dev-libs/libatomic_ops - dev-libs/libtommath - dev-libs/libuv - jit? ( dev-lang/lua:0[deprecated] - dev-lua/LuaBitOp ) - virtual/libffi" -DEPEND="${RDEPEND} - clang? ( >=sys-devel/clang-3.1 ) - dev-lang/perl" - -DOCS=( CREDITS README.markdown ) - -# Tests are conducted via nqp -RESTRICT=test - -src_configure() { - use doc && DOCS+=( docs/* ) - local myconfigargs=( - "--prefix=/usr" - "--has-libtommath" - "--has-libuv" - "--has-libatomic_ops" - "--has-libffi" - "--libdir=$(get_libdir)" - "--compiler=$(usex clang clang gcc)" - "$(usex asan --asan)" - "$(usex debug --debug --no-debug)" - "$(usex jit --lua=/usr/bin/lua --no-jit)" - "$(usex optimize --optimize= --no-optimize)" - "$(usex static-libs --static)" - "$(usex ubsan --ubsan)" - ) - use optimize && filter-flags '-O*' - - perl Configure.pl "${myconfigargs[@]}" || die -} diff --git a/dev-lang/moarvm/moarvm-2016.09.ebuild b/dev-lang/moarvm/moarvm-2016.09.ebuild deleted file mode 100644 index 5e0452988700..000000000000 --- a/dev-lang/moarvm/moarvm-2016.09.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit flag-o-matic - -MY_PN="MoarVM" -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" - inherit git-r3 - KEYWORDS="" - S="${WORKDIR}/${P}" -else - SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" -HOMEPAGE="http://moarvm.org" -LICENSE="Artistic-2" -SLOT="0" -IUSE="asan clang debug doc +jit static-libs optimize ubsan" - -RDEPEND="dev-libs/libatomic_ops - dev-libs/libtommath - dev-libs/libuv - jit? ( dev-lang/lua:0[deprecated] - dev-lua/LuaBitOp ) - virtual/libffi" -DEPEND="${RDEPEND} - clang? ( >=sys-devel/clang-3.1 ) - dev-lang/perl" - -DOCS=( CREDITS README.markdown ) - -# Tests are conducted via nqp -RESTRICT=test - -src_configure() { - use doc && DOCS+=( docs/* ) - local myconfigargs=( - "--prefix=/usr" - "--has-libtommath" - "--has-libuv" - "--has-libatomic_ops" - "--has-libffi" - "--libdir=$(get_libdir)" - "--compiler=$(usex clang clang gcc)" - "$(usex asan --asan)" - "$(usex debug --debug --no-debug)" - "$(usex jit --lua=/usr/bin/lua --no-jit)" - "$(usex optimize --optimize= --no-optimize)" - "$(usex static-libs --static)" - "$(usex ubsan --ubsan)" - ) - use optimize && filter-flags '-O*' - - perl Configure.pl "${myconfigargs[@]}" || die -} diff --git a/dev-lang/moarvm/moarvm-2016.05.ebuild b/dev-lang/moarvm/moarvm-2016.12.ebuild similarity index 100% rename from dev-lang/moarvm/moarvm-2016.05.ebuild rename to dev-lang/moarvm/moarvm-2016.12.ebuild diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest index e63ec15ec71e..eb64d7859fa6 100644 --- a/dev-lang/nqp/Manifest +++ b/dev-lang/nqp/Manifest @@ -1,23 +1,10 @@ AUX enable-external-jars.patch 7921 SHA256 a4cb4d4c6390a4dccfe849e4db0c736e7516f1ac6d952d6f0b6e12277aae3ab3 SHA512 cddc6716f66c114a2c97840c1443322a2ec1aad668fce40207a6fa3ec8cd5baaefc9ae7a20b72ca663c7756b98f970d3319baf1af195c9c30b4002f6c79f7776 WHIRLPOOL 3dfd51260fed3a1768c3273edff398f6ecddf99e4f7b623b24a8bda2eba61d51e02aa17456d6643c62b7650f033d18decb005789e3ab87679d2d3c3302f68e38 -DIST nqp-2016.03.tar.gz 5126687 SHA256 50731983cfc0800015bf73a2174000f5631ad09b551ff190153fba00a448067f SHA512 707701e22752cb43b0694c8c57ec834cfee3d2a50c2b6ae3ee36af5881728c94ae1d03d07c624367edb6cf58bba18abd26dcc18656b0483f4f979db5dd26a07e WHIRLPOOL 364abefc3d7b005b89fd3a3180e66971dbc56851377b93e38d2a8b2ed546121ec730628e0f93947f77e8f12346d64e60b4af8ffa720dc0a05810fae846b262a4 -DIST nqp-2016.04.tar.gz 5156494 SHA256 9176422eb2a99db24ab520bc78686f3a2c008ba73bf8c7091a790985f5061019 SHA512 5dcb685a90b26fee3e8dac3ca24da11bd967d034b5328232d18d9db37e27645b57259cabf54ef8e10b3ac508b1aa784072f0a9542d30168d3017f86e610c3cee WHIRLPOOL 0711e1471740b0ed181f9e4504f810a084056e74650c0ffb1c6c17e2976b2c1facb6a7e73df5d991d9ffe43f055fe844f0756dbd816375708b4d499a0f7a9162 -DIST nqp-2016.05.tar.gz 5159647 SHA256 7fdd76322383632783b4352e8fab144c3d68acbfda5112c1f178d8909277f616 SHA512 c81d2f6ef13fad36ed863869c985049a5e1daa04e979449fbbd3b5b365ff58430711f6a7ed5ac10ff61fe6a78d4f960f76ade7445ecb82eb3100882449747a61 WHIRLPOOL 119237accc6723db4afa27cdbb1409e9d11a572bf24fbd83e8bed3c507193bf2199bb5a1e8a27052d922040892f5ce35ffd30640218bbc15167fff88e70941c7 -DIST nqp-2016.06.tar.gz 5162457 SHA256 e8142a6fb9ff710fa8a312e84f73986abb0027f537ec53ef2a42b5d6da6df8ac SHA512 76821f63a247fee1e4d8eea87ef2187f6529f72dd3c77fc2cb2829c050e9689b586a7b61d12e4523c507e08618ca2ae7f6d85a95542113f20bae961be6fd024f WHIRLPOOL 62ee4b31e7e9de3c8623f16cf0d7d216214c1bd2232f7192ea02f2cc6edaf0d67707aacd23692757db6d81711c8719409e4d1518d7b7383c25b04911c64f2cb5 -DIST nqp-2016.07.tar.gz 5163170 SHA256 bf579d9b8bfa35e4cae368db0f5fa74785e3d571970e043278fe0ccefb91d59f SHA512 74ef7af564aafac4c4785431e6618ed6ccf962c70fb2ad91e63f765c8e107e230f03b8095c917db9d2ebd2829aaa42cd426de5eeb826c60f3ac935cabfaaefaf WHIRLPOOL 0a83126d163cb045351bb28e6af6860bd62c83ee5570bf702813d1553428739e91f3d3966f16c6977fa418d844eb9072a28dca4a263f956c9c308a98009d0807 -DIST nqp-2016.08.1.tar.gz 3931460 SHA256 2eb9c0ea2864a232f50db6f898370caea1e844daabce658b44847aa31dee56ab SHA512 fa771dd46b84aa7cf295a86d4a54953fc99cc3ef90f272ea8331bf02fd30d1e7e4139c5f7518294de98a66d4bac0451e2fe98a8e05ff294fa622ca84d7e45d6f WHIRLPOOL ed4d3b2d035581d4cc031815cb7da00785f96818af9a9970cd7b34d9baef5ecd4955296eaf081df34922667907540309bf3eae22069d29a7c459306ff7d8cfc6 -DIST nqp-2016.09.tar.gz 3935097 SHA256 24f10be9d1072d9dc3314bc729c1fbbe0df09accd2e4f9b2cb0f403a1c251d57 SHA512 0d6af33cfd856a191027a2ca3001b4142e775f919f4f5bf8ef0c92dae1e6c84b3c19bef17d6ec11202429c03f3a1d21fa719201aea935cabeeb8efc656451680 WHIRLPOOL 2175ec6fb8f7b730fdeb35bd014b619af662621ab89491fb3fb870bc6724f03b8af40d07080154af7ec3f246d1e717f662be1feb6e5d4ee39c3143784576b370 DIST nqp-2016.10.tar.gz 3943840 SHA256 d66905006e74b6d55f7abd3fba051fdf9a2583879bbf3cecaab076c07d39d476 SHA512 8a42fd4062237838d71870718e8cb9c166fb022fa05d624543479d9476890aa4eaaba0f4ba0d9c5ca1684559f34d999acdfbb5173d15a462ae94a9aaabbd1dbd WHIRLPOOL 62868016c516888df327601be2f4bb30b156bd0d3a14a3a1e9f7d162c5dfe089f3bf2946b69237eff559e44870a07e702480947bc47e13c6b4b7ca81a947ad31 DIST nqp-2016.11.tar.gz 3946759 SHA256 08d3eb664ad049e72bd9821755564ee7cbbf0da4833f1bcc9441e970c5f73ccd SHA512 bd99e286dc09fa5096429cc35847e43893d30a9ce9efdfb55346c04eeeda0c44307fd39217107a2210040b7a4dcc900f69279e19d1cc54a469ab286377e28f6a WHIRLPOOL 373fe379cf8fe965d9c1097042a55472d69322c08e613a9d55749bbb4da084b84adee5c5dfe93c4f9bf81298e28308d697f66482b80a16ada3ea9ea81754f54b -EBUILD nqp-2016.03.ebuild 1428 SHA256 d07c485a081ecaa7f8295d5a323bba8b82a03e94f6917c3605d90ac5c233596d SHA512 0d6b310c13ec8efc5bc6b8083ed138582d659f8c4ef460b76bacf7297e8a1ab66e465f71170d6d0eee539d2190e3cd64de796b627000bf53b0264ea599d2d2f3 WHIRLPOOL f5058326b167ced367cb43941a15bda05fcf108c25543b5be879130f514545b2377d5c7be0e899d17832c124f13baf886eeeb79623e508427d4e2064902f76b9 -EBUILD nqp-2016.04-r3.ebuild 3667 SHA256 c57fa2247d88965e30195bf8dfcf0b02c4185f8f147960fd6aa9685629b1c6e0 SHA512 102df041727820983f4e542928e747632bb1febd7ce57fdf41157ab9bd967bd9890e106ca06e237a336a9c064fc8777f4ee9d79a22ae0f886a5d1f4b0fdc62e6 WHIRLPOOL 421ecc1f31b10050d0cb79acf98b78f2a5fed27d1455d35aae2e067281a3b9802c003ad34f9361faabddf33dfa3d7404873e637adaa12c7dc2f7cbde704bc75a -EBUILD nqp-2016.04.ebuild 1428 SHA256 99f6a521a77b92f9513aed350902a66c653002233b4dc96bd13f5197e9f8dc6f SHA512 f9f3b4776218673386953b2dc511778bd04bfae2d2f4f67aaaa53a0933f0a4b36930615a786ed6e7419d2b373ce0794f8ceded2e0f1f17d260ac16fea200f6aa WHIRLPOOL 898de6859aade8eab53d1617bbf57196b41f222bebeb0e8ee55eef679394136a84cae242ae6efcc31222dbe65a01d7a0c46155f061acbd006f3ec3af7e9818bd -EBUILD nqp-2016.05.ebuild 3614 SHA256 72a37f436f25f4c1917f869654366033fee3eea804099202e0937853bc719520 SHA512 fc89a247e27cf777726d8a3b88bf6aaa3539027d3c5d9814041251a98bdf19e5b1f9a13d566930fc05ddf2bc00e29dc211e399526330147e721b5a70761f1f32 WHIRLPOOL 9bb97058b72ede27b3e51785279f2c2a99ba87b1a81b2a3376dc7ac76932954c6981b2beaf635ba432d9166327d51d9a102f7d9baf42be9d5554128072e81b56 -EBUILD nqp-2016.06.ebuild 3614 SHA256 72a37f436f25f4c1917f869654366033fee3eea804099202e0937853bc719520 SHA512 fc89a247e27cf777726d8a3b88bf6aaa3539027d3c5d9814041251a98bdf19e5b1f9a13d566930fc05ddf2bc00e29dc211e399526330147e721b5a70761f1f32 WHIRLPOOL 9bb97058b72ede27b3e51785279f2c2a99ba87b1a81b2a3376dc7ac76932954c6981b2beaf635ba432d9166327d51d9a102f7d9baf42be9d5554128072e81b56 -EBUILD nqp-2016.07.ebuild 3614 SHA256 72a37f436f25f4c1917f869654366033fee3eea804099202e0937853bc719520 SHA512 fc89a247e27cf777726d8a3b88bf6aaa3539027d3c5d9814041251a98bdf19e5b1f9a13d566930fc05ddf2bc00e29dc211e399526330147e721b5a70761f1f32 WHIRLPOOL 9bb97058b72ede27b3e51785279f2c2a99ba87b1a81b2a3376dc7ac76932954c6981b2beaf635ba432d9166327d51d9a102f7d9baf42be9d5554128072e81b56 -EBUILD nqp-2016.08.1.ebuild 3616 SHA256 20d804cdea3bc3be561c1042996f9ee3359f32f4e43cc2951668994b857ae2d4 SHA512 a349a13496cfdead3e80be10dbf2b2b497989c3f27988c12b6aac6104aff99286518dba7ccf41316b2b87f5227cad1a3a002dd01719049010dd45434e43d678f WHIRLPOOL f4c92b3e6281325693436c3e472a7484382a49f93f1d10ce9c99139f0c7db77722e65dca6c594c3639c82c72dfa857948a04052489af4d33eb28c3b212f351fe -EBUILD nqp-2016.09.ebuild 3614 SHA256 72a37f436f25f4c1917f869654366033fee3eea804099202e0937853bc719520 SHA512 fc89a247e27cf777726d8a3b88bf6aaa3539027d3c5d9814041251a98bdf19e5b1f9a13d566930fc05ddf2bc00e29dc211e399526330147e721b5a70761f1f32 WHIRLPOOL 9bb97058b72ede27b3e51785279f2c2a99ba87b1a81b2a3376dc7ac76932954c6981b2beaf635ba432d9166327d51d9a102f7d9baf42be9d5554128072e81b56 +DIST nqp-2016.12.tar.gz 3643470 SHA256 3dfd71f7f51b78a8266d159a41a4b9d0a3fff1b93b7366054c2daf14ec5df981 SHA512 5967029227b6f527f25cfdc0f27e5466cbff4286e2ef7252b3767fe5f752210d5637d634c4e946f32797e4e380f2f937523a325497214767fae3fa39764eecb2 WHIRLPOOL 67e7138d8d7bd428f77d37721f206a613498cabb07ea0cdfa9afa730505e303709f86373dc36d0ac149f35e08193e85621e41131832e5bafbd5765d1b0d8ed51 EBUILD nqp-2016.10.ebuild 3614 SHA256 72a37f436f25f4c1917f869654366033fee3eea804099202e0937853bc719520 SHA512 fc89a247e27cf777726d8a3b88bf6aaa3539027d3c5d9814041251a98bdf19e5b1f9a13d566930fc05ddf2bc00e29dc211e399526330147e721b5a70761f1f32 WHIRLPOOL 9bb97058b72ede27b3e51785279f2c2a99ba87b1a81b2a3376dc7ac76932954c6981b2beaf635ba432d9166327d51d9a102f7d9baf42be9d5554128072e81b56 EBUILD nqp-2016.11.ebuild 3614 SHA256 72a37f436f25f4c1917f869654366033fee3eea804099202e0937853bc719520 SHA512 fc89a247e27cf777726d8a3b88bf6aaa3539027d3c5d9814041251a98bdf19e5b1f9a13d566930fc05ddf2bc00e29dc211e399526330147e721b5a70761f1f32 WHIRLPOOL 9bb97058b72ede27b3e51785279f2c2a99ba87b1a81b2a3376dc7ac76932954c6981b2beaf635ba432d9166327d51d9a102f7d9baf42be9d5554128072e81b56 +EBUILD nqp-2016.12.ebuild 3614 SHA256 72a37f436f25f4c1917f869654366033fee3eea804099202e0937853bc719520 SHA512 fc89a247e27cf777726d8a3b88bf6aaa3539027d3c5d9814041251a98bdf19e5b1f9a13d566930fc05ddf2bc00e29dc211e399526330147e721b5a70761f1f32 WHIRLPOOL 9bb97058b72ede27b3e51785279f2c2a99ba87b1a81b2a3376dc7ac76932954c6981b2beaf635ba432d9166327d51d9a102f7d9baf42be9d5554128072e81b56 EBUILD nqp-9999.ebuild 3614 SHA256 72a37f436f25f4c1917f869654366033fee3eea804099202e0937853bc719520 SHA512 fc89a247e27cf777726d8a3b88bf6aaa3539027d3c5d9814041251a98bdf19e5b1f9a13d566930fc05ddf2bc00e29dc211e399526330147e721b5a70761f1f32 WHIRLPOOL 9bb97058b72ede27b3e51785279f2c2a99ba87b1a81b2a3376dc7ac76932954c6981b2beaf635ba432d9166327d51d9a102f7d9baf42be9d5554128072e81b56 MISC ChangeLog 6805 SHA256 24f5fd858a027e5c0d66c8070fb1190cb0c176bef6f5c7a9ef2567e92ad3e00b SHA512 c166f8ce55decf53ef46911b6fe2661368d6dbbfbc6c0b70e39e8c8b99f4bd764492f1eb2a7351362eda72b7307363a94d5f845d598f1b4b9285e6abe365405c WHIRLPOOL cd0b51b56c54e6190790a0123640270cc1f3b9fcea6dd757b3501df473aaa71b468ddc1ce9fccb6f2ed2cbf8face53ce6055fa6d7c3e2d606a041c424c7d979d MISC ChangeLog-2015 9081 SHA256 971953bf554c81aa3f83c29ba1ed70485b940ec6fa1179c13f12a3fdef70dd0c SHA512 865cdb4d3fe65c7d17cfc4e29c003d344bff9fa67743ca173522e379274bbcaa0391f7471b1b8ab334466e9048773bf7bf5fab476007d9c627b9eaf51159faa9 WHIRLPOOL 5246d66fd1ed3eb57da242dbdf0c8367835dee1188325387c6b90dd5d1d2eacf381eb53f71b5764f8aa677c7f043793b6a2f04e7111aa744d60aa2ad8c96ec87 diff --git a/dev-lang/nqp/nqp-2016.03.ebuild b/dev-lang/nqp/nqp-2016.03.ebuild deleted file mode 100644 index 63020f35afb8..000000000000 --- a/dev-lang/nqp/nqp-2016.03.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# still not working -RESTRICT="test" - -inherit eutils multilib versionator - -GITCRAP=d1e443f - -DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" -HOMEPAGE="http://rakudo.org/" -SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="doc java +moar" -REQUIRED_USE="|| ( java moar )" - -RDEPEND=" - java? ( >=virtual/jre-1.7 ) - moar? ( ~dev-lang/moarvm-${PV} ) - dev-libs/libffi" -DEPEND="${RDEPEND} - java? ( >=virtual/jdk-1.7 ) - dev-lang/perl" - -S=${WORKDIR}/perl6-nqp-${GITCRAP} - -src_configure() { - use java && myconf+="jvm," - use moar && myconf+="moar," - perl Configure.pl --backend=${myconf} --prefix=/usr || die - # dirty hack to make dyncall not fail - sed -i -e 's/-Werror=missing-prototypes//' Makefile || die - sed -i -e 's/-Werror=missing-declarations//' Makefile || die - sed -i -e 's/-Werror=strict-prototypes//' Makefile || die - - # more dirty hack to allow building with newer gcc - sed -i -e 's/-Werror=implicit-function-declaration//' Makefile || die - sed -i -e 's/-Werror=nested-externs//' Makefile || die -} - -src_compile() { - emake -j1 || die -} - -src_test() { - emake -j1 test || die -} - -src_install() { - emake DESTDIR="${ED}" install || die - - dodoc CREDITS README.pod || die - - if use doc; then - dodoc -r docs/* || die - fi -} diff --git a/dev-lang/nqp/nqp-2016.04-r3.ebuild b/dev-lang/nqp/nqp-2016.04-r3.ebuild deleted file mode 100644 index 35e745f45ab6..000000000000 --- a/dev-lang/nqp/nqp-2016.04-r3.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit java-pkg-opt-2 multibuild - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/perl6/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" - inherit vcs-snapshot - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" -HOMEPAGE="http://rakudo.org/" - -LICENSE="Artistic-2" -SLOT="0" -IUSE="doc clang java +moar test" -REQUIRED_USE="|| ( java moar )" - -CDEPEND="java? ( - dev-java/asm:4 - dev-java/jline:0 - dev-java/jna:4 - ) - moar? ( ~dev-lang/moarvm-${PV}[clang=] )" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) - dev-lang/perl" -PATCHES=( "${FILESDIR}/enable-external-jars.patch" ) - -pkg_pretend() { - if has_version dev-lang/rakudo || has_version dev-lang/nqp; then - ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP" - ewarn "already being installed. So if it fails, try uninstalling both" - ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -java_prepare() { - # Don't clean stage0 jars. - einfo "Cleaning upstream jars" - java-pkg_clean 3rdparty/ - - # Don't use jars we just deleted. - sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \ - src/vm/jvm/runners/nqp-j || die -} - -src_prepare() { - MULTIBUILD_VARIANTS=() - use moar && MULTIBUILD_VARIANTS+=( moar ) - use java && MULTIBUILD_VARIANTS+=( jvm ) - - multibuild_copy_sources - - # This will pull in conditional java_prepare - default -} - -nqp_configure() { - pushd "${BUILD_DIR}" > /dev/null || die - local myconfargs=( - "--backend=${MULTIBUILD_VARIANT}" - "--prefix=/usr" ) - - perl Configure.pl "${myconfargs[@]}" || die - popd || die -} - -nqp_compile() { - if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then - emake -j1 \ - -C "${BUILD_DIR}" \ - THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \ - JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" - elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then - emake -j1 \ - -C "${BUILD_DIR}" - fi -} - -nqp_test() { - emake -j1 \ - -C "${BUILD_DIR}" \ - test -} - -nqp_install() { - # This is the actual reason we need multibuild.eclass. - # We need to distinguish the install procedure for MoarVM and JVM backends. - case "${MULTIBUILD_VARIANT}" in - moar) - emake \ - DESTDIR="${ED}" \ - -C "${BUILD_DIR}" \ - install - ;; - jvm) - pushd "${BUILD_DIR}" > /dev/null || die - # Set JAVA_PKG_JARDEST early. - java-pkg_init_paths_ - - # Upstream sets the classpath to this location. Perhaps it's - # used to locate the additional libraries? - java-pkg_addcp "${JAVA_PKG_JARDEST}" - - insinto "${JAVA_PKG_JARDEST}" - local jar - - for jar in *.jar; do - if has ${jar} ${PN}.jar ${PN}-runtime.jar; then - # jars for NQP itself. - java-pkg_dojar ${jar} - else - # jars used by NQP. - doins ${jar} - fi - done - - # Upstream uses -Xbootclasspath/a, which is faster due to lack - # of verification, but gjl isn't flexible enough yet. :( - java-pkg_dolauncher ${PN}-j --main ${PN} - dosym ${PN}-j /usr/bin/${PN} - dobin tools/jvm/eval-client.pl - popd > /dev/null || die - ;; - *) - die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}." - ;; - esac -} - -src_configure() { - multibuild_foreach_variant nqp_configure -} - -src_compile() { - multibuild_foreach_variant nqp_compile -} - -src_test() { - multibuild_foreach_variant nqp_test -} - -src_install() { - multibuild_foreach_variant nqp_install - - dodoc CREDITS README.pod - use doc && dodoc -r docs/* -} diff --git a/dev-lang/nqp/nqp-2016.04.ebuild b/dev-lang/nqp/nqp-2016.04.ebuild deleted file mode 100644 index 4a4564476eea..000000000000 --- a/dev-lang/nqp/nqp-2016.04.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# still not working -RESTRICT="test" - -inherit eutils multilib versionator - -GITCRAP=10d3ecc - -DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" -HOMEPAGE="http://rakudo.org/" -SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="doc java +moar" -REQUIRED_USE="|| ( java moar )" - -RDEPEND=" - java? ( >=virtual/jre-1.7 ) - moar? ( ~dev-lang/moarvm-${PV} ) - dev-libs/libffi" -DEPEND="${RDEPEND} - java? ( >=virtual/jdk-1.7 ) - dev-lang/perl" - -S=${WORKDIR}/perl6-nqp-${GITCRAP} - -src_configure() { - use java && myconf+="jvm," - use moar && myconf+="moar," - perl Configure.pl --backend=${myconf} --prefix=/usr || die - # dirty hack to make dyncall not fail - sed -i -e 's/-Werror=missing-prototypes//' Makefile || die - sed -i -e 's/-Werror=missing-declarations//' Makefile || die - sed -i -e 's/-Werror=strict-prototypes//' Makefile || die - - # more dirty hack to allow building with newer gcc - sed -i -e 's/-Werror=implicit-function-declaration//' Makefile || die - sed -i -e 's/-Werror=nested-externs//' Makefile || die -} - -src_compile() { - emake -j1 || die -} - -src_test() { - emake -j1 test || die -} - -src_install() { - emake DESTDIR="${ED}" install || die - - dodoc CREDITS README.pod || die - - if use doc; then - dodoc -r docs/* || die - fi -} diff --git a/dev-lang/nqp/nqp-2016.06.ebuild b/dev-lang/nqp/nqp-2016.06.ebuild deleted file mode 100644 index fe2ace68a5d8..000000000000 --- a/dev-lang/nqp/nqp-2016.06.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit java-pkg-opt-2 multibuild - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/perl6/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" - inherit vcs-snapshot - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" -HOMEPAGE="http://rakudo.org/" - -LICENSE="Artistic-2" -SLOT="0" -IUSE="doc clang java +moar test" -REQUIRED_USE="|| ( java moar )" - -CDEPEND="java? ( - dev-java/asm:4 - dev-java/jline:0 - dev-java/jna:4 - ) - moar? ( ~dev-lang/moarvm-${PV}[clang=] )" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) - dev-lang/perl" - -pkg_pretend() { - if has_version dev-lang/rakudo || has_version dev-lang/nqp; then - ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP" - ewarn "already being installed. So if it fails, try uninstalling both" - ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -java_prepare() { - # Don't clean stage0 jars. - einfo "Cleaning upstream jars" - java-pkg_clean 3rdparty/ - - # Don't use jars we just deleted. - sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \ - src/vm/jvm/runners/nqp-j || die -} - -src_prepare() { - MULTIBUILD_VARIANTS=() - use moar && MULTIBUILD_VARIANTS+=( moar ) - use java && MULTIBUILD_VARIANTS+=( jvm ) - - multibuild_copy_sources - - # This will pull in conditional java_prepare - default -} - -nqp_configure() { - pushd "${BUILD_DIR}" > /dev/null || die - local myconfargs=( - "--backend=${MULTIBUILD_VARIANT}" - "--prefix=/usr" ) - - perl Configure.pl "${myconfargs[@]}" || die - popd || die -} - -nqp_compile() { - if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then - emake -j1 \ - -C "${BUILD_DIR}" \ - THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \ - JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" - elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then - emake -j1 \ - -C "${BUILD_DIR}" - fi -} - -nqp_test() { - emake -j1 \ - -C "${BUILD_DIR}" \ - test -} - -nqp_install() { - # This is the actual reason we need multibuild.eclass. - # We need to distinguish the install procedure for MoarVM and JVM backends. - case "${MULTIBUILD_VARIANT}" in - moar) - emake \ - DESTDIR="${ED}" \ - -C "${BUILD_DIR}" \ - install - ;; - jvm) - pushd "${BUILD_DIR}" > /dev/null || die - # Set JAVA_PKG_JARDEST early. - java-pkg_init_paths_ - - # Upstream sets the classpath to this location. Perhaps it's - # used to locate the additional libraries? - java-pkg_addcp "${JAVA_PKG_JARDEST}" - - insinto "${JAVA_PKG_JARDEST}" - local jar - - for jar in *.jar; do - if has ${jar} ${PN}.jar ${PN}-runtime.jar; then - # jars for NQP itself. - java-pkg_dojar ${jar} - else - # jars used by NQP. - doins ${jar} - fi - done - - # Upstream uses -Xbootclasspath/a, which is faster due to lack - # of verification, but gjl isn't flexible enough yet. :( - java-pkg_dolauncher ${PN}-j --main ${PN} - dosym ${PN}-j /usr/bin/${PN} - dobin tools/jvm/eval-client.pl - popd > /dev/null || die - ;; - *) - die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}." - ;; - esac -} - -src_configure() { - multibuild_foreach_variant nqp_configure -} - -src_compile() { - multibuild_foreach_variant nqp_compile -} - -src_test() { - multibuild_foreach_variant nqp_test -} - -src_install() { - multibuild_foreach_variant nqp_install - - dodoc CREDITS README.pod - use doc && dodoc -r docs/* -} diff --git a/dev-lang/nqp/nqp-2016.07.ebuild b/dev-lang/nqp/nqp-2016.07.ebuild deleted file mode 100644 index fe2ace68a5d8..000000000000 --- a/dev-lang/nqp/nqp-2016.07.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit java-pkg-opt-2 multibuild - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/perl6/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" - inherit vcs-snapshot - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" -HOMEPAGE="http://rakudo.org/" - -LICENSE="Artistic-2" -SLOT="0" -IUSE="doc clang java +moar test" -REQUIRED_USE="|| ( java moar )" - -CDEPEND="java? ( - dev-java/asm:4 - dev-java/jline:0 - dev-java/jna:4 - ) - moar? ( ~dev-lang/moarvm-${PV}[clang=] )" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) - dev-lang/perl" - -pkg_pretend() { - if has_version dev-lang/rakudo || has_version dev-lang/nqp; then - ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP" - ewarn "already being installed. So if it fails, try uninstalling both" - ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -java_prepare() { - # Don't clean stage0 jars. - einfo "Cleaning upstream jars" - java-pkg_clean 3rdparty/ - - # Don't use jars we just deleted. - sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \ - src/vm/jvm/runners/nqp-j || die -} - -src_prepare() { - MULTIBUILD_VARIANTS=() - use moar && MULTIBUILD_VARIANTS+=( moar ) - use java && MULTIBUILD_VARIANTS+=( jvm ) - - multibuild_copy_sources - - # This will pull in conditional java_prepare - default -} - -nqp_configure() { - pushd "${BUILD_DIR}" > /dev/null || die - local myconfargs=( - "--backend=${MULTIBUILD_VARIANT}" - "--prefix=/usr" ) - - perl Configure.pl "${myconfargs[@]}" || die - popd || die -} - -nqp_compile() { - if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then - emake -j1 \ - -C "${BUILD_DIR}" \ - THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \ - JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" - elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then - emake -j1 \ - -C "${BUILD_DIR}" - fi -} - -nqp_test() { - emake -j1 \ - -C "${BUILD_DIR}" \ - test -} - -nqp_install() { - # This is the actual reason we need multibuild.eclass. - # We need to distinguish the install procedure for MoarVM and JVM backends. - case "${MULTIBUILD_VARIANT}" in - moar) - emake \ - DESTDIR="${ED}" \ - -C "${BUILD_DIR}" \ - install - ;; - jvm) - pushd "${BUILD_DIR}" > /dev/null || die - # Set JAVA_PKG_JARDEST early. - java-pkg_init_paths_ - - # Upstream sets the classpath to this location. Perhaps it's - # used to locate the additional libraries? - java-pkg_addcp "${JAVA_PKG_JARDEST}" - - insinto "${JAVA_PKG_JARDEST}" - local jar - - for jar in *.jar; do - if has ${jar} ${PN}.jar ${PN}-runtime.jar; then - # jars for NQP itself. - java-pkg_dojar ${jar} - else - # jars used by NQP. - doins ${jar} - fi - done - - # Upstream uses -Xbootclasspath/a, which is faster due to lack - # of verification, but gjl isn't flexible enough yet. :( - java-pkg_dolauncher ${PN}-j --main ${PN} - dosym ${PN}-j /usr/bin/${PN} - dobin tools/jvm/eval-client.pl - popd > /dev/null || die - ;; - *) - die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}." - ;; - esac -} - -src_configure() { - multibuild_foreach_variant nqp_configure -} - -src_compile() { - multibuild_foreach_variant nqp_compile -} - -src_test() { - multibuild_foreach_variant nqp_test -} - -src_install() { - multibuild_foreach_variant nqp_install - - dodoc CREDITS README.pod - use doc && dodoc -r docs/* -} diff --git a/dev-lang/nqp/nqp-2016.08.1.ebuild b/dev-lang/nqp/nqp-2016.08.1.ebuild deleted file mode 100644 index 56b70ca5e8f5..000000000000 --- a/dev-lang/nqp/nqp-2016.08.1.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit java-pkg-opt-2 multibuild - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/perl6/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" - inherit vcs-snapshot - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" -HOMEPAGE="http://rakudo.org/" - -LICENSE="Artistic-2" -SLOT="0" -IUSE="doc clang java +moar test" -REQUIRED_USE="|| ( java moar )" - -CDEPEND="java? ( - dev-java/asm:4 - dev-java/jline:0 - dev-java/jna:4 - ) - moar? ( ~dev-lang/moarvm-2016.08[clang=] )" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) - dev-lang/perl" - -pkg_pretend() { - if has_version dev-lang/rakudo || has_version dev-lang/nqp; then - ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP" - ewarn "already being installed. So if it fails, try uninstalling both" - ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -java_prepare() { - # Don't clean stage0 jars. - einfo "Cleaning upstream jars" - java-pkg_clean 3rdparty/ - - # Don't use jars we just deleted. - sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \ - src/vm/jvm/runners/nqp-j || die -} - -src_prepare() { - MULTIBUILD_VARIANTS=() - use moar && MULTIBUILD_VARIANTS+=( moar ) - use java && MULTIBUILD_VARIANTS+=( jvm ) - - multibuild_copy_sources - - # This will pull in conditional java_prepare - default -} - -nqp_configure() { - pushd "${BUILD_DIR}" > /dev/null || die - local myconfargs=( - "--backend=${MULTIBUILD_VARIANT}" - "--prefix=/usr" ) - - perl Configure.pl "${myconfargs[@]}" || die - popd || die -} - -nqp_compile() { - if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then - emake -j1 \ - -C "${BUILD_DIR}" \ - THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \ - JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" - elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then - emake -j1 \ - -C "${BUILD_DIR}" - fi -} - -nqp_test() { - emake -j1 \ - -C "${BUILD_DIR}" \ - test -} - -nqp_install() { - # This is the actual reason we need multibuild.eclass. - # We need to distinguish the install procedure for MoarVM and JVM backends. - case "${MULTIBUILD_VARIANT}" in - moar) - emake \ - DESTDIR="${ED}" \ - -C "${BUILD_DIR}" \ - install - ;; - jvm) - pushd "${BUILD_DIR}" > /dev/null || die - # Set JAVA_PKG_JARDEST early. - java-pkg_init_paths_ - - # Upstream sets the classpath to this location. Perhaps it's - # used to locate the additional libraries? - java-pkg_addcp "${JAVA_PKG_JARDEST}" - - insinto "${JAVA_PKG_JARDEST}" - local jar - - for jar in *.jar; do - if has ${jar} ${PN}.jar ${PN}-runtime.jar; then - # jars for NQP itself. - java-pkg_dojar ${jar} - else - # jars used by NQP. - doins ${jar} - fi - done - - # Upstream uses -Xbootclasspath/a, which is faster due to lack - # of verification, but gjl isn't flexible enough yet. :( - java-pkg_dolauncher ${PN}-j --main ${PN} - dosym ${PN}-j /usr/bin/${PN} - dobin tools/jvm/eval-client.pl - popd > /dev/null || die - ;; - *) - die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}." - ;; - esac -} - -src_configure() { - multibuild_foreach_variant nqp_configure -} - -src_compile() { - multibuild_foreach_variant nqp_compile -} - -src_test() { - multibuild_foreach_variant nqp_test -} - -src_install() { - multibuild_foreach_variant nqp_install - - dodoc CREDITS README.pod - use doc && dodoc -r docs/* -} diff --git a/dev-lang/nqp/nqp-2016.09.ebuild b/dev-lang/nqp/nqp-2016.09.ebuild deleted file mode 100644 index fe2ace68a5d8..000000000000 --- a/dev-lang/nqp/nqp-2016.09.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit java-pkg-opt-2 multibuild - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/perl6/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" - inherit vcs-snapshot - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" -HOMEPAGE="http://rakudo.org/" - -LICENSE="Artistic-2" -SLOT="0" -IUSE="doc clang java +moar test" -REQUIRED_USE="|| ( java moar )" - -CDEPEND="java? ( - dev-java/asm:4 - dev-java/jline:0 - dev-java/jna:4 - ) - moar? ( ~dev-lang/moarvm-${PV}[clang=] )" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) - dev-lang/perl" - -pkg_pretend() { - if has_version dev-lang/rakudo || has_version dev-lang/nqp; then - ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP" - ewarn "already being installed. So if it fails, try uninstalling both" - ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -java_prepare() { - # Don't clean stage0 jars. - einfo "Cleaning upstream jars" - java-pkg_clean 3rdparty/ - - # Don't use jars we just deleted. - sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \ - src/vm/jvm/runners/nqp-j || die -} - -src_prepare() { - MULTIBUILD_VARIANTS=() - use moar && MULTIBUILD_VARIANTS+=( moar ) - use java && MULTIBUILD_VARIANTS+=( jvm ) - - multibuild_copy_sources - - # This will pull in conditional java_prepare - default -} - -nqp_configure() { - pushd "${BUILD_DIR}" > /dev/null || die - local myconfargs=( - "--backend=${MULTIBUILD_VARIANT}" - "--prefix=/usr" ) - - perl Configure.pl "${myconfargs[@]}" || die - popd || die -} - -nqp_compile() { - if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then - emake -j1 \ - -C "${BUILD_DIR}" \ - THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \ - JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" - elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then - emake -j1 \ - -C "${BUILD_DIR}" - fi -} - -nqp_test() { - emake -j1 \ - -C "${BUILD_DIR}" \ - test -} - -nqp_install() { - # This is the actual reason we need multibuild.eclass. - # We need to distinguish the install procedure for MoarVM and JVM backends. - case "${MULTIBUILD_VARIANT}" in - moar) - emake \ - DESTDIR="${ED}" \ - -C "${BUILD_DIR}" \ - install - ;; - jvm) - pushd "${BUILD_DIR}" > /dev/null || die - # Set JAVA_PKG_JARDEST early. - java-pkg_init_paths_ - - # Upstream sets the classpath to this location. Perhaps it's - # used to locate the additional libraries? - java-pkg_addcp "${JAVA_PKG_JARDEST}" - - insinto "${JAVA_PKG_JARDEST}" - local jar - - for jar in *.jar; do - if has ${jar} ${PN}.jar ${PN}-runtime.jar; then - # jars for NQP itself. - java-pkg_dojar ${jar} - else - # jars used by NQP. - doins ${jar} - fi - done - - # Upstream uses -Xbootclasspath/a, which is faster due to lack - # of verification, but gjl isn't flexible enough yet. :( - java-pkg_dolauncher ${PN}-j --main ${PN} - dosym ${PN}-j /usr/bin/${PN} - dobin tools/jvm/eval-client.pl - popd > /dev/null || die - ;; - *) - die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}." - ;; - esac -} - -src_configure() { - multibuild_foreach_variant nqp_configure -} - -src_compile() { - multibuild_foreach_variant nqp_compile -} - -src_test() { - multibuild_foreach_variant nqp_test -} - -src_install() { - multibuild_foreach_variant nqp_install - - dodoc CREDITS README.pod - use doc && dodoc -r docs/* -} diff --git a/dev-lang/nqp/nqp-2016.05.ebuild b/dev-lang/nqp/nqp-2016.12.ebuild similarity index 100% rename from dev-lang/nqp/nqp-2016.05.ebuild rename to dev-lang/nqp/nqp-2016.12.ebuild diff --git a/dev-lang/polyml/Manifest b/dev-lang/polyml/Manifest index 9c55bc2a1043..03402c708d39 100644 --- a/dev-lang/polyml/Manifest +++ b/dev-lang/polyml/Manifest @@ -9,6 +9,7 @@ AUX polyml-5.5.2-r1952-check_for_negative_sized_array.patch 548 SHA256 b65ba50d7 AUX polyml-5.5.2-r1954_Fix_segfault_in_FFI_when_malloc_runs_out_of_memory.patch 4089 SHA256 a2f08bc8f5708df1fbb1b91170f43d35b9d6d69b7b7f44ca9ee67e4b747b5d5f SHA512 8b4f174ace31a839ea592402c10068af62f03227a43a663ea17ea5eefecf52472fc6a3437cd99f1593de7d575af57ae4b8156756695623c7db0f9e726e5f21a6 WHIRLPOOL be034af4b9e9f594895ce0cebccd6a8e9cc262a5e2b0c44f45496a57a9c6159385a86c35acccd8e258cd78c61d258ebaaf14c7ed466ff61e0c4450a334334a8f AUX polyml-5.5.2-r2007_Ensure_the_large_object_cache_pointer_is_cleared.patch 1247 SHA256 9e5a5c254b84ac272fa15ce09494ac61c817d47499c3729bfdf65290cada489b SHA512 ac2d1baff1c8d743ee783ac81f31df12cc4598874dd5a9a7855cd06fb179af2c64bc02a87d85a72238f19c805128143693839bd0a58d9a4002bc75fae985303b WHIRLPOOL a2f044c74b9b8898130436c9e59510321af9a71e24287f78f353b8efaa72c0854c456607fa92c44625f980a3f32ec60f543ae1e6fb1c3fabf4000689d699f1dd AUX polyml-5.5.2-r2009_Initialise_the_largeObjectCache_fully_in_the_constructor.patch 951 SHA256 9612b28a09e7097440962ba9b59678fefcc0ab85a80fd6436484028682a015f3 SHA512 644e90f26ef80aa8e945257eafa4da1ee2da9d353db40b5c6e367d032f41db4a6589a2527bce9d84d45794d88d31edaeb3cea53d57b4421bf209f6c07be69cf0 WHIRLPOOL d82c663331d7e72ace67a3c20edbab4dd2672dd04e0adaa26e47d953f2357cc4654dfb96a5145579d7485f7b0075647c7614952b6b8d3be9adaf1caaad2ba36c +DIST polyml-5.6.tar.gz 6066166 SHA256 20d7b98ae56fe030c64054dbe0644e9dc02bae781caa8994184ea65a94a0a615 SHA512 cd4f25c225831dec512f7136dfda4ba31abd6939d9e8e0cacdb6d48212488b56ba5969c76e76fcbfcfa83d015a67d9cf62457286086f3c2b3f7914a7939d7b59 WHIRLPOOL a50042ed5cd309ca2b148cfb33a98681803b79c80f8efde1ad2b39cabdfb6dd85da6a66dd21f92f603d3be9685008e3fd4f5303eadd24d8cec493acead29acc3 DIST polyml.5.4.1.tar.gz 6107319 SHA256 514d1d07be487b783d4dfa29dbd550b3396640579ce135a9eb5a61f08e7f9cac SHA512 4a7b404ed648b5a9fd9d52917214688d15f4f9a5f4570ba13b52a8304bde1cc4b534f539ffc3c9554283816ae130e4c898a179d776df6d3220fba9743a19b175 WHIRLPOOL 048db0b2210d699c0a86940daaafd24bfc81debae412f7e7dcad2585cd5514253f6c47e0006277ef00b640ab971a031d74e64c78c4abcc09712fa9e8593d1720 DIST polyml.5.5.1.tar.gz 5465794 SHA256 cf8009dabc8b5d308d92e201dcd01f17ce14289d30caa8021a87365f4b8e209a SHA512 283954c8bf5599d83ea69916b827b1acae7137fe4add67537026092da2e6f1a89d71d3a394dbba599bbe9e967ded1446f39f4d81afb90301532db6be949f7a6f WHIRLPOOL 5bfeb8dcedcfe9b0a925ed089abc246d70d1269631ee46e9c78b123d461afb80e68640d6c08d77f47e69b0c244e9c7a27750dd7350741911e007f9dbcb2e7f76 DIST polyml.5.5.2.tar.gz 5599140 SHA256 73fd2be89f7e3ff0567e27ef525ef788775d9f963d6db54069cb34d53040a682 SHA512 248c2a38c4691898bc1243a041f4683bf227d9c8a98c6c3545af2a8a3249ed5ed96f33f90cb2dede8809b42f33c0557650147302cfe046a5fba965ccd93cbc5b WHIRLPOOL d8dae553b6d4effef80b4303ea8fdbb95f8470790ab7ff49e62ae2a47d70d9d0b11b2113caa28302c029049041bd0286ba06a2153b5266b88a6c26eb1714abf7 @@ -17,6 +18,7 @@ EBUILD polyml-5.4.1.ebuild 888 SHA256 9ff221bdae2a04a2f56a033ab6347daebb5d64fda5 EBUILD polyml-5.5.0.ebuild 1127 SHA256 94331d5d2fd61adb2261264d21b2de2610797e1d2e159d2a1db39fc5af3e28d7 SHA512 325f6a87958473a5497a3eac080a68ed4e79948473429160435ee45ee56f5aba192ae3359408fa2f6dbc326e2698b9104100fc3b8a466d7d161ddb848f21bbe8 WHIRLPOOL a384fe2e720bcb7ffb491c4dfd70cf1c24be01db76c267347cb80bea23c0644c42e63e26fb38c6d3a8a0a2fa932035a99eed46bde3050611a5e8f944ee42bc0d EBUILD polyml-5.5.1.ebuild 1812 SHA256 5f030b7ebfbe85bf998af5d221600dd35ebf070a5432f65e608d7832206dce1b SHA512 979640a5eb46eceb8607e1843d0fb52eb24f1dbbf87c32a2e8c3521f722255bfdd33aad0c216bc2c78c1a39555c70574472637d863fa9b44913a7a82227a5f3a WHIRLPOOL bb852e33d0bbfb7e2eb072094fffb4e7542976c08a5a1040da556f2f7d02a7af268f9dbb52cbbef3ed7eee6fe39683815ae5466ba1b95d51fd67f1fd89225bbd EBUILD polyml-5.5.2.ebuild 1969 SHA256 b7210317eafb260bb2a88c7942e5b49ec07994cd647e8b2d1a538d7c87781c79 SHA512 d794cdbe2a2ccaadc4144da875fa62fde68dffd8c3fdac7ad0a756ac4e712dced246dab771352f56ebf58b3452e80cc6612a813d5c2660177e9e592c1c1e480d WHIRLPOOL 9572f8d12aabcbb1795a6a1c66f6e416b332c2dbc1c7c8ef9fd5d0bd59faf3eed7d8358d6f685ca5381e13be858061b265da8f1c93d7312aba96b51e844ccd53 +EBUILD polyml-5.6.ebuild 1109 SHA256 5cbbc48c2bd5ef3ee46ddb3cabd088bc43019ea17ec4958030e5f9f7a7612a48 SHA512 61f17c16f7b57ce07ecafdc355633d46bf7c7b43204556100f0b1157be300ac0b5208751e8a98e714b8afdf3304b5fd834e1d4416bc1aea95b8a9ce008a96a91 WHIRLPOOL 770ec80520dd85b9a51c33bf8a596b27f135c795d850a4ab1aba2eb65f3b9d8d11b299ab4c7b57743cda497fd67f0ad8de042961d72e456576eb1d4e7e0f59a9 MISC ChangeLog 3751 SHA256 319413f9f6c3e1e7c4ce8515ff6557d3b3407d60d0982c196fdb95b2c009d6ab SHA512 18409236273a9773c5cff99d29e84795f4d8066630d9251d4e2c6cc3ed749365581fc5f926bd79ef1e66c67f3cfdc7a86587599b7d3eb0692e53daab6ccfb0dc WHIRLPOOL e44e9df9bc8cda9e632dd656cd84bea88f6ff807666669238a03d0b073fdad801f0e2c35ebf49d13a4694a376b79d4cd5209e8a5ddca6bced0940d0b2c7e291b MISC ChangeLog-2015 3467 SHA256 e234d6a82bafcf318ab6bf7cce265924c9c974509ac66df2f84f498ddaa1a837 SHA512 219f020da6115415d7dbd9c076bcf25e9809a99168cdd336916e193c8412b70b681f03504e64bf33900afad95f936ba6cd5841c2eb3b5711a1fb83d795316e1b WHIRLPOOL 92517471801ceb4e0083bb4990da61729f7bdf3fcf8e30acf1528c3e1203f368d641eba1cd3e8c0e292e5a4c7987e5df8673f4f126e59f04d8187ab2c26e6d6e MISC metadata.xml 562 SHA256 8483763f59bcbe26be3a367c52bc0afecccb5a00aed904e08aee44cee0c1373e SHA512 d6cd496acc03dbcca4b50f5cc49bec9818764dc2aca36ab83eb4b82102fda5c562d8a73eb83e400eb254bb2c7db1a1a68453cfbe655d780ed67a149712a74038 WHIRLPOOL c4b1f477e08c3808cd8cc4b59cba859e77cea7a4535d6834a01ecf675773bc9f9ee8dc875d106dd1652fab82613c7b1799a6f5474a6ea42eded601b1d2d8a20a diff --git a/dev-lang/polyml/polyml-5.6.ebuild b/dev-lang/polyml/polyml-5.6.ebuild new file mode 100644 index 000000000000..70af2d9248ad --- /dev/null +++ b/dev-lang/polyml/polyml-5.6.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +inherit autotools pax-utils + +DESCRIPTION="Poly/ML is a full implementation of Standard ML" +HOMEPAGE="http://www.polyml.org" +SRC_URI="https://codeload.github.com/polyml/polyml/tar.gz/v${PV} -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="X elibc_glibc +gmp portable test +threads" + +RDEPEND="X? ( x11-libs/motif:0 ) + gmp? ( >=dev-libs/gmp-5 ) + elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) + virtual/libffi" +DEPEND="${RDEPEND}" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --enable-shared \ + --disable-static \ + --with-system-libffi \ + $(use_with X x) \ + $(use_with gmp) \ + $(use_with portable) \ + $(use_with threads) +} + +src_compile() { + # Bug 453146 - dev-lang/polyml-5.5.0: fails to build (pax kernel?) + pushd libpolyml || die "Could not cd to libpolyml" + emake + popd + emake polyimport + pax-mark m "${S}/.libs/polyimport" + emake + pax-mark m "${S}/.libs/poly" +} + +src_test() { + emake tests || die "tests failed" +} diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest index 66a8a11dd373..86f42dc4a2eb 100644 --- a/dev-lang/rakudo/Manifest +++ b/dev-lang/rakudo/Manifest @@ -1,24 +1,11 @@ AUX rakudo-2016.04-Makefile.in.patch 1423 SHA256 af9b43506fcbdd6aa127d886aea9ab869493334eec44affeec1fe294b0dbcb4e SHA512 303ef48326fa4699021028ae58b111be29f253dc479b35dab0f690667ebcd75c53c95ee290f37a878fc1bc276458e695da7793c531c695159c091f48873ecc21 WHIRLPOOL f21a17296dc6489b29e03a318491b444323be24ee62875fb18c2fdb230270bc6d4c46956892f3966863e76274b029e511eeac2284f35eaa529949e5323fc4d23 AUX rakudo-2016.04-jna-lib.patch 970 SHA256 3700ede81d4ed7b5662d506ee81d232a93e322f3644e611060154db49b470323 SHA512 3e76c33e08911fc9105fc8e6f046a8af133ec956aad1537653ee335f0068d4428a9c8be45af45ed3eccae58f1be38579614bac278deb00ea143829e6d98d38c6 WHIRLPOOL 184f5c756b828a869b45502fb61bffaa15dd04fc88041a5f114b01ac59dd97ac4c1525eb6f816793e24d5dabed28b76589dcbe82e65b1aedaa88614dd86b8174 -DIST rakudo-2016.03.tar.gz 2702229 SHA256 d77b58acb09f34c99af94f32db92698df88cda7015c7630ddb1392adbf703471 SHA512 53619288655edf72f986cb5fe7b72cd70ed88a6b18421d46d5d70a8932ca22eb1067be5ddf98264e576f7d81a84d9bbaca2ac5ac3241e582d2f4672589ba7ab1 WHIRLPOOL 43696dda25214aa9e30be7c1c3323dee8ea0f1c50a5754ca2a08d421b4c59cac5001fa4a63d8086ce0cb97801eb098d4e854ca4b801eaf7d277099bf6d86b655 -DIST rakudo-2016.04.tar.gz 2706659 SHA256 207d723c9b2d524daf6008a3ed026ea06773d937e76e0fe79b89bfb7dcd0d92b SHA512 08e718643cfa89edbb8995ab9f350f69053e41cff97b33530dd2eb202d2ab2116d219ef1385717b48f5883665c73a181b1b054c1300db302fba31c6081e97532 WHIRLPOOL d49791b696114f57b685221be5cfe1873a88507810819b2a9aace07da2c2d7535eeaecc6c830df3265ecd1ff352effa509cbb3f24cba7e8afc0dc1468553cce6 -DIST rakudo-2016.05.tar.gz 2786506 SHA256 f3b3236c22ff75427c87dea1fab1dc9a0b4ca3a97296e64a14c3f2695be7a28a SHA512 524a71fa72fc04ed8a04eebe319d68c051d45082ae4ce0894a34b2c08d5dd1f270fd380ffb9a486c1cbad7df20dd96180a11642dc20f2ef343a386ce9df42ac8 WHIRLPOOL 000c74d0c0c26517b2324a20e91d304fafbf4953e028683b84599cc0508e4d79c8324dd78c95fb456e46163b52bb5615e30ec034813df10c8762a3362ae77fae -DIST rakudo-2016.06.tar.gz 2751927 SHA256 239a0b50cfd60026ba4bb2a20b5130feaee144ccbbe3e73b6c6633ebb710519c SHA512 5197b1ffec3978a762129de7ac3130b33c6f0a97e6ab8191fc3a7271d47028b1abb35896220ad1443288489ab7789203534121d44869101def29774c6cebc38f WHIRLPOOL dd2d3d75d8ca764e41bd8a2bcd7123d7b62dde34d2d850579b849573c13339618ce7eeed2bf0f20a7b66bb0ffefe47fbb8557700ca950cfae0eaeaa27ecbc376 -DIST rakudo-2016.07.1.tar.gz 2767818 SHA256 dc71e6cccf71da98846800426a3fa260eb5913e7a3c100a89acc11d7d128d0d1 SHA512 ef5360c33c52d2628745d4d2837aca766e710452246a57cf3305d94cbda292d67e3cce31dbb846c5b7e4f68b3db38cf26dce40790a6fc28770c552da509cdece WHIRLPOOL 72ef2f5bbd0e1af5b2157449106c68d7dcc21e7981e658eafa88f0b29f98653bbe5bf15646a71e704c1a622597bbfbe6427e888c77baccfa62a475aa42b897f8 -DIST rakudo-2016.08.1.tar.gz 2779156 SHA256 ab0688963b9d19e26cea76eb5e852f6c68da650a9d209b868c21bde904ee34fe SHA512 3edae590c7dd87dfaca821c8676c5256c19e53f93bd5fd534ae235ae5a2449d0329f0b1311b6b344ec7a258f9eeae6a78e904a02d57c49a6b32ab1914ff2ebe8 WHIRLPOOL 9435477144e0dd45e58e831f5239e95104765a3be5411ba9772324af0c803fd43a9f903f107b3b9186409fb3b5af227e923fcf213052603291a242412fe1d2be -DIST rakudo-2016.09.tar.gz 2789496 SHA256 fe280bcc511a3f25b805039e842b554f5f0f9c6255043a8fa3d6a1e4f35e47e7 SHA512 68f45dba174d1421b95b30e4ee5aef658576c4d0845d879b6e67e1587166f4438c05da85dee294498da947089c866bbbd29270e967777d72b953557d59943387 WHIRLPOOL b71bc10bcc5f26bd9df8270b10fb4b232df924333628fb32cacb874624604e98f0415aaa7d30ce86bbc0c58152b210a8421996e0bce4cda58055a6118947ee28 DIST rakudo-2016.10.tar.gz 2798155 SHA256 a1446049610a5de9609a8570be3f916c48fe90027094ae7c30f82ffafcea1a7c SHA512 b9b4ccd4cd3bbc442b2e1989c43ad76e8a2710562f9006bb43052bbdd6b5f70c845ab2d22260167c3a8a95437f6db2f562dc4db613bf95802e35bd3959f255fe WHIRLPOOL 866a0d6723d27d67f5c546984982a48ec4e9599fe98e2be6648e40b01c60fd028eeb63d2f31da7234995f61ad1cd7ca71f38f6fe2f88fd5aeff7cac32288ebff DIST rakudo-2016.11.tar.gz 2824346 SHA256 49c7231032ebeaf32335d8564a65e54d4021a33c7aa8310db6e5048540f4527f SHA512 81d2491a834c724bc90d0539eeb3ee9ea510fc35542be61c86ccad0098a3a9466a2e9526d97cce1f0de89a3691fc51124159dbf790e74aae8e6670abe088e56b WHIRLPOOL 340fc1ebbe2bad57ebf31191ea199134f61496243018c99a76bf7cbb27dac40e22e9d3bfc81f735f472f53a27e068ccc7afb6b847a09354adf2b1fdc9d422a55 -EBUILD rakudo-2016.03.ebuild 758 SHA256 6530c12ca3f530a3e59564c6178058af2acdd2e7464722979593320557b3d12f SHA512 c035867e0ec2d1c1b3596ff6cb1be2284ce15501f244e7b6391eababa9cb70705673e77f55155a17407f9e13071e5f0c823e085a41121d5c032f0c944307d66b WHIRLPOOL 3f3513c577b909730059ed356dcb7182f321c1de630b14199bfc589d0b7bcb5f5c0cdda59c65698c840c5fcd2931194a3a1a156eff1d218d10934223d9f1824b -EBUILD rakudo-2016.04-r2.ebuild 1787 SHA256 4a1aa9898b8f3155448c21589fe17920ce7a93e4e53fea89402c7234463364df SHA512 193fc370dead7f11cfcf1e20741dd58f63b6059c174387f8d26458db8d941468337635fb9c68affa9d4c6a7c211e4f9a6016437d273a23aa6caca2953c3c0ee1 WHIRLPOOL f0dd95b7dfbe3f35d9ca272a0594064170c26f2a43890d9968e7179d0ae061c1d9e714d362a9a84e08bfadaedb0c8c46296792e9b0cd66fe45fea5c2447eaca0 -EBUILD rakudo-2016.04.ebuild 728 SHA256 e2a21a03ddaf5c343300e837cffdbb977ab5d298e6927930363fbd64cc48a5b4 SHA512 678f2d0ab144d88b2de2dd09a255277cd950cb06b60ebb8890ae541b34174da2c1450cbb6e42bd2dbcbfa3c426fa97f0ec1a7620b9da03de5f50345341c60d56 WHIRLPOOL b3f5372fc6baffdd998516858cbccb6c2f725b04f0d79c891b152b93b3fc02feee40fdc3662c447c0762e5d29f864a8b9c4e44dfc6750fce594402cefc157d60 -EBUILD rakudo-2016.05.ebuild 1721 SHA256 ffc65952d7a788d3e4c18e69ccc8472715d424962b9e1c8ae18ee7a23be6a4b6 SHA512 5b3c4cfe13fabbd8e3b3af402770f5cdf4a2e821595f64e6b7a60ba38237f64b97956689f5319db73ca9f63136c72e2806a437f487accfcd28c60b0a7c57e368 WHIRLPOOL c8957f2cf08fc2c4563d2ee991c12e3f5d16ee7937023c3df8362d48bf47633c8e0fd7112ca124295dbdba7ead949cb482344f70ffad338b1ebb91aaa12dc5f7 -EBUILD rakudo-2016.06.ebuild 1721 SHA256 ffc65952d7a788d3e4c18e69ccc8472715d424962b9e1c8ae18ee7a23be6a4b6 SHA512 5b3c4cfe13fabbd8e3b3af402770f5cdf4a2e821595f64e6b7a60ba38237f64b97956689f5319db73ca9f63136c72e2806a437f487accfcd28c60b0a7c57e368 WHIRLPOOL c8957f2cf08fc2c4563d2ee991c12e3f5d16ee7937023c3df8362d48bf47633c8e0fd7112ca124295dbdba7ead949cb482344f70ffad338b1ebb91aaa12dc5f7 -EBUILD rakudo-2016.07.1.ebuild 1612 SHA256 0887cfd8510171a72900a8942db5a988ff9a330767ddbae5067c9a812a0704d5 SHA512 6ab4f9532e1369ae9743a07afa9f881c93becf42c01204275eb785293d23242fde8e5b57d031e369ed7c6cdba850e2fd2c7eba0de74d2e73d8740a72520b5933 WHIRLPOOL 3d17b4497550314e9839776979ad419acfca0df92e9dc42079c9e21498653710b696dd533cf6ee3a84ad3f1301aba2f8a9a8571f22f1af30f344fb7e1eb7210e -EBUILD rakudo-2016.08.1.ebuild 1610 SHA256 f6d57cd48a1d80149cee7958583f2f6ac0ce310c9ccd6f606fb64756a5069fe0 SHA512 66e5c36b7a04ab2dcdaad179040bce0fe853798bc807f38a37bbf4084a9edbfb64f510d46e7e465bd580eff321f3726591a503639666865c9d228946bd20f4cf WHIRLPOOL f211ca66ef948476411cc3b015f14f5ed17db33be031fad9a72c1f33f74136c87b97e3f999a03f41adc6ca24a4b4fbd94e1a6da068e39ce89f8d7507cdcf5114 -EBUILD rakudo-2016.09.ebuild 1610 SHA256 f6d57cd48a1d80149cee7958583f2f6ac0ce310c9ccd6f606fb64756a5069fe0 SHA512 66e5c36b7a04ab2dcdaad179040bce0fe853798bc807f38a37bbf4084a9edbfb64f510d46e7e465bd580eff321f3726591a503639666865c9d228946bd20f4cf WHIRLPOOL f211ca66ef948476411cc3b015f14f5ed17db33be031fad9a72c1f33f74136c87b97e3f999a03f41adc6ca24a4b4fbd94e1a6da068e39ce89f8d7507cdcf5114 +DIST rakudo-2016.12.tar.gz 2843706 SHA256 e5b1b7ed8e6e5eb26eae75691e90a61255d87b73c91c595b412cbd30300e7cb8 SHA512 656c654d893b2ca9cc947711d78d433b462d8bb8cf39c5e8e77dd518c57c4754949f1bb87392d31ee82a412c788bc193c251b1e3d852e87e2c9d2fcb1d71a497 WHIRLPOOL b362392e5965c923538ff57187b4e0dade7a5dc0b8ef6dd09716ced7e8d876d46136a8a93e45388c9a74e725201d3aab8f9b94bbef2e4fd74dbf8367b57c6703 EBUILD rakudo-2016.10.ebuild 1610 SHA256 f6d57cd48a1d80149cee7958583f2f6ac0ce310c9ccd6f606fb64756a5069fe0 SHA512 66e5c36b7a04ab2dcdaad179040bce0fe853798bc807f38a37bbf4084a9edbfb64f510d46e7e465bd580eff321f3726591a503639666865c9d228946bd20f4cf WHIRLPOOL f211ca66ef948476411cc3b015f14f5ed17db33be031fad9a72c1f33f74136c87b97e3f999a03f41adc6ca24a4b4fbd94e1a6da068e39ce89f8d7507cdcf5114 EBUILD rakudo-2016.11.ebuild 1610 SHA256 f6d57cd48a1d80149cee7958583f2f6ac0ce310c9ccd6f606fb64756a5069fe0 SHA512 66e5c36b7a04ab2dcdaad179040bce0fe853798bc807f38a37bbf4084a9edbfb64f510d46e7e465bd580eff321f3726591a503639666865c9d228946bd20f4cf WHIRLPOOL f211ca66ef948476411cc3b015f14f5ed17db33be031fad9a72c1f33f74136c87b97e3f999a03f41adc6ca24a4b4fbd94e1a6da068e39ce89f8d7507cdcf5114 +EBUILD rakudo-2016.12.ebuild 1610 SHA256 f6d57cd48a1d80149cee7958583f2f6ac0ce310c9ccd6f606fb64756a5069fe0 SHA512 66e5c36b7a04ab2dcdaad179040bce0fe853798bc807f38a37bbf4084a9edbfb64f510d46e7e465bd580eff321f3726591a503639666865c9d228946bd20f4cf WHIRLPOOL f211ca66ef948476411cc3b015f14f5ed17db33be031fad9a72c1f33f74136c87b97e3f999a03f41adc6ca24a4b4fbd94e1a6da068e39ce89f8d7507cdcf5114 EBUILD rakudo-9999.ebuild 1721 SHA256 ffc65952d7a788d3e4c18e69ccc8472715d424962b9e1c8ae18ee7a23be6a4b6 SHA512 5b3c4cfe13fabbd8e3b3af402770f5cdf4a2e821595f64e6b7a60ba38237f64b97956689f5319db73ca9f63136c72e2806a437f487accfcd28c60b0a7c57e368 WHIRLPOOL c8957f2cf08fc2c4563d2ee991c12e3f5d16ee7937023c3df8362d48bf47633c8e0fd7112ca124295dbdba7ead949cb482344f70ffad338b1ebb91aaa12dc5f7 MISC ChangeLog 7779 SHA256 49ed3c3bcb9d94137fd729c11cd1b3f82baac3b5edac5ab717c59d1ba2b4b1e7 SHA512 072435ff251446c97a585cc22578a40f440453122cf98998bd5ef333c5d1d4dc6cd8d3f3aa63063d890c40186d02622e5cfb636d0beeaa74c2f6562cd47022b4 WHIRLPOOL 317d540f1f845610193802db9f9b1abee13eeed679e67ecab5a2e408d6716847f679df395b1fe0dcd094c77620024de45db8a9edf62efaf5294ba5bdaedbcba0 MISC ChangeLog-2015 11105 SHA256 14cfecf1d8fb52e762394fe58c152186a96a43c8218bcdce3a2fd24e183dfefc SHA512 7b667a5cd7ce5f4620739f0289fced88434e7848518c1476ad7c66e946fc8645e613a468c0cbba03acc207465cb97601286897372d28d4dc53ac500fbe8d05e1 WHIRLPOOL de461c09858e8f30de8bffdeb94535479d73acac62370ade62e5ad50346cd72feec0a3bfc3ee9a12ed655111738ef22f6e2cf7f21980c5c35beca6045fb1f658 diff --git a/dev-lang/rakudo/rakudo-2016.03.ebuild b/dev-lang/rakudo/rakudo-2016.03.ebuild deleted file mode 100644 index 623e8f443bd6..000000000000 --- a/dev-lang/rakudo/rakudo-2016.03.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -DESCRIPTION="A compiler for the Perl 6 programming language" -HOMEPAGE="http://rakudo.org" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rakudo/${PN}.git" - inherit git-r3 -else - SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz" -fi - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -# TODO: add USE="javascript" once that's usable in nqp -IUSE="test" - -RDEPEND="=dev-lang/nqp-${PV}:=[moar]" -DEPEND="${RDEPEND} - >=dev-lang/perl-5.10" - -#PATCHES=(${FILESDIR}/${PV}) - -src_configure() { - perl Configure.pl --prefix=/usr --sysroot=/usr --backends=moar -} - -src_test() { - export RAKUDO_PRECOMP_PREFIX=$(mktemp -d) - default -} diff --git a/dev-lang/rakudo/rakudo-2016.04-r2.ebuild b/dev-lang/rakudo/rakudo-2016.04-r2.ebuild deleted file mode 100644 index 18eb63155abb..000000000000 --- a/dev-lang/rakudo/rakudo-2016.04-r2.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit java-pkg-opt-2 - -DESCRIPTION="A compiler for the Perl 6 programming language" -HOMEPAGE="http://rakudo.org" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rakudo/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Artistic-2" -SLOT="0" -# TODO: add USE="javascript" once that's usable in nqp -IUSE="clang java +moar test" -REQUIRED_USE="|| ( java moar )" - -CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=] - >=dev-lang/nqp-2016.04-r3" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) - >=dev-lang/perl-5.10" - -PATCHES=( - "${FILESDIR}/${PN}-2016.04-Makefile.in.patch" - "${FILESDIR}/${P}-jna-lib.patch" -) - -pkg_pretend() { - if has_version dev-lang/rakudo; then - ewarn "Rakudo is known to fail compilation/installation with Rakudo" - ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo," - ewarn "then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -src_prepare() { - epatch "${PATCHES[@]}" - epatch_user -} - -src_configure() { - local backends - use moar && backends+="moar," - use java && backends+="jvm" - - local myargs=( - "--prefix=/usr" - "--sysroot=/" - "--sdkroot=/" - "--backends=${backends}" - ) - - perl Configure.pl "${myargs[@]}" || die - - if use java; then - NQP=$(java-pkg_getjars --with-dependencies nqp) - fi -} - -src_compile() { - emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" -} - -src_install() { - emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install -} - -src_test() { - RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default -} diff --git a/dev-lang/rakudo/rakudo-2016.04.ebuild b/dev-lang/rakudo/rakudo-2016.04.ebuild deleted file mode 100644 index 4903a0a79a9e..000000000000 --- a/dev-lang/rakudo/rakudo-2016.04.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -DESCRIPTION="A compiler for the Perl 6 programming language" -HOMEPAGE="http://rakudo.org" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rakudo/${PN}.git" - inherit git-r3 -else - SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz" -fi - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -# TODO: add USE="javascript" once that's usable in nqp -IUSE="test" - -RDEPEND="=dev-lang/nqp-${PV}:=[moar]" -DEPEND="${RDEPEND} - >=dev-lang/perl-5.10" - -src_configure() { - perl Configure.pl --prefix=/usr --sysroot=/usr --backends=moar -} - -src_test() { - export RAKUDO_PRECOMP_PREFIX=$(mktemp -d) - default -} diff --git a/dev-lang/rakudo/rakudo-2016.05.ebuild b/dev-lang/rakudo/rakudo-2016.05.ebuild deleted file mode 100644 index 821e32f1ac93..000000000000 --- a/dev-lang/rakudo/rakudo-2016.05.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit java-pkg-opt-2 - -DESCRIPTION="A compiler for the Perl 6 programming language" -HOMEPAGE="http://rakudo.org" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rakudo/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Artistic-2" -SLOT="0" -# TODO: add USE="javascript" once that's usable in nqp -IUSE="clang java +moar test" -REQUIRED_USE="|| ( java moar )" - -CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) - >=dev-lang/perl-5.10" - -PATCHES=( "${FILESDIR}/${PN}-2016.04-jna-lib.patch" ) - -pkg_pretend() { - if has_version dev-lang/rakudo; then - ewarn "Rakudo is known to fail compilation/installation with Rakudo" - ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo," - ewarn "then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -src_prepare() { - epatch "${PATCHES[@]}" - epatch_user -} - -src_configure() { - local backends - use moar && backends+="moar," - use java && backends+="jvm" - - local myargs=( - "--prefix=/usr" - "--sysroot=/" - "--sdkroot=/" - "--backends=${backends}" - ) - - perl Configure.pl "${myargs[@]}" || die - - if use java; then - NQP=$(java-pkg_getjars --with-dependencies nqp) - fi -} - -src_compile() { - emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" -} - -src_install() { - emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install -} - -src_test() { - RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default -} diff --git a/dev-lang/rakudo/rakudo-2016.06.ebuild b/dev-lang/rakudo/rakudo-2016.06.ebuild deleted file mode 100644 index 821e32f1ac93..000000000000 --- a/dev-lang/rakudo/rakudo-2016.06.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit java-pkg-opt-2 - -DESCRIPTION="A compiler for the Perl 6 programming language" -HOMEPAGE="http://rakudo.org" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rakudo/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Artistic-2" -SLOT="0" -# TODO: add USE="javascript" once that's usable in nqp -IUSE="clang java +moar test" -REQUIRED_USE="|| ( java moar )" - -CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) - >=dev-lang/perl-5.10" - -PATCHES=( "${FILESDIR}/${PN}-2016.04-jna-lib.patch" ) - -pkg_pretend() { - if has_version dev-lang/rakudo; then - ewarn "Rakudo is known to fail compilation/installation with Rakudo" - ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo," - ewarn "then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -src_prepare() { - epatch "${PATCHES[@]}" - epatch_user -} - -src_configure() { - local backends - use moar && backends+="moar," - use java && backends+="jvm" - - local myargs=( - "--prefix=/usr" - "--sysroot=/" - "--sdkroot=/" - "--backends=${backends}" - ) - - perl Configure.pl "${myargs[@]}" || die - - if use java; then - NQP=$(java-pkg_getjars --with-dependencies nqp) - fi -} - -src_compile() { - emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" -} - -src_install() { - emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install -} - -src_test() { - RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default -} diff --git a/dev-lang/rakudo/rakudo-2016.07.1.ebuild b/dev-lang/rakudo/rakudo-2016.07.1.ebuild deleted file mode 100644 index 1aaf08e9b2c3..000000000000 --- a/dev-lang/rakudo/rakudo-2016.07.1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit java-pkg-opt-2 - -DESCRIPTION="A compiler for the Perl 6 programming language" -HOMEPAGE="http://rakudo.org" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rakudo/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Artistic-2" -SLOT="0" -# TODO: add USE="javascript" once that's usable in nqp -IUSE="clang java +moar test" -REQUIRED_USE="|| ( java moar )" - -CDEPEND="~dev-lang/nqp-2016.07:${SLOT}=[java?,moar?,clang=]" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) - >=dev-lang/perl-5.10" - -pkg_pretend() { - if has_version dev-lang/rakudo; then - ewarn "Rakudo is known to fail compilation/installation with Rakudo" - ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo," - ewarn "then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -src_configure() { - local backends - use moar && backends+="moar," - use java && backends+="jvm" - - local myargs=( - "--prefix=/usr" - "--sysroot=/" - "--sdkroot=/" - "--backends=${backends}" - ) - - perl Configure.pl "${myargs[@]}" || die - - if use java; then - NQP=$(java-pkg_getjars --with-dependencies nqp) - fi -} - -src_compile() { - emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" -} - -src_install() { - emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install -} - -src_test() { - RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default -} diff --git a/dev-lang/rakudo/rakudo-2016.09.ebuild b/dev-lang/rakudo/rakudo-2016.09.ebuild deleted file mode 100644 index babfa7fff0bf..000000000000 --- a/dev-lang/rakudo/rakudo-2016.09.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit java-pkg-opt-2 - -DESCRIPTION="A compiler for the Perl 6 programming language" -HOMEPAGE="http://rakudo.org" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rakudo/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Artistic-2" -SLOT="0" -# TODO: add USE="javascript" once that's usable in nqp -IUSE="clang java +moar test" -REQUIRED_USE="|| ( java moar )" - -CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) - >=dev-lang/perl-5.10" - -pkg_pretend() { - if has_version dev-lang/rakudo; then - ewarn "Rakudo is known to fail compilation/installation with Rakudo" - ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo," - ewarn "then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -src_configure() { - local backends - use moar && backends+="moar," - use java && backends+="jvm" - - local myargs=( - "--prefix=/usr" - "--sysroot=/" - "--sdkroot=/" - "--backends=${backends}" - ) - - perl Configure.pl "${myargs[@]}" || die - - if use java; then - NQP=$(java-pkg_getjars --with-dependencies nqp) - fi -} - -src_compile() { - emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" -} - -src_install() { - emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install -} - -src_test() { - RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default -} diff --git a/dev-lang/rakudo/rakudo-2016.08.1.ebuild b/dev-lang/rakudo/rakudo-2016.12.ebuild similarity index 100% rename from dev-lang/rakudo/rakudo-2016.08.1.ebuild rename to dev-lang/rakudo/rakudo-2016.12.ebuild diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index fba7b77b3a09..841d76d41684 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -14,6 +14,7 @@ DIST ruby-patches-2.2.5.tar.bz2 2272 SHA256 f54373704ce8df732490e8d1e7e35188503f DIST ruby-patches-2.2.6.tar.bz2 2272 SHA256 f54373704ce8df732490e8d1e7e35188503faacc5278fe0ab0d8c07bdc762fed SHA512 ed8bff8f730ccb114e62784d29541f276b2821d9eb121a9772dc4aabc139b688f2b14f5f27710098a8cd751c62d31b46170b427ad54dc4f6490c003450ae1583 WHIRLPOOL 8598c9284252c1e7cc9f9019c5f468ce5ab8b4ae013e71c631cd00cc8bfde068b041f1bc6851bb2962982a1e46cbde0ddc51c186ea41638a7881c587c658e603 DIST ruby-patches-2.3.1.tar.bz2 2223 SHA256 f0a803173564368e5cf31162e1dba901c46640f9e861255f6cbe14256d18f3eb SHA512 bb47000e516017c1fedf7c5313b0628fa734030e69bd0fed1c06a38dd115b8c50837e3dd917f272e24abf5609c4c12793ae4570bfd7d6210290785bf2f8287bd WHIRLPOOL 0b0d4dcf7df4ff3ff11610bfe7a7b29ed621b45b412cb7618a6572f98a568ac67419bd852b193cfc3aa0968382cf9400a578511e9e8fb8b2125bc876e733bd64 DIST ruby-patches-2.3.2.tar.bz2 2223 SHA256 f0a803173564368e5cf31162e1dba901c46640f9e861255f6cbe14256d18f3eb SHA512 bb47000e516017c1fedf7c5313b0628fa734030e69bd0fed1c06a38dd115b8c50837e3dd917f272e24abf5609c4c12793ae4570bfd7d6210290785bf2f8287bd WHIRLPOOL 0b0d4dcf7df4ff3ff11610bfe7a7b29ed621b45b412cb7618a6572f98a568ac67419bd852b193cfc3aa0968382cf9400a578511e9e8fb8b2125bc876e733bd64 +DIST ruby-patches-2.3.3-r1.tar.bz2 2223 SHA256 f0a803173564368e5cf31162e1dba901c46640f9e861255f6cbe14256d18f3eb SHA512 bb47000e516017c1fedf7c5313b0628fa734030e69bd0fed1c06a38dd115b8c50837e3dd917f272e24abf5609c4c12793ae4570bfd7d6210290785bf2f8287bd WHIRLPOOL 0b0d4dcf7df4ff3ff11610bfe7a7b29ed621b45b412cb7618a6572f98a568ac67419bd852b193cfc3aa0968382cf9400a578511e9e8fb8b2125bc876e733bd64 DIST ruby-patches-2.3.3.tar.bz2 2223 SHA256 f0a803173564368e5cf31162e1dba901c46640f9e861255f6cbe14256d18f3eb SHA512 bb47000e516017c1fedf7c5313b0628fa734030e69bd0fed1c06a38dd115b8c50837e3dd917f272e24abf5609c4c12793ae4570bfd7d6210290785bf2f8287bd WHIRLPOOL 0b0d4dcf7df4ff3ff11610bfe7a7b29ed621b45b412cb7618a6572f98a568ac67419bd852b193cfc3aa0968382cf9400a578511e9e8fb8b2125bc876e733bd64 DIST ruby-patches-2.4.0.tar.bz2 2047 SHA256 9560b8e8dc4a5517814df07aa635c9269f5e7cff5a15827a25a9f0811194e450 SHA512 b35db875a7e4a226e75eb6f7bc68b4bc97cc699bdc5f6930015e55cdc324b67b9883a2aa574c9c9a8b5dc5345c4df8a5ca8ace5b794b3e4de6517f3eefd25745 WHIRLPOOL fc5d226f46fe4ee1c86f6fff51ec9184b8c0ec08a1793eab365437d4ce2fd573cfc8857386cd10932f7dde05254bc975eff5b7986aea429730c606147fae2a5c EBUILD ruby-2.0.0_p648.ebuild 6428 SHA256 2a781de03553b429532a7088c00e45a94955bc9e80c6b7ae8bbeef255597c560 SHA512 6b4009d9d0a234399de0fff62573bfc02ba6db4264a8b7ea38acd8c8a745ac810089f716227723064045fb02c9b393b7d5855d12e7c772e5d6275aa448f40190 WHIRLPOOL 37ce28ce1fa2e4ba1b2d525a2228fabd96caa0aad41f42f7548899ff8e44906217f7ea7359cb1024d99839049d6eee3d5fa5675ab8e52b7b843077a2596bf7f7 @@ -23,6 +24,7 @@ EBUILD ruby-2.2.5.ebuild 6925 SHA256 a3c0d208a0ecc9762c327fe9aa87bbe06679d32b9e4 EBUILD ruby-2.2.6.ebuild 6925 SHA256 a3c0d208a0ecc9762c327fe9aa87bbe06679d32b9e42a0bc018bd91ff5ebcc89 SHA512 081b1817cb1a1aa8ba700baa3fbd5c4fc6d4fcdd30f425314f6480798840711e122757f4c0ba69eb1f050573baf449af3a6f585c7920d7b7b375912c824058a7 WHIRLPOOL 1d33978882bec35ef44998de95e32a3970b84f84ada3792ac791e005072116db145194fae387be50f4cee05567e35f9691e9670cfa0d9c1d3a893b30a5526ba2 EBUILD ruby-2.3.1.ebuild 6876 SHA256 4b3cde33c6fd19dacd9b9eb8992ef23722b78a9d11541a338362881e70d2e939 SHA512 6af55b81a44b1e934b425689bc1f5f0fb7813e13de361c98d1880264e8330030aafb7671fe871f01dbcc3ee8cd4132ff20be77174968db948e8af774163ddedd WHIRLPOOL 4a088510eff39de5dabd0d7effa87cab47c33c079528cbed85df5c9aece0bfb9a92255255386ea61a2c8050f42e19758bc25606a26a2f83834bc6d671f2d16be EBUILD ruby-2.3.2.ebuild 6876 SHA256 4b3cde33c6fd19dacd9b9eb8992ef23722b78a9d11541a338362881e70d2e939 SHA512 6af55b81a44b1e934b425689bc1f5f0fb7813e13de361c98d1880264e8330030aafb7671fe871f01dbcc3ee8cd4132ff20be77174968db948e8af774163ddedd WHIRLPOOL 4a088510eff39de5dabd0d7effa87cab47c33c079528cbed85df5c9aece0bfb9a92255255386ea61a2c8050f42e19758bc25606a26a2f83834bc6d671f2d16be +EBUILD ruby-2.3.3-r1.ebuild 6878 SHA256 5729acff3255e70a9305e47c59b870f70e631f480b7733fe91994004aa068cfa SHA512 78325bae2c3a0ce45ea9f2f5dd9e464ebef5312f7c3e2e1b0db9feba6b3e464477a420091ff475d4347e844586c094e2f2a69df7a09aa30e1cda88de4d12a60f WHIRLPOOL 81087c60118078191acdab0673b4c41c121b4f34a3bd5df6808428ba4a470c53f556387c82d37e8d1ce892630d88f6dd06553da3181435f1ed2c8c92f7446d2b EBUILD ruby-2.3.3.ebuild 6876 SHA256 4b3cde33c6fd19dacd9b9eb8992ef23722b78a9d11541a338362881e70d2e939 SHA512 6af55b81a44b1e934b425689bc1f5f0fb7813e13de361c98d1880264e8330030aafb7671fe871f01dbcc3ee8cd4132ff20be77174968db948e8af774163ddedd WHIRLPOOL 4a088510eff39de5dabd0d7effa87cab47c33c079528cbed85df5c9aece0bfb9a92255255386ea61a2c8050f42e19758bc25606a26a2f83834bc6d671f2d16be EBUILD ruby-2.4.0.ebuild 6742 SHA256 79d91c4587c89e0de796fcd6ee7bb4b24835bd005a25663eca616d72ea8d87b4 SHA512 3c38ee153690fd8adbbea3d194c03148f1689b6a5187acb34214e2cec8bbfdd18d704fd2750a04967e8f0aeb7a83a4d187b0206f41e07c8b0c666babe501e458 WHIRLPOOL e4f68275a26d238488dd9d65a1f48a2c5264043bc95da108548f793a10cce8c1f8dfe4ef549664e6f87a9110691eec30c1f4cd7e5900337545a971df3c5cfb32 MISC ChangeLog 14020 SHA256 f0339e6fd4cb9ef4a7b472031ac3c3ae21f60d574fa5db2e4e48577e73e53b7e SHA512 d7d9bc849624e4814b0b277924715d53479dbf15b087bec68ebca20c447ce9515993509efbc33d5f65c19268072d4f68ba2b7879ab91d1c12bd349445bdf3aa1 WHIRLPOOL 9c64ffb6004a17afcc4ea207698c233079026eef065cc7495de0f10af7a6ae62015b47be6e4a828a7d1d45d917be5b148fb6376a9deb9fe938048a58380fddb7 diff --git a/dev-lang/ruby/ruby-2.3.3-r1.ebuild b/dev-lang/ruby/ruby-2.3.3-r1.ebuild new file mode 100644 index 000000000000..56c659505934 --- /dev/null +++ b/dev-lang/ruby/ruby-2.3.3-r1.ebuild @@ -0,0 +1,243 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +#PATCHSET=1 + +inherit autotools eutils flag-o-matic multilib versionator + +MY_P="${PN}-$(get_version_component_range 1-3)" +S=${WORKDIR}/${MY_P} + +SLOT=$(get_version_component_range 1-2) +MY_SUFFIX=$(delete_version_separator 1 ${SLOT}) +RUBYVERSION=2.3.0 + +if [[ -n ${PATCHSET} ]]; then + if [[ ${PVR} == ${PV} ]]; then + PATCHSET="${PV}-r0.${PATCHSET}" + else + PATCHSET="${PVR}.${PATCHSET}" + fi +else + PATCHSET="${PVR}" +fi + +DESCRIPTION="An object-oriented scripting language" +HOMEPAGE="http://www.ruby-lang.org/" +SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz + https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2" + +LICENSE="|| ( Ruby-BSD BSD-2 )" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline" + +RDEPEND=" + berkdb? ( sys-libs/db:= ) + gdbm? ( sys-libs/gdbm ) + jemalloc? ( dev-libs/jemalloc ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + ) + socks5? ( >=net-proxy/dante-1.1.13 ) + tk? ( + dev-lang/tcl:0=[threads] + dev-lang/tk:0=[threads] + ) + ncurses? ( sys-libs/ncurses:0= ) + readline? ( sys-libs/readline:0= ) + dev-libs/libyaml + virtual/libffi + sys-libs/zlib + >=app-eselect/eselect-ruby-20151229 + ! /dev/null 2>&1; then +- lastcommitdate=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 1) +- lastcommithours=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 2) +-else +- lastcommitdate=$(date +%Y-%m-%d) +- lastcommithours=$(date +%H:%M:%S) +-fi ++lastcommitdate="2016-12-05" ++lastcommithours="00:00:00" + + # 20120324 + echo "${lastcommitdate//-/}-${lastcommithours//:/}" +--- scala-2.12.1-orig/tools/get-scala-commit-sha 2016-12-05 20:45:09.000000000 +1100 ++++ scala-2.12.1/tools/get-scala-commit-sha 2016-12-27 16:44:07.393422207 +1100 +@@ -10,13 +10,7 @@ + + [[ $# -eq 0 ]] || cd "$1" + +-if git rev-parse --is-inside-work-tree > /dev/null 2>&1; then +- # printf %016s is not portable for 0-padding, has to be a digit. +- # so we're stuck disassembling it. +- hash=$(git log -1 --format="%H" HEAD) +- hash=${hash#g} +- hash=${hash:0:10} +-else +- hash="unknown" +-fi ++hash="2787b47396013a44072fa7321482103b66fbccd3" ++hash=${hash#g} ++hash=${hash:0:10} + echo "$hash" diff --git a/dev-lang/scala/files/scala-2.12.1-runner-script.patch b/dev-lang/scala/files/scala-2.12.1-runner-script.patch new file mode 100644 index 000000000000..9115a9810f67 --- /dev/null +++ b/dev-lang/scala/files/scala-2.12.1-runner-script.patch @@ -0,0 +1,22 @@ +--- scala-2.12.1-orig/src/compiler/scala/tools/ant/templates/tool-unix.tmpl 2016-12-05 20:45:09.000000000 +1100 ++++ scala-2.12.1/src/compiler/scala/tools/ant/templates/tool-unix.tmpl 2016-12-28 11:46:29.120052198 +1100 +@@ -197,14 +197,11 @@ + # to java to suppress "." from materializing. + if [[ "$usebootcp" == "true" ]]; then + classpath_args=("-Xbootclasspath/a:$TOOL_CLASSPATH" -classpath "\"\"") +- # Note that the version numbers go 1.7, 1.8, 9, 10, ... +- java_release="$(cat $JAVA_HOME/release | grep JAVA_VERSION)" +- if [[ ! "$java_release" =~ JAVA_VERSION=\"1\. ]]; then +- # Java 9 removed sun.boot.class.path, and the supposed replacement to at least see +- # the appended boot classpath (jdk.boot.class.path.append) is not visible. +- # So we have to pass a custom system property that PathResolver will find. +- classpath_args+=("-Dscala.boot.class.path=$TOOL_CLASSPATH") +- fi ++ # Java 9 removed sun.boot.class.path, and the supposed replacement to at least see ++ # the appended boot classpath (jdk.boot.class.path.append) is not visible. ++ # So we have to pass a custom system property that PathResolver will find. ++ # We do this for all JVM versions, rather than getting into the business of JVM version detection. ++ classpath_args+=("-Dscala.boot.class.path=$TOOL_CLASSPATH") + else + classpath_args=(-classpath "$TOOL_CLASSPATH") + fi diff --git a/dev-lang/scala/scala-2.12.1.ebuild b/dev-lang/scala/scala-2.12.1.ebuild new file mode 100644 index 000000000000..9277fdc5d363 --- /dev/null +++ b/dev-lang/scala/scala-2.12.1.ebuild @@ -0,0 +1,214 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +JAVA_PKG_IUSE="doc source" + +inherit eutils check-reqs java-pkg-2 versionator + +SV="$(get_version_component_range 1-2)" + +# Note: to bump scala, some things to try are: +# 1. update all the sha1s in JURI +# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.gz +# and https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.gz from +# SRC_URI +# 3. try emerge scala. Check if it downloads more stuff in src_compile to +# ${WORKDIR}/.ivy2 or ${WORKDIR}/.sbt or /root/.ivy2 or /root/.sbt +# 4. tar up all the .ivy2 and .sbt junk into ${P}-ivy2-deps.tar.xz and +# ${P}-sbt-deps.tar.xz and add them to SRC_URI: +# XZ_OPT=-9 tar --owner=portage --group=portage \ +# -cJf /usr/portage/distfiles/${P}-ivy2-deps.tar.xz .ivy2/cache +# XZ_OPT=-9 tar --owner=portage --group=portage \ +# -cJf /usr/portage/distfiles/${P}-sbt-deps.tar.xz .sbt + +# creating the binary: +# FEATURES="noclean -test" USE="doc source" emerge dev-lang/scala +# cd $WORDKIR +# XZ_OPT=-9 tar --owner=portage --group=portage \ +# -cJf /usr/portage/distfiles/${P}-gentoo-binary.tar.xz .ivy2/local \ +# ${P}/build/pack/bin ${P}/build/quick/classes/scala-dist/man/man1 \ +# ${P}/src/library ${P}/src/library-aux ${P}/src/reflect ${P}/doc/README \ +# ${P}/build/scaladoc + +# In the pullJarFiles function in tools/binary-repo-lib.sh it executes find commands +# to search for .desired.sha1 files, which contain sha1 hashes that are appended +# to ${BURI} along with the subdirectory and filename to form the list of jar files +# listed in SRC_URI. The output of this find command can be hacked into the desired format: +# find . -name \*.desired.sha1 -exec sed -e 's@\([0-9a-f]*\).*@\1@' {} \; -print +# After editing it into the desired format: sort -t / -k 3 file + +BURI="http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap" + +declare -a JURI=( + "${BURI}/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> ${P}-ant-contrib.jar" + "${BURI}/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> ${P}-ant-dotnet-1.0.jar" + "${BURI}/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> ${P}-ant.jar" + "${BURI}/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> ${P}-maven-ant-tasks-2.1.1.jar" + "${BURI}/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> ${P}-vizant.jar" + "${BURI}/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> ${P}-code.jar" + "${BURI}/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> ${P}-annotations.jar" + "${BURI}/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> ${P}-enums.jar" + "${BURI}/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> ${P}-genericNest.jar" + "${BURI}/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> ${P}-jsoup-1.3.1.jar" + "${BURI}/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> ${P}-macro210.jar" + "${BURI}/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> ${P}-methvsfield.jar" + "${BURI}/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> ${P}-nest.jar" + "${BURI}/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> ${P}-instrumented.jar" +) + +DESCRIPTION="The Scala Programming Language" +HOMEPAGE="http://www.scala-lang.org/" +SRC_URI=" + !binary? ( + https://github.com/scala/scala/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.xz + https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz + ${JURI[@]} ) + binary? ( + https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz )" + +LICENSE="BSD" +SLOT="${SV}/${PV}" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos" + +IUSE="binary emacs" + +COMMON_DEP="dev-java/ant-core:0 + dev-java/hawtjni-runtime:0" + +DEPEND="${COMMON_DEP} + !binary? ( + =virtual/jdk-1.8* + >=dev-java/sbt-0.13.13 + media-gfx/graphviz + ) + binary? ( + >=virtual/jdk-1.8 + ) + app-arch/xz-utils:0" + +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.8 + app-eselect/eselect-scala + !dev-lang/scala-bin:0" + +PDEPEND="emacs? ( app-emacs/scala-mode:0 )" + +CHECKREQS_MEMORY="1536M" + +pkg_setup() { + java-pkg-2_pkg_setup + + if ! use binary; then + debug-print "Checking for sufficient physical RAM" + + ewarn "This package can fail to build with memory allocation errors in some cases." + ewarn "If you are unable to build from sources, please try USE=binary" + ewarn "for this package. See bug #181390 for more information." + + check-reqs_pkg_setup + fi +} + +src_unpack() { + # Unpack tar files only. + for f in ${A} ; do + [[ ${f} == *".tar."* ]] && unpack ${f} + done +} + +src_prepare() { + java-pkg_getjars ant-core,hawtjni-runtime + + if ! use binary; then + local a + for a in "${JURI[@]}" + do + echo "${a}" + local g="${a/* -> /}" + echo "${g}" + local j="${a/ -> */}" + echo "${j}" + cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die + done + # gentoo patch (by gienah) to stop it calling git log in the build + eapply "${FILESDIR}/${P}-no-git.patch" + + # https://issues.scala-lang.org/browse/SI-10098 + eapply "${FILESDIR}/${PN}-2.12.1-runner-script.patch" + + local SBT_PVR="$(java-config --query=PVR --package=sbt)" + sed -e "s@sbt.version=0.13.11@sbt.version=${SBT_PVR}@" \ + -i "${S}/project/build.properties" \ + || die "Could not set sbt.version=${SBT_PVR} in project/build.properties" + + cat <<- EOF > "${S}/sbt" + #!/bin/bash + gjl_package=sbt + gjl_jar="sbt-launch.jar" + gjl_java_args="-Dsbt.version=0.13.13 -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -Duser.home="${WORKDIR}"" + source /usr/share/java-config-2/launcher/launcher.bash + EOF + chmod u+x "${S}/sbt" || die + + sed -e 's@-Xmx1024M@-Xmx1536M@' \ + -e 's@-XX:MaxPermSize=128M@-XX:MaxPermSize=256M@' \ + -i "${S}/test/partest" \ + || die "Could not change increase memory size in ${S}/test/partest" + fi + + default +} + +src_compile() { + if ! use binary; then + export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${L_P}:${PATH}" + einfo "=== scala compile ..." + "${S}"/sbt -Dsbt.log.noformat=true compile || die "sbt compile failed" + einfo "=== sbt publishLocal with jdk $(java-pkg_get-vm-version) ..." + "${S}"/sbt -Dsbt.log.noformat=true publishLocal \ + || die "sbt publishLocal failed" + else + einfo "Skipping compilation, USE=binary is set." + fi +} + +src_test() { + "${S}"/sbt -Dsbt.log.noformat=true test || die "sbt test failed" +} + +src_install() { + pushd build/pack || die + local SCALADIR="/usr/share/${PN}-${SV}" + exeinto "${SCALADIR}/bin" + doexe $(find bin/ -type f ! -iname '*.bat') + dodir /usr/bin + for b in $(find bin/ -type f ! -iname '*.bat'); do + local _name=$(basename "${b}") + dosym "${SCALADIR}/bin/${_name}" "/usr/bin/${_name}-${SV}" + done + popd || die + java-pkg_dojar $(find "${WORKDIR}"/.ivy2/local -name \*.jar -print) + + pushd build/quick/classes/scala-dist/man/man1 || die + for i in *.1; do + newman "${i}" "${i/./-${SV}.}" + done + popd || die + + #sources are .scala so no use for java-pkg_dosrc + pushd src || die + if use source; then + dodir "${SCALADIR}/src" + insinto "${SCALADIR}/src" + doins -r library library-aux reflect + fi + popd || die + + local DOCS=( "doc/README" ) + local HTML_DOCS=( "build/scaladoc" ) + einstalldocs +} diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest index dbce013c2753..8c41501da584 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -13,6 +13,7 @@ AUX boost-1.56.0-build-auto_index-tool.patch 412 SHA256 02cbad68d52513860ffbdc2e AUX boost-1.58.0-fix-non-constexpr-types-regression.patch 10687 SHA256 746c6c48f7b88782b3bf792e8e0e042eee65a5c3a419cc8a8c7714991314eda1 SHA512 1d1aa4c6b64fec4773b0a294ed2e2ba6f3cc905370a5b641010ca7310063f4cc9090cda9435fc5817b379f9b4c0ad93777b81387c4eb59da73ed297005d09dc8 WHIRLPOOL 48b50c9d823c829f8c1dd7955cf7c9e163acfa0f9069f139c52be026df6082ffa6caeda2c5c831ee4bf103a3fb79ebabe2c652cb7924f6e5dfa3ff613563f4b5 AUX boost-1.60.0-auto-pointer-python.patch 1812 SHA256 3a4f58f87d402c1335b0ae13bd5dab0975ff641f8ba2d8fc2caffb4e7a1605d1 SHA512 e452e845485d6b4f0d186a2c1d3ff1e3f58d96e634af759e1872bcb5058a32943731e338b0368c2d91ec6a0e1ceb4c01b60a669ecec77f705c36b7dcbee79bdf WHIRLPOOL d6f04f29dfc271ea0308ef00ded0dd0c8e7ef4b690231609193bee8fb902571e7f8f42761960009c12e563fc632d4d872ef71313c033fc2e524d64c1922d7544 AUX boost-1.60.0-deprecated-header-ice_not.patch 1589 SHA256 e3f6b83e3b5b8683bb834bc2f76faa29abf512715424f6f6acfd5e3d60b53844 SHA512 7f1cebdfc7f40bc375189ae5181d945091fa8eb0237a8825d425b7272a6d53893e7e4fb5d1c059f27afba3069be50e6b491cf6df71291aad60cd52166a57075f WHIRLPOOL 6dbaae5c761c109438fb1ea97beec25528d0cb6c3bfb0f9d90e97e0e8ba9be16efa19574a9eb24973e7dd423a92e4fa30a33db37d6cba04ba9527c61dcf1270d +AUX boost-1.63.0-fix-python.patch 3949 SHA256 db79a7243b034447750ce06286912c9fa6db619b6f64636eedea72e6e4134d75 SHA512 dfdf123422ea8c4eb84b66f54621161db47a8ae979f007099835bcf8f205c1f13b180ffb49264f3ad6fb05a0fddbd4bec72f0fd019539353456c421e169bb528 WHIRLPOOL e3182c4fd9fd8cc584c1838d2f8fdb7750a880f2a9d48f957a3ccbe30280851dd254bd98092fdc674c71c470b58d8f4bd07079b6da387755c1b24d8e54347eba DIST boost_1_55_0.tar.bz2 58146647 SHA256 fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52 SHA512 dc606477f4c303e8f40de2586c16394b6d758e198b35bf3a7d3e576a2f49171aadc4f95e8d685fa731bc4e61e19869d5a24e1e816febfca9de078d66e096e041 WHIRLPOOL 6ae111d6a956651bd91914432b743faffeb466703191b05193db47f02fd3528a14ce200f26c1ab77bf2c68994eb5b135b0176f66a746964d334b4793ba113ad5 DIST boost_1_56_0.tar.bz2 94777674 SHA256 134732acaf3a6e7eba85988118d943f0fa6b7f0850f65131fff89823ad30ff1d SHA512 1ce9871c3a2519682538a5f1331938b948123432d99aea0ce026958cbebd25d84019a3a28c452724b9693df98a8d1264bb2d93d2fee508453f8b42836e67481e WHIRLPOOL e9e9bb965816b687141d55bc026e378a56ed577a2bf0bdad61a1736e7f11d1797e0cac0185a1fa25b6c4b9fe1f75cbb0bb73a5ea05e84d59385bb3b17a90fd12 DIST boost_1_58_0.tar.bz2 70394057 SHA256 fdfc204fc33ec79c99b9a74944c3e54bd78be4f7f15e260c0e2700a36dc7d3e5 SHA512 7480ec713b0aa13f0ec990603e87e3b5c8d53f4411329b10fae37fc963b90aad12dbd9290a33c3669ae801e9012a68683eadff057591e9ca2ebcd22b1a67b5d1 WHIRLPOOL 0ed66f7de8b2ac28eda89e2fcadfc5533e6a3887ef7a929610804efa3ca66b850fecafeb61c986d37cb704ec844744e47d08f87e08ea25c779f57cffd26a1be2 @@ -20,6 +21,7 @@ DIST boost_1_59_0.tar.bz2 70389425 SHA256 727a932322d94287b62abb1bd2d41723eec435 DIST boost_1_60_0.tar.bz2 76553944 SHA256 686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b SHA512 7c851b3fc2b322ff05d642d9cf03e7c30c5f04d5cf0579c99046b1ec708901c58a3d349031dfe24591f5b88c1e664b6a0d40abea6cce89abb52080c02eb725df WHIRLPOOL 828b0797a8b62150ecef5ee13f0e8b8d6b6a0e7365511ec9782d2d8f3a26ac38a98f10876c40d05ea46697c013b1f96f22b3a24c449372520c84bb725059fe48 DIST boost_1_61_0.tar.bz2 85202254 SHA256 a547bd06c2fd9a71ba1d169d9cf0339da7ebf4753849a8f7d6fdb8feee99b640 SHA512 a1c7338e2d2dbac8552ede7c554640d22cbb2fda7fbc325dc3cdcb51e769713626695426ffc158cbe0e1729dd9a7b5ad18af4800d74e24539e8d8564268c2b9d WHIRLPOOL 59b47e7ae9ae8443ecaab29b1104cfe3ebfa607d22afcc3fad4a87bdfd575939eba8130a80fd509da178eb3227a26cb74db51852716dc5df068d36fc4839372b DIST boost_1_62_0.tar.bz2 84513338 SHA256 36c96b0f6155c98404091d8ceb48319a28279ca0333fba1ad8611eb90afb2ca0 SHA512 5385ae3d5255a433a704169ad454d8dc2b0b5bcae3fb23defd6570df4ff7d845cf9fcbeebccdc1c5db0eec9f82ee3d90040de9507c8167467c635d3b215463be WHIRLPOOL 49c4558d5e6d72084f083a76217e3d97b504f112d7e4d228eded72dc49fa7e675ba943a9fc52a3c27d296ee689aee27d4566796c6eae71cf647430285777c0fb +DIST boost_1_63_0.tar.bz2 81984414 SHA256 beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0 SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad WHIRLPOOL 28c241785097272a1e0952e529eef082444e4ef35a8d738161e4a491a986d75359d3afe888b2ea91a4a81b6ec7a5772ebea337c9d09377b43f6eed66cac90378 EBUILD boost-1.55.0-r2.ebuild 11964 SHA256 2f534ab14a3512a69fea66448cf0341fd6a91d317006ad1bb7eafec035e741c0 SHA512 e1abddbda5bf5857ed94eecb8fee4026fe6dc70209a4e9c686417e64cb5df7511fd18cee2f8b771f53416f5254898010e0ac846f865e620515e3e84ebe40caf5 WHIRLPOOL c7c16ddeae332e0545b8c31d67b720a9950653cafff032c33d8025d5beaa9f4b1478233a4d088670d21d96e24fbf8c772eebd71e1f7ac1ac7c2aa46495f8fd76 EBUILD boost-1.56.0-r1.ebuild 12351 SHA256 463f7a9d6c9be609c26f32a7cb86c31a3a557e61f112267f90da0ffbb016a0cf SHA512 9840ca3537854bab557fdd49ed8a965c7f2904e7b7406444b9b2a32cc6d138a42f32abf0183ba1cdf31dec9954f5b1dd6cf553fea209157f1eb21c42220b6436 WHIRLPOOL bcc965eae720564996ac5f9cd5554559137a3d946cb48207143dc092062515d8c28ef71e044aefdb5324b3dfa179cf27eda841c2d6546c4cf7bc4848ba609428 EBUILD boost-1.58.0-r1.ebuild 12264 SHA256 97e28783752d9c1f309cac01b3ffd6edce3eb351cf1e70b889c05b9211adea1f SHA512 309230cc10bf81cf791cb27fa02944a3729dc39f8ad7fe53b2d0abee2c073e349a77a1a02842c4e2ca8da40df9f5cf2e8af2624884e73bc7ba1fafb59f5412a0 WHIRLPOOL fc2c49adf11226ea0b294aa855282037d8ad1c0f2d19459775cee822917dce79244a966d83f1a9ca58e00dd8ec44fd4a4584dd84f453b627c86441b182165207 @@ -28,6 +30,7 @@ EBUILD boost-1.60.0.ebuild 12298 SHA256 73ecb047f2802e991e6ca36a9a456db9baa1656a EBUILD boost-1.61.0-r1.ebuild 12128 SHA256 e0fc39fe8f0aa26cdf70d47973b7b13f66ad6efa9662365d6a03ad215fc4a9e1 SHA512 a8fb9fe748e304ddb3b32a6f0ea0b953aa7d9a6dcf3857ffa4c5b1e073a450fb84648f92e6279dc79d8cba7ad83d4ea589afd48de873bca1aa81e5c8cdea72d3 WHIRLPOOL 994f8dac6e4d118ceb3822db36fdb7d337f703df6ab0f8a57bc224bf7b8b450c827c2a7f5c2ae75824b1e8dab13a2278588b59ad39aeeb4afda811865c97b79c EBUILD boost-1.61.0.ebuild 12251 SHA256 90c54156f2b7408246c566e75694acc6ca772760466cd3fabba574b21fa1ae24 SHA512 8a94a476986be0e4964cf917e9fe611fa202cc0c2f119bf5db00ba0f404afdfe17d1bf106b01bd56da791f6191785eb276c773eba0be8450f05d5da8a7975aa4 WHIRLPOOL 9172da01ad7d6545a1204ba84e23c658360691bd19f8a391bc39d1cd85f6c9a05d471f1c188f890d27767b1b235dfd49467a5d56f0064cd9109f731a204a565c EBUILD boost-1.62.0-r1.ebuild 12510 SHA256 244a486fe2ea972509a2d54fbd6d2cae1717602e152e9595bbdc6024192a6a1e SHA512 2a85c75024422877461fad49c503a73b289de95ed267827eff66d5eec576ad93b40375e5044d7e8fef12f39b3f3c5a9832771e9133377dbb767b90495b5af8fa WHIRLPOOL 292c411e2d6d44f293389560857296be4b4876021e54708727121da709ed0b108a853d7253d2e2bdb40a082cedda628314a4e8e459a835867b508bcb0a4654ec +EBUILD boost-1.63.0.ebuild 12264 SHA256 defacf92c48dac9a0a7c2a65be282204da1d1d1f38bfcb2eea34ebffa17bde3b SHA512 15694b842a1b10fac3a1b3543c07780d6949c1af5b0abf3be283cc79e2ae4ee7c82b7879634ef3371b70a16fd48f3f51642f59f9bb8c6fa2e07a6060443ab05d WHIRLPOOL d3c6327184c7d495ad237b9427e71b71f7cd63e7de9f16bf2e380b51c824a76ecba08169de40c71e662c9a58df69c80823d2926321809c5344d765494d06db6d MISC ChangeLog 9975 SHA256 642cfd545560930656783f915297a280e467394d4d2c53a5f81485893701b6ed SHA512 36a87862bce59e58f7af6d02c6eca9fd9169ac7f4736417f64aa941141c800d80c8979c0ed4cd62e55a22f2bcd1a6803bc5daa8393c2f3e9f23060aefafa0c1b WHIRLPOOL e76c059fba7246adcb3e48d0b7f8b58f61ec4e1f95d82d7af4ba021e29fd1a34b9a95b415f7f98d6f03a0e86f549e22f2178ee36e14ace177d73e78d5c6c9697 MISC ChangeLog-2015 60992 SHA256 f3b1d8b8c4ad6bd080f9b3d18ccb1cc360d47864f4afc95992e171d475d682a1 SHA512 6f29b95e625e1a8a8a7ea2578f07b543329e007443f3b4926e07c913ab21336e1b1332084b090354dcd9899b6f0aa9012b92e0cb5e0457733da4a47da86a818f WHIRLPOOL e11113ea0a8eda558457c7018283f274d10df473c116da67126640d56b49107e05326e0a8a3ef4f9043a22e2fc91f151c1cbed71bfe41cac52f5467e12a7e1d8 MISC metadata.xml 1654 SHA256 aec7f8916bd76fc5c14a23487e21c9e091a5999ce137c9e054a9db4bbfd06d19 SHA512 13f013eeea54d202881c252764d52dc65e74b585e1aed15f79042f3efcfda7f00c0e6f9047cefbb5ef789aa936e7c231201caf0757ddfedb9f5ba060d810973a WHIRLPOOL 6b765cbe8bce0b84e5a8cfb36d840667cdfe9143da6ccc4d0fc3d250f98a4f3024e7e92549c806b53c02d0937d9378a0d0b35503fedaede1b861eb4edb872ba9 diff --git a/dev-libs/boost/boost-1.63.0.ebuild b/dev-libs/boost/boost-1.63.0.ebuild new file mode 100644 index 000000000000..2512e46f1229 --- /dev/null +++ b/dev-libs/boost/boost-1.63.0.ebuild @@ -0,0 +1,437 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +inherit eutils flag-o-matic multiprocessing python-r1 toolchain-funcs versionator multilib-minimal + +MY_P="${PN}_$(replace_all_version_separators _)" +MAJOR_V="$(get_version_component_range 1-2)" + +DESCRIPTION="Boost Libraries for C++" +HOMEPAGE="http://www.boost.org/" +SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar.bz2" + +LICENSE="Boost-1.0" +SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh \ + ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos \ + ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt" + +IUSE="context debug doc icu +nls mpi python static-libs +threads tools" + +RDEPEND="icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] ) + !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] ) + mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] ) + python? ( ${PYTHON_DEPS} ) + app-arch/bzip2[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + !app-admin/eselect-boost" +DEPEND="${RDEPEND} + =dev-util/boost-build-${MAJOR_V}*" +REQUIRED_USE=" + mpi? ( threads ) + python? ( ${PYTHON_REQUIRED_USE} )" + +S="${WORKDIR}/${MY_P}" + +# the tests will never fail because these are not intended as sanity +# tests at all. They are more a way for upstream to check their own code +# on new compilers. Since they would either be completely unreliable +# (failing for no good reason) or completely useless (never failing) +# there is no point in having them in the ebuild to begin with. +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" + "${FILESDIR}/${PN}-1.55.0-context-x32.patch" + "${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch" + "${FILESDIR}/${PN}-1.63.0-fix-python.patch" +) + +python_bindings_needed() { + multilib_is_native_abi && use python +} + +tools_needed() { + multilib_is_native_abi && use tools +} + +create_user-config.jam() { + local compiler compiler_version compiler_executable + + if [[ ${CHOST} == *-darwin* ]]; then + compiler="darwin" + compiler_version="$(gcc-fullversion)" + compiler_executable="$(tc-getCXX)" + else + compiler="gcc" + compiler_version="$(gcc-version)" + compiler_executable="$(tc-getCXX)" + fi + local mpi_configuration python_configuration + + if use mpi; then + mpi_configuration="using mpi ;" + fi + + if python_bindings_needed; then + # boost expects libpython$(pyver) and doesn't allow overrides + # and the build system is so creepy that it's easier just to + # provide a symlink (linker's going to use SONAME anyway) + # TODO: replace it with proper override one day + ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die + + if tc-is-cross-compiler; then + python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;" + else + # note: we need to provide version explicitly because of + # a bug in the build system: + # https://github.com/boostorg/build/pull/104 + python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;" + fi + fi + + cat > "${BOOST_ROOT}/user-config.jam" << __EOF__ || die +using ${compiler} : ${compiler_version} : ${compiler_executable} : "${CFLAGS}" "${CXXFLAGS}" "${LDFLAGS}" ; +${mpi_configuration} +${python_configuration} +__EOF__ +} + +pkg_setup() { + # Bail out on unsupported build configuration, bug #456792 + if [[ -f "${EROOT%/}/etc/site-config.jam" ]]; then + grep -q gentoorelease "${EROOT%/}/etc/site-config.jam" && grep -q gentoodebug "${EROOT%/}/etc/site-config.jam" || + ( + eerror "You are using custom ${EROOT%/}/etc/site-config.jam without defined gentoorelease/gentoodebug targets." + eerror "Boost can not be built in such configuration." + eerror "Please, either remove this file or add targets from ${EROOT%/}/usr/share/boost-build/site-config.jam to it." + die + ) + fi +} + +src_prepare() { + default + + # Do not try to build missing 'wave' tool, bug #522682 + # Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507 + sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die + + multilib_copy_sources +} + +ejam() { + local b2_opts=( + "--user-config=${BOOST_ROOT}/user-config.jam" + "$@" + ) + echo b2 "${b2_opts[@]}" + b2 "${b2_opts[@]}" +} + +src_configure() { + # Workaround for too many parallel processes requested, bug #506064 + [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64" + + OPTIONS=( + $(usex debug gentoodebug gentoorelease) + "-j$(makeopts_jobs)" + -q + -d+2 + ) + + if [[ ${CHOST} == *-darwin* ]]; then + # We need to add the prefix, and in two cases this exceeds, so prepare + # for the largest possible space allocation. + append-ldflags -Wl,-headerpad_max_install_names + elif [[ ${CHOST} == *-winnt* ]]; then + compiler=parity + if [[ $($(tc-getCXX) -v) == *trunk* ]]; then + compilerVersion=trunk + else + compilerVersion=$($(tc-getCXX) -v | sed '1q' \ + | sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^ \t]*\) .*,\2,') + fi + compilerExecutable=$(tc-getCXX) + fi + + # bug 298489 + if use ppc || use ppc64; then + [[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec + fi + + # Use C++14 globally as of 1.62 + append-cxxflags -std=c++14 + + use icu && OPTIONS+=( + "-sICU_PATH=${EPREFIX}/usr" + ) + use icu || OPTIONS+=( + --disable-icu + boost.locale.icu=off + ) + use mpi || OPTIONS+=( + --without-mpi + ) + use nls || OPTIONS+=( + --without-locale + ) + use context || OPTIONS+=( + --without-context + --without-coroutine + --without-coroutine2 + ) + use threads || OPTIONS+=( + --without-thread + ) + + OPTIONS+=( + pch=off + --boost-build="${EPREFIX}"/usr/share/boost-build + --prefix="${ED%/}/usr" + --layout=system + # building with threading=single is currently not possible + # https://svn.boost.org/trac/boost/ticket/7105 + threading=multi + link=$(usex static-libs shared,static shared) + ) + + [[ ${CHOST} == *-winnt* ]] && OPTIONS+=( + -sNO_BZIP2=1 + ) +} + +multilib_src_compile() { + local -x BOOST_ROOT="${BUILD_DIR}" + PYTHON_DIRS="" + MPI_PYTHON_MODULE="" + + building() { + create_user-config.jam + + local PYTHON_OPTIONS + if python_bindings_needed; then + PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}" + else + PYTHON_OPTIONS=" --without-python" + fi + + ejam \ + "${OPTIONS[@]}" \ + ${PYTHON_OPTIONS} \ + || die "Building of Boost libraries failed" + + if python_bindings_needed; then + if [[ -z "${PYTHON_DIRS}" ]]; then + PYTHON_DIRS="$(find bin.v2/libs -name python | sort)" + else + if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then + die "Inconsistent structure of build directories" + fi + fi + + local dir + for dir in ${PYTHON_DIRS}; do + mv ${dir} ${dir}-${EPYTHON} \ + || die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed" + done + + if use mpi; then + if [[ -z "${MPI_PYTHON_MODULE}" ]]; then + MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" + if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then + die "Multiple mpi.so files found" + fi + else + if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then + die "Inconsistent structure of build directories" + fi + fi + + mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON} \ + || die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${EPYTHON}' failed" + fi + fi + } + if python_bindings_needed; then + python_foreach_impl building + else + building + fi + + if tools_needed; then + pushd tools >/dev/null || die + + ejam \ + "${OPTIONS[@]}" \ + ${PYTHON_OPTIONS} \ + || die "Building of Boost tools failed" + popd >/dev/null || die + fi +} + +multilib_src_install_all() { + if ! use python; then + rm -r "${ED%/}"/usr/include/boost/python* || die + fi + + if ! use nls; then + rm -r "${ED%/}"/usr/include/boost/locale || die + fi + + if ! use context; then + rm -r "${ED%/}"/usr/include/boost/context || die + rm -r "${ED%/}"/usr/include/boost/coroutine{,2} || die + rm "${ED%/}"/usr/include/boost/asio/spawn.hpp || die + fi + + if use doc; then + # find extraneous files that shouldn't be installed + # as part of the documentation and remove them. + find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die + find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die + find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die + + docinto html + dodoc *.{htm,html,png,css} + dodoc -r doc libs more tools + + # To avoid broken links + dodoc LICENSE_1_0.txt + + dosym /usr/include/boost /usr/share/doc/${PF}/html/boost + fi +} + +multilib_src_install() { + local -x BOOST_ROOT="${BUILD_DIR}" + installation() { + create_user-config.jam + + local PYTHON_OPTIONS + if python_bindings_needed; then + local dir + for dir in ${PYTHON_DIRS}; do + cp -pr ${dir}-${EPYTHON} ${dir} \ + || die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed" + done + + if use mpi; then + cp -p stage/lib/mpi.so-${EPYTHON} "${MPI_PYTHON_MODULE}" \ + || die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed" + cp -p stage/lib/mpi.so-${EPYTHON} stage/lib/mpi.so \ + || die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed" + fi + PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}" + else + PYTHON_OPTIONS=" --without-python" + fi + + ejam \ + "${OPTIONS[@]}" \ + ${PYTHON_OPTIONS} \ + --includedir="${ED%/}/usr/include" \ + --libdir="${ED%/}/usr/$(get_libdir)" \ + install || die "Installation of Boost libraries failed" + + if python_bindings_needed; then + rm -r ${PYTHON_DIRS} || die + + # Move mpi.so Python module to Python site-packages directory. + # https://svn.boost.org/trac/boost/ticket/2838 + if use mpi; then + local moddir=$(python_get_sitedir)/boost + # moddir already includes eprefix + mkdir -p "${D}${moddir}" || die + mv "${ED%/}/usr/$(get_libdir)/mpi.so" "${D}${moddir}" || die + cat << EOF > "${D}${moddir}/__init__.py" || die +import sys +if sys.platform.startswith('linux'): + import DLFCN + flags = sys.getdlopenflags() + sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL) + from . import mpi + sys.setdlopenflags(flags) + del DLFCN, flags +else: + from . import mpi +del sys +EOF + fi + + python_optimize + fi + } + if python_bindings_needed; then + python_foreach_impl installation + else + installation + fi + + pushd "${ED%/}/usr/$(get_libdir)" >/dev/null || die + + local ext=$(get_libname) + if use threads; then + local f + for f in *${ext}; do + dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}} + done + fi + + popd >/dev/null || die + + if tools_needed; then + dobin dist/bin/* + + insinto /usr/share + doins -r dist/share/boostbook + fi + + # boost's build system truely sucks for not having a destdir. Because for + # this reason we are forced to build with a prefix that includes the + # DESTROOT, dynamic libraries on Darwin end messed up, referencing the + # DESTROOT instread of the actual EPREFIX. There is no way out of here + # but to do it the dirty way of manually setting the right install_names. + if [[ ${CHOST} == *-darwin* ]]; then + einfo "Working around completely broken build-system(tm)" + local d + for d in "${ED%/}"/usr/lib/*.dylib; do + if [[ -f ${d} ]]; then + # fix the "soname" + ebegin " correcting install_name of ${d#${ED}}" + install_name_tool -id "/${d#${D}}" "${d}" + eend $? + # fix references to other libs + refs=$(otool -XL "${d}" | \ + sed -e '1d' -e 's/^\t//' | \ + grep "^libboost_" | \ + cut -f1 -d' ') + local r + for r in ${refs}; do + ebegin " correcting reference to ${r}" + install_name_tool -change \ + "${r}" \ + "${EPREFIX}/usr/lib/${r}" \ + "${d}" + eend $? + done + fi + done + fi +} + +pkg_preinst() { + # Yai for having symlinks that are nigh-impossible to remove without + # resorting to dirty hacks like these. Removes lingering symlinks + # from the slotted versions. + local symlink + for symlink in "${EROOT%/}/usr/include/boost" "${EROOT%/}/usr/share/boostbook"; do + if [[ -L ${symlink} ]]; then + rm -f "${symlink}" || die + fi + done +} diff --git a/dev-libs/boost/files/boost-1.63.0-fix-python.patch b/dev-libs/boost/files/boost-1.63.0-fix-python.patch new file mode 100644 index 000000000000..abfefb6a7860 --- /dev/null +++ b/dev-libs/boost/files/boost-1.63.0-fix-python.patch @@ -0,0 +1,127 @@ +--- a/libs/python/build/Jamfile ++++ b/libs/python/build/Jamfile +@@ -30,22 +30,6 @@ + ; + } + +-rule find-py3-version +-{ +- local versions = [ feature.values python ] ; +- local py3ver ; +- for local v in $(versions) +- { +- if $(v) >= 3.0 +- { +- py3ver = $(v) ; +- } +- } +- return $(py3ver) ; +-} +- +-py3-version = [ find-py3-version ] ; +- + project boost/python + : source-location ../src + ; +@@ -53,10 +37,16 @@ + rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } } + rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } } + +-rule lib_boost_python ( is-py3 ? ) ++rule lib_boost_python + { ++ local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ; ++ local python2 ; ++ if $(python_major_version) = 2 ++ { ++ python2 = true ; ++ } + +- lib [ cond $(is-py3) : boost_python3 : boost_python ] ++ lib boost_python + : # sources + numeric.cpp + list.cpp +@@ -90,20 +80,9 @@ + : # requirements + static:BOOST_PYTHON_STATIC_LIB + BOOST_PYTHON_SOURCE ++ [ cond $(python2) : -fno-strict-aliasing ] + +- # On Windows, all code using Python has to link to the Python +- # import library. +- # +- # On *nix we never link libboost_python to libpython. When +- # extending Python, all Python symbols are provided by the +- # Python interpreter executable. When embedding Python, the +- # client executable is expected to explicitly link to +- # /python//python (the target representing libpython) itself. +- # +- # python_for_extensions is a target defined by Boost.Build to +- # provide the Python include paths, and on Windows, the Python +- # import library, as usage requirements. +- [ cond [ python.configured ] : /python//python_for_extensions ] ++ [ cond [ python.configured ] : /python//python ] + + # we prevent building when there is no python available + # as it's not possible anyway, and to cause dependents to +@@ -112,7 +91,6 @@ + config-warning + + on:BOOST_DEBUG_PYTHON +- [ cond $(is-py3) : $(py3-version) ] + + -@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag + @$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag +@@ -125,51 +103,8 @@ + ; + } + +-rule lib_boost_numpy ( is-py3 ? ) +-{ +- numpy-include = [ python.numpy-include ] ; +- lib [ cond $(is-py3) : boost_numpy3 : boost_numpy ] +- : # sources +- numpy/dtype.cpp +- numpy/matrix.cpp +- numpy/ndarray.cpp +- numpy/numpy.cpp +- numpy/scalars.cpp +- numpy/ufunc.cpp +- : # requirements +- [ cond [ python.numpy ] : /python//python_for_extensions ] +- [ unless [ python.numpy ] : no ] +- $(numpy-include) +- boost_python +- on:BOOST_DEBUG_PYTHON +- [ cond $(is-py3) : $(py3-version) ] +- +- -@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag +- @$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag +- +- : # default build +- shared +- : # usage requirements +- on:BOOST_DEBUG_PYTHON +- ; +-} +- + libraries = boost_python ; +-libraries3 = boost_python3 ; +-if [ python.numpy ] +-{ +- libraries += boost_numpy ; +- libraries3 += boost_numpy3 ; +-} + + lib_boost_python ; +-lib_boost_numpy ; +- +-if $(py3-version) +-{ +- lib_boost_python yes ; +- lib_boost_numpy yes ; +- libraries += $(libraries3) ; +-} + + boost-install $(libraries) ; diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest index 8078cbe3d5b7..ad3ec8fe3f8b 100644 --- a/dev-libs/confuse/Manifest +++ b/dev-libs/confuse/Manifest @@ -3,7 +3,7 @@ DIST confuse-2.8.tar.xz 403252 SHA256 2a8102bfa3ccc846c14d94a81b0abfb4f5e855809f DIST confuse-3.0.tar.xz 449144 SHA256 bb75174e02aa8b44fa1a872a47beeea1f5fe715ab669694c97803eb6127cc861 SHA512 12279045b772e94d2e29201ab1d7aef1ef8e698780a22d6a282d12f51ccd9a437e7817a4dd5e39bdfc8dae79700b72aa0783b4b983a935d751403d2cffd1161e WHIRLPOOL fe9f792b9f0858029393a811da93746fb91dc6cc3c99bfcc3a183d7bc0f3600818b96df8d169c63e64a59cb0f3857a86298f0bfd4053c8360bcd2b6bd1e71156 EBUILD confuse-2.7.ebuild 1017 SHA256 7475094853b50b9328dccb80a257c3d27dcb5b1c8962213aa982d3eadf125eb3 SHA512 820e4a1530e886dc529f52f9f6ec34609219b57f5b8f94f9dcfbc1d5404909913c7662c6d1421d3893ea45b014281fd6b5ced0475808228de25de94bf790e162 WHIRLPOOL 93127a7d20b302b1d2afd75887a85e13101f70f77da04b269a769ee01f9cb4eea50306c9a178fd80437d84d8c9350a8c9b443cbcc24fba80b78bd8dd01d42887 EBUILD confuse-2.8.ebuild 1204 SHA256 0c81478f20769aa58e1ba1cf3e2905e6faa95b608fa4013d084d44214246adc6 SHA512 a4a3cf8b8dbd45a12e4922dfee9d82d3dd5bc686fcd1e86ce6364006b975b50fe0dd52d3b9225cdf7a7d6cc504cda279ad604433b3fd152a1253510643adc2e7 WHIRLPOOL b2defa774d6011ac88bb90263cfdb256fe06b3238c53c31e0ed090e9d2cba6f96e25865f305c714646c2f4abd638a2ac02d1a178eeb4c5ccc86dfb85e3f4d146 -EBUILD confuse-3.0.ebuild 1177 SHA256 8d232dfe2dfba7e704032d8edb07d529340409505254fc17350fff415c66a383 SHA512 b165a28528da1c5bc347524f21c42dabac8bfb384b268e596fd2415d3e84d8aecbcf9e26ff55994399cfe97677425066ff4ea18f41c8512fb078f6ec1bfcdd3e WHIRLPOOL e8cd7c4bd4b2d1ec565ac695030fa9c09a65ec05a6d36f0a83ae0ee1a28bf060153954d7f9ef51f7988cb518a32aeac48bd99ab4d5dceba2f9e8f388b8614ace +EBUILD confuse-3.0.ebuild 1176 SHA256 f504af5fb3989a9659ae51e4d571a272e00987f21e30058e9aec524ca07eb58d SHA512 7aa616036d6322c7c26864b9bf983c149cf197ebaae61f55991161c8781df49d001709e8cfb1421924564cde02b753de4416cb67f8875b31fb83c2700b5dd8b5 WHIRLPOOL 174ddc6c5184c167802274b7fe46c74e791b2ed3de9c9fbbcd7100ba30ecdf62a6af01506a2ac3a01fd97f93327b22a2dfc19e5d0ff5d8f17f9132810bb4aba1 MISC ChangeLog 3238 SHA256 7d05dc104c7f19d6c4c9f563594d424a78fe9d7cea3d87db10606010eb42e7a7 SHA512 1e54e90656e60daf0b721272e69c405a21e82a0f735d5f24af407afb5484948bbd2eba50d31232dc5785cab2eb12af0e3c32a02cc965d02a663e34ea63b890c8 WHIRLPOOL 6a9083788ce970508ba86998286745f7f95d5fcc4e4f8a95d9a64d0099fef2efa706c7007fda64e501668c0d922f9d9cc5e45766b8edf80276e9a5cfd35680e4 MISC ChangeLog-2015 6775 SHA256 941579df4145ee3db54980905eba6087cb6f34b929c37f36e91fdf498a92e445 SHA512 c8936a44771fbd0a425257a4bc0b579b630fa870cbd4633dc74d5f532e6ad20b56a7dc94f49810407df14ae0ac26f6c92debce0be02adab75a76416ae733b45a WHIRLPOOL 1675feddf111bef96a1c4abd35e4c570fe14fbf1341f1f00db5cf0cc0eaaa80b15e75df6a00702420918b6f2bf7921b2976c6b4931f77d2c35bbf2d075754e63 MISC metadata.xml 247 SHA256 fb925313d1ae70feaa6db91150f34a2157b48e884e8f47d773640af149e3744b SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a WHIRLPOOL 142b4295733faec48b0ca9eb6d3561799ff743481aabf2b74ecf6d717d972b4961979c7b6bf32b9840cb34e47d22fe2befb9b0ef8ec0d3f28f6416069128d3c7 diff --git a/dev-libs/confuse/confuse-3.0.ebuild b/dev-libs/confuse/confuse-3.0.ebuild index ce0dfc443fe4..a95f4ebe9fdb 100644 --- a/dev-libs/confuse/confuse-3.0.ebuild +++ b/dev-libs/confuse/confuse-3.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar LICENSE="ISC" SLOT="0/1.0.0" -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="nls static-libs" diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest index 0c074d8e106d..2b6218f8cf5e 100644 --- a/dev-libs/elfutils/Manifest +++ b/dev-libs/elfutils/Manifest @@ -1,15 +1,10 @@ AUX elfutils-0.118-PaX-support.patch 954 SHA256 e769e1168dc645ce99655f984f5c19a54d765210cacd098556b6b68743b877fa SHA512 d2b27b1715908ebc68c304a32b29e5bdebede5d4c9819b552617b3e3fd00f21570fa2346ec0e01b9b8028e9139eea629e0e70bee2f509ebfdacd31bbcd3bea0d WHIRLPOOL 47b537a5a01b9a1240b0e922eeef7e5e0e00b04cb474dbb0728849deba4a50c13e6a56b9b5476121771dab25a61641091deefd2cf94bb7cdcf4858f1b6222670 -DIST elfutils-0.163-portability.patch 72818 SHA256 e4e82315dad2efaa4e4476503e7537e01b7c1b1f98a96de4ca1c7fa85f4f1045 SHA512 c657da2c4a37e8dac6fe4b399ef72ff60b6780000721f0617fb1dc0a6d962cb1e609b8e72fa0dc5b2d50db8dd68dcd58096bf2e475f7c5461f1765a4ee4c0d2e WHIRLPOOL 0ff248e4767778351f46c91fd5f189d7d2cfee59ac2afdfd5fee659151b72e33d310440273da0ed6f5611f76f9ec651ff51acffcc0557a0ec111c50b819db091 -DIST elfutils-0.163.tar.bz2 6029307 SHA256 7c774f1eef329309f3b05e730bdac50013155d437518a2ec0e24871d312f2e23 SHA512 80cb37b965e85f6c6b51247f0cb07cde9d9071e7cdde4c028479a609e12dfb196e428fa8743586ce8a46d49dac74073b55bcb812ea6118471c0de07b3dd7f772 WHIRLPOOL 5e2b7881ec96438e0ecb583b77202ccdad6ae7b46f2dcc0b2869119642173bc5da5f26d51bf4464fc9c5c1951f14a4a11bf8dfc6906e6dfd551782c4c9f28cd8 -DIST elfutils-0.164.tar.bz2 6065265 SHA256 9683c025928a12d06b7fe812928aa6235249e22d197d086f7084606a48165900 SHA512 83e0bdf17fff2c480cf5f99fe9d733a8b4f7cde0f9a3eeb4e3c4b4bd221a306e0a03bfd99e097f0085a33bb8b9f73fda10e390e17d30c3f5a1344e781065efce WHIRLPOOL d1de8d928b64e170358343c8984762286d63745c8cbe1375b7cdf07566c44091dd078f5876106c6b829831e630fda9d8db5e28c5c871c98a70eb1cda58596705 -DIST elfutils-0.165.tar.bz2 6481128 SHA256 a7fc9277192caaa5f30b47e8c0518dbcfd8c4a19c6493a63d511d804290ce972 SHA512 89d42a32f1d77d3419473165e1ac15782765ce6ec842d63f03962260806fbfdf16d17b8abec8527d8b125b9195c24a56252070b0c6ae860ffcf0dd74943da32a WHIRLPOOL 7a3ae8304609da902feb606b9eb974c71f664f721ac14fa400474964fe7d40b53232ce7a2d371c14a01c9b34472eae8ead03a16a72ad36a11485892084e93e9e DIST elfutils-0.166.tar.bz2 6496225 SHA256 3c056914c8a438b210be0d790463b960fc79d234c3f05ce707cbff80e94cba30 SHA512 543e8f9fbebbef86c40b1d6dc93da04a8431071aad636b70e7a1b9536450990b237d100d354c29fd0c3605074b7a0621f5bdaab4c2664be42b2912ad283bc614 WHIRLPOOL 4de083bbb397235dd46c2ba6e0cbb615825c13d7e8413015d5ff08d72deae1d9a508c0f6e5f90e27cc709870064bc53a51b2a681f2a9b80e1f658bb7dc475f8d DIST elfutils-0.167.tar.bz2 6456047 SHA256 3f300087c42b6f35591163b48246b4098ce39c4c6f5d55a83023c903c5776553 SHA512 855b27b7b2785265e095a5c28518b9765238bbcdc8aefede11453e9727156b71360a4b0e2634f2c3813d4b632d3be7079b2d952701bf0455a9c2c19f7facdc91 WHIRLPOOL 1eccbdf65e75c36d7e7704e34eb824d8f54aa4d5879c8df174a1121889fd796cd0aaf5e727f07f361da301659f23d7167e5e59e6a039003def0411d0d01a570e -EBUILD elfutils-0.163.ebuild 2399 SHA256 5e134aa0f6b0c69b22b6b6cd48f893ff8da88a218928feb6160f1c859a340b01 SHA512 42b3d15f5bcd78c1cc645d4d69144a77e57474957c44fc76aff63a63d9baf8d53df333d1c3f988ccbf296b549323ebe922125c8e96947004cf638275a4d0bf75 WHIRLPOOL 9fc7d225436453953e4714d8095e20e91324abb9f37fef291c4c523b38bb4c7701c5ddd65ea0546f7b97e49f4006e0c9617683c61ad0da8d1c892e9678967276 -EBUILD elfutils-0.164.ebuild 2240 SHA256 52dfe91bc67ecc673452f171afc9656a46ac5220cb13cd2926dab87fcfafc40d SHA512 bbd5307723b7501a5b8e0ba0936a0876d9c01e6ab8fb946462e757fecb6deac09a054856580f4e6dcc5973c19999d3ef32a023277e7919b5cfbc2929e00ef082 WHIRLPOOL 376d93f7dc4b74582112264245c9bcbeee1af316d080e67beb346aa42ad5e6873eae818c7717559f86d49a6fc9a109a5f828f3548a40a8856431f988fc560125 -EBUILD elfutils-0.165.ebuild 2306 SHA256 50a24ab2970a61d5fd814f7900a130c39e726a60d326512e9868a5e897b96b04 SHA512 9d0b49a981d3ae358b602e13407aace1f252c46876a2d822ab1972e10fdd199b9294a8487cfab2b63e6146e610c2bef46276e50a488f00e358d2886ec1762db7 WHIRLPOOL 18f8769d08356f2c1110630b46117007760528ca34952f1d516471df763075e6108e823f84e62513b83eddc550d885f1d04076038fac5c512e2a72694e6e823b -EBUILD elfutils-0.166.ebuild 2207 SHA256 de681803c7601bef9d17ea7bafd3c6dad69279dca18d682a41d1a9a5b3a474ee SHA512 e066f04e5ee69ec7d498ee11d9d8a7b158d079bd6f7d59a44dfaa37a9fb59c1987884515ee4391e9fb2ad869e9abebbbe84e2653fba10fb68f04f1ded1802605 WHIRLPOOL fa0f23b275898fd686ce6cb6cc22899e4f1e584bc63d262b9834240e8be478797ec05e86dc34d3baa3e00d36566f8d17f4c247fcc7be874e1bc1c497108ca6cc -EBUILD elfutils-0.167.ebuild 2220 SHA256 8d07598abfca7c075a8406c97073ed2efff7206c52abdf251e56a75d9326f979 SHA512 d2a7b1aa8977c0b9e15c1195e606405a3f8cfabe1f0b9d482971dd26665fe6a3148ec8f858f53f55d5e9f91bff22150b0fd0b1bd5618f8440e304b98eef8adbd WHIRLPOOL 5b3fae6b485849b0e069852fb6ac3f8025ccc34fd5261d6c7a5fbec46d22292662b81cbbab313078a65d7a2421c692ea967fdfd37192cac1b02062f085887fad +DIST elfutils-0.168.tar.bz2 6840399 SHA256 b88d07893ba1373c7dd69a7855974706d05377766568a7d9002706d5de72c276 SHA512 c8f2077ffe6877ad9e9d2f553bf0576361799c601d246f53e1d99a6f7046794c5916e1087b97ad1d1e5f59f9debc20384f864d507ef6c4c75a8e767d15d6eb91 WHIRLPOOL 281e6917ad243c4f28dad48801d43c29b503da0198f1cd882b6e378b9016e0843088185a39909db75295484f28b963b711f68b80dc6cc810b3027a2ea5cce556 +EBUILD elfutils-0.166.ebuild 2225 SHA256 6ed04bbc40adff85691fe4140265fc401f8c0bf1ffac8d72dc6f3dc313347943 SHA512 dfcae2806922c1d4f7eb393f523499ea00971953480898a9695fb123de5613139d856379c658afb35354d7c27c53f2f3c3f2a1a3511ff169c5e457266904db0f WHIRLPOOL eb650da05203e4a2db55f197e1c6f3ddb0bbbc490259c01f9bce636443731c9cfaef11ef94377968eebd8416653f74a74f164012f90f80eb0ce6b0f06ce8ebf0 +EBUILD elfutils-0.167.ebuild 2238 SHA256 b74656856076e71b02d386405ce4eb68f4992253dca1c0d940ebf6f5a7781ef2 SHA512 566b621366875f24f2da7715cb01703234fb95b79bfc4cde63d44c61b007069cefcfe7522aabd6a14a774c24ba43640716cf7ac3e8719d0986c9ae23bee116fe WHIRLPOOL 38a5e756424f4360ed6517c31f03ae877daf2e623b9228873c21498e83a3830993d2c4666622f1f75f42d3a1f15bcf4436cde2d62fe47cbb3e6be2f43e921bea +EBUILD elfutils-0.168.ebuild 1761 SHA256 0a7cb70447c0ae736c44a4950dc539eb18261f4ea4a3f1ee468b7007cc8bdf45 SHA512 1a5506a5edd3412c251f2a93794d98b0c50324e93dcf43dc4350232c767c437f887ba18e5008d5035078def6db91d2da9a10a8fe2c5ea3d325f0c63902bc18a1 WHIRLPOOL db1de19d0162f67230c65d12a17b5c56e589406c39a2271264eae7dd697dac76a732220cb5ac2c737227ee2db6de53312c1d77fdf6d76b5354b89eb7b1a96cd8 MISC ChangeLog 7419 SHA256 ff7c10991450fcb447e0298a86f3904ec9c7cd319d3fda3462147e8ab04401da SHA512 128a43b08a06c627db6b93bd9a06406e019d8f8bc4dc5d72ab90fa7ba2cb72bcb657d4e8ad75036ac86f1cb4f3f6c3aca1272a32ed77ac4ec199f8daa092c449 WHIRLPOOL 82059a04e6b34a90a3df4bf6a2e70a50d80e4b159bfcbbbba404adc96c4cc8e49f2d857558534b4b6ec400c9fe57b7021377a1969b6839b3a64739abdc8b01c5 MISC ChangeLog-2015 26517 SHA256 61907666b709962af3b2eaf57d8f4d826b63acd7dbf8900bd252a6705d2694e0 SHA512 78e8c72dedef41246c681629f263abcccfee692f6435c07593a979c83842a6fa9561bc4b39029bb557c23769decf154248ca957b99e54f1fbf0e2f79aba6979a WHIRLPOOL f20236de60045698116307ca83f42ff35eb6fe1fd5c956b9962f4fda07aea53e8352a9cdfb810914fbab626135ac94e24d98496132f8c7b9327d933c32a93323 MISC metadata.xml 536 SHA256 c3a1800d65f3a779757015fa973588785610daa943a0f5781faf854792ef6993 SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac WHIRLPOOL 4f06288344e8654c048b3ed2aaee8353e0f76a1623eb6936564f65954d52247db57903bdc70f50cd7465681887279024bad5ddd6c9d9c4297a17ef758bd1cf43 diff --git a/dev-libs/elfutils/elfutils-0.163.ebuild b/dev-libs/elfutils/elfutils-0.163.ebuild deleted file mode 100644 index efb7a4ec2bcf..000000000000 --- a/dev-libs/elfutils/elfutils-0.163.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils flag-o-matic multilib-minimal - -DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)" -HOMEPAGE="https://fedorahosted.org/elfutils/" -SRC_URI="https://fedorahosted.org/releases/e/l/${PN}/${PV}/${P}.tar.bz2 - https://fedorahosted.org/releases/e/l/${PN}/${PV}/${PN}-portability-${PV}.patch -> ${P}-portability.patch" - -LICENSE="GPL-2-with-exceptions" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" -IUSE="bzip2 lzma nls static-libs test +threads +utils zlib" - -# This pkg does not actually seem to compile currently in a uClibc -# environment (xrealloc errs), but we need to ensure that glibc never -# gets pulled in as a dep since this package does not respect virtual/libc -RDEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) - !dev-libs/libelf - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - >=sys-devel/flex-2.5.4a - sys-devel/m4" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.118-PaX-support.patch - epatch "${DISTDIR}"/${P}-portability.patch - use static-libs || sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in - sed -i 's:-Werror::' */Makefile.in - # some patches touch both configure and configure.ac - find -type f -exec touch -r configure {} + -} - -src_configure() { - use test && append-flags -g #407135 - multilib-minimal_src_configure -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - --disable-werror \ - $(use_enable nls) \ - $(use_enable threads thread-safety) \ - --program-prefix="eu-" \ - $(use_with zlib) \ - $(use_with bzip2 bzlib) \ - $(use_with lzma) -} - -multilib_src_test() { - env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \ - LC_ALL="C" \ - emake check || die -} - -multilib_src_install_all() { - einstalldocs - dodoc NOTES - # These build quick, and are needed for most tests, so don't - # disable their building when the USE flag is disabled. - use utils || rm -rf "${ED}"/usr/bin -} diff --git a/dev-libs/elfutils/elfutils-0.164.ebuild b/dev-libs/elfutils/elfutils-0.164.ebuild deleted file mode 100644 index 06df99aa907b..000000000000 --- a/dev-libs/elfutils/elfutils-0.164.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils flag-o-matic multilib-minimal - -DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)" -HOMEPAGE="https://fedorahosted.org/elfutils/" -SRC_URI="https://fedorahosted.org/releases/e/l/${PN}/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2-with-exceptions" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" -IUSE="bzip2 lzma nls static-libs test +threads +utils zlib" - -# This pkg does not actually seem to compile currently in a uClibc -# environment (xrealloc errs), but we need to ensure that glibc never -# gets pulled in as a dep since this package does not respect virtual/libc -RDEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) - !dev-libs/libelf - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - >=sys-devel/flex-2.5.4a - sys-devel/m4" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.118-PaX-support.patch - use static-libs || sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in - sed -i 's:-Werror::' */Makefile.in - # some patches touch both configure and configure.ac - find -type f -exec touch -r configure {} + -} - -src_configure() { - use test && append-flags -g #407135 - multilib-minimal_src_configure -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable nls) \ - $(use_enable threads thread-safety) \ - --program-prefix="eu-" \ - $(use_with zlib) \ - $(use_with bzip2 bzlib) \ - $(use_with lzma) -} - -multilib_src_test() { - env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \ - LC_ALL="C" \ - emake check || die -} - -multilib_src_install_all() { - einstalldocs - dodoc NOTES - # These build quick, and are needed for most tests, so don't - # disable their building when the USE flag is disabled. - use utils || rm -rf "${ED}"/usr/bin -} diff --git a/dev-libs/elfutils/elfutils-0.166.ebuild b/dev-libs/elfutils/elfutils-0.166.ebuild index 464bf92d94b4..1a73751e276b 100644 --- a/dev-libs/elfutils/elfutils-0.166.ebuild +++ b/dev-libs/elfutils/elfutils-0.166.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for HOMEPAGE="https://fedorahosted.org/elfutils/" SRC_URI="https://fedorahosted.org/releases/e/l/${PN}/${PV}/${P}.tar.bz2" -LICENSE="GPL-2-with-exceptions" +LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="bzip2 lzma nls static-libs test +threads +utils" diff --git a/dev-libs/elfutils/elfutils-0.167.ebuild b/dev-libs/elfutils/elfutils-0.167.ebuild index d15b366b1d23..7c6f9386ab25 100644 --- a/dev-libs/elfutils/elfutils-0.167.ebuild +++ b/dev-libs/elfutils/elfutils-0.167.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for HOMEPAGE="https://fedorahosted.org/elfutils/" SRC_URI="https://fedorahosted.org/releases/e/l/${PN}/${PV}/${P}.tar.bz2" -LICENSE="GPL-2-with-exceptions" +LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="bzip2 lzma nls static-libs test +threads +utils" diff --git a/dev-libs/elfutils/elfutils-0.165.ebuild b/dev-libs/elfutils/elfutils-0.168.ebuild similarity index 68% rename from dev-libs/elfutils/elfutils-0.165.ebuild rename to dev-libs/elfutils/elfutils-0.168.ebuild index 5bf686f9c88a..c8421493747a 100644 --- a/dev-libs/elfutils/elfutils-0.165.ebuild +++ b/dev-libs/elfutils/elfutils-0.168.ebuild @@ -1,34 +1,24 @@ # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI="5" inherit eutils flag-o-matic multilib-minimal DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)" -HOMEPAGE="https://fedorahosted.org/elfutils/" -SRC_URI="https://fedorahosted.org/releases/e/l/${PN}/${PV}/${P}.tar.bz2" +HOMEPAGE="http://elfutils.org/" +SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2" -LICENSE="GPL-2-with-exceptions" +LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="bzip2 lzma nls static-libs test +threads +utils" -# This pkg does not actually seem to compile currently in a uClibc -# environment (xrealloc errs), but we need to ensure that glibc never -# gets pulled in as a dep since this package does not respect virtual/libc RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) - !dev-libs/libelf - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" -# We need to require a newer glibc for its elf.h defs. #571814 + !dev-libs/libelf" DEPEND="${RDEPEND} - !=sys-devel/flex-2.5.4a sys-devel/m4" @@ -37,8 +27,6 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-0.118-PaX-support.patch use static-libs || sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in sed -i 's:-Werror::' */Makefile.in - # some patches touch both configure and configure.ac - find -type f -exec touch -r configure {} + } src_configure() { @@ -59,7 +47,7 @@ multilib_src_configure() { multilib_src_test() { env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \ LC_ALL="C" \ - emake check || die + emake check } multilib_src_install_all() { diff --git a/dev-perl/AnyEvent/AnyEvent-7.120.0.ebuild b/dev-perl/AnyEvent/AnyEvent-7.120.0.ebuild index c25712504761..55d594d8b1bd 100644 --- a/dev-perl/AnyEvent/AnyEvent-7.120.0.ebuild +++ b/dev-perl/AnyEvent/AnyEvent-7.120.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Provides a uniform interface to various event loops" SLOT="0" -KEYWORDS="alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris" +KEYWORDS="alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-solaris" IUSE="" RDEPEND="" diff --git a/dev-perl/AnyEvent/Manifest b/dev-perl/AnyEvent/Manifest index 77a1b4ab995a..8b0adffef4e7 100644 --- a/dev-perl/AnyEvent/Manifest +++ b/dev-perl/AnyEvent/Manifest @@ -1,7 +1,7 @@ DIST AnyEvent-7.07.tar.gz 292938 SHA256 4c4cc8e877bc8812e17aad29ae8d6364066bf2a0d1e4de9de14fb01e02a43106 SHA512 db02fd12aa64f7d253509f701dde5af67b58e43f7df052f8b1e23fc6f45327bec7668ed0ead8407ce72578d2d8544bab4a688f739bcc2fb5aaac3a431aeaeb6c WHIRLPOOL 569fd392192a2718603500cae0ce0bf8a4a31b37e9343259e449f68ac2c14c15711ca82196b2c9069a96697a9d7b2c3195735dfa4c4a3a4835dfec38eec8f172 DIST AnyEvent-7.12.tar.gz 296712 SHA256 7893a7e5d65e6bc34479712235baccb739837c336fb9eb70193141532e95737d SHA512 a508024ee207dd227d81544d0796672587125698034317d6d1e50a22395358fbf62001b17d0e7f3bc7ea4be69b1004f563cdf7097ac67b10a4a43545a9d2273c WHIRLPOOL 9024dcf667e3628905b2f24b8d730fb79d4cebb7dd26e5775ce8a19f62ce355f23aee65526d76e6afea51857b96fd447e099f1ee33102459a9bfd2f2582130c5 DIST AnyEvent-7.13.tar.gz 299596 SHA256 a4103f4def9687b5545b3e6be1f29a5a24b59ff9a817b1afc27fb9bc268d04ad SHA512 7a3b10028641358cb5a7c09c01583ee7a7d7c8d02529a0e4682ff426246f3675a1e82cb46c31d0b7ea1c130c11b4f4f392be2592d961f1c03d66803287ddb089 WHIRLPOOL 4f4448c6f4a30c890b0285d82f41cd429585b58da94ec6543ae275924b8c66a455e2760899f8473d2221c712dc7e059aa219898ec36d51af778fc5ed54603991 -EBUILD AnyEvent-7.120.0.ebuild 440 SHA256 f9254ffd3c5706546e7951dc74bbb92772184fd1328ff5faa7c2c8b3ea908965 SHA512 80072f39b6f1f8032906b26871fd955aa3ba70c0af5344123fba373f25d69bb5a924b7efdfb94c126edaeb7c988497dfbeb02fedaf61547a10c0324fa1c5aab4 WHIRLPOOL 2e0c2807bc40e6fc8bd99849ed5f2f9f2c91fb3ca70051dea425e3168be057ee1e5cffffaf8fb940d4cbc4a879ccefdf71366cfe2f8cc228420f6c5df23b2f42 +EBUILD AnyEvent-7.120.0.ebuild 439 SHA256 5b197469ea7d4e580b03a2756381493b3656092749c8871f284223949f218a01 SHA512 e71e4062615b2d33a38bd6ab2532be2e73855bb513800e66d6b9f91ab888a7d73bb44eeb3acc45ca2c27eba9bd199e0ced615fa4e963b792ee8623eb6b510b54 WHIRLPOOL d1df026a27cfe72c483c0c605f0f376c7a6431dba2fffa0df72c858898bc330b45c5de9871d9d4c659c24e54c3a447be193cca8b3c62e4d5bfb4f23049784ab7 EBUILD AnyEvent-7.130.0.ebuild 443 SHA256 fa04ba5c852895b831a495e882a959f25b698b534a1c7583c8d4e7b1b330e841 SHA512 68fc6c544e4bff091f771a2f6815b099e36d938d80c35b2d3a9dbf3a7f420e5938b10b895a2deebdd2c0612428aaed8c1e42938cedb4771237ebf1856aa2a213 WHIRLPOOL 5a3b5393495e95add2c9fd3d0ca05c4425188ac722f92767d9b433152a9f7ef4563f88b189b9231d2232883fedfe6dbcf13a5e1d5275da1b5282f41390711149 EBUILD AnyEvent-7.80.0.ebuild 351 SHA256 26e6d877e45e51958a0b2fc1c767ce7e8e45267233c155e3419ad5b6b7c5da87 SHA512 468e7e56a07e97bf4e5b7decb5e704fd5f9b6c8677e9f905af98432a866e0b7136f42e154c145b471da8ffa2106a904c29902158e2a5d215e4e5b40a8058e60b WHIRLPOOL c41167bd39dbdfc7a01f823e89ae4aa81c336177299836698e8b25ce50dcf2c05508505da193f58d00eb97367b9cecf91619c1399108ef58086b1b7ced245796 MISC ChangeLog 4233 SHA256 4823bb0c9aa1fbe1b17f13f4126c2d482a7136a14c14d424b429a952f3c34f91 SHA512 664f0262e9d2e25294c754e367f9bb97194190813c27d106459c0be128aa81761ebe735f5c5d1a05a17e1563e9e126d7b37a0ae61079e4fb128c91f221c813d1 WHIRLPOOL 97fadedda691fe8418cd7a429e4210953e4425febe9beece9da6b087a0b18780bbdca4a96cffd9d1a04d241fcd28e2b22f63271b97acbd6d578f216c2115d1d8 diff --git a/dev-perl/Encode-compat/Encode-compat-0.70.0-r1.ebuild b/dev-perl/Encode-compat/Encode-compat-0.70.0-r1.ebuild index d6c9c425fb02..d0cb4ad9f761 100644 --- a/dev-perl/Encode-compat/Encode-compat-0.70.0-r1.ebuild +++ b/dev-perl/Encode-compat/Encode-compat-0.70.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -13,6 +13,7 @@ DESCRIPTION="Encode.pm emulation layer" SLOT="0" KEYWORDS="amd64 ia64 ~ppc sparc x86" IUSE="" +LICENSE="Artistic" RDEPEND="dev-perl/Text-Iconv" DEPEND="${RDEPEND}" diff --git a/dev-perl/Encode-compat/Manifest b/dev-perl/Encode-compat/Manifest index 3d7516c8b5dd..9c23de836fc5 100644 --- a/dev-perl/Encode-compat/Manifest +++ b/dev-perl/Encode-compat/Manifest @@ -1,5 +1,5 @@ DIST Encode-compat-0.07.tar.gz 9070 SHA256 4436c2b168b7e11627a24c54c7e8ce56e25dbf368219b9298d96281d4b463420 SHA512 0722f27933bbceaba9750c655c06bb23cdbf6e5e54160d85ee2e9ae26405e87721a7cd382c3a467d78123827433802fc0f0ee32f269f0fecb667a3194c0565a5 WHIRLPOOL 7c02a5a686b6b35279ea5d27cb750080e23606169ffa2de00edd0543b37e1486f30683b7853d66af50e788aa552b57ece405b4784d12ffd8ee49b1c21912b33c -EBUILD Encode-compat-0.70.0-r1.ebuild 349 SHA256 284854916d93fad205cd3171b8555ca4a1a9e96109d41297dcf7051c38c207d0 SHA512 abc53202fa378c5feb56a684d440867da33d65c051e1ce5fbe01f0851afd5b84e9d6ffd883ef89ab58c22e4805c11b69236d57ea3036bf4427b422ad0093fe29 WHIRLPOOL a813c49c1c74e4d73697b4d11352009a2524e718155625237a132ea3190bcc103317d2972e464e7f1ce01e16839a3953c43b56ee8dc1f968bf205c8bc7968316 +EBUILD Encode-compat-0.70.0-r1.ebuild 368 SHA256 55d28cf06b26be20755ad07d65dbf8c8de137b2d7b8c0a1d41087949480f24d2 SHA512 c704442fc4c589b82b65bcc77b71204198eb231db5ba153c88397cfab7f6dd768a6699047847bad8bf27f920d39fe4a9c6cfe5e390b8c14f095ff23b83ef91ab WHIRLPOOL 8e702143e6fe4fc7770e9e439352fe984edae6470742ca739b44408c0fbd35d95b05b36576ed33ec578d0acf86b05cbebb1cda2e93d9443d36111a01c4649a09 MISC ChangeLog 2453 SHA256 657d879d87afdae1d86963ab0ec2c107ddb0410e07e8063bcab60896d54bd942 SHA512 0add2a64b6d49e8caafdd97169afd4950bae23092d80791f0ab9cdde496db0234aa63c69202577d481e0941435e0ea9bbab82b23da036b3bcba19b39a7ad6bb5 WHIRLPOOL 12363e44fe372ff2c61667744c663d7299fd1954c46e1530aeb80c5d9f5646b4b4e291eefe1744a5ae9932fdf8461a6d04a13e715940c15c652376a6df6c7353 MISC ChangeLog-2015 2207 SHA256 2e060bd0ad1f33a57fd617c13a4a8efe9a34a3ec632bdd6eae2df913141c2bc6 SHA512 c0a47cb1305c2ad9d6bddc886c47d0c2a749439e972bd9b823aea9191dba542415841739adf3894c90d02aab9e8eb5a4a661aa564b4a762b160bb893a1315a9a WHIRLPOOL 44e9652ad0b9a79811283dc2737760659fccb8d26c8ac510cb7995ea9e4bf6cd318be809bc7555c23ca3cfeb3e0a933d949e41e31714da7b8ebd3f0826688980 MISC metadata.xml 718 SHA256 6b75285abe5295cbb25f209fed8a7096921ecfc4cf6dfc32d213f73defe57dff SHA512 464ab15d60b1a3d47c9fe881b08c3b1a4a6d775b385c9d6aad0592daf4664bd3b0a5d1a480084bea71948969943e191a6a083b17e79aea399e850f5f6aac5e4a WHIRLPOOL 9a55f02f8117371b09dfb7f4ae6608b16fcbd73a97dc815f521638db0fa28ec61ba7d7fa6f2b5c9994ad3769be44c83bb4cb1e898dcba48fcc1db0b00128c954 diff --git a/dev-perl/File-DirWalk/File-DirWalk-0.500.0.ebuild b/dev-perl/File-DirWalk/File-DirWalk-0.500.0.ebuild new file mode 100644 index 000000000000..7fc97b6082ea --- /dev/null +++ b/dev-perl/File-DirWalk/File-DirWalk-0.500.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=JENSL +DIST_VERSION=0.5 +inherit perl-module + +DESCRIPTION="File::DirWalk - walk through a directory tree and run own code" + +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86" +IUSE="test" + +RDEPEND=" + >=virtual/perl-Carp-1.80.0 + >=virtual/perl-File-Spec-3.250.100 +" +DEPEND="${RDEPEND} + >=dev-perl/Module-Build-0.360.0 + test? ( + >=dev-perl/Test-Exception-0.270.0 + >=virtual/perl-Test-Simple-0.720.0 + ) +" + +PATCHES=( + "${FILESDIR}/${P}-qw-list.patch" +) diff --git a/dev-perl/File-DirWalk/Manifest b/dev-perl/File-DirWalk/Manifest index fba999f5faa0..4266a4fee1bd 100644 --- a/dev-perl/File-DirWalk/Manifest +++ b/dev-perl/File-DirWalk/Manifest @@ -1,5 +1,8 @@ +AUX File-DirWalk-0.500.0-qw-list.patch 365 SHA256 3199764060254edb3bb17b50d62818c2fc1e1ba5a69141248b8a3bba18e2f735 SHA512 6cebc9473705889d909eb6491d8e14dbbe687d879a96ab5c8e31efe0d2337760e1562a3daa3fca47ac251ef86dcbca5c41685f19a6872d28527f83b4bb38b6bd WHIRLPOOL dcebd27d6fe06b62f344cfdbbffda0426576971fdf18b945311d1c49d553895c9f8538969ba3cf40ce82afd2100df4f888a13df7a59dea3cc20427ce80d6721c DIST File-DirWalk-0.4.tar.gz 5864 SHA256 f5fcd1c043c78ad726b4d17b3fa04a3a33700829d800432708892da5a7f427ff SHA512 f86fc39afcebbb359920471b420446cfe478057242eba412c8b9675f4fc01d10293706037bd6e6a3b9733abf06e1c6ed46250c777d5c487ce9a5a00e6a8bf613 WHIRLPOOL 86e65dbd8b2a2d519033109e41e1be79fa77356194fefa27652866ee1bfc2f0061e61d57412813ad07d1c5d4741325e1441144a0edf08f2efb116d23aba4c745 +DIST File-DirWalk-0.5.tar.gz 16649 SHA256 0ff9658579497aa37796daf0179e2e4ad581ee6b8b3628e000b548dc3a2224db SHA512 7f5329725035b7ae70ead89c25e01d026a16a30a02919570c533f22261791d511577e100684cc3099698cbba4e5809f0edba3520f6d70d007450ab7a0dafad8f WHIRLPOOL fcdd696fad941f9aeac9ae5324a13384ca891d1dadcb2307779914d594736bceda5cc3f897c6052e63da0bfc9976e5068f72ad9a483f2b400d03a0f9723937c6 EBUILD File-DirWalk-0.400.0-r1.ebuild 334 SHA256 408aea4e5615a3c198069475fcc9c195ccbee804fb1d6990a4a200470d63a3a4 SHA512 50c0daabd90d14e6298b33ca254171a9e5f8c2e575338c60a85cf281aa261f215bc1a268b031f0ede4d970cc88d89a244f9a2cd2b15ad3967a43a15cb9d8c4c6 WHIRLPOOL cc740508bb747a1dba3a44b55c70fe48a226dda42aa2f1a2e8e49104dc6bd109ef22d1af3c7e8d7fdf74d347e5c39febd1eb4bc47538ba90fa42e3e67ffce765 +EBUILD File-DirWalk-0.500.0.ebuild 588 SHA256 763aae9fd137a18a3639c9a8ad2ca3911dbc27bd468cf715b17d3e1994ced85c SHA512 57ce3acc75d75e0745bfbe2a34c7b390599464af5853d4a484b694665e2a56fd0ebd517d6b6925a137f42340cf3f401e7d88612fbaf81382cbc1b62c9e06b992 WHIRLPOOL 0fc9e670430af10e4db0c967447f1b9b81d3c8493b39a5d314d9c5655dda45a6e48b4f506123f64046e589fa449bb4e36071383e997f42c07d297ac872d5985a MISC ChangeLog 2452 SHA256 38e8f31c7255c8dc16bedca7d9ac06b4576dd09c621ed006498c421b92b66f0a SHA512 e4a69f62e27bbe00e7511cf8dbb7c939c908707d14cb05b5617276219a9429b7f6f17059a6c9ec97d680a27b56d73a13d64fa10d6a42702239513bb29ddde28c WHIRLPOOL 1425f51ef2763b8a9a9b12e76d824c2a456e7335ef60725cbed43470f459d16293d30a1b5e89cdf406e0b67a843a58924917c30d897195a725f879c03d5458b8 MISC ChangeLog-2015 3692 SHA256 20444e0d02ce09f1f297decdbdf41fc47beccf241ac01ab5a36a517c79125205 SHA512 95445b0cea015a3280e6c3e95b382263c22109790da7ae47f117ef858db46aad44b97c602ee6c716251801cc12ffd7cbed10589b89f0b0624a70366e5c2e5285 WHIRLPOOL 8640a9bba94feb722624812fe704139a9179e689dc26359e29bcbd4e72635fd3bbc6fe8aa64f9d61593c6b402cfcdc6b768259e291900678761f649924108afc MISC metadata.xml 396 SHA256 2882de19bc1cd5e7d771183ff1dad09891c7de07a0ad59c3eefbcfc0812a4c28 SHA512 ed77d48f7bb0f1c71accdca083b56bbdd391d8b83a67bf2fc7714d4edf00a0fc892b38204887629b16e3d645e997aa1884035c48c19ae3d242950626924f6db2 WHIRLPOOL ef27a0b11431566e54a36084d0d732d77c5926620ebc39b920e0ff4f9b30443bdcb65aa42ed43e726cbec790e6b86b97d32a0ec503cb4ca705c0ce3d25c9ebc8 diff --git a/dev-perl/File-DirWalk/files/File-DirWalk-0.500.0-qw-list.patch b/dev-perl/File-DirWalk/files/File-DirWalk-0.500.0-qw-list.patch new file mode 100644 index 000000000000..d78c1a198245 --- /dev/null +++ b/dev-perl/File-DirWalk/files/File-DirWalk-0.500.0-qw-list.patch @@ -0,0 +1,12 @@ +diff -ruN File-DirWalk-0.5.orig/t/2.t File-DirWalk-0.5/t/2.t +--- File-DirWalk-0.5.orig/t/2.t 2013-03-10 18:13:51.000000000 +0100 ++++ File-DirWalk-0.5/t/2.t 2016-12-28 12:42:38.523599947 +0100 +@@ -9,7 +9,7 @@ + ok(-e "t/"); + ok(-d "t/"); + +-foreach my $f qw(1.t 2.t 3.t 4.t) { ++foreach my $f (qw(1.t 2.t 3.t 4.t)) { + $dw = new File::DirWalk(); + $dw->setDepth(1); + diff --git a/dev-perl/Text-CSV_XS/Manifest b/dev-perl/Text-CSV_XS/Manifest index a34e56f0cb2a..7e41d78ed591 100644 --- a/dev-perl/Text-CSV_XS/Manifest +++ b/dev-perl/Text-CSV_XS/Manifest @@ -2,7 +2,7 @@ DIST Text-CSV_XS-0.95.tgz 121627 SHA256 0cf43f442e086bc10ec6e4d7f277fa30f8f14591 DIST Text-CSV_XS-1.23.tgz 159271 SHA256 5714e1c275e7715aee44f820f8ca26c976fbb563668de7eba42a4419a05a4b5a SHA512 d49abfa55f4be0613bf0ff08df5f6e3d93c4281900640476e8a6bc584fb8c31d8cd3c3d80d850bb39b455e4d63397a7e378267bbd580626f301e4552083f30c3 WHIRLPOOL 94c0badd92a9d2e78d26943320f04c4512f10a6c4a27b6948571dbc00350da98a2fa29b347b7c8d3a2288cff1e2f7ff1fc0bd358ec38abee2d230c7db3042662 DIST Text-CSV_XS-1.26.tgz 163706 SHA256 e0cdb04b32a64632b4c99927b31100578a75c53d0ab2a5bc1686151706e38662 SHA512 f3e2841638e212f4858b230159ee2a246732d9f5739ce2adbd9778a630852946a9da11c0f270828b880ac6e160611817ffbc0f59f42f20ed64bc82255cdeed7b WHIRLPOOL e94d98953833e383c61d471cc50629ecd5eedab70f945beb2b006b41b0be269d87e6a3de6d68e498ce79c02871b3bf79558541cf78a4736cc99edb11527ce00c EBUILD Text-CSV_XS-0.950.0.ebuild 656 SHA256 6aee12f2a218e14028dae29690e4a181badc7f0c871da8d98f244de018d56fc1 SHA512 6b84830949d748f49d8c5ea6fddd151d2b42e5af4071aa085ca8a251c0858563cbb4236f3386a84dee43d6773f41e9089e2d1c52372ec5a1c9e2e8f07aa486ce WHIRLPOOL d10a034c87789b39361b5de79658d1aa869bf07ab223bb8538b462a1e68b65a77d447fb3a0d2ca7cd736ae69170d516210e68383f69a2c5eeefa94251855234c -EBUILD Text-CSV_XS-1.230.0.ebuild 716 SHA256 4d3f1ae3a4b79ed922edd279251ec19251c96d8cc80e6d6850766d12ace544fe SHA512 3dd0f6ca7c594bd8bc087585d11617b25cc8247b2872964fcbc32b8c57df1e8a74e1288cb6bbf79e1f43837f026cbc9e1d8c3b36df079c3ae79edb059a260123 WHIRLPOOL 9bb01e3df525e34bf2999f1452776d0e67d6ceb9baf7dbef776205d869b56ea8a38ab241c0b272629b1d4240033d2b0ff064342249d0dcde77957d201fec4d1f +EBUILD Text-CSV_XS-1.230.0.ebuild 715 SHA256 302961617967c7e0d8904458d3eecf1ffdd5efc0e2838d2d70e9364091ee70bf SHA512 5cccf262eaeed53d4445941832efab691a9f6772fa2d4fa1a1bb5402d9d9356dd1009a046831c4da2062140db503df66dc0265c6697ed18f6b04754fb6f78a5d WHIRLPOOL d09df5e1517e554a661143a04a0ef543edd91a21fc3de1c629db960dd2ec2a499c67eaa5860b1b7c49906e742ddf72ff6f05c946372c127c05466bc2d9053ee6 EBUILD Text-CSV_XS-1.260.0.ebuild 742 SHA256 fcfd4595c9b976cde93148bf9dd0ed326aebbbbb98734fd43d654ee6271e4da1 SHA512 5657e8b76e2d03685b8c05ade35b9a2fad8e7de0d8625f42581ab16df3e30321d9cb986074ae0bffd926ccd426b6a0c6846db78f06e0148155fb5244c0e38ecf WHIRLPOOL de1974bd8d76bfcbfd5b96c1424c406e188e415ccd3cb6828be68b4700ab90dc42fc5ccdd7eb48bcc122bae73a451f7cbcfd3bc087a441d64cbeb0b78efd4e4d MISC ChangeLog 4824 SHA256 e81564e7ef0c3ac15b1171ee3594d2d44debaf52d2403d0abd7cc4fada413d4d SHA512 b1c70487973413b9cd201d90999ce1134d023b2117df5f788303063321ac73097cb09979017fca1d7524cf12fd35b1764d77007dfa3753d35ce863c6fb30e194 WHIRLPOOL 6d0d75160bf4f046085eac477645822773d56108bbde321e923ef5f7f9016f4af14d7f00cb7a47a6bf8e3ecc252f6f22fb8325d2c163d5527775f131ba91b3b7 MISC ChangeLog-2015 18250 SHA256 ed3822c41e2fbec6f1b51d44abd75115e1806f88c5a2352e3f7a468c23b22b06 SHA512 1606c434cd7e5f19cacc0d34c658cae2574a5939b74fdfc72187506c0c8d1e290f6d20b5cd64674dc4cd7cfc94aabcdee3e8a9bf31055f274eaf163f13ce5ce7 WHIRLPOOL bde1fae563f533fed40fdd05352272a479a2b1fec18ba70c015eacdeb24a7b1d7d0ebcec1d647327ebd7330958f8a0f2af992155bcb2facd599e5e81115ee487 diff --git a/dev-perl/Text-CSV_XS/Text-CSV_XS-1.230.0.ebuild b/dev-perl/Text-CSV_XS/Text-CSV_XS-1.230.0.ebuild index a86d29c0c6c4..ded2d027c5c0 100644 --- a/dev-perl/Text-CSV_XS/Text-CSV_XS-1.230.0.ebuild +++ b/dev-perl/Text-CSV_XS/Text-CSV_XS-1.230.0.ebuild @@ -13,7 +13,7 @@ inherit perl-module DESCRIPTION="Comma-separated values manipulation routines" SLOT="0" -KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="test" RDEPEND=" diff --git a/dev-perl/Text-Wrapper/Manifest b/dev-perl/Text-Wrapper/Manifest index 10e3335321e3..f349466b0df6 100644 --- a/dev-perl/Text-Wrapper/Manifest +++ b/dev-perl/Text-Wrapper/Manifest @@ -1,6 +1,6 @@ DIST Text-Wrapper-1.04.tar.gz 18239 SHA256 084d08e48fa37c8e75c9a724e55f7415e54ffa8ec63918ef7aec3494352d571b SHA512 e3bd9db890bb93136cf7ea8662b50052fee63dc02d47f830628395fa57b589c02ff4e6af70238fcffb9bfb77da02168a46e828e1a61e6b26ed8c660099d72b13 WHIRLPOOL a3a6ed25be9badde720c3949a5c90ab6ed22ec05849f45b22458c97be6b7ba5282d5530d2506ebc71a33b4c64fcf29b57f99edc79854790d248733decf7100a9 DIST Text-Wrapper-1.05.tar.gz 18609 SHA256 64268e15983a9df47e1d9199a491f394e89f542e54afb33f4b78f3f318e09ab9 SHA512 8efd94ad7880069a37205a4b6e38d4b03ce8d83869994916abb831498e1e3d1bc23df39e8546b5b0953db7e0c8e7ef29aa237f8cf20452dc9e4263e49e31dad9 WHIRLPOOL b1e2c25f9f721aa00c05edc6eee3a19bc434b5564dfec1608e1ef49b578e66c692b66c47fb33e969f2a442927dc0f1df4f869e925ade2272ae54862634eab653 EBUILD Text-Wrapper-1.40.0-r1.ebuild 301 SHA256 d0423b9b5415803a2dfcd790c2014174d267508fcece629a2cecf769c29ba739 SHA512 87c090bc986ede22122ff0e95b6add063bf845e97f3dca00e0a734a09471478d27fc4442d5228f60579ad81fa322766a3bfeb1c133f1e5de606bf046fa7fbc62 WHIRLPOOL 9ebf33f030998c3fe3f63ec991d71b4225060eaa6f0e8ae85a6b8728e546314671f7560b9d2907d8824df4a617b16b743ff7def54b8e66df5d6698204ac50064 -EBUILD Text-Wrapper-1.50.0.ebuild 507 SHA256 9707e05be6c9565c05d68af05a64cb933c8dd74725628066d6874f54718aaf36 SHA512 9f4a767c072ad025b424c6575d5add4e6495cc911b9a4392c61a97bd3da45b6bc8d9b3c2a26f3b50df092af62fc1900cc62a909a105f3bfb8a510be6c68d822c WHIRLPOOL b2d7783ddab31d3a98f65ef239cc7d00dc0d097439e01440de25e0401a9dcff481beba5818fcc206036fc24765f848e7ab447f6d5438c7ba21befb363c22700f +EBUILD Text-Wrapper-1.50.0.ebuild 506 SHA256 ae85384e1442ccefbf400f668281c3619a583a1ed4c37d6770b32a0f789a5cfa SHA512 3ba2824c12ae7b3b0737be7846c8ace3b996370927bb42359f8d601a842392062ad92bc7537fd7727f73ca2b312ee65d4e0dcf7f33d4151323a966f9634d5852 WHIRLPOOL a86a713bb6e4e7010ae0a6e74a9e3a5909b82fac63c0021b8731f033bf942f395830a3a285ee7ea19696bf8e45551a00dede80489e70c44ef2860b9dd812c630 MISC ChangeLog 1234 SHA256 916a679598300349e39bb648be05b120ca3572f8b061b34b564ecfbf51fefbad SHA512 03e4d287252f29bcb7e56e79408c3fcefbad2f4d8352487ec1e7cbede2db12358cb323c5bc253599e18403d4c68dd0209925ba99f9ccc4dd557cd180cd5458f9 WHIRLPOOL c4355eff50ea3c97a5d84cee227b87124010acb14708285a1f5af2ce2231bc56b242e5fba9d539ead18c397f5641528ddf5d13c415e8e173ade159673ce0dd2f MISC metadata.xml 396 SHA256 4040f36dca707b17fd0363808f5e06c383b85d1385b0c7290ea0550be784c0da SHA512 defdf164ed438d5add78497415c443bb0f5b14a9909dffab2f97bbb3dbfeb286348af8539bb254a35225791c9898bc7e407f968bb878c40ec67a6ed9b42dc7e1 WHIRLPOOL f931eb71277994318a26cccf9b4e254236bb7bf167d82328f12df3c53bde8f7e768c25ebae1c14b360a8430f6261396b5c842b1d571432f6a5f9107f209f43ff diff --git a/dev-perl/Text-Wrapper/Text-Wrapper-1.50.0.ebuild b/dev-perl/Text-Wrapper/Text-Wrapper-1.50.0.ebuild index 5c4befa85587..aab68ef54dff 100644 --- a/dev-perl/Text-Wrapper/Text-Wrapper-1.50.0.ebuild +++ b/dev-perl/Text-Wrapper/Text-Wrapper-1.50.0.ebuild @@ -12,7 +12,7 @@ inherit perl-module DESCRIPTION="Word wrap text by breaking long lines" SLOT="0" -KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86" IUSE="test minimal" RDEPEND="virtual/perl-Carp" diff --git a/dev-perl/Tie-Cache/Manifest b/dev-perl/Tie-Cache/Manifest index b2ead4edf818..395ce338f12f 100644 --- a/dev-perl/Tie-Cache/Manifest +++ b/dev-perl/Tie-Cache/Manifest @@ -1,7 +1,7 @@ DIST Tie-Cache-0.19.tar.gz 11433 SHA256 29065e9327d4d389131242bdd787c46126c5cc0c6656fdbc0454950e4660561b SHA512 c72b12a4eb3a6d692ccc159090483a9ed79e6fb2e6326459ca9d20fdd99c791ce594c0fef367f81f4a160af283ac9eeba6591d340cea26453147f3c9a5f66677 WHIRLPOOL 1500259ec738150e304d7703f537a24a5ba563ee68f990a55f344aee92cc4f730ebf2b3aea74c78825d0157f22bdecd411bc3c1bafd2bf17bda31aa53c7ebde3 DIST Tie-Cache-0.21.tar.gz 11200 SHA256 d7eaa22f35a21b226f2bfd17782cd4226a584a2364659cd7bf8b24fe37f6fe89 SHA512 f2d5672c058db0513b1956e077d68c8641b518e3e676fa3f05508a21989284c7a5059a110c0e12235eefd2f7bf358b531a90ba89b60b7ae61d04f8ed24347de9 WHIRLPOOL e89b72d93a31c455c623a421384e8834e3165dd8d810249d25ed7d8dbabf56899b8778edbfc5d773a820e0becfa2b6a8261119a8dad97e8933c197287a34ddc4 EBUILD Tie-Cache-0.190.0-r1.ebuild 298 SHA256 40ec31cd86df1301d0d789cc3e261b37c0efb05e202583450f11fbec74aa76bf SHA512 3707d4c80c36cd11d55f8908f9b92280b6b34a8f2acea4e93f626de7de3409ec8e1763c8fcec9e249c7112fb369bf631d102ad4012809d57e46082c63ddefff0 WHIRLPOOL 805f8ad8cb968ca64e3ffda76a3a02068f3e88928b50ab23ab959ce569f7c04eddc8cac2f3606a1cf930c782b106cecabfe4b5cda4cc2ea3ee849fc27ffdebbc -EBUILD Tie-Cache-0.210.0.ebuild 299 SHA256 f6da2d1bd356f5f295a175a776692d14895af0ee9d1d8c909d6242447f808ead SHA512 6150f2be8b747ca0e0762818b4f6344eba6fbf42ab217b4db0bb682c69d4b6ece1eb597860656de3d36f4cead7f3c025e4847a7174a5e9de16c8c8b6c69f1f8e WHIRLPOOL 40364b72caf836eec86717442f72fc4ec31781b0bfefb692ac2b511a066ac4d2f2011260242e5501efc1255f315d0cd2b6db9b4615017d5314ee3a77496db0f0 +EBUILD Tie-Cache-0.210.0.ebuild 298 SHA256 1fc13796bce370e9e8a510eae3d08abd0a0811e985c73ceba265700ad4532788 SHA512 d46ff01da2d60b234c5fa73279df3ae7ae7fee07543f8a2dcd738bee9a4b438e416d4de2b6fa53c3c4b15a31819001ed0c9b703ec4548c4383ddb48cf2384ea5 WHIRLPOOL b0789aa17494235275fc6496c14098f4af59970581a25dde049c10a793206bb8d13826a63bdf826390734231a933488381ed8aa1dee1ffc0ff72bf7ebbda50c2 MISC ChangeLog 2503 SHA256 fec999e4bf576754b10feb472008efe3a3f6a5102a103c0ee96312a2ae308355 SHA512 6f289e804011e4ff09b3e1239b4684372cb057274c181c458e1b50b25d9f39dfdc8d334157b3dfbd48a5d902f976b3da656e967050839ee30b761e9d83642fd3 WHIRLPOOL 86911499c65fb1697fed1691ebc21d34928aed31c958ee387dde2b5e9b199ebe410f065b01a45da5486f88ebe97dbf79f0a3baa34e1aa0d9be658c51bf1850c8 MISC ChangeLog-2015 2096 SHA256 dfac2d426c810575bf7e2dcdd76fdddd32b5a66c32b516c29a872be6dcd0df3e SHA512 829c4493a869fc89c5a2d5bb96444c9ccd29e58628e6b76297bc10f9bf975d1270db29890badfaf341acda350833c4926655a7f5e4c54c8ce0e55ae15fbef906 WHIRLPOOL cdccea3ff1eebd2662a7ae2113c0ad1c2ec82eeb731f11d016778c53eb4933e0a66e22642a7c899af8228c1a5a5b40aa7c91327f657ec3c3a17ca31baf672696 MISC metadata.xml 390 SHA256 32b48654c59a4f3e8c947ff663c6e9ff9392ff49b8e10f20758dc3fcbdcab5c3 SHA512 b7a4cfbd3f692b9afcf409a2b39fee787029e9c30f19840a6a9a4d747436aff1eb4e9595c86a7fc2a2b5113fd7ca98b5e559b209bfa526058ea6c189f8c0327b WHIRLPOOL 5dba9fa7d366acaaa41b43a3a26a32358476b83f4a4cffdef1a241124a56b24925077d314e57d0182d2c9247d200078a0f63835ad238264f70f975ad059b7cbc diff --git a/dev-perl/Tie-Cache/Tie-Cache-0.210.0.ebuild b/dev-perl/Tie-Cache/Tie-Cache-0.210.0.ebuild index ad8d7ebae0f3..8cb77dd17893 100644 --- a/dev-perl/Tie-Cache/Tie-Cache-0.210.0.ebuild +++ b/dev-perl/Tie-Cache/Tie-Cache-0.210.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -11,5 +11,5 @@ inherit perl-module DESCRIPTION="In memory size limited LRU cache" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86" IUSE="" diff --git a/dev-perl/Time-ParseDate/Manifest b/dev-perl/Time-ParseDate/Manifest index 1cfa41002b57..2b0e1f310858 100644 --- a/dev-perl/Time-ParseDate/Manifest +++ b/dev-perl/Time-ParseDate/Manifest @@ -1,6 +1,6 @@ DIST Time-ParseDate-2015.103.tar.gz 26644 SHA256 2c1a06235bf811813caac9eaa9daa71af758667cdf7b082cb59863220fcaeed1 SHA512 3c5bf09198289a889e606c806fbb225e729fa1a0af6d04056b75c4c61110e6135fce0eccd8c58a2f1db364d7d624b417f4960bdfa376d2fb9b16ecf090879fd0 WHIRLPOOL 00890627bae923d24584c1f10174889e153351b4a9c9284f035d0c4d0f00d2e41aadbdaad378767770567ba4bd2e50e707582b6c21f74cb672a182e92c18e6cf DIST Time-modules-2011.0517.tar.gz 25621 SHA256 8edffdc9ca55ccb19690ed45e8e224083904f0426650d6dc460dcdbc50a265ee SHA512 5cb9be993db47bf5c37fbe6a473d77142af16d9a6bac8b82388d536296b72ccb54c8fef13ff436f34892de331617bcca9921dcde614e344f0fef314f78c5d085 WHIRLPOOL 25ece948c7e4d59083158e2ac5f67fcd3a66b98d2196059c790a30c9d1edbfe23fe4b66f482a30661e9a6d508db5b98bc0e99fefa30854d1e300676b06f22d5c EBUILD Time-ParseDate-2011.51.700-r1.ebuild 377 SHA256 185202007a3ff6eaaa340e8b1486438205698714d942b0185dc4718e96916f05 SHA512 68f6114862807f4b2928f0f1605606b1fd06c3794c5ca949209df2a4b0ad55f7a123c6bdce35652fce63e4b79da2380b4542c8dff2a110cf2811a570400586fb WHIRLPOOL 40f4c70be3ba03a14bc5cc1d5c5de49b961ebe309e9b3c5315476ebb05a04b2b49d87ee1f5eb811ea561408cbe3345625b4415e14ed64c53bb383c1b81927a98 -EBUILD Time-ParseDate-2015.103.0.ebuild 434 SHA256 93702242cdb6787b2be18e05746f6088ef0f66d3fff96abc094ac3682a3a8f88 SHA512 de3dfaf7805593bfbe7fd1102837907585dc9f47678659c6712b892ec9d9ffd164ff3fd8ef4a16fbc8ade17a78cd011b0da367b4576d7a299fa6e6e14a52054c WHIRLPOOL e68b97219160e183d927c1b8f0778dec70491920f4a976b7f6919353f0f7e0f3d987dc5c8ca78d1a8a357149de9704cd7f0ce951db14dfaf2374fa990ef0042f +EBUILD Time-ParseDate-2015.103.0.ebuild 431 SHA256 caea289b9cd1e5b3c05a1cabcda2767701e5af2e5c9c6c00559c563084be570b SHA512 84989bfd405ede72a7af64aa1d90f9f5a659bb472d6bcffe6224db78ca19bfe9fdb11b6edbe3687fca3615a1ab61541866bb41421bc2e84c0deaa3ef711e3e10 WHIRLPOOL 17d6e4692a22e00b1855f5873c5238259023e619ebc5cbe3e9a4b15cacb14f3f7f690e81fa7073ab3db0b4a6f04cbf176335affe8339a53b5455638dddd5ece9 MISC ChangeLog 1596 SHA256 b3a474591c4cbae3acebb84391b513b9cdcc53b3bdbe6f52fbd0d3eab5391c2f SHA512 87434fdbb1c143d046631fbf3f6e96d6d74d0b27356e5559dce735ae06b5da937161147439896d693420c2e64e11b5e390ef1ab50e3f3fb844d699e7dede3c40 WHIRLPOOL e9bbaa88431a98aeae7058d1d706bd19213dea24e8f8f5693a3808f044ba9f708c4faf755db3ade2eed5cfa93d3b1242397c3bd11a401d8357dff39e5fd7ef3f MISC metadata.xml 645 SHA256 0f3a339b1fe4024a528c5b26f46c722a77f0e394e6d6997030c914970475c98e SHA512 6c15b04c4a6e67ba4c45e73c9019a5d4a4f6051370c2df9057a93f93ae5eccc1de7456ea41413d6f2497a805bfc915bc27dd1ba955cf870d6501790a60cd8433 WHIRLPOOL 612d2bfb94530cbde928bb4c7c8de70c673dad6d4db65ad1efbca637e085a994d039eef8360a9cf271665a9b9d9ad023772fd0f713356529b75b7fd12c15edf6 diff --git a/dev-perl/Time-ParseDate/Time-ParseDate-2015.103.0.ebuild b/dev-perl/Time-ParseDate/Time-ParseDate-2015.103.0.ebuild index 84a63d5fc5c4..57d67e7a665a 100644 --- a/dev-perl/Time-ParseDate/Time-ParseDate-2015.103.0.ebuild +++ b/dev-perl/Time-ParseDate/Time-ParseDate-2015.103.0.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="A Date/Time Parsing Perl Module" LICENSE="Time-modules public-domain" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="test" RDEPEND="" diff --git a/dev-perl/Time-Period/Manifest b/dev-perl/Time-Period/Manifest index 70804817df9e..ab0bef3650a8 100644 --- a/dev-perl/Time-Period/Manifest +++ b/dev-perl/Time-Period/Manifest @@ -1,6 +1,6 @@ DIST Time-Period-1.24.tar.gz 18279 SHA256 d78157fced53a9ea3044033e2a1414ea52309bbdba110d94509cb7342bedf2af SHA512 4ee1440e22e271c73779e5228472c9430302a0c775dc8e6d6020b419415cfd126ec359a0b739ec3456af6eef1dd820572a1f451c2ac15a5385257bb9baddf165 WHIRLPOOL 50651eae84b8c17e5ca63872a9bff59826955d94212e90688ef25ec841e818b2647660e1f3e4f8a6237bc5be6951cdc7b5062a54cc0d71781d95d7efe9b63eee DIST Time-Period-1.25.tar.gz 18393 SHA256 d07fa580529beac6a9c8274c6bf220b4c3aade685df65c1669d53339bf6ef1e8 SHA512 528dc8c31692da61170362df8d32c81d4811edfa8388752c82452e57f2349f9345b7ee4611c4cf48bfe7aae19cdad50513f9ce6347768be61970c507c0c0e98d WHIRLPOOL 58f28ffbacc16f3f942592814a33996add8df5863fda158d4a11a33597e8e8dc9dd52fab12f6974fc6317bc5b787f2c1ca76cc7d658d3423a61d60ab44354be8 EBUILD Time-Period-1.240.0-r1.ebuild 278 SHA256 d4ff5b28854167846aafe0ad4fa2146749d357decc7b9aa7a97b867ebcfd1832 SHA512 3c91d88b50d537bd7bf785d9111c7a4245a8c2a71a2a377abeb888f8b372df8b6eb1c90aec15f0ccc6bf6d15d87cb1dd3c43a0d6e0b3bf95b05e1defe8033c4b WHIRLPOOL 0cd7680da7ddad7b4fd434ac0ec00ceff9886c32aa8a9b8cdca101d4e45223ed8e2b7196104f682d782f7a4c80c0a2cacebdb342831bd7ead9f7222c3190314b -EBUILD Time-Period-1.250.0.ebuild 280 SHA256 738945e16fc0a778c115a447bbe083fd5eeeda73fc4874e7f5a45d6ac6dd63af SHA512 9a3274463137fb1c03a7dea3493bf58656954c8a3a3cfc0735f3243089c2f2ca493d4229cf45160126033078f61eedf53b5c75f9148b29117fd6d2a7eb781f59 WHIRLPOOL 69f66de6c02abc13600205fd6a85e37171e8bd0e120e59b77c0341525c2ca8de027d5275d1ddb9ee392a99540621f77a9aa9fe9f4658d054e9fae616ba5ba211 +EBUILD Time-Period-1.250.0.ebuild 278 SHA256 d591fc0be84ccf380b0d9d52422dea6b2ebe3351636e6c15d8841fab9657a6b7 SHA512 1b1c3044cd413e4fc4b5568ff83423d4658485bbf6006a06ddc97c369f85a99aebda63ba16fe1822ca85e4e4e9b279297e3d757a67379a751c89f30759e03a04 WHIRLPOOL 6fec6399a689aa5969334bfd485a01f64600966d9509ad45676335c08ec6710a7795de9551b66df7290b20c79fff391ca2fe2fdbb6d4f3801684cc75cfab2b5e MISC ChangeLog 705 SHA256 cd5ab1b15a85b73be45627ef1e4b075faa8c08916c31447565cfea2238d62c19 SHA512 5f58aa33e776ae427b858ddcd37adee9bf1ce2d394be7b12aadc1408c98e090b5b859597b15df7f84cf52edbdb6e434a40da297079c43a3714b894689fb1e5f2 WHIRLPOOL 778ca603c04265bab553070b20e52e71f360f19c00dbce085a421196fd3368d7ac64189f9ea51627f959c4e216337db148926ded4b9cfba8b556871f252f8f13 MISC metadata.xml 394 SHA256 fc72d64c8b3370c38e88cb41eb2bf99f0a24d22ccbd69144eb158283d4306cd0 SHA512 a4a235cdbc7b06c27578da20ad9919ba87fa1156b5cae12aa727b72bc39f71e4cceecc28171b1f8f7455cce273d53df8e81e3e237dfc1bca967c7ddeb7beb6da WHIRLPOOL a232c1ffb00d1e8294daf7cc895f20bd89fdce6f3c433c85edd1997c7e833e613ce8e7d3a5ffd2ce6de12735902ea91377672808a4424730eeea0b1341cbfe1b diff --git a/dev-perl/Time-Period/Time-Period-1.250.0.ebuild b/dev-perl/Time-Period/Time-Period-1.250.0.ebuild index 8999f6fac3d0..1dcee67b2b04 100644 --- a/dev-perl/Time-Period/Time-Period-1.250.0.ebuild +++ b/dev-perl/Time-Period/Time-Period-1.250.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Time period Perl module" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="" SRC_TEST=do diff --git a/dev-perl/Tree-Simple/Manifest b/dev-perl/Tree-Simple/Manifest index 7f19130f7170..d1e1ebb41158 100644 --- a/dev-perl/Tree-Simple/Manifest +++ b/dev-perl/Tree-Simple/Manifest @@ -2,7 +2,7 @@ DIST Tree-Simple-1.18.tar.gz 32851 SHA256 cfbcdf0e02fb94134e1308ef5c3feb4ca4d4ff DIST Tree-Simple-1.27.tgz 46811 SHA256 ec3f9447744172c798a2191276c8ab2f4296f51e3b4e3fd48fa242e8509c566c SHA512 61cc1b7350adbae47fdd23693f212b700363e388e650fbb1e740f6ca615d6b61ac71e2283ee96fb68987bc8f3f295948edd9a981fd45f87e1a68fa92edfd3df1 WHIRLPOOL 3938373603f119fc0b4d160b144ddb01be382c4f246e3281e7fa9d3d1f14ce064c3f22bed4e84590cc3304318809f79122f134d6481fb81ea3ef9339b5cc366e DIST Tree-Simple-1.29.tgz 47322 SHA256 695e693587241d56d6b5a6e1477f548bcf71a0b0e4bf14b06ef2965e499bfe2c SHA512 d6ed79878bf9e8cb4bf82a85dd4d11c70968be53b08d73905d49fff70ec21ca53c604df1e139c0304763e592e42db831c411d03dc8cd1bbb2834cf037088b746 WHIRLPOOL a87fac94e3437b075d97db8bebfcd19b640117c11040434cdc7b341feb23fb55739cced9fee86813d7d051d8d2db2924641102952ae0d405aa183523acaf2764 EBUILD Tree-Simple-1.180.0-r1.ebuild 502 SHA256 bf53c919d4a731bf06dfb971986bb5cef6f3c46471e59530083a0e931b541b57 SHA512 fd21aea85a23dd5862c81f33b4efd3d4e9a091243588b5f5ea922c93d0d030dadaf22377a703b5c8abf60c5a494a48bf8e74b23ae249cf5de1bc666319d69c1a WHIRLPOOL dd74c4ae4acb4224c47756bbcd6a0827c0b9a56425380c76f883f4a6226184076b7ee5685f581fe2aa72097d2fed80ac01f88bf5095bb303ab9d39ed01f654f8 -EBUILD Tree-Simple-1.270.0.ebuild 525 SHA256 cd74a6a666ae9e6cd9be0d49a0580c2a80ebfb6c58d6772e31e29528865c00ae SHA512 94edb1487d5bb797f9fbddbae1754cd36a01b772367123e1121ebc4104a023f2bc7b6591db27a426fb4e62abc378fd5931430c78a29f094a0d985244abef5d03 WHIRLPOOL dd084b2110679b86f4073c1ebb8e9276617c9b25aadc0f94b7a4631818b7b0ceb1261afec27f98701d2a0323b49402e6ee2e325ac30dc3b7753199fa26b36f5c +EBUILD Tree-Simple-1.270.0.ebuild 524 SHA256 2f10575bc4a52bf584ae3dfa028fcf93384c8eb0166b4f2a6fd5d2b0fbfab52a SHA512 9d1f913f89e1e0d651af092af676da6dae5e22e60b86f3fcf7fdafdc6f3071c511b3ae77f6b53c4aada844a9a357d8fba9f9f21876988b33526a0903886d5982 WHIRLPOOL c524c0bb85dd459fb3cfaea1dc783a6bf52ae5d207f3e003db0312c2d20d0a19d9ff7365a303406c4a87cb361f003b079f36ff858db8f455a9d795b5e84bd643 EBUILD Tree-Simple-1.290.0.ebuild 526 SHA256 10304234382b76715ddba651e40fddb527d84c9b888bff61c0ae81fb9c4a242d SHA512 34f5c58fe5030b599ffc80e0805ae53fe457469d72af187e82345d545c210cbac834f8af260731b94fd33f4abd1e32df379617930a9bb870c5c18e534485b313 WHIRLPOOL 3be018e009d7ddfb6454d74cce3ed8c4e603e59761ac8003d635c0e0825b5a622325fe33a5b156509c64b37d6ee1670b2ce198b8f7ebef9690e7593d8e941a1c MISC ChangeLog 3787 SHA256 0033c397ce10ede3d1ad83ec5c4f74c13e264f7f95083dc50f7ae9686d7bce32 SHA512 21cae0a80b2dda225175036f7abc82da82129e75f0d6b64aec653047c3348c7c708442e65fd5141cc710ef38282394e8a74ed3d86d0d37879576dd9f84127f67 WHIRLPOOL 7fd01b69e696186ca031538a2b0a0467258974a11e5205ff73215c8389095fe0aa79ac367fa5c7af8fff02c02c042ea82b8d1fb4148740416047fa39d5fc0220 MISC ChangeLog-2015 5123 SHA256 c1a93d06d4c1ad4b31550e79342462219ec0b3044a22ecbcee7388d591dba02f SHA512 4e13762818f0729b748601c2390982f5bc1d413f263d05dcb87c005e2528e630603706b0fd37144b0e0cc116aee9a7408731982d6de66a6da152be3b77d9c89c WHIRLPOOL e6e981f1dcf699a15b4b1fcc2f695e01a0a2d8dcba256bd2efc654bcf550de9d66c8d75ec56e1d856e59e9c3a828388fd6a595549da853f4b177f4c617c79f92 diff --git a/dev-perl/Tree-Simple/Tree-Simple-1.270.0.ebuild b/dev-perl/Tree-Simple/Tree-Simple-1.270.0.ebuild index 37d29962ada5..0065034555cb 100644 --- a/dev-perl/Tree-Simple/Tree-Simple-1.270.0.ebuild +++ b/dev-perl/Tree-Simple/Tree-Simple-1.270.0.ebuild @@ -12,7 +12,7 @@ inherit perl-module DESCRIPTION="A simple tree object" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="test minimal" RDEPEND=" diff --git a/dev-perl/UNIVERSAL-can/Manifest b/dev-perl/UNIVERSAL-can/Manifest index 70d1a84e0f7a..b29c7465e664 100644 --- a/dev-perl/UNIVERSAL-can/Manifest +++ b/dev-perl/UNIVERSAL-can/Manifest @@ -1,7 +1,7 @@ DIST UNIVERSAL-can-1.20140124.tar.gz 14556 SHA256 f91f08c7f1414058fc18f8a19367d54546f925e48f6e43028fe7db648cc116f4 SHA512 36b9d51d68f8cfa3eaf7ca7f2e19195dceb87925c666fc625f2818018cb7b22754f2cee7e7b56da3ee91e009d7187bd1c943bf0e0053860c51f7048ff8ff10be WHIRLPOOL 0797fe18a05eba0935b2b134c595a351de6fa6c20de81c5fc5c0b5a458f1512e95e52a656e30410ae847e97709a9de8993b93025ae33102041263439df32dfcc DIST UNIVERSAL-can-1.20140328.tar.gz 14654 SHA256 522da9f274786fe2cba99bc77cc1c81d2161947903d7fad10bd62dfb7f11990f SHA512 6fb032b968fa87d95e6fa6897575c6374a2d43fe9d505e339e593bad398b444b9818c8214fe7ac67fa2cfa1013e5c6337c507c3ea6104c711e3ee3d5635f0bc0 WHIRLPOOL 89ee11a8ff9b11b4a08a9863d389c94ab9d13924372a123d0a3747b9e18680e3ae8f182ef708fba7d85e10dcd28982f0df18f07a0f69b1548efd69ecd068e288 EBUILD UNIVERSAL-can-1.201.401.240.ebuild 453 SHA256 d07e24a569a1095310364516e75dc4f74a586091fbed4fccc18245b934f46bb1 SHA512 799c86dbe2a36bddd078869c0196926498726936c281a81085f9ef94400eff205721b6e18d2d16528b91da6e5bbd2930a18a9b68c462d1fe32ba5ca476eaaaba WHIRLPOOL a2d1cd578e287b7c0d429cbfe7076802cfb51c442584b3371561c6b96334158d79c902ce8a5ad4a066593165799849476f5810774469102762c6e4dc0db71948 -EBUILD UNIVERSAL-can-1.201.403.280.ebuild 455 SHA256 65a3be68ff538d07347236dc2da878fa99f5ffec500341bbac687c52e9ad1ffa SHA512 8ad9396213cdf613bf4d5c1d0ed44bc654485398906af0b2c610ba31db4d5c9c5a01322add771b9badee0eb09850e7f728a7c8db4d416a42c349c790d4fc0a5b WHIRLPOOL 3010fc5e727ff96c53bd271fa76e03a0922f7aff3f48f04b51aa9ac0eb2ecea6fb7ea492ac243a9064e0151611a9fd02cc6dd9fdeb258ab0f5082bbf4079c9f6 +EBUILD UNIVERSAL-can-1.201.403.280.ebuild 453 SHA256 e8aaa33a6eba288ce1522fda73a57b7627f9813dc20678be8cb6509f7489f31b SHA512 63931d2603ed5b61e32bb9ed051037b91647575c80b2998ee37ac23221d4c087d7338fe97a3d251edd976767da8a6d51d0424f5ebfc8fb9ae092e2ec21807630 WHIRLPOOL fc3189e2d210f37f0e07e76fdc3de710980d0bd4c7e7d5cbac37dfc0fefe6269a98700110d780cc5b11a022ad14ad67910a047bc1dc3172c51c106d3c83b06df MISC ChangeLog 3025 SHA256 375980e6a9cfbd654343fb0740fcc71a5d54a328ff42571958b6944ac9e4a459 SHA512 dcecd5f679c3cb168c3be22391759d0c22f12021f7d1ff8ff0c949f2e23df88cce2bd49f087c2d8cb163460996eda919cb83b88a925186981f431f09add8482d WHIRLPOOL c14796269e9f83945c64efb953cc08da0d5f2a0f3f8d67c4966af72d1b003fed7c905206628b7cd05cb0793c8772158088daee7ed508dc6f98e43524689aba1a MISC ChangeLog-2015 3475 SHA256 d9295e567c14ad6b2415026fba0c0085348ccba89c3ccbf37b4519627c7db051 SHA512 4668d2cf9bd277a52679aaaeefb9629cee641f04e19b89059962b83f0dce85a8ac4e69dc5ba12a6e02407ec7ab0cfb4d9b323ceedbf0f8a5f5070fcba2adb4c1 WHIRLPOOL cb867882a8f0fba894217f947669b447e3c67aa039b6a668f51ff4ac5569b5930668992eb49f1089a6149bc8d8398875e1236b4f976b2078546284a18f633846 MISC metadata.xml 398 SHA256 712b4654184ac55489210f4d01acadf97ed5f02d3cf2f09df107c041bae692fc SHA512 425ede01dd3f527021d67fb8b6c1f6e03d659d27af4e05a4ae7112bea92b58ef6ed9538c4fb1ca5f6af7f52b24767e17b2361a8344ac2bd5bc8c3bdb15d7cf74 WHIRLPOOL f147fc1b6c17e185227229b171c0fc2b815fed0b21ac338d276367ee2421d673c9cf8e9e189077ac1d601b60af04bee9fc56efde5f8a1df1affc026076f159db diff --git a/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.403.280.ebuild b/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.403.280.ebuild index 3d07aaab8803..896a412097f5 100644 --- a/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.403.280.ebuild +++ b/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.403.280.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Hack around people calling UNIVERSAL::can() as a function" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~x86 ~ppc-aix" +KEYWORDS="amd64 ~arm ppc x86 ~ppc-aix" IUSE="test" RDEPEND="virtual/perl-Scalar-List-Utils" diff --git a/dev-perl/Variable-Magic/Manifest b/dev-perl/Variable-Magic/Manifest index fcbd5faf43a4..4e390e4b1a8e 100644 --- a/dev-perl/Variable-Magic/Manifest +++ b/dev-perl/Variable-Magic/Manifest @@ -2,7 +2,7 @@ DIST Variable-Magic-0.58.tar.gz 73506 SHA256 036d6a18b2014fbe3a9e2c033157bd62dd8 DIST Variable-Magic-0.59.tar.gz 74019 SHA256 e01eb9fd803d8c9baf93f3dbb5cabf750e4bb74eccc8a1f9035e46246a688066 SHA512 500def84c3ef27afc0ee41d3737d4dc9d527ecd6f2fddbf53f969548d843adf30990f7b2704aa6db654bcfea9e2a6906fc5f3b89ef933abb22c72ac528acad1f WHIRLPOOL ef2fb39605c522162df5841a8329c2664452f401f038317521aa1fb6e8b763cbe9bd380ba64eecfb061dc81125b1841a6fa5807573a0ec2b4d81224657088d21 DIST Variable-Magic-0.60.tar.gz 78080 SHA256 22a5e2bd38ac327f1ae4b4ce654e726f3bba9c1d813750b98165831ea00952cf SHA512 605ca57c59f1ff758c6fc5669b503dc1a92a47474c9744bd23ea3b422409ba4f15a1f5ae9b259a9e243b32cf31757d2d54ab7b02bce7472cfa22fbfdcb52a9a8 WHIRLPOOL 883b0a191d3a3ab11fdb4b8d1f514e22988369267219d7250d866b1eb9931b96c04896a1b868392b20e09352ef640bbaab1ecf79e979118cc26933ed634da02d EBUILD Variable-Magic-0.580.0.ebuild 529 SHA256 3536c5fefbb8ea40a41143fb789a5cbe281064081ce95393d72e5b7f5bec4671 SHA512 adfa571da2c16f3c86c8c9e4af24129703604b2a566a9309a8c9bdf5db5b4f44b913cbabfb387481cfe24795e5c0d27e601fa8a4fa95959ba599fc9fce45ff7c WHIRLPOOL f19081a28376c03303c0373e7ff31f1c7cc9a35808c26e72f7ab5713b62c70412240cf185899e3e2adaf92eae199196e8aa59b9277b6f5aa5b09f7ea8743361b -EBUILD Variable-Magic-0.590.0.ebuild 531 SHA256 06323b623e42a19b454db6d902d98dd7e3b674eb72eac00b5c9fe34878548ecf SHA512 684064d15b71382ac81857233c4fd76f41970ff90675198f6d30a2dcedfc43efb0f32e3a88f970d8b5e68b8b4634e0fc3a6cd3d8773253e306b0cf927aa95df7 WHIRLPOOL f664970cd71cc08bb718248a2aa42d83e2b6ca53667a71dbc8a95e5b8782df9dab654ee7500ebf7c9e1adc6fb7834cdd6328dc3ea620541dfee539a8764d4341 +EBUILD Variable-Magic-0.590.0.ebuild 530 SHA256 3cb0792d77c5fdf72dfddfac531dfa6301822a3a106ae2d499d22012a28e8b0d SHA512 2cd376049c7e0cc2ba6eee623fae7ba6747337c85778ea00a58ab22c82838f19f0f6630b98cf1d1d04a855029e6e53cb54ab54dcb34d5706f04256ebdd885ca7 WHIRLPOOL c68a6cd563ef1a25e483a862c94ef5af55802ac9f776830b104586b61b713c292c3bcbc022464be90ad5c5cb198022e1800e18a467de67518eb105abc161aa02 EBUILD Variable-Magic-0.600.0.ebuild 542 SHA256 53cbebe3310b724f1a30dd025564490d2ba06769e2d8eec566c94293f30938c3 SHA512 5a14875c1e9b3134cd0e03267c1144061d49bd87ee1bf303a16c3f72550d9f61f0cb75541c14e94f1a031a9eb0229dafe8538557f5e6a77a9e7a25762a3ea226 WHIRLPOOL d78d5618f1e9a91f4851977bb3d321c621feb75f16618fc0f06da44dbd67c7c8f5bf1d55f9ca1b31d0b7ce3a4b8cbd29baed824d4d7560c6a9ce9ba24c498826 MISC ChangeLog 5914 SHA256 a409a75ec2ad7ba0159da91bd0e96b4021164e0327f266439c2eb4f3155a5b63 SHA512 7bd8a2a93e1bf5b6fc78ac6c9ba123d23f17e3a0c3a5991e77a34e59612de5f360b4f525889267fde61851e3288b137569bbe79128a6411f3239a4b4f6f04fd6 WHIRLPOOL da363102314fd82ef774e66fd10877bc3d4022c460c6face9d62664392e1dbed5c6e062fb98f1640142a2311f18a327fb5e119e9f962ff1d9ca936f512327ad1 MISC ChangeLog-2015 8890 SHA256 1e2019b823f2f1988acbab00f32342058b1b83201fc36ea6e3d7106af5eeee90 SHA512 d77be54538e555c8765cedc8ace375fd0089f70555ad3d7b6c6c7a131aefdb5e42304c8e41690218bcf833529165a2d645b1260f905acb6a0642b24e8734f779 WHIRLPOOL faff59e2fd07372c3bcfca9493f3144dce0641851361306911abcc9a8fa5acafd6d4bc4be807619dc2c37fdb2affe7ff19b2e0c13a9bf9a32b51ab2b21d98df5 diff --git a/dev-perl/Variable-Magic/Variable-Magic-0.590.0.ebuild b/dev-perl/Variable-Magic/Variable-Magic-0.590.0.ebuild index 829591749609..9d619bafe168 100644 --- a/dev-perl/Variable-Magic/Variable-Magic-0.590.0.ebuild +++ b/dev-perl/Variable-Magic/Variable-Magic-0.590.0.ebuild @@ -12,7 +12,7 @@ inherit perl-module DESCRIPTION="Associate user-defined magic to variables from Perl" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~x86 ~ppc-aix ~x64-macos" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc x86 ~ppc-aix ~x64-macos" IUSE="test" RDEPEND=" diff --git a/dev-perl/WWW-Curl/Manifest b/dev-perl/WWW-Curl/Manifest index c562cc96fedf..d6e255754fea 100644 --- a/dev-perl/WWW-Curl/Manifest +++ b/dev-perl/WWW-Curl/Manifest @@ -2,7 +2,7 @@ AUX WWW-Curl-4.150.0-curl-7.50.2.patch 1233 SHA256 1c178834932c11f4c3375b2e84b9a DIST WWW-Curl-4.15.tar.gz 53741 SHA256 3ef40494537a1ce7f848f3b524f5690cf47db458c0bb662e15c4642dc13c5fa1 SHA512 5481d7bb2e39fe26c8501399d1123f4cced6309d8059ff856ffe184c0a78c0a5cfdc09959ad948fdc693b78339c7d58401f844151b58ebc454fda0425c38f659 WHIRLPOOL afa0b6656a29ca2f6c84038137f73b3ebe114cd7818255c9e08c253e8c184facc64a83a00f347dc71908a71c6e2b164d54a55712b6f83a8f4d0f1e3f942b11dc DIST WWW-Curl-4.17.tar.gz 50917 SHA256 52ffab110e32348d775f241c973eb56f96b08eedbc110d77d257cdb0a24ab7ba SHA512 bc7a75d0e23f5a77578fd7244b56a1e1b81d814993b90ac7132926f0d571232c4c95875bc615cb6239e424ae1d5481d27796efc5376bb0845d1da0ff1137c0d6 WHIRLPOOL 7b7d77eb0f4d72e4501d90fb2c90c1ab06f249cd270544c688489cfe002240807b80fc7da8cc2a25ca3380a2ba0ad643d0ca50267b72210df5bbdcc6f17ddf9d EBUILD WWW-Curl-4.150.0-r1.ebuild 444 SHA256 a0fc2282ab1c05932d3e4c5c79eb91efd03819a045c909c5320d62cceacc8588 SHA512 e0d80b8793b7866d139ff5fb4744eb5cb89280cdb8503f458062db21d4a7bce3fd6b64e8cafdc21781423d68a2b2030c68beaa8f10eb81c019ea92553fbd1fb1 WHIRLPOOL 585d14245ac83a815965439a26740a8a459ef1b85f6cc321725b620b9258965ce66ee3c6bfa8ec756b25ebb7f41ec335956ba96d9a94b739711ce343cb0a3aaa -EBUILD WWW-Curl-4.170.0.ebuild 446 SHA256 4fb0a7941933a295a0b06ae53351b0ee57e31e255a3e3f9612782223eb4a7541 SHA512 c303f4613acb2109a5d3d9a55d7bf7ed358c392dcec45b9f4d6982ed46c3ce07ae33117439ae3232d780f6d7b1877cbcc482afb896f05c22d24c728cb9b15191 WHIRLPOOL 7be60776e2e2fabad7b78c8d12bcf70ee36e0d3ec785cb052218d9189c7468c36e9d4c01273e6dcd60571641bc7b54cb3b0a31e901ab14eb0f8e12195d99435d +EBUILD WWW-Curl-4.170.0.ebuild 445 SHA256 3e4ae4041a2ced353688736e2a40c2041276e7d14a1113ff7ef7dbf4d4f7f380 SHA512 e1fc09d22926c6c0c97aab1512a63fd49509312ec24dd852d5224b0c673b7562b913056ac9fdd2f4a0d372e7878ca7cfd0c2bb70247955816d3c99bfae67e714 WHIRLPOOL 0b0975d21dfd9d61e8f39984150d59fd4f573389009a3171e41c4101f85fc85e72d8dbc134891ab01e862a390aacb32b193563861e3db807c80ed8322239b1c6 MISC ChangeLog 3056 SHA256 035ae5ac6d0f9f8ebd0dfa723ea5584dfa619365f74b40ef248ac3efd15bf45e SHA512 c4028cde91db1cc36607092b5b1b51cf5c43e54fa8ca75ede28e98cbcd60dd2b7382ca1c2e7bacffc4a87f897420e3383c394db173258ab284ea8b64abb35e8c WHIRLPOOL a1c007d6774f3a8326ba82bc4d1047261a7efe2c86520a5e55b84db8c7842d31b1aa5260466d90781eb45ac220437109091e1af96a78f8ff8211202e9cdc7e02 MISC ChangeLog-2015 4127 SHA256 d020b89957396bd2e872a15574a604f548925b3508bd19eb518ad7e314073527 SHA512 1d827b70e840c90800382c307f07d3fcc86089224f77aa1614467dadaf80d03862a0f3b74bf238b61ba79929c2735a75abd7eb2baa84c8618177e07361649d9b WHIRLPOOL 2b093e50255a0ce446b37da5d8e832f528d56febfdc6d2f642df58c63207d4cfd0e9b7622b8e34c1cb9476e26178c6e229df7c5995246b2be3b1be19c10c08a6 MISC metadata.xml 638 SHA256 2240119d3d7d9216a996f5cc7fbd99bc585a38649a2cc6b4c05c19d874333c9a SHA512 3836ea633a8e613b67fad2aee01058fb3c67f7a625f98d8da5d0c72a23b643abebc0378d1933320b64cc7a171b80818a611e8362ad8be56548785c1e6300086b WHIRLPOOL c9c845d86a235b9ac77ac2a85d41a8ef3bc40492e1f63de5720f5107537b739e4202f79f6522f6f65ea99baff032a7fa419ba0f198aa71fe34b688a82467a356 diff --git a/dev-perl/WWW-Curl/WWW-Curl-4.170.0.ebuild b/dev-perl/WWW-Curl/WWW-Curl-4.170.0.ebuild index 56672c159553..698eb7666f9e 100644 --- a/dev-perl/WWW-Curl/WWW-Curl-4.170.0.ebuild +++ b/dev-perl/WWW-Curl/WWW-Curl-4.170.0.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Perl extension interface for libcurl" LICENSE="|| ( MPL-1.0 MPL-1.1 MIT )" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 x86" IUSE="" RDEPEND="net-misc/curl" diff --git a/dev-perl/Want/Manifest b/dev-perl/Want/Manifest index 7ce633ffbe0e..b6f708d2c85c 100644 --- a/dev-perl/Want/Manifest +++ b/dev-perl/Want/Manifest @@ -1,7 +1,7 @@ DIST Want-0.21.tar.gz 18607 SHA256 cc8bed2d029a08b2f0c8188ade90bea1fd82cbd70b66867039a50ff385a5eba8 SHA512 50592e6ea9d3e7c1fd0eea4c354072f34314cb82c06e2200fd7de68ed3f476cee478280b3a4a52a414b339d73c3e298b455d5e173a57861549a6b3159695c1c7 WHIRLPOOL b46525e143fe815fe3e914f73808880cbe6203e428bc12bff2a1022cd8bce3a8d056a630a265c6293c9ffd5301b56237e4da793dd09782d1e8b8ebb38aead337 DIST Want-0.29.tar.gz 20928 SHA256 b4e4740b8d4cb783591273c636bd68304892e28d89e88abf9273b1de17f552f7 SHA512 08df985de16b5e9dd67d6ed38d319da2511e92098f95a861a5a695eed8d77eaf412671b626e4da29b536147ad4da4a8cfdfd789ef204dac240073091481f3c1a WHIRLPOOL a65f34e3721f1065bdeada2e0f63746affe76ac14afe02382d6fe22a89b550cff081fb2e7d0ae361c98625b29fe26daa6783a8256f3f384c9d1c25b27cdb990e EBUILD Want-0.210.0-r1.ebuild 300 SHA256 b9e7f32ecb7d917d2b239dc983f54889e9835083fe4e8910b70a86f376dec354 SHA512 1fc53b09dc216ae8854c072b77205ecae79c96f790eb056d8843e32477c5422914cd95477d7e0328bec1e664545618e06c1db1cd4e60e9b5acfb2313743abb50 WHIRLPOOL beec685368976b493da64d96e0171b7b247dae38a04f12da191e9774c1965d1ff816e73429dc6313e008d4d2304e379b1ae20cb188cb72f5cbc7ecc02744661c -EBUILD Want-0.290.0.ebuild 350 SHA256 94db572ed8c26b2362221c97b2cd7f20d63ba8666339d88c52da9ad309933eb9 SHA512 c64349ce79e5b348894d01052f69e1e3e2205f04e39751275bcd3627a8e9109ca217546836dd77fa222f2fb4060f0e4abc02604c59abbd56567e886e17618cce WHIRLPOOL 301ab5926e6b3dc1fc87ee7115518802af943a31964edde9cae3a8db13ffd83bb14af1ed94224e4d2b83166fab342392a0e78a818a6b64d90ec2ff159bfc6a95 +EBUILD Want-0.290.0.ebuild 349 SHA256 eb23af6c57bbba4441a660761949b1630c7b0596eca5e76bd9d9c43b76ca77be SHA512 43cc6829faac042db4c5072d95ab796982c9cb5a8c404235bc6abedfb30463045cce673cdf6a53ab1d6fea9a29d54cfd2d32161548fd6fc65ce60d09bd6b97e3 WHIRLPOOL 7d8f21b8a4ac197427273993c71bc4fb2dfe7c6ea239932373a16e7b35da2f3d89d9b474ab0b8b58ef8e19bdd9380f3facd74ac3625714e2cb3ade2f4a8a881d MISC ChangeLog 3485 SHA256 d8530a9e230298fda3912c5b2006758db43974cdbfb01426d3df3fb8f1e8c1c3 SHA512 e65adfc296ec5a25e31cc98c1e7669eb30aea685a0c162debc48e005cc7f25ddfca75479f91968f14274f3392c7889ad2c16b614868ebba5dbadbe132e0d7d2d WHIRLPOOL 798b0682246dcf5c0c25a6283c0ebc12fb130d5da62c0e90f5f0052a842f864afb9798a601d83f4bda07f3411fe6bad4c8a3b47dc14c3c4a18769cb2dea0dbb2 MISC ChangeLog-2015 6274 SHA256 ce283a96b24e148b4083f6cfb3f13eed90313aba5f0725d10dbbb7c0f44647b1 SHA512 333fdee664b091719d9ef9175fcee2764d6014474bdb126c9715e9932999d369cbc2a34e7c57f4ab5eaa27a03179efe0c5a187b681f5d4b58a9a55569b33542c WHIRLPOOL 48382cc6143478b79cccb4bb8a2090f76a2ce8e8181f81530fcd0d396f37abbbe02635edefd1fbf87aae90bb940d36801cdd3a10fd28514c2c4be10ebaface23 MISC metadata.xml 379 SHA256 e1f1af7d8dee01880a13ae84f65f3e21f3e66abfb099a6a79d9470b98dc3ccf9 SHA512 fe886ac09837977f59eada31089e76910b3a338a57b49bf4f43d4a830a81a69856d149d3509983b28b56022c8136bed99e83f1158bf8d2f089979ad44bfd43b3 WHIRLPOOL 62775cf343f5bafb7311b37a68e4cc2c7e5afbf995b8c3af7984dc2abd6f567ef05242fffb4930c5828c628a78d2e84af9ba0aabd98ba60dc0ddb9f8feac9649 diff --git a/dev-perl/Want/Want-0.290.0.ebuild b/dev-perl/Want/Want-0.290.0.ebuild index eb3009b6cf5e..71dec141286f 100644 --- a/dev-perl/Want/Want-0.290.0.ebuild +++ b/dev-perl/Want/Want-0.290.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="A generalisation of wantarray" SLOT="0" -KEYWORDS="amd64 ~hppa ~ppc ~x86 ~ppc-aix" +KEYWORDS="amd64 ~hppa ~ppc x86 ~ppc-aix" IUSE="" RDEPEND="" diff --git a/dev-perl/Wx/Manifest b/dev-perl/Wx/Manifest index 5a0234bf8596..a5616588a2bb 100644 --- a/dev-perl/Wx/Manifest +++ b/dev-perl/Wx/Manifest @@ -1,6 +1,6 @@ DIST Wx-0.9927.tar.gz 486022 SHA256 a174bd1b6a5558174697775be0ede2fb8260258d60bb6e116dfe6f56ac1d22bb SHA512 9f81b0c5f8017ca03eeb773555842d3e2b8360b20b071534f9f6501094af0f5371a0b2cfb5cd490b7ee77316ad3005183ff8c16f945393bff2d615e4d8721726 WHIRLPOOL 1210eb83969ab1ab6b89dc8b1aa7d605406276b22dcaf35bdc1a2c9d02ecbb8a1ac88ed15f9852f9e38b959215cd4d55a2747204c37f4a61ebac69b7d7ea8a5b DIST Wx-0.9928.tar.gz 501439 SHA256 58e06c094c07817617b1e69fa0501f2cee80cd4700ac7a62c516179f7aa85b42 SHA512 9ddb946e1a6a7f670fcc27ece4227821cfa9b2fcebe078e8452e924a8786fca8c20c53262a5fa2f93ecd6586a82d42af77920ec543817a0552749caca2c552f6 WHIRLPOOL e8d3b68a7cf1ecaaa8134b7108606b3c8f8116908ab3daff1502f0023a469ca608ab5c310405dea68a7afb8baac4bcfae08cc576d96fb1256c9a30d210e1b248 EBUILD Wx-0.992.700-r1.ebuild 896 SHA256 4cea0fbe566753336badaa34120ce1e91282bfc09ef1a32107889ba570ee706f SHA512 564159d376e777f7ffe0317f0d4b38152bbcce6ad93f93931d795046cd5171b3ce372ef83ccc45c81a0f839507bd92ee9d1c35dca704dda501285da1cd1d9ea1 WHIRLPOOL 1b11ba1ec67f84a9b795532de61b3c8b2e11351cd2aac9254f7f313f9d45c60f35d9fb62a7d5df351ed731f6d59434ebce35d48327bd7c135c38a492105195c6 -EBUILD Wx-0.992.800.ebuild 1106 SHA256 53dabaf12ad7a38043b74d3d75cbcb1b3f2949471234beb62e9c368091a7eab8 SHA512 33a9d070d52c20e9e9f1e3ca43cdf15adcac6e0cb18b635333b78b41b1aa2bf8d167905d5ec3d44e07b60c280147d7b4ce2c631cff30cfe1e646d71eda82e0b2 WHIRLPOOL 053e949a54e2dced233defeb1759c8e444ed5d1415eca3aa6d8b0f713fcb07de48da0fc39327b9c600a38883023f78236cf125eacd13b8c40f8230d5f72e1cbe +EBUILD Wx-0.992.800.ebuild 1105 SHA256 efd16bbb9b2a292045182689d676cbc17731e59e360852b84d1990e1bbf843e3 SHA512 c30fa7ecd44d8d31b42353c667cf00d40fdbebac566ac5bea3c33137f789d7251e992551d29f0726712a1cfecfa3446aeac282521b9345ac750655f2dddc353e WHIRLPOOL 36febaf7ff4d539972a0f3e721f8438da7f2d04b9c3371b891573a4dd94545b6281230f3fd97cd61c96cfb21f15fde78b3eca444ffcd176ae08d8a09a3ab770d MISC ChangeLog 1976 SHA256 5de7f90b4772d8614f3946990ba9e1f0806388556c3e10c7da9d26ff1c6bfb08 SHA512 cd6b70c6cd4f5da1a5fd5e79902f12c3fa630b03c49064a8229e5553e9185f7bd53d855ec8d3c64800a6c4302b4a81d6c5e048e17e9ed97e4c4b1671e262ffcc WHIRLPOOL 01dc248e779c2452d761da06c9452f945707f93d53340a175af57d907d018d46b758c544e00727bc489dac934be75335c1136515440d8effcbb2f6c05e4859b9 MISC metadata.xml 20246 SHA256 d21d08641a4f9c038aee0d74603f992ba731fc4403d02829280771cac7207499 SHA512 618e3cb991b6d5d3d72daea34be068fade6b211fedeecf43167a891cb30f4aaf10e9514b8a2d2bf8c85f6e4d1b0b0be84e8185607c332413a4e8775c5d8d003a WHIRLPOOL e98e2cd33a716289f492930e5584c7248cac53869bda93f49981cc75d19f7c824abf0286672fca8e42808e8e5ba8b5e1d7e4a56dcd65d6cadf30d73760833821 diff --git a/dev-perl/Wx/Wx-0.992.800.ebuild b/dev-perl/Wx/Wx-0.992.800.ebuild index da176d306916..9e75c2668a86 100644 --- a/dev-perl/Wx/Wx-0.992.800.ebuild +++ b/dev-perl/Wx/Wx-0.992.800.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Perl bindings for wxGTK" HOMEPAGE="http://wxperl.sourceforge.net/ ${HOMEPAGE}" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" RDEPEND=" diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest index 660c41ec8973..4ab2b9a77735 100644 --- a/dev-php/PHPMailer/Manifest +++ b/dev-php/PHPMailer/Manifest @@ -1,4 +1,4 @@ -DIST PHPMailer-5.2.19.tar.gz 156311 SHA256 5c167f6d84bd74bff9de6b5594f2c262e748a021ce4686cadfc2ed273e71f82f SHA512 2eda1b856305c10017fe026f7de0e96796706216d64dce9ee9f3aa1bc8db4be277b8e8d88954d447e138f9d8701a7c7a86b75ba12b93160ff13ec65d1c0131ba WHIRLPOOL 37a8cc78bc207f25998352ad2460e2035cc53e4d9d33b9279fcae044ef2c75c43bf6702f518ea34f93ddf9e06746ea5e34fd51341be4fa9ec1cebaee8fea36ac -EBUILD PHPMailer-5.2.19.ebuild 1489 SHA256 315653cd0e17865554c25d0516913585db8b594b51e1ba8beaf603c10e285f03 SHA512 6da62284fa40e32bf7401229ac7e1c80d7493873492c357af8066fa7e3a2f226870aeec07f1859bc2e36411079766b9159750d6c156100ffb7b55e37558c5555 WHIRLPOOL 8d2490e153aa947971b532d8fe8c6ecdfdcdcf0cfcc96a50692ffd31f53e534c660e32efd3975c0874a44a0f2e565d762a1123aa6abcee2a13a5d4cfe7b32b46 +DIST PHPMailer-5.2.20.tar.gz 156793 SHA256 4716acef60503f345323849842f3138a8453c178d3829477553bf1e347664976 SHA512 c8dab5decd5012687b2e1d7a4ce2a3a605a6c3589b1f747960faa6080fb1c65580c1dd0f0cba52fc3735e4cf357c31237b51a6ade00c5dbffc57c27328d15018 WHIRLPOOL 9d490758ac09accf3f30645615a34a39a5c7ec542f5eceaa6327d3119ff35bf5c14f420dd731ee47f84cfb6409f5f26d6f7d9979031343172778b59825b7d08d +EBUILD PHPMailer-5.2.20.ebuild 1281 SHA256 7cdf5ac73d8be58bee7f978c19027b1a89fa39d65037175356345c9c8ee35009 SHA512 9884e1fc5440ac9d33a601ea4449d802fb644839760aeff09452401d0e54bb956b1bdacc1c49b521ec5164ec25ae2f598b4fa20147aaac864533fbeac51a23b9 WHIRLPOOL d18d215961c86c5b515fc3b8519240c5bcd51232a3d8f104df8d142b079ebc65aa76f61fdc1cedb635bca8e550d1bd1d74fb99f7aecf42c96e2978d142d96510 MISC ChangeLog 1483 SHA256 959f738913369ce71ce675c7c93b3cfbba0e526b06ba79ea014876d3e18ab98d SHA512 eeb917ffbba56c15f05bd2b95c2594e681b74d67bf965969b0322bafb750e73f67acb8c83d1ca1505a050d19a2fb067d42f4de80991ca4d90da15f978a089513 WHIRLPOOL 43c440626b8cf46501eb7e4cdcbd35fba320cd6bff239c12d830fcc0c4aea7c84c43ce0be394917a476b90c3f112ae54a47fa98affddfb5bd7c695f66bd4b1c1 MISC metadata.xml 446 SHA256 066ddbc7e6e16e06938c34a0573bf1965d35a9d5a8713580e027b4fc7fd0b2a9 SHA512 3dfce858cb0e00b526f04a5764a6173d4711db4f21f52b6d827b82f1cddea4e33f533e645dae95d0bb6a69699b00520a414f2e322c76b56aee1e4ea047bb4bb5 WHIRLPOOL 21530d7c9338e14c8714f921c72bb15406a9760e1062264e99a7da5074da2db5664af26e7de1096e33871dfca87661434ace965b2437e886a8ceceaad45ea21f diff --git a/dev-php/PHPMailer/PHPMailer-5.2.19.ebuild b/dev-php/PHPMailer/PHPMailer-5.2.20.ebuild similarity index 74% rename from dev-php/PHPMailer/PHPMailer-5.2.19.ebuild rename to dev-php/PHPMailer/PHPMailer-5.2.20.ebuild index 2210a19992fb..936fe316e501 100644 --- a/dev-php/PHPMailer/PHPMailer-5.2.19.ebuild +++ b/dev-php/PHPMailer/PHPMailer-5.2.20.ebuild @@ -11,15 +11,11 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc +examples test" +IUSE="doc +examples" RDEPEND="dev-lang/php:*" DEPEND="${RDEPEND} - doc? ( dev-php/phpDocumentor ) - test? ( ${RDEPEND} dev-php/phpunit )" - -# The test suite requires network access. -RESTRICT=test + doc? ( dev-php/phpDocumentor )" src_compile(){ if use doc; then @@ -35,23 +31,15 @@ src_compile(){ } src_install(){ + # To help out the Composer kids, most of the documentation and + # tests are missing from the release tarballs. insinto "/usr/share/php/${PN}" doins -r *.php language extras - # Fixed in the next version, I hope. - # https://github.com/PHPMailer/PHPMailer/issues/919 - #dodoc README.md SECURITY.md changelog.md - #dodoc docs/* use examples && dodoc -r examples - use doc && dodoc -r html/* } -src_test(){ - cd test/ || die - phpunit . || die "test suite failed" -} - pkg_postinst(){ elog "${PN} has been installed in /usr/share/php/${PN}/." elog "To use it in a script, require('${PN}/${PN}Autoload.php')," diff --git a/dev-php/pecl-dio/Manifest b/dev-php/pecl-dio/Manifest index 2149cb72b856..6a3bb7b7da1a 100644 --- a/dev-php/pecl-dio/Manifest +++ b/dev-php/pecl-dio/Manifest @@ -1,5 +1,7 @@ DIST dio-0.0.7.tgz 19570 SHA256 0294c0f88705213b30589c565fffa1a3e7cb036806eaa2a47e6a793914a821fe SHA512 00925d6f6640f6a17c5bb8997910f15978c9e53b190ff4a44c3a23138013d1f460ef6fa1522fd5f5b1bd51130b859ea1619beffdb702a69b99a13e5eadd8ca25 WHIRLPOOL 4511273497f32ae726cce8153a83bca31b529e21dd73b1330cab9a8d56fc42fa993ae699631989f12625a25e4aa3aad9a25a036c86894a35c6f61c9c620ba037 +DIST dio-0.0.9.tgz 36688 SHA256 2c80b63fbbbaead856cb468955c14dc328d1262621b0c704b122d902053c8156 SHA512 7bca34a50a1c6cc1f28f47e62392d5a71bccf2783e12f510cc0101949c68d753650e19dbf9ef8172ba23c02680d30959791738353d89762f806ac7ae72a20058 WHIRLPOOL ed6d1947ec9b0fe1721648727467c5d726bfca0c0e362afa5e6170a51cbe5dbea67bb0a54fb01219581295689f4c5d0b6626772bfae4378bda72b5f8ae6452fc EBUILD pecl-dio-0.0.7-r3.ebuild 410 SHA256 c989706dec80d15c05673c4eba9226c71368d3ae3241d672529f1c43d5b9f07d SHA512 da9ae1ccd47a75d58d38fad5cb27e09aaf2bc51033a7d6420563a89d63eb5ff8d9be2680086ab6a6ad2780425703d6dcc05563638b2071e90962fee61ad080a0 WHIRLPOOL 6c45726a5e5edf07b8fae86c6609f0371dfdccd870eb5037f1b3f7c12ccffeebd8b06d94370889195d93e05c7a4371fc3e122940a196ed0cee397e5fbecb380c +EBUILD pecl-dio-0.0.9.ebuild 427 SHA256 875329468165ee95078909c709630afed4e026ac08c8cc28b3cca118ee519006 SHA512 458c2036056a0b66da0fb12566700c5ffff6db6392c6f4a9985ab6147d9d3d2d245068f3c91e20a918e4aa378b47d3062d9c880585d92d9be9d9ab07bfcb428a WHIRLPOOL 5a12a5560166b126340a45a646f62954a99649ba7c47ee6473bf9bd2463ad08c75c80430147f261e1abf3fc5decdbd37daf0e114920c664943f192e12feb8224 MISC ChangeLog 2952 SHA256 3a3ecd198af887302cdb0204155286aaa81451a58be57940086a3524b22ccdca SHA512 64d4c1d1cf8f0dbcac6fe770c2d558c6e45317e78d6aef7037087c07b9dbfd41d7e859c82bcae8fc9d535316e3b132fadd33d04e457a295c6d3d9d20c2dd2b2f WHIRLPOOL ba410921b9345e12f3e1acfa1c1706f8c29879863ab098b3dd79ff3ea00d45798141b66eabb64a74b2ab7be3a397753702e3e3b37fa4e6e53ea7842a61b18d85 MISC ChangeLog-2015 1436 SHA256 607556a6ea0a634a5cca5ebcec6f6bf47849f84a65664016a07cd938b9b49246 SHA512 8f25432a00aac2357ff6fdabf843e0f30bcefa9f447fc8a8da74efe2ec48fd2b0b09048fbf2410bbd07f800a459ef475ea325a7a47c88430539abeb711ce5858 WHIRLPOOL 811d1c67efd3fa7e5b0152a0e0d4dafc3b6632f9ead6c4de5072bdd5ed6bf58f76a43a6b339b6338e3aff943fee1e9f9a26142ed326d802903ae4e0c32b0061c MISC metadata.xml 235 SHA256 b248157b2feece4fbe51f91e87ab0c0249a13655e50e070080763a2a6556606f SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64 WHIRLPOOL d9032f2fa2b465d0658cb19728a50849c3ca8e021574651e7aa69a9f949f186bb43812034fffda1273cfa8fbbec663ee5f08fd30db366b96ab6945b7ed4291e0 diff --git a/dev-php/pecl-dio/pecl-dio-0.0.9.ebuild b/dev-php/pecl-dio/pecl-dio-0.0.9.ebuild new file mode 100644 index 000000000000..3027af7bb9b7 --- /dev/null +++ b/dev-php/pecl-dio/pecl-dio-0.0.9.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +PHP_EXT_NAME="dio" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" + +USE_PHP="php5-6 php7-0 php7-1" + +MY_PV=${PV/_rc/RC} +PHP_EXT_S="${WORKDIR}/${PN/pecl-/}-${MY_PV}" + +inherit php-ext-pecl-r3 + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="Direct I/O functions for PHP" +LICENSE="PHP-3.01" +SLOT="0" +IUSE="" + +S="${PHP_EXT_S}" diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest index ccdeef91f059..18cb61e8e6aa 100644 --- a/dev-php/pecl-http/Manifest +++ b/dev-php/pecl-http/Manifest @@ -1,7 +1,11 @@ DIST pecl_http-2.5.6.tgz 200469 SHA256 8435eb9082b8fdc56b630e3d3d8e63617a3bc43d360f6f49fbd7b1856b266be4 SHA512 a4ddb2e55b537a240dc79ad38665f9cb79ef56a70f50e0393ca19c36f744c21374ba801e31e68545516c4be98cff65587ee91b2b25f05dd587120afcb87dfe4a WHIRLPOOL d4d2158b610c959a558b450a79a77a7f9de53d6e75982e920c4b64d48731139223659af149b9894c2fee1a477005af34a57cb33a806429e11446d5162b031b89 +DIST pecl_http-2.6.0.tgz 217673 SHA256 ddbf3eea3d1c7004a7dd83b5864aee5f87b1b6032bc281c08ccc62f83b9931ed SHA512 12d18049411a4133008449a1e7458a3055322dc337f421e0e2be126ec965f15b0189af6fccd9ca4537c48819c763b9e020906ac6d09d87ead92f4436fac595ad WHIRLPOOL 976a3ba0f37e78f97c4cc4884e61b2c14cd8760e48be2da0743a3b7adc44198984ff748ebed63885f012a14c8e016a57247685a576cc90e57c6bfbba59a4e862 DIST pecl_http-3.0.1.tgz 197372 SHA256 4e45ea546e3245669887ec98187666ccb4aa3df15078335b1c02c824c8165031 SHA512 344ae45987269d9505ffed6059be378005298d89c5e39bda6f771d8bf5a1998e91c214c03d32b9c78329c95e4928d35d3659dd3a1c70071aa5b2bd2763852098 WHIRLPOOL 76538ec0b94ef5d63808b625a8e73ab499c2afc78cd0f31823dcea4de66d865f7cf8387cc67eac1f19fec032a7ac7b7775685048ac0c6f76fadccfc1d932026c +DIST pecl_http-3.1.0.tgz 214166 SHA256 e3de67b156e7d5f6c2e5eb1e2b5f0acceb7004f1260d68c9f8b2c0f9629aabf0 SHA512 1c272aa476106bb61848f175f0ba6715b3d8928f70cdac1a673cc87c2dc780dff5434a3bc595d5e8a1ef7b847a1d2e214f9e9ae80b8b5d1f80a299febc85b0ea WHIRLPOOL 8a6cb8689001e794b590ad2b0b9c873a8fd805f37726e61c2b617d962a94b3cf87c2d280f665b42bce7d8583415718f505a4f826ac616bcead2bfe2c9295fa55 EBUILD pecl-http-2.5.6.ebuild 973 SHA256 0ec860e24bbf90bc107dcb2f4713816daf25a3efc976b1f6e860ad8fa2f69805 SHA512 c310d5680c89055a264eab14baa96a6e4ad3eddc693eeca3beae5b5d35a8b33106dc3ee08c0a9f7151b4dd372b3c386c7090f56b6ff0920775c5d510cd988f18 WHIRLPOOL 6b37cfee922d80cd6027afe08e282ebf2bb59c7c258951e298deb801fbe07b0c43ddbf8ca95e3cdba092b71f746542e63435d4988e399bb88dec886e7a73b2f4 +EBUILD pecl-http-2.6.0.ebuild 1393 SHA256 fc5ae76bb860afb2ed4f5d6361d290f32c1bc5acea4196d4fe63b5eb51d5ee87 SHA512 f5e5be9a3a94f858545f8c8586c396e3c8b10849c6d3d3af9d54f21d8573424f9ae91c43335e99c3c3f10f8c5f16bc05d1a2537aa752e087147bc5f901cdfa89 WHIRLPOOL d71b9cf619905bd2b7904c6f8ee890f3c078e3277f5dc8db2de08f611d835bcc3996d807bbee7f677eb6dd7cdb61acbe98f0f9e4f41787e7f3c52eec1e7cb4f5 EBUILD pecl-http-3.0.1.ebuild 1162 SHA256 1599fc7811b4c730105798fa1a343bec103cd05c0d3276ecf24dbd27bcc9e7b2 SHA512 4e7062260022ce935d6efd14ca5c2b7cf694cf015598df0dbc15515c581a39fc57fb8ec3e22a9632d3903bf8b2c95114b8377c414006a5470dd2e0cc5d07ebd4 WHIRLPOOL b1e2a65f77d6c4d719cce215c942771e9202c49355a37d13ee85021fa914284269a88c9688286d612f24cc7c44179a7f3f205cd529dd12c9b3509e95444095c3 +EBUILD pecl-http-3.1.0.ebuild 1519 SHA256 14ede210739c1e82cbe611c7fa8a191cf4f532f05753768e031342ec7f0fa677 SHA512 d3a9b265ea361190be1fbd85959cddafba616b2d997e46db5ae1fd2faa695750e232e21a08993f607eb0af2e360b0262cb3836c80c73bf2be6990a2410e45edc WHIRLPOOL 64c0e2edd89f75b3baa92cab709d272abe16d21f8090ec4beac7c2f87aa5071e0b83ff3f7681fc336b8ebe0320c21db28a3213f23bbda480699858d9c16f6282 MISC ChangeLog 3863 SHA256 d1ee0ec875e3a785100bc098bc6f31dd5e65948982572cdf4450fe082ca63fe5 SHA512 bb2505f6c122e6ff993db212321651f79a648261021e6c3a50fe907197cdd73fc918722474639e00ad7183847dab8cd67adb42c7e9cf04610af55928e5f0b39e WHIRLPOOL 66969af7c3a436b7eef9e8430574e06b8e1c45568eb1015ebb05dab5fae4de97cf20fb36e4131d44e80475a89b78dfbae35336632749b574fe44afd5272213fd MISC ChangeLog-2015 5880 SHA256 d5a60e4cedb49b3c4258dbe3cd8ac3e8574ef28c5a3a65ee89c78b249f12137e SHA512 da7778bfcdcd478224ed7806d943641fce314d9fadd48ba3995d7758b114a3819beb3f370d200a42bf3a269ef2388466d5d504b003350ff44e3a3921ddd4db8c WHIRLPOOL a04324d97977709c115f1c92cea943da2e3a52fcb6a3f09692dd125f4a68cc2eba163abb1f28663171516f505f696d10ed5d84fd2d19bc211c2f8b1d857e5de6 MISC metadata.xml 239 SHA256 b54aca642ac424532264a97d14931720ed288cf387dbdef6a10b34ffed6689f1 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 WHIRLPOOL 80ab9605bb31ce3310bf524de4705c67ca85cf8f2346b7e13274595598b9fe92c9b119beb865ef214ad33ef172b880e318d18ff8c8d2026cb7319f0524d8a7aa diff --git a/dev-php/pecl-http/pecl-http-2.6.0.ebuild b/dev-php/pecl-http/pecl-http-2.6.0.ebuild new file mode 100644 index 000000000000..2b2f983495bd --- /dev/null +++ b/dev-php/pecl-http/pecl-http-2.6.0.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +PHP_EXT_NAME="http" +PHP_EXT_PECL_PKG="pecl_http" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" + +USE_PHP="php5-6 php7-0 php7-1" + +inherit php-ext-pecl-r3 + +USE_PHP="php5-6" + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="Extended HTTP Support for PHP" +LICENSE="BSD-2 MIT" +SLOT="2" +IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl" + +DEPEND="php_targets_php5-6? ( + dev-libs/libevent + dev-php/pecl-propro:0[php_targets_php5-6] + dev-php/pecl-raphf:0[php_targets_php5-6] + net-dns/libidn + sys-libs/zlib + ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) + !ssl? ( net-misc/curl[-ssl] ) + dev-lang/php:5.6[hash,session,iconv] )" +RDEPEND="${DEPEND}" +PDEPEND=" + php_targets_php7-0? ( dev-php/pecl-http:7[php_targets_php7-0] ) + php_targets_php7-1? ( dev-php/pecl-http:7[php_targets_php7-1] )" + +PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps ) + +src_prepare() { + if use php_targets_php5-6 ; then + php-ext-source-r3_src_prepare + else + default_src_prepare + fi +} + +src_install() { + if use php_targets_php5-6 ; then + php-ext-pecl-r3_src_install + fi +} + +pkg_postinst() { + ewarn "This API has drastically changed and is not compatible with the 1.x syntax." + ewarn "Please review the documentation and update your code." +} diff --git a/dev-php/pecl-http/pecl-http-3.1.0.ebuild b/dev-php/pecl-http/pecl-http-3.1.0.ebuild new file mode 100644 index 000000000000..d74da5940a22 --- /dev/null +++ b/dev-php/pecl-http/pecl-http-3.1.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +PHP_EXT_NAME="http" +PHP_EXT_PECL_PKG="pecl_http" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" + +USE_PHP="php5-6 php7-0 php7-1" + +inherit php-ext-pecl-r3 + +USE_PHP="php7-0 php7-1" + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="Extended HTTP Support for PHP" +LICENSE="BSD-2 MIT" +SLOT="7" +IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl" + +DEPEND="dev-libs/libevent + dev-php/pecl-propro:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?] + dev-php/pecl-raphf:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?] + net-dns/libidn + sys-libs/zlib + ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) + !ssl? ( net-misc/curl[-ssl] ) + php_targets_php7-0? ( dev-lang/php:7.0[hash,session,iconv] ) + php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] )" +RDEPEND="${DEPEND} + php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] )" + +PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps ) + +src_prepare() { + if use php_targets_php7-0 || use php_targets_php7-1 ; then + php-ext-source-r3_src_prepare + else + default_src_prepare + fi +} + +src_install() { + if use php_targets_php7-0 || use php_targets_php7-1 ; then + php-ext-pecl-r3_src_install + fi +} + +pkg_postinst() { + ewarn "This API has drastically changed and is not compatible with the 1.x syntax." + ewarn "Please review the documentation and update your code." +} diff --git a/dev-php/pecl-propro/Manifest b/dev-php/pecl-propro/Manifest index 1413fb11052e..f4b0802be058 100644 --- a/dev-php/pecl-propro/Manifest +++ b/dev-php/pecl-propro/Manifest @@ -1,6 +1,8 @@ DIST propro-1.0.2.tgz 13393 SHA256 6b4e785adcc8378148c7ad06aa82e71e1d45c7ea5dbebea9ea9a38fee14e62e7 SHA512 a4a3216d13c412051c063e0370c5f0badb65aa7054a43b0f6eb387a7a5fbbba1800b7f5f5113ba68ca8c7fe19932184a069864d1362239c71e0f55466c9cc8eb WHIRLPOOL 96d6edcf0e7df73f5c4b53d7b90450e0b3b01c7b63887ee979ea9f16e765346fa7638ed30df8d1ef7375b41deea84fad945fd7b8310a138dd44a76f830395c73 DIST propro-2.0.1.tgz 13399 SHA256 ce136875650e22d28804a41a62a5325fff85318e559626d63c5b8875fb2e4529 SHA512 c5a5f7c1fdf042d49597df789dc2b2e4e1512e7320a3a39cad344a9dfa3b9253b4a98d2f33e10e04ee608e5b8d1e1b50238787510db0a0f99d8f8b45b91c5c22 WHIRLPOOL dd1d05eb2fb1e6f05eece95d64ccdd1c66097db99f180a0d36451824e53874505fbaac66ca283889d54ff0b361fa54ee519e32d8dae5658b840712759479ff1a +EBUILD pecl-propro-1.0.2-r1.ebuild 744 SHA256 c10b6f25c8cbf9e5398119d4e594dd46d9832e6b6c14c7e126973008cc808653 SHA512 6ace829961211e9cb83889d752ce7d1e96c702b5119c59abbc9c750876e4c0d7f1b8faf47dd0d1487beeea1161c6458991de5e0d003e0b0f5d72c890e1a40a92 WHIRLPOOL eceae8c17b8ad56a69d3bcfcbfd6d95e8db1f574c41b71513a59d447f74f7975fce7c876a7c1a04a61aaf1b2c3f5edec6b85863a46e172923d5116c44d0faaa4 EBUILD pecl-propro-1.0.2.ebuild 338 SHA256 beaa3eaa2d7b096b85fb87115959e55da60d6b8dde78fc434fed9433d06fffd1 SHA512 a95bd3a320ff633e4d7a5278c7324af3d328754c9606bbaa4c4de7da0f7269e85483600bd5f4acdf129d725dac1f41924a16910ef295fe55d6d2b4f9e1a26e02 WHIRLPOOL 9d0957cbf332a91776134d7e7738b6d4ea3e43048eee30844b620d8d63ca2ca8fd2b4f3729a45c88b6b44e6886475160d3757782d72a4078a6a96949ffc6d7dd +EBUILD pecl-propro-2.0.1-r1.ebuild 759 SHA256 3153f4d5e1ee9a5b223d59a7fa42379e47d299fbca737f00f64a2cd4a798f112 SHA512 c27d8d89fa7dca01b6c544b7976628638be90160f811d713f2792a7b3973614700d7b38f8b2dbe93c28b2bf3d1efb33b9ca74141d34313688e221197004a2ab3 WHIRLPOOL d840e3ccd1b8dcf3b89e94ea1d82b252b843e95c6a6af80a56c921a9f2f09919433aefcbbc768deb28adfa10924485f1ad965d71787f7996c69bb612062e7e73 EBUILD pecl-propro-2.0.1.ebuild 584 SHA256 169818c170c92438e523cedf29ef3e4a22a8ad392da0b9cb739de3d8fea51cfa SHA512 a0a17e250c19607c9fcf53b7a9c4865ebaf6d9262af3ef79a358a8c2eb8355b7fdb95b86211c38a6a9dc84ee0995d0fd83a83325d9623ad9efd7de3c858879ea WHIRLPOOL b4722eaa118d26a6ea05072dbc6a973f03e196ba4b607406e814242c9bca94dcdcf7702a01c65c9fb70c31c318cf455c650abd3ecc0a336a0859c4ecba6e3e65 MISC ChangeLog 1034 SHA256 f28eb3495601b62a2d2a2f8cff10543147fb505ad1fa0c774a52f3d9a827eb7a SHA512 ca104b686f5e85db393e53a6072b7ec96c9adba26daf132d564c2939303a07f91dd97e610f29b32de7255b48698a30a12e376a599760bba79ace870906fbb0f7 WHIRLPOOL ab5b901ca3ff6d8efa78f84cafab5d34f433758f63f8a9e8aacae5426a51e8891d286ff3ad6ca929dc8fe480aa235372821ef7a1c1a7e6ed77778e340921b463 MISC metadata.xml 239 SHA256 b54aca642ac424532264a97d14931720ed288cf387dbdef6a10b34ffed6689f1 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 WHIRLPOOL 80ab9605bb31ce3310bf524de4705c67ca85cf8f2346b7e13274595598b9fe92c9b119beb865ef214ad33ef172b880e318d18ff8c8d2026cb7319f0524d8a7aa diff --git a/dev-php/pecl-propro/pecl-propro-1.0.2-r1.ebuild b/dev-php/pecl-propro/pecl-propro-1.0.2-r1.ebuild new file mode 100644 index 000000000000..b69efb9f4d36 --- /dev/null +++ b/dev-php/pecl-propro/pecl-propro-1.0.2-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +PHP_EXT_NAME="propro" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +PHP_EXT_ECONF_ARGS="" + +USE_PHP="php5-6 php7-0 php7-1" + +inherit php-ext-pecl-r3 + +USE_PHP="php5-6" + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="A reusable, property proxy API for PHP" +LICENSE="BSD-2" +SLOT="0" +IUSE="" + +PDEPEND=" + php_targets_php7-0? ( dev-php/pecl-propro:7[php_targets_php7-0] ) + php_targets_php7-1? ( dev-php/pecl-propro:7[php_targets_php7-1] )" + +src_prepare() { + if use php_targets_php5-6 ; then + php-ext-source-r3_src_prepare + else + default_src_prepare + fi +} + +src_install() { + if use php_targets_php5-6 ; then + php-ext-pecl-r3_src_install + fi +} diff --git a/dev-php/pecl-propro/pecl-propro-2.0.1-r1.ebuild b/dev-php/pecl-propro/pecl-propro-2.0.1-r1.ebuild new file mode 100644 index 000000000000..047db83f2b61 --- /dev/null +++ b/dev-php/pecl-propro/pecl-propro-2.0.1-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +PHP_EXT_NAME="propro" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +PHP_EXT_ECONF_ARGS="" + +USE_PHP="php5-6 php7-0 php7-1" + +inherit php-ext-pecl-r3 + +# Only really build for 7.x +USE_PHP="php7-0 php7-1" + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="A reusable property proxy API for PHP" +LICENSE="BSD-2" +SLOT="7" +IUSE="" + +RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )" + +src_prepare() { + if use php_targets_php7-0 || use php_targets_php7-1 ; then + php-ext-source-r3_src_prepare + else + default_src_prepare + fi +} + +src_install() { + if use php_targets_php7-0 || use php_targets_php7-1 ; then + php-ext-pecl-r3_src_install + fi +} diff --git a/dev-php/pecl-raphf/Manifest b/dev-php/pecl-raphf/Manifest index 1efc32ff6bc2..c0aa27a93e62 100644 --- a/dev-php/pecl-raphf/Manifest +++ b/dev-php/pecl-raphf/Manifest @@ -1,6 +1,8 @@ DIST raphf-1.1.2.tgz 15915 SHA256 d35a49672e72d0e03751385e0b8fed02aededcacc5e3ec27c98a5849720483a7 SHA512 dbde89a8ba508727ab2511b977b74fcc06010d75d043c2acca31e75cac2a105a8c322a01995271ab89fcd39d42a16b36c6d1c06a569e33926c0626d30a6672eb WHIRLPOOL 453f9cc174e71b2ea3750a05cb9596309cb023fdd9b42dc02e0faa618980e1e28e3f4adfa0101750a4399e40992089b742e53ea334ddc2f1e8d445a16ba89dd8 DIST raphf-2.0.0.tgz 15715 SHA256 95a59ea0dc3fc172805a6acd8327b122dd159b0a85b253826166457a05efa411 SHA512 16b029b694d30817a68a1a9d80bdf031d058ada45a93a4b34b49ec5d61fa8af78d0dbf1a3e5e2f1b950b2a11ac0b86b5a467807551556ab2a77f7f99739ed11b WHIRLPOOL 211c371bc64534823fac35dbdefa847e15447ffd7ee2a4294ae0e2fe93d2b3d5c6adfcaa9ca88c352df28b7598457f47da47615a3e7b0bf1e58202350048b692 +EBUILD pecl-raphf-1.1.2-r1.ebuild 757 SHA256 be7e961c2adaf822a8304c40125d5182266e4e9722da9d8b1c18c1b649abf39a SHA512 bbab7ada7d6d7a8152ffd0e8f26b8cfb457b653788c03db1936ad48aea0dfc2d33bbf1163de4822ac91a7b392fd51a66f57f9c340c5e6099440bcc032c6745f9 WHIRLPOOL fbe4ba49484df1680365a196b051b7cbc002a30c42150dbf6ae3d245fa8aed4af78ab30817c9079a76aa20c16fb3333253995bd352c0e6521b56bf0af4c61409 EBUILD pecl-raphf-1.1.2.ebuild 353 SHA256 7ad0274502aa9163163d3cf5a0b98b4ca52c9c42cfbeac906d3ad1dc7744145f SHA512 ebca04f628b72090bb185e908c5d5f9fb7a9345f11b26fb2341a885d044c8a251c9c2035a63cc158a1fcaa73a84bf76b10a39d62d9fd6fedd812c8881747dc24 WHIRLPOOL 843669a56564d62481c7da11ca68cd0e79e1d71d93a8445e5012aa0f3b2a675f746fea76869b1e54e9911e865c43351228c5ad228aae9e0acda5cab6dda19694 +EBUILD pecl-raphf-2.0.0-r1.ebuild 775 SHA256 86f7deb5cf4721d870618d8b7910e5f5c03c8f0f4aa2063675567ce24801bcf1 SHA512 9668556c3a5e0c629f60bf8a88091801ab6b67e0a77715cfc09ba585eb4199914f4491fba5b649734bb7a11b719e6c0885d1641f29355dd8fa138e9c35863fd8 WHIRLPOOL 8e88328d72bb160bb7b4205b2a38e781c3c662ce01c154dfd3609c94eaf06f19553a382409c06f120778dafccca1f72e06c1d25d91ca7664af1df62fa388df75 EBUILD pecl-raphf-2.0.0.ebuild 600 SHA256 417f5a8ae55f2330ad512e449aac7be67747931d668b064d7218129e685daa8a SHA512 17fc42eaf47a2ff46a2bbab83a7b348d304ede950f1fdbbf7ab0d196a3ce317b65a17389531ddb1e70820c61f4f6f9c9df9bac950d494280754f2766a5a4f72c WHIRLPOOL cb4ccfa630aff5b03ae43becc04b0aa346c0a7a4052e7953ba399974ab82514e71addef8f1251dece11cb87c992f61ec58901cb077bb934f5ce95bd7c12c13d2 MISC ChangeLog 1017 SHA256 686650e4ad0b47a3bea7ec97f56f81a6c3354520241e40a9010b9f81277e218a SHA512 f43c0612301e336080a197bdf07d931f089ae2a0f0683b7558318052f35292ff892ea1a8f973a4acccace9db4953d2eb14e7856478e065531c5e96351a72ecaf WHIRLPOOL 5e188417fa8ad30c99ed114fb41d05aacacbc46f96423ec1dfe9a57266cc2c5a934d6276a70028a1de7a850737477e32a11c3d0ae611dc60623edffaf6916a09 MISC metadata.xml 239 SHA256 b54aca642ac424532264a97d14931720ed288cf387dbdef6a10b34ffed6689f1 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 WHIRLPOOL 80ab9605bb31ce3310bf524de4705c67ca85cf8f2346b7e13274595598b9fe92c9b119beb865ef214ad33ef172b880e318d18ff8c8d2026cb7319f0524d8a7aa diff --git a/dev-php/pecl-raphf/pecl-raphf-1.1.2-r1.ebuild b/dev-php/pecl-raphf/pecl-raphf-1.1.2-r1.ebuild new file mode 100644 index 000000000000..9875d132d89f --- /dev/null +++ b/dev-php/pecl-raphf/pecl-raphf-1.1.2-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +PHP_EXT_NAME="raphf" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +PHP_EXT_ECONF_ARGS="" + +USE_PHP="php5-6 php7-0 php7-1" + +inherit php-ext-pecl-r3 + +USE_PHP="php5-6" + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="A reusable, persistent handle and resource factory API" +LICENSE="BSD-2" +SLOT="0" +IUSE="" + +PDEPEND=" + php_targets_php7-0? ( dev-php/pecl-raphf:7[php_targets_php7-0] ) + php_targets_php7-1? ( dev-php/pecl-raphf:7[php_targets_php7-1] )" + +src_prepare() { + if use php_targets_php5-6 ; then + php-ext-source-r3_src_prepare + else + default_src_prepare + fi +} + +src_install() { + if use php_targets_php5-6 ; then + php-ext-pecl-r3_src_install + fi +} diff --git a/dev-php/pecl-raphf/pecl-raphf-2.0.0-r1.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.0-r1.ebuild new file mode 100644 index 000000000000..c70af5650bf5 --- /dev/null +++ b/dev-php/pecl-raphf/pecl-raphf-2.0.0-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +PHP_EXT_NAME="raphf" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +PHP_EXT_ECONF_ARGS="" + +USE_PHP="php5-6 php7-0 php7-1" + +inherit php-ext-pecl-r3 + +# Only really build for 7.x +USE_PHP="php7-0 php7-1" + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="A reusable, persistent handle and resource factory API" +LICENSE="BSD-2" +SLOT="7" +IUSE="" + +RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )" + +src_prepare() { + if use php_targets_php7-0 || use php_targets_php7-1 ; then + php-ext-source-r3_src_prepare + else + default_src_prepare + fi +} + +src_install() { + if use php_targets_php7-0 || use php_targets_php7-1 ; then + php-ext-pecl-r3_src_install + fi +} diff --git a/dev-python/astropy-helpers/Manifest b/dev-python/astropy-helpers/Manifest index 44b8da0af170..a288e174f793 100644 --- a/dev-python/astropy-helpers/Manifest +++ b/dev-python/astropy-helpers/Manifest @@ -1,7 +1,7 @@ -DIST astropy-helpers-1.1.2.tar.gz 132787 SHA256 d4ae269f7bb6f41f791334b524e788c37e07787b2a3efe9906da8d30f645824e SHA512 28fef972c92bd988ef9456292f5f02d12d27d64fa181985fec799ebe23c472cab61ce7bcebb758c46273c2a2e8098b15ae3242b5961bf84f5ffe8e5f91e13ff8 WHIRLPOOL ecbadad319cfb9e2afbb6120230ac24b59cb82e3489be54d63769681ecd22b841f5a1d58fa7ae7e4fd706b5eda761bd30b5a8b647e70205e5fab526384786e14 DIST astropy-helpers-1.2.tar.gz 134346 SHA256 623a9efdd1f34ce4fc71effb225bf5b8ff06ff515bd8e6b751aba2c7ff207661 SHA512 c343b2d8a2f37f8baa94a4920c458b23fe28e5afa812937559cd10c1f6750bacc21aec38b8f52367ec68e2ea3ffeea85125290c320288888b3076abebb8f2e7e WHIRLPOOL 528ac9acb02bc03f3af61649be08ecc5cc39c26c7fc408664b38d4b662a64ef5350e6f9127bcbd5c9c8765d196c6b90221e0e192b70c70953d8e6b9dcbfe5aa4 -EBUILD astropy-helpers-1.1.2.ebuild 573 SHA256 2718d28e9d31aeb5f5ccb892696f41f3ccb400317fd3fd1d9ee7fe376f112357 SHA512 bc5afb518da0cb9398911b781f1e8a8013d612c14ad2fa7d2f915dc1183d3f0352d460331daf0486c6007c2a4e35c914791f68054a3f0c93604771ca8eff6815 WHIRLPOOL a272319476990125255e12fdfd484050512b1797b1a9ddc286696bc6d1144f91a2501270f0196b4c3aeb7b4a302f93480682f964a5906ba13b980fdf09dee939 +DIST astropy-helpers-1.3.tar.gz 136411 SHA256 8e7410e5045bdccc68a8010624eed4ab0ef019a4fc621cae6eb900f51b107e20 SHA512 f72a5de8ce1af5f340067bb9e76ccd6dd39195e4f65faf28ee482ef16ecec7e7dfb4cfbb4ec2db333a13bbf34e7f5f968041af807672421419f90f672c599ec4 WHIRLPOOL 2354912bbbd9b0ef1d165cea4b1fdaee7f978aebe40086d23d3a9905085fbb6a52dd97807ad8305b7b58269e281c2593b5a3f9c6d426f361c498a94f3cf37cb3 EBUILD astropy-helpers-1.2.ebuild 605 SHA256 89ee64a5720dc2a100e49cc75eb577b0615ad4ffe998ee5f9ecf1329b11516a9 SHA512 2147d7313183a1d55cd66a3471b971a0fcca29297035fe8d71dc557d6bfd80d430e029ed79849e106d3275fa34c7cb17802ec773bf17969a30a3fa379801c493 WHIRLPOOL bd51bb2959ec81a19f1627faba9d8bac2604201c1b3767821d2cb06d4b7387ae2d9f7784b21e588b1fb217b930f0af91f8b8c7c11e63ed6fb2d3efe47dd0696b +EBUILD astropy-helpers-1.3.ebuild 606 SHA256 6a659c5743b7bab6eb16d2c05839c2ffa6a9769cb332796ffeb51bb3f67d4782 SHA512 29ed8691df342e03b7fee46d1ce7d5b1529d132bf6bc2854db797b9ca7723f1974160d3b7e4de4e1199943fdea3c305e00081048065574bdbb558c30b7a3beff WHIRLPOOL bb6644728f0225d10454449436628544d7098eb793a8d36819e9b1eb863f48bcce583d25614fdabfa619e01ab30225f10fbbea04aeeeed321523cb1d50a869b3 MISC ChangeLog 4416 SHA256 d6044394305b4f7d79f4c698cf389f7c43da3ce48382c9ac1c86ea86011ef03b SHA512 30baaaaf199c5e69539a81a0b2e02d5c16f2ca99cd0b747a62081675b50c06fe7ec3684b31a9a72fc0b2421a50a002786f2419b5ffec05ea48d59c3036aadddd WHIRLPOOL 918ad7a9942ab12383c0eb30252fe965d2e23b2b35371297b31217ae248403a7c2d688a9d539f761d7ee5ddfb5e6846955e05c021f90d04e383064c3508c0bb0 MISC ChangeLog-2015 754 SHA256 454727f071e60c56ef14dbc09dea476598b4b54ec26af04610e46beb71e1d036 SHA512 d7c522134126a06650cc83530ce4b6a6f10821aaf4af8e7b82719b6aebe30a108eb5bb5f4aa38f80696a46feb0939e8f7b5a5f146cd1736fd3c9c2936c0ea8d1 WHIRLPOOL 7716911c464e56c978f76b71cbf672f1cf9e16973a5f8a1b3fc2b4a4e4ae7067767e7d274e25dcec72519494a801c0e3a1d057eabcc424e53fbbf109845b3ed9 MISC metadata.xml 558 SHA256 2a806bf747d2eab10beda4d7f2997950438de201bf8066a799b74d5c8036fea1 SHA512 89de5e5c1557ac63fe6147d8208ac796a740c818477590968ab25ca11ac3b90433c946f73459990bf431c840ce7c85c0bfb282ab2b93266cb8f66058ef0046a9 WHIRLPOOL 96458b0528774d027b1b48ae0a4f68e08fa3ba09b899efd13ee0f5b6588a05e13e9f45f87e9c0b173d900256c8f3004e20f1a3a86d83e3d2943946becb54a073 diff --git a/dev-python/astropy-helpers/astropy-helpers-1.1.2.ebuild b/dev-python/astropy-helpers/astropy-helpers-1.3.ebuild similarity index 91% rename from dev-python/astropy-helpers/astropy-helpers-1.1.2.ebuild rename to dev-python/astropy-helpers/astropy-helpers-1.3.ebuild index f7cda012b24f..f5ac3b40493f 100644 --- a/dev-python/astropy-helpers/astropy-helpers-1.1.2.ebuild +++ b/dev-python/astropy-helpers/astropy-helpers-1.3.ebuild @@ -6,7 +6,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5} ) -inherit distutils-r1 +inherit distutils-r1 xdg-utils DESCRIPTION="Helpers for Astropy and Affiliated packages" HOMEPAGE="https://github.com/astropy/astropy-helpers" @@ -19,5 +19,6 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" python_prepare_all() { sed -e '/import ah_bootstrap/d' -i setup.py || die "Removing ah_bootstrap failed" + xdg_environment_reset distutils-r1_python_prepare_all } diff --git a/dev-python/astropy/Manifest b/dev-python/astropy/Manifest index 42fd53ac2c12..d93a85db6c12 100644 --- a/dev-python/astropy/Manifest +++ b/dev-python/astropy/Manifest @@ -1,14 +1,13 @@ AUX astropy-1.0.4-system-configobj.patch 601 SHA256 6caadc044d0f64b5f372344371f9c0dd05c8f414746348474c55d42307c73817 SHA512 9cb9bbb65fb4c1e3f45256643cde6e2c3f5d9cf60bd3ce2d1aab7e1f4d1fc82581e85059b1f8f50af1217836928bec83db5d87633c1252448ddfdbb3ec3b819e WHIRLPOOL 7bfcb31e2938f8792a753bb70a9d59bfe7ee246680c178a6832a275e659f80074c17b47e05ddfeb30a0ccdf5b004fd2f9fedc8a0ee2c751a987b58f68edfc1c8 AUX astropy-1.0.4-system-six.patch 568 SHA256 0bb273644ec20180ed6e6a27d48341161ddd2d84079d06c21e28bf78548a166d SHA512 7687cd3fb2dc8f9d491ec15cc848c53aa58df2405bb1a48d68c384b5a3595502abcf2413bef95963c4fdf30470f95b0906a3fd991ad3b72f54a82ea2da3c8594 WHIRLPOOL 8a14d11c3c9431e124ac46699240454ffdc85bfcb68e6e9e865de67693f6a7ffd635706dfc81a5046b98844643ea775405997995b337860354acebba07246ae1 AUX astropy-1.1.1-mark-kown-failures.patch 3418 SHA256 59bc0b993b64999a1665aea58ed4634d9838997fbc305d1398c7b9160fc994ac SHA512 0b8b29c5cd9c9781c4f64c4595fba11efe1bd6d06be56a80fc8832a295b9c95993281014c642b21d40f3be18835de6d83796977c495a8c2ce1029c935d555962 WHIRLPOOL 6921e905d03c29033376ce2020576da05cb9ea8f93b84c869516f06491f181ce32d05eebb197cac3545c5dd2984fc23132c72940668cdb80d6e825aa960f5cc2 -AUX astropy-1.1.2-cfitsio-338.patch 1216 SHA256 40cd2cf186034cb0c2be3eefdf2ed0d3eb47ed9a37d87bc1b8049f8211aead4f SHA512 229a451224112c22b5bed9c063bb81237ac49539e04fb74d8e949aa13ef35b3a3e02ada69ae2fc0708d6772a6d42fb993f031757288323f081654ef5dd0173ed WHIRLPOOL 919d9d70001d429bea30aef89c43cc79be21fc6d561f68d8b386cfaf7c9fa14986bc407bb6b8c2078a99096a8452a212bd71bb57f8fe5c26e0fe937e4c09ac0e -AUX astropy-1.1.2-fix-for-pytest-28.patch 1853 SHA256 ecd217dc9e86bc21fc1a61e51e0184efa54440b2ecf217430419b6737f00efbd SHA512 dd5554f0e1655fa5cbfa142e35ec032716665fbdf849d13e61f2b5ea1c39684e16870cd502169bcbaf677102a0f39c14ac9a671c05e9b52be6c8de553797e9d5 WHIRLPOOL 0e4cb62353f77a7a1b1210ff6c82f1d4acf650027f282a766f2a102b8110655b23f8a519e1b0550cceef7eec7ef00921374e0cfa1fd82007b94ca94499bdf3e0 AUX astropy-1.2.1-cfitsio-338.patch 667 SHA256 3280d270dd75acba713b162a60e5873a97c3c389c55c932b45859b962dfb9fad SHA512 4422dc794e2ad3ff91342b521b447115157c464883b928970ccba6a999bd7a1ceea2d5fc48f3c39769be4b9a174d571bd57ba58d1a08d90fa72f626932d60668 WHIRLPOOL 6e2f6e4e6623c6bfb9c1755e2e43ebd6c70fbb5995ab717b205921283f0f502ca9b87166bbae41fa34488cfcfc769d544f78ae456cc79170ca56350136a5d6e4 +AUX astropy-1.3-mark-known-failures.patch 3374 SHA256 77aa14ba69b3df9f11ac1895b5d7f667c6213e2bafebb258a28c21641743e824 SHA512 7a2b9bb3a97ed99efe5c61d98e141e53775a1c106c758d662e22f7f6651b05e1d2ac429983b7fe431a07c9b94a93a43b158d68251a03220d3138683c52083a06 WHIRLPOOL 15861ec446d3ad34106daca334b785b53dc7b2861db7a538660ba76f20b12a5f318488ad15bfafcfd51afb139f526060ece4e5fdd1892e769685841896db0a56 AUX astropy-ply.py 1674 SHA256 9f58bcd0f6491aaebc6b6778314c8f3ac95f2dd10d01ff63c417ba77e5fd05c8 SHA512 ebf5a7ec8df3c62b2f7ba91a4c5138558583186dfb945c89cc1454f9cafadc0e11bb5390c2aa57a993ca98e04dd06167e94d54fb1acc4b49c16e90dbab6b63d7 WHIRLPOOL f3edcb0ca04d47e8368b9a287fcd1a55af7293230c37750ba0e4f7dbfb82efd33a6d1b1c284417707344a9ecc63dc4c958c79f151c7749f8b3e98272586061e0 -DIST astropy-1.1.2.tar.gz 8059713 SHA256 6f0d84cd7dfb304bb437dda666406a1d42208c16204043bc920308ff8ffdfad1 SHA512 b83c4a1415a3eb8c016507705d0d2f22971e4da937bb97953eec08f8f856933d8fa76ce8c536122235b19e7879b16add2e20fd2fee3e488f9b2b4bf1b9f4dbdb WHIRLPOOL 01cdfd33c29f7128e88be3f53b7ecdec37d95ba06acae6ceeba83746e0454aa220396fb00519b30639ac01b5b297fad004488d34856295735e04924d154c4eb9 DIST astropy-1.2.1.tar.gz 8179665 SHA256 0d7ef702166f26fed239b59fc12edcd5243ca5bf562a36202fd8c6b0270d6e48 SHA512 2ef37537a4c6b2ec50a1d898f600978475c9c5d2cb66ba19d06782656e9ddcb4aa6a8e53217e318448cedac45dac0dce0d8cc2fe94cddc15ebb306b3b0794595 WHIRLPOOL d37374f23a0121fdc92fa572facc248f0a571dacb8edcf1a9d0987d6a40287de199262ec01f654bd6ea5aece826e5588d2869558152adffe9ab490fa46f2e36d -EBUILD astropy-1.1.2.ebuild 2755 SHA256 6194e2abf49e8a9d856b0b4855e5212238f9f5955c7e4250314ce3e7668f9d6b SHA512 e7f00327e93c651298d277e958e1a340e1b5f44cc88d7e349d6051f1469132888cd3ba1684b98f41521c5369c58b6f26e90acfc9e0483859b21e6fbf426ca7b4 WHIRLPOOL 52a9a79e1aac2c684e7bab5849608a9d216727f417a414b21387755ad263640fb7f6d43a43d3f0b7e4d5b59e565aace4ce11580474d4f5d0847c2db78b455b41 +DIST astropy-1.3.tar.gz 8372366 SHA256 49de3e86482abe24e3cd02c4a30a469ee4b928d5b46ea5f70fa605ff6f9c6d38 SHA512 1dd667af78be568bd4719d273d432881d7dea03725deb24a045726b315f8e5cd8afac3f6f925867b05c4c7924cd71d7e7d6ae15985a95c7fcc4421e52273983b WHIRLPOOL 2913c195989c2af0a58ab5e675bd41607bb28273265c0a502c8b1d33925994f9127c9a03058b55aabc1b3a8c594e89ddbd2d5fc38c42dd4723998bad01c7bd45 EBUILD astropy-1.2.1.ebuild 2728 SHA256 c8b1155276c37d586af52aeef4c3e28211e59c6d78a2af687984d1be71a537c8 SHA512 0b374368db3837cb506bbc3e84e25d61ad576f02b1f3fbe01773360ca88cbcec465b6160215816ef8df578d6b1eeac96016dcd52ecccb23052826b39aaacc7c6 WHIRLPOOL 1a0c4e8131d2e5e7ca2be33efca99d7824be53e4dfac50eac2a1e819e4e286113302decca3e7a837b91e4c56d5f5bd3c767902e1466b4e9db28a01fa0ed4d187 +EBUILD astropy-1.3.ebuild 2319 SHA256 4e758a3b1db6bba26a27e9b3251e43676392c50842927d7d0ce31a0b6c0efdbd SHA512 73731f05917ce3bdb077508061e620240f46665c9d60e3551ecbdaf9342e867f2eff4537f12579af9feedbd3cf9a56f3861b9b4ae7ae2f411a7a6256cbbf67cb WHIRLPOOL 744d453f1d51d06fca4aa3f10893739092e7be980ef03d38d3bdc639adef3108bc09e9756c3ceb9ee19855ad8df248fa4e97dc9cc19ffe843f70bc57ece46d57 MISC ChangeLog 6917 SHA256 444c267ce4e2dbff8d0d2a3b072786dcc2ff2009c30ea7bb2c33c5eb40c2fadf SHA512 44ca7409313bd23606f4501470168a19f71da9976f050f700a19513051fd3793383c9f8dbf9604c293bde989962933e2cef674aa62af87a8b7e0cea3eda66f7e WHIRLPOOL 1febdd98889a209ae584cedf67ae4ed2de39da74dbc47710bb13397dd234f3093754bd68d0325bdfad0b19b9b163006fd7bfa18aa4c74bf0e8332eec7f6352ba MISC ChangeLog-2015 3905 SHA256 0caa97d13b7b0a80d2f5b4ea1d60ab6ad79b751e13e86694e83b0d77a083936f SHA512 d1321808335b50433e13c3238130153bbf5803b22145796ccbbdccd58d4636bea2d762fa0f71eb799293227e4124cb5ef1fee769f05b70201c48120c7a008914 WHIRLPOOL d06117b036c97da9f9abd4b8b525b0d17fa4d508fccc2b079ca6adcd2cb5e48334f8e95a514b29ccf61615d4fbc6685996e39e323aa8b1137546f8806f6e9742 MISC metadata.xml 573 SHA256 bdd68bcb0bf0c3ca0e5ebdb00f7b04b6c22f60cc4958eeeacfc9f0657683d5da SHA512 a8054d4eb431348c9840e37a5877c2ce7cd4b73f213c1a24f9d3548dfc63a6756d80ffb9f96f78a053fb4ae2a39a424dbe46257be2e9f892f42ec18ff44fad17 WHIRLPOOL 87d8d5f608325797299e4c6ed130f76b7446535d4355ec7b338dc5ce834ab7224f489519b5e27ce73b273a3f19226232a0be2e6e06bb4a2e9a9330d5f37c668d diff --git a/dev-python/astropy/astropy-1.1.2.ebuild b/dev-python/astropy/astropy-1.3.ebuild similarity index 63% rename from dev-python/astropy/astropy-1.1.2.ebuild rename to dev-python/astropy/astropy-1.3.ebuild index c8b61aea91c5..d85184f42f3e 100644 --- a/dev-python/astropy/astropy-1.1.2.ebuild +++ b/dev-python/astropy/astropy-1.3.ebuild @@ -6,7 +6,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5} ) -inherit distutils-r1 +inherit distutils-r1 xdg-utils DESCRIPTION="Core functionality for performing astrophysics with Python" HOMEPAGE="http://astropy.org/" @@ -18,12 +18,12 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc test" RDEPEND=" - >=dev-libs/expat-2.1.0:0= + dev-libs/expat:0= dev-python/configobj[${PYTHON_USEDEP}] >=dev-python/numpy-1.10[${PYTHON_USEDEP}] dev-python/ply[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] - >=sci-astronomy/erfa-1.2:0= + >=sci-astronomy/erfa-1.3:0= >=sci-astronomy/wcslib-5:0= sci-libs/cfitsio:0= sys-libs/zlib:0=" @@ -34,13 +34,13 @@ DEPEND="${RDEPEND} virtual/pkgconfig doc? ( media-gfx/graphviz - $(python_gen_cond_dep 'dev-libs/libxml2[${PYTHON_USEDEP}]' python2_7) - $(python_gen_cond_dep 'dev-python/h5py[${PYTHON_USEDEP}]' python2_7) - $(python_gen_cond_dep 'dev-python/matplotlib[${PYTHON_USEDEP}]' python2_7) - $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]' python2_7) - $(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7) - $(python_gen_cond_dep 'dev-python/wcsaxes[${PYTHON_USEDEP}]' python2_7) - $(python_gen_cond_dep 'sci-libs/scipy[${PYTHON_USEDEP}]'python2_7) + dev-libs/libxml2[${PYTHON_USEDEP}] + dev-python/h5py[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/wcsaxes[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}] ) test? ( dev-libs/libxml2[${PYTHON_USEDEP}] @@ -50,20 +50,13 @@ DEPEND="${RDEPEND} sci-libs/scipy[${PYTHON_USEDEP}] )" -REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )" - PATCHES=( - "${FILESDIR}/${PN}-1.0.4-system-six.patch" - "${FILESDIR}/${PN}-1.0.4-system-configobj.patch" - "${FILESDIR}/${PN}-1.1.1-mark-kown-failures.patch" - "${FILESDIR}/${PN}-1.1.2-fix-for-pytest-28.patch" - "${FILESDIR}/${PN}-1.1.2-cfitsio-338.patch" + "${FILESDIR}"/${PN}-1.0.4-system-six.patch + "${FILESDIR}"/${PN}-1.0.4-system-configobj.patch + "${FILESDIR}"/${PN}-1.3-mark-known-failures.patch + "${FILESDIR}"/${PN}-1.2.1-cfitsio-338.patch ) -pkg_setup() { - use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) -} - python_prepare_all() { export mydistutilsargs="--offline" export ASTROPY_USE_SYSTEM_PYTEST=True @@ -75,12 +68,12 @@ python_prepare_all() { [build] use_system_libraries=1 EOF + xdg_environment_reset distutils-r1_python_prepare_all } python_compile_all() { if use doc; then - python_setup "python2*" VARTEXFONTS="${T}"/fonts \ MPLCONFIGDIR="${BUILD_DIR}" \ PYTHONPATH="${BUILD_DIR}"/lib \ diff --git a/dev-python/astropy/files/astropy-1.1.2-cfitsio-338.patch b/dev-python/astropy/files/astropy-1.1.2-cfitsio-338.patch deleted file mode 100644 index d4a8fa072c5d..000000000000 --- a/dev-python/astropy/files/astropy-1.1.2-cfitsio-338.patch +++ /dev/null @@ -1,35 +0,0 @@ -Author: Ole Streicher -Description: Make TFORMx check more flexible - The maximal column length in cfitsio changed between version 3370 and 3380. - This patch checks their syntax, without a specific length. -Bug: https://github.com/astropy/astropy/issues/4646 ---- a/astropy/io/fits/tests/test_image.py -+++ b/astropy/io/fits/tests/test_image.py -@@ -4,6 +4,7 @@ - - import math - import os -+import re - import time - import warnings - -@@ -1010,7 +1011,7 @@ - hdu.writeto(self.temp('test.fits')) - - with fits.open(self.temp('test.fits')) as hdul: -- assert (hdul['SCI'].data == cube).all() -+ assert np.abs(hdul['SCI'].data - cube).max() < 1./15. - - def test_subtractive_dither_seed(self): - """ -@@ -1265,8 +1266,8 @@ - - with fits.open(self.temp('test.fits'), - disable_image_compression=True) as h: -- assert h[1].header['TFORM1'] == '1PB(30)' -- assert h[1].header['TFORM2'] == '1PB(359)' -+ assert re.match(r'^1PB\(\d+\)$', h[1].header['TFORM1']) -+ assert re.match(r'^1PB\(\d+\)$', h[1].header['TFORM2']) - - def test_compression_update_header(self): - """Regression test for diff --git a/dev-python/astropy/files/astropy-1.1.2-fix-for-pytest-28.patch b/dev-python/astropy/files/astropy-1.1.2-fix-for-pytest-28.patch deleted file mode 100644 index 0d62e9c963a4..000000000000 --- a/dev-python/astropy/files/astropy-1.1.2-fix-for-pytest-28.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e904df784b91fd45e7dfcdec0713c471bb03efff Mon Sep 17 00:00:00 2001 -From: Thomas Robitaille -Date: Fri, 1 Jan 2016 19:36:39 +0000 -Bug: https://bugs.debian.org/812648 -Bug: https://github.com/astropy/astropy/pull/4349 -Subject: [PATCH] Fixes to pytest plugins for pytest >= 2.8.0 ---- a/astropy/tests/pytest_plugins.py -+++ b/astropy/tests/pytest_plugins.py -@@ -161,7 +161,10 @@ - # handling __doctest_skip__) doesn't happen. - def collect(self): - if self.fspath.basename == "conftest.py": -- module = self.config._conftest.importconftest(self.fspath) -+ try: -+ module = self.config._conftest.importconftest(self.fspath) -+ except AttributeError: # pytest >= 2.8.0 -+ module = self.config.pluginmanager._importconftest(self.fspath) - else: - try: - module = self.fspath.pyimport() -@@ -191,8 +194,14 @@ - def runtest(self): - # satisfy `FixtureRequest` constructor... - self.funcargs = {} -- self._fixtureinfo = doctest_plugin.FuncFixtureInfo((), [], {}) -- fixture_request = doctest_plugin.FixtureRequest(self) -+ try: -+ self._fixtureinfo = doctest_plugin.FuncFixtureInfo((), [], {}) -+ fixture_request = doctest_plugin.FixtureRequest(self) -+ except AttributeError: # pytest >= 2.8.0 -+ python_plugin = config.pluginmanager.getplugin('python') -+ self._fixtureinfo = python_plugin.FuncFixtureInfo((), [], {}) -+ fixture_request = python_plugin.FixtureRequest(self) -+ - failed, tot = doctest.testfile( - str(self.fspath), module_relative=False, - optionflags=opts, parser=DocTestParserPlus(), diff --git a/dev-python/astropy/files/astropy-1.3-mark-known-failures.patch b/dev-python/astropy/files/astropy-1.3-mark-known-failures.patch new file mode 100644 index 000000000000..1a30bc1d10ab --- /dev/null +++ b/dev-python/astropy/files/astropy-1.3-mark-known-failures.patch @@ -0,0 +1,84 @@ +From: Ole Streicher +Date: Tue, 13 Dec 2016 09:41:39 +0100 +Subject: Mark all known test failures as xfail. These failures have been + discussed with upstream. + +--- + astropy/table/tests/test_info.py | 4 +++- + astropy/tests/tests/test_socketblocker.py | 4 ++-- + astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py | 4 ++++ + astropy/vo/samp/tests/test_standard_profile.py | 2 ++ + 4 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/astropy/table/tests/test_info.py b/astropy/table/tests/test_info.py +index 2bbcc7a..50fbdb4 100644 +--- a/astropy/table/tests/test_info.py ++++ b/astropy/table/tests/test_info.py +@@ -8,6 +8,7 @@ from collections import OrderedDict + + import numpy as np + ++from ...tests.helper import pytest + from ...extern import six + from ...extern.six.moves import cStringIO as StringIO + from ... import units as u +@@ -229,7 +230,8 @@ def test_class_attribute(): + t.info(out=out) + assert out.getvalue().splitlines() == exp + +- ++# see https://github.com/astropy/astropy/issues/4336 ++@pytest.mark.xfail() + def test_ignore_warnings(): + t = table.Table([[np.nan, np.nan]]) + with warnings.catch_warnings(record=True) as warns: +diff --git a/astropy/tests/tests/test_socketblocker.py b/astropy/tests/tests/test_socketblocker.py +index c362fa5..783defe 100644 +--- a/astropy/tests/tests/test_socketblocker.py ++++ b/astropy/tests/tests/test_socketblocker.py +@@ -66,8 +66,8 @@ PY3_4 = sys.version_info[:2] >= (3, 4) + def _square(x): + return x ** 2 + +- +-@pytest.mark.skipif('not PY3_4 or sys.platform == "win32" or sys.platform.startswith("gnu0")') ++# see https://github.com/astropy/astropy/issues/4193 ++@pytest.mark.skipif(True, reason="Blocks on Debian CI test") + def test_multiprocessing_forkserver(): + """ + Test that using multiprocessing with forkserver works. Perhaps +diff --git a/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py b/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py +index 53436dd..4c710e7 100644 +--- a/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py ++++ b/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py +@@ -3,6 +3,8 @@ from ..core import WCSAxes + import matplotlib.pyplot as plt + from matplotlib.backend_bases import KeyEvent + ++import pytest ++ + from ....wcs import WCS + from ....extern import six + from ....coordinates import FK5 +@@ -93,6 +95,8 @@ class TestDisplayWorldCoordinate(BaseImageTests): + + assert string_world5 == six.u('267.652 -28\xb046\'23" (world, overlay 3)') + ++ # See https://github.com/astropy/astropy/issues/5601 ++ @pytest.mark.xfail() + def test_cube_coords(self, tmpdir): + wcs = WCS(self.cube_header) + +diff --git a/astropy/vo/samp/tests/test_standard_profile.py b/astropy/vo/samp/tests/test_standard_profile.py +index 325ac96..ac25e55 100644 +--- a/astropy/vo/samp/tests/test_standard_profile.py ++++ b/astropy/vo/samp/tests/test_standard_profile.py +@@ -62,6 +62,8 @@ class TestStandardProfile(object): + + self.hub.stop() + ++ # see https://github.com/astropy/astropy/issues/5460 ++ @pytest.mark.skipif(True, reason="Setup fails due to SSL problems") + def test_main(self): + + self.client1_id = self.client1.get_public_id() diff --git a/dev-python/gwcs/Manifest b/dev-python/gwcs/Manifest index 02e4e830f2cd..02d21879698c 100644 --- a/dev-python/gwcs/Manifest +++ b/dev-python/gwcs/Manifest @@ -1,4 +1,4 @@ -DIST gwcs-0.7_rc2.tar.gz 87079 SHA256 13cab5214b61e6b9e5f0212f7e076b8247929f8f54779ecd92738a67102f154e SHA512 8df99ec22a8ffbf9f7e4ca000f69aa89301fd62c16a8b4f004f84cccf333abb71c856e854cd08e61a811ad769e99ef61e1f0e6c0a61f7c1895ac6159aa99c897 WHIRLPOOL c12ed58a74a7a626ae7aa276b1ede36bd1e0fe89281ab388d97f294667df6e538e1c089e55ea311f6aadbd1bc1804abc767e14c9426de625ee40217dda90bbef -EBUILD gwcs-0.7_rc2.ebuild 1470 SHA256 9edb1c5b083aa676560b7856df192943700147cf88428cf0fef7704e645c2d13 SHA512 110e8e2ad0f685e97d0dca4bf07ddb454465889b74fa0857199275f34c15971d7c502be71f34359d3642f5944bd6cd91415291ab52131b77ff522c51242dbd83 WHIRLPOOL e3f84d709fb812765fc7aa9580b362849966a4cb9774191fdda95b2dc42c4bcdd039626d07f06fb9ad68c5a1efce3a251761f8386d08b45cdbed534b005fbf9c +DIST gwcs-0.7.tar.gz 276681 SHA256 ad1cb88de858a4174d97c50a045cc7a4317c615a95c70ff5243a55431b0278cb SHA512 fe7b11c748f76175ea7a3d0a584ac61d783ef06db849c7dc77f220e40e8e9f44a5090f3f2de50a51d0df66e04f7aec32aac14fd406d4d41d32d70c53f04a9961 WHIRLPOOL 93265da283643487e189c573e6b052c08638b1a34c2e096151d507b26bb269259cade121896bdfcb2723fa923845079c02f277c08d1501d9eb72393720426b7d +EBUILD gwcs-0.7.ebuild 1318 SHA256 7598b49b6750a9494b81cb89f1dd0635df669ec26461d5ca9c9dbff28abaf301 SHA512 f6dfc4365b2f02b57f3d7827641d9f4fea169d397dd99060786754e63f72e9fc162e5c2878fa33bf1b64048e563d3f79182233312f960d363183c150d3ce927d WHIRLPOOL 407ada52fb97d05098434a16b7c75e7d52e68d8ff4126d7316675f294a1127e0c65d25c74d04fd1798ccc2a47ddf88ae8001809392ab109b86dfa6ed37930c1a MISC ChangeLog 310 SHA256 aa0417e4d7aa899200b162f576d28369653658f25a455ce9df3bafcab98ee8b3 SHA512 ec079c4c82cfd9866c46c603c48565b5983775cac4dcd92c1d6bc1ef3a001e1d46148cd017e2d4ae53d178276d390dba0f04d86959759c82388b95be0ce44693 WHIRLPOOL b0b95028acab0a0f96b71641d600fbbc691cbe91964869ffebc476bbe40fd549ceff52509d1896c6d0d922da8ce92b131899dd82617fac2a3843f1e9262c996d MISC metadata.xml 801 SHA256 530a852bd3ad7e06a9ff60f65e9fa451da4d8b90be524a01e35917e56dcbd952 SHA512 9a20c6faf196c7076f94c28ff3dbb1c63ba144b799b6d4c35051afb39d3cf90247bfe38fcb5ec4a53f210d629f5d86c38282eeac3cb24913d1cab0fa58e2c273 WHIRLPOOL 345bd9c244a411979974291c801c5146e6fe52c0ada64f8443833bf036112fe0c89b1e52c6539c0e086d096f1fa818eef615aa55dc190888e6651d96e8f5107c diff --git a/dev-python/gwcs/gwcs-0.7_rc2.ebuild b/dev-python/gwcs/gwcs-0.7.ebuild similarity index 86% rename from dev-python/gwcs/gwcs-0.7_rc2.ebuild rename to dev-python/gwcs/gwcs-0.7.ebuild index ac871b89ec03..1d7018980bd5 100644 --- a/dev-python/gwcs/gwcs-0.7_rc2.ebuild +++ b/dev-python/gwcs/gwcs-0.7.ebuild @@ -9,10 +9,7 @@ inherit distutils-r1 DESCRIPTION="Python for managing the World Coordinate System" HOMEPAGE="http://gwcs.readthedocs.org" - -# take 0.7_rc2 instead 0f 0.5.1, incompatible with asdf-1.2.1 -#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -SRC_URI="https://github.com/spacetelescope/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" diff --git a/dev-python/healpy/Manifest b/dev-python/healpy/Manifest index 7caadf6e523f..28bfa851084b 100644 --- a/dev-python/healpy/Manifest +++ b/dev-python/healpy/Manifest @@ -1,6 +1,8 @@ DIST healpy-1.10.1.tar.gz 4017986 SHA256 d81f6a5bdf7c8b6be062ae3be493a91520db4d1830fddf416905c28bc3476e79 SHA512 fb7c3d578992adb98907dca164f22f8b1d201b838cdbd94d5a19fb06fdac2a685c35fe42fb5644bcabe8b9221814ef3f7332cddb617098fd6b589649fb0c9675 WHIRLPOOL d4c58beb7a26aac2850ade240174186bc73cc28e672b64763ad7caef1365c10e90ed8e1e5b664a16872a2604f801e0bed83e75eb6b1b75d71cc7cc8c7820fa3a +DIST healpy-1.10.2.tar.gz 4018889 SHA256 210fe8a1d3797e6ebb99125054d35d624229602179b119fc3b73586056307e4d SHA512 658dac9f9c3dfa8c6f4050138c81fc3f0c3b813ace797a531ea6fc7785d8a2e59ac07f8873a32682f06fde7097710cb91a8181f90bad82acdb04a20191d0601f WHIRLPOOL 216c336652866e3196cf86e073d29a87168f54b891d6b8382227fb49c961e9a28f8d64b3be980d37a006af989d0aa26c8b66deecd07973c8fcdb3f2b94647b6c DIST healpy-1.9.1.tar.gz 4043342 SHA256 b88fcd667e0bf474335811018cb97932b5f9d5575f22d2237b6707844a121c23 SHA512 84427e4fdb01ed534a00617ba707a58f4ed21ba0114fcc3f7bd4748cefaad148c9025bfc7a4c77c1de40b7f69dfb53139f2b347e80955f4631609cd50e70cd5a WHIRLPOOL 2c8e5fe751fbfe12b699ff154c6f0472bbd7d758b0e18d249984d51567398e9eeea26ee9d79bb086fd79af4b4c4afa0f1f8c3a6c369acd1a4f91a7f8ebd7081a EBUILD healpy-1.10.1.ebuild 958 SHA256 c6e37ad7f417517b83c9ffecc368458179a9b88659e2b55a325634c15a8606fc SHA512 1303ef0a81063de4f2f20199c0dd04b1d0a4b5c780d8a0887c5b2bb54b7d73c28aa98a76fb0f81488a93c76b53c284991f5c77889cf62ca1a25836d42b3e8509 WHIRLPOOL 23a27dd05f2b75333ff11a663d7e8308c423c8d8b1bef990c6763c05004beda883b7e04ba01136f00b39567d635d0200ae2ebbedd3c25ccc70820a9cbf01768d +EBUILD healpy-1.10.2.ebuild 958 SHA256 c6e37ad7f417517b83c9ffecc368458179a9b88659e2b55a325634c15a8606fc SHA512 1303ef0a81063de4f2f20199c0dd04b1d0a4b5c780d8a0887c5b2bb54b7d73c28aa98a76fb0f81488a93c76b53c284991f5c77889cf62ca1a25836d42b3e8509 WHIRLPOOL 23a27dd05f2b75333ff11a663d7e8308c423c8d8b1bef990c6763c05004beda883b7e04ba01136f00b39567d635d0200ae2ebbedd3c25ccc70820a9cbf01768d EBUILD healpy-1.9.1.ebuild 958 SHA256 c6e37ad7f417517b83c9ffecc368458179a9b88659e2b55a325634c15a8606fc SHA512 1303ef0a81063de4f2f20199c0dd04b1d0a4b5c780d8a0887c5b2bb54b7d73c28aa98a76fb0f81488a93c76b53c284991f5c77889cf62ca1a25836d42b3e8509 WHIRLPOOL 23a27dd05f2b75333ff11a663d7e8308c423c8d8b1bef990c6763c05004beda883b7e04ba01136f00b39567d635d0200ae2ebbedd3c25ccc70820a9cbf01768d MISC ChangeLog 471 SHA256 edccd66667eccd41ab6a161f101719b69db7df548c2d87d1851aa8c9d3547520 SHA512 f938d33c53011414e3defa75144916eb5cbec1bd15313e20256895d680209b141b8bb82bc87f1018583931f1aa02c4bd2e4ee8d5097cea991b127accba5a4b2a WHIRLPOOL 7dd745d0f75c4cb14596e140426a01fdfcd2966a4fabd002ab238b3c8279dccbed3eae6fde28a754f882c5c3ec26ce7dcb925b99d49cb7ef561ddf70bd4fff1b MISC metadata.xml 609 SHA256 c705ce298601801e95338a2a24cf56cdf3a9a6435961d3e3fc7893ea245d68ad SHA512 e8d86f81b4a62f3f15bb2210cfbc9eb51568525349c34e10bc32de76654f18c7937ee1c5390915c8a225be35baefb8b45d8cb982a41e314da77b91c30ae8749f WHIRLPOOL f4d99bcab4e795a035511e4c2d5408111f3b94a2dda09225e7cfc46a514a4ede2f2ccef085b3b580af9c688a24591b39a6bebf9ab3f4f5fc3c6526e862d332b8 diff --git a/dev-python/healpy/healpy-1.10.2.ebuild b/dev-python/healpy/healpy-1.10.2.ebuild new file mode 100644 index 000000000000..9f11d2313d6a --- /dev/null +++ b/dev-python/healpy/healpy-1.10.2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5} ) + +inherit distutils-r1 + +DESCRIPTION="Python wrapper for healpix" +HOMEPAGE="https://github.com/healpy" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +RDEPEND=" + dev-python/astropy[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + sci-astronomy/healpix:=[cxx] + sci-libs/cfitsio:=" +DEPEND="${RDEPEND} + dev-python/astropy-helpers[${PYTHON_USEDEP}] + dev-python/cython[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + virtual/pkgconfig + test? ( dev-python/pytest[${PYTHON_USEDEP}] )" + +DOCS=( README.rst CHANGELOG.rst CITATION ) + +python_test() { + echo "backend: Agg" > matplotlibrc || die + MPLCONFIGDIR=. esetup.py test || die + rm matplotlibrc || die +} diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest index a4efd56ba86b..b6858e37f0d9 100644 --- a/dev-python/imageio/Manifest +++ b/dev-python/imageio/Manifest @@ -1,8 +1,10 @@ DIST imageio-1.5.tar.gz 187004 SHA256 6240f5e8391b34bdeacf23bdb8f70c7b578dc11dec1644a6ba81b4153ad512f4 SHA512 2913353c02a26236f254c6cefce72cb8179cedeac4e1ebae435218dddfc35cbec9e806eefe99e174ca9c572c09725a697e1165f6be0bbdc657a9fcf2312c7460 WHIRLPOOL 0960f559cd47dcb0eeca2133a8118004b7fed7250da0c9a776d6745558345a59682f103bf2159e71c6f6571bed90a3879fb95d10c2af69ef83d80afe6b6c3a61 DIST imageio-1.6.tar.gz 201043 SHA256 7b6519c358b87b026f5253c4d55e21b8e84f556adab1f04ac3726937e6b4baa4 SHA512 bbb22a8c48f54e5bec8475eea041ce361b259cd8113463fb85e6c02b9c5a9805e675eaf2c693a26d51d1609071ce92d54fe76ed5563ad48f562b465ab586bb43 WHIRLPOOL 1d429c1eff65e5df30d665f3819267271c5d351f448021848310f74c814306991b8b794a0279a5ece6257fc98738083c7f40f35b73072efa1e504164f674ce58 DIST imageio-2.0.1.tar.gz 224487 SHA256 cd0d32f7621b02faa0b5a8533e58579f011b75e2f6f8547f1c55a8c2d464664b SHA512 8adfcdb897d898806ef4a3227730a45a663eb485e126db62d8c5f79063aa8aa2b83f4a9c27d4ae47b4ca8e2ed82125d04642952c62fb29dd1fe8dfa11430bb58 WHIRLPOOL 949e83d466dca03e22e73de761c343a90fd73295e23fcf00b923d88f5ab294d46784f725bc369422a458bce6072639a89856233ed2592e72c150759ed31ea01e +DIST imageio-2.1.1.tar.gz 227148 SHA256 7aa56f4ddfb7b1e6bf99d752eeee93a07d2fe2bfb299fe7f2735c0690533028d SHA512 a01ebf8fe9cc3761b0779107bcd610ecf4c9a5e6e789bdc15983e2f4ff65d03351266431391519cd637a98f48a1a9f91a2123191d0aed5790bc731b007a85d29 WHIRLPOOL a2cf5042a9d88190205608e3b4da33d6905964d97ad2ebf6796d5d5545b735b4e8acff0fb35b807cc35cdd5c04c7cc4e0abc3b8f932fa5ab7397e68aaa1fbfe4 EBUILD imageio-1.5.ebuild 560 SHA256 67a757d97d0de7c67ad3ee6ef81b67665411ebe4430ddd681ef24ae8af6706c9 SHA512 4ecd1841953cf7073ec5c230eb325391a95e0faedaec42c04884ca29c1dd534a02c948764958b8902df3fef5e3fd94c34004eb84063a878f6cd234936eb05c33 WHIRLPOOL 66313d284aa6c723411b09ebd9ef1c04998e37eeaacd68479c8dc4597a13acc77ba87d55d85bb231d726949614b4938ba851cb017766fb0bc41a7690ebb0a3f1 EBUILD imageio-1.6.ebuild 560 SHA256 67a757d97d0de7c67ad3ee6ef81b67665411ebe4430ddd681ef24ae8af6706c9 SHA512 4ecd1841953cf7073ec5c230eb325391a95e0faedaec42c04884ca29c1dd534a02c948764958b8902df3fef5e3fd94c34004eb84063a878f6cd234936eb05c33 WHIRLPOOL 66313d284aa6c723411b09ebd9ef1c04998e37eeaacd68479c8dc4597a13acc77ba87d55d85bb231d726949614b4938ba851cb017766fb0bc41a7690ebb0a3f1 EBUILD imageio-2.0.1.ebuild 560 SHA256 67a757d97d0de7c67ad3ee6ef81b67665411ebe4430ddd681ef24ae8af6706c9 SHA512 4ecd1841953cf7073ec5c230eb325391a95e0faedaec42c04884ca29c1dd534a02c948764958b8902df3fef5e3fd94c34004eb84063a878f6cd234936eb05c33 WHIRLPOOL 66313d284aa6c723411b09ebd9ef1c04998e37eeaacd68479c8dc4597a13acc77ba87d55d85bb231d726949614b4938ba851cb017766fb0bc41a7690ebb0a3f1 +EBUILD imageio-2.1.1.ebuild 560 SHA256 67a757d97d0de7c67ad3ee6ef81b67665411ebe4430ddd681ef24ae8af6706c9 SHA512 4ecd1841953cf7073ec5c230eb325391a95e0faedaec42c04884ca29c1dd534a02c948764958b8902df3fef5e3fd94c34004eb84063a878f6cd234936eb05c33 WHIRLPOOL 66313d284aa6c723411b09ebd9ef1c04998e37eeaacd68479c8dc4597a13acc77ba87d55d85bb231d726949614b4938ba851cb017766fb0bc41a7690ebb0a3f1 MISC ChangeLog 822 SHA256 14a7e63f023b15775756b02b1754c44802ce894a90e7a2fa803360198e80063c SHA512 2d95a03505f29954a2eb1ae600a71c033f1bc046273636c0731ff35b219101bcb3977253ef191edbaadb0e61ccc712d42d4fe0fee2b9b214e64527453c84ee96 WHIRLPOOL f18ba10ac51c58898c14a39e8a9808af0b298b80d348399565539d61788c63e155881257a5a724fa5762bfa2ed4fdbfd36f80065184e9f8e2cb19d49a2e04e60 MISC metadata.xml 763 SHA256 935206aeb1c1f3b66c2bf365f4c871d08ead6f1ec5d1d4d5f9ec7139f043b7b6 SHA512 b6729dbd110c5d7c977618ba6fdc7585609e4bc69f93d904a8796781273b38c9dd0e9a29e782f47e36d49dc72032d6967803f88e418a6a1ea8715c719342136e WHIRLPOOL f333c47e137fed66aa364af1a9e1ec1358fd953cbb41491c78667b290036158ae16797d132b3a8954cc5e3d216fce96f9e0d1a79e63c702945c83f7713ee53e2 diff --git a/dev-python/imageio/imageio-2.1.1.ebuild b/dev-python/imageio/imageio-2.1.1.ebuild new file mode 100644 index 000000000000..07d0d943e8df --- /dev/null +++ b/dev-python/imageio/imageio-2.1.1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +inherit distutils-r1 + +DESCRIPTION="Python library for reading and writing image data" +HOMEPAGE="https://imageio.github.io/" +SRC_URI="https://github.com/imageio/imageio/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="" + +RDEPEND=" + dev-python/numpy[${PYTHON_USEDEP}] + media-libs/freeimage + " +DEPEND=" + ${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + " diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest index 9b730be353e2..00ebe365a13e 100644 --- a/dev-python/keyring/Manifest +++ b/dev-python/keyring/Manifest @@ -6,7 +6,7 @@ EBUILD keyring-10.0.2-r1.ebuild 756 SHA256 eb64665854c265bb73e883e87070de5dcbfa0 EBUILD keyring-10.0.2.ebuild 725 SHA256 743adb1349680dca14f3e96af5d7f4c5cb1af22207f2b02f39118f0ac1672c26 SHA512 47957d64151fa32dbad5a65c02f3e4ed98d65504d67580be587a93e970e82bde5e610d26526c15ee0dce70944a316b50465a9d50c256934a3c407d9774c9bd66 WHIRLPOOL 4cc7ac5f32093e00239ce52e929f08ee1bc9e03307b11750ff3605a2c0e53553c8899801d5935a06355fa5c2d3c82ec1e8e0852f1cb00ea9034ef354d03b6675 EBUILD keyring-10.1.ebuild 758 SHA256 a97a14c1d7be213f12982f350e975131a87dc38b2ab03ea0012bcdc8bbc36b5e SHA512 b352f5b944f66450d7a26f15e254159b7e5f5b60dc00877d678c999ca0a9938e9fa92b761a0d853fdc39f23b56ec3635f2c769a3386c03dce5edfb1f7ef2dff3 WHIRLPOOL 198495ee8445baae77eb8aadc15c526ad066f95704f4e9921ebc4928407cc02faeea7d0b42c5a9870e0ce5caf11292d7de2872b838eb807bb2214e2fcfe9835c EBUILD keyring-8.6.ebuild 883 SHA256 5f2c39cb80e9a5556b268cd9ba3a7877b799d0d4792e0a79f60e279380442243 SHA512 0975327dd28acee6626ff88ba4beaad37c9ae2c8db2258674fd3f3bcef10f95e488621a49a99755ba40f421a040ce297f3087eaed74255014b1ac5134e8c94d4 WHIRLPOOL a3e48c2d15570ca06929401e324bcdb1601fd175bab5f399604b75c31570af54eb6ae3091c972cecc604f27f2fbda74a5f3b1c0184cffbe954a5d22b2ac3003b -EBUILD keyring-9.3.1.ebuild 724 SHA256 30e15dd1e3f0d337b59e594fec2126c08742cef821507864084bb1c8e4d28eb4 SHA512 44832a009a5aab5f756b3d23be43fd4fd8dee16aa5b5b8af9fbdbdd97dbb649382232293d047a84e04e1feeba2972615abe9947daced45afec47ed0483c1f02f WHIRLPOOL 35d1d33a3e48f59cb3501eb19e3f2e447f05387cb660678de1202938fd96a81e10014aa05632b3a16621a6ee887fa992f78cac7d5f85a5a75c09bcda9cc392ed +EBUILD keyring-9.3.1.ebuild 723 SHA256 57c851e31474b8a5df94b7c0cdbb751c1e5614acc4e65fab5806d26c4552daaf SHA512 e31c1749181a8ab3f74e4cbdb39c9fe800a529b36b2bad7c211e3f26445deea3dc08073afc620f42a3a359a94cd0cc90772fdf0c53096c87e6d42ac23cb944e0 WHIRLPOOL 91443f17cb4e3adf55e374f48c377d59944cfa8160fdc0223a74a2e6089d43422e9581a53d1a2b66e09a593684620de35e4bf9e2edd1b05e379036be119ae08d MISC ChangeLog 6541 SHA256 2164587edfc3bd92ef721d5a4b2010d432f2f8e311f9224f5d9f365343bce0b4 SHA512 03107c0af2cf5ae7e82b1300e9618f49053dd1fd83bf6f487af26ebe170b081a991669e731a071eb9e9d2b89722f36233987d3866e912ee3882de6efe1e25c49 WHIRLPOOL 2d90400d7c74506d0463e7b33b09574a79984b98949b3281711ee8b2d9ceba96cedae4119433b79a4632da0e3843d5fac15c61a8dc57d07c8a5b5b1e39e3a40a MISC ChangeLog-2015 3476 SHA256 9e3e504467d5b4b3d18bb5cc12358b59087f7484d612d56ed0d82c069c58ebf8 SHA512 81e4fbb0ef294c4b9a4a812ef92f85fc7a7557219dabe2cc60bb025c54eb8a6c7cc3b4b0e68592590064a6282965180c2bdd45f98832e606bfc908bd95e610a7 WHIRLPOOL 63f15f3b64efc5facb2c7e27d2c0e270ba15ee67a14722758961624e0505616f873d4bb5e367b461861d4a7a34c841a90265c33fc09b86e995230a79c9832c4c MISC metadata.xml 618 SHA256 c29aec9b2661d311938703e2fe44ecb609dd34713a90c30a400acd7419bf1294 SHA512 378365b274f22ba1c3ea6d3ee043d64ea555eb81af226c71f42a5c9e2a9ea1e735996836a9d5766fdf77c1d6c8011847bef8025f2253c58f8ae4ac36b54feb8a WHIRLPOOL 2c9cf474a5b1395449db7700b1d2db296a459f8a473da8af6a91d40159722ef40a72bc6208077df8a5e2fae49abfbb7fb3aef4b4241957a5cb4421f20a6418c3 diff --git a/dev-python/keyring/keyring-9.3.1.ebuild b/dev-python/keyring/keyring-9.3.1.ebuild index 7afe95a0065c..9826924c90c9 100644 --- a/dev-python/keyring/keyring-9.3.1.ebuild +++ b/dev-python/keyring/keyring-9.3.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz" SLOT="0" LICENSE="PSF-2" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" IUSE="test" DEPEND=" diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest index 0dc2b9523321..f3dcd2343169 100644 --- a/dev-python/pyicu/Manifest +++ b/dev-python/pyicu/Manifest @@ -1,6 +1,6 @@ DIST PyICU-1.9.3.tar.gz 179514 SHA256 1a7a96212cb3e42e8df85b9062f1f1d6e207474d44f087218fad1d4ec210fa42 SHA512 93720f6fd4131b6cff7fe89996a3851b5993c74859e85de7813883a30152b63a0065b8c51c536cd40417b6e3ccf0ec4e26ed471cec84cd48761a306a35bfd15c WHIRLPOOL 97d5ff9d5a96aa98700c3048104bb79309f3b7a2e6610a03be1a1b06b23be44ffaa6ef9afb548144757421616bf2401fa4bffac6d8759a7718021abfa9fb03d0 DIST PyICU-1.9.5.tar.gz 181878 SHA256 73b052b800861fae3281dbaf9c92d12a81cabf3d31912d94c51862e093ef359b SHA512 19fb3222a68cc67e92ea4171257d00c9a322f993f1303a4432b5c3c4efda32ff4c2372027cf9f3fd31d3dc3cf3bcbcb957dfa420039591044812f0213684e885 WHIRLPOOL 05e931826f445cc989d8d5ad1db10121705e685d53e8696e0befe172ee8e32895482813bcbcac105e3c8ac92ef85d8b96f79c67de35ed6547a7ccc64acee3413 EBUILD pyicu-1.9.3-r1.ebuild 1262 SHA256 378313f65289af5d0ea126e1434ea0f07a1aa6c12c36ce7453b266af7d258d5a SHA512 f32a359b4d01626d03688c399c70dc4800075b9ded2396bcdf4135d324c86d5eb935f65b059828b5131eda4fd0d3dd23deb55222c6e49976a4e6cdce9854731a WHIRLPOOL 6912495c1ed78e20d3d6d5e322b429cbba88c8855205a71dbac36817b4142ba975d59d2c9e4a4d7f095ef7e48b304f9b20c08d8b2a9bc890a64cf351f04b4bac -EBUILD pyicu-1.9.5.ebuild 1262 SHA256 378313f65289af5d0ea126e1434ea0f07a1aa6c12c36ce7453b266af7d258d5a SHA512 f32a359b4d01626d03688c399c70dc4800075b9ded2396bcdf4135d324c86d5eb935f65b059828b5131eda4fd0d3dd23deb55222c6e49976a4e6cdce9854731a WHIRLPOOL 6912495c1ed78e20d3d6d5e322b429cbba88c8855205a71dbac36817b4142ba975d59d2c9e4a4d7f095ef7e48b304f9b20c08d8b2a9bc890a64cf351f04b4bac +EBUILD pyicu-1.9.5.ebuild 1261 SHA256 acbe7fbe4ee68df51301672017c793f7b65ab763d3a7bb9d55286193d7e024ca SHA512 e7873107eeaab549aa3248c444b9d4092b0c1c791f7ad8a50052cd04034eccc9a6f71ac4a712ee7d18410ebe70658cdf46a22cc68cb4c0a340a2a3f4f600f862 WHIRLPOOL a6d5d45929944af06ad9feee5bb33f665cef1e35d343585e764c437acdf713cf29c25b0ca663278e926c7674531e2f5aa57c31559c356031c5920ab31cb429ce MISC ChangeLog 2161 SHA256 b4f65082538621cbd79a9ffcb2e6f1e759f5d6165030e5a93bb7b4a594b3280e SHA512 8f1e125f50c6aadf679005eda6b02757bf5606c591440db6d4a3edd42b6ded902f3be5f8c23266611cf8b78442974aafeb01424388b905df1b78fba1d8bf66cd WHIRLPOOL 32d8af3e973bf002f546d29e609b60f02a36a8e24d4256fed39cff53c673486b60b0f5de2ca2cfe3c4d53387c064a76ca640c058ef6d9f11ee4f6c5d2ef6f19a MISC metadata.xml 358 SHA256 5082d5f8de90eaf93d3b3ff21d50d00c4b21e2b733589212d7db3b3bb42eeae9 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835 WHIRLPOOL 3aa0bba56f6383b8da810ce81a1f98d6420ca7fa7ebcc2850b51649e839af8e7a93bb4111c88a9ff0ddefdaf6811305b0b30dd7a19e99fa2ce6df1f57e0c61c9 diff --git a/dev-python/pyicu/pyicu-1.9.5.ebuild b/dev-python/pyicu/pyicu-1.9.5.ebuild index 7889c5661bad..18fb87754098 100644 --- a/dev-python/pyicu/pyicu-1.9.5.ebuild +++ b/dev-python/pyicu/pyicu-1.9.5.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="doc" RDEPEND="${PYTHON_DEPS} diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest index 3f633788152b..b16ba940eb59 100644 --- a/dev-python/sympy/Manifest +++ b/dev-python/sympy/Manifest @@ -2,10 +2,11 @@ AUX sympy-0.7.6-doc-makefile.patch 573 SHA256 71206fbb563c6624e03450a701e4220957 AUX sympy-0.7.6.1-sphinx-1.3.1.patch 2305 SHA256 34c9266e5881568f359043a287bc0b8b9f4fc4d52abf90c1378b7c72e818eac6 SHA512 dd93360697be0c53b66af77b5e6670f0c83c1802a4cfc833c1038e52fd1bf2389b1cf974b783ed98f2e2551e52992c55bdf11f71db5ec29e496517c1c971c409 WHIRLPOOL 5019894ce76ab14ae51ed3185613d429ec344158b19392912a1f57495908adf3891c83596289725c9b5c90cfc9618848369445a0d61d872b6080240b16421771 AUX sympy-0.7.6.1-zeta.patch 1070 SHA256 b98bc76c438ea211fd0ee17b3028df8b8a8b9648a20f13cc6e19fed50ff03151 SHA512 0dba3db948369757eb073ecf1665b833673ba04e023b5bb272acf66a3e5f34e4e53e3c77997f99c64e437f299c340dd9450f6bf13b5b1c2f9980487d071f4d7d WHIRLPOOL 1bb01cde01cbfcfd1d1e34121638dad0a10daeccf0bbfd960e097742edc27522321cb82db4bb26adcb67c735487416943e5fdd0edea97e6a560926da10d466ce AUX sympy-1.0-doc-makefile.patch 565 SHA256 56d963ed6836565158f060e2395674f899ccd67b964340b9a700b3d8af3b7158 SHA512 45012ba3c3af162510eff7c6800c2a88739aff203a46ae95b854685850658bf68feacb7d100a164ac58cd7968058bb555909c1f0d6d06e54532a14c0b5e64069 WHIRLPOOL dc758e654e74aba8fd9e9c8cc3c41767ed17baf634443ad57cd35a12e2dbcf53803d6b1d9d55112e393c1aa5ed4329c4995dd21c75e7a948497d63c339b0b0fd +AUX sympy-1.0-zeta.patch 1908 SHA256 d0e933ad40f609e2aa37a3eeb62332d34b98180535b76745e9545352b31970d4 SHA512 b3cc3ae37c8faf7077c8b3018859c21a14b38f92d85de4386686a20f0318b9e73ab33fde276f00b859e0de19022cbd095844d4310398ec5cb4a4441cddc0b21b WHIRLPOOL 3cb5602fa07a3fb68b6df23c3f72a6db7ec32945c26ca9be5144b2cb1b1b0fa60f3274102c6a8d03afd3ad5402c385080f4f4cf71dae1e82ad7ab13c50eb7168 DIST sympy-0.7.6.1.tar.gz 6431571 SHA256 1fc272b51091aabe7d07f1bf9f0a47f3e28657fb2bec52bf3ef0e8f159f5f564 SHA512 18877abd3c530418e4f4942cbb0a03140dc81e5a1004720c472fb97cf8eaa41acca59765f6278715ea88bcd0cd07ad5952863a0d1b6e6d00994d257e8c0a6574 WHIRLPOOL b0c0c74e7865c91585d1a2c8510fe328b8e697dec02bd17aaa446ef6e089b9cf2ca5b4f58b6b59febccf142384b907e1bd47451e22fa305843bd883355801226 DIST sympy-1.0.tar.gz 4281528 SHA256 3eacd210d839e4db911d216a9258a3ac6f936992f66db211e22767983297ffae SHA512 977db6e9bc6a5918cceb255981a57e85e7060c0922aefd2968b004d25d704e25a5cb5bbe09eb387e8695581e23e2825d9c40310068fe25ece7e9c23037a21f39 WHIRLPOOL df02cc8603c23f621226f28b4f0555e765f145d968869058ed9420fedd3c6d6d0f095ee14fa864cd505455f245e5adf10794fc3b1392fb5a331ed5dc506b988b EBUILD sympy-0.7.6.1-r1.ebuild 2686 SHA256 9bf5632e6e3bb3461f0d0db392fbafe7bb213d343f845f63e6c19a2d8a0a84ad SHA512 3ff6e6cb16c9dd5a20147f244c4a0d9ad143a335fddf43f139754c42bab0aa38cc05ed8d437bf50947bb5bdd650f0033cff346bb9f3bbf9d88c21e7d7ffeb4bb WHIRLPOOL 81486e0764e4f6c5fc04aa24c4d8afa16f0f929e9c687fcbbc62a81bdd31d6af2d5a2e5b5080625cbbbe6c786aa80dad991d4cf67357280c26d80efb41e94550 -EBUILD sympy-1.0-r1.ebuild 2701 SHA256 3137c66da629fe6fa7244e4934a325b4c8d87ee4f723c8ab5effa293263bbed5 SHA512 596ec8d069b7b6d2022ac8b6dfcd2a3337be8e388279685269e68773d4b158704df8539ad67afc6d6512495ffbec9d9a877d1032cc39f436ac90d4be456944f6 WHIRLPOOL c27a86e3feff6d4e65e6976d5fb737a675bca9bd8acbd2bb593738f3c5d5c628c553f6ab4b4cc73b5472ad3fa03935c579dfd271d9c0c139b99cd0a770062768 +EBUILD sympy-1.0-r1.ebuild 2692 SHA256 9e3ccd7cbed515be4d56b80940fa213b8a426db7b060de9c806d3db56fef01e9 SHA512 afde79906820a4766e78717881dd3c2af6750b5c9ee36c1a3c125332a783553663fe553988ea9d527b614dac5b8a9cb7a75a80be4b40570ce7a3c48afa814019 WHIRLPOOL 7df7bf5fe9822ba2b1bb7ac7d9cbfc1f42fa5deead0bd74d4dcbc86bec88987616c46319aa877bf36da5b5c0656c228002007d408c96b7de0fdad321e1b3a70a MISC ChangeLog 4867 SHA256 233d9656a69e7d06d93cdee411df3afa4b6a0e380adeda274c12b113eaeb298e SHA512 de04e49d6d9b5ad9a739ec8f30b634182f533bd83e9252dfbfce47ab07934152549ba6bb569525311e550549e06ce98785ec54c3119932c3df05c4e0b644943a WHIRLPOOL 1dce1e7d7517838728345762080d30ae26e822ffa0a36cfd2c7523247074d7f45421e8298e639188bea065c8ff3abaa5bcd8ab0e0e28eda8f29b1f882e0f5442 MISC ChangeLog-2015 5654 SHA256 f499b420c429d816e180a6ddf0af3068262bdb5198a8dc9c49910414b603f657 SHA512 cb2b8de6abce4e10aabb5148a557cc87b65edbcbe64134b60bfefd7b68fce6036d8b6e5a5f446bdc76bd6053fdb8044e8eefce0083462c2138a0edba40bdab36 WHIRLPOOL 5560c892ef02fdb3bfc4408d494be2a14b2525ab716dd914ddf830a76d8345b3e21c758bcb3d7a77d8273a7e94537d8a09c3f9c63794638902768ca3835bbbf8 MISC metadata.xml 1379 SHA256 01827156cbcf0629aff5b0c6972c67dec40fa82d40ac410aa041281d044a4ffa SHA512 ffe4786b78b74c4173c9d04403e41084030ad30c5512a1080ba8aa10a698e7c4cd23a792d132ab117645f75ab331249c34dae650dc26262359b74a5b7bb3478c WHIRLPOOL a54dd9436064285f1eeb1cec29009e410349003c9d07d65d14db267aad694cbcfd8d8bc4bc788c5d8ead5dadb9d33c75c1d0775b97a61e5cfff1dd2608874489 diff --git a/dev-python/sympy/files/sympy-1.0-zeta.patch b/dev-python/sympy/files/sympy-1.0-zeta.patch new file mode 100644 index 000000000000..43f54832c948 --- /dev/null +++ b/dev-python/sympy/files/sympy-1.0-zeta.patch @@ -0,0 +1,47 @@ +diff -r -U2 sympy-1.0.orig/sympy/functions/special/tests/test_zeta_functions.py sympy-1.0/sympy/functions/special/tests/test_zeta_functions.py +--- sympy-1.0.orig/sympy/functions/special/tests/test_zeta_functions.py 2016-03-09 00:38:39.000000000 +0600 ++++ sympy-1.0/sympy/functions/special/tests/test_zeta_functions.py 2016-12-28 23:25:19.370041561 +0700 +@@ -125,5 +125,5 @@ + assert polylog(s, 0) == 0 + assert polylog(s, 1) == zeta(s) +- assert polylog(s, -1) == dirichlet_eta(s) ++ assert polylog(s, -1) == -dirichlet_eta(s) + + assert myexpand(polylog(1, z), -log(1 + exp_polar(-I*pi)*z)) +diff -r -U2 sympy-1.0.orig/sympy/functions/special/zeta_functions.py sympy-1.0/sympy/functions/special/zeta_functions.py +--- sympy-1.0.orig/sympy/functions/special/zeta_functions.py 2016-03-09 00:38:39.000000000 +0600 ++++ sympy-1.0/sympy/functions/special/zeta_functions.py 2016-12-28 23:23:56.109047180 +0700 +@@ -245,5 +245,5 @@ + zeta(s) + >>> polylog(s, -1) +- dirichlet_eta(s) ++ -dirichlet_eta(s) + + If :math:`s` is a negative integer, :math:`0` or :math:`1`, the +@@ -272,10 +272,17 @@ + @classmethod + def eval(cls, s, z): ++ from sympy import unpolarify + if z == 1: + return zeta(s) + elif z == -1: +- return dirichlet_eta(s) ++ return -dirichlet_eta(s) + elif z == 0: +- return 0 ++ return S.Zero ++ ++ # branch handling ++ if (1 - abs(z)).is_nonnegative: ++ newz = unpolarify(z) ++ if newz != z: ++ return cls(s, newz) + + def fdiff(self, argindex=1): +@@ -486,5 +493,5 @@ + For `\operatorname{Re}(s) > 0`, this function is defined as + +- .. math:: \eta(s) = \sum_{n=1}^\infty \frac{(-1)^n}{n^s}. ++ .. math:: \eta(s) = \sum_{n=1}^\infty \frac{(-1)^{n-1}}{n^s}. + + It admits a unique analytic continuation to all of :math:`\mathbb{C}`. diff --git a/dev-python/sympy/sympy-1.0-r1.ebuild b/dev-python/sympy/sympy-1.0-r1.ebuild index 88544a984687..2015771ecfc1 100644 --- a/dev-python/sympy/sympy-1.0-r1.ebuild +++ b/dev-python/sympy/sympy-1.0-r1.ebuild @@ -51,7 +51,7 @@ pkg_setup() { python_prepare_all() { epatch "${FILESDIR}"/${P}-doc-makefile.patch - epatch "${FILESDIR}"/${PN}-0.7.6.1-zeta.patch + epatch "${FILESDIR}"/${P}-zeta.patch distutils-r1_python_prepare_all } diff --git a/dev-python/tagpy/Manifest b/dev-python/tagpy/Manifest index 5ac2c1e572fe..d8448ea4675d 100644 --- a/dev-python/tagpy/Manifest +++ b/dev-python/tagpy/Manifest @@ -2,7 +2,7 @@ AUX tagpy-0.94.8-taglib-1.8_compat.patch 896 SHA256 6222a098926726766f244fc1024e DIST tagpy-0.94.8.tar.gz 151986 SHA256 56eab8dd81510f8af18e19375a0ffd5cd25c8e555104be46a92c3dc08634a0dc SHA512 430ae545065e5358dab6021a47b3b176934bc0901058daace35f98b645f7b087859930566d951c30e0e03d91ad46771a5bddc2a6f48a7196cf66b994699b39f1 WHIRLPOOL 164a2c56f86c7174976c9c5d55cf4097a0b992809812524a63a6c2bf4476d189fdb8dad01431ce2b62337a57d25efea90081a2291bb396345dac15f79a3d3056 DIST tagpy-2013.1.tar.gz 151463 SHA256 80481c78ce34878e7a1f3231acd781a3bf1b0b569c70ce0e8d63af58061152f4 SHA512 4068b33fcbee2d5037149fda3ad0b256a31187ee35146392d0e187acb1d8e57c249da5356cb396cb9f027ed47ff44016466a1faaea0912494535c631f8271d58 WHIRLPOOL b47f349bc7f328ee4c18856e7f817f35868529afa0b7a820ec614cb003b3f4c4c84fabc4bd6c5a93ce12d0721e9127cf0dc806df4977fbb505934b9ba5233c20 EBUILD tagpy-0.94.8-r1.ebuild 1255 SHA256 293d23360cdf6ab49752d80a99857a929ae34c62eb78f69e9aa87994ffa4b808 SHA512 3ed0acf724579b3735e60ce98dee75c21ee79164818b2351b265f7f0254dc7e1a0180e8b269796b903751faada517f0926016ef176559a3ec7500b09bba1694e WHIRLPOOL e461ea0da011f0129956c518f121a3b1aca6d073b635530ced3bd4d7b002a263abea6c0c565a281927f8c96d8f2b0145255073f49c614c7a1f0fdd3f81383fcd -EBUILD tagpy-2013.1.ebuild 920 SHA256 0b2ec46824ab2e202d603b6d1974ef0d4da02f950d34e09c9a3add830e13e611 SHA512 d209932b7cc8d4be912e0b51478837b421da416dd60bec8c4eb89d99a3afde5f020347f8cbfaff905a1589ef1180ee0b257d8ff174b00efd2537172236ce470e WHIRLPOOL c73c3bdd73d9efc4601c41dd13d894d189c0278aee88487f556d4472da0f76a1aa61992d434c163c6f74cdbbcaade29fd66a0eff274565401a7971cd4361eb41 +EBUILD tagpy-2013.1.ebuild 919 SHA256 e70f6fa195bccd4511d30c239733f19c9381842b2094303df4daddf3be2c1c48 SHA512 06a585dea90471bb3e5123bd3e88be2f32d7cfe276beed12c21d3c0de75b9c9e2b519bbcd7eace9ee0d7241c70353939e0aab0d43fe32aaf1c401b9d83f38dc9 WHIRLPOOL 5ad68334719d3fd73f9905b843a8d76812d5e0a9137ad1f0b76fa88fc69dac06e9020d45c63404a7492bd7ca277e66d9a1541547563aa69800a605c439dd6860 MISC ChangeLog 3424 SHA256 181df2900950e194cf16f96caf78eb833c8b67fdbba5884a845b53774f2803a3 SHA512 5f4e517434c185fe6808f4b0f0b8fa27d5db55786486dc67b4c1e7265d680be7aa60b705775398895b7e3c1a54b407ca1b1990d3fc9e0696843f745ea89c3669 WHIRLPOOL 0bc5cf89a81ef8586df92e4b6c84453a868643cc8d4a6586e673610bab6db77ff0f7139254ec9c723a1862d5b3819c99cf09affa06f7f3382cd29225d3f43a1a MISC ChangeLog-2015 6852 SHA256 f12649a75614324055b91bfefe233d1ab27ff403a155da21c0f0788f3489a762 SHA512 dcc3479b453c869e1be5595253e672bd3d2e34f3a129b89f3f4da9e3bf69af50c111349d443836300acfcae7b2ccb0dbaf026486c478539caebbd37ce600010f WHIRLPOOL 39dfe6f365a45c5193e42be0553939b34d0aaf453b8aa55e8bcf8f574e5c2d156939c197945e1827408c551ee0d768d33876050531d29c7afa59d34f061000e8 MISC metadata.xml 547 SHA256 5fc3561e1a2178c158ec112f23b4dd532aa391421a3ced95dd7a2c83b4814092 SHA512 caf162b52bba166e74c1c1c9a6f157ee44d4b7f829c089dee93b6c84a99c847384ff7cd4f03ce191574e58562fdabe29eb4b00281551227f5d274adc3e7ba2d2 WHIRLPOOL 22f3085455c7129b411e5ee6264eb85d86f7ec1ccb8f462ebba6c1a52290ed3dba672eecf92c6151a96479202d6f6e197aea4e22d04d004c9596ec93f18942f0 diff --git a/dev-python/tagpy/tagpy-2013.1.ebuild b/dev-python/tagpy/tagpy-2013.1.ebuild index c6c183798b74..3ff326e7be34 100644 --- a/dev-python/tagpy/tagpy-2013.1.ebuild +++ b/dev-python/tagpy/tagpy-2013.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="examples" RDEPEND=">=dev-libs/boost-1.49.0:=[python,threads,${PYTHON_USEDEP}] diff --git a/dev-ruby/coderay/Manifest b/dev-ruby/coderay/Manifest index 43428b94d4bc..a6970d7d003c 100644 --- a/dev-ruby/coderay/Manifest +++ b/dev-ruby/coderay/Manifest @@ -1,7 +1,7 @@ DIST coderay-1.1.0.tar.gz 242639 SHA256 a33f6490aacd1d035fa82e2c1fe88b0e2c9553c1f7d24b813ca2b4d73804342f SHA512 9443a629bf60b7f888198ebfc72f012cceda5c9cb3e14204b3d025807dc4cb0ca0896869ae1cc89f1aa87a7c0e84830cb03aee2c4da4fd80326606a0e22b2031 WHIRLPOOL 50c5b6d07e803bfd7e14c10b0f583657f2b95dc548a748a8d677b80c49480110e9e763bdd6fe376bf58b1992a61a93e88ba2b5476ce9437e41a8d1fc5addc745 DIST coderay-1.1.1.tar.gz 220111 SHA256 75736cb542a8fb355943f8f256c690b5b79171c2a5569d9abca305c6ac803e60 SHA512 850cd1db29b90455f329fd2eec7ddf8f0556469162d9abb8579c8e3a7d19f4aee15185d4846b0d5f74016e1dd66eef78d06155684c64040706e4cf121d05c5c9 WHIRLPOOL 15a517cfa52fa3b9cb7a9f2491de4635517f2c96d9903ce0265d54d5214f7c70e429b4a583bea27c58a1193594ff645c71242f0841bd7551c8cfe373753804d3 EBUILD coderay-1.1.0-r2.ebuild 1211 SHA256 d5eb4f2a6df85364653692301052fa1457d6e768ea4ab4397b3f493d976a8067 SHA512 ce2641408e04febf6581acfca4f88f03debb9499751f5380d0a6a086d1ee92dfe233deb9660b0b5a5c395ed360edb825d82418d3516b4431c0aa2cbb1302d9c2 WHIRLPOOL 011f280deebf5dad22755ee83615ed08e55b3c2ba81063e3bd56409bd3a94536708a78403e52a7a8d8297213e0e6a0ab6186870b6922199341fd03852c7e4fc9 -EBUILD coderay-1.1.1.ebuild 1252 SHA256 3dfe33a111687693ae39746117a4c419266884d7e0f33a4dc126f53ffe83b9a6 SHA512 dd2f63ac172a15f8d450b763d9e98b8276c0d628371c87c85ce9d93f0aaf16ccec89c8387bc7b89c40d9cbf2a3d74d6b5ba88ea37d46f1b199081eb8b69c9688 WHIRLPOOL 943c6dafff863f44261ee79e1a81a468d0058ecac87d54cc2870b53bf760b5daf5421f7adb37b150cd0a0722763cc8a8783c2408676bb0108a29ba7a6e4c7db1 +EBUILD coderay-1.1.1.ebuild 1259 SHA256 5ed747f50fdba9933170b27323383964342af4d3ac8c66888fc90806e3ed1b12 SHA512 242880678e6a27179415f13aa680198f53b54da4eff1ff6b01464957a55de91348ea0891b355422e46d75d0b5d40c7ef62f4c7739c25206565f76b2e51ba00ff WHIRLPOOL c6f29f51b929ec67e0f90d5cda19b4a4c55c936b76a0573409650cb641accc1427e8bea9987b4ed16254982ef33e7f04110281e7993230d7733561d4fbe5b051 MISC ChangeLog 4563 SHA256 d6ce58c0713a18156273990912597dbab98adfb378fefbb0058ba857bd7c6cf6 SHA512 b7a6c673bd4b6010e62dcd3f16edb6d38a48ff8fe38a2c52270810904a7a0b380916599c56939b6418f6b287736d8d4e2a34b342aa239c08e364c8b6418b569f WHIRLPOOL 2e17c42056a6cf9ff387875c81c688057fa7ae32c118478bad86aad84ce5d1fe7c07406d77f5497ae47bbfc78607ac256ab8484ceec3c334ead1486a4acb79e8 MISC ChangeLog-2015 11926 SHA256 ea32cdc6b029fb3abf3309c9b438a9e5aaf18f1ad174f0e5e24067e3d62cf4de SHA512 37d5748a1b6f9fc34e5ae8b7988f6bc1872edc987138688e1970ef119da63b534df3e50c0edf622eb2247622645c396d7ab4c7cb53346c047cbf6797a4fa108c WHIRLPOOL bac199cfa39dafb07a58a4c8ebb5cb4e76aebd805422f2f6330c767bd30f77a83d98f420f22696f69bfa5d6f597445c7d8ac7f2c9a0a3608980f5a321fa20130 MISC metadata.xml 342 SHA256 a88e2ff2228280a6963811a8afbd0c679199788c396c7b29b70a463191f3549e SHA512 13f33c6d77b3297dab6c125c2ebc9a1f7584dd5374e7f13d416d5a80ffe04e39ecdddd93de30fceed22e110e1c68e4b853fdd5b6ab5ec4d254c05b17f624ca4f WHIRLPOOL a073c0468939f974bc9cf2992092d9ff5fd5e856a062874952711a8f345845c47598aad3aa0d640ead51a013386855a0a24a34c30f0b2eb8a53bfcbad9f41987 diff --git a/dev-ruby/coderay/coderay-1.1.1.ebuild b/dev-ruby/coderay/coderay-1.1.1.ebuild index 6698ce71c77a..84e5b2d6b576 100644 --- a/dev-ruby/coderay/coderay-1.1.1.ebuild +++ b/dev-ruby/coderay/coderay-1.1.1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -USE_RUBY="ruby20 ruby21 ruby22 ruby23" +USE_RUBY="ruby20 ruby21 ruby22 ruby23 ruby24" # The test target also contains test:exe but that requires # shoulda-context which we do not have packaged yet. diff --git a/dev-ruby/hashdiff/Manifest b/dev-ruby/hashdiff/Manifest index ac0974d5ab9f..ffb8d16ba27d 100644 --- a/dev-ruby/hashdiff/Manifest +++ b/dev-ruby/hashdiff/Manifest @@ -1,6 +1,8 @@ DIST hashdiff-0.3.0.gem 15360 SHA256 04844d6f841e96ead0f1453597a92045cae5abb1c74fc0fcf790dc8fb27a06e4 SHA512 c40b400c5cfbc7a3cd5bd59936608ab4616e41937f355a3cea84b738d2fe51a88a80bc70a70a526a884326df93d2817be46c50065e20dda2a0de846b05f5f241 WHIRLPOOL d8e3a3fe4c7a36a8ec5965bc2a2401d4d57b785c402c7027f06558f3a02707df7e09beee197b9b6e9a032680d6adf6e68f521b79d0e8853fd7c6fdd79ff93eca DIST hashdiff-0.3.1.gem 15872 SHA256 fef28aadc110e1770488c6c777f16ec729244ed4e7cdd027013bf2381e09b71e SHA512 402e33211bc7119a8edc3d84552c8a31a3f56e3564abe824bd766c39277107393f32deb1902b279268f6eebf0afeb7d9726e9e0b6af04b59a486988a31f2be63 WHIRLPOOL d213a2ee199b6fb79adc1f6bb1bd07025696f71049ee432c1e38c0594ed910a0a9cee3a647be54ba30b4d5e9dcae1bb50db05a92799cf3c72e9984d6fcafbe4d +DIST hashdiff-0.3.2.gem 15872 SHA256 5682c6e510f224d3c42c885d80d15d3dc0effadde5ed4920cd727acf2cb939e0 SHA512 eaf7554ee3336ef5873272320b23d71c7b30fbf9dc37a09ce84af5eec3d83b82dd345017a45bb9ca6fa57882d8a4bda42ec650ae15ce3c14eb0ad81b096a02d9 WHIRLPOOL 5321f1be89ffb3a3d69360ee45a083bec422fc959c97b88eb6813e0feac8efc08db1b70fcac2e402f8baaefb8291ae6c955720c72f897afd8344b6fda1578998 EBUILD hashdiff-0.3.0.ebuild 565 SHA256 fa8dbbd5f52a75b52b8774920e33b2ce781078803466bd165dfc3ef0812d7ca7 SHA512 d8a64102310119bf6fd1a9d2a68b9e4419a1c9b8f2e69620be64f9aff89c2e22984db328a063e75b3a3bfb0c9ea265164ac68c0764ca0fe233a99b18a9fcfb64 WHIRLPOOL 57b78d179ba0bc53f8c3dc13b340e9c1be01d8c1b1c5d1dcb968cb922622f1b49d50853882749fefcc0749154f8b926fb69f4c6fe95329cd55e8b7441be17b63 EBUILD hashdiff-0.3.1.ebuild 565 SHA256 fa8dbbd5f52a75b52b8774920e33b2ce781078803466bd165dfc3ef0812d7ca7 SHA512 d8a64102310119bf6fd1a9d2a68b9e4419a1c9b8f2e69620be64f9aff89c2e22984db328a063e75b3a3bfb0c9ea265164ac68c0764ca0fe233a99b18a9fcfb64 WHIRLPOOL 57b78d179ba0bc53f8c3dc13b340e9c1be01d8c1b1c5d1dcb968cb922622f1b49d50853882749fefcc0749154f8b926fb69f4c6fe95329cd55e8b7441be17b63 +EBUILD hashdiff-0.3.2.ebuild 565 SHA256 fa8dbbd5f52a75b52b8774920e33b2ce781078803466bd165dfc3ef0812d7ca7 SHA512 d8a64102310119bf6fd1a9d2a68b9e4419a1c9b8f2e69620be64f9aff89c2e22984db328a063e75b3a3bfb0c9ea265164ac68c0764ca0fe233a99b18a9fcfb64 WHIRLPOOL 57b78d179ba0bc53f8c3dc13b340e9c1be01d8c1b1c5d1dcb968cb922622f1b49d50853882749fefcc0749154f8b926fb69f4c6fe95329cd55e8b7441be17b63 MISC ChangeLog 1909 SHA256 c41e8c012a6801413f9cabfc99ca0c556ef0ad951bc7fe296f8a6a212365b178 SHA512 4515bf23bf4a5e801782d7bbf66ca8d2bb77f68dac1ac08a13d57de6b4de9ba6f4591a9e781fe12a4134fc56d43de82a6d51d98643ca6b4ff61d9c63669a6649 WHIRLPOOL 3400784becc48fde51401317a74e9ae8134dbdb12fef167fe259f9a86b1446ae542c4ee9afc003437c4393aeb5b4b43ca41ae5ae572f173ee838eec7fa4b303e MISC metadata.xml 345 SHA256 f5ef4156b3158674ceb2de982f5b7043f89848723d81b6ff9a0aab3dd747e646 SHA512 f241e4bd08fb29d4a2538d5b548597c5869c0bdf332e3453e55c625093bde7c52b35e7a7bcd691b9f5b2bf2cd1c90ef244d23e343cf7800f9fda4de73f6a4cbd WHIRLPOOL 15b64d690249cb6a3d17349585d0e7b8d58919fdc0e0764ef7af9cf45a5c1e87bed32787203e3ed89011320c1ac735d6de5fc00e59dd95b5ae081af275791ecf diff --git a/dev-ruby/hashdiff/hashdiff-0.3.2.ebuild b/dev-ruby/hashdiff/hashdiff-0.3.2.ebuild new file mode 100644 index 000000000000..7a7d2d8c76b7 --- /dev/null +++ b/dev-ruby/hashdiff/hashdiff-0.3.2.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21 ruby22 ruby23" + +RUBY_FAKEGEM_RECIPE_TEST="rspec" + +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="changelog.md README.md" + +inherit ruby-fakegem + +DESCRIPTION="Simple Hash extension to make working with nested hashes easier" +HOMEPAGE="https://github.com/liufengyun/hashdiff" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="" diff --git a/dev-ruby/oauth2/Manifest b/dev-ruby/oauth2/Manifest index 4378791a5bf5..e9a0ca6887a2 100644 --- a/dev-ruby/oauth2/Manifest +++ b/dev-ruby/oauth2/Manifest @@ -1,8 +1,8 @@ -DIST oauth2-1.1.0.tar.gz 18376 SHA256 ea76a41dc7c559f9530e19961b5a8cd9a4b3f231f54901b9e6ef09031ce3aa77 SHA512 c4231093929733a662ed6246338508396eb0e8d1be48bff05c43a8e3f6dd38261667cad7db0dc44c3f6fd9152165b13fa46a779a05b3c1ae98f912f337820d2e WHIRLPOOL 0f9269df95ceabbcff65751d89bac5eef6bb18f34114b3045ac658325e7b8145f23fad311473c77e64f3170c45ccc880eb48c05ad6f174c7a42591995498a557 DIST oauth2-1.2.0.tar.gz 18949 SHA256 e40fb1edaac68cb83bdbd1d6e2a1c485535278124c48f7b2db4771bb03c927d0 SHA512 2adacdc02752289eba217c6b2dfce0d00325becdbb7983b9fdfb149717ffd58cd235217048e48dc5be3d3c4024c224f8164cb0f9b4d792060554fbcb72e70536 WHIRLPOOL 138076cf3509b08ba40041be126d158ebd1767f043c0838789d28b5bce63b6c5ee49c2acfcf9ce81b9cc0303f618035366e947bc4bbd6e242658e973438cf5fc -EBUILD oauth2-1.1.0.ebuild 1059 SHA256 33a8132e3e955bd880172ad5bc55d779bae0626a74036b2f7c13f0b6e7e53dc7 SHA512 32f5172e4b80da1809a5c10fd9eafdba05bf300d9a3c1311c6d7137f7939e4e9350b6717b4db3c5ff93869e3d0e15b93eb3779170099dac527578efcc5071e50 WHIRLPOOL fff2b14bab83bd9077e825710914ea166c4a43db4f21016b74d5e89df720e959b354565dcbae6f8f69f9901201d68234aa058c40f466b56e178876fb12b4a684 +DIST oauth2-1.3.0.tar.gz 20739 SHA256 fc3c1c5d540a7dbf5363a753052394eb67397590e17b15c1daf2d214ef3a5eaf SHA512 18b7a5055bdbecd1a073b0c7e4f9175b70cf0b6df0f98811d7de4a3ff252b9d2e6319cc3c9d9c3564cfe45a96bbd55a1cf0658dd8080918fc03b14e0f0041c9d WHIRLPOOL b5ad6772fd033342585ba03fd0cbf3a1bd74876ff2027f80e7550f9a50d464d5d89b6b570b7949ffc929fbd36ebe389dbfa8e543e78b8f565546a9cb974c0842 EBUILD oauth2-1.2.0-r1.ebuild 1075 SHA256 3ab6265e85c327e04042580681a7acfcfa29fbf1d59faa97488ed963cc65d7e3 SHA512 ced68ec5236bb8f509f5d45fb22d0d0b270ebe1134c71c0db38f6e52f6e6dfa3862fa966c80d1da0aa8587c63ccbef11f04a790d88060f2be53f4a5b29b30730 WHIRLPOOL 6eb3517747036216e5c9783e6315544e455937208f0c1199ce048d11377f74414809d5b373fe066311e4878ac53de69c802f7927ec78c0c9678d774aa90c2b72 EBUILD oauth2-1.2.0.ebuild 1078 SHA256 30b13797002ca958c5c82cdeb13f726110358692ababe872bbb3baacae0d931a SHA512 650f192c723c411243d78f718c6f2c0ba5fe165a520bcd0200cbe62a4e1d76fff8057ecbf332aadaa3603ebb75ee482b7e64556f1ae63446f2517940c294e12e WHIRLPOOL e11367a501a35769464d00735d488a6086bd2e9c5678b56183975dad6b52c144c7b10209dff7508d515752f83c895b687a559d4ef659430b5873f74687af1e41 +EBUILD oauth2-1.3.0.ebuild 1075 SHA256 3ab6265e85c327e04042580681a7acfcfa29fbf1d59faa97488ed963cc65d7e3 SHA512 ced68ec5236bb8f509f5d45fb22d0d0b270ebe1134c71c0db38f6e52f6e6dfa3862fa966c80d1da0aa8587c63ccbef11f04a790d88060f2be53f4a5b29b30730 WHIRLPOOL 6eb3517747036216e5c9783e6315544e455937208f0c1199ce048d11377f74414809d5b373fe066311e4878ac53de69c802f7927ec78c0c9678d774aa90c2b72 MISC ChangeLog 3208 SHA256 a94b633eaabc3801cb66995e7919ad437b36c221417c0d80648c6c392b99bbb5 SHA512 762515f93be648ad1f4ac224add5317b2198936d3c4591d0820444fd8d1e3bf4cb084099475a5ed6c7ca2fca49abd832495f3bb1348799069c498ae7293bb782 WHIRLPOOL fdcda75ecb7c3890b3d3f54aa98be681883cef9f373e645f5c382bb840cbe0b93fde01ce5bc02edbd044cba7220b6b2cfd4eeb61b72382e1eb538e142dd3bc5a MISC ChangeLog-2015 3910 SHA256 627ce08f59e13564dfbbe29349c5f7d299389fc9cc1049a1da6def94d1602ace SHA512 ccbace5d7cfbe2e5a96f26d6960621abdd3914f465ac244e9c40a309d5c609676cc8ae12a2036cc36585b2f3771e492928afcc83e036b21fc1366237f1293521 WHIRLPOOL c32af609cdc1cdcdd6dee794783dd5a3648eae6f40b07f17308ed62883d08b79a55ebb3b9fce596309958c47b02eb83ee04ee4dbd370408ca909031afa82fb89 MISC metadata.xml 341 SHA256 d85e0736f2ff1f3b5d81308bf7ae2be598b377c4ea4556a1ea434ed191e6d675 SHA512 33c5be74161557ae3e5888730256536cd02baac6c26913add84d8ce90854c4a3bb57c31fec1287bf560268c681ea3acf2119f2fea3162dd07e3962ee34d74f9e WHIRLPOOL 0d6e65c01ad6e0c215bcecee8ca78bc099c46e96f26945ba89b8f94368997b3615a16e0abf6787564781b8ea175e513c7ba074b28f9a6763fa9f14b7e6534c3a diff --git a/dev-ruby/oauth2/oauth2-1.1.0.ebuild b/dev-ruby/oauth2/oauth2-1.3.0.ebuild similarity index 90% rename from dev-ruby/oauth2/oauth2-1.1.0.ebuild rename to dev-ruby/oauth2/oauth2-1.3.0.ebuild index ba5c08096fa9..ff3d289bdd3d 100644 --- a/dev-ruby/oauth2/oauth2-1.1.0.ebuild +++ b/dev-ruby/oauth2/oauth2-1.3.0.ebuild @@ -4,7 +4,7 @@ EAPI=5 -USE_RUBY="ruby20 ruby21 ruby22" +USE_RUBY="ruby20 ruby21 ruby22 ruby23" RUBY_FAKEGEM_TASK_TEST="none" RUBY_FAKEGEM_TASK_DOC="doc:rdoc" @@ -20,14 +20,14 @@ SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~ppc64" IUSE="" ruby_add_rdepend ">=dev-ruby/faraday-0.8 >=dev-ruby/jwt-1.0 =dev-ruby/jwt-1* >=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1* >=dev-ruby/multi_xml-0.5:0 - >=dev-ruby/rack-1.2:*" + >=dev-ruby/rack-1.2:* =dev-ruby/rspec-2.5.0:2 )" all_ruby_prepare() { diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest index fb1d4684e55c..3f9dfd73d350 100644 --- a/dev-util/boost-build/Manifest +++ b/dev-util/boost-build/Manifest @@ -13,6 +13,7 @@ DIST boost_1_59_0.tar.bz2 70389425 SHA256 727a932322d94287b62abb1bd2d41723eec435 DIST boost_1_60_0.tar.bz2 76553944 SHA256 686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b SHA512 7c851b3fc2b322ff05d642d9cf03e7c30c5f04d5cf0579c99046b1ec708901c58a3d349031dfe24591f5b88c1e664b6a0d40abea6cce89abb52080c02eb725df WHIRLPOOL 828b0797a8b62150ecef5ee13f0e8b8d6b6a0e7365511ec9782d2d8f3a26ac38a98f10876c40d05ea46697c013b1f96f22b3a24c449372520c84bb725059fe48 DIST boost_1_61_0.tar.bz2 85202254 SHA256 a547bd06c2fd9a71ba1d169d9cf0339da7ebf4753849a8f7d6fdb8feee99b640 SHA512 a1c7338e2d2dbac8552ede7c554640d22cbb2fda7fbc325dc3cdcb51e769713626695426ffc158cbe0e1729dd9a7b5ad18af4800d74e24539e8d8564268c2b9d WHIRLPOOL 59b47e7ae9ae8443ecaab29b1104cfe3ebfa607d22afcc3fad4a87bdfd575939eba8130a80fd509da178eb3227a26cb74db51852716dc5df068d36fc4839372b DIST boost_1_62_0.tar.bz2 84513338 SHA256 36c96b0f6155c98404091d8ceb48319a28279ca0333fba1ad8611eb90afb2ca0 SHA512 5385ae3d5255a433a704169ad454d8dc2b0b5bcae3fb23defd6570df4ff7d845cf9fcbeebccdc1c5db0eec9f82ee3d90040de9507c8167467c635d3b215463be WHIRLPOOL 49c4558d5e6d72084f083a76217e3d97b504f112d7e4d228eded72dc49fa7e675ba943a9fc52a3c27d296ee689aee27d4566796c6eae71cf647430285777c0fb +DIST boost_1_63_0.tar.bz2 81984414 SHA256 beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0 SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad WHIRLPOOL 28c241785097272a1e0952e529eef082444e4ef35a8d738161e4a491a986d75359d3afe888b2ea91a4a81b6ec7a5772ebea337c9d09377b43f6eed66cac90378 EBUILD boost-build-1.55.0-r1.ebuild 3895 SHA256 a3f01b2560d8cfb7471f1584003a32b1fc682ae5d4bc1b83a979da5d794daabb SHA512 49f95f5cdb6e7193ddb0c8c4040ac846d874eaa02c10644c8c67b12a4ca11277847d91133fb62f6a6d9d39d6ef07f4a0741eddeb29a19df7c1143d46d4de5355 WHIRLPOOL 98e7eafcc118671f9e33c298e57032b91b51dac2cac62106371efb1aeb206428ec9e766db695be57fff35c46d88d6e547adeb4095cc02c325ebb1c93525ee9ba EBUILD boost-build-1.55.0.ebuild 3878 SHA256 4edebe6da2d4f02e2898c106b7cc95ad5bcd3b7d541e845430b33ebaf5915d2e SHA512 8d5241adccc64cfdd538b4a95bd3a2cb7106b2cd96d230ad3c9311ea5f022111d98e9e9b2bad3e1e55756a1a3bb1006c4076fa48c22627cfc359c556f9b948d3 WHIRLPOOL ce590ac096fe4f06d1f49db7ef670ee34c24beee23e1316de09406994d3913cf4dc131241753e6d1042c7f85d2bd28661e7c8c18d8001c046b145c8d4153faf4 EBUILD boost-build-1.56.0.ebuild 3947 SHA256 b33ab81a7d68bfaf64e4f71c9366a81876340ad65454c642224b8cf9e28b5079 SHA512 de52a30bd77db39a3c51b1c9b7864deed6a2484cf52abc1428b0c2d82b92c184ff1ea5832a910e3f2504d189719ca15d7334ef57549821e5aac971530e00bb29 WHIRLPOOL 8c4c694c4eba2f577cef583dec035acd08d8b9287cebec8ebdc5f6c631d6a3c97ad4b07bb8dfe9c2c40bc618e8fb08924baecb00c5fc492e259f9fb8c485d2fe @@ -21,6 +22,7 @@ EBUILD boost-build-1.59.0.ebuild 3947 SHA256 896a2e18b2280f50f59a2fb6b06992196af EBUILD boost-build-1.60.0.ebuild 3947 SHA256 896a2e18b2280f50f59a2fb6b06992196af5a0786abcd9ed3bcf0edcad54dc3a SHA512 ad9e1dff9322b1eb644ddb10e825f40520b5bb974bb7d1f2d1d4f02eb006980aa89d556195076ca2747cf168455d48024325acb0fc5cb7a5f0f93fc0cd4ba534 WHIRLPOOL 7b8f6289f4068834f386d104eea57267cc7dcd6585fa05d5433af090f39589006365b43e9940327ff2226dea8cd0c474b978b776edd573525ab8d77bdd7c7fbf EBUILD boost-build-1.61.0.ebuild 3923 SHA256 c67f179c37b9d0511cb05b59a78ac9bae2e1609ace7b9011169bd6c8a7cbee76 SHA512 42fa7cfd2da40994c97278bd895191b668d75cb1b83a2f1923d8b5ac30d370b29e7db71cf378308f595c1cd3f398c510cae6733118cac8080d52ed2ca44cd7b2 WHIRLPOOL 62b4829865c47549d964e35e062c4f6dab5c014e7c690138ec1afb62762cca972474f20281bfc5822b24b8db256f617c41f1648785f9bd8096d1b41bacde0942 EBUILD boost-build-1.62.0-r1.ebuild 3966 SHA256 d65a33bcdc134ce9d642a68cfad6c276256474d5d9e85f6355418d3349a6fb97 SHA512 5e259c5b5c2b5daea353105db54dfca1fc0bed95c8dca30b7fc4f8c9cbcf2b57324bd7abdb59a78e53f57a7ab4bd77aab7cfa707a9f430f85ccb425baa650a7b WHIRLPOOL 0998edd6b2098795e185c8e9a37b053ab58b1c425acf5464fef03bcfaa957a34bd7fdee1cff0a735cae429391a69a3114c1a2fa5030984b291ebef16c6a620df +EBUILD boost-build-1.63.0.ebuild 3877 SHA256 42846dd763bcb2d192cc2bd2abb9f32dcdcc55cc4286f47ad7533deb8381c721 SHA512 bbc656663cbebc7b8438246d6400cd9375930e67e85c9a726a72621fd3334302ee18c89de4eada48def0addc154f9173f5ed793a9374b66f4b23fe66eb7694f3 WHIRLPOOL 53facb926f2ffca91a663111541a3bb2b4027ed48ea4c2c1d227c18d96491db8ad6c622b4cd0495c59695f1e57e41847c4e1b37c7d1fd7ebca0888db4e7af6bc MISC ChangeLog 6926 SHA256 5b6756f0013121ec09198c73da2d7129ec1ac2b1d6fc61f5747b93dca22eaa12 SHA512 08ca2bc9b31b300716becca8c9d2517ff5f883bb1a9e699c08801422998c5e4d66d081c63365739d656417cf2dbd40d4e6aac11f15bfda0134f8083531d39c19 WHIRLPOOL 437676783bc3e32e926f4f3d73c607c48ac093e92457afc55142b7fed55009cecee6a2ec8d331855ec0450c0aa926663e51c5a2baa89b50b3754e901f5703cf9 MISC ChangeLog-2015 22458 SHA256 8341068142b55bc555677104798816b8c9a9e135b924faf03d03e6a371003f1f SHA512 b6eee67178faa003cbbee237311dfd302b9544d7c8cfb397a4a26234e6db628e91f3fa802a37dc8df68c88bfd3d5bd156c16e0c33f57e35cb55cd6bfc4513e46 WHIRLPOOL eae5386edd1e2275e2656bf4fba0edfa3adfaa3ecd7cf889eb65177895a91ff1ff31a7e52d2f70b9c3bb7017fffec8045bc607a7ecacd6fca32a9d3b1c1bb33a MISC metadata.xml 334 SHA256 247038e2c8e01feb3d58a507761974ec2d1904fedd028be5bf1d1627be82d9d5 SHA512 bc1fa12d69f5711c380a938546914a325ac9dee1b35b2b75136144bbf90190fdc7e113a8eedf26a5c23d1564baf71f936141d71ad715ad6f212f32226601706e WHIRLPOOL e5413e89efb623ebfff8259965a51ed6c6c8d207eeaa6f6ad691b6001945664a72cb9e4dc501c0ee0d560cabc0fdc20d3181b5212e031ee15e357c0ccc72a985 diff --git a/dev-util/boost-build/boost-build-1.63.0.ebuild b/dev-util/boost-build/boost-build-1.63.0.ebuild new file mode 100644 index 000000000000..86e0638746cc --- /dev/null +++ b/dev-util/boost-build/boost-build-1.63.0.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +RESTRICT="test" + +PYTHON_COMPAT=( python2_7 ) +inherit eutils flag-o-matic python-single-r1 toolchain-funcs versionator + +MY_PV="$(replace_all_version_separators _)" + +DESCRIPTION="A system for large project software construction, simple to use and powerful" +HOMEPAGE="http://www.boost.org/doc/tools/build/index.html" +SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2" + +LICENSE="Boost-1.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh \ + ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix \ + ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris \ + ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="examples python test" + +RDEPEND="python? ( ${PYTHON_DEPS} ) + !/dev/null || die + eapply "${FILESDIR}/${PN}-1.54.0-fix-test.patch" + popd >/dev/null || die + + # Remove stripping option + # Fix python components build on multilib systems, bug #496446 + cd "${S}/engine" || die + sed -i \ + -e 's|-s\b||' \ + -e "/libpython/s/lib ]/$(get_libdir) ]/" \ + build.jam || die "sed failed" + + # Force regeneration + rm jambase.c || die + + # This patch allows us to fully control optimization + # and stripping flags when bjam is used as build-system + # We simply extend the optimization and debug-symbols feature + # with empty dummies called 'none' + cd "${S}" || die + sed -i \ + -e 's/\(off speed space\)/\1 none/' \ + -e 's/\(debug-symbols : on off\)/\1 none/' \ + tools/builtin.jam || die "sed failed" +} + +src_configure() { + if use python; then + # replace versions by user-selected one (TODO: fix this when slot-op + # deps are available to always match the best version available) + sed -i \ + -e "s|27 26 25 24 23 22|${EPYTHON#python}|" \ + engine/build.jam || die "sed failed" + fi +} + +src_compile() { + cd engine || die + + local toolset + + if [[ ${CHOST} == *-darwin* ]]; then + toolset=darwin + else + # Using boost's generic toolset here, which respects CC and CFLAGS + toolset=cc + fi + + CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT%/}"/usr) || die "building bjam failed" +} + +src_install() { + dobin engine/bin.*/{bjam,b2} + + insinto /usr/share/boost-build + doins -r "${FILESDIR}/site-config.jam" \ + ../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \ + build kernel options tools util + + if ! use python; then + find "${ED%/}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed" + fi + + dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt + + if use examples; then + docinto examples + dodoc -r ../example/. + docompress -x /usr/share/doc/${PF}/examples + fi +} + +src_test() { + cd ../test || die + + export TMP="${T}" + + DO_DIFF="${PREFIX}/usr/bin/diff" ${PYTHON} test_all.py + + if [[ -s test_results.txt ]]; then + eerror "At least one test failed: $(= 5.7.0 +COMMON_DEPEND=" + $(add_frameworks_dep kactivities) + $(add_frameworks_dep kauth) + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdeclarative) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kidletime) + $(add_frameworks_dep kinit) + $(add_frameworks_dep kio) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kpackage) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwayland) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem X) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep plasma) + $(add_plasma_dep breeze) + $(add_plasma_dep kdecoration) + $(add_plasma_dep kscreenlocker) + $(add_qt_dep qtcore '' '' '5=') + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui 'gles2=') + $(add_qt_dep qtscript) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) + >=dev-libs/libinput-1.2 + >=dev-libs/wayland-1.2 + media-libs/fontconfig + media-libs/freetype + media-libs/libepoxy + media-libs/mesa[egl,gbm,gles2?,wayland] + virtual/libudev:= + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXi + x11-libs/libdrm + >=x11-libs/libxcb-1.10 + >=x11-libs/libxkbcommon-0.5.0 + x11-libs/xcb-util-cursor + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms +" +RDEPEND="${COMMON_DEPEND} + $(add_plasma_dep kde-cli-tools) + multimedia? ( + || ( + $(add_qt_dep qtmultimedia 'gstreamer,qml') + $(add_qt_dep qtmultimedia 'gstreamer010,qml') + ) + ) + !=sys-auth/consolekit-1.0.0\" sys-power/upower" + fi +} diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest index 3135e2d2374c..d81af63d777e 100644 --- a/kde-plasma/sddm-kcm/Manifest +++ b/kde-plasma/sddm-kcm/Manifest @@ -1,7 +1,9 @@ DIST sddm-kcm-5.8.3.tar.xz 48968 SHA256 0d41f5d7017616ea17e4e4c37bb9dbf8ff2efcefd242c7b101ffa722564e42b3 SHA512 7b5f1b60b278cf2021e0738ca7f3a65c4c2bc669feee2e905b08c799646cb4a66b4c5f7ee690dac086618af7e8e9f648f08ccf1aa6db85a546ab98c9ef8abf9e WHIRLPOOL 0f8b9fd872e4ae7ecbc3bbb847a0474a720030431cce4cdaea1154901d41e2d14e2365c2d0ff91820118c2d124d8d0bb0b32d56e2089cbea177715418f2f094d DIST sddm-kcm-5.8.4.tar.xz 49560 SHA256 dd770bdccb4a0c327b51d9f1585fe0db5a72b13c7a13a0d9ad8d6fb9a1e9a20d SHA512 1683ce7813189949ed27b1ec64b40f5eea9e2f9acb3a0c650d4b42bab2b6621486e3ee85314848b1182c13354c59f7f6a66711c6597f37dd335e7ed42c3a8be7 WHIRLPOOL 01bc73bd79c927ca9adfef2ea4ceebd136685bec5b52e38699cdefd0f2ce78c50d12b77b1af8437eaa611b082db5a6369a37ab77930ce96a69aee78e2fca7312 +DIST sddm-kcm-5.8.5.tar.xz 49008 SHA256 0c3b903ce09a6707453edd6a89da9676ce417dbf8c0dc360f9046336dc989b35 SHA512 12ab54496dcb07ae662eff7bfe0b3c4a12ae91b4c3b3de8186f310305e7a7bfe1060ccf2d6b0dadff1ea15cd6fb666385c71230e35b86de6383122cd88ae66b5 WHIRLPOOL f3e57d59f09ff1a11a6560eddf9da0195981482ae0140a51414f92e88627261b0ba64779f391d787edf6272dfb9b6bb7124f03a4dbab3969bedd1db6f1150c6f EBUILD sddm-kcm-5.8.3.ebuild 905 SHA256 8a0d9c16eadc2de66dafed7e9b03ad07874fc87fcd2713ba30ab963e4a1ac6cd SHA512 a35dfadb3098f41a99dce1cfab0b08f123e1021447bf0a850850f600bd3b173bc7989b64e8e90efe87ffc4fb6c48a27fdf1079d987a6e91f3bf5c35111132296 WHIRLPOOL 4d07531662034359f8e05284a7c52caeb12de9f36aa0959e49fd05e0a281331c0a661066373f7e7e97146f7ca5767503fb472e0cac32004e38264d6455878fd0 EBUILD sddm-kcm-5.8.4.ebuild 907 SHA256 2cd01e0e94d40649a08c18c9ee84431d8f100bccdb390105f4da2a5451706634 SHA512 94e77e05a0b97e5342e53d718f7ffc3ef1ac0d8c37da9e7747a19f98538a062638ef8c2d82c563b8da1ee4f47140071c5619bd3ad4c7fb6a0767968451c6d475 WHIRLPOOL 8cea61f027a7eedf66204e26a7dfeac9d9c7677619aca47f40bef9698b98a100a918858d53ddbd6df30632a7fc78535251890bbdc2da9074bff85ee5795eee14 +EBUILD sddm-kcm-5.8.5.ebuild 907 SHA256 2cd01e0e94d40649a08c18c9ee84431d8f100bccdb390105f4da2a5451706634 SHA512 94e77e05a0b97e5342e53d718f7ffc3ef1ac0d8c37da9e7747a19f98538a062638ef8c2d82c563b8da1ee4f47140071c5619bd3ad4c7fb6a0767968451c6d475 WHIRLPOOL 8cea61f027a7eedf66204e26a7dfeac9d9c7677619aca47f40bef9698b98a100a918858d53ddbd6df30632a7fc78535251890bbdc2da9074bff85ee5795eee14 MISC ChangeLog 12141 SHA256 86700c703790bcfc85dfcc9ab44be1f1d8b3266a0e38fabb708cf218ee8c40f5 SHA512 c33a24c029738447dc8ad912a6be1044ecb88c7c355c06a3d137cbd33d94b0fbe2b344de24fa076cbf1283491dce7749778600100a6dc549d1c2a57517883ea4 WHIRLPOOL d231de675bef80af44cc3a09e2a321fcb88134f7c893f6dadf158f1397d80583e2260f92cbe46f96037b1feb06b22486be6b98c6ea7bba614dc6139fd54a17b0 MISC ChangeLog-2015 710 SHA256 fe3f1b3f60d0c4c573e273578fbce8affd00d9899c058ab58a2717d3d5f5b985 SHA512 b535bdb4b53eeabde8755c6262ee53e62e0bab2663cdf1dfec00078dd47a0a741283ae8245cef315818ee690b88f70015187cbb15cc4b2908346120eb84e49f5 WHIRLPOOL 11d7b0f838e5e7a3643283853ef119351b74947700fcbd1891071f88e7abdbdee90fb3bee131e08ae4155afb7137a56e5362df36e7be5e659a723042f193aa6f MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.8.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.8.5.ebuild new file mode 100644 index 000000000000..35f34a84351a --- /dev/null +++ b/kde-plasma/sddm-kcm/sddm-kcm-5.8.5.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit kde5 + +DESCRIPTION="KDE Plasma control module for SDDM" +HOMEPAGE="https://projects.kde.org/projects/kdereview/sddm-kcm" + +LICENSE="GPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +COMMON_DEPEND=" + $(add_frameworks_dep kauth) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kio) + $(add_qt_dep qtdeclarative 'widgets') + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) + x11-libs/libX11 + x11-libs/libXcursor +" +DEPEND="${COMMON_DEPEND} + x11-libs/libXfixes +" +RDEPEND="${COMMON_DEPEND} + $(add_plasma_dep kde-cli-tools) + x11-misc/sddm + !kde-misc/sddm-kcm +" + +DOCS=( CONTRIBUTORS ) + +src_prepare() { + kde5_src_prepare + punt_bogus_dep Qt5 Designer # bug 603794 +} diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest index 71453c19eb5f..32ac56700b03 100644 --- a/kde-plasma/systemsettings/Manifest +++ b/kde-plasma/systemsettings/Manifest @@ -3,9 +3,11 @@ AUX systemsettings-kcm-randr.patch 909 SHA256 5ff8877c3d4b564777343332b9a2aeb78a DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802 DIST systemsettings-5.8.3.tar.xz 157968 SHA256 b50ec8fb4402d332d9fb6c1aa00cd7431ac3299da3003cc54522c1544c610a6a SHA512 d1a81880057bf648527a42cf2a93f51bca8a10bceb4bd04ed3ec47fb57195840b6d4369425b3605ca791ebd5f612071e8dc0a154720088541a00093b0ddb03f3 WHIRLPOOL 595a298541cb39da14752431fb034d02bb3380246337e450b51bc8c962782b614aa4ce1416a7d1f51e5aa85e72e15be75724da40f1cda9ddfb84a2a26850306d DIST systemsettings-5.8.4.tar.xz 159288 SHA256 1b327b813f3d6dec3b1c873309ef88648e5e743aa90bfcf9b6a15354f7f685c8 SHA512 947f9f069c3f2d6db732e9373212be66b146f157ca4b996c05824e5f6168a9e5af761649bc850d4c4899658d1034bf393c3395cc074a7f4e03db6ddf4f0ffea6 WHIRLPOOL e2e880dc2dfe32c8709d3abea41da1b24536e2b17ad0b5066bbc86202816e791477201393d077be30e6ca1904ce8cb1665bf8e44393aa3b4171706408375c819 +DIST systemsettings-5.8.5.tar.xz 158604 SHA256 eaf1295d0d681a33514a6e38375c13e448655f813b422122627ed127d7ab7c5e SHA512 6a9d1819f29d5bff4a30d28e9ae799b5584384a7b75ce0832756d5925b68ac09c0dc6d43e9b5113d93aa08ada3700d3193c9e571dc8e5762d210ca75ac75e07c WHIRLPOOL 938f099990d2a2da0b56e91a5b76d4ef41b3594d6e15ff7ea84af0ce94b0f8e277ccaa9fbfe758ea43a6bc994f0d4c6ad00548feee9f72006fdd64cf6c45cc19 EBUILD systemsettings-4.11.22-r2.ebuild 2335 SHA256 77576ce2b1e3b135c09f8599c69d1b39f45855d530fc8338eb7affdad607eeaf SHA512 033f625b27ccbb3d0d20d93b5940e5071c5d04bc7dd77b98bb638807f18db4db652c2e124334552c6ccfd631c36e7a09c57269cca1a0805131c11d2498005508 WHIRLPOOL c4825241901565b75c843042b9a439edcbd8a5afeca0b67531abe6d8809ba9155579fdc25dea3c25c2bcb1f0f2213560677b2aa6892ffbc78a5a75ff483b08a2 EBUILD systemsettings-5.8.3.ebuild 1080 SHA256 e4ca93cfe7747c3d0a5e356ce70ebd3d533d56a8c2e92ffcb8f3572a2b249aaa SHA512 3876ac0dbf4ab7cd90ed0d41e8ed1da1fc1dc3d2dfa620f34ccc0550e48de624a55b83071611c5c7d5dc6b4523b40d6385af75ad780c29a1a3bae26742ee9f91 WHIRLPOOL aca0a6132f9282285dc77f40db5fd005bb39af1e02e7e20f7f8e904f82b76eb595f6c2f79b252371f25a9247e6c2c14461d1e7ac7a40ad349ad46dbf2fd2db40 EBUILD systemsettings-5.8.4.ebuild 1082 SHA256 1df24f10c0fa883df735e750d323e67a50bd02c0d04d424c78ee9c2a6f6f0646 SHA512 515d16451f03101e204350283ef4d0b037fff32fb0c1ad683bd5111c6f1c2e61ac839490a964d4840c88f01a53738b9ad755e585ff941800856649e0ee9a79c6 WHIRLPOOL f6797e07b361276352f3cee78494e4ebab5bc637bb3366e720a5a185feb065e3edf4766b7dbe2060545dcb8c7c8fe57104b93b0f25b0facc47866993ec2c303e +EBUILD systemsettings-5.8.5.ebuild 1082 SHA256 1df24f10c0fa883df735e750d323e67a50bd02c0d04d424c78ee9c2a6f6f0646 SHA512 515d16451f03101e204350283ef4d0b037fff32fb0c1ad683bd5111c6f1c2e61ac839490a964d4840c88f01a53738b9ad755e585ff941800856649e0ee9a79c6 WHIRLPOOL f6797e07b361276352f3cee78494e4ebab5bc637bb3366e720a5a185feb065e3edf4766b7dbe2060545dcb8c7c8fe57104b93b0f25b0facc47866993ec2c303e MISC ChangeLog 13696 SHA256 91d37679ac7ac4253fb1ae2fd23d9240b34358af603efe8e91269efeeabb4535 SHA512 af549929608ef264bb7aaf9893fa3d05f1c135ad2470740b251e1a0d0de242597e74d3b6af00c65ebeeed64e2e8b2f253bc9600a868ac3a02e3323476095df7d WHIRLPOOL 2ef6dc94350335ab8f1ddb3b05276c47af534f279540dab70f9ebb0ead7f4920f67fc5b2ac3aa6fc1ced55494ab28507322cca52e3a5980a0f119ec0490ee2d3 MISC ChangeLog-2015 752 SHA256 bba7fa7b0d94886cadc43b95b8058782406612b8a9045881692191783f8a6cdb SHA512 f95f59e061299f0a15a29f473df03af4caee95119a00a46f681da6a556e422ac502da7f03bedd94555063c404431db201c412bb5084dd446116ac74d8875bc25 WHIRLPOOL 868c009bda9d7f15ef1431223037af3af05484a5e34f406a807f130d5f544d3112680ec2a0884327b08ccb3bad1dd262cf93c3405bc5a87b9d4c67255249df11 MISC metadata.xml 449 SHA256 f1cea58797dc3f90107a9add880ea54ee46da107454eacadf252d156fe44c5ba SHA512 849cc2e4d0d1b6b67a37dfb6529f4bac83bf6f0ead67121c594882fa5bd1e013939d0a337f2e8e6d512f2c845aa3cdc6f004c41026ada570eef1b3c976673d05 WHIRLPOOL de87cb6993d59a672f5aea27ae882d2814194005ac71a2b553ce985f19e1be2783dcdee2a1f37f0d6ae9b7d10bcfaaa6fc671ff9c3bf1ca35e22ebb39377ceef diff --git a/kde-plasma/systemsettings/systemsettings-5.8.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.8.5.ebuild new file mode 100644 index 000000000000..177613b6e606 --- /dev/null +++ b/kde-plasma/systemsettings/systemsettings-5.8.5.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +KDE_HANDBOOK="forceoptional" +inherit kde5 + +DESCRIPTION="System settings utility" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="classic gtk" + +DEPEND=" + $(add_frameworks_dep kauth) + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + classic? ( $(add_frameworks_dep khtml) ) +" +RDEPEND="${DEPEND} + gtk? ( $(add_plasma_dep kde-gtk-config) ) + !kde-plasma/systemsettings:4 +" + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package classic KF5KHtml) + ) + + kde5_src_configure +} diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest index 4e070d023483..9007015df901 100644 --- a/kde-plasma/user-manager/Manifest +++ b/kde-plasma/user-manager/Manifest @@ -1,6 +1,8 @@ DIST user-manager-5.8.3.tar.xz 542076 SHA256 1be1ed786e8762bf35b9ad56455f6441ec14ae622439dffe5430bb2cb29d094e SHA512 ffe798bb982c98601b36924a32e7f4206a96c2a3c56afa90d13f01978c1384fcf0cc705c0ca79e166ad9a2e8a1ca4ad93f1670da79db9ba75bc02e3e33e451ea WHIRLPOOL 798a3cedc89e1606315b51e471969513d469996e80202285b306e580a257518666030130b32ebb80e46a15ae6b19a6bf1febc13898c17c364722e316d20e1379 DIST user-manager-5.8.4.tar.xz 542716 SHA256 2da8fb75f2de0d15f167698ae168d1f9cbc1b94200b8d1cb2fc90349f1d95e54 SHA512 02d2075798f3d8350eafc31356c77bb95aa527d3c658c96d8bbefff933e19d6f8d85edc494dbe6b19510e2fd4023bd5d4d53a1f82b8ae82a849868d3ad9a18a1 WHIRLPOOL 6a1aab353d9ca4b36ddf2a548e48effb2ba3425e8e7088a73ed31fbd2a88e9a6ea3283c61089c4a75da9a3238d4b5e633195bb42cd20b31e2d1d347f67e893ef +DIST user-manager-5.8.5.tar.xz 542472 SHA256 bfd047cc2d01acd0139d29a88d31b4422f108186cdf1f8d67a580d0c0cea68b2 SHA512 dec55d0ecdf628637c3d80ff916109f24bf08f241756c15cbcbe4200082d7ae5bc066e15cebdfd8fbce478a37e040ce63fdc0fbd021814edc0409d74c3ca1e34 WHIRLPOOL dfcec7e46ba5ddf3634ca82e129cbecac665e5307f0f6305521d74fbe047126ccc91f5db10a330b55577997a854fc5fc3192a7597852fc56137cb14e04538787 EBUILD user-manager-5.8.3.ebuild 622 SHA256 86f3d1466306118f64e9bdd53671d25bf38f44f38ab18723ccaa683963940f94 SHA512 10163b67b1aab73e7752c887fb73884e1619f3a431459143ac0bc486af390bf57c127aff95b600c6da930d6b208e7dfc381425601696b431ad4c5a719633ff33 WHIRLPOOL 629b4b41ab9258cefb697f5ea8aec16b72dc0734d118b31548259889fd903263a103cfc8011ba55a9bc6229ee294a71510ed9658964d35202b606392df72fb7c EBUILD user-manager-5.8.4.ebuild 624 SHA256 d5d599943be695a0ce5ea948a76b4d5e050041b738b6a4379b62e9cf4c6fd13f SHA512 b0a2fba6e888e7c055aaa1e8965a339dae6d56758c5c86073a2c1b56f7afbfe590df9b0a80bf1bba1c3b57518b8fc0068dbfce560483484b9bbbd4bef3c3dc1b WHIRLPOOL 8d658a221a1cd2a18492a6386ff64f76d585488c7ac7ada865b3fae6f4be31a068af967d5facd8a3a3c88a8d9eed5da3822cc8320589df1a69fcba3898263a1b +EBUILD user-manager-5.8.5.ebuild 624 SHA256 d5d599943be695a0ce5ea948a76b4d5e050041b738b6a4379b62e9cf4c6fd13f SHA512 b0a2fba6e888e7c055aaa1e8965a339dae6d56758c5c86073a2c1b56f7afbfe590df9b0a80bf1bba1c3b57518b8fc0068dbfce560483484b9bbbd4bef3c3dc1b WHIRLPOOL 8d658a221a1cd2a18492a6386ff64f76d585488c7ac7ada865b3fae6f4be31a068af967d5facd8a3a3c88a8d9eed5da3822cc8320589df1a69fcba3898263a1b MISC ChangeLog 10571 SHA256 129049cf67b632dd75ec391f76d853b9eb1ab713902b7342551c7c0db6ad6517 SHA512 a24780c15d3488ba52ef22ce8302d0fca1fba1aed90bb68ce59ee96fa60ec89c8437429f98e0f299359a861d6786bd34085815bbfadd16af637dee4bca2594d7 WHIRLPOOL 1f3a6611b0dd86287daeaa693ac45754c18e1f4ae5a48417dab75fa66e032a85f3d247f7f1042029c6710adacc970692d02c1b814ca1aba9a1e932a74bc89966 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c diff --git a/kde-plasma/user-manager/user-manager-5.8.5.ebuild b/kde-plasma/user-manager/user-manager-5.8.5.ebuild new file mode 100644 index 000000000000..8580afb7f457 --- /dev/null +++ b/kde-plasma/user-manager/user-manager-5.8.5.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit kde5 + +DESCRIPTION="Simple system settings module to manage the users of your system" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +DEPEND=" + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kwidgetsaddons) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + >=dev-libs/libpwquality-1.3.0 +" +RDEPEND="${DEPEND}" diff --git a/licenses/GPL-2+-with-openssl-exception b/licenses/GPL-2+-with-openssl-exception new file mode 100644 index 000000000000..7480f8003b74 --- /dev/null +++ b/licenses/GPL-2+-with-openssl-exception @@ -0,0 +1,12 @@ +GNU General Public License, version 2 or any later version. +See GPL-2 for the full text of this license. + +In addition, as a special exception, the copyright holders give permission +to link the code of this work with the OpenSSL project's "OpenSSL" library +(or with modified versions of it that use the same license as the "OpenSSL" +library), and distribute linked combinations including the two. You must +obey the GNU General Public License in all respects for all of the code +used other than "OpenSSL". If you modify this file, you may extend this +exception to your version of the file, but you are not obligated to do so. +If you do not wish to do so, delete this exception statement from your +version. diff --git a/mail-client/pinepgp/Manifest b/mail-client/pinepgp/Manifest index f53b8264fe80..72b067a97302 100644 --- a/mail-client/pinepgp/Manifest +++ b/mail-client/pinepgp/Manifest @@ -1,6 +1,6 @@ AUX pinepgp-0.18.0-makefile-sed-fix.patch 3349 SHA256 22b60805085efdd6c2a327d4cf3d5deeb6ecd12eaf0c31fae9d449dc5426d42d SHA512 5c2c87ea5ab1e8cc64b7223f5f56d5211d1c024f84ab8ed6ba15d0b221010a080a6843133d0b29e72b15db08028175073fbb7dd883584da87e3a753e362c9b31 WHIRLPOOL f1104d3530f3218f4043f6efcda54a106e076191bdff9cd5885cdb99c9b1bf2a183f966f9335ce9770390a556ead09eeb8137c111737761fe83cc5a590a17ff5 DIST pinepgp-0.18.0.tar.gz 38103 SHA256 2917ed5734b2c2e70cd8d944537cb0280f7cdfa34fcd64121f41bb4c37c7d6d9 SHA512 b28b71d4d5132b451ff4a2a9489f830cedade300d18ad05a0aa443bffa6fe5ece7be4f166e7428fc999b2d1b550cf8dccf7982314868db8597117d0f8d74686e WHIRLPOOL 88b411b721eeab280c22aa2f2d41f78a14d28511d221be0fa89a50183a202dac66524500fa78e061b9964cc95097929c97559609a9558ea6cb6f98445b4bc9ce -EBUILD pinepgp-0.18.0-r1.ebuild 618 SHA256 da5d024b2829300c9b915e2ed891767c42675cce734891aefb27a29eb0e7fc11 SHA512 29c51d7c2e308262420aeafb12d7395ea7c25031f3a13f04109da724e4f770d6c47eade793c1446f72f34c565af67feca80f0e819d4ea2d66d00700fa9119636 WHIRLPOOL c72a33b153b43c3da08e2abeae7b4ea679df5a9a23e63c9733b17188f1d4a05ea3697d61ead421c3c4b64d40e6d03c4fcd7a5f53e7a3e16067d1cd82adb7a6c2 +EBUILD pinepgp-0.18.0-r1.ebuild 600 SHA256 d8a5a922e0d85b0621d5420f7ca6e0d0c736616f03b3faa75aaa0c74af0f5978 SHA512 6d4c7a67ae3a4c4b1a1f2da57f645916d1e9bd6f5cbb7c41e0d498f6d099767b5719280962ccbb20ace040a2b3908169309377cefc4d6c99c3bf7b357a92faed WHIRLPOOL 8dd802d90eb021a08151c9a66cef82666b79eeca437ef2762cdc6dc6b66b4f5a270f23e4a8ee259e0b8a2591997b1ea837e080116353d823438ae807eecb1c02 MISC ChangeLog 2486 SHA256 54f292f012cac1004469adc61b915b0e39389f5cff1c665cd2f173f03af88ff3 SHA512 c28bc22b07aae75aec18754f60ca0d540c952112b56f4a8c67fb78602071ef92cde7a7880315259e57d1deffe25644af7ac1c4f271ba9be2366c51b739be9a11 WHIRLPOOL ee540a477ebfa98fb54ecfb886ea3634190f349642b047b350578e923f273f49468bb65aafb7f8bae69aea0740960356c52c885146f1b41e3e1f0658f1ce2806 MISC ChangeLog-2015 1982 SHA256 17382b5cf33c1fd07460f9bfc04e4b9cb0b34dea65e547425c1656c317bc909e SHA512 77076752aac8df35006b23aa7943a595095529453e9e45a7a4658a3c1b0c9c6197087a307d28dad09014ff74057287eda6fa5bf1565d57b732b8c82dacae974e WHIRLPOOL c344c89473364e8677757cb6804f53e0ac4349711aa2871660f1078f708cbcb53d4e08f4b8593dd113600390165eff2d15d0f969886e5f7f29bb1be04e5182e4 MISC metadata.xml 240 SHA256 f0e0bb7a24c4b1ff6b6a8a3e9315245c298499c03fbda429c0f775ec6a5396af SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db WHIRLPOOL a7adfcb24489ae67a43a59d8350a70b20874fb03de95681c5b516a741d95422560a433f641de5a7222cf5d3500333e215055ec0cb3844e7abc6d6a836de97357 diff --git a/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild b/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild index c32067c67008..da56950e401f 100644 --- a/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild +++ b/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ inherit eutils DESCRIPTION="Use GPG/PGP with Pine" -HOMEPAGE="http://www.megaloman.com/~hany/software/pinepgp/" -SRC_URI="http://www.megaloman.com/~hany/_data/pinepgp/${P}.tar.gz" +HOMEPAGE="http://hany.sk/~hany/software/pinepgp/" +SRC_URI="http://terminus.sk/~hany/_data/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ~sparc x86" diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest index 9cadc628c675..44449d228b64 100644 --- a/media-gfx/librecad/Manifest +++ b/media-gfx/librecad/Manifest @@ -1,4 +1,3 @@ -AUX gcc_cpp0x.patch 412 SHA256 2f41faa6dae24a68dedf990b3d40a9f32dea7412c496f7bbf8386e5b71500dee SHA512 07d085f5a39a7d70ebfc39efb1c51f384c922636108a1c847a44d7ada4526c21807cbee2f87539064f81af85f807f4a54eaab525692db7f1bc9bd13767779822 WHIRLPOOL b9a79055c5e899bf8b497504212b82c1a7ca43c864311d5ac4a1a451876b92e64f0f7d6984dd463efe5df23104040c46c3906a489e4cdcf0ef15e24dab5c7ddf AUX iota-fix-2.1.1.patch 264 SHA256 af0a5c29c79e8e5061a1a959689a4822093d86c129028807cd0c50a5774aab55 SHA512 fe9fa83e7bcaeaea01b08d3a294501f2738ec41a2433c154eabb3544b169aedcdd99525157473baa254b0890292185b17733c1e6a4810c633ed6cc1ec5d5e689 WHIRLPOOL 1550a73c903a535e0396a2cb03aabf0d325653f5703eec64a4076694f4d5cd440513f7276f4c19399be72952a77785eeadb21843edb1d246c756ab24f5063e41 DIST librecad-2.0.3.zip 16590256 SHA256 4221348541c46c6e9698c1fa3471a14a81376e022a009a164a7f0d0035da4643 SHA512 c40952ae967d83197645bef65dac6e050ddeacf536401b2b99cd18d753462af086ac2a410c6746a92c094ad76fd9177a900c21531ed7b7fcdf1e4b0f7f070e00 WHIRLPOOL c2e1d33b17b7a47ffd9b3795ad292b22cb1225aceacf052494745243630b0537e21701930b9433ea235c462d65581efc2b5ccda3b37712d4ab639ab9bcc6a97d DIST librecad-2.0.9.zip 25524745 SHA256 3fd92e8249642462d41d688446393ee5e79f68b7b0d9878388c6c194af2cb43a SHA512 e2029389b2ced67a94d9411cb2f49f524ac12542409bc7829a043af9611dd51544fc431e364f4dcfb1a8b645b2bc6eb86fc74294726a65ee687f69bd7eb8f700 WHIRLPOOL 20aaa38cd92547bae6cee4b696f5b7f3699438481c5051af6112c6b1661ffb018509ff1fdcfb4591e8828c8ffcfcc5a3002c594dbcf95beba93e9768c5133c02 diff --git a/media-gfx/librecad/files/gcc_cpp0x.patch b/media-gfx/librecad/files/gcc_cpp0x.patch deleted file mode 100644 index 1d145a5ba65e..000000000000 --- a/media-gfx/librecad/files/gcc_cpp0x.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- LibreCAD-2.0.2/common.pri 2014-01-09 18:31:10.000000000 +0000 -+++ LibreCAD-2.0.2/common.pri.gcc46 2014-01-24 09:27:48.886665241 +0000 -@@ -59,8 +59,8 @@ - - # c++11 is now obligatory for LibreCAD - message(We will be using CPP11 features) --QMAKE_CXXFLAGS_DEBUG += -std=c++11 -g --QMAKE_CXXFLAGS += -std=c++11 -g -+QMAKE_CXXFLAGS_DEBUG += -std=c++0x -g -+QMAKE_CXXFLAGS += -std=c++0x -g - - # svg support - QT += svg diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest index 32bb5ab47cb8..578c58b4ffa9 100644 --- a/media-gfx/transfig/Manifest +++ b/media-gfx/transfig/Manifest @@ -2,7 +2,6 @@ AUX transfig-3.2.5-solaris.patch 263 SHA256 ef80b926734637eea2cf55c35746d5c1f405 AUX transfig-3.2.5c-maxfontsize.patch 1956 SHA256 b3f1ff76e940a7912f7617a62355d1cc0aec6cc793da1d2472fb3dcb4c2744c6 SHA512 f135d99d69988d5d4f0ab803ece9d2d88e1ef2e0605887328a92d3cbca561dc20869dbd8f6aa3eee9e59d74786eafcd3552e2076bff46b1c8002724c94a6247a WHIRLPOOL 0e6fe8b9164e771f447b454dda148f54234571a977fadee1b4c733e45c6d9d430e03b88ae6ff55b76fd3e1028cf4530f6ab5d85b42569bf95ee62a51923aa371 AUX transfig-3.2.5d-MAXWIDTH.patch 637 SHA256 0a9ea3f1aabf2110e348e8cd789bd9863b3f9ec5ce729041b491d13beca71df4 SHA512 fe5d4afca4b57e6cde61f91d6ddf4be4ed83fee2ecb07c796ad95c8a5a96a19592abec0b520505030e0d00bd1bb1192bb90a9f0f0c95eb3f6c70266e598492a6 WHIRLPOOL eab17b7e3a03421a1b7f191e5ea01bec7e0804c47a1318089250922c8a5b6e0d0be562c503c622ed05d61f0b1f8aa22883e9f6c9fa0c31ab607a7c290ea49541 AUX transfig-3.2.5d-fig2mpdf-r1.patch 41613 SHA256 13360b2bd5916b459b3b1debf18f66fbe8abead874b2eea1c77e09ffa404a85a SHA512 cac4ce672f1c9ba0f97243d8e550e9191676006f8ad6a3584a48e3f557af1e2ade1584f652fe812bf07250ad0e56fffd8f2d63b4827921e98a120ef635c62fc2 WHIRLPOOL 7467996c4b2ef5a1730d7595df6227b133c561793e327bf3bbf14b295c8cd2167cb94a002ba3711973adab38fa4d54dc380d8774ed15aa81e4b2a21deb6f94ae -AUX transfig-3.2.5d-fig2mpdf.patch 14711 SHA256 c05a1b2fdf20b18c9b69fd271194d54588ab28244b411011290d4cb7a9dc55e1 SHA512 f428f61f6ad849be6538e2ca3e1089b1baa39bea4b465e0e02aba926603c8f27b55fd95cd485d1d6b6455d6a7d07685057fe4fa092c5cf1769b79b12e1257491 WHIRLPOOL ea82316319316db1b4de447230b75b7a2b61215a5d0d9b2acc04e91470d844c8acfad2d1579f17fd9723be9a4e3092ef943e50c400202b3bb288d406a623e5a1 AUX transfig-3.2.5d-leadspace.patch 725 SHA256 dbb22b727835186d5c9422decf130cf2b292b7fde288aa212b9e52144de4f79f SHA512 70b3f171f028febee8689bcbca66d67de524c734bd09a978eae40b9c15ade06d884380e77dccd69518a2af286e4f3033b1aedd188871b4a5c701e020fc2607d5 WHIRLPOOL a14b46505dc2f2ccb6ce15dca16f3b0ff9f10b3c544302d691341dc83529d3736769b56a5b8d42e95e7a084dc2ad3b934f3b393cbc4430f7870daae3c27b6357 AUX transfig-3.2.5d-libpng-1.5.patch 1449 SHA256 8621fc408f700225ff9498f0743afabb135c729b244a2bcafd3418692d2a4230 SHA512 66c0018a62a22cec02df59ac80326e0d77399190b66a7df125886bb76d1e682655ef1a498e940b7ab0a5e12e2156dc98b3d88a5d81513a47154ebf4c62ba02dc WHIRLPOOL cccf802ab472fb76ed4f1e306a60560927bdcca647f339da3038790664092e41a61f1a6fdc17aee00833f474c66e43ea8d83ef4d0a9f8afc1fdca53f42a7d955 AUX transfig-3.2.5d-precision.patch 1633 SHA256 e2d4c992e438df5271d462cae48c5472a485517fb4093577c4461b6f97e45bb0 SHA512 8ed38b2f295da48a56049368f0643b8e1c26d06c3a340c81999e67608ec70854d72703ae81be89006efb54a0a9a4145b71100c4dc48d9602dd1cb86545cf2763 WHIRLPOOL dc27333136aeeb83082d2e857dba2086ddd0f80ebfda24447bd8e6290ce069daa8db0ad9d6ff6ec1e07ecd021526a457d7fdd68038512bdb3103136677396bad diff --git a/media-gfx/transfig/files/transfig-3.2.5d-fig2mpdf.patch b/media-gfx/transfig/files/transfig-3.2.5d-fig2mpdf.patch deleted file mode 100644 index b04478f87970..000000000000 --- a/media-gfx/transfig/files/transfig-3.2.5d-fig2mpdf.patch +++ /dev/null @@ -1,522 +0,0 @@ -=== modified file 'doc/fig2dev.1' ---- doc/fig2dev.1 2010-09-28 13:22:38 +0000 -+++ doc/fig2dev.1 2010-09-28 13:28:26 +0000 -@@ -53,8 +53,8 @@ - \fBbox, cgm, epic, eepic, eepicemu, emf, eps, gbx (Gerber beta driver), gif, ibmgl, jpeg, - latex, map (HTML image map), mf (MetaFont), - mp (MetaPost), mmp (Multi-MetaPost), --pcx, pdf, pdftex, pdftex_t, pic, pictex, png, ppm, ps, --pstex, pstex_t, pstricks, ptk (Perl/tk), -+pcx, pdf, pdftex, pdftex_t, pdftex_p, pic, pictex, png, ppm, ps, -+pstex, pstex_t, pstex_p, pstricks, ptk (Perl/tk), - shape (LaTeX shaped paragraphs), sld (AutoCad slide format), - svg (beta driver), textyl, - tiff, tk (tcl/tk), tpic, xbm and -@@ -1062,6 +1062,62 @@ - font. Option 1 sets LaTeX font size only. Option 2 issues no font - commands at all. - -+.SH PSTEX_P and PDFTEX_P OPTIONS -+The \fBpstex_p\fR language has the same intention as -+the combination of \fBpstex\fR and \fBpstex_t\fR. -+The only reason to use \fBpstex_p\fR is that you have partially overlayed texts. -+\fBpstex_p\fR splits the Fig file concerning the depths of existing texts. Because -+of it's necessary to get the resulting size of the figure for the pdf document -+you have to specify the target document format -+(i.e. using \fBpstex_p\fR rsp. \fBpdftex_p\fR). -+.br -+Two files results by using this language: -+.br -+.HP +.3i -+1) A bash script for creating and removing the necessary graphics files. -+Extension: \fB.create\fR -+.HP +.3i -+.HP +.3i -+2) The latex code which includes all graphics files and special texts. Content is -+put to stdout. -+ -+.TP -+The \fBpstex_p\fR driver has the following special options: -+ -+.TP -+.B \-p basename -+specifies the basename of the files to be created (see (1) above). This option -+is mandatory. -+.TP -+.B "\-d dmag" -+Set a separate magnification for the length of line dashes to -+.I dmag. -+.TP -+.B \-E num -+Set encoding for latex text translation (0 no translation, 1 ISO-8859-1, 2 ISO-8859-2) -+.TP -+.B "\-l lwidth" -+Sets the threshold between LaTeX thin and thick lines to -+.I lwidth -+pixels. -+LaTeX supports only two different line width: \\thinlines and \\thicklines. -+Lines of width greater than -+.I lwidth -+pixels are drawn as \\thicklines. -+Also affects the size of dots in dotted line style. -+The default is 1. -+.TP -+.B \-v -+Verbose mode. -+.TP -+.B \-F -+Don't set the font face, series, and style; only set it's size and the -+baselineskip. By default, fig2dev sets all 5 font parameters when it -+puts some text. The disadvantage is that you can't set the font from your -+LaTeX document. With this option on, you can set the font from your LaTeX -+document (like "\fB\\sfshape \\input picture.eepic\fR"). -+ -+ - .SH TK and PTK OPTIONS (tcl/tk and Perl/tk) - .TP - .B -l dummy_arg -@@ -1107,6 +1163,13 @@ - .PP - Rotated text is only supported in the IBM-GL (HP/GL) and PostScript (including eps) - languages. -+.PP -+In \fBpdftex_p\fR language \fIfig2dev\fR can not determine the exact sizes of -+the special texts set by pdflatex afterwards. If these texts are bigger than -+expected the calculated bounding box might be too small so that some texts passes -+over the figure boundaries. If this happen you have to put an invisible -+rectangle (line width 0) around the text or the entire figure. -+ - .SH COPYRIGHT - Copyright (c) 1991 Micah Beck - .br -@@ -1187,3 +1250,7 @@ - The GBX (Gerber) driver was written by - .br - Edward Grace (ej.grace@imperial.ac.uk). -+.sp -+The PSTEX_P and PDFTEX_P drivers (overlayed LaTeX texts) was written by -+.br -+Michael Pfeiffer (p3f@gmx.de) - -=== modified file 'fig2dev/dev/genpstex.c' ---- fig2dev/dev/genpstex.c 2010-09-28 13:22:38 +0000 -+++ fig2dev/dev/genpstex.c 2010-09-28 13:26:39 +0000 -@@ -70,7 +70,307 @@ - genps_end (); - - static char pstex_file[1000] = ""; -- -+static int iObjectsRead = 0; -+static int iTextRead = 0; -+static int iObjectsFileNumber = 0; -+static int iStartDepth; -+static int iLastDepth; -+static FILE * ptCreateFile; -+static char szFileName[1000]; -+static int iLength; -+static int iPdfOutputs = 0; -+ -+#ifdef never -+static double unitlength; -+static double dash_mag = 1.0; -+ -+static int (*translate_coordinates)() = NULL; -+static int (*translate_coordinates_d)() = NULL; -+#else -+extern double unitlength; -+extern double dash_mag; -+ -+extern int (*translate_coordinates)(); -+extern int (*translate_coordinates_d)(); -+#endif -+ -+#define TOP 840 -+#define SWAP(x,y) {tmp=x; x=y; y=tmp;} -+#define TRANS(x,y) (*translate_coordinates)(&x,&y) -+#define TRANS2(x1,y1,x2,y2) (*translate_coordinates)(&x1,&y1); \ -+ (*translate_coordinates)(&x2,&y2) -+#define TRANSD(x,y) (*translate_coordinates_d)(&x,&y) -+ -+static void genpstex_p_finalize_objects(int depth); -+ -+/************************************************************************* -+ *************************************************************************/ -+static -+translate2(xp, yp) -+ int *xp, *yp; -+{ -+ *xp = *xp + 1; -+ *yp = (double)(TOP - *yp -1); -+ } -+ -+static -+translate1_d(xp, yp) -+ double *xp, *yp; -+{ -+ *xp = *xp + 1.0; -+ *yp = *yp + 1.0; -+ } -+ -+static -+translate2_d(xp, yp) -+ double *xp, *yp; -+{ -+ *xp = *xp + 1.0; -+ *yp = (double)TOP - *yp -1.0; -+ } -+ -+/************************************************************************* -+ *************************************************************************/ -+void genpstex_p_option(opt, optarg) -+char opt, *optarg; -+{ -+ if (opt == 'p') -+ { -+ strcpy(pstex_file, optarg); -+ } -+ else -+ genlatex_option(opt, optarg); -+} -+ -+ -+/************************************************************************* -+ *************************************************************************/ -+void genpstex_p_start(objects) -+ F_compound *objects; -+{ -+ int tmp; -+ struct stat tStat; -+ long lUnitLength; -+ -+ if (*pstex_file == '\0') -+ { -+ put_msg("Argument -p is mandatory to pstex_p."); -+ exit(1); -+ } -+ -+ strncpy(szFileName, pstex_file, 900); -+ iLength = strlen(szFileName); -+ -+ sprintf(szFileName + iLength, ".create"); -+ ptCreateFile = fopen (szFileName, "wb"); -+ -+ if ( ! ptCreateFile) -+ { -+ put_msg("Couldn't open %s for writing", szFileName); -+ exit(1); -+ } -+ fstat(fileno(ptCreateFile), & tStat); -+ fchmod (fileno(ptCreateFile), tStat.st_mode | ((tStat.st_mode & (S_IRUSR | S_IRGRP | S_IROTH)) >> 2)); -+ fprintf(ptCreateFile, "#!/bin/bash\n\n", szFileName); -+ -+ fprintf(ptCreateFile, "while getopts \"r\" Option\n"); -+ fprintf(ptCreateFile, "do\n"); -+ fprintf(ptCreateFile, " case $Option in\n"); -+ fprintf(ptCreateFile, " r) iOptRemove=1;;\n"); -+ fprintf(ptCreateFile, " *) echo \"illegal option -$Option\"\n"); -+ fprintf(ptCreateFile, " esac\n"); -+ fprintf(ptCreateFile, "done\n"); -+ fprintf(ptCreateFile, "shift $(($OPTIND - 1))\n"); -+ -+ texfontsizes[0] = texfontsizes[1] = -+ TEXFONTSIZE(font_size != 0.0? font_size : DEFAULT_FONT_SIZE); -+ -+ unitlength = mag/ppi; -+ dash_mag /= unitlength*80.0; -+ -+ translate_coordinates = translate2; -+ translate_coordinates_d = translate2_d; -+ -+ TRANS2(llx, lly, urx, ury); -+ if (llx > urx) SWAP(llx, urx) -+ if (lly > ury) SWAP(lly, ury) -+ -+ /* LaTeX start */ -+ -+ /* print any whole-figure comments prefixed with "%" */ -+ if (objects->comments) { -+ fprintf(tfp,"%%\n"); -+ print_comments("% ",objects->comments, ""); -+ fprintf(tfp,"%%\n"); -+ } -+ -+ lUnitLength = (long) (round(4736286.72*unitlength)); -+ fprintf(tfp, "\\setlength{\\unitlength}{%lisp}%%\n", -+ lUnitLength); -+ /* define the SetFigFont macro */ -+ define_setfigfont(tfp); -+ -+ sprintf(szFileName + iLength, ".size"); -+ fprintf(ptCreateFile, "if [ \"$iOptRemove\" == \"\" ]; then\n"); -+ if (iPdfOutputs) -+ fprintf(ptCreateFile, " echo \"\\setlength\\pdfpagewidth{%3.2fpt}\\setlength\\pdfpageheight{%3.2fpt}\" > %s\n", -+ (float) lUnitLength / 65536 * (urx - llx), (float) lUnitLength / 65536 * (ury - lly), szFileName); -+ else -+ fprintf(ptCreateFile, "echo -n\"\" > %s\n", szFileName); -+ fprintf(ptCreateFile, "else\n rm -f %s\nfi\n", szFileName); -+} -+ -+/************************************************************************* -+ *************************************************************************/ -+void genpdftex_p_start(objects) -+ F_compound *objects; -+{ -+ iPdfOutputs = 1; -+ genpstex_p_start(objects); -+} -+ -+ -+/************************************************************************* -+ *************************************************************************/ -+int genpstex_p_end() -+{ -+ if (iTextRead) -+ { -+ fprintf(tfp, "\\end{picture}%%\n"); -+ iTextRead = 0; -+ } -+ if (iObjectsRead) -+ { -+ genpstex_p_finalize_objects(iLastDepth); -+ iObjectsRead = 0; -+ } -+ -+ /* LaTeX ending */ -+ fprintf(tfp, "\\begin{picture}(%d,%d)\n", urx-llx, ury-lly); -+ fprintf(tfp, "\\end{picture}%%\n"); -+ -+ fclose(ptCreateFile); -+ -+ /* all ok */ -+ return 0; -+} -+ -+ -+/************************************************************************* -+ *************************************************************************/ -+void genpstex_p_finalize_objects(depth) -+int depth; -+{ -+ char szFileName[1000]; -+ int iLength; -+ -+ strncpy(szFileName, pstex_file, 900); -+ iLength = strlen(szFileName); -+ -+ -+ sprintf(szFileName + iLength, "%03d", iObjectsFileNumber++); -+ fprintf(ptCreateFile, "if [ \"$iOptRemove\" == \"\" ]; then\n"); -+ if (iPdfOutputs) -+ { -+ fprintf(ptCreateFile, " %s -L pstex -D +%d:%d %s", prog, depth, iStartDepth, from, szFileName); -+ fprintf(ptCreateFile, " | epstopdf -f --outfile %s.pdf\n", szFileName, szFileName); -+ } -+ else -+ fprintf(ptCreateFile, "%s -L pstex -D +%d:%d %s %s.eps\n", prog, depth, iStartDepth, from, szFileName); -+ fprintf(ptCreateFile, "else\n rm -f %s.", szFileName); -+ if (iPdfOutputs) -+ fprintf(ptCreateFile, "pdf"); -+ else -+ fprintf(ptCreateFile, "eps"); -+ fprintf(ptCreateFile, "\nfi\n"); -+ -+ fprintf(tfp, "\\begin{picture}(0,0)%%\n"); -+/* newer includegraphics directive suggested by Stephen Harker 1/13/99 */ -+#if defined(LATEX2E_GRAPHICS) -+# if defined(EPSFIG) -+ fprintf(tfp, "\\epsfig{file=%s.eps}%%\n",szFileName); -+# else -+ fprintf(tfp, "\\includegraphics{%s}%%\n",szFileName); -+# endif -+#else -+ fprintf(tfp, "\\special{psfile=%s.eps}%%\n",szFileName); -+#endif -+ fprintf(tfp, "\\end{picture}%%\n"); -+} -+ -+/************************************************************************* -+ *************************************************************************/ -+void genpstex_p_object(depth) -+int depth; -+{ -+ if (iTextRead) -+ { -+ fprintf(tfp, "\\end{picture}%%\n"); -+ iTextRead = 0; -+ } -+ if (iObjectsRead == 0) -+ { -+ iStartDepth = depth; -+ iObjectsRead = 1; -+ } -+ iLastDepth = depth; -+ -+} -+ -+void genpstex_p_arc(obj) -+F_arc *obj; -+{ -+ genpstex_p_object(obj->depth); -+} -+ -+ -+void genpstex_p_ellipse(obj) -+F_ellipse *obj; -+{ -+ genpstex_p_object(obj->depth); -+} -+ -+void genpstex_p_line(obj) -+F_line *obj; -+{ -+ genpstex_p_object(obj->depth); -+} -+ -+void genpstex_p_spline(obj) -+F_spline *obj; -+{ -+ genpstex_p_object(obj->depth); -+} -+ -+ -+ -+/************************************************************************* -+ *************************************************************************/ -+void genpstex_p_text(t) -+F_text *t; -+{ -+ -+ if (!special_text(t)) -+ genpstex_p_object(t->depth); -+ else -+ { -+ if (iObjectsRead) -+ { -+ genpstex_p_finalize_objects(iLastDepth); -+ iObjectsRead = 0; -+ } -+ if (iTextRead == 0) -+ { -+ fprintf(tfp, "\\begin{picture}(0,0)(%d,%d)\n", llx, lly); -+ iTextRead = 1; -+ } -+ genlatex_text(t); -+ } -+ -+} -+ -+/************************************************************************* -+ *************************************************************************/ - void genpstex_t_option(opt, optarg) - char opt, *optarg; - { -@@ -112,6 +412,8 @@ - else genlatex_text(t); - } - -+/************************************************************************* -+ *************************************************************************/ - void genpstex_text(t) - F_text *t; - { -@@ -128,6 +430,32 @@ - genlatex_option(opt, optarg); - } - -+struct driver dev_pstex_p = { -+ genpstex_p_option, -+ genpstex_p_start, -+ gendev_null, -+ genpstex_p_arc, -+ genpstex_p_ellipse, -+ genpstex_p_line, -+ genpstex_p_spline, -+ genpstex_p_text, -+ genpstex_p_end, -+ INCLUDE_TEXT -+}; -+ -+struct driver dev_pdftex_p = { -+ genpstex_p_option, -+ genpdftex_p_start, -+ gendev_null, -+ genpstex_p_arc, -+ genpstex_p_ellipse, -+ genpstex_p_line, -+ genpstex_p_spline, -+ genpstex_p_text, -+ genpstex_p_end, -+ INCLUDE_TEXT -+}; -+ - struct driver dev_pstex_t = { - genpstex_t_option, - genpstex_t_start, - -=== modified file 'fig2dev/drivers.h' ---- fig2dev/drivers.h 2010-09-28 13:22:38 +0000 -+++ fig2dev/drivers.h 2010-09-28 13:29:46 +0000 -@@ -30,8 +30,10 @@ - extern struct driver dev_pdf; - extern struct driver dev_pdftex; - extern struct driver dev_pdftex_t; -+extern struct driver dev_pdftex_p; - extern struct driver dev_pstex; - extern struct driver dev_pstex_t; -+extern struct driver dev_pstex_p; - extern struct driver dev_pstricks; - extern struct driver dev_textyl; - extern struct driver dev_tk; -@@ -75,6 +77,7 @@ - {"pdf", &dev_pdf}, - {"pdftex", &dev_pdftex}, - {"pdftex_t", &dev_pdftex_t}, -+ {"pdftex_p", &dev_pdftex_p}, - {"pic", &dev_pic}, - {"pictex", &dev_pictex}, - {"png", &dev_bitmaps}, -@@ -82,6 +85,7 @@ - {"ps", &dev_ps}, - {"pstex", &dev_pstex}, - {"pstex_t", &dev_pstex_t}, -+ {"pstex_p", &dev_pstex_p}, - {"pstricks", &dev_pstricks}, - {"ptk", &dev_ptk}, - {"shape", &dev_shape}, - -=== modified file 'fig2dev/fig2dev.c' ---- fig2dev/fig2dev.c 2010-09-28 13:22:38 +0000 -+++ fig2dev/fig2dev.c 2010-09-28 13:26:39 +0000 -@@ -649,6 +649,18 @@ - #endif /* NFSS */ - printf(" -p name name of the PostScript file to be overlaid\n"); - -+ printf("PSTEX_P and PDFTEX_P Options:\n"); -+ printf(" -p name basename of the files to be created\n"); -+#ifdef NFSS -+ printf(" -F don't set font family/series/shape, so you can\n"); -+ printf(" set it from latex\n"); -+#endif /* NFSS */ -+ printf(" -d dmag set separate magnification for length of line dashes to dmag\n"); -+ printf(" -E num set encoding for text translation (0 no translation,\n"); -+ printf(" 1 ISO-8859-1, 2 ISO-8859-2)\n"); -+ printf(" -l lwidth set threshold between thin and thick lines to lwidth\n"); -+ printf(" -v verbose mode\n"); -+ - printf("SHAPE (ShapePar driver) Options:\n"); - printf(" -n name Set basename of the macro (e.g. \"face\" gives faceshape and facepar)\n"); - printf("Tcl/Tk (tk) and Perl/Tk (ptk) Options:\n"); -@@ -776,6 +788,12 @@ - int rec_comp(r1, r2) - struct obj_rec *r1, *r2; - { -+ if (r2->depth == r1->depth) -+ { -+ if ((r1->gendev == dev->text) ^ (r2->gendev == dev->text)) -+ return ((r1->gendev == dev->text) * 2 - 1); -+ return (0); -+ } - return (r2->depth - r1->depth); - } - - diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest index 36783a299fc9..f8c8f00fddb6 100644 --- a/media-gfx/xfig/Manifest +++ b/media-gfx/xfig/Manifest @@ -1,18 +1,10 @@ -AUX xfig-3.2.5b-CVE-2010-4262.patch 619 SHA256 694ea1b3bfd73272c861cb51a0180bfa8915166302636684e8b4561a8b1afb3b SHA512 0597d2b52373bec585b83e259cf61d18e1a2c886289d1410e2d298eeddc9e151447f28f508880a40acf481c799bed81354b21d576d943713b7e6c4123b8dc119 WHIRLPOOL d6b17e2aa6001b955aa0890748f18c0834962db651164bcea8472c5a141d9a5c39c37c011640eb0c2395658173fc2811117b2ff8421593c94eadd78a0e814a53 AUX xfig-3.2.5b-app-defaults.patch 601 SHA256 e475edf793fb74ccf07c52d864c7d8e1f89fcc5c8204b69b60b1e7431d13311b SHA512 111a49a856f20a004277ac183a1daabf85ebc999a3127989adf18dd418c6d1635a184f7420e705950158d589cb1f6b29475f2fed63d8717a192746b2cb7065a1 WHIRLPOOL 0e9f87e3148c49e0cf98b89d96c2cbd1c4f6f9f8d62e3924fd5c2ae038856b17dcc1dab548db99ade24a9368a5992c2a10d8ce414d70a07210ee334d3a7d67b6 -AUX xfig-3.2.5b-darwin.patch 649 SHA256 78a1467e8d76874d9b71eed7da7907f5544fb68fe6c0bffe578889c3aced86a8 SHA512 e7d7c9f8e73963bb86912ee5e813f88c3f7ae84a94fe8b465716f84e82532f0f117b97a8b1c4d316a2aec7b577e726abe3d57caf81f7103d60b50fe965fd88c6 WHIRLPOOL 9ac9859e9a07aee1bddbe2ae04b8d5d0ae7d530ab27ec91dd37d6b9446d1967905f9442e7fc23b56f5bebcf8a728d7e13accbf4df1c0146dd58aa1ae35071234 -AUX xfig-3.2.5b-edit-menu.patch 13653 SHA256 be7a2b6a9d0f8b8b08ff30eb0ce43936cd9f0c02eaf36c0d0352ff4ef73001c4 SHA512 f10aadb99d1a870a64b1b75e3e7dac9927a3ecbae399b37f9f9abbe6859f26b4ff75962c2e27367444aae644bd0b577fbb99704be6977a41c70d320499883a30 WHIRLPOOL 82df19dcd5d44036880901698033d979623bfdd5dc4494c23dfd92a95c6352e4d344ab743841e14cd45fc9e56cf41170f50d95c82b60509e81e1fec6136bf5f8 -AUX xfig-3.2.5b-figparserstack.patch 1787 SHA256 334ccd66978934defed3e060b324db1fd729fb2fc02e6606149a3ec28f12c71d SHA512 e39b5101ca2e2f3566f9f1f09c62f1a176443f68a67ae23c0b29c7be1a67ab39b0458396b020340126c08b5142226c70cd9144fe9661ee935b5bcd7af594ebb0 WHIRLPOOL 477686c6e058bdedb6b888293d6e4bf36af5161cb3abeb5a8c0a61c3d8461bf9aabcf295b33ebf7ec4a38198fd5e9142aa5dded3ba1ad08e8d334f52b048451e -AUX xfig-3.2.5b-fix-eps-reading.patch 1700 SHA256 b261f311c937ae58e3398424e90607c88496f751b6342eae0a519af2a6eec82c SHA512 0b3f557bdaac1a9232c9ddbb7df7a2c84561e960ab00038a350109d53b929743cb32e2112e7cdb97f7987ee3052dc0f9128445afdba9f24304f5916b46676c65 WHIRLPOOL 0d70147738f4edece877ee86689514f4947cdeb1a754f91cbf0789a5e8aa9c358173b2c24bad5530391e65974b0c81b688f4b5062674acd049ba50a211407de2 -AUX xfig-3.2.5b-libpng-1.5.patch 2524 SHA256 f3b17684e360fe3c0f0b9836e6d05ca5c707297e1f21e7898a83a56bb988dad5 SHA512 156c431f9bee9a89f4e7e9fd10b590c15c9b2ea0abdfb812c94c7df35184a2e458925b392c3820875903d2c6c987bee65906965329685f5444f9cf20369a2425 WHIRLPOOL 09516adc16c1fc3041cc643c436bcd1b6ece1f23b3092252725df413d6663a8684d5173e70ccd3bb1558e83ded725c138ada23100258525384c2b0adfbb3d1a6 AUX xfig-3.2.5b-mkstemp.patch 979 SHA256 0881185381976aaad5b62d54baf7df96981b41a54a74c24710971b175e9e520c SHA512 264215de05d7a2cfa26f4b59e0d4799b5e22750ae0d1b355f2508d811579c46c5acd45068df80ff08627fa1e6740378ea57a9dd2a18529c8ea8618a9cce8f55e WHIRLPOOL b181b874e5f884e8489e51749db5cb7de7a38803c2894d7446521190fc7600bd09fd66b3111ba19dfce1d8354b4ee898c9550516579b132a8d067b035e899268 AUX xfig-3.2.5b-network_images.patch 11918 SHA256 08d983eea753008d3a2a9c7bebf0f9035e795ad3038dbbb05c2a512d86163695 SHA512 17bf8519146b5085743d29959ad6416ed2a19da477d2aaa8d4cc82e0b53c060ee1ada036de1c79e4db91e5cc832978c80194b31b0444f0dcbb5edc1136c8afd3 WHIRLPOOL ebd9a6216533c0afa40c35ea0898932cee17388474df59e1eef78b69d7dc75e183af2e97798c080b7b5967f17242ecd2358a50a7ed48e344510d8cf9e6e8d10f AUX xfig-3.2.5b-papersize_b1.patch 1127 SHA256 36bed2e9bfe46868d5b750a12b892a7e20dbf7189d9fbbe4b0066411946d6f01 SHA512 6f302560bb359d1ea8ddb902aec1536d757ccb4655124ba00a6cbcc951eb607475b5abe1ae208c91a034a652d29b85c753af91f936bf4bab8bf0b0b259de2404 WHIRLPOOL c0d5f16c0032ea7c8c4f81951a276a703a7031b162f46c1a00e7764d65563113c583a9bed7d6bfb3f75597503447988a7be67f30ce58d1df2d499e0dc6501d8e AUX xfig-3.2.5b-pdfimport_mediabox.patch 1245 SHA256 40ecce3a59500c66879d4b5738ce80d6a6d105b1827b97a14c4e841cf596a5a9 SHA512 88d1cd6fc81e975209b86c0aa656760bcd1d1bc2bc393f3af16c905b5991a469dcd35660300d7c0c84de42c98018922125d6ff757e4dcd707b09931ff49abd39 WHIRLPOOL 41ccfe4cf345190a86164cc77438709c0603893416ee72e62a720574d4f4bc402352a95c6b8639cd3b4d5b875215165c808d3c6be7cd48c4253109df7623bd5c AUX xfig-3.2.5b-solaris.patch 499 SHA256 66286e793810c05fe282127ad5637763883de54e889dc89ebb453206e63f066e SHA512 dd95275c7eeade2c8ca1a51fae66be20cf3b3518f6865857ae8917d35fdd8be4316b0142896ef1b8f251e660fdb8e32905aea215df0d49852b1d8271ee456120 WHIRLPOOL 257ee5a389318320232ab11af804388a276bad2d35481b75fc0c8e620bacda3beec4fdd969db192d34ae1d79d8e2e2d15af24cb36fad13eecc9e6fafe890dda3 -AUX xfig-3.2.5b-spelling.patch 898 SHA256 792f6dd9dc785e2deadf8691bd667612953b8ba6b0b4f6177984226b7590ddb2 SHA512 47a968c0a27e3306b596a6418d37fa5c7dcb2096b797b674fe192b396b7db558656554d9fe4b065898d759b845c1aa2a250c21cfbb95e5877b0208e35557f756 WHIRLPOOL 283d39de3f790507706519d0ddfe2680cdea3714269581e0ae1a1abb226888599feb24a7640ba932e00fc23be9e385d9935412e8b6e2f72bb791f73d8413adbc AUX xfig-3.2.5b-urwfonts.patch 4921 SHA256 84d4d179088b5384c848acbf34e3b040e9648e838b080df8af54d73161a13f19 SHA512 10fc5f702b87990581c344dc313478528cec4df672a625f340a4946dd3d285abd8ff26a993e5f024bb3759ada37943582d4a32da04df6aee602282c426326851 WHIRLPOOL 9a34536805a561b0c29957d75a000de3fcdd5a944619b6d0e4e7661b2f700fcd20158dca76136e65d03a9f11132ad22df1b2cc6a658243e533bc3e6446c8a50b -AUX xfig-3.2.5b-zoom-during-edit.patch 691 SHA256 922c8dd8d3949caca71be28043889db6359eb7ecd4509ce339f216df11b41e5b SHA512 0f9653e4cfcee3fc0bcce26cc92cda6c71d36e0e51618f7fc6919a3f7c9bac9047de9b66f8da9918044033ba3df39445d078da71f24f3b354ecd0c65a71c36b0 WHIRLPOOL cb70845a284e0b5fca69b3346d43efe9f405823d9af9116bbc9b16be259883517714f434a430a86c87bf6ebe6b0cb2a613c34f51162a177d22c71a3b2a5a97ed AUX xfig-3.2.5c-XAW3D1_5E_notlocal.patch 1590 SHA256 bb4260c6b08cac2e8a8ec6042054ae026561f1bf5b66ecdaef54b57eb2e7ab25 SHA512 493b34b167ed0807c6f417f6d468d73170d3246576320582e9e9c8a7bbb55a7a14820eb756f7f05a3d53d942b8b4ef63689744d77c4c554d6e35f9e2be64a482 WHIRLPOOL 751fd604219f6508089fa02fe06d592103a84f9564ae9d36c29396c30d3ccc39675b27861268577caebbf370bc4fc72218703005a60694878d593f6932ed2244 AUX xfig-3.2.5c-crash-on-exit.patch 526 SHA256 1594528e06a2f9f6767ce0e3343800a5fc0191462db8c960c30b96adcedc0e43 SHA512 e3e7baebab9b8efcb621971a873185ccf7202a98ba26ca505aeae1831e0f78ce87fb17f5c62ee646e5b21668922555f47817cf179796a02a53534e4648f0650e WHIRLPOOL 9190790b6955c23aa7df9a528024bf4a4e5cda055f7986c2c9adce0915bff10ce8325006d373716733293f956f54e375ff291a1ad673cf097d0715601f9f8b66 AUX xfig-3.2.5c-darwin.patch 812 SHA256 cca6ae8af34c16d608038918d385197cd346576c1d88e35c48bba51958c045f2 SHA512 2aa3d845e8fa646cd8a4c0a6892d505c64c6750268b238e7327fb4fd4677401c1dbe976ae4abc5ebb1bb7b8f38e5b8f875b7051dd557eb33ea221489639d40de WHIRLPOOL 80e6fe98a2b3ce9c303ed2fca8fc655c36879a155e58a73da3de6b16dfbb20d937d6134d0eb08aaa5654222e5de09469c57f6eb664de23b6834a896bc07edc86 diff --git a/media-gfx/xfig/files/xfig-3.2.5b-CVE-2010-4262.patch b/media-gfx/xfig/files/xfig-3.2.5b-CVE-2010-4262.patch deleted file mode 100644 index eb85513ef69d..000000000000 --- a/media-gfx/xfig/files/xfig-3.2.5b-CVE-2010-4262.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- w_msgpanel.c -+++ w_msgpanel.c 2010-12-03 14:21:07.931926127 +0000 -@@ -60,7 +60,7 @@ DeclareStaticArgs(12); - /* for the popup message (file_msg) window */ - - static int file_msg_length=0; --static char tmpstr[300]; -+static char tmpstr[512]; - static Widget file_msg_panel, - file_msg_win, file_msg_dismiss; - -@@ -582,8 +582,8 @@ file_msg(char *format,...) - } - - va_start(ap, format); -- /* format the string */ -- vsprintf(tmpstr, format, ap); -+ /* format the string (but leave room for \n and \0) */ -+ vsnprintf(tmpstr, sizeof(tmpstr)-2, format, ap); - va_end(ap); - - strcat(tmpstr,"\n"); diff --git a/media-gfx/xfig/files/xfig-3.2.5b-darwin.patch b/media-gfx/xfig/files/xfig-3.2.5b-darwin.patch deleted file mode 100644 index 0c4fa29fb271..000000000000 --- a/media-gfx/xfig/files/xfig-3.2.5b-darwin.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- fig.h -+++ fig.h -@@ -374,7 +374,7 @@ - extern long random(); - extern void srandom(unsigned int); - --#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) && !defined(__FreeBSD__) && !defined(__GLIBC__) -+#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) && !defined(__FreeBSD__) && !defined(__DARWIN__) && !defined(__GLIBC__) - extern void srandom(int); - - #endif ---- w_keyboard.c -+++ w_keyboard.c -@@ -41,7 +41,7 @@ - #define REG_NOERROR REG_OKAY - #endif - --#if defined(__FreeBSD__) && !defined(REG_NOERROR) -+#if (defined(__FreeBSD__) || defined(__DARWIN__)) && !defined(REG_NOERROR) - #define REG_NOERROR 0 - #endif - diff --git a/media-gfx/xfig/files/xfig-3.2.5b-edit-menu.patch b/media-gfx/xfig/files/xfig-3.2.5b-edit-menu.patch deleted file mode 100644 index ea396f1b005c..000000000000 --- a/media-gfx/xfig/files/xfig-3.2.5b-edit-menu.patch +++ /dev/null @@ -1,332 +0,0 @@ -diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/Imakefile /root/xfig.3.2.5b/Imakefile ---- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/Imakefile 2012-04-20 09:46:26.217957716 +0200 -+++ /root/xfig.3.2.5b/Imakefile 2012-04-20 09:16:28.744362135 +0200 -@@ -251,7 +251,7 @@ - #endif /* USEJPEG */ - - #ifdef I18N --I18N_DEFS = -DI18N -DSETLOCALE -+I18N_DEFS = -DI18N -DSETLOCALE -DXAW_INTERNATIONALIZATION - I18N_SRC = w_i18n.c - I18N_OBJ = w_i18n.o - #endif -diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/e_edit.c /root/xfig.3.2.5b/e_edit.c ---- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/e_edit.c 2007-04-04 18:18:32.000000000 +0200 -+++ /root/xfig.3.2.5b/e_edit.c 2012-04-20 10:02:04.209542848 +0200 -@@ -3211,7 +3211,7 @@ - XtAddCallback(but1, XtNcallback, - (XtCallbackProc) grab_button, (XtPointer) NULL); - -- if ( cur_image_editor != NULL && *cur_image_editor != (char) NULL) { -+ if ( cur_image_editor != NULL && *cur_image_editor != '\0' ) { - FirstArg(XtNlabel,"Edit Image"); - NextArg(XtNfromHoriz, but1); - NextArg(XtNfromVert, label); -@@ -3501,7 +3501,7 @@ - { - Widget but_spline[3]; - Dimension label_height, label_width; -- int i, dist; -+ int i, dist; - - static char use_item[]="Edit the behavior\nof the control point"; - -@@ -3598,7 +3598,7 @@ - below = but_spline[i] = XtCreateManagedWidget(sfactor_type[i].label, - commandWidgetClass, form, Args, ArgCount); - XtAddCallback(but_spline[i], XtNcallback, -- (XtCallbackProc) toggle_sfactor_type, (XtPointer) i); -+ (XtCallbackProc) toggle_sfactor_type, (XtPointer) (intptr_t) i); - XtSetArg(Args[0], XtNfromVert, below); /* here are the direct */ - XtSetArg(Args[1], XtNvertDistance, 3 * dist); /* accesses to Args */ - } -@@ -3608,7 +3608,7 @@ - static void - toggle_sfactor_type(Widget panel_local, XtPointer _sfactor_index, XtPointer call_data) - { -- int sfactor_index = (int) _sfactor_index; -+ int sfactor_index = (int) (intptr_t) _sfactor_index; - - update_sfactor_value(sfactor_type[sfactor_index].value); - XawScrollbarSetThumb(sfactor_bar, -@@ -3629,10 +3629,10 @@ - static void - scroll_sfactor_value(Widget panel_local, XtPointer closure, XtPointer _num_pixels) - { -- int *num_pixels = (int *) _num_pixels; -+ int num_pixels = (int) (intptr_t) _num_pixels; - - update_sfactor_value(sub_sfactor->s + -- (STEP_VALUE * SFACTOR_SIGN((int) num_pixels))); -+ (STEP_VALUE * SFACTOR_SIGN(num_pixels))); - XawScrollbarSetThumb(panel_local, SFACTOR_TO_PERCENTAGE(sub_sfactor->s), - THUMB_H); - } -@@ -4031,7 +4031,6 @@ - Widget - color_selection_panel(char *label, char *wname, char *name, Widget parent, Widget below, Widget beside, Widget *button, Widget *popup, int color, XtCallbackProc callback) - { -- - FirstArg(XtNfromVert, below); - NextArg(XtNborderWidth, 0); - NextArg(XtNtop, XtChainBottom); -@@ -4057,7 +4056,7 @@ - * callback - */ - /* also set the label */ -- (callback)(below, (XtPointer) color, NULL); -+ (callback)(below, (XtPointer) (intptr_t) color, NULL); - *popup = make_color_popup_menu(below, name, callback, NO_TRANSP, NO_BACKG); - - return *button; -@@ -4658,7 +4657,7 @@ - int ival; - double val; - -- new_points_units = (int) new_unit; -+ new_points_units = (int) (intptr_t) new_unit; - if (points_units == new_points_units) - return; - -@@ -4739,7 +4738,7 @@ - FirstArg(XtNlabel, XtName(w)); - SetValues(arc_type_panel); - -- generic_vals.arc_type = (int) new_style; -+ generic_vals.arc_type = (int) (intptr_t) new_style; - /* if now a pie-wedge type, make the arrow panels insensitive */ - if (generic_vals.arc_type == T_PIE_WEDGE_ARC) { - /* unmanage arrow forms */ -@@ -4865,7 +4864,7 @@ - static void - pen_color_select(Widget w, XtPointer new_color, XtPointer call_data) - { -- pen_color = (Color) new_color; -+ pen_color = (Color) (intptr_t) new_color; - color_select(pen_col_button, pen_color); - if (pen_color_popup) { - XtPopdown(pen_color_popup); -@@ -4875,7 +4874,7 @@ - static void - fill_color_select(Widget w, XtPointer new_color, XtPointer call_data) - { -- fill_color = (Color) new_color; -+ fill_color = (Color) (intptr_t) new_color; - color_select(fill_col_button, fill_color); - if (fill_color_popup) { - XtPopdown(fill_color_popup); -@@ -4927,7 +4926,7 @@ - { - FirstArg(XtNlabel, XtName(w)); - SetValues(hidden_text_panel); -- hidden_text_flag = (int) new_hidden_text; -+ hidden_text_flag = (int) (intptr_t) new_hidden_text; - } - - static void -@@ -4935,7 +4934,7 @@ - { - FirstArg(XtNlabel, XtName(w)); - SetValues(rigid_text_panel); -- rigid_text_flag = (int) new_rigid_text; -+ rigid_text_flag = (int) (intptr_t) new_rigid_text; - } - - static void -@@ -4943,7 +4942,7 @@ - { - FirstArg(XtNlabel, XtName(w)); - SetValues(special_text_panel); -- special_text_flag = (int) new_special_text; -+ special_text_flag = (int) (intptr_t) new_special_text; - } - - static void -@@ -4951,7 +4950,7 @@ - { - FirstArg(XtNlabel, XtName(w)); - SetValues(textjust_panel); -- textjust = (int) new_textjust; -+ textjust = (int) (intptr_t) new_textjust; - } - - static void -@@ -4963,7 +4962,7 @@ - - FirstArg(XtNlabel, XtName(w)); - SetValues(flip_pic_panel); -- flip_pic_flag = (int) new_flipflag; -+ flip_pic_flag = (int) (intptr_t) new_flipflag; - p1.x = panel_get_dim_value(x1_panel); - p1.y = panel_get_dim_value(y1_panel); - p2.x = panel_get_dim_value(x2_panel); -@@ -4996,7 +4995,7 @@ - FirstArg(XtNlabel, XtName(w)); - SetValues(rotation_panel); - /* get new rotation (0 = 0 degrees, 1 = 90, 2 = 180, 3 = 270) */ -- rotation = (int) new_rotation; -+ rotation = (int) (intptr_t) new_rotation; - - /* get the two opposite corners */ - p1.x = panel_get_dim_value(x1_panel); -@@ -5104,7 +5103,7 @@ - - FirstArg(XtNlabel, XtName(w)); - SetValues(fill_style_button); -- fill_flag = (int) new_fillflag; -+ fill_flag = (int) (intptr_t) new_fillflag; - - if (fill_flag == 0) { - /* no fill; blank out fill density value and pattern */ -diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/u_draw.c /root/xfig.3.2.5b/u_draw.c ---- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/u_draw.c 2007-04-04 18:18:32.000000000 +0200 -+++ /root/xfig.3.2.5b/u_draw.c 2012-04-20 09:20:31.379714332 +0200 -@@ -603,7 +603,7 @@ - /* is it a picture object or a Fig figure? */ - if (line->type == T_PICTURE) { - if (line->pic->pic_cache) { -- if ((line->pic->pic_cache->bitmap != (Pixmap) NULL) && active_layer(line->depth)) { -+ if ((line->pic->pic_cache->bitmap != NULL) && active_layer(line->depth)) { - /* only draw the picture if there is a pixmap AND this layer is active */ - draw_pic_pixmap(line, op); - return; -diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_cmdpanel.c /root/xfig.3.2.5b/w_cmdpanel.c ---- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_cmdpanel.c 2008-07-17 17:50:06.000000000 +0200 -+++ /root/xfig.3.2.5b/w_cmdpanel.c 2012-04-20 09:54:55.595198185 +0200 -@@ -1581,7 +1581,7 @@ - beside = XtCreateManagedWidget("char_button", commandWidgetClass, - character_map_panel, Args, ArgCount); - /* add callback to paste character into current text */ -- XtAddCallback(beside, XtNcallback, paste_char, (XtPointer) i); -+ XtAddCallback(beside, XtNcallback, paste_char, (XtPointer) (intptr_t) i); - /* skip empty entries and 127 (delete) */ - if (i==126) { - below = beside; -diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_color.c /root/xfig.3.2.5b/w_color.c ---- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_color.c 2007-04-04 18:18:32.000000000 +0200 -+++ /root/xfig.3.2.5b/w_color.c 2012-04-20 09:23:24.738775166 +0200 -@@ -334,7 +334,7 @@ - } else { - NextArg(XtNstate, True); /* start with edit pen */ - } -- NextArg(XtNradioData, (XtPointer) (i+1)); /* can't use 0 */ -+ NextArg(XtNradioData, (XtPointer) (intptr_t) (i+1)); /* can't use 0 */ - mixedEdit[i] = XtCreateManagedWidget("mixedEdit", toggleWidgetClass, - mixedForm[i], Args, ArgCount); - XtAddCallback(mixedEdit[i], XtNcallback, switch_edit, (XtPointer) 0); -@@ -807,7 +807,7 @@ - set_slider_sensitivity(); - - /* activate the one the user pressed (pen or fill) */ -- XawToggleSetCurrent(mixedEdit[0],(XtPointer) (func==I_PEN_COLOR? 1:2)); -+ XawToggleSetCurrent(mixedEdit[0],(XtPointer) (intptr_t) (func==I_PEN_COLOR? 1:2)); - } - - void restore_mixed_colors(void) -diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_export.c /root/xfig.3.2.5b/w_export.c ---- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_export.c 2007-09-19 21:32:30.000000000 +0200 -+++ /root/xfig.3.2.5b/w_export.c 2012-04-20 09:24:09.181867729 +0200 -@@ -384,7 +384,7 @@ - change_orient(); - appres.landscape = (int) client_data; - /* make sure that paper size is appropriate */ -- papersize_select(export_papersize_panel, (XtPointer) appres.papersize, (XtPointer) 0); -+ papersize_select(export_papersize_panel, (XtPointer) (intptr_t) appres.papersize, (XtPointer) 0); - } - } - -diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_fontpanel.c /root/xfig.3.2.5b/w_fontpanel.c ---- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_fontpanel.c 2007-04-04 18:18:32.000000000 +0200 -+++ /root/xfig.3.2.5b/w_fontpanel.c 2012-04-20 09:26:50.774325641 +0200 -@@ -142,14 +142,14 @@ - ps_fontmenu_items[i].type = MENU_IMAGESTRING; /* put the fontnames in - * menu */ - ps_fontmenu_items[i].label = ps_fontinfo[i].name; -- ps_fontmenu_items[i].info = (caddr_t) (i - 1); /* index for font # */ -+ ps_fontmenu_items[i].info = (caddr_t) (intptr_t) (i - 1); /* index for font # */ - } - - for (i = 0; i < NUM_LATEX_FONTS; i++) { - latex_fontmenu_items[i].type = MENU_IMAGESTRING; /* put the fontnames in - * menu */ - latex_fontmenu_items[i].label = latex_fontinfo[i].name; -- latex_fontmenu_items[i].info = (caddr_t) i; /* index for font # */ -+ latex_fontmenu_items[i].info = (caddr_t) (intptr_t) i; /* index for font # */ - } - - pane_actions = XtParseTranslationTable(":set()\n\ -@@ -352,9 +352,9 @@ - char *font_name = mi->label; - - if (*flag_sel) -- *font_ps_sel = (int) mi->info; /* set ps font to one selected */ -+ *font_ps_sel = (int) (intptr_t) mi->info; /* set ps font to one selected */ - else -- *font_latex_sel = (int) mi->info; /* set latex font to one -+ *font_latex_sel = (int) (intptr_t) mi->info; /* set latex font to one - * selected */ - put_msg("Font: %s", font_name); - /* put image of font in indicator window */ -diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_indpanel.c /root/xfig.3.2.5b/w_indpanel.c ---- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_indpanel.c 2009-03-30 17:54:00.000000000 +0200 -+++ /root/xfig.3.2.5b/w_indpanel.c 2012-04-20 09:34:38.181793478 +0200 -@@ -2692,7 +2692,7 @@ - /* "Ticks" checkbutton */ - below = CreateCheckbutton("Show ticks", "ticks", tickform, below, (Widget) NULL, - MANAGE, LARGE_CHK, &dimline_ticks, -- dimline_panel_preview, (Widget) NULL); -+ dimline_panel_preview, (Widget*) NULL); - - /* Tick Thickness label */ - FirstArg(XtNlabel, "Thickness"); -diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_print.c /root/xfig.3.2.5b/w_print.c ---- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_print.c 2009-04-20 18:26:14.000000000 +0200 -+++ /root/xfig.3.2.5b/w_print.c 2012-04-20 09:36:11.004623947 +0200 -@@ -407,7 +407,7 @@ - change_orient(); - appres.landscape = (int) new_orient; - /* make sure that paper size is appropriate */ -- papersize_select(print_papersize_panel, (XtPointer) appres.papersize, (XtPointer) 0); -+ papersize_select(print_papersize_panel, (XtPointer) (intptr_t) appres.papersize, (XtPointer) 0); - } - } - -@@ -771,7 +771,7 @@ - for (i = 0; i < XtNumber(paper_sizes); i++) { - entry = XtCreateManagedWidget(paper_sizes[i].fname, smeBSBObjectClass, - papersize_menu, NULL, ZERO); -- XtAddCallback(entry, XtNcallback, papersize_select, (XtPointer) i); -+ XtAddCallback(entry, XtNcallback, papersize_select, (XtPointer) (intptr_t) i); - } - - /* Orientation */ -diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_util.c /root/xfig.3.2.5b/w_util.c ---- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_util.c 2009-03-30 17:52:38.000000000 +0200 -+++ /root/xfig.3.2.5b/w_util.c 2012-04-20 09:37:37.764153931 +0200 -@@ -378,7 +378,7 @@ - } - entry = XtCreateManagedWidget(entries[i], smeBSBObjectClass, pulldown_menu, - NULL, ZERO); -- XtAddCallback(entry, XtNcallback, callback, (XtPointer) i); -+ XtAddCallback(entry, XtNcallback, callback, (XtPointer) (intptr_t) i); - } - return pulldown_menu; - } -@@ -488,7 +488,7 @@ - NextArg(XtNbackground, black_color.pixel); - } - entry = XtCreateManagedWidget(buf, commandWidgetClass, pop_form, Args, ArgCount); -- XtAddCallback(entry, XtNcallback, callback, (XtPointer) i); -+ XtAddCallback(entry, XtNcallback, callback, (XtPointer) (intptr_t) i); - } - - /* make a scrollable viewport in case all the buttons don't fit */ -@@ -545,7 +545,7 @@ - } - entry = XtCreateManagedWidget(buf, commandWidgetClass, color_box, - Args, ArgCount); -- XtAddCallback(entry, XtNcallback, callback, (XtPointer) i); -+ XtAddCallback(entry, XtNcallback, callback, (XtPointer) (intptr_t) i); - } - - /* make the cancel button */ diff --git a/media-gfx/xfig/files/xfig-3.2.5b-figparserstack.patch b/media-gfx/xfig/files/xfig-3.2.5b-figparserstack.patch deleted file mode 100644 index 7f4668214acc..000000000000 --- a/media-gfx/xfig/files/xfig-3.2.5b-figparserstack.patch +++ /dev/null @@ -1,61 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 30_figparserstack.dpatch by Hans de Goede -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix Stack-based buffer overflow by loading malformed .FIG files -## DP: https://bugzilla.redhat.com/show_bug.cgi?id=543905 -## DP: Closes: #559274 - -@DPATCH@ -diff -urNad xfig~/f_readold.c xfig/f_readold.c ---- xfig~/f_readold.c -+++ xfig/f_readold.c -@@ -471,7 +471,7 @@ - F_text *t; - int n; - int dum; -- char buf[128]; -+ char buf[512]; - PR_SIZE tx_dim; - - if ((t = create_text()) == NULL) -@@ -485,22 +485,34 @@ - t->pen_style = -1; - t->angle = 0.0; - t->next = NULL; -+ if (!fgets(buf, sizeof(buf), fp)) { -+ file_msg("Incomplete text data"); -+ free((char *) t); -+ return (NULL); -+ } -+ -+ /* Note using strlen(buf) here will waste a few bytes, as the -+ various text attributes are counted into this length too. */ -+ if ((t->cstring = new_string(strlen(buf))) == NULL) -+ return (NULL); -+ - /* ascent and length will be recalculated later */ -- n = fscanf(fp, " %d %d %d %d %d %d %d %[^\n]", -+ n = sscanf(buf, " %d %d %d %d %d %d %d %[^\n]", - &t->font, &dum, &dum, &t->ascent, &t->length, -- &t->base_x, &t->base_y, buf); -+ &t->base_x, &t->base_y, t->cstring); - if (n != 8) { - file_msg("Incomplete text data"); -+ free(t->cstring); - free((char *) t); - return (NULL); - } -- if ((t->cstring = new_string(strlen(buf))) == NULL) { -+ -+ if (!strlen(t->cstring)) { -+ free(t->cstring); - free((char *) t); - file_msg("Empty text string at line %d.", line_no); - return (NULL); - } -- /* put string in structure */ -- strcpy(t->cstring, buf); - - /* get the font struct */ - t->zoom = zoomscale; diff --git a/media-gfx/xfig/files/xfig-3.2.5b-fix-eps-reading.patch b/media-gfx/xfig/files/xfig-3.2.5b-fix-eps-reading.patch deleted file mode 100644 index 7601d20eae31..000000000000 --- a/media-gfx/xfig/files/xfig-3.2.5b-fix-eps-reading.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ur xfig.3.2.5b/f_readeps.c xfig.3.2.5b.new/f_readeps.c ---- xfig.3.2.5b/f_readeps.c 2009-03-30 17:52:18.000000000 +0200 -+++ xfig.3.2.5b.new/f_readeps.c 2010-11-25 16:53:54.328247928 +0100 -@@ -252,12 +252,13 @@ - { - char buf[300]; - FILE *tmpfp, *pixfile, *gsfile; -- char *psnam, *driver; -+ char *driver; - int status, wid, ht, nbitmap, fd; - char tmpfile[PATH_MAX], - pixnam[PATH_MAX], - errnam[PATH_MAX], -- gscom[2 * PATH_MAX]; -+ gscom[2 * PATH_MAX], -+ psnam[PATH_MAX]; - - wid = urx - llx; - ht = ury - lly; -@@ -307,19 +308,14 @@ - /* for color, use pcx */ - driver = "pcx256"; - } -- /* avoid absolute paths (for Cygwin with gswin32) by changing directory */ -- if (tmpfile[0] == '/') { -- psnam = strrchr(tmpfile, '/'); -- *psnam = 0; -- sprintf(gscom, "cd \"%s/\";", tmpfile); -- *psnam++ = '/'; /* Restore name for unlink() below */ -- } else { -- psnam = tmpfile; -- gscom[0] = '\0'; -+ /* Canonicalize the eps file filename, needed to "defeat" -dSAFER */ -+ if (!realpath(tmpfile, psnam)) { -+ file_msg("Cannot canonicalize %s: %s\n", tmpfile, strerror(errno)); -+ return False; - } -- sprintf(&gscom[strlen(gscom)], -- "%s -r72x72 -dSAFER -sDEVICE=%s -g%dx%d -sOutputFile=%s -q - > %s 2>&1", -- appres.ghostscript, driver, wid, ht, pixnam, errnam); -+ sprintf(gscom, -+ "%s -r72x72 -sDEVICE=%s -g%dx%d -sOutputFile=%s -dDELAYSAFER -c '<< /PermitFileReading [ (%s)] >> setuserparams .locksafe' -dSAFER -q - > %s 2>&1", -+ appres.ghostscript, driver, wid, ht, pixnam, psnam, errnam); - if (appres.DEBUG) - fprintf(stderr,"calling: %s\n",gscom); - if ((gsfile = popen(gscom, "w")) == 0) { diff --git a/media-gfx/xfig/files/xfig-3.2.5b-libpng-1.5.patch b/media-gfx/xfig/files/xfig-3.2.5b-libpng-1.5.patch deleted file mode 100644 index 7d9c3f15efb9..000000000000 --- a/media-gfx/xfig/files/xfig-3.2.5b-libpng-1.5.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: xfig.3.2.5b/f_readpng.c -=================================================================== ---- xfig.3.2.5b.orig/f_readpng.c -+++ xfig.3.2.5b/f_readpng.c -@@ -73,7 +73,7 @@ read_png(FILE *file, int filetype, F_pic - } - - /* set long jump recovery here */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - /* if we get here there was a problem reading the file */ - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - close_picfile(file,filetype); -@@ -90,15 +90,17 @@ read_png(FILE *file, int filetype, F_pic - png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type, - &interlace_type, &compression_type, &filter_type); - -- if (info_ptr->valid & PNG_INFO_gAMA) -- png_set_gamma(png_ptr, 2.2, info_ptr->gamma); -- else -- png_set_gamma(png_ptr, 2.2, 0.45); -+ png_fixed_point gamma = 0.45; -+ png_get_gAMA_fixed(png_ptr,info_ptr,&gamma); -+ png_set_gamma(png_ptr, 2.2, gamma); - -- if (info_ptr->valid & PNG_INFO_bKGD) -+ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) { - /* set the background to the one supplied */ -- png_set_background(png_ptr, &info_ptr->background, -+ png_color_16p background; -+ png_get_bKGD(png_ptr,info_ptr,&background); -+ png_set_background(png_ptr, background, - PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); -+ } - else { - /* blend the canvas background using the alpha channel */ - background.red = x_bg_color.red >> 8; -@@ -136,7 +138,11 @@ read_png(FILE *file, int filetype, F_pic - - if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) { - png_get_hIST(png_ptr, info_ptr, &histogram); -+#if PNG_LIBPNG_VER_MAJOR <= 1 && PNG_LIBPNG_VER_MINOR < 5 - png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0); -+#else -+ png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0); -+#endif - } - } - if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { -Index: xfig.3.2.5b/f_wrpng.c -=================================================================== ---- xfig.3.2.5b.orig/f_wrpng.c -+++ xfig.3.2.5b/f_wrpng.c -@@ -20,6 +20,7 @@ - #include "w_msgpanel.h" - #include "w_setup.h" - #include -+#include - - /* - * Write PNG file from rgb data -@@ -59,7 +60,7 @@ write_png(FILE *file, unsigned char *dat - } - - /* set long jump recovery here */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - /* if we get here there was a problem reading the file */ - png_destroy_write_struct(&png_ptr, &info_ptr); - return False; diff --git a/media-gfx/xfig/files/xfig-3.2.5b-spelling.patch b/media-gfx/xfig/files/xfig-3.2.5b-spelling.patch deleted file mode 100644 index 942276ca75e9..000000000000 --- a/media-gfx/xfig/files/xfig-3.2.5b-spelling.patch +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 31_spelling.dpatch by Roland Rosenfeld -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix spelling errors in binary. - -@DPATCH@ -diff -urNad xfig~/f_load.c xfig/f_load.c ---- xfig~/f_load.c -+++ xfig/f_load.c -@@ -373,5 +373,5 @@ - /* Format error; relevant error message is already delivered */ - ; - else -- file_msg("File \"%s\" is not accessable; %s.", file, strerror(err)); -+ file_msg("File \"%s\" is not accessible; %s.", file, strerror(err)); - } -diff -urNad xfig~/f_readgif.c xfig/f_readgif.c ---- xfig~/f_readgif.c -+++ xfig/f_readgif.c -@@ -137,7 +137,7 @@ - - if (c == '!') { /* Extension */ - if (! ReadOK(file,&c,1)) -- file_msg("GIF read error on extention function code"); -+ file_msg("GIF read error on extension function code"); - (void) DoGIFextension(file, c); - continue; - } diff --git a/media-gfx/xfig/files/xfig-3.2.5b-zoom-during-edit.patch b/media-gfx/xfig/files/xfig-3.2.5b-zoom-during-edit.patch deleted file mode 100644 index 11e5ceb932a8..000000000000 --- a/media-gfx/xfig/files/xfig-3.2.5b-zoom-during-edit.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit fc4381d7c3e8d7440a3e33430d24ebf217a99142 -Author: Vladislav Zavjalov -Date: Thu Oct 2 12:24:04 2008 +0400 - - fix calling null function (todo: problem with initialize_char_handler after resize?) - -Fixes crash. To reproduce create some object, zoom in so that it does not fit -the screen, start another edit and press Ctrl+Z. - -diff --git a/xfig/u_redraw.c b/xfig/u_redraw.c -index 146abfa..fd53a8e 100644 ---- a/xfig/u_redraw.c -+++ b/xfig/u_redraw.c -@@ -434,7 +434,7 @@ redisplay_curobj() - } - } else { - /* editing an object, just refresh it as is */ -- (*canvas_ref_proc)(cur_x, cur_y); -+ if (canvas_ref_proc) (*canvas_ref_proc)(cur_x, cur_y); - } - } - diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest index f38a5b35d54f..32909e1a4013 100644 --- a/media-gfx/xpaint/Manifest +++ b/media-gfx/xpaint/Manifest @@ -2,8 +2,6 @@ AUX xpaint-2.9.10.2-QA2.patch 2235 SHA256 7bcb094de312522af55e6107a96cd9611da710 AUX xpaint-2.9.10.2-tiff.patch 860 SHA256 d60e1c2cbd0f4ba89f262ff471ad40bf7c640b6f4138b444b57a51ef4cf63b28 SHA512 38a34e3f317a3ac9a0ea5b8a62f3c93566c70889315ffa652c1dbec796e1448efabdcd58c8a7e67e70a4fa185871dfd6ca163bf38f50e9592ac792a4ca827dac WHIRLPOOL d7e6a5693de9b8492f1abaaf327fbed979dd39888bf992589422eb00a338b7aae2a312cc7aa39b8db0384d981aea74160634b250baab313261bc76afcbc565ae AUX xpaint-2.9.10.3-Fix-build-with-clang.patch 669 SHA256 04213e1ce4ea8bbe5a4b9b9271d6fbf7e1da800971be53f67ba740c1ddeade41 SHA512 7a8138a82eb3d4824d138a21d03759986ad03d05d65d0ef24fb911b642e1906bc5b6aba7417836fa4756cb63ae09427b7ec2a05be1588fd86a1668b52418f9e7 WHIRLPOOL 3b98a7a88458314f38a1287098f9ee1d6f175ab3b3a2d7965071ac60f24b8d2e2075e4ecb12e613ad9e800d978b81fd1e7a7616b87952fcf4f34197ce5f0ebc6 AUX xpaint-2.9.9.4-QA1.patch 3336 SHA256 ede53a3bde4eeaf267234fa918ad2ace481add0988eeab4818ef6a15353de522 SHA512 2760bd60bc1e6335c48ce4576e9176c5893e70568f99d535b48878e6917591258ff5d206851c312b3af6b1bcda93076a60bcb3452176a49f588d4ffa1ed69a79 WHIRLPOOL 498fea0ef4149181f9bbd057d3c5e75b161f7704531e7ba1b96ee2d44560fd07a2ef259d8c5dfe153b9b3d2a0fb366ad0bbe1f155537fd9cfc61408728089dc2 -AUX xpaint-2.9.9.4-QA2.patch 1917 SHA256 8f24e1866add5c9e7376a2258f574be5c66611bfbcd8825230a454204a05c328 SHA512 90f4419f0b96f5178e9528bb1285ea3ef3a5aac8676ffc86f84c647d392f46441a99d122999bad21d1afec37c1f44708891919964a07930ff8146c12f3494f72 WHIRLPOOL 802601a94a9cba7245679cbf3407e4256ef0b72d23033dd3edf46afd789be5e4f19d1d298788de49a0261bb5032c0ff26bb18f0d5c35c6e3aed59d55e1446388 -AUX xpaint-2.9.9.4-autoreconf.patch 485 SHA256 9df6633075fb5c056718b92a3562522c7e122bdbe78119848fcb711271f16fc2 SHA512 aeebc6aadbc089ea0f532b947db028db0c10064c6b2883f508052ea2e2e99f41b51e6b72cf7782ed9c1afb61c709cce3e259a3be70d35cea863101b152a8f84a WHIRLPOOL c0bd2f8557edc14be1621b67f9a24fce687400786cdd0df8ab7a197cde4023146823c20dfa8e4ef20f13f019a51c4e5d37aefcfc8ce654a0edd58a3cd969b0cd AUX xpaint-2.9.9.4-parallel-make.patch 655 SHA256 1e416437a4c30d7bb6567baf6707a2dd32ad91e0ffc634cd4ac95a2a753568a1 SHA512 45161a7a76f05ebff009b8dda5c52baddcd936ee8c5984a3e0fa02d80a56947ba55df68c1241115dcce5a1f75d8993794b761ba0dbadb94b86b9c2ebfbe7c3d7 WHIRLPOOL 5ab4032ac7e81533dc2e51b235e8722f8ef491b0adccc40ea59c4c96d4157188d2f4b9c8c4202c2917e66e51ba33935f943a08bed05f4f39f7707907155102cf AUX xpaint-2.9.9.4-submake.patch 747 SHA256 483e844cc41a6899f114d317a2a283748ff509c1523d49bf790e32bfbb456a4b SHA512 72525c5cd892772210cba85b0f5ff193a6474657d6ffbead23c711de3346c87f8d306e252fdd8b98ae136f32311d88be6107bbe72932039bf17e4c0c64b70bae WHIRLPOOL 3324a1663897e968c5d962341ddc0c71ff8e67728ac5e18ed6e23bc772e64454ff33a1fb05aae491abad39f035bcdb2292f1a9ac38c34686b66a0b6f8b882578 DIST xpaint-2.9.10.2.tar.bz2 1245813 SHA256 7f1554c8390bc68da2bcc0449407b8cc69616ce5d2170f97d1b30aee9fcbdcf6 SHA512 8aa388d4b82b5867817eca2188f50734140c395efe663c290a78b4f24314754fb29257165a64c9b8a03634dede03d919d9a3a54c1d32049cc34216a1f3d4e499 WHIRLPOOL 5ffe99ba979590c1ad675f7cbd57e4dba92aa7c24a9600784224c913069cad1fa88a676180d60fc2cc60c6f7185056385ccb59f2725c9799781335ed38d8934a diff --git a/media-gfx/xpaint/files/xpaint-2.9.9.4-QA2.patch b/media-gfx/xpaint/files/xpaint-2.9.9.4-QA2.patch deleted file mode 100644 index 03b35f81f37b..000000000000 --- a/media-gfx/xpaint/files/xpaint-2.9.9.4-QA2.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 08bdf5f5d0c64384b2be16bd8ac68244675388d5 Mon Sep 17 00:00:00 2001 -From: hasufell -Date: Sun, 6 Oct 2013 21:13:51 +0200 -Subject: [PATCH] respect CFLAGS - ---- - Makefile.am | 2 +- - configure.ac | 2 +- - rw/Makefile.am | 2 +- - rw/configure.ac | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 4cf1753..414597f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -26,7 +26,7 @@ EXTERN_VIEWER = display - ## -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ - ## -DFUNCPROTO=15 -DNARROWPROTO - --ARCH_DEFINES = -g -O2 -fno-strict-aliasing -fPIC -+ARCH_DEFINES = -fno-strict-aliasing -fPIC - - ## - ## Specific xpaint options -diff --git a/configure.ac b/configure.ac -index e058529..3979075 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -29,7 +29,7 @@ AC_TYPE_UINT16_T - AC_TYPE_UINT32_T - AC_TYPE_UINT64_T - --CFLAGS="-I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" -+CFLAGS="$CFLAGS -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" - LIBS="$LIBS -lm" - echo "VERSION = $VERSION" > .version - -diff --git a/rw/Makefile.am b/rw/Makefile.am -index d91d5d5..2f50253 100644 ---- a/rw/Makefile.am -+++ b/rw/Makefile.am -@@ -10,7 +10,7 @@ SHAREDIR = $(prefix)/share/xpaint - ## -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ - ## -DFUNCPROTO=15 -DNARROWPROTO - --ARCH_DEFINES = -g -O2 -fno-strict-aliasing -fPIC -+ARCH_DEFINES = -fno-strict-aliasing -fPIC - - ## - ## Specific xpaint options -diff --git a/rw/configure.ac b/rw/configure.ac -index fb4f3d4..d9c7601 100644 ---- a/rw/configure.ac -+++ b/rw/configure.ac -@@ -29,7 +29,7 @@ AC_TYPE_UINT16_T - AC_TYPE_UINT32_T - AC_TYPE_UINT64_T - --CFLAGS="-I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" -+CFLAGS="$CFLAGS -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" - LIBS="$LIBS -lm" - - dnl check X11 --- -1.8.3.2 - diff --git a/media-gfx/xpaint/files/xpaint-2.9.9.4-autoreconf.patch b/media-gfx/xpaint/files/xpaint-2.9.9.4-autoreconf.patch deleted file mode 100644 index 4342d4f4fa78..000000000000 --- a/media-gfx/xpaint/files/xpaint-2.9.9.4-autoreconf.patch +++ /dev/null @@ -1,24 +0,0 @@ -From e22a3c15aea7d734f433370130458d97d6490d8a Mon Sep 17 00:00:00 2001 -From: hasufell -Date: Sun, 6 Oct 2013 20:27:49 +0200 -Subject: [PATCH] add missing macros - ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 169419e..e058529 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -15,6 +15,7 @@ AC_CONFIG_MACRO_DIR([m4]) - AM_INIT_AUTOMAKE([-Wall -Werror]) - - AC_LANG_C -+AM_PROG_AR - - ## basic types - --- -1.8.3.2 - diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest index 2fbf3285b94f..8129e858a099 100644 --- a/media-libs/gegl/Manifest +++ b/media-libs/gegl/Manifest @@ -12,7 +12,7 @@ DIST gegl-0.3.4.tar.bz2 5328192 SHA256 846290a790854d1e6b7c17a2d6f82ad7cb14c72e2 DIST gegl-0.3.8.tar.bz2 5876259 SHA256 06ca9e67a59da026eb941b9d323269d7c19a922f1e478acdd3791a0eef8b229b SHA512 13207e7ab4723be1e31bdba5e30e5725e93c1adc61bad1413502128730391dbe7eb35419d243c8d0a1d8794341a58188790adacbb10d2a8e68db861c18d21bfb WHIRLPOOL 97e3521e2c95e2b370c8a6ac2724b57212ebfbbf3c1eeccc3cfaa4de6b993c56b32ead9e5baa23dcbcb8272f7ec29ce7a2acc3afcc5fcc062d0adc72899293b8 EBUILD gegl-0.2.0-r2.ebuild 4633 SHA256 de81ec25f88835217b17bacbc823d26fe0cefefe115c3e88161b824c5c99a5dc SHA512 c6e6655b7e1a4c40481f87c3d4642029bcbb181140d6172dbcb87ed483b20ba9512f0a6847eb007a8b1cc9981c661ff18714ae405ebbce9b2966db1a9167fc51 WHIRLPOOL bff41f179a59d90a4c310b70100faeec34604c3e04ffaf8bdd0b0a563369f17a5d7f32c4bd2d7bc8fe58569548656afaaa02f0e25b5e44fad0e8cceee37e4b07 EBUILD gegl-0.3.0.ebuild 5297 SHA256 6c16dcdf287ee28c69eafd25d38b61fcd5a0c0fdcf8f69b79e374753de9ba215 SHA512 b49bc3a596b0f44024d54d7bac247119308b3aeb1a5e67045d43eb1993a46be59a6306fc8f8cb01391ac31add12c24b2281cc195122d340e071fe07ea7626bce WHIRLPOOL 3908dcd2e3801cde4d4ff463db5ec50bbfb4c8fb2c51845bd1be12f5395dc29af32e86fd4b491a46f54d84d063d3b68c65bab20f6b9f7f6448e3f17bf96f32ba -EBUILD gegl-0.3.10.ebuild 5178 SHA256 32fc3871d77cf5808060071361d36349084e1469ee555b9af12caeac27652985 SHA512 280db34146a3b27417e7649ec4c420e6b3b9c81dd549074ee0331d49054e317636364d8fa5837066568918a4aece722e88b003a505165435d4b8a22380b5bca5 WHIRLPOOL 83ce3b0045723caf9b2ac5ec90e54da040edc72674653ac51d1f0b1aa178f62bc67c0b0e30c2fae11af04c1345075553fd6659e177a05a96b7c857503c11edc2 +EBUILD gegl-0.3.10.ebuild 5181 SHA256 44a25e462dc828e61da4f8dca4c6fddbf94f764547c4cc65eade591254948d90 SHA512 30ef601c2932f392b03af3344509a725914bad5b85ca912f265e7f789f37cb3e91844e7d023a5f977bfe75587a1ab9351b3eedd15f9ab7f5db529556fafb40f6 WHIRLPOOL e234ab3575a0fe28cb84f72f025aa05ac960cdb8b569266b1bcbe9acbb8f314c2057fc206eb199daea822dee9ae9ee28296a97f9b4a5cd2dbb5cd68e031b3f65 EBUILD gegl-0.3.4.ebuild 5435 SHA256 abb14b4b53dee3af635a3ab9110b58ed6c07c1339c756f71d328d3d4236fd262 SHA512 a6f71297aff04a01ef113cca21fbf0ac525faf7cd7d6a5c214c628b7f74ad309e72751067d73b332398dc5bf5a1ebe67a0d23051ff617c8683b5b230d17dc9c1 WHIRLPOOL eef47cef3e224f803efb8e95a9eddb418ca7790b7a85e0b19bf6e65da34045ec638851da7ab5eeb084d44fa9a77e09e7b1e8e2b945b2dec58883a79b59a3bf30 EBUILD gegl-0.3.8.ebuild 5172 SHA256 3b91e45403265d1ef869b37d4f0b55160f29fb9b25bf8aaa94a2378b7c3fee92 SHA512 fd2e8019b4e4b373c1489e2b332269ff79b577464889c2fe0b834c3ad058b46e0ce587a12507eb31a64d2ad26ca0107139398cbdd9a03a555dd2207a9b396fa4 WHIRLPOOL 7b74e028e4df412bc19f54a19e3b50c20dc014af39a1bbdb4c9af6a562028279dc82f617ca5850ec3437ec7474ff228cf516b5f637ac1fb5aea3738c59500a3d EBUILD gegl-9999.ebuild 5182 SHA256 a7c4b4f433517f6663bce77989841e43ff46871d2ee99112202e63ed629ae2f1 SHA512 a510cabc7cf9058144aeb8d7c607ffbcd8259f02001db5f7f7423b2bf1979a65568fc587ef1bd0156256417f60715be46738e61ed1699bd51d5befeefa89bfdf WHIRLPOOL 7a459f1b611f3547b7a84ca0ccf74430153ae8db621a7d535b992b2ea327defaab8b31b075de1a6491b625e43c99c27ba8f0e38a9a33af7d7d2a1b4362129f5f diff --git a/media-libs/gegl/gegl-0.3.10.ebuild b/media-libs/gegl/gegl-0.3.10.ebuild index 3e7c741f5053..d49bb4f17fb8 100644 --- a/media-libs/gegl/gegl-0.3.10.ebuild +++ b/media-libs/gegl/gegl-0.3.10.ebuild @@ -53,7 +53,7 @@ RDEPEND=" lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr:= ) media-libs/libpng:0= - raw? ( >=media-libs/libraw-0.15.4 ) + raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) tiff? ( >=media-libs/tiff-4:0 ) diff --git a/media-libs/libdvb/Manifest b/media-libs/libdvb/Manifest index 83b799854964..84b001a5e610 100644 --- a/media-libs/libdvb/Manifest +++ b/media-libs/libdvb/Manifest @@ -1,7 +1,5 @@ AUX libdvb-0.5.5.1-autotools.patch 17609 SHA256 4e6a4c229f82be6f6e73fbe33c7a703d9a90550365bb90b207cb342d3cc28c20 SHA512 ef4b40876cadaaedebfb4969a440de617669f6377b8eb092ba880518c53720517f8edbe662b859ecb574eab21ce3b4403f2eb860abfff352640e54eb5cc8cf01 WHIRLPOOL 2132d63b1e00597f4f19e2d8206820cbcfcdcee735e01d7df377792ba7311ab6ac823ff77a6d01d0de0ab89b2b4d6c1961b4996e3fac545a9058ceafb73869e6 AUX libdvb-0.5.5.1-gcc43.patch 565 SHA256 79ee130a6ea603a49957e4ca406c2b4236b0ba9b55714a674b09837ff1e94838 SHA512 bdc985b42beed0a24bd07e4c0a4aea190956c82eeaabd3b92ad43de70415d10b5c0e071ac07ec491950afcfd9534f4052f3befd63b44c8aebd673686b1ccc359 WHIRLPOOL 1ce9cdbf6be5a76070926be16ce7c6d3e7b08f553929400dca26c27e01205946b05b5f323e29c51b917a68b8cdcf1a64618423ee74c5bebb14eaffb819f8f7fd -AUX libdvb-0.5.5.1-gentoo-file-collisions.patch 4796 SHA256 61f350d5af255a621e32682c7634b6a778cfb475ece2bcf30d50552c3ade2d04 SHA512 03388800f53095b945efdee1cf7b785bcfd62272cbf452fa879b1327b0e13728e07d5fded83b1fe10ad3f81e2bbb0d11ff55338734b80ce7f1a3b5afa10967ad WHIRLPOOL fcff3fd09dae3b3990487939961683ad067960e1d9f52e8eead014bb42923107d335e562fae28cff937ea3574b0f83eb9bd1c62ec7d8ed5e2e30fae004e0e86a -AUX libdvb-0.5.5.1-gentoo.patch 1052 SHA256 371d977bca97c3f3c5649980108e4f5a74da5c9560cbc1debc0edfc1a34d0cde SHA512 0159979e6123495c1ee24e0707aea0c12eb92405a33b5b02480f659c4ba090abe4afc0fc3853c2ec082289cb45ea42b4655bbdd698dabb502bf3758094740105 WHIRLPOOL b5dd525d79b46a455142c7c5e59e6b93209434a30fba6e83ad16fa68a055cc4a26673c4ae3aa55dc9c1843313db0b9fbc1b83c8360a5cc5037e7879c6e11c3a4 AUX libdvb-0.5.5.1-rename-analyze.patch 4785 SHA256 f240a8e3dc7284813e5cbf95edb811020df5b914e5f21b7fa4fecf33d1537b2c SHA512 b539974f6bfae5ba291ae3b405e6ad2ec5b3aacbc2e5e3fac4c94ef2de58bbd3fbfec0bdce97bf3c9e639d0c9aefea08819a91545be2f4bac19c283b862d50c5 WHIRLPOOL 9515b9b3da55f1d1ca56c41b36d969191eabc7ef047d8719bac3100322917d7ae6bd0784e75cfa1b42383c9448eddf2a6524981e01c9b50991cad935a6732ba9 DIST libdvb-0.5.5.1.tar.gz 312295 SHA256 941e8020129111377652bd7253ea85e6c133fd1c23c66bd9fc0ca9eabab1385a SHA512 6e776e9a01b0059e46124f8525c1b83951295bc695100386e3a488dfbe058ef074a96019bb77c5fd2c51b9baf67beb889af00914cfd796e2dd175f9423c449d4 WHIRLPOOL 1af63bf745839cb602916a0b7c4ccbf958d5278cc5fbf277bce799f641fb1262cb4e971a9651c2f78a8a0b4f4588af7ee1ff74d3a287bbf6c110ed1ec4083881 EBUILD libdvb-0.5.5.1-r3.ebuild 1208 SHA256 a681345162b879e8ce97357628827ab2e9cfbcff9af779be6a214347ddf23569 SHA512 74662bc99b2ff44c54215af4f8ec3bd304268396fcf0235dbb532f67c39cfa8cb6878d3dd296f69cf184d3ed3c322059215ae23a47b59a70f26c04b3ecb45ab1 WHIRLPOOL a7f28adbe288fee7e747e94eac0e315c0e2fa31e060da3dfc4993a275948a63a4938012e258244d78d75cb4e8c00c1d6f208ee95ecdaa72df0fbfacc3ed1107f diff --git a/media-libs/libdvb/files/libdvb-0.5.5.1-gentoo-file-collisions.patch b/media-libs/libdvb/files/libdvb-0.5.5.1-gentoo-file-collisions.patch deleted file mode 100644 index 408c62c28112..000000000000 --- a/media-libs/libdvb/files/libdvb-0.5.5.1-gentoo-file-collisions.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/main.cc libdvb-0.5.5.1/dvb-mpegtools/main.cc ---- libdvb-0.5.5.1-orig/dvb-mpegtools/main.cc 2006-01-21 14:16:09.919104500 +0100 -+++ libdvb-0.5.5.1/dvb-mpegtools/main.cc 2006-01-21 14:16:38.460888250 +0100 -@@ -54,7 +54,7 @@ - - #define PROGS 29 - --char *prognames[PROGS+1] = { "streamtype", // 0 -+char *prognames[PROGS+1] = { "streamtype_mpg", // 0 - "ts2pes", // 1 - "ps2vid", - "pes2aud_es", -@@ -63,7 +63,7 @@ - "pes2vid", - "tspids", - "pes2ts", -- "analyze", -+ "analyze_mpg", - "pes_demux", // 10 - "es_demux", - "ts_demux", -@@ -87,7 +87,7 @@ - }; - - --enum { streamtype_, // 0 -+enum { streamtype_mpg_, // 0 - ts2pes_, // 1 - ps2vid_, - pes2aud_es_, -@@ -96,7 +96,7 @@ - pes2vid_, - tspids_, - pes2ts_, -- analyze_, -+ analyze_mpg_, - pes_demux_, // 10 - es_demux_, - ts_demux_, -@@ -123,9 +123,9 @@ - { - switch(progn) { - -- case streamtype_: -- cerr << "usage: streamtype " << endl; -- cerr << "or streamtype < (or pipe)" << endl; -+ case streamtype_mpg_: -+ cerr << "usage: streamtype_mpg " << endl; -+ cerr << "or streamtype_mpg < (or pipe)" << endl; - break; - - case ts2pes_: -@@ -175,9 +175,9 @@ - cerr << " (or pipe)" << endl; - break; - -- case analyze_: -- cerr << "usage: analyze " << endl; -- cerr << " or analyze < (or pipe)" << endl; -+ case analyze_mpg_: -+ cerr << "usage: analyze_mpg " << endl; -+ cerr << " or analyze_mpg < (or pipe)" << endl; - break; - - case pes_demux_: -@@ -320,7 +320,7 @@ - } - - switch( progn ) { -- case streamtype_: { -+ case streamtype_mpg_: { - char *streams[4] = { "PS_STREAM", "TS_STREAM" - , "PES_STREAM"}; - char *tv_form[3] = {"DUNNO", "PAL", "NTSC"}; -@@ -426,7 +426,7 @@ - } - break; - -- case analyze_: -+ case analyze_mpg_: - if (fd == STDIN_FILENO) { - analyze(cin); - } else { -diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/Makefile libdvb-0.5.5.1/dvb-mpegtools/Makefile ---- libdvb-0.5.5.1-orig/dvb-mpegtools/Makefile 2006-01-21 14:16:09.919104500 +0100 -+++ libdvb-0.5.5.1/dvb-mpegtools/Makefile 2006-01-21 14:16:38.460888250 +0100 -@@ -11,8 +11,8 @@ - CPPSRC = $(wildcard *.cpp) - CSRC = $(wildcard *.cc) - COBJ = $(notdir $(SRC:.c=.o)) --LINKS = streamtype ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \ -- tspids pes2ts analyze pes_demux es_demux ts_demux ts_es_demux \ -+LINKS = streamtype_mpg ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \ -+ tspids pes2ts analyze_mpg pes_demux es_demux ts_demux ts_es_demux \ - pesplot pes2ts2 pes_repack split_mpg cut_mpg ts2ps ts2es\ - insert_pat_pmt get_http extract_pes extract_pes_payload\ - change_aspect_1_1 change_aspect_4_3 change_aspect_16_9 \ -diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/README libdvb-0.5.5.1/dvb-mpegtools/README ---- libdvb-0.5.5.1-orig/dvb-mpegtools/README 2006-01-21 14:16:09.923104750 +0100 -+++ libdvb-0.5.5.1/dvb-mpegtools/README 2006-01-21 14:24:06.020859000 +0100 -@@ -21,10 +21,10 @@ - get_http http://mymachine:8090/test.avi | mplayer - - usage: get_http - --streamtype -+streamtype_mpg (original name was streamtype, renamed to avoid name collisions) - tries to recognize the stream type and gives information about the stream. --usage: streamtype --or streamtype < (or pipe) -+usage: streamtype_mpg -+or streamtype_mpg < (or pipe) - - ts2ps - ts2pes -@@ -70,11 +70,11 @@ - usage: pes2ts2