diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-17 14:32:10 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-17 14:32:10 +0100 |
commit | 51c50bd4c895ebf56d81fecae8e45ec3b5fc3efa (patch) | |
tree | 753b6b08624c34d1ed8414bbe22c45409f7741b9 /net-news | |
parent | be9d77d3ac6af8f4ead98d89706f356b65578c93 (diff) | |
parent | deba8115d2c2af26df42966b91ef04ff4dd79cde (diff) |
Merge branch 'edge' into next
Diffstat (limited to 'net-news')
-rw-r--r-- | net-news/Manifest.gz | bin | 2227 -> 2229 bytes | |||
-rw-r--r-- | net-news/canto-curses/Manifest | 4 | ||||
-rw-r--r-- | net-news/canto-curses/canto-curses-0.9.9.ebuild (renamed from net-news/canto-curses/canto-curses-0.9.3.ebuild) | 6 | ||||
-rw-r--r-- | net-news/canto-daemon/Manifest | 4 | ||||
-rw-r--r-- | net-news/canto-daemon/canto-daemon-0.9.7.ebuild (renamed from net-news/canto-daemon/canto-daemon-0.9.1.ebuild) | 6 | ||||
-rw-r--r-- | net-news/newsboat/Manifest | 7 | ||||
-rw-r--r-- | net-news/newsboat/files/newsboat-2.19-json-c-0.14.0.patch | 34 | ||||
-rw-r--r-- | net-news/newsboat/files/newsboat-2.19-libressl.patch | 82 | ||||
-rw-r--r-- | net-news/newsboat/metadata.xml | 4 | ||||
-rw-r--r-- | net-news/newsboat/newsboat-2.19-r1.ebuild | 169 |
10 files changed, 304 insertions, 12 deletions
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz Binary files differindex 27e0467c5d03..728f7b5c6753 100644 --- a/net-news/Manifest.gz +++ b/net-news/Manifest.gz diff --git a/net-news/canto-curses/Manifest b/net-news/canto-curses/Manifest index 4f0236325a24..5d41b5625430 100644 --- a/net-news/canto-curses/Manifest +++ b/net-news/canto-curses/Manifest @@ -1,3 +1,3 @@ -DIST canto-curses-0.9.3.tar.gz 77748 BLAKE2B 7da3e9a3e12ba0216d67fe75ea4ad1e9e528ddc2289d187bfab4a43a09831535c8d5b86fa48f5784f5031b5a8a5783a65a9083a66b3d56658408db7276033466 SHA512 547061439e5d5a7f2bcb1643cc597578161f3c3c284520326fe483f79a60650e9b8b1c7cf5a5e1f165f13510e7cab893b77968b5995c66b572c0bb605b6ebaaa -EBUILD canto-curses-0.9.3.ebuild 629 BLAKE2B bf6628d39ec71db87cb19a131c59e23bdbc4af30023a1004fddb303fbe83f21ff1e6a13edd7a0a6b64fbd4efbcea8fa34c3e74402dbe1331c256390352849797 SHA512 2d6123ef7b7b842da52c9a032c34ae4e20745ae1c505197cd19281b98b7fd5ab0a6f85bae1b54c4476203dbc5873ad34be85b314442b2d177967367bf4fb4ed7 +DIST canto-curses-0.9.9.tar.gz 79963 BLAKE2B c6154dfa71ec88b405fb89feec66a6bb922dfb93523c865c33fe0664ed7ea796d795027ff65a355fd3767342ffd5fa8cb01f48475c262ded4413924df6339509 SHA512 2a88631506c1fda7278bb3ac376c2b67b4f2e5e1f443e49fe3035f542b66ac4b232fa66e7ae1b40e86b0a5cde3c38d11a0953754e5c5c7ed572a0da74656d798 +EBUILD canto-curses-0.9.9.ebuild 672 BLAKE2B 470f8dd7fa095253dc578ea8be05dcef0a2c81ae3331363742f4582576505c8c3421b6f9168381e4640346cd8063a7be1246e3839bbc531d3aa87d5871c8f4dc SHA512 798ec230a23cd64b3fd116e741db90c275cde3c8b8922685dbcd5ce094f9f526a70d05cc0acee6c88a91166b29b96cd29ed6e33e72e54751fd95600beca3ca63 MISC metadata.xml 333 BLAKE2B c3a7a84d30ccd33b38841c56c4a80ca7273cdea75e85da8d280d6ae77530dcf9d2d6873578cd850c7fe0a447d928dd57ee59e4ad6e2687501994404676bf2fb3 SHA512 b04c9d84039cce1d67057ecdb88493cff7c68a1e49c4f79c8a38a1ae9ce45f52fa255fdf34f424b882782f2e938c014dd150ab112f3e0cb773944a968fc78974 diff --git a/net-news/canto-curses/canto-curses-0.9.3.ebuild b/net-news/canto-curses/canto-curses-0.9.9.ebuild index d125ebcb65ce..aebb0706e41e 100644 --- a/net-news/canto-curses/canto-curses-0.9.3.ebuild +++ b/net-news/canto-curses/canto-curses-0.9.9.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_REQ_USE="ncurses(+),threads(+)" inherit distutils-r1 multilib DESCRIPTION="The ncurses client for canto-daemon" HOMEPAGE="https://codezen.org/canto-ng/" -SRC_URI="https://codezen.org/static/${P}.tar.gz" +SRC_URI="https://github.com/themoken/canto-curses/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-news/canto-daemon/Manifest b/net-news/canto-daemon/Manifest index 32be033421b9..6764b3d358d0 100644 --- a/net-news/canto-daemon/Manifest +++ b/net-news/canto-daemon/Manifest @@ -1,3 +1,3 @@ -DIST canto-daemon-0.9.1.tar.gz 49316 BLAKE2B 9e19dfe348b915735f81a74d7eed21a2c442c2f16d7c78c881ed06db6079154921a34e39b5b28fd17ccae7a626ef2f931b169f35bb15a29b091ec3a444acf4e0 SHA512 88e708c92813ddda44a8ea6a5d21722510822f22ebc0a4fb4165e6793ea50d89b139a51a4b1e06f811d7073c6b103590b52e4299c674f904e8b5aae7645484fd -EBUILD canto-daemon-0.9.1.ebuild 649 BLAKE2B 143288e95db94bebb654669b04bd0aaf9f3afdb99e9a7cf96fff88f75cbf6daa7c9af29e34d2c303a18bb39a0260c7c8bd7ef378be287a52b782219ff2cd4c68 SHA512 cb57bbd6ce91310f5d2ad8e7996bf0325e3f8285d71c2217b02bf166fcadaac5fb0d638de5245fec58791c5043ba8515e802fe3484325f9e0d8d3b04a2a483f4 +DIST canto-daemon-0.9.7.tar.gz 53833 BLAKE2B 148929d610ccde11d32295b585e7ff01d847e4fbf8e9d0bea63fdf2c38b3474f958ff99a2667624b08ab90e004023659b9f4aa0477a67ed5b6e218eac4b2eedc SHA512 8c8c73cb6bc7455620abd299dfa0350ea5b8ec0e04d7ccdb1dd8ee2a6de51d0a0ba3934d66141dc899d28e49993c87002a936659f9c31b3c416ee294f9b616b9 +EBUILD canto-daemon-0.9.7.ebuild 690 BLAKE2B 16c0b6ea1439375d2c2ae2ee3c7f2b3bf43467880ee82e38b8a5e8cd712557f464edc0c229385da0e56beea814df3d6de7d3cfc0ff0138084d352f6e524a04ee SHA512 4e64e0ef251d776d74c4d79c94ac35d9834a09510d3de82b659bfc6421f8af4441fd07d89dab475fdf3ced82bc5f9969f8f446e17415d6b87f0a4bf0cb13c3ff MISC metadata.xml 331 BLAKE2B 5803223748ed71ad398c6abd5500663055d227a19a140bc62c3a35f88c40966a89c84d9ba0468f1ba5e74dcc990c6bd076a9a1d82f15e8e9e0081fbbf30642bd SHA512 833239ae946113877fa2337e78d5511e1469b9a10771c09e1a7abe5ac683d6527445488084f7e4721056f63e5c2ad03480bceafce1e1ddea5977e749d7258993 diff --git a/net-news/canto-daemon/canto-daemon-0.9.1.ebuild b/net-news/canto-daemon/canto-daemon-0.9.7.ebuild index a5006ea04687..b7c139a520be 100644 --- a/net-news/canto-daemon/canto-daemon-0.9.1.ebuild +++ b/net-news/canto-daemon/canto-daemon-0.9.7.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_REQ_USE="xml(+),threads(+)" inherit distutils-r1 multilib DESCRIPTION="Daemon part of Canto-NG RSS reader" HOMEPAGE="https://codezen.org/canto-ng/" -SRC_URI="https://codezen.org/static/${P}.tar.gz" +SRC_URI="https://github.com/themoken/canto-next/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-news/newsboat/Manifest b/net-news/newsboat/Manifest index 587d2be8c25e..acc00e3ad7a7 100644 --- a/net-news/newsboat/Manifest +++ b/net-news/newsboat/Manifest @@ -1,5 +1,7 @@ AUX newsboat-2.11-flags.patch 380 BLAKE2B 2479cfb65282b0cbdbf4d0c6d82257b00254970a6429d388a01b462e4294be2130f9ffebc9380b95d87b4de067768b1b263e28888de88ab48e7497e78d2424f8 SHA512 d031df9800fcbdeddd96b9aaa8fe936f66c35523adee0f1c8e1d08664f6a3ff9e04c606633f2df29fac5ee660b2f11b23c41e63499ad84a528426b9f9b1752b6 AUX newsboat-2.17.1-libressl.patch 6834 BLAKE2B 1e1d4b4876a641508854e02c0308e92f59d9c49bfde10161a9bf81e2c1efa8f67eacea349192a68edace45305f55f2738845d7576a3b95ca5a24287b92bc78b2 SHA512 4d85d660dfea02cd6817d98d3946e13d2ea617a2c481576df9be680b3f4078a3fdbbfeae42033fad25884a5d0574d051c7f77070f68950d65ca334c7915cb6e9 +AUX newsboat-2.19-json-c-0.14.0.patch 970 BLAKE2B e6685bca764b01c62d0e76b743aa95c90541d10283cfb74f4a58c2f730cb311d35dd27a54496aa183f40bdc54afd4d9cc50e812cfe612ed1a69405f25c11e39c SHA512 482086d59d6fa0c67897c829ced6480e674b8e42b3d658e65842ac0a75719ca1981175165014567c53d74d4d902d266b2903865acebec02b7df4ee63f483c138 +AUX newsboat-2.19-libressl.patch 5497 BLAKE2B 556f1cb3102014be879b99f8f1bdec642ca40e893cc46a1053d46a8065fc56e2a9b59c96db0af51707ae716b7334ad36ae13c06ee08c316483bec95ddc42583b SHA512 0e6d2970a5b78b7a11fe4639c4f17031e5b8498d5445e7f60be3290dfdb193a63d1c085f4277b678149c862180fd998c306cce8c52fd9f7288d42155007027d1 DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b DIST argon2rs-0.2.5.crate 353096 BLAKE2B 9f8136f54f96cd95facd78572e31d83d49474b77205277805173aa4afe3ebdccf2592dfcb72a68cfc8e7434b89cdf36058038b2c2d452c8289a5c0f4fbb3ed3b SHA512 09a47467d09ed5bb4efdc4b8392e6282da6f4434063f4352c225c6dd1b668b51623e7d8960deb56c7c18eaca890a3515c1dc833acac1c68dc999e56b63e9b04f DIST arrayvec-0.4.10.crate 26133 BLAKE2B 43772765a9be4e3e6dd5b2ee8864f7894aab3128123a673fd0ddf18dafb69d7ed94709dad6de26e222f080b1de83d31aacbb3419b1d926ec4005de64e4db8b30 SHA512 8aa327fcc18220da496c63c76a521c383c7d506e8c39448f5cc6535c47b8c70ca74f73322b0c368fae7b8a8cec11c9854ac45b4eb7e537fed34e007aa3ad175f @@ -29,6 +31,7 @@ DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed DIST lazy_static-0.2.11.crate 12361 BLAKE2B 3fe6a480c30a792448a3a2b378e05634ec59603f07baa03c0881fe5af85ecde5a172bb0733e7043fb6c43eabc261635b23410658d48add09eef6d807a750d22f SHA512 c85ac434d1b7d41d638e76a142a43d925b96bdddda112b1abeca1bae160d828262a85cd333d72499fe1dc7ae9574d3db226106acb433328c056028eb8c42bfe6 DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc DIST libc-0.2.48.crate 353045 BLAKE2B 707f0311abe07e9a5bb9a1d2597d5a25f837dff783dff827f0c9e224b9ef0c915bc1f7f76a4a0afce5faa5bfe7896bbf1d22e645aed0cdd0e1197dcb45e495df SHA512 3ca3482cbdf8a031c6dfbc063537cee95b1735f8224baaad562f29279554ffd17999bb02c5ca54b25c845f63e70868b76d5d4123dcfa65d86d6e466527f4ce99 +DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975 DIST libz-sys-1.0.18.crate 632715 BLAKE2B 3c88d321f22d8c49a17d2af04361792247f7590e4b21163033e5de7b726b75f91ee15d4e9a8824f4ae894ab8a1856c637982e5f1c70de8dbd543b75de2d1af94 SHA512 fcc9e5bd9ffd5eb4f302d3c271f86370f04fe9fcb3b818ac8d605241a701e9d0c40cfe729ad8fcbe7bbb07df66539503415a00360c56831a511142ff225d0d8c DIST locale_config-0.2.2.crate 20975 BLAKE2B e675c792f5092670cc9f3a3ffecc9c3c35b2bd81f9557f1303a22a817b16d2d42c2289dc9c811b77d7ba76c5a62251550cb683555f05260004ce88d0c964f114 SHA512 969565323cbd9d6e3713052afe08aea606d4b4a336015eb1cc5e73f9ce3415df5eb54e4254c8df09a3a79fcfa3de0ca8c8194bd596f373868ee2ed659ac90a41 DIST lock_api-0.1.5.crate 16967 BLAKE2B c44ebe24fa6074394d0719b293d447ab67a9a23788821f2ba816b5e5b7a6b09d543c630a946b956811dd199144bf43568b52da5ebdd5e8b674e489f9efd2234d SHA512 e6049a8a840c11f00b6505dc9d01d1f759aa7bee47520f86e36caf6c52ca476236b09609b0a5cab0f4c247a40a4736f8fc04cf26fce0962cbbf2956ad4adbfde @@ -37,6 +40,7 @@ DIST memchr-2.1.3.crate 20069 BLAKE2B 6afd95538abae42fdb22b82964b64657555734f250 DIST natord-1.0.9.crate 3866 BLAKE2B 8e8f576af50121e7571a1d919557ddc14a3c1511c12154a9cb74fa34cb5c2279406e1ae7ffb120242689e34d4f237d9548631f5a35f4f5d4369bafd8a728fcc6 SHA512 bf58eda54c759fecca1fd310bece370f26555bde1096081adc5bb1e9446a538f1652fb3049a52f898f4f62a2608805b72cb72dd52ff3fc9b88fe0a7c9071025a DIST newsboat-2.13.tar.xz 460076 BLAKE2B e86fd3e3da8336527f3fd53e663f547a6066bfd1659bf83354a01139a9f6481afda893046faa1729cdfe03b19080032c70575cdcfd13b15aad40f2af808e2f6e SHA512 f7ce9717540e1c38809a44d531d28b26d5f9759479d311c127adec1ed6f3f6e8ad68799559ed31e9ecde7a988a683b0c9f58ff10e8dd4b2de60d75b7f8efe3da DIST newsboat-2.18.tar.xz 577632 BLAKE2B 290f115a2c17b05f9d32f44beab791a65df4e39c944ba88898c2fd1ad387199bbfe02885911a0d824aea7086d1d749aeaf40f9e585c3ea64d22fd8aaad879376 SHA512 63fc7ae45b26d6d5df85c9f2cec826a218aa54de26a9c99cb1d0dd239c885599e8c74bb5c8954d58176abf9c4bf4eb407cab830d2e24f9517e021a2b6b765485 +DIST newsboat-2.19.tar.xz 591616 BLAKE2B 15c9502b607cd6d4f34b0d054c7ae54731d8de9df0bec4e12588e8bc89b92cdd46ce0bbf83a9a1ef160746e5768be63336f6a16b1f4100863d15329f9a0e18d1 SHA512 83e41b8ea96d6a53dad832898192f30dc30c74f32327466dff44ffd4b8bf1a966f55a55b8bde5b7e987f4df80ea83e5ad5211becd7fedc6836533f11f4a91b21 DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e DIST nom-4.2.3.crate 115343 BLAKE2B 03c0d1cf97a0d34adab29d6e21add3da7d8eb78ee6b7987ed11b136db7fc6afeca6a8eb91e00aadc1f6047eb7bff55bc288faa8c481e6a4677e0c43512a68f72 SHA512 663567dcc6310ecd6446bab1eb700f4ebe834a3b25bc2a0054edf14bcf205a95128de5f5dfaab04adb95e1a2241d487d59c0e23c957934a0d656e4c51932bd54 DIST num-integer-0.1.39.crate 17881 BLAKE2B 1398b54766719f6fe298fb20489373ef774f1466349bcb96479610c00bb0f6f54b1a794def2841a0bf70558f6e5a080b528071ad5c64baa82bfac084354fa203 SHA512 1e00ef9fe5adcc312b4b8a59923015eb1387d90e6b3d7239b3aabcd83a9e67f2384b3a383d84ce8cdc82a470770f56373a89f0a679727a5fcc8f5bdb1f1209e3 @@ -106,4 +110,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e DIST xdg-2.2.0.crate 13387 BLAKE2B f1a5909b6a4544eaf28d1d051e05a6b9b09043060e14e394410778ed175e9f27246afadf3851dec21020c5e2ca81ef4db44a34e58d9229972b2475ff5f40d6c9 SHA512 16342b8396b4a329801a0ce3b9db82c4c767d09339f895d9f000c64b7160df11019b320cda632f99d8d5b9f65c97894b09091ee4e2ccafac0cd671481fa5c61e EBUILD newsboat-2.13.ebuild 1252 BLAKE2B 20607997ab2079d9531b6214a21f556c0c78f4059d3276c08f87006eb19603e92a8daff0883b527f136959078a6172a7a77c2099616dfc481f60a4d062a17b00 SHA512 139266eed0947fbb7f479c9d973cf30a44b97c5ab3ee09d3909d494db016cc9045d064436d28bcc986d0a7d0dc15bb1df10014a4a9e38e4e6804733df3d84852 EBUILD newsboat-2.18.ebuild 3110 BLAKE2B b63ad337f7b7ffda7b3f1c1e2479379d41ee2c8b57d058cfcb84d3f95531ae85560995bf0c54da732c520961d42e46ff6945967b7bd5c9ea087ec312a570f1d6 SHA512 bfc1a11a4079dc4c5f7a3d07d643c8fe561e2ae6f518cb06a08e811a4e656bda1eb186624dc8b0c7aac9e5b986be7ff08119656925b6f2f58ca05881dea0f9ee -MISC metadata.xml 168 BLAKE2B f9ddc82021e50bfec072d30481f58e0fe25e473a84564b5a05fc207b484c78a2347f71ba7482c9be4e315f9c025e9c503b88a3875cf1d86d9b6f3ff0ea737b3d SHA512 259ac66a82c624436b3cf00f30407b80ca4218b0ee9141b2b74ad5543db862b3868c29c004f909e97b19040ca6245d6adfe6a939e9f78c0af4b8b2a7bc48a4f7 +EBUILD newsboat-2.19-r1.ebuild 3170 BLAKE2B 3a2ccc77db468855554d867b2566888805eb4dc7b6e40dfcd283c82eaaa7a5923ad0e92ce783e997202a3e7ae739a399bd3b9935fedd970345a9c8cc0827f67e SHA512 a00bc840ddf5f2630716269bc7e23c34ecf5c303ef37429dcf9043d1b3acba5c5708f532ceb829f7511fc15c64c4f08da60a248a81a695e5ef426be38b36b5dd +MISC metadata.xml 216 BLAKE2B 6a9d054ae44666e41d1fa4f4876a8ef7bb95e7023a56b7a7f108cc2cc5b131e94d2080a5777dbbeef466a38db321c530af83dcec5eff25aa5bd8137dc949b6b7 SHA512 237dec64aa7d798b0b71f56a1c93a701fd424b0374d549a1f51272fd22905341157bdd7bcde6f77a7afeb83afede7e6eb2bbd0a2e3a70a9670933bd1d8732196 diff --git a/net-news/newsboat/files/newsboat-2.19-json-c-0.14.0.patch b/net-news/newsboat/files/newsboat-2.19-json-c-0.14.0.patch new file mode 100644 index 000000000000..79c4da5e726a --- /dev/null +++ b/net-news/newsboat/files/newsboat-2.19-json-c-0.14.0.patch @@ -0,0 +1,34 @@ +From db70049f436a965767e8a1273389e1be92e946fa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org> +Date: Mon, 13 Apr 2020 12:52:46 +0200 +Subject: [PATCH] Add support for upcoming json-c 0.14.0. + +TRUE/FALSE are not defined anymore. 1 and 0 are used instead. +--- + src/newsblurapi.cpp | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/src/newsblurapi.cpp b/src/newsblurapi.cpp +index 2d1acdae..e124852d 100644 +--- a/src/newsblurapi.cpp ++++ b/src/newsblurapi.cpp +@@ -9,6 +9,19 @@ + #include "strprintf.h" + #include "utils.h" + ++/* json-c 0.13.99 does not define TRUE/FALSE anymore ++ * the json-c maintainers replaced them with pure 1/0 ++ * https://github.com/json-c/json-c/commit/0992aac61f8b ++ */ ++#if defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99) ++#ifndef FALSE ++#define FALSE 0 ++#endif ++#ifndef TRUE ++#define TRUE 1 ++#endif ++#endif ++ + #define NEWSBLUR_ITEMS_PER_PAGE 6 + + namespace newsboat { diff --git a/net-news/newsboat/files/newsboat-2.19-libressl.patch b/net-news/newsboat/files/newsboat-2.19-libressl.patch new file mode 100644 index 000000000000..86dff345a56a --- /dev/null +++ b/net-news/newsboat/files/newsboat-2.19-libressl.patch @@ -0,0 +1,82 @@ +diff --git a/Cargo.lock b/Cargo.lock +index ca8ce060..b738b0b2 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -124,12 +124,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "curl-sys" +-version = "0.4.5" ++version = "0.4.12" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "cc 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "libz-sys 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", + "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -234,12 +234,12 @@ dependencies = [ + "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "curl-sys 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "curl-sys 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", + "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "gettext-rs 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gettext-sys 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "libz-sys 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", + "natord 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", + "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "once_cell 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -265,7 +265,7 @@ dependencies = [ + + [[package]] + name = "libz-sys" +-version = "1.0.17" ++version = "1.0.18" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "cc 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -863,7 +863,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" + "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" + "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" +-"checksum curl-sys 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "71c63a540a9ee4e15e56c3ed9b11a2f121239b9f6d7b7fe30f616e048148df9a" ++"checksum curl-sys 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "78800a6de442f65dab6ce26c6f369c14fc585686432bf4b77119d2d384216c31" + "checksum dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "88972de891f6118092b643d85a0b28e0678e0f948d7f879aa32f2d5aafe97d2a" + "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" + "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" +@@ -876,7 +876,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" + "checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" + "checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" +-"checksum libz-sys 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "44ebbc760fd2d2f4d93de09a0e13d97e057612052e871da9985cedcb451e6bd5" ++"checksum libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "87f737ad6cc6fd6eefe3d9dc5412f1573865bded441300904d2f42269e140f16" + "checksum locale_config 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "14fbee0e39bc2dd6a2427c4fdea66e9826cc1fd09b0a0b7550359f5f6efe1dab" + "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" + "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +diff --git a/rust/libnewsboat/Cargo.toml b/rust/libnewsboat/Cargo.toml +index 6b9d78dd..5943d43a 100644 +--- a/rust/libnewsboat/Cargo.toml ++++ b/rust/libnewsboat/Cargo.toml +@@ -16,14 +16,14 @@ xdg = "2.2.0" + backtrace = "= 0.3" + unicode-width = "0.1.5" + nom = "^4.1" +-curl-sys = "0.4.5" ++curl-sys = "0.4.12" + libc = "0.2" + gettext-rs = "0.4.1" + natord = "1.0.9" + + # We don't use the following crates, but we pin their versions to make sure + # that Newsboat builds with Rust 1.25 and later. +-libz-sys = "= 1.0.17" ++libz-sys = "= 1.0.18" + + # The following constraints close security holes + # https://rustsec.org/advisories/RUSTSEC-2019-0009 diff --git a/net-news/newsboat/metadata.xml b/net-news/newsboat/metadata.xml index 31e786a3031f..e6c6d10feb76 100644 --- a/net-news/newsboat/metadata.xml +++ b/net-news/newsboat/metadata.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>cedk@gentoo.org</email> + </maintainer> </pkgmetadata> diff --git a/net-news/newsboat/newsboat-2.19-r1.ebuild b/net-news/newsboat/newsboat-2.19-r1.ebuild new file mode 100644 index 000000000000..2729ac499207 --- /dev/null +++ b/net-news/newsboat/newsboat-2.19-r1.ebuild @@ -0,0 +1,169 @@ +# Copyright 2017-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Auto-Generated by cargo-ebuild 0.3.0 + +EAPI=7 + +CRATES=" +aho-corasick-0.6.9 +argon2rs-0.2.5 +arrayvec-0.4.10 +autocfg-0.1.2 +backtrace-0.3.13 +backtrace-sys-0.1.28 +bit-set-0.5.1 +bit-vec-0.5.1 +bitflags-1.0.4 +blake2-rfc-0.2.18 +cc-1.0.29 +cfg-if-0.1.6 +chrono-0.4.6 +clap-2.33.0 +cloudabi-0.0.3 +constant_time_eq-0.1.3 +curl-sys-0.4.12 +dirs-1.0.4 +failure-0.1.5 +failure_derive-0.1.5 +fnv-1.0.6 +fuchsia-cprng-0.1.1 +gettext-rs-0.4.1 +gettext-sys-0.19.8 +idna-0.1.5 +kernel32-sys-0.2.2 +lazy_static-0.2.11 +lazy_static-1.2.0 +libc-0.2.66 +libz-sys-1.0.18 +locale_config-0.2.2 +lock_api-0.1.5 +matches-0.1.8 +memchr-2.1.3 +natord-1.0.9 +nodrop-0.1.13 +nom-4.2.3 +num-integer-0.1.39 +num-traits-0.2.6 +once_cell-0.1.8 +openssl-sys-0.9.53 +parking_lot-0.7.1 +parking_lot_core-0.4.0 +percent-encoding-1.0.1 +pkg-config-0.3.14 +proc-macro2-0.4.27 +proptest-0.7.2 +quick-error-1.2.2 +quote-0.6.11 +rand-0.4.6 +rand-0.5.6 +rand-0.6.5 +rand_chacha-0.1.1 +rand_core-0.3.1 +rand_core-0.4.0 +rand_hc-0.1.0 +rand_isaac-0.1.1 +rand_jitter-0.1.3 +rand_os-0.1.2 +rand_pcg-0.1.1 +rand_xorshift-0.1.1 +rdrand-0.4.0 +redox_syscall-0.1.51 +redox_users-0.2.0 +regex-0.2.11 +regex-1.1.0 +regex-syntax-0.4.2 +regex-syntax-0.5.6 +regex-syntax-0.6.5 +remove_dir_all-0.5.1 +rustc-demangle-0.1.13 +rustc_version-0.2.3 +rusty-fork-0.2.1 +scoped_threadpool-0.1.9 +scopeguard-0.3.3 +section_testing-0.0.4 +semver-0.9.0 +semver-parser-0.7.0 +smallvec-0.6.10 +syn-0.15.26 +synstructure-0.10.1 +tempfile-3.0.6 +textwrap-0.11.0 +thread_local-0.3.6 +time-0.1.42 +ucd-util-0.1.3 +unicode-bidi-0.3.4 +unicode-normalization-0.1.8 +unicode-width-0.1.5 +unicode-xid-0.1.0 +url-1.7.2 +utf8-ranges-1.0.2 +vcpkg-0.2.6 +version_check-0.1.5 +wait-timeout-0.1.5 +winapi-0.2.8 +winapi-0.3.6 +winapi-build-0.1.1 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-x86_64-pc-windows-gnu-0.4.0 +xdg-2.2.0 +" + +inherit toolchain-funcs cargo + +DESCRIPTION="An RSS/Atom feed reader for text terminals" +HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat" +SRC_URI=" + https://newsboat.org/releases/${PV}/${P}.tar.xz + $(cargo_crate_uris ${CRATES}) +" + +LICENSE="Apache-2.0 BSD-2 CC0-1.0 ISC MIT Unlicense" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="libressl" + +RDEPEND=" + >=dev-db/sqlite-3.5:3 + >=dev-libs/stfl-0.21 + >=net-misc/curl-7.21.6 + >=dev-libs/json-c-0.11:= + dev-libs/libxml2 + sys-libs/ncurses:0=[unicode] +" +DEPEND="${RDEPEND} + dev-ruby/asciidoctor + virtual/pkgconfig + sys-devel/gettext + sys-libs/zlib + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) +" + +PATCHES=( + "${FILESDIR}/${PN}-2.11-flags.patch" + "${FILESDIR}/${PN}-2.19-libressl.patch" + "${FILESDIR}/${PN}-2.19-json-c-0.14.0.patch" +) + +src_configure() { + ./config.sh || die +} + +src_compile() { + export CARGO_HOME="${ECARGO_HOME}" + emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" +} + +src_test() { + # tests require UTF-8 locale + emake CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" test + # Tests fail if in ${S} rather than in ${S}/test + cd "${S}"/test || die + ./test || die +} + +src_install() { + emake DESTDIR="${D}" prefix="/usr" docdir="/usr/share/doc/${PF}" install + einstalldocs +} |