diff options
Diffstat (limited to 'dev-util')
33 files changed, 664 insertions, 42 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz Binary files differindex 1573dc634447..7de77bb4fa03 100644 --- a/dev-util/Manifest.gz +++ b/dev-util/Manifest.gz diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest index 141e788b1b79..dd505416e601 100644 --- a/dev-util/cdiff/Manifest +++ b/dev-util/cdiff/Manifest @@ -1,5 +1,5 @@ AUX cdiff-0.9.2-disable-unimportant-failing-test.patch 383 BLAKE2B 4dfd4cdff8c71ba3cc160317d27a5bf26b2c5ed0d1278403dd7c5ad2a07e0b55759ec8c67c50b5d36aa1a8912f2b4f653fdb0b7ad1b36865367e28a433ebc4d7 SHA512 598cf3d4ccbffb6ac71c3e60c4402001d18172d1f7fb309290c94b0f5d2541c4fc1c6557cb1d5780e993e3fefb84314acb2515ab6e585affb7172327794fb4f9 DIST cdiff-0.9.8.tar.gz 34861 BLAKE2B 2b9637c924cb6d2cf436386163af35a0931a1999caa9e63b3a350aef4db32f3c4be82cb1608adb0100d3e96b0b969ae5ca7e870be0fc03055a17f7118a26931d SHA512 303126c51b4c5cfafd800da7f4ffd56655f28f8b525c7d83c7417e1e0013b2186b178697aca41af18f5397ac860cc0159d359e2b23eaa8111e8f77184dc9d4f3 -EBUILD cdiff-0.9.8.ebuild 783 BLAKE2B c2370e33155572dc5723f3cde8d664eb72bba758125a8f03cab023e7fb84c9567aae9ec85f839ec750d8b7ed7cd20647ff54f244690973e71e3d4459d52b560d SHA512 08857ef6c8f2d2483fdff53eadbc0e491c20b22a3626c8247ab4c4df4c60e12cda0969cfa091c13e628afab0ae6908581ee35846223d265b439d068a2af8e16f -EBUILD cdiff-9999.ebuild 787 BLAKE2B f22ba75cc1151bb0f9a1325f4ea9672a951280996dcb01ef69ac64140d729b5d225183897b31504322ace9102b499591f2dad2682c8bbede8aaf64e251fca1c7 SHA512 80e6bd4d06bd8dba869f9d1111ade351ff5ef9649ca59690f171e8d0a7983b11b234e408ed8ead069d94bdf13f13cf1c108eb7f92c2d675e5fbc107808b3e936 +EBUILD cdiff-0.9.8.ebuild 783 BLAKE2B fc5c4f5c595940e8a36823349a7a5513fb80a59ceff26a88e34e04e7295b8a709abebb65fc068f13a82a517aa8bf0391e66791efb28457f827aceaecd6aa1c90 SHA512 ac5a69cd3dd6804219f77720d045945ed866d43815445581e39adf0d05ca294600000df3e7aadf887203b555749e3fdf6cc1bf4c6fb599049ff5db745f774a13 +EBUILD cdiff-9999.ebuild 752 BLAKE2B dab28fae8a7d15a2b630ab794b3c388fbe6caf5fc011c8f3dea1451f5f388bd19ce5692e01699dee07df1c3c2c86e31ba392c4df2d3eca95ecf8b05a881c949c SHA512 68046d783fd8421ae93bb2094a6b46728b60955ac2d1e74c89657ef7e7740785db7eb8f5ded27fe99ca229545de49ecce09dbdc62e624a5f63f66d28545ae4b2 MISC metadata.xml 383 BLAKE2B c2fba0c9ed05af593bf10ae733401d7de8a1396c22094ba912418a796783e069243506edfa72cfb1a706f63c0bcbc5cfb0321b21a5d699a726901ccae682a32f SHA512 c797a47d8258e3aff9bf93328566438192a37c166733e84fd6846ecccb77ea0398c82dd9abbbe90623d4a1fa33405c75ed1defeb832cb2e55b754d3a594bba5f diff --git a/dev-util/cdiff/cdiff-0.9.8.ebuild b/dev-util/cdiff/cdiff-0.9.8.ebuild index 0b2159815163..a38fa1a360dd 100644 --- a/dev-util/cdiff/cdiff-0.9.8.ebuild +++ b/dev-util/cdiff/cdiff-0.9.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) inherit distutils-r1 DESCRIPTION="Colored, side-by-side diff terminal viewer" -HOMEPAGE="https://github.com/ymattw/${PN}" +HOMEPAGE="https://github.com/ymattw/cdiff" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" diff --git a/dev-util/cdiff/cdiff-9999.ebuild b/dev-util/cdiff/cdiff-9999.ebuild index 0052610eb3f9..9d071be628c7 100644 --- a/dev-util/cdiff/cdiff-9999.ebuild +++ b/dev-util/cdiff/cdiff-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -7,8 +7,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit distutils-r1 git-r3 -DESCRIPTION="Term based view of colored, incremental diff in a Git/Mercurial/Svn workspace" -HOMEPAGE="https://github.com/ymattw/${PN}" +DESCRIPTION="Colored, side-by-side diff terminal viewer" +HOMEPAGE="https://github.com/ymattw/cdiff" EGIT_REPO_URI="https://github.com/ymattw/cdiff.git" LICENSE="BSD" diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest index ee3952a26d10..3c582446f4b9 100644 --- a/dev-util/conan/Manifest +++ b/dev-util/conan/Manifest @@ -1,3 +1,3 @@ DIST conan-1.0.4.tar.gz 580404 BLAKE2B a3099e7f5bdb882591bab031da267f3df5582975d93a840cd7bf42d7b5b57850d42a28ea33440f6570149b7db8c2ae6a395460f375fee084a9336435d42e7df6 SHA512 47fe9632b0007cdc0456004e6c9122df387869c33b58694b4a2dca9956daf977532f79c204207b21d3a4e7d90337a25dba49cf84cba98c1f9bde3170f1a185a9 -EBUILD conan-1.0.4.ebuild 1614 BLAKE2B 61927121cb774070d2886f2a93c4e7e7e334cb8eb482fc5c0e44fd71be75a9af5a860696b9dafe72fdab6344791c0a9f9074fbd45644fae5fbb3cb95620b4ddc SHA512 51c96947fc4653b955269143e9d72aabe7837cdfb03c064c61e2ff45605603b1b8b4c409d1d78e956a77e36d1cd656bfeda317cf83cf96626ea69e2a21799790 +EBUILD conan-1.0.4.ebuild 1615 BLAKE2B 1036a900af9fa14ca4760c2775d9bae1fdde999521bcfba449da3adf03bc5374600cb32ee9f6b7b99f9edad2afae39fefb6130ee2a6cd3d11bb71275e0eceb5d SHA512 d8d18d217d487f5c1ebdc02936bcee13d680d9167be8eba40cd12a195f215f14ccfee5028942eec233cae63e329dbbc4b514d44dfbd236cb6fa073c8ca114468 MISC metadata.xml 735 BLAKE2B 12342e8032df1d0377576fd154e9db9713f915af597a6840f6cd003aff2976288fa29a75875bddcdb0972ee47f2a79543df80453a821358a7e15b6f202e31c9e SHA512 ff1ecd407675bc4b417af1f8e56fd1cb4b1c6c5f5de08836ffa8f944cacd8b60d6068553b9a8739a3a2d94b85311f6e9c0da5ab0dac0b80f3dae660eeec1068f diff --git a/dev-util/conan/conan-1.0.4.ebuild b/dev-util/conan/conan-1.0.4.ebuild index 990edbd43c60..1c65c049844a 100644 --- a/dev-util/conan/conan-1.0.4.ebuild +++ b/dev-util/conan/conan-1.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ PYTHON_REQ_USE="sqlite" inherit distutils-r1 DESCRIPTION="Distributed C/C++ package manager" -HOMEPAGE="http://conan.io/" +HOMEPAGE="https://conan.io/" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest index bfefda57e278..b675e2e2983e 100644 --- a/dev-util/debhelper/Manifest +++ b/dev-util/debhelper/Manifest @@ -1,7 +1,7 @@ -DIST debhelper_11.1.4.tar.xz 449928 BLAKE2B 6cf3b3aa79802ab8fcc8a1ce84f10e53071c85b249311c41ce84c33a5acbf8d88a5bed28c62154c26e96bc1b925f2ff7bcbad1c84afde303532963589bb74d15 SHA512 4389914409b9160b7f8903ea814bad58666d5dcada5641a897a1805579024fc49e6a631d40ca70c4caa914d790867d70dcaca04a633b42767d4d6f48245b039e DIST debhelper_11.1.5.tar.xz 451468 BLAKE2B 504cf7453e23e6bdc4759c3e4f0cdcc42b450d14992c5400b8fccd3b1bc3926a0f1ba7cffffff81846bdcffc847d58aab0c6e19f99bf5802e6f0a9792c72cfe7 SHA512 a6cc982bfbb2a172866e6deea936d9396dad5c4c89381cd04aba9efce8ba9ed8acfad2e6f80818cec6d91318cd912b75640ff9ee8cb25d212b63fb3b90a05041 +DIST debhelper_11.1.6.tar.xz 453020 BLAKE2B 79a62c37a8b14336516d877f0633d3231cfe57a0bdd19dd50233843d186bff619dd31155d9851d367748f70ffda2d94d138b06357c0dcadba0c99771777ea3af SHA512 8a9e5a98ccafe72f6fd2d3d6376c82cd2ba656b4a72936afb5e0564144a6dc495b8d74b7fc65dfe97aca6282118298f0c256f5433bbc01a5837306329d2c737c DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62 -EBUILD debhelper-11.1.4.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4 EBUILD debhelper-11.1.5.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4 +EBUILD debhelper-11.1.6.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4 EBUILD debhelper-9.20160814.ebuild 1508 BLAKE2B e690fd6e7e568ef0245db0bcc8fbd47131b0bba0bb6c0d0363c2c52b1ab9fbc39b9ff4523c8f48a7a15a0685730fb6af38c82029b35bf3a82ef5fbd7e74d8b5b SHA512 edf4a1242cd0ece4dd3afea0641299fe89be0398a313111ffaaf11f72ce97194e53bcd5cb223d8b271b0e5612704a8f008c06ffc6001198d5e9d39e9a379d411 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735 diff --git a/dev-util/debhelper/debhelper-11.1.4.ebuild b/dev-util/debhelper/debhelper-11.1.6.ebuild index eb7e5fa626c2..eb7e5fa626c2 100644 --- a/dev-util/debhelper/debhelper-11.1.4.ebuild +++ b/dev-util/debhelper/debhelper-11.1.6.ebuild diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest index 43db17f6146c..040b95b9d4e6 100644 --- a/dev-util/dejagnu/Manifest +++ b/dev-util/dejagnu/Manifest @@ -6,5 +6,5 @@ DIST dejagnu-1.5.tar.gz 576269 BLAKE2B df7767e5b8adbad7315e3489d3f8a267043e2bf27 DIST dejagnu-1.6.tar.gz 523969 BLAKE2B 1cc9498aacd681570cd8d8834cd2fe0594bb49e6664cfe934b824dba0bd4a6766f977de6a1dc4596095a11d68844873f5687000423f4928f0432981023d26451 SHA512 a494dd5cde8d275b397116049c93e183f5f1731d63660ee8d2f4263b099fc5be7fbddde927fab3ccd5f000c43d50242f94bbb4d95497b915ea53be418bc145bc EBUILD dejagnu-1.4.4-r3.ebuild 979 BLAKE2B 48712a9df00606d95f8c0db480bc501b7c1c51a144236c0d0267b8bd5033a7809132c28fe6ec8c27c4c82382cba9ccf6b509d53e2a1ee69a8ffd5318e8002fe7 SHA512 b44d349d8d82305084b44268176f2f80985e7c983661d565a77f537a80b9ebd29bdd4290e2394e524aa5f30676f0aa09e6e717e4ed620fe5f0eb0d7c2488751e EBUILD dejagnu-1.5.ebuild 793 BLAKE2B 4d1961448a3b2d5b38d05a70f34a289b75b19d240e730ad243b5ae11684c3bec52f057d051ba50715063f07a21391a9bad5519825b381e9f1df84eef9b03e513 SHA512 34f446f6714c330d8cff1728ca439af085343f0a2e70ce36c7db785dc4ef2102af92129e5ac92fbe36d199f9837560b1d7fbca03e16dc098e2247121f463b208 -EBUILD dejagnu-1.6.ebuild 734 BLAKE2B c52e11e32e4a17b72971bdcbcf0e219b8c20357d0510c575631994025a4857176c16b974ccbae5f033e06bb12203e0a1a1ed17a35ea47f8645bb785f8d3bd508 SHA512 3430249a58ccf34896abf4c28a66aa875cfb850d9633c34b9a8875eed94805c138235df80a3eedf1176272435410c23fc8e3700bd0ba3e6a4aabf9294be43ead +EBUILD dejagnu-1.6.ebuild 747 BLAKE2B c0484f5ad2e8479e9c472ca66116243147cb61229cdba9e8b5172800190407f93f354ae348e42f0c62ba0d750ce36aee47685c6806c9a81e9169ce4e8b111037 SHA512 06cd549942eb088955e744512835dca5c5e79b9753e5b4073ccb2d47f3a14b62234d178a5dd588c57f7f5deebe794d7fc8908c1e7fd2c733fb732e56683109c3 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1 diff --git a/dev-util/dejagnu/dejagnu-1.6.ebuild b/dev-util/dejagnu/dejagnu-1.6.ebuild index 2daa6c53f7f5..e27ffef09c26 100644 --- a/dev-util/dejagnu/dejagnu-1.6.ebuild +++ b/dev-util/dejagnu/dejagnu-1.6.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris" IUSE="" DEPEND="dev-lang/tcl diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest new file mode 100644 index 000000000000..bb3dd03b770b --- /dev/null +++ b/dev-util/gnome-builder/Manifest @@ -0,0 +1,7 @@ +AUX 3.24.2-jedi-fixes-1.patch 1224 BLAKE2B 4e3ea7702ddc69f892522596c9ff33495556b2d3cf1bcc2f09db7773d6f833b39e3a65f26813b1c75255c60ea5b0f0477439d25e7897f9d45baa84e6166f8d11 SHA512 f46e3a2e5128873bf8dc2ece5bca060d4d2dc936ce21127ce023f606c4841f888b5acaedf5500c1a5e2af634f12d1594e7dbb3480726ac871ca73e47c6fd0639 +AUX 3.24.2-jedi-fixes-2.patch 928 BLAKE2B 8fb3e4bb34217309475431ea66f24c003e27a89314d1eafff37b11eb9f79c76b7bddb78899e9cf78215dd72e5da27e6f416757db40921f06904ec6a215ea1dd6 SHA512 e5b08a6ad2e182e9340d49876b0ee61f9a5e97abb8c31361ee5058647490894b741250c0850adfb18f93005ccebbbbff5c0ca6fe75f61d1895816f33e4801af0 +AUX 3.24.2-jedi-fixes-3.patch 8966 BLAKE2B 9dc40ddc73ae2ca5b0cbb6202391eb3aa550771dd65f7fac84e724d207c5867129c8607417279c78aa469234e62a3e1f62cb294701948b5741b06c4a0aecbf9d SHA512 5481e325a338cea5946a4515e8e532c8d516b0f05a2f3c7ad33dc3e9bbc83024bb8ceb2f0913b1795fdc57e856b37ccaf314e05b414d27669a4819b63747f255 +DIST gnome-builder-3.24.2.tar.xz 4342908 BLAKE2B 5dca80d2e948041bc096fa9a2a5d39322c6fedb0560e3e4f3c60c7b0657c7c62e89387a63f7d050c3df90d8c129485bc5495039802548b22ae268d94c14a37ae SHA512 dec133ad3c5ef96a036598ebbe684667dc44f73d8643e700f1e776cf8eb860b99c1d333f1fed5bc896cb7bdcf607eb51fedb7bb1f5b0cc662e4b2703d74140bf +EBUILD gnome-builder-3.24.2-r1.ebuild 5197 BLAKE2B cddad23ff685a46801e50022a95606bf19937b9740a86f280e39cb72b898b3cd68dfcb34639ce0e16fc98433a171d9427d5a4db26c9d9fa92a5271a7d7e74322 SHA512 9f4687cd2b47ba9a7035e17e20bdd30be2b3a678a5c83db65c20dce251499f4135667e970dd8c13e56cfcd66eb49a13bc20a440b36f3bb7aa5b31c3ef2ec5987 +EBUILD gnome-builder-3.24.2.ebuild 5019 BLAKE2B 4ed96a85fb1d622006ac877a50ba580c2d7ca95639af086230d3209e7239cbe8fd48f51776d20d2e656cec25332ae9e735c8c7b3c5750c8dddd12f620e0be0ee SHA512 6d9e47c151f701eae71a4053a72ed0e1de77edd299cf3eef1d2e91289b9e576537269f0571321deb9c5c63103b9181f0db4f87a64f8a4fb8ecfff21056d651f8 +MISC metadata.xml 1011 BLAKE2B d6099c6cd5ffaf091f2ee0e07e261caacf0283aa18dc6be22a617b95236131e831d24f36bbc73f86edc66a3e6fe74f5102d101c9736d5d992a80929a68ac2100 SHA512 b3519707a4023a6c9892827abaf6465e28dbad2f1a8c2760a3f2d9b34d4be384d10326870e0d7952b41cb725c955cc838092786543ff1867db4a3acf41cb404a diff --git a/dev-util/gnome-builder/files/3.24.2-jedi-fixes-1.patch b/dev-util/gnome-builder/files/3.24.2-jedi-fixes-1.patch new file mode 100644 index 000000000000..399811bb0eac --- /dev/null +++ b/dev-util/gnome-builder/files/3.24.2-jedi-fixes-1.patch @@ -0,0 +1,28 @@ +From 294920f6b932992e9da8864ca96ae35fe2402406 Mon Sep 17 00:00:00 2001 +From: Christian Hergert <chergert@redhat.com> +Date: Fri, 30 Jun 2017 21:19:41 -0700 +Subject: [PATCH] jedi: silence xml parser warning + +https://bugzilla.gnome.org/show_bug.cgi?id=784327 +--- + +diff --git a/plugins/jedi/jedi_plugin.py b/plugins/jedi/jedi_plugin.py +index 7be46f2..d257680 100644 +--- a/plugins/jedi/jedi_plugin.py ++++ b/plugins/jedi/jedi_plugin.py +@@ -298,7 +298,11 @@ class DocumentationDB(object): + cursor.execute('UPDATE girfiles SET last_modified=? WHERE file=?', (mtime, filename)) + parser = lxml.etree.XMLParser(recover=True) + tree = lxml.etree.parse(filename, parser=parser) +- namespace = tree.find('core:namespace', namespaces=ns) ++ try: ++ namespace = tree.find('core:namespace', namespaces=ns) ++ except: ++ print("Failed to parse", filename) ++ continue + library_version = namespace.attrib['version'] + for node in namespace.findall('core:class', namespaces=ns): + doc = node.find('core:doc', namespaces=ns) +-- +libgit2 0.26.0 + diff --git a/dev-util/gnome-builder/files/3.24.2-jedi-fixes-2.patch b/dev-util/gnome-builder/files/3.24.2-jedi-fixes-2.patch new file mode 100644 index 000000000000..de8397a57a00 --- /dev/null +++ b/dev-util/gnome-builder/files/3.24.2-jedi-fixes-2.patch @@ -0,0 +1,25 @@ +From 1d7c6fa60faf9e81f2fa0f93898f8e1cc68da6d4 Mon Sep 17 00:00:00 2001 +From: Christian Hergert <chergert@redhat.com> +Date: Thu, 6 Jul 2017 14:32:52 -0700 +Subject: [PATCH] jedi: ignore non-gir files + +The rnc file is now shipped here, so ignore that when going +through the directory contents. +--- + +diff --git a/plugins/jedi/jedi_plugin.py b/plugins/jedi/jedi_plugin.py +index d257680..25ade14 100644 +--- a/plugins/jedi/jedi_plugin.py ++++ b/plugins/jedi/jedi_plugin.py +@@ -280,6 +280,8 @@ class DocumentationDB(object): + # I would use scandir for better performance, but it requires newer Python + for gir_path in GIR_PATH_LIST: + for gir_file in os.listdir(gir_path): ++ if not gir_file.endswith('.gir'): ++ continue + if gir_file in processed_gir_files: + continue + processed_gir_files[gir_file] = None +-- +libgit2 0.26.0 + diff --git a/dev-util/gnome-builder/files/3.24.2-jedi-fixes-3.patch b/dev-util/gnome-builder/files/3.24.2-jedi-fixes-3.patch new file mode 100644 index 000000000000..484341ad1155 --- /dev/null +++ b/dev-util/gnome-builder/files/3.24.2-jedi-fixes-3.patch @@ -0,0 +1,197 @@ +From 8bf74c787af082102958de7498a9b4f4248788cc Mon Sep 17 00:00:00 2001 +From: Elad Alfassa <elad@fedoraproject.org> +Date: Wed, 9 Aug 2017 17:39:07 +0300 +Subject: [PATCH] jedi: adapt to jedi 0.10.0 + +https://bugzilla.gnome.org/show_bug.cgi?id=778708 +--- + +diff --git a/plugins/jedi/jedi_plugin.py b/plugins/jedi/jedi_plugin.py +index 25ade14..8898b69 100644 +--- a/plugins/jedi/jedi_plugin.py ++++ b/plugins/jedi/jedi_plugin.py +@@ -55,7 +55,6 @@ from gi.repository import GtkSource + from gi.repository import Ide + from gi.types import GObjectMeta + from gi.types import StructMeta +- + _ = Ide.gettext + + gi_importer = DynamicImporter('gi.repository') +@@ -91,22 +90,31 @@ _ICONS = { + try: + import jedi + from jedi.evaluate.compiled import CompiledObject ++ from jedi.evaluate.compiled import get_special_object + from jedi.evaluate.compiled import _create_from_name +- from jedi.evaluate.compiled import builtin ++ from jedi.evaluate.context import Context + from jedi.evaluate.docstrings import _evaluate_for_statement_string + from jedi.evaluate.imports import Importer + + class PatchedJediCompiledObject(CompiledObject): + "A modified version of Jedi CompiledObject to work with GObject Introspection modules" ++ ++ def __init__(self, evaluator, obj, parent_context=None, faked_class=None): ++ # we have to override __init__ to change super(CompiledObject, self) ++ # to Context, in order to prevent an infinite recursion ++ Context.__init__(self, evaluator, parent_context) ++ self.obj = obj ++ self.tree_node = faked_class ++ + def _cls(self): + if self.obj.__class__ == IntrospectionModule: + return self + else: +- return super()._cls() ++ return super()._cls(self) + + @property + def py__call__(self): +- def actual(evaluator, params): ++ def actual(params): + # Parse the docstring to find the return type: + ret_type = '' + if '->' in self.obj.__doc__: +@@ -115,18 +123,21 @@ try: + if ret_type.startswith('iter:'): + ret_type = ret_type[len('iter:'):] # we don't care if it's an iterator + +- if ret_type in __builtins__: ++ if hasattr(__builtins__, ret_type): + # The function we're inspecting returns a builtin python type, that's easy +- obj = _create_from_name(builtin, builtin, ret_type) +- return evaluator.execute(obj, params) ++ # (see test/test_evaluate/test_compiled.py in the jedi source code for usage) ++ builtins = get_special_object(self.evaluator, 'BUILTINS') ++ builtin_obj = builtins.py__getattribute__(ret_type) ++ obj = _create_from_name(self.evaluator, builtins, builtin_obj, "") ++ return self.evaluator.execute(obj, params) + else: + # The function we're inspecting returns a GObject type +- parent = self.parent.obj.__name__ ++ parent = self.parent_context.obj.__name__ + if parent.startswith('gi.repository'): + parent = parent[len('gi.repository.'):] + else: + # a module with overrides, such as Gtk, behaves differently +- parent_module = self.parent.obj.__module__ ++ parent_module = self.parent_context.obj.__module__ + if parent_module.startswith('gi.overrides'): + parent_module = parent_module[len('gi.overrides.'):] + parent = '%s.%s' % (parent_module, parent) +@@ -138,22 +149,28 @@ try: + # A pygobject type in a different module + return_type_parent = ret_type.split('.', 1)[0] + ret_type = 'from gi.repository import %s\n%s' % (return_type_parent, ret_type) +- result = _evaluate_for_statement_string(evaluator, ret_type, self.parent) +- return result ++ result = _evaluate_for_statement_string(self.parent_context, ret_type) ++ return set(result) + if type(self.obj) == FunctionInfo: + return actual + return super().py__call__ + ++ # we need to override CompiledBoundMethod without changing it much, ++ # just so it'll not get confused due to our overriden CompiledObject ++ class PatchedCompiledBoundMethod(PatchedJediCompiledObject): ++ def __init__(self, func): ++ super().__init__(func.evaluator, func.obj, func.parent_context, func.tree_node) ++ + class PatchedJediImporter(Importer): + "A modified version of Jedi Importer to work with GObject Introspection modules" + def follow(self): + module_list = super().follow() +- if module_list == []: ++ if not module_list: + import_path = '.'.join([str(i) for i in self.import_path]) + if import_path.startswith('gi.repository'): + try: + module = gi_importer.load_module(import_path) +- module_list = [PatchedJediCompiledObject(module)] ++ module_list = [PatchedJediCompiledObject(self._evaluator, module)] + except ImportError: + pass + return module_list +@@ -169,9 +186,9 @@ try: + return original_jedi_get_module('gi._gobject') + + jedi.evaluate.compiled.fake.get_module = patched_jedi_get_module +- +- jedi.evaluate.imports.Importer = PatchedJediImporter + jedi.evaluate.compiled.CompiledObject = PatchedJediCompiledObject ++ jedi.evaluate.instance.CompiledBoundMethod = PatchedCompiledBoundMethod ++ jedi.evaluate.imports.Importer = PatchedJediImporter + HAS_JEDI = True + except ImportError: + print("jedi not found, python auto-completion not possible.") +@@ -331,7 +348,6 @@ def update_doc_db_on_startup(): + + update_doc_db_on_startup() + +- + class JediCompletionProvider(Ide.Object, GtkSource.CompletionProvider, Ide.CompletionProvider): + context = None + current_word = None +@@ -600,6 +616,15 @@ class JediCompletionRequest: + script = jedi.Script(self.content, self.line + 1, self.column, self.filename) + + db = DocumentationDB() ++ ++ def get_gi_obj(info): ++ """ Get a GObject Introspection object from a jedi Completion, or None if the completion is not GObject Introspection related """ ++ if (type(info._module) == PatchedJediCompiledObject and ++ info._module.obj.__class__ == IntrospectionModule): ++ return next(info._name.infer()).obj ++ else: ++ return None ++ + for info in script.completions(): + if self.cancelled: + return +@@ -608,10 +633,9 @@ class JediCompletionRequest: + + # we have to use custom names here because .type and .params can't + # be overridden (they are properties) +- if type(info._definition) == PatchedJediCompiledObject and \ +- type(info._definition.obj) == FunctionInfo: ++ obj = get_gi_obj(info) ++ if type(obj) == FunctionInfo: + info.real_type = 'function' +- obj = info._definition.obj + params = [arg_info.get_name() for arg_info in obj.get_arguments()] + else: + info.real_type = info.type +@@ -626,8 +650,8 @@ class JediCompletionRequest: + params.append(param.name) + + doc = info.docstring() +- if hasattr(info._definition, 'obj'): +- obj = info._definition.obj ++ if obj is not None: ++ # get documentation for this GObject Introspection object + symbol = None + namespace = None + +@@ -640,17 +664,7 @@ class JediCompletionRequest: + namespace = obj.get_namespace() + + if symbol is not None: +- # we need to walk down the path to find the module so we can get the version +- parent = info._definition.parent +- found = False +- while not found: +- new_parent = parent.parent +- if new_parent is None: +- found = True +- else: +- parent = new_parent +- version = parent.obj._version +- result = db.query(symbol, version) ++ result = db.query(symbol, info._module.obj._version) + if result is not None: + doc = result + +-- +libgit2 0.26.0 + diff --git a/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild b/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild new file mode 100644 index 000000000000..1daef3f26567 --- /dev/null +++ b/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{4,5,6} ) +VALA_MIN_API_VERSION="0.30" +VALA_USE_DEPEND="vapigen" +DISABLE_AUTOFORMATTING=1 +FORCE_PRINT_ELOG=1 + +inherit gnome2 python-single-r1 vala virtualx readme.gentoo-r1 + +DESCRIPTION="Builder attempts to be an IDE for writing software for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Builder" + +# FIXME: Review licenses at some point +LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="clang +git sysprof vala webkit" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# When bumping, pay attention to all the included plugins/*/configure.ac files and the requirements within. +# Most have no extra requirements and default to enabled; we need to handle the ones with extra requirements, which tend to default to auto(magic). +# Look at the last (fourth) argument given to AC_ARG_ENABLE to decide. We don't support any disabling of those that are default-enabled and have no extra deps beyond C/python/introspection. +# FIXME: >=dev-util/devhelp-3.20.0 dependency is automagic for devhelp integration plugin +# FIXME: vte could be optional via $(use_enable vte terminal-plugin) - but most/all people want this and have vte? +# FIXME: flatpak-plugin needs flatpak.pc >=0.6.9, libgit2[threads] >=libgit2-glib-0.24.0[ssh] libsoup-2.4.pc +# FIXME: --with-sanitizer configure option +# FIXME: Enable rdtscp based high performance counter usage on suitable architectures for EGG_COUNTER? +# Editorconfig needs pcre.h, with vte migrating away, might want it optional? +# Python is always enabled - the core python plugin support checks are automagic and not worth crippling it by not supporting python plugins +# Relatedly introspection is always required to not have broken python using plugins or have to enable/disable them based on it. This is a full IDE, not a place to be really minimal. +# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it. Last full check at 3.22.4 +RDEPEND=" + >=x11-libs/gtk+-3.22.1:3[introspection] + >=dev-libs/glib-2.50.0:2[dbus] + >=x11-libs/gtksourceview-3.22.0:3.0[introspection] + >=dev-libs/gobject-introspection-1.48.0:= + >=dev-python/pygobject-3.22.0:3 + >=dev-libs/libxml2-2.9.0 + >=x11-libs/pango-1.38.0 + >=dev-libs/libpeas-1.18.0[python,${PYTHON_USEDEP}] + >=dev-libs/json-glib-1.2.0 + >=app-text/gspell-1.2.0 + >=app-text/enchant-1.6.0 + webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] ) + clang? ( sys-devel/clang:= ) + git? ( + dev-libs/libgit2[ssh,threads] + >=dev-libs/libgit2-glib-0.25.0[ssh] ) + >=x11-libs/vte-0.46:2.91 + sysprof? ( >=dev-util/sysprof-3.23.91[gtk] ) + dev-libs/libpcre:3 + ${PYTHON_DEPS} + vala? ( $(vala_depend) ) +" +# desktop-file-utils for desktop-file-validate check in configure for 3.22.4 +DEPEND="${RDEPEND} + dev-libs/appstream-glib + dev-util/desktop-file-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + !<sys-apps/sandbox-2.10-r3 +" + +# Tests fail if all plugins aren't enabled (webkit, clang, devhelp, perhaps more) +RESTRICT="test" + +DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide +extra capabilities beyond these expressed via USE flags. Some of these +that are currently available with packages include: + +* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for + C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic + highlighting and symbol resolving support. +* dev-python/jedi-0.10.x and dev-python/lxml for more accurate Python + autocompletion support. +* dev-util/valgrind for integration with valgrind. +* dev-util/meson for integration with the Meson build system. +* dev-util/cargo for integration with the Rust Cargo build system. +' +# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important +# eslint for additional diagnostics in JavaScript files +# jhbuild support +# rust language server via rls +# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template +# mono/PHPize stuff + +PATCHES=( "${FILESDIR}"/${PV}-jedi-fixes-{1,2,3}.patch ) # jedi-0.10+ compatibility from 3.25.9x; remove 0.10 specific mention from DOC_CONTENTS once compat with 0.11+ + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + use vala && vala_src_prepare + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --with-channel=distro \ + --enable-editorconfig \ + --enable-introspection \ + $(use_enable vala vala-pack-plugin) \ + $(use_enable webkit) \ + $(use_enable webkit html-preview-plugin) \ + $(use_enable clang clang-plugin) \ + $(use_enable git git-plugin) \ + $(use_enable sysprof sysprof-plugin) \ + --disable-flatpak-plugin \ + --enable-terminal-plugin \ + --enable-gettext-plugin \ + --disable-static +} + +src_install() { + gnome2_src_install + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_pkg_postinst + readme.gentoo_print_elog +} + +src_test() { + # FIXME: this should be handled at eclass level + "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data/gsettings" || die + + GSETTINGS_SCHEMA_DIR="${S}/data/gsettings" virtx emake check +} diff --git a/dev-util/gnome-builder/gnome-builder-3.24.2.ebuild b/dev-util/gnome-builder/gnome-builder-3.24.2.ebuild new file mode 100644 index 000000000000..fc35c2c3eb4b --- /dev/null +++ b/dev-util/gnome-builder/gnome-builder-3.24.2.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{4,5,6} ) +VALA_MIN_API_VERSION="0.30" +VALA_USE_DEPEND="vapigen" +DISABLE_AUTOFORMATTING=1 +FORCE_PRINT_ELOG=1 + +inherit gnome2 python-single-r1 vala virtualx readme.gentoo-r1 + +DESCRIPTION="Builder attempts to be an IDE for writing software for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Builder" + +# FIXME: Review licenses at some point +LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="clang +git sysprof vala webkit" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# When bumping, pay attention to all the included plugins/*/configure.ac files and the requirements within. +# Most have no extra requirements and default to enabled; we need to handle the ones with extra requirements, which tend to default to auto(magic). +# Look at the last (fourth) argument given to AC_ARG_ENABLE to decide. We don't support any disabling of those that are default-enabled and have no extra deps beyond C/python/introspection. +# FIXME: >=dev-util/devhelp-3.20.0 dependency is automagic for devhelp integration plugin +# FIXME: vte could be optional via $(use_enable vte terminal-plugin) - but most/all people want this and have vte? +# FIXME: flatpak-plugin needs flatpak.pc >=0.6.9, libgit2[threads] >=libgit2-glib-0.24.0[ssh] libsoup-2.4.pc +# FIXME: --with-sanitizer configure option +# FIXME: Enable rdtscp based high performance counter usage on suitable architectures for EGG_COUNTER? +# Editorconfig needs pcre.h, with vte migrating away, might want it optional? +# Python is always enabled - the core python plugin support checks are automagic and not worth crippling it by not supporting python plugins +# Relatedly introspection is always required to not have broken python using plugins or have to enable/disable them based on it. This is a full IDE, not a place to be really minimal. +# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it. Last full check at 3.22.4 +RDEPEND=" + >=x11-libs/gtk+-3.22.1:3[introspection] + >=dev-libs/glib-2.50.0:2[dbus] + >=x11-libs/gtksourceview-3.22.0:3.0[introspection] + >=dev-libs/gobject-introspection-1.48.0:= + >=dev-python/pygobject-3.22.0:3 + >=dev-libs/libxml2-2.9.0 + >=x11-libs/pango-1.38.0 + >=dev-libs/libpeas-1.18.0[python,${PYTHON_USEDEP}] + >=dev-libs/json-glib-1.2.0 + >=app-text/gspell-1.2.0 + >=app-text/enchant-1.6.0 + webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] ) + clang? ( sys-devel/clang:= ) + git? ( + dev-libs/libgit2[ssh,threads] + >=dev-libs/libgit2-glib-0.25.0[ssh] ) + >=x11-libs/vte-0.46:2.91 + sysprof? ( >=dev-util/sysprof-3.23.91[gtk] ) + dev-libs/libpcre:3 + ${PYTHON_DEPS} + vala? ( $(vala_depend) ) +" +# desktop-file-utils for desktop-file-validate check in configure for 3.22.4 +DEPEND="${RDEPEND} + dev-libs/appstream-glib + dev-util/desktop-file-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + !<sys-apps/sandbox-2.10-r3 +" + +# Tests fail if all plugins aren't enabled (webkit, clang, devhelp, perhaps more) +RESTRICT="test" + +DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide +extra capabilities beyond these expressed via USE flags. Some of these +that are currently available with packages include: + +* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for + C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic + highlighting and symbol resolving support. +* dev-python/jedi and dev-python/lxml for more accurate Python + autocompletion support. +* dev-util/valgrind for integration with valgrind. +* dev-util/meson for integration with the Meson build system. +* dev-util/cargo for integration with the Rust Cargo build system. +' +# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important +# eslint for additional diagnostics in JavaScript files +# jhbuild support +# rust language server via rls +# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template +# mono/PHPize stuff + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + use vala && vala_src_prepare + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --with-channel=distro \ + --enable-editorconfig \ + --enable-introspection \ + $(use_enable vala vala-pack-plugin) \ + $(use_enable webkit) \ + $(use_enable webkit html-preview-plugin) \ + $(use_enable clang clang-plugin) \ + $(use_enable git git-plugin) \ + $(use_enable sysprof sysprof-plugin) \ + --disable-flatpak-plugin \ + --enable-terminal-plugin \ + --enable-gettext-plugin \ + --disable-static +} + +src_install() { + gnome2_src_install + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_pkg_postinst + readme.gentoo_print_elog +} + +src_test() { + # FIXME: this should be handled at eclass level + "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data/gsettings" || die + + GSETTINGS_SCHEMA_DIR="${S}/data/gsettings" virtx emake check +} diff --git a/dev-util/gnome-builder/metadata.xml b/dev-util/gnome-builder/metadata.xml new file mode 100644 index 000000000000..78c212429a5c --- /dev/null +++ b/dev-util/gnome-builder/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +<use> + <flag name="clang">Provide integration with <pkg>sys-devel/clang</pkg> for best possible C/C++ autocompletion, semantic highlighting, symbol resolving, and diagnostics support</flag> + <flag name="git">Provide support for the Git version control system via <pkg>dev-libs/libgit2-glib</pkg> + (such as setup of Git for New Project, direct cloning for Open Project and changed lines indicators in the editor gutter)</flag> + <flag name="sysprof">Provide an integrated profiler via <pkg>dev-util/sysprof</pkg></flag> + <flag name="vala">Provide an autoindenter, autocompletion, diagnostics, and symbol resolver for Vala</flag> + <flag name="webkit">Enable <pkg>net-libs/webkit-gtk</pkg> using plugins support and the HTML/Markdown previewer plugin</flag> +</use> +</pkgmetadata> diff --git a/dev-util/hxtools/Manifest b/dev-util/hxtools/Manifest index 8951808bfa66..ee696102b839 100644 --- a/dev-util/hxtools/Manifest +++ b/dev-util/hxtools/Manifest @@ -1,3 +1,5 @@ DIST hxtools-20121125.tar.xz 287716 BLAKE2B 66c125e4db14b6a6adb49e0d45944969f6c4a4a238d58a03a2d678eda3e5f8bec002c3fa401c1c9458b4840816a0cc3c357e9e5c8c5ed6a062309785c51ec1a7 SHA512 fa15331d8c961b0a3b1a99f592e2b4f9b0531ac294a2fef0f9a5067b5e427ca57e0c62798b1048a1d6005c9655af45136636255f684a129bc997864e8c7c4915 +DIST hxtools-20180301.tar.xz 301516 BLAKE2B 6b768e316de6d9b724cdca5beef1ec14e3482aaf1aa34abc138861782266eac32565cdf7713cc65d3863fb1b3463a21446165ecc7df4f39c4fed168d8efdd3df SHA512 10b6a59367a9d5127116a81ae46c4c0f10dd4cecd60ff78b2dfeb2a304c7a34112df2355b9f939558c8e27d0e255e2df6277da9cc558d4368bcbe4d7130d5326 EBUILD hxtools-20121125-r1.ebuild 565 BLAKE2B 62d9727f59390c97157e8685cd9be53d1883d52739bdd76a5c171fe4c3c7af3ffdef772700ec45922cc10f1b9b5d8d1eb3cfd658eaca84ea679afe484f25789b SHA512 4f886b9deb4741ce55c83ebeadadf0225444f8809fb3d07ede72e9125d4e840506a0798cce98e8bf1cad55f68673c8a8cbd57da868c71f871706b22847683f91 +EBUILD hxtools-20180301.ebuild 802 BLAKE2B a35cb67d8dacdb559df4dafed8ce2ebfa2482030fe5e513a0802ccec0b0192d92bda8a09dc0ecf7dbce5dee39463a92667fa67183a773f0572ffc9f16d4746a9 SHA512 d86fd5d656bf6646c2469f2d83c39370943dba1bced7ecabaa5629be4a0ce4a6b8c6a0958af2480543b00b18d9237c42d3106ed76e2a607e92afffecefdc4029 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be diff --git a/dev-util/hxtools/hxtools-20180301.ebuild b/dev-util/hxtools/hxtools-20180301.ebuild new file mode 100644 index 000000000000..38fb9a949d55 --- /dev/null +++ b/dev-util/hxtools/hxtools-20180301.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="A collection of tools and scripts" +HOMEPAGE="http://inai.de/projects/hxtools/" +SRC_URI="http://jftp.inai.de/${PN}/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +RDEPEND=" + dev-lang/perl + >=sys-apps/util-linux-2.19 + sys-libs/libcap + >=sys-libs/libhx-3.12.1 + >=sys-apps/pciutils-3 + x11-libs/libxcb:0= +" +DEPEND="${RDEPEND}" + +src_install() { + default + + # man2html is provided by man + rm -rf "${ED}"/usr/bin/man2html + rm -rf "${ED}"/usr/share/man/man1/man2html* + + # Don't collide with dev-util/cwdiff + mv "${ED}"/usr/bin/cwdiff "${ED}"/usr/bin/cwdiff.hx || die + mv "${ED}"/usr/share/man/man1/cwdiff.1 "${ED}"/usr/share/man/man1/cwdiff.hx.1 || die +} diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest index b5df9ccd132d..ea76929e24e5 100644 --- a/dev-util/meson/Manifest +++ b/dev-util/meson/Manifest @@ -1,6 +1,6 @@ DIST meson-0.44.1.tar.gz 1136337 BLAKE2B 7391776d2f480f43c6cf0bfae3665c16a61c4a28fc4310dc8659ab4165ef76ad1729a9daf645330ea213aeb59e5ba9d991d021d1ad620f6673cebfd64b085d93 SHA512 3c350d1752ae4463ec47060e051d79cc0855385e9552deff34fad8431175fb5d0f04b51a242f8f8f737726d06e504339d6b02a5aa9558ee673fb867dbb4e5b2d DIST meson-0.45.1.tar.gz 1163287 BLAKE2B 820ab763193322c75ebf3a79cd38f49f9fa06f9645f382961eddab9bb088263f5ecc603d3ba6db9e038db1ea150d6897dc202bad24ff985ab1ef2dea3f08b724 SHA512 704731aae28ba5fe4c2040464d42489cfc1946c95c39e28eef170ba5ab929b8672c782ed18798528b59aeb38abd23e4930f38e38f1e8c45f1ccf96071b097731 EBUILD meson-0.44.1.ebuild 923 BLAKE2B bd78fd51af575678067d4fad1c4c240fb4582607ad1dd0eb9bc2c114ac61942956bc93b2b419bbf95edc0c6c7ba4326833aa01a39036a67bf0ff504e4b9054a5 SHA512 3b69e8a6d79476bc93185865c6795b239eb8c4b91d6aab48b8fe6dfb14288e7c53b59ec2418795270f1901debe0ebdcf1167e5817bffb37b62cb6f270df9a4a9 -EBUILD meson-0.45.1.ebuild 920 BLAKE2B 450e88f485be98d7a0939de1b0c35f95cc1a173002d891f4fa24a3eff3dc3c919bc1b80808dd375c7fd9d5cd8f28ae41cdcef62290144f6397a891bfe276c38a SHA512 59436c1ff03915271474cb55369128a534c730a6c400af975f5c8c101c128e3c12cf94e028942404cf19c8468e3c23a2baaf779e198f04d24d365a9cb84a3a4d +EBUILD meson-0.45.1.ebuild 919 BLAKE2B 2e740208444aec17853970d422188c0b59d4d000e1f4b78dfb27675d0cec3d5cb1d57f4c609cec09b5faab40af47dc315273380dc423fb4e16328f8b4d78fe16 SHA512 ae6275c59d93afc0c5dc36705c4b8d7e5115ce010840471e8fd1e7b31cd3c1c54129a99c24bef3034a83f0ebaa63ea0bbc526ff1fa36b14f8f1672ccb1216b64 EBUILD meson-9999.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467 diff --git a/dev-util/meson/meson-0.45.1.ebuild b/dev-util/meson/meson-0.45.1.ebuild index d6860a61dcad..9a6d59e8de20 100644 --- a/dev-util/meson/meson-0.45.1.ebuild +++ b/dev-util/meson/meson-0.45.1.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 else SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris" fi inherit distutils-r1 diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest index 4191f0f3f13c..2549bba9cc3b 100644 --- a/dev-util/re2c/Manifest +++ b/dev-util/re2c/Manifest @@ -4,7 +4,7 @@ DIST re2c-1.0.1.tar.gz 5758988 BLAKE2B e02d8ce5f82441d33ec055d582e797d33a4b1a524 DIST re2c-1.0.2.tar.gz 5805526 BLAKE2B 931e7b00f57cf8c3e49e540496906208e5a5b73f87427c095e9f5744594007b5d536bf8a2920c3fb509f57bc0ba608ca80a6780ae8af033fdfe7bb3c26292007 SHA512 9d85933ae874cb9240175ce7210d3808173bafe246c67b9c333578846239b7bcef074287f26040b5a048bcd98db8d0393035c417918b80db1f74098695a77176 DIST re2c-1.0.3.tar.gz 5806555 BLAKE2B 98664998a52e9f3198ac6d19e8c8af8db716414e42aa89b05750cb8a2054d53d0b13fa499ca004eecc294cef2756554c3e08c8167055d38d266be86f0684b83d SHA512 7b2a43828da872a957af88fb0a226e1936a45c8a1020ba1f6544b588aaa61dff8df40e84f9053c30ac8e17c41164e70627d57f5d3721a34b2aba7b1dbf25b6ae EBUILD re2c-0.13.5-r1.ebuild 712 BLAKE2B 7dccc9fa372c83c421eb1ee12ceeac59765c37d8f8df2ee8d1a81671e4a2d05739863f5f9c32e42f61912b5cdcbfb17f29c0b3dcb3d667c2815c0dcec3b3b353 SHA512 446a7fe4ff39783c7172ae3110200e896955cf36bb2fa26133a671adc6394ca4efb92f012b074e3cf2dd392d27b4ee6bfbf43a86755b4b6edebb8fe77e395f86 -EBUILD re2c-0.16.ebuild 755 BLAKE2B 7c7cacf4824b4a9d880298bbb2d1c40810500ea9203db157830652b7b598a68ae4c5bc685899bbbc9937f9ee8bc550d07c93755ff2064927f8475dbc4d14dee5 SHA512 8bd63d72cb9bd092ce626def2946ee5167d98c91ced9497f8fa895115c868fb199b2afe4173fd0f5fa14f0aacd763170f72817e4cf2444a2bebbccf307a45653 +EBUILD re2c-0.16.ebuild 754 BLAKE2B 28913bde66f2630596b289eab49f003eb727f7beb56e45cdbea3ee664b210f0df9aeeda19119d6bd6155e6488fb4dab84e120cd56038dbcf57753169c9bd7950 SHA512 a869252b8c140ead837f6c3eb2fd6b46ef199480ed2e67acf684b9bc1d5fb858e2bed875d8d6eee7b246c3f0e73fa5522a53b11983af98b374b31cc55c8d539b EBUILD re2c-1.0.1.ebuild 763 BLAKE2B 590b767074a8478ef7f3bd01f2c050ce868ff2b4795f2ff3762b917d45d6976ff29ebbd7da914d76e6ba56cb3e70e352f53b48ef4374743e8ec482fdba24b786 SHA512 ded3ef724bc5624a00994a80739483e7a21278bb45f7d54001e060b71d591c44cca59e7202e1af5f36ec84b39003c97f7f9161d735a8ba67925d29bdb65253a7 EBUILD re2c-1.0.2.ebuild 769 BLAKE2B 90d97ac18d6faf57040988b9aa1f5fd50c726359012a1d3f6f16155cb29c2ea3202aad01ad7f9fdd5c0e97b9d956ef998549f1e86ce84636993825b22b48593d SHA512 2845c30b034de806ec2339ad15e9a966349006db475d614c0399988cc1f6fee866f37e6d5c671d73414c11a14c28b7e56645b8cdebf1f785f47c15c5ca225d86 EBUILD re2c-1.0.3.ebuild 782 BLAKE2B b20b14e780a6bdf3f9a09d7b21f67b9d797d403d176b5b25bab866600614a7e0bccc5ce043acee34ca3db5a32f32f47240750c3c91d8c0ea1b00ef48a67affd7 SHA512 829c3ff138da03fd1867869509533a24b964add4594c6115b2df2a042825ac164a3117afff3f2b03f34fa6c10df0e4db42d07ceca52e6489598f2a009dc61bc3 diff --git a/dev-util/re2c/re2c-0.16.ebuild b/dev-util/re2c/re2c-0.16.ebuild index 958239c76220..072d58199292 100644 --- a/dev-util/re2c/re2c-0.16.ebuild +++ b/dev-util/re2c/re2c-0.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" src_prepare() { epatch_user diff --git a/dev-util/shadowman/Manifest b/dev-util/shadowman/Manifest index f9f267b34440..7c6c1f617ee8 100644 --- a/dev-util/shadowman/Manifest +++ b/dev-util/shadowman/Manifest @@ -1,4 +1,4 @@ DIST shadowman-2.tar.gz 3349 BLAKE2B 2881c0487205c00114967be7600ef5483cc64c7ad5ed5cac60fe8bf2ca17e5b06d5df6e39148d90ff68a51d3e918ca616d0c5eedf11366df90c788a07e4c63b0 SHA512 eeb10248c7f76116352bffa671ab7c761b2f79cb943de20dba327b0d7bf1126d15021508c9e9389b9f0c37cf5049ad2c67bad93f6a03340fcfd27e03c4969110 -EBUILD shadowman-2.ebuild 668 BLAKE2B b348f2ed8cdd149c89bcfce0c1f35f0562e9c9f45b8e3b98748f2268153681f23ec1480211c2e4fe38a1cf5eff7fe1624c56c30ad6c53ecbe4e658e1f1cc50a8 SHA512 9c41aee8719895352d8fda2f3960ba7a017ead1c3c764aa83a7e929f811f4063315d20e47c4a96042066b8eadb3b6e1ff486128351beb623b3dabebf09b97a96 +EBUILD shadowman-2.ebuild 675 BLAKE2B d48c7a16e948dffd1a964b4428b15ff52fa4a4776092224cd77cd04db31a2d571a94ee040c33de95dc3d0be75099da14e09223173957512daa6edd3a392e79e9 SHA512 b296f57688049e724689bea403cdded0127659e4e2e190bf42c55c3cac32718e4e078572eb210c2a45f8dc6189937cf3d3f5c25af08080610998ffed5c09eeac EBUILD shadowman-9999.ebuild 568 BLAKE2B 199779d69123dae88d3024a00370b24a898f40ce7aca43257e0dfd3a9747f5b969133cffce9aa70ff1fa0555a18442e4170829df7d27d397ea10b96136a76524 SHA512 4325db35429e59387690b10c09e86268e79e3a4a5e968075f36155fbcd5af7e0ec0a79b6a08b6e9e74ea5cad6727be0697abebcc63ba48c7449cd54141edd794 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282 diff --git a/dev-util/shadowman/shadowman-2.ebuild b/dev-util/shadowman/shadowman-2.ebuild index 171a2f58db5f..947e12897c11 100644 --- a/dev-util/shadowman/shadowman-2.ebuild +++ b/dev-util/shadowman/shadowman-2.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" IUSE="" RDEPEND="app-admin/eselect" diff --git a/dev-util/spec-cleaner/Manifest b/dev-util/spec-cleaner/Manifest index 1b08af325847..0999bc2dec61 100644 --- a/dev-util/spec-cleaner/Manifest +++ b/dev-util/spec-cleaner/Manifest @@ -1,4 +1,5 @@ -DIST spec-cleaner-0.8.9.tar.gz 100949 BLAKE2B da95f336d05677350018c4e48c61023b35b8b97d731a08fe90ae147b32c374cf55a904e1f0559cc7c42b50acfe3b7a8c5b4cf25e596dce387b58417657fab8c5 SHA512 9e89c2760b429baa38be2ce2149fbd323b38a4c6159421192b07e612e359666810dc6077b2befd8a6d91b03aabc78bd4f81bb0e5cf5b4a274061b0aae0ab66f8 -EBUILD spec-cleaner-0.8.9.ebuild 878 BLAKE2B 609953e91f2aafa9071ed914ff9d442836aa2fdc32aeb0306f05f219ad45178381f1b6579045e542222ba64ba6c3ac5dcc9971c3623f41f6a09bea6ebce244b9 SHA512 18f047622b1b235f424b24e98809697e96d9217df6c1a29010ed23c4a031d17ad7b7fdd7d4b4c5e18f9f40e7cd0d5870e2058669f5d72fac89a1746350c8ca87 -EBUILD spec-cleaner-9999.ebuild 878 BLAKE2B 609953e91f2aafa9071ed914ff9d442836aa2fdc32aeb0306f05f219ad45178381f1b6579045e542222ba64ba6c3ac5dcc9971c3623f41f6a09bea6ebce244b9 SHA512 18f047622b1b235f424b24e98809697e96d9217df6c1a29010ed23c4a031d17ad7b7fdd7d4b4c5e18f9f40e7cd0d5870e2058669f5d72fac89a1746350c8ca87 -MISC metadata.xml 225 BLAKE2B 827d485e6a34bee26949a1779a852bbb87ea60d437e2345921bbc01a4f9d5e7e29b63ad56d7ade75954faa8feba95e129054b33b2dc2c6ed6fdd0245efe6ce3a SHA512 b2a0be2871dbfe8122f8868dfbee024f38fd9e3d1652909ad4c3f270623f8be84cd4605200792af0c412bda171ca20c4132d6228cad28a4eaeec615f8df8ae61 +AUX spec-cleaner-1.0.6-pytest-runner.patch 348 BLAKE2B 4bdb0a4db5eb581f826f14452c980381756945985e9d45c09f2e7b16fb7f2367e7781d8a1b7b69f02e2c33cb1527fbcd437462cfed9061ca9ed4edfe4a439b9a SHA512 d971124da1dc1b8c93a359bd139bb6fa9226b383d0261a18f2f821a857872b6fc501649f66f5ad754c17e0f86c14c43eba59f25b9f99e804f76ccdcb973bb0ca +DIST spec-cleaner-1.0.6.tar.gz 450602 BLAKE2B acd298421f2c119e24dc52cf63e149194d5baa1282f9aef902e2ccaf51de040f5817641b4077f209656f715ea6ceb19bf55b8661c32cd24f461c58f9126d9e19 SHA512 a27b5dc7fdb02ca5c632faa5b6a2b71d6db3e9f97950f20c15b14584fa240ff7b69dc981ca67f4fcb6af207dff28a8267447ad0eb918e06ce2294436892e0eef +EBUILD spec-cleaner-1.0.6.ebuild 977 BLAKE2B ea12ef15c6134849b9bffb8b970a343d4326db4a7b07f2b8c13692d9c842b717392141cd52f7d5936e94f8d8dc85087c0f357d6ecdf8cbc77a583a8386164c4c SHA512 50bc9535c4b3cc1a328b7fc4ce3c050efe0985af9325cd947a72616e77d9df9b98c80f700579bfe24bb32d3cbab935e42e2d0d62e5ee0151e4ff8a7260069e42 +EBUILD spec-cleaner-9999.ebuild 977 BLAKE2B ea12ef15c6134849b9bffb8b970a343d4326db4a7b07f2b8c13692d9c842b717392141cd52f7d5936e94f8d8dc85087c0f357d6ecdf8cbc77a583a8386164c4c SHA512 50bc9535c4b3cc1a328b7fc4ce3c050efe0985af9325cd947a72616e77d9df9b98c80f700579bfe24bb32d3cbab935e42e2d0d62e5ee0151e4ff8a7260069e42 +MISC metadata.xml 450 BLAKE2B b091afea0453f996442347131d337d2cb516a4a5e08a98e0b0ab4a6f2cdd19f7d4d284f02a9fecf35590998fd3143b9151c3cd6632c0bd7148374d307b0a28c0 SHA512 6f10ea61bcc2e9982fb7e1383959f36c77d881a495a9251819b47d168114272c5f26b7e5bcc80657f5d8a79ec18e0a1e7c54201fa6c773bc64d3ceff2a1ddc3c diff --git a/dev-util/spec-cleaner/files/spec-cleaner-1.0.6-pytest-runner.patch b/dev-util/spec-cleaner/files/spec-cleaner-1.0.6-pytest-runner.patch new file mode 100644 index 000000000000..b280cce28bf4 --- /dev/null +++ b/dev-util/spec-cleaner/files/spec-cleaner-1.0.6-pytest-runner.patch @@ -0,0 +1,11 @@ +--- a/setup.py 2018-03-19 15:23:46.128000000 +0000 ++++ b/setup.py 2018-03-19 15:24:26.920000000 +0000 +@@ -43,7 +43,6 @@ + platforms=['Linux'], + keywords=['SUSE', 'RPM', '.spec', 'cleaner'], + +- setup_requires=['pytest-runner'], +- tests_require=['pytest', 'pytest-cov'], ++ tests_require=['pytest'], + + packages=['spec_cleaner'], diff --git a/dev-util/spec-cleaner/metadata.xml b/dev-util/spec-cleaner/metadata.xml index 1f5d6f413c44..209ca060ffe3 100644 --- a/dev-util/spec-cleaner/metadata.xml +++ b/dev-util/spec-cleaner/metadata.xml @@ -1,6 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person"> + <email>jubalh@iodoru.org</email> + <name>Michael Vetter</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="github">openSUSE/spec-cleaner</remote-id> </upstream> diff --git a/dev-util/spec-cleaner/spec-cleaner-0.8.9.ebuild b/dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild index 61a6579ab757..297d0528ae6b 100644 --- a/dev-util/spec-cleaner/spec-cleaner-0.8.9.ebuild +++ b/dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +PYTHON_COMPAT=( python{3_4,3_5} ) EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git" inherit distutils-r1 [[ ${PV} == 9999 ]] && inherit git-r3 @@ -14,20 +14,25 @@ HOMEPAGE="https://github.com/openSUSE/spec-cleaner" LICENSE="BSD" SLOT="0" -[[ ${PV} != 9999 ]] && \ +[[ ${PV} != 9999 ]] && KEYWORDS="~amd64 ~x86" IUSE="test" DEPEND=" test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] ) " RDEPEND=" ${PYTHON_DEPS} + >=app-arch/rpm-4.11.0.1 " +PATCHES=( + # pytest-runner is only needed in test scenario + "${FILESDIR}/${PN}-1.0.6-pytest-runner.patch" +) + [[ ${PV} != 9999 ]] && S="${WORKDIR}/${PN}-${P}" src_prepare() { @@ -39,5 +44,5 @@ src_prepare() { } python_test() { - nosetests + esetup.py test } diff --git a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild index 61a6579ab757..297d0528ae6b 100644 --- a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild +++ b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +PYTHON_COMPAT=( python{3_4,3_5} ) EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git" inherit distutils-r1 [[ ${PV} == 9999 ]] && inherit git-r3 @@ -14,20 +14,25 @@ HOMEPAGE="https://github.com/openSUSE/spec-cleaner" LICENSE="BSD" SLOT="0" -[[ ${PV} != 9999 ]] && \ +[[ ${PV} != 9999 ]] && KEYWORDS="~amd64 ~x86" IUSE="test" DEPEND=" test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] ) " RDEPEND=" ${PYTHON_DEPS} + >=app-arch/rpm-4.11.0.1 " +PATCHES=( + # pytest-runner is only needed in test scenario + "${FILESDIR}/${PN}-1.0.6-pytest-runner.patch" +) + [[ ${PV} != 9999 ]] && S="${WORKDIR}/${PN}-${P}" src_prepare() { @@ -39,5 +44,5 @@ src_prepare() { } python_test() { - nosetests + esetup.py test } diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest index 54c72501add1..cb00ec01168d 100644 --- a/dev-util/valgrind/Manifest +++ b/dev-util/valgrind/Manifest @@ -6,7 +6,7 @@ DIST valgrind-3.12.0.tar.bz2 12788556 BLAKE2B aeebf9c29afb3cce683c6448a3dec8f4ed DIST valgrind-3.13.0.tar.bz2 14723076 BLAKE2B cdf92087575cc851d316e2136081441f528596048bc5d1e9c17539283085dd9accd0c1b3136f9768a62de27d1f1641b450305681a33d9ba9fdfe028a73c0cb99 SHA512 34e1013cd3815d30a459b86220e871bb0a6209cc9e87af968f347083693779f022e986f211bdf1a5184ad7370cde12ff2cfca8099967ff94732970bd04a97009 EBUILD valgrind-3.12.0.ebuild 2854 BLAKE2B 07c651acb3854432137f09513f991cb549b6192a704a26ed9626816f8650acfca0179c7064e772e59058a7657b1c0407a87753ec30b2209cf47aa04d68d908ca SHA512 a65f3ccca3a33e2bbae7d2616b2fa13a6a3913e927f601f8ef52172981f72c03219ccad126a801719688cb6106dea18c56ac0e14de194e065bffa744151ab457 EBUILD valgrind-3.13.0-r1.ebuild 3428 BLAKE2B 96f18609fe79c997b4d344ecf59be9356aafd5ed7bc4e03b028f06e3e938ee1f00440289f7918ab935ccc42fa2bea2d316bb1d96c43ef40a85374b12e0b5683c SHA512 aa0fe6e76e52d25c6b05a30c46de96aabf539f7166bd369b21b93522d52e01d9fc50c77769170021038b0ec60911cd07bf5afccca86e35ad49828e401ed4d61e -EBUILD valgrind-3.13.0-r2.ebuild 3475 BLAKE2B da04e4c84813d8775ae853024231b92ce3bb79db45118d32fb9e343fa32dcebf42d50f024faf938bdf8c0ff239e66aa2003fb8f72b0a60307fbc8db2ea1a46d8 SHA512 1ea3b52700f077c2eef7d5d5f79ea47c8f6cc7d41b6a3ec803cb0034dabb0beea77cf5c601c3eccf65e30838febe9feec271504dc2152c1c7452f73f0746811e +EBUILD valgrind-3.13.0-r2.ebuild 3879 BLAKE2B 03709383d7167d639ec5f3d461b0990c1d240a5260f5f4533a7dc79ca3b789ae9cfb7f749a11be2dfb410cadf7364ffd13515c63ee3673fee3fcb4d07b8a4b25 SHA512 c2f81be414f2d5d2853350b1e1652f5cc03578962d3a8ed5a31462defe970b1a5b7f4820f02fb76e4a7494ec5377af35149c0c22c9378619e2705247f490268b EBUILD valgrind-3.13.0.ebuild 2854 BLAKE2B 8228042c5f24ce771f07f3b44c94a26dec805e7ce03ecd545a7b7caee1c3a41f93deeed2b298a99b9560614e64b54961e4df3c8d902984b34ed0b2e005568107 SHA512 771bf52c0436aa15175df29d10e3f191e5e9511a50dd466ef6a102c7b13d677ad84adf387b7edb99b6cdce1f38f644adbdc3a40bdaacabb22168f2aa07302fcc -EBUILD valgrind-9999.ebuild 3284 BLAKE2B c033cc3d26adfdb05375ca7713ad2487a5db84153649e85d2ad445e0c884ecb44952d9c3a36810403f9293936a8307221033b938d02ac706a156b923b6e5969b SHA512 5b8f4e022237703cf9f93c2c9e2e6af366890ac4ccf737af6b1dc9bd1a4949392c7e25b37dfbe41e8dabf04efe9a80bd90114cc90138662042247780e773e705 +EBUILD valgrind-9999.ebuild 3675 BLAKE2B 4405fa37a59f844c3ab8f5ca933408834a7986b4534542f7276214ed9616912f9df22b62f3bd2dcaa8693acaf0c19f09489d67ea8825bc8d2ee6e5d387aca10b SHA512 408fb2dd9e8676dcf117298f03dcedd5dd54f8eb33d75c04f6f890817a82a9035b7387d4a075ef7bebc52c2008ae99c7831eb0e9e7553eae449ccc3f6160a3fa MISC metadata.xml 1139 BLAKE2B fef548fc43861a5c031c4db6fcd5a446cb3a33b030916a118de1d99e78fc893991cd20f06d545d7731668e4ad859ded8e8b980e35e383ba27ecb96b704757a95 SHA512 f3ee37b8e5f408c01d5f6308644305fcb945df008e5f708dbde95f73a1e7988f53799e28bd72f75bd5e01765414a0e11b8045f671e723beb46d90a50f5dd1846 diff --git a/dev-util/valgrind/valgrind-3.13.0-r2.ebuild b/dev-util/valgrind/valgrind-3.13.0-r2.ebuild index f509e509703b..0ef938d860fd 100644 --- a/dev-util/valgrind/valgrind-3.13.0-r2.ebuild +++ b/dev-util/valgrind/valgrind-3.13.0-r2.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2" - KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" + KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris" fi DEPEND="mpi? ( virtual/mpi )" @@ -37,6 +37,15 @@ src_prepare() { # Fix --xml-socket command line option (qt-creator), bug #641790 eapply "${FILESDIR}"/${P}-xml-socket.patch + if [[ ${CHOST} == *-solaris* ]] ; then + # upstream doesn't support this, but we don't build with + # Sun/Oracle ld, we have a GNU toolchain, so get some things + # working the Linux/GNU way + find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \ + sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die + cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in + fi + # Allow users to test their own patches eapply_user diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild index 2b96d5f5150c..b7152e95dc5e 100644 --- a/dev-util/valgrind/valgrind-9999.ebuild +++ b/dev-util/valgrind/valgrind-9999.ebuild @@ -31,6 +31,15 @@ src_prepare() { # Respect CFLAGS, LDFLAGS eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch + if [[ ${CHOST} == *-solaris* ]] ; then + # upstream doesn't support this, but we don't build with + # Sun/Oracle ld, we have a GNU toolchain, so get some things + # working the Linux/GNU way + find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \ + sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die + cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in + fi + # Allow users to test their own patches eapply_user |