[gentoo-commits] dev/graaff:master commit in: dev-python/django-multiselectfield/
commit: d9ce6ab6be8c9caef6ba1ed985a9ebc67124ec8e Author: Hans de Graaff degraaff org> AuthorDate: Fri Nov 20 14:03:57 2015 + Commit: Hans de Graaff gentoo org> CommitDate: Fri Nov 20 14:03:57 2015 + URL:https://gitweb.gentoo.org/dev/graaff.git/commit/?id=d9ce6ab6 dev-python/django-multiselectfield: remove erroneous blocker Package-Manager: portage-2.2.20.1 dev-python/django-multiselectfield/django-multiselectfield-0.1.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/django-multiselectfield/django-multiselectfield-0.1.3.ebuild b/dev-python/django-multiselectfield/django-multiselectfield-0.1.3.ebuild index d49c6ae..aa0125a 100644 --- a/dev-python/django-multiselectfield/django-multiselectfield-0.1.3.ebuild +++ b/dev-python/django-multiselectfield/django-multiselectfield-0.1.3.ebuild @@ -17,7 +17,7 @@ LICENSE="BSD" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="test"
[gentoo-commits] repo/gentoo:master commit in: dev-python/numba/
commit: a5f7c6bd2f060ee7b5852da133ff3ad7f82d296e Author: Benda Xu gentoo org> AuthorDate: Fri Nov 20 14:11:18 2015 + Commit: Benda XU gentoo org> CommitDate: Fri Nov 20 14:11:18 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f7c6bd dev-python/numba: bump to 0.22.1. Package-Manager: portage-2.2.25 dev-python/numba/Manifest| 1 + dev-python/numba/numba-0.22.1.ebuild | 68 2 files changed, 69 insertions(+) diff --git a/dev-python/numba/Manifest b/dev-python/numba/Manifest index 068ecdd..e8ac3a4 100644 --- a/dev-python/numba/Manifest +++ b/dev-python/numba/Manifest @@ -1,3 +1,4 @@ DIST numba-0.18.2.tar.gz 786935 SHA256 5988621a8dd3609d252435c8e280bf01e2f25d9eb63bb8ae49487fe013235a7f SHA512 03d0511df1a5e98f4166a1febc51b6bc4dbf4ca8b432c315a93c8a5c762f6d0ac830fd264c4b42cdb52f262a24c6777885ab6e61e08605f30c4bb830850d WHIRLPOOL d62e5e14191146d301fd5475023d0e711e1a014f52c8d2d4661529adb6190006c37259e9a45a8336e5e4cbf8d60fa8a69babce6e0cf01a297ef43d1e7f563cf7 DIST numba-0.19.2.tar.gz 871394 SHA256 10bdd84a3a8dfb9b195ad7d3b11c1f52693833820268c64837dc8510e66f1e2e SHA512 9eca230b5d69890680278248365e748b2e8a7e040703e80acaed2c0e1dc3576e102bde3809eceb6e600d90e02685e66419ca3423d332620c034fe9c07995aa67 WHIRLPOOL bfba05b56ff9fa9708b67dad1f514bc35c72ac3bf76e349f2ec20c63f7cb9c1664b106898559220e796ae9cafc7a48dbb5e6e537720d6cd4f6b5ccde4903dc67 DIST numba-0.20.0.tar.gz 895183 SHA256 62dd4eebbd8fef27a8a60b74de2f540b12223939e197877babb13bf06eba5d9f SHA512 d511ed382813471dd2b9f6d99ee7cae4b77375a3c003df44ec2954b0f16c32b0fec76b3c33df46c821f17a4d148afab6c4b2d43429548a5bc81efbebc4fb54e3 WHIRLPOOL 8345bed1965715aace541bfcde33f4a999241fac8f655d80d1bb67db5ae806924fec47e3895b2a61484474fef2d4362d15800aa5be8b1c8f1922eaeb06d432ce +DIST numba-0.22.1.tar.gz 1101843 SHA256 2b0c95cf9c4f6390b1ff0a238499ee4cc32b3695728293e1d888cd3c15803633 SHA512 0514a04e83f800ba4dba97e5b220fd5d530e923e91769881f9df320a0eedcfb1e652fc87a1cda2d80223e38a25f85387a1930259179996bab7b7a731b86864c0 WHIRLPOOL dd554a15ea3783bfe335ed08b538eed6ec7071986ef4ad63e76e51c3d06783b38dccd0fb5b01b720eab130dbb20d8a2fe8cefd4124a6f57aeb10e74c228fad16 diff --git a/dev-python/numba/numba-0.22.1.ebuild b/dev-python/numba/numba-0.22.1.ebuild new file mode 100644 index 000..cbd0b42 --- /dev/null +++ b/dev-python/numba/numba-0.22.1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit distutils-r1 + +DESCRIPTION="NumPy aware dynamic Python compiler using LLVM" +HOMEPAGE="http://numba.pydata.org/; +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples test" + +RDEPEND=" + dev-python/llvmlite[${PYTHON_USEDEP}] + >=dev-python/numpy-1.6[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3}) + virtual/python-funcsigs[${PYTHON_USEDEP}]" +DEPEND="test? ( ${RDEPEND} ) + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" + +# test phase is pointless since it errors in circa 60% of 1984 tests +RESTRICT="test" + +# Delete intersphinx & entry to set sphinxjp.themecore, which is absent from portage, from conf.py +PATCHES=( "${FILESDIR}"/${PN}-0.19.2-docbuild.patch ) + +python_prepare_all() { + # Re-set them of doc build to one provided by sphinx + if has_version ">=dev-python/sphinx-1.3.1"; then + sed -e 's:basicstrap:classic:' -i docs/source/conf.py || die + else + sed -e 's:basicstrap:default:' -i docs/source/conf.py || die + fi + distutils-r1_python_prepare_all +} + +python_compile() { + if ! python_is_python3; then + local CFLAGS="${CFLAGS} -fno-strict-aliasing" + export CFLAGS + fi + distutils-r1_python_compile +} + +python_compile_all() { + use doc && emake -C docs/ html +} + +python_test() { + cd "${BUILD_DIR}"/lib* || die + ${PYTHON} -c "import numba; numba.test()" || die +} + +python_install_all() { + # doc needs obsolete sphinxjp package +# use doc && dodoc docs/Numba.pdf + use examples && local EXAMPLES=( examples/. ) + use doc && local HTML_DOCS=( docs/_build/html/. ) + + distutils-r1_python_install_all +}
[gentoo-commits] repo/gentoo:master commit in: dev-python/llvmlite/
commit: b61f8364c2fcc529bd406dd6519b54547562af89 Author: Benda Xu gentoo org> AuthorDate: Fri Nov 20 13:51:55 2015 + Commit: Benda XU gentoo org> CommitDate: Fri Nov 20 13:51:55 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b61f8364 dev-python/llvmlite: bump to 0.8.0. Package-Manager: portage-2.2.22 dev-python/llvmlite/Manifest | 1 + dev-python/llvmlite/llvmlite-0.8.0.ebuild | 39 +++ 2 files changed, 40 insertions(+) diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest index cb671e0..dfb2680 100644 --- a/dev-python/llvmlite/Manifest +++ b/dev-python/llvmlite/Manifest @@ -2,3 +2,4 @@ DIST llvmlite-0.2.1.tar.gz 67340 SHA256 48c9217db60d496ffef9d15bcb493b84757fc08b DIST llvmlite-0.2.2.tar.gz 75171 SHA256 5771189d07da7774446e1ac6c586d31ea4293ef1c2bfb9dbe0c570bcf971b4a1 SHA512 7eeea5c0bd5287415d6cc39fb2e546366de42d3b2b99cf57655036c9fd2bf526398cc51ea79d062504cdfdd927ce5be22997a54c5d79cc2e4de3168317f35fcf WHIRLPOOL aac97a187e341a67a5ee1771480deb6598d921cfce098aec6ca20927d6173c1f984de0b8e1985e2c7db55e393e65f4bd471c5d57bb8fd0da21cb2ad4faf0a3dc DIST llvmlite-0.5.0.tar.gz 74434 SHA256 616b0f16366dd1eec197b7067f4618c6c5183db852e7f4203862c0343ebdd31c SHA512 aec69c841a8166896a6632a4204a53df1f19a42514c335a3dc21a9c7e7610c110a5d00b293d7013dfe497cc7c1e3ffbaedf0a80ee16970f5f33f0043bacd6aec WHIRLPOOL 737a53017e160a04f371e87abf24eb923f17b101d3b2394c276ae0d47787c617aa496428b268ee86301a2ed33a0a93b0b5d3fbc0fb293e295d38742d8a5b98e8 DIST llvmlite-0.6.0.tar.gz 74834 SHA256 0ed6bbf850578dc99c06be3060a1067ea4993474392137760d1c020f7188a236 SHA512 7db3f774d7cff903e4a5a476eee3efd1c6f107443433ab47543eae4e28918a385534225a23e0cd000cfab65b5ebeb0a5c38d6b963090ee0943c65fb61879fc7b WHIRLPOOL 3bed14fef8defac3f217b9ecdb5a2b4d1c68cd9e19078292cc792f375345a87b4daf63ee9c6429954d5156e7c73b5ea85b3bff54c60f78fbc982067411f2eb40 +DIST llvmlite-0.8.0.tar.gz 80497 SHA256 a10d8d5e597c6a54ec418baddd31a51a0b7937a895d75b240d890aead946081c SHA512 d960dd2635d670b3ed2a79f81e5c3ada4fe0a03ac39e8f94a16a83fb62013ecbbce1a430ac48c8e6abd8fa34c37938d4ec7a0b949bd8c490f391c8dc29ce221c WHIRLPOOL 569cf60ae6b6efe63aa1af322d53cb983a4d29550557ba465ff26dbcc49bab598365cc592931cabca5f2e99b979ebb4f101d698a1c457a1ef1fa11eb89184c31 diff --git a/dev-python/llvmlite/llvmlite-0.8.0.ebuild b/dev-python/llvmlite/llvmlite-0.8.0.ebuild new file mode 100644 index 000..6e422ed --- /dev/null +++ b/dev-python/llvmlite/llvmlite-0.8.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit distutils-r1 + +DESCRIPTION="Python wrapper around the llvm C++ library" +HOMEPAGE="https://pypi.python.org/pypi/llvmlite; +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples" + +RDEPEND=" + =sys-devel/llvm-3.6*:=[multitarget] + $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3) + " +DEPEND="${RDEPEND}" + +python_prepare_all() { + # disable test using installed instance to read version info + sed -e 's:test_version:_&:' -i llvmlite/tests/test_binding.py || die + distutils-r1_python_prepare_all +} + +python_test() { + "${PYTHON}" -m "llvmlite.tests" || die "Tests failed under ${EPYTHON}" +} + +python_install_all() { + use examples && local EXAMPLES=( examples/. ) + distutils-r1_python_install_all +}
[gentoo-commits] repo/gentoo:master commit in: media-fonts/hack/
commit: 1243338e45bf4d344ffab84a6fc145de2cec20a7 Author: Guilherme Amadio gentoo org> AuthorDate: Fri Nov 20 09:24:30 2015 + Commit: Guilherme Amadio gentoo org> CommitDate: Fri Nov 20 09:24:38 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1243338e media-fonts/hack: version bump to 2.018 Package-Manager: portage-2.2.25 media-fonts/hack/Manifest | 1 + media-fonts/hack/hack-2.018.ebuild | 27 +++ 2 files changed, 28 insertions(+) diff --git a/media-fonts/hack/Manifest b/media-fonts/hack/Manifest index 5a77c5a..1ad61d9 100644 --- a/media-fonts/hack/Manifest +++ b/media-fonts/hack/Manifest @@ -1 +1,2 @@ DIST Hack-v2_010-otf.zip 450300 SHA256 de757b2dd1b6383505ff1e73845db482dccf7561a1133fe5e776e02f82bf5e9d SHA512 2aba7ce05a74c7c6ea2965c48491155790de4ba2a8865cb8297fdd40537108814e4b1c38654eb3eabd01d1acee6b12686a631f2a6bf27e8809b8c7192bc62c2a WHIRLPOOL 166343ed851780272b8da8c5f091a498a3afdf9c6d16fa325d3135fe8751fd679fa22449de9ef3a1696a9f4544e6647303f6d006aa593f5d3f563c03c3353c4d +DIST Hack-v2_018-otf.zip 466060 SHA256 43df71895cb8b5b0e14f2880a8ce2617064dcc36cf229e5682f1e06513a46046 SHA512 ca34994a0cbf5cb6be2b56c84a52b66b98d08f0d5ddcd2169a263b52fe33c323209f27dad3017c175ed3fdd321017bd43670f2dbedf8a4a927f7b4b4b7e056a5 WHIRLPOOL 18fc8fe050f3262f73fbee2827229456433ae1ee22abd0b2c5918e1cea9a679f1ef912af9bb373035ae3ac310ea73dc565dd094d4ca8b1b8dacba6ee279567df diff --git a/media-fonts/hack/hack-2.018.ebuild b/media-fonts/hack/hack-2.018.ebuild new file mode 100644 index 000..d8b0c68 --- /dev/null +++ b/media-fonts/hack/hack-2.018.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit font versionator + +DESCRIPTION="A typeface designed for source code" +HOMEPAGE="https://github.com/chrissimpkins/Hack; +SRC_URI="https://github.com/chrissimpkins/Hack/releases/download/v${PV}/Hack-v$(replace_version_separator 1 '_' )-otf.zip" + +LICENSE="OFL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +RESTRICT="binchecks strip" + +DEPEND="app-arch/unzip" +RDEPEND="" + +FONT_SUFFIX="otf" + +src_unpack() { + mkdir "${S}" && cd "${S}" + unpack ${A} +}
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: e330665f57d7ce6eb4567223602476ae94625e7d Author: Alexis Ballier gentoo org> AuthorDate: Fri Nov 20 10:16:13 2015 + Commit: Alexis Ballier gentoo org> CommitDate: Fri Nov 20 10:16:13 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e330665f Revert "media-video/ffmpeg: remove old" This reverts commit 5b2ceba09425a2abaf4a317c38fd2441ef73b272. media-video/ffmpeg/Manifest| 2 + media-video/ffmpeg/ffmpeg-2.7.2.ebuild | 450 media-video/ffmpeg/ffmpeg-2.8.1.ebuild | 455 + 3 files changed, 907 insertions(+) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index bab5030..8eb4930 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,3 +1,5 @@ DIST ffmpeg-2.6.3.tar.bz2 7803314 SHA256 59eb98c1b5896ac29abc0385f7c875d1b4942d695818818d418ee71eea1e0cfb SHA512 0998fa0cc2711b556fc28ce498e986f8f0b3ba7a30394c6b6cd494a542917eafb3d4d758f75e33fb39db4a631eca40515aa36c8b278fa3ffc9be006995d31029 WHIRLPOOL bfd074cf0b7a315d42c3559f4edeb46fc693918c9958e8e8b19d08f2e8c2765cf26f0ca9007d34a5dd07b69775cf06ab517c2a56926c46ade8bb7a782f492512 DIST ffmpeg-2.6.4.tar.bz2 7811925 SHA256 184f49e6b359426c398ad6c67d89abd362558373a43d3d92f86e554571655a5d SHA512 76c8bb3b23f2d2bac73b1561ef31bb3d1da49b2e182d84a13bf0bf49ea84cd0d64566c9dfafc4ac9d660aa4cecc0f08272b9ee284d1d09776e4599b87920c308 WHIRLPOOL 2d68715fb284979d703905919289c897c5cb002c3d466aca6c9759ca9f93443b749a24747cf218d005d728680ad137990880ec99210b6fb49038587966dd79f4 +DIST ffmpeg-2.7.2.tar.bz2 8157217 SHA256 7ceb7550ad628c526fa6c9ff23fdfb687a62f54d90c4a730998d8c2b417b9ef2 SHA512 cce58c63ae14dcbd3bdc4758af8427e18ac589f8bd4f2701e54b5e0e61669d5aab212e5829feb67a0fd33bc52b2d64adff93729c0696c44a0f6064a0752433dd WHIRLPOOL dd286393427b89be266ad2b122138dab578843d16bdf9b989b9546734f489c8c5c3d1ab0443ff5039b440a8430802ffe24f0fc38553688ec80984a1cce2ba2a3 +DIST ffmpeg-2.8.1.tar.bz2 8564488 SHA256 e2ed5ab28dee1af94336739173eb0019afc21a54e38a96f4e3208e94a07866e2 SHA512 5c493f1eb84dd916f12a709a77ca0317a03ce88caaa1ee5e06b4e03c60ef4520ba58c8972841de25dcadb0da42e88592e6a87c3aca18dba62e246256c33fcf91 WHIRLPOOL f0f26375960dff80055fe257b63f11a1cc598bef9450d0da4a619bfc61ba6df185ea0dcf9c566810c7917159bb193d30a1009051c5b32ea1d746b289c782b8aa DIST ffmpeg-2.8.2.tar.bz2 8573586 SHA256 830ec647f7ad774fc0caf17ba47774bf5dee7a89cbd65894f364a87ba3ad21b2 SHA512 15c1c09d7d4bb8cc7babff4c782e4bf6621ed86d6b02bffb5468bdcd294a1144bf56a8a758d2801200bb89c26ce8f5a086d818affb473364424f94f701cbf749 WHIRLPOOL 83ae9a00cba7bc906672f55d796b044d3f4baad9a56804f6482e7c27b9f526d1364dfddaa22ef32b921e5dcd0158222897935544a34c1d1e7c3b9d681067d2e0 diff --git a/media-video/ffmpeg/ffmpeg-2.7.2.ebuild b/media-video/ffmpeg/ffmpeg-2.7.2.ebuild new file mode 100644 index 000..83094e5 --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-2.7.2.ebuild @@ -0,0 +1,450 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +# Subslot: libavutil major.libavcodec major.libavformat major +# Since FFmpeg ships several libraries, subslot is kind of limited here. +# Most consumers will use those three libraries, if a "less used" library +# changes its soname, consumers will have to be rebuilt the old way +# (preserve-libs). +# If, for example, a package does not link to libavformat and only libavformat +# changes its ABI then this package will be rebuilt needlessly. Hence, such a +# package is free _not_ to := depend on FFmpeg but I would strongly encourage +# doing so since such a case is unlikely. +FFMPEG_SUBSLOT=54.56.56 + +SCM="" +if [ "${PV#}" != "${PV}" ] ; then + SCM="git-2" + EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git" +fi + +inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} + +DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec" +HOMEPAGE="http://ffmpeg.org/; +if [ "${PV#}" != "${PV}" ] ; then + SRC_URI="" +elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot + SRC_URI="mirror://gentoo/${P}.tar.bz2" +else # Release + SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2; +fi +FFMPEG_REVISION="${PV#*_p}" + +SLOT="0/${FFMPEG_SUBSLOT}" +LICENSE=" + !gpl? ( LGPL-2.1 ) + gpl? ( GPL-2 ) + amr? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + encode? ( + aac? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + amrenc? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + ) + samba? ( GPL-3 ) +" +if [ "${PV#}" = "${PV}" ] ; then + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" +fi + +#
[gentoo-commits] repo/gentoo:master commit in: dev-python/aiohttp/
commit: 992d804eb1e959d57acd67037532b43eb1c41c53 Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 11:39:00 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:39:00 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=992d804e dev-python/aiohttp: Keyword for x86 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=565956 Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> dev-python/aiohttp/aiohttp-0.18.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/aiohttp/aiohttp-0.18.4.ebuild b/dev-python/aiohttp/aiohttp-0.18.4.ebuild index 1f7cb32..de73c18 100644 --- a/dev-python/aiohttp/aiohttp-0.18.4.ebuild +++ b/dev-python/aiohttp/aiohttp-0.18.4.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" IUSE="doc examples test" CDEPEND=" dev-python/chardet[${PYTHON_USEDEP}]"
[gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-raisesregexp/
commit: f087ce24dc27052ca9aba590932e448479149721 Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 11:37:52 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:37:52 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f087ce24 dev-python/pytest-raisesregexp: Keyword for x86 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=565956 Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> dev-python/pytest-raisesregexp/metadata.xml | 2 +- dev-python/pytest-raisesregexp/pytest-raisesregexp-2.0.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/pytest-raisesregexp/metadata.xml b/dev-python/pytest-raisesregexp/metadata.xml index b63e922..ecfd999 100644 --- a/dev-python/pytest-raisesregexp/metadata.xml +++ b/dev-python/pytest-raisesregexp/metadata.xml @@ -1,4 +1,4 @@ - + http://www.gentoo.org/dtd/metadata.dtd;> diff --git a/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.0.ebuild b/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.0.ebuild index 95d8396..937901a 100644 --- a/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.0.ebuild +++ b/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" IUSE="test" CDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
[gentoo-commits] repo/gentoo:master commit in: www-apps/owncloud/
commit: a0b64595ab22305a2068ad46d9d9658ad317864e Author: Bernard Cafarelli gentoo org> AuthorDate: Fri Nov 20 09:54:26 2015 + Commit: Bernard Cafarelli gentoo org> CommitDate: Fri Nov 20 09:54:26 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0b64595 www-apps/owncloud: version bump, bug #566304 Package-Manager: portage-2.2.24 www-apps/owncloud/Manifest | 1 + www-apps/owncloud/owncloud-8.2.1.ebuild | 52 + 2 files changed, 53 insertions(+) diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest index 99267ba..8d6ce8d 100644 --- a/www-apps/owncloud/Manifest +++ b/www-apps/owncloud/Manifest @@ -4,3 +4,4 @@ DIST owncloud-7.0.11.tar.bz2 28637003 SHA256 21dd75de4ed832f16f577eb6763d04c663e DIST owncloud-8.0.9.tar.bz2 24121882 SHA256 0c1f915f4123dbe07d564cf0172930568690ab5257d2fca4fec4ec515858bef1 SHA512 902182fbbb8fbf6f001a5b3cb7d878a2106f2a9dc6a2810a220fcd3b2600512c1447cfbe5608004743d83079f50d0841eebfdd73d3baf87ddeab45a19c474d12 WHIRLPOOL 20fa34730b1f0dd2e87eb4ed373c2a727e67841bdaa304f11c288e37e2050f82accbb5ab013bf73709391e74966710cbeca82d4b5ff6885cb0ec0537d34f424c DIST owncloud-8.1.4.tar.bz2 25160172 SHA256 e0f4bf0c85821fc1b6e7f6268080ad3ca3e98c41baa68a9d616809d74a77312d SHA512 168f432c3733ee2c6ed10027b0235920817e7617bb1355ea9f3b85b5c5a88413f1d4c24d745abe7ef2362fa808b2e6bdc95b5cbf4f8aaea3dd3e5907fe5297f1 WHIRLPOOL 589f72d0814b10ca4a3139944346265c12183ecf5b3f9cf6308b77ec46cb005feef2d79bccc9c0c5271125b0574af9f6874da85e05b61337020af405314a36a6 DIST owncloud-8.2.0.tar.bz2 26072679 SHA256 fcfe99cf1c3aa06ff369e5b1a602147c08dd977af11800fe06c6a661fa5f770c SHA512 82777951bf4ded1997ea5bb19a145a2feabd9cf454637be9522c14b5d7bc35784d847cd281c2596590ffebe8cc5c02173b35376b612ebc8c113a5e80685b5084 WHIRLPOOL cd4fff556960bdd680e46586b1b835b34b3d86c3279d4c6256755ef6458f9f5e13d8d5d331458104273b60897efa1eac06166f085e5fa33bde4cf58d7d285196 +DIST owncloud-8.2.1.tar.bz2 26444342 SHA256 5390b2172562a5bf97a46e9a621d1dd92f9b74efaccbb77978c39eb90d6988d4 SHA512 303e2e573809a8fa661f66fc2bab9c04bc8803f8c1b2d5c4bce23ef067cf450db6c32cc012d3366fcd92ae92d0ceb5d9148bc90e87dae6d97ad84f4bd081 WHIRLPOOL dd9acfbe114f8110ead6bcb2f181a2e7aeb438396f27fd16d26bc0b353898e612087a5b06728dec2445104b3d7067a266439846a29f570e478e21dfe0050b68b diff --git a/www-apps/owncloud/owncloud-8.2.1.ebuild b/www-apps/owncloud/owncloud-8.2.1.ebuild new file mode 100644 index 000..1de78dc --- /dev/null +++ b/www-apps/owncloud/owncloud-8.2.1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils webapp + +DESCRIPTION="Web-based storage application where all your data is under your own control" +HOMEPAGE="http://owncloud.org; +SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2" +LICENSE="AGPL-3" + +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+curl mysql postgres +sqlite" +REQUIRED_USE="|| ( mysql postgres sqlite )" + +DEPEND="" +RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlwriter,zip] + virtual/httpd-php" + +S=${WORKDIR}/${PN} + +pkg_setup() { + webapp_pkg_setup +} + +src_prepare() { + epatch_user +} + +src_install() { + webapp_src_preinst + + insinto "${MY_HTDOCSDIR}" + doins -r . + dodir "${MY_HTDOCSDIR}"/data + + webapp_serverowned -R "${MY_HTDOCSDIR}"/apps + webapp_serverowned -R "${MY_HTDOCSDIR}"/data + webapp_serverowned -R "${MY_HTDOCSDIR}"/config + webapp_configfile "${MY_HTDOCSDIR}"/.htaccess + + webapp_src_install +} + +pkg_postinst() { + elog "Additional applications (calendar, ...) are no longer provided by default." + elog "You can install them after login via the applications management page" + elog "(check the recommended tab). No application data is lost." + webapp_pkg_postinst +}
[gentoo-commits] repo/gentoo:master commit in: dev-python/cffi/
commit: 8d71cfe769acd1792a33dfc28b4aa3e6bc69419e Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 08:16:28 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:29:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d71cfe7 dev-python/cffi: Drop old Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> dev-python/cffi/Manifest | 1 - dev-python/cffi/cffi-0.8.6.ebuild | 38 -- 2 files changed, 39 deletions(-) diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest index e42d513..b52b383 100644 --- a/dev-python/cffi/Manifest +++ b/dev-python/cffi/Manifest @@ -1,4 +1,3 @@ -DIST cffi-0.8.6.tar.gz 196835 SHA256 2532d9e3af9e3c6d0f710fc98b0295b563c7f39cfd97dd2242bd36fbf4900610 SHA512 b913d459bf0d355f0cb42fa0587a940c227d6765450033b14ab4d5281173cd1875cd6872911bb4f0b567cc1c5b0ca330615ec5f6ba205b25c41b683ae8c77790 WHIRLPOOL 4a03a077f15f943e0f06acf1bc10572b19680379e36805dbfc3dfffb8a5d735d28d9bab38e2d233f3a347fc03cede8126cc2ce017c6e3a0896b9baecddfae39f DIST cffi-1.1.2.tar.gz 326758 SHA256 390970b602708c91ddc73953bb6929e56291c18a4d80f360afa00fad8b6f3339 SHA512 d146984013b63382ea64bd2d6188cdbf9154cf83d66bf4dbb9353f1daea66f9eae07c6da47e152c5758d3458a742adde0310f71c792eb0a80950d7f857bfb943 WHIRLPOOL 02b92f0d13b02e351ba63e55a731c0b5480ae0b376c99a8dc1a256b3b55bf0119b4238dca88171605c1348b0847a6ff305ba4ec69cd1b42b9950708f42d6067e DIST cffi-1.2.1.tar.gz 335778 SHA256 eab571deb0a152e2f53c404c08a94870a131526896cad08cd43bf86ce3771e3d SHA512 26ab695d34ef1895f38c735b2c6400cbf6325d622ce93799513130791365bb71d656288e991b86861ac8e899872504c1f4368d27104c4ac9b881c83c7f8dad88 WHIRLPOOL a8bbe3c24be660946c1f31fbb8b1f50810f78b9485a32aadfb091a624b5386641bde71981c58792f8e95e8e77cfce7d9959eb197c417464cf5351e568aa6336d DIST cffi-1.3.0.tar.gz 347342 SHA256 9daa53aff0b5cf64c85c10eab7ce6776880d0ee71b78cedeae196ae82b6734e9 SHA512 2ea789d67782b2f23501bea4480f42f79e312d047e2d8c777aab8113400cfa136585aa92c0a51608a0da35cd6734bc24914fcccfc5bbdad3041aad2e9f784400 WHIRLPOOL 5daea22a7ad04a68aea0f962de8ff08c96b41d45539c43d2157ebc7f26799cf75f251b6b5c54901bc4f8e988791cc3ddefc52528b1c0ab3d3163adc56dea452a diff --git a/dev-python/cffi/cffi-0.8.6.ebuild b/dev-python/cffi/cffi-0.8.6.ebuild deleted file mode 100644 index a7862a6..000 --- a/dev-python/cffi/cffi-0.8.6.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -inherit distutils-r1 - -DESCRIPTION="Foreign Function Interface for Python calling C code" -HOMEPAGE="http://cffi.readthedocs.org/; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" -IUSE="doc" - -RDEPEND="virtual/libffi - dev-python/pycparser[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" - -# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile) -DISTUTILS_IN_SOURCE_BUILD=1 - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - py.test -x -v --ignore testing/test_zintegration.py c/ testing/ || die "Testing failed with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - use doc && dohtml -r doc/build/ -}
[gentoo-commits] repo/gentoo:master commit in: dev-python/python-magic/
commit: db5d3c15667c2594197416903dfe38ffe1662a72 Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 11:10:45 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:29:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db5d3c15 dev-python/python-magic: Version Bump Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> dev-python/python-magic/Manifest | 1 + dev-python/python-magic/python-magic-0.4.10.ebuild | 22 ++ 2 files changed, 23 insertions(+) diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest index 09d275e..fad968d 100644 --- a/dev-python/python-magic/Manifest +++ b/dev-python/python-magic/Manifest @@ -1 +1,2 @@ +DIST python-magic-0.4.10.tar.gz 3950 SHA256 79fd2865ec96074749825f9e9562953995d5bf12b6793f24d75c37479ad4a2c3 SHA512 8dadfd069bbca574a159dc034fca84fb110a3015ba54fa62c715006b586a5fd10373a5108a4847887bd86c6b7f2c4da90dfb7041cd5e4d51829ac1b94b8e1a03 WHIRLPOOL de890b593b062475a67c1286e8b6f2a1076cc8f0a04281d268f9d72b6df2b457e2b86a14743896283011c27babaf037ecf84d4f02939472dda7ee0114a622a1e DIST python-magic-0.4.6.tar.gz 3462 SHA256 903d3d3c676e2b1244892954e2bbbe27871a633385a9bfe81f1a81a7032df2fe SHA512 66c3a7a3120ea360422fe422c373a403a21be674f8df213a80ce83b02051cc1f0d0a2aaa7b4d512194e6914d801062036bdfa5155ead350dde154725808944f6 WHIRLPOOL 03fdb881140bdc4cb985fe5854245f067fdfcfa8bf0c8e7d7984ac0708d4978298b69ccb54401038c3c14049ba2e9293db66c48bf025607e139bcf194406fbbe diff --git a/dev-python/python-magic/python-magic-0.4.10.ebuild b/dev-python/python-magic/python-magic-0.4.10.ebuild new file mode 100644 index 000..224d596 --- /dev/null +++ b/dev-python/python-magic/python-magic-0.4.10.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} ) + +inherit distutils-r1 + +DESCRIPTION="Access the libmagic file type identification library" +HOMEPAGE="https://github.com/ahupp/python-magic; +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="PSF-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ia64 ~x86" +IUSE="" + +RDEPEND="sys-apps/file[-python]" +DEPEND="${DEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]"
[gentoo-commits] repo/gentoo:master commit in: dev-python/python-bugzilla/
commit: 08ad4176f6470227fade4317802f7a0e085152f8 Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 11:20:10 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:29:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08ad4176 dev-python/python-bugzilla: Version Bump Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> dev-python/python-bugzilla/Manifest| 1 + .../python-bugzilla/python-bugzilla-1.2.2.ebuild | 25 ++ 2 files changed, 26 insertions(+) diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest index 8a57ce4..fffb6eb 100644 --- a/dev-python/python-bugzilla/Manifest +++ b/dev-python/python-bugzilla/Manifest @@ -1 +1,2 @@ DIST python-bugzilla-1.1.0.tar.gz 70841 SHA256 7e24b50269a994b77463575a75dd5c91a892ebc669289171bef4e0193f3d9549 SHA512 30192d6c1e76f3a79b5059916ad773704e6ce503d5d44fbc9e5d7b4ac18b062108d336d8d2e0d26e4cd21ba421fc607e4b3ca2bd5a1e362561708c05b8322d88 WHIRLPOOL 1a2209b89125807cfd6db9258c2a2ee87641921316d8f2dd9123c28f90ca78f52241e1ead9fda392cc026421fd84244418791150cdca6cf07d9f86a4a34b134e +DIST python-bugzilla-1.2.2.tar.gz 76026 SHA256 e4606c325960f9e3eb90aac26014348c96160d77bbee09b7c31c211d38433922 SHA512 bb4ce43ffbf054097bd537404861848dd4ff5883fa63f156dfa90bea9f2e89cfaf0670980ec290a3d9c90cee268709b914e8bd5bd38b7f2e29c8d7fbd0215ac2 WHIRLPOOL cd37177dd5ebcf3016ab870d76e9a2bb655c3d6d0ef8884820d1646daad9f364c71c62d156bb3f60c5a4fffc5b92255f9db9da9c9771f2c95b7494fd294bc75a diff --git a/dev-python/python-bugzilla/python-bugzilla-1.2.2.ebuild b/dev-python/python-bugzilla/python-bugzilla-1.2.2.ebuild new file mode 100644 index 000..f29788a --- /dev/null +++ b/dev-python/python-bugzilla/python-bugzilla-1.2.2.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_4 ) + +inherit distutils-r1 + +DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC" +HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla; +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +KEYWORDS="~amd64 ~x86" +IUSE="" +LICENSE="GPL-2" +SLOT="0" + +RDEPEND=" + || ( dev-python/python-magic[${PYTHON_USEDEP}] sys-apps/file[python,${PYTHON_USEDEP}] ) + dev-python/requests[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] +"
[gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/files/, dev-python/pytest/
commit: a4b6f280123ceb0df064e80c7b007f65bfae1b52 Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 11:21:34 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:29:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4b6f280 dev-python/pytest: Version Bump Fixes test problems with pypy3 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=564764 Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> dev-python/pytest/Manifest | 1 + .../files/pytest-2.8.3-skip-test-on-pypy.patch | 96 ++ dev-python/pytest/pytest-2.8.2.ebuild | 2 + .../{pytest-2.8.2.ebuild => pytest-2.8.3.ebuild} | 7 +- 4 files changed, 105 insertions(+), 1 deletion(-) diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest index 761f698..88e523a 100644 --- a/dev-python/pytest/Manifest +++ b/dev-python/pytest/Manifest @@ -3,3 +3,4 @@ DIST pytest-2.7.3.tar.gz 548235 SHA256 d5a9c3db3515ab95902ba08c09d1e941a21a440dc DIST pytest-2.8.0.zip 8189680 SHA256 29ed6fdb7b287f5353620494e950aba652c593c40556aece95a4d23d403ae2cb SHA512 98f7131c3396848ef7dbcf67e21e0329f8a3b771b3f8b832c1894758b34a2f852209f809001da856cfe8ea3773b257405ae2d5f8a04152242b8692e1511289ed WHIRLPOOL 3fd7f6ec73f11f29fd9b67bbb0c28dd73605604053160111212bd43d2c85c0b6cec5a25a979fecabb83a097c5621d5460747df5cb08796866349b7ba71b12005 DIST pytest-2.8.1.tar.gz 580991 SHA256 2b58662d356ee953bc40f7a73857d05f0bd07f0a8507c929de3006dd6b14c918 SHA512 b73237810b69ecd504c2bd51af62d7ed23091b7bcc74cd1fcc8683dc582cadfd68b9eaed3259165bac6ddca5fb960b8dc295e82cfb9120f4b732d07843fe WHIRLPOOL 16b27620bd0edde16d28dc247352c0a1b6042ac79bcb7a76b67fc4917ef6a42462767343a5e86acfe6880ba0372a124fb11491e670abde6ffdb48e03963243db DIST pytest-2.8.2.tar.gz 563955 SHA256 da2fc57320dd11f621d166634c52b989aa2291af1296c32a27a11777aa4128b9 SHA512 0df6e0421d1575e1efc0bb0550c5993f802777cb616ab1514bf12ed11eb5ec35a142dd837ff65659989268c36e441e18108369991cd3d458d357aac6ba433991 WHIRLPOOL ea917f4aaec444d6edc830b4ec66f7adb305031f11328e47d12a609ec92368a5c56e9cf8e24bd1a9a4a6a0746b43133f0d9821cf27d74c15ed2a83a705ee6030 +DIST pytest-2.8.3.tar.gz 880441 SHA256 37d950e93c1fd7e04d816a3ca4a5226ea2531c6d531c8284ad9b88848417e720 SHA512 04dd9041729d83b98a15cef22aac65dfb95cd3bf6b71a580ff91e8738f9a1ad5ee46fae45c950342e4a0162e38c875299a46fc69ec74702f36a1e36ef76dc0d6 WHIRLPOOL 78149cdcc25dc478ae004b0a54b333edcad0268ce5e66efe9878b0bcaff0e33d227513f84040f3aa53967afa5ffc51ecef0e6003814c09925fdf9e6a4921d88a diff --git a/dev-python/pytest/files/pytest-2.8.3-skip-test-on-pypy.patch b/dev-python/pytest/files/pytest-2.8.3-skip-test-on-pypy.patch new file mode 100644 index 000..81a7573 --- /dev/null +++ b/dev-python/pytest/files/pytest-2.8.3-skip-test-on-pypy.patch @@ -0,0 +1,96 @@ + testing/acceptance_test.py | 2 ++ + testing/python/collect.py | 1 + + testing/python/fixture.py | 1 + + testing/python/metafunc.py | 1 + + testing/test_capture.py| 3 ++- + testing/test_collection.py | 1 + + testing/test_junitxml.py | 1 + + 7 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py +index b9a3fa3..9db5017 100644 +--- a/testing/acceptance_test.py b/testing/acceptance_test.py +@@ -209,6 +209,8 @@ class TestGeneralUsage: + result = testdir.runpython(p) + assert not result.ret + ++# https://github.com/pytest-dev/pytest/issues/1162 ++@pytest.mark.skipif('"__pypy__" in sys.modules') + def test_issue109_sibling_conftests_not_loaded(self, testdir): + sub1 = testdir.tmpdir.mkdir("sub1") + sub2 = testdir.tmpdir.mkdir("sub2") +diff --git a/testing/python/collect.py b/testing/python/collect.py +index 636f959..da9a291 100644 +--- a/testing/python/collect.py b/testing/python/collect.py +@@ -659,6 +659,7 @@ class TestConftestCustomization: + l = modcol.collect() + assert '_hello' not in l + ++@pytest.mark.skipif('"__pypy__" in sys.modules') + def test_setup_only_available_in_subdir(testdir): + sub1 = testdir.mkpydir("sub1") + sub2 = testdir.mkpydir("sub2") +diff --git a/testing/python/fixture.py b/testing/python/fixture.py +index 2031764..f52cf85 100644 +--- a/testing/python/fixture.py b/testing/python/fixture.py +@@ -83,6 +83,7 @@ class TestFillFixtures: + "*1 passed*" + ]) + ++@pytest.mark.skipif('"__pypy__" in sys.modules') + def test_conftest_funcargs_only_available_in_subdir(self, testdir): + sub1 = testdir.mkpydir("sub1") + sub2 = testdir.mkpydir("sub2") +diff --git a/testing/python/metafunc.py b/testing/python/metafunc.py +index 111ca61..bc489fa 100644 +--- a/testing/python/metafunc.py b/testing/python/metafunc.py +@@ -835,6 +835,7 @@ class TestMetafuncFunctional: + reprec = testdir.runpytest() + reprec.assert_outcomes(passed=1) + ++
[gentoo-commits] repo/gentoo:master commit in: dev-python/cffi/
commit: fc09b1fc40e335f9bec55db00dd63e5554f0b213 Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 08:49:45 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:29:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc09b1fc dev-python/cffi: Version Bump Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> dev-python/cffi/Manifest | 1 + dev-python/cffi/cffi-1.3.1.ebuild | 42 +++ 2 files changed, 43 insertions(+) diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest index b52b383..a2c75c6 100644 --- a/dev-python/cffi/Manifest +++ b/dev-python/cffi/Manifest @@ -1,3 +1,4 @@ DIST cffi-1.1.2.tar.gz 326758 SHA256 390970b602708c91ddc73953bb6929e56291c18a4d80f360afa00fad8b6f3339 SHA512 d146984013b63382ea64bd2d6188cdbf9154cf83d66bf4dbb9353f1daea66f9eae07c6da47e152c5758d3458a742adde0310f71c792eb0a80950d7f857bfb943 WHIRLPOOL 02b92f0d13b02e351ba63e55a731c0b5480ae0b376c99a8dc1a256b3b55bf0119b4238dca88171605c1348b0847a6ff305ba4ec69cd1b42b9950708f42d6067e DIST cffi-1.2.1.tar.gz 335778 SHA256 eab571deb0a152e2f53c404c08a94870a131526896cad08cd43bf86ce3771e3d SHA512 26ab695d34ef1895f38c735b2c6400cbf6325d622ce93799513130791365bb71d656288e991b86861ac8e899872504c1f4368d27104c4ac9b881c83c7f8dad88 WHIRLPOOL a8bbe3c24be660946c1f31fbb8b1f50810f78b9485a32aadfb091a624b5386641bde71981c58792f8e95e8e77cfce7d9959eb197c417464cf5351e568aa6336d DIST cffi-1.3.0.tar.gz 347342 SHA256 9daa53aff0b5cf64c85c10eab7ce6776880d0ee71b78cedeae196ae82b6734e9 SHA512 2ea789d67782b2f23501bea4480f42f79e312d047e2d8c777aab8113400cfa136585aa92c0a51608a0da35cd6734bc24914fcccfc5bbdad3041aad2e9f784400 WHIRLPOOL 5daea22a7ad04a68aea0f962de8ff08c96b41d45539c43d2157ebc7f26799cf75f251b6b5c54901bc4f8e988791cc3ddefc52528b1c0ab3d3163adc56dea452a +DIST cffi-1.3.1.tar.gz 351300 SHA256 d45dd39a770b4afb591c82555f6a8bbc1ac7eb019eda9b621eee1a0a72201220 SHA512 b89fe1b98a2e1492e05a9e69407104a5d5057dbe2730852fb91fae1db66751d35db53186d2f03dc950eb10dd9cecc83e44eb3e6954381dfd80d79519c7938288 WHIRLPOOL 37ea487ae7e5474a903cd259bac3428d04dc8f0ab0623edf8e12979e666d0779a04135e150073deb608a46b63084e51f66023e618637d3f71cc54f2eac84fdb9 diff --git a/dev-python/cffi/cffi-1.3.1.ebuild b/dev-python/cffi/cffi-1.3.1.ebuild new file mode 100644 index 000..ce2896f --- /dev/null +++ b/dev-python/cffi/cffi-1.3.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +# DO NOT ADD pypy to PYTHON_COMPAT +# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead. +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) + +inherit distutils-r1 + +DESCRIPTION="Foreign Function Interface for Python calling C code" +HOMEPAGE="http://cffi.readthedocs.org/ https://pypi.python.org/pypi/cffi; +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" +IUSE="doc test" + +RDEPEND=" + virtual/libffi + dev-python/pycparser[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + test? ( dev-python/pytest[${PYTHON_USEDEP}] )" + +# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile) +DISTUTILS_IN_SOURCE_BUILD=1 + +python_compile_all() { + use doc && emake -C doc html +} + +python_test() { + py.test -x -v --ignore testing/test_zintegration.py c/ testing/ || die "Testing failed with ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( doc/build/html/. ) + distutils-r1_python_install_all +}
[gentoo-commits] repo/gentoo:master commit in: dev-python/cffi/
commit: 3421c9f8bef8d92b6e0eb4788c45fceb7593aa42 Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 08:25:39 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:29:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3421c9f8 dev-python/cffi: Add USE=test to install pytest buildtime only Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=566286 Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> dev-python/cffi/cffi-1.1.2.ebuild | 10 +- dev-python/cffi/cffi-1.2.1.ebuild | 8 dev-python/cffi/cffi-1.3.0.ebuild | 8 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dev-python/cffi/cffi-1.1.2.ebuild b/dev-python/cffi/cffi-1.1.2.ebuild index cb0be69..a78ef1c 100644 --- a/dev-python/cffi/cffi-1.1.2.ebuild +++ b/dev-python/cffi/cffi-1.1.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} ) @@ -15,13 +15,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0/${PV}" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" -IUSE="doc" +IUSE="doc test" RDEPEND=" virtual/libffi - dev-python/pycparser[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" + dev-python/pycparser[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + test? ( dev-python/pytest[${PYTHON_USEDEP}] )" # Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile) DISTUTILS_IN_SOURCE_BUILD=1 diff --git a/dev-python/cffi/cffi-1.2.1.ebuild b/dev-python/cffi/cffi-1.2.1.ebuild index 3d9d113..e23874b 100644 --- a/dev-python/cffi/cffi-1.2.1.ebuild +++ b/dev-python/cffi/cffi-1.2.1.ebuild @@ -17,13 +17,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0/${PV}" KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" -IUSE="doc" +IUSE="doc test" RDEPEND=" virtual/libffi - dev-python/pycparser[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" + dev-python/pycparser[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + test? ( dev-python/pytest[${PYTHON_USEDEP}] )" # Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile) DISTUTILS_IN_SOURCE_BUILD=1 diff --git a/dev-python/cffi/cffi-1.3.0.ebuild b/dev-python/cffi/cffi-1.3.0.ebuild index 762c538..ce2896f 100644 --- a/dev-python/cffi/cffi-1.3.0.ebuild +++ b/dev-python/cffi/cffi-1.3.0.ebuild @@ -17,13 +17,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0/${PV}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" -IUSE="doc" +IUSE="doc test" RDEPEND=" virtual/libffi - dev-python/pycparser[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" + dev-python/pycparser[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + test? ( dev-python/pytest[${PYTHON_USEDEP}] )" # Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile) DISTUTILS_IN_SOURCE_BUILD=1
[gentoo-commits] repo/gentoo:master commit in: sci-biology/seaview/
commit: 68d94399d2dbcc0efa6835df6bef41475d5ddbc2 Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 10:14:23 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:29:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d94399 sci-biology/seaview: Version Bump fixes compilation problems with newer fltk Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=556750 Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> sci-biology/seaview/Manifest | 1 + sci-biology/seaview/seaview-4.5.4.ebuild | 77 2 files changed, 78 insertions(+) diff --git a/sci-biology/seaview/Manifest b/sci-biology/seaview/Manifest index 6bb12c4..fc48e74 100644 --- a/sci-biology/seaview/Manifest +++ b/sci-biology/seaview/Manifest @@ -1 +1,2 @@ DIST seaview_4.3.5.tar.gz 309530 SHA256 38050d6792eb799d61e5e849f76971a9c7d45f467e5c04fbc4363062d8e7100d SHA512 b20c018da9a29d79fe0393fed5d29117729492ea8f36e72d4aeb98044a3de4a13331bd29e76ca552a08f6da764e57e69f9fb0325fc031551514d7a54b56c849a WHIRLPOOL 82fc7324bf1d934d69712629808d6b4178a5f2cdcf25351fb2fe2784f9cea0c1ec0aaaba7a3a08c84795108eb049394ceaab052af8cc0efbb0975064fa4e80e0 +DIST seaview_4.5.4.tar.gz 420608 SHA256 f4569ad7f1d8de2b141175b1122f036cb45f55f8e9e59e42d6026668e091e7ed SHA512 a8a2e49a13f87ae4279311068147169b1e17874e9ce5787003b854c7271efc7a128db6916bb883a9b7b0b90f855fe40d83c77e9fd9f5751464e04346b9923301 WHIRLPOOL c52f7ac9d7d4c85d7670bdb3a87c9ba94904b25e11583ad8abf3de9f43fa3967d64b96d447ebb5ebe614053c4de64828d1c3c5763c64dc269e78fb3c49151886 diff --git a/sci-biology/seaview/seaview-4.5.4.ebuild b/sci-biology/seaview/seaview-4.5.4.ebuild new file mode 100644 index 000..16459f3 --- /dev/null +++ b/sci-biology/seaview/seaview-4.5.4.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="A graphical multiple sequence alignment editor" +HOMEPAGE="http://pbil.univ-lyon1.fr/software/seaview.html; +SRC_URI="ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/${PN}_${PV}.tar.gz; + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="+xft" + +CDEPEND=" + sys-libs/zlib + x11-libs/fltk:1 + x11-libs/libX11 + xft? ( + x11-libs/libXft + x11-libs/fltk:1[xft] )" +RDEPEND="${CDEPEND} + sci-biology/clustalw + || ( sci-libs/libmuscle sci-biology/muscle ) + sci-biology/phyml" +DEPEND="${CDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}/${PN}" + +src_prepare() { + # respect CXXFLAGS (package uses them as CFLAGS) + sed \ + -e "s:^CC.*:CC = $(tc-getCC):" \ + -e "s:^CXX.*:CXX = $(tc-getCXX):" \ + -e "s:\$(OPT):${CXXFLAGS}:" \ + -e "s:^OPT:#OPT:" \ + -e "s:^FLTK = .*$:FLTK = ${EPREFIX}/usr/include/fltk-1:" \ + -e "s:^#IFLTK .*:IFLTK = $(fltk-config --use-images --cflags):" \ + -e "s:^#LFLTK .*:LFLTK = $(fltk-config --use-images --ldflags):" \ + -e "s:^USE_XFT:#USE_XFT:" \ + -e "s:^#HELPFILE:HELPFILE:" \ + -e "s:/usr/share/doc/seaview/seaview.htm:${EPREFIX}/usr/share/seaview/seaview.htm:" \ + -e "s:^#PHYMLNAME:PHYMLNAME:" \ + -e 's:-lXinerama::g' \ + -e 's:-lpng::g' \ + -e 's:-ljpeg::g' \ + -e 's:-lfontconfig::g' \ + -i Makefile || die "sed failed while editing Makefile" + + if use xft; then + sed \ + -e "s:^#USE_XFT .*:USE_XFT = -DUSE_XFT $($(tc-getPKG_CONFIG) --cflags xft):" \ + -e "s:-lXft:$($(tc-getPKG_CONFIG) --libs xft):" \ + -i Makefile || die "sed failed while editing Makefile to enable xft" + else + sed -i -e "s:-lXft::" Makefile || die + fi +} + +src_install() { + dobin seaview + + # /usr/share/seaview/seaview.html is hardcoded in the binary, see Makefile + insinto /usr/share/seaview + doins example.nxs seaview.html + + insinto /usr/share/seaview/images + doins seaview.xpm + + make_desktop_entry seaview Seaview + + doman seaview.1 +}
[gentoo-commits] repo/gentoo:master commit in: dev-python/cryptography-vectors/
commit: 450b5a48a469a7c80a080bfcf435a21208b0d0ad Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 11:23:38 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:29:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=450b5a48 dev-python/cryptography-vectors: Drop old Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> dev-python/cryptography-vectors/Manifest | 14 .../cryptography-vectors-0.5.4.ebuild | 23 --- .../cryptography-vectors-0.6.1.ebuild | 23 --- .../cryptography-vectors-0.7.1.ebuild | 23 --- .../cryptography-vectors-0.7.2.ebuild | 23 --- .../cryptography-vectors-0.7.ebuild| 23 --- .../cryptography-vectors-0.8.1.ebuild | 23 --- .../cryptography-vectors-0.8.2.ebuild | 26 -- .../cryptography-vectors-0.8.ebuild| 23 --- .../cryptography-vectors-0.9.1.ebuild | 26 -- .../cryptography-vectors-0.9.2.ebuild | 26 -- .../cryptography-vectors-0.9.3.ebuild | 26 -- .../cryptography-vectors-0.9.ebuild| 26 -- .../cryptography-vectors-1.0.1.ebuild | 26 -- .../cryptography-vectors-1.0.ebuild| 26 -- 15 files changed, 357 deletions(-) diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest index 63f9197..2079560 100644 --- a/dev-python/cryptography-vectors/Manifest +++ b/dev-python/cryptography-vectors/Manifest @@ -1,17 +1,3 @@ -DIST cryptography_vectors-0.5.4.tar.gz 19093455 SHA256 3537837ef31814fb25c082274a64042bf2c52b6108b99374d1eee505097ccf36 SHA512 b548130a4566928c9103b57c1b441fb8a52ced337d358126b6ce9e8bc9566690f321b6f83ed7858a5d6171465ec862f654624bebc9874bb6990502bab5f629d2 WHIRLPOOL c1e03779a72332bea7f41eb53e60a7eb41ca93201fe184434f51bc6e71333752c61dd15e503dbbd65862159a662a7115f8bc44eef59265abd74350b50cb01e6c -DIST cryptography_vectors-0.6.1.tar.gz 19348556 SHA256 79d0cd0a4ae89e013f0a9e8df7a4bedc2ecdf3dc8ee1df64c5e4381756eb41cf SHA512 00a802cf8ee3a56236b67b1405f593300141e63f5354182ea5e229516b52ab870f3164009aa47bb75d2294d5587f4b0ad531f3cef867e70bcce87eadd1743cc0 WHIRLPOOL c37ace825f40664890fdcf600fc9213741f2abc168fc5794a80f9224d940bd980bffd4a3c0333f379d238247e97ea3f098a94632cbc2a5ee59e6a32bae8f9cb0 -DIST cryptography_vectors-0.7.1.tar.gz 21377829 SHA256 2b7592b7d8f2ff3a7e288a6fecda5129a4ec4067d6d7ce3ce061a5d2024ea676 SHA512 98a3b8138ab2754f9f6eb6ba06118718b7f1b30af99d00c205a33b435fe8e432af84328b5b26ec531c920f7c3091bf3189d1d884e543fc9e5b4bea93f6d5b94b WHIRLPOOL 2d041fb9908e2991562bd2b90781082b99a03440fcdd5727e2aff69b20abe3534119acd069a3459c4fd4c67bcab01738ba36468494c111be713884ab27a7 -DIST cryptography_vectors-0.7.2.tar.gz 21377865 SHA256 36ad9bec8ed667e3720ff4b877b4dc728e54986a895fdc1d90d55c00b10a21c4 SHA512 be12f275874ec38ec768858ff2d0c9a058c324321dea2eb6e9f771636f2917ea59b39f6499634169876ae0dc01d3481f47f90638d1fb94e4e20b7bc7c59f0cba WHIRLPOOL 499f7a247557c2fb4def26f9a021022f9bf3418f741f34d8c5c3836a907716526ff4b8eb01edfae2432ff3d611661164e3a696feabbe10ddafc2ae65a8b28e07 -DIST cryptography_vectors-0.7.tar.gz 21375413 SHA256 73c84276e5932a4d6b28394c31393350f27b61f66619e5ef5b6932fa835ea084 SHA512 5cb54bb32822d454fa449dc8c5add75efb430722d62ea0c7b591b27d681db5384522d9892bfdd088d00e2ec933564566302ca7b14d94b9e79f11151b2b816f08 WHIRLPOOL 10f14c934d08289dca26a398ce58e4b7b262bf802bc3491831424b769922ddbd63957083da8a66646c74425aaa4234e6b8a1b8b9671213bebba1a607c1a33f01 -DIST cryptography_vectors-0.8.1.tar.gz 21396583 SHA256 4a69e66026bfce4b97f75e72fe262f5e8f71daddc081f6608e5b0db89e552504 SHA512 0d0a383a81247eb2027b2c33827041494cd1c3198957196f7c8aab840119a3c127951584efbe522885afb725bc99b923d15cbc371fb9c7bbd5b1067e3bc70c80 WHIRLPOOL 74db8741a270d9c00f8368bc191c400b60e5a3ec06cc4386e104cc8e50c896be853ab7135a6d8f251fdf7dbf12f5593235f41970254dae738fd476b26d01c6af -DIST cryptography_vectors-0.8.2.tar.gz 21396554 SHA256 6e7c2c2761a210ae8af34c6797c291ef2b01cff787b08e433570ca4915973c06 SHA512 36760a13aeef4baa65c0eb94fb36a64360f065c7781bfcae049e671affeb931e842a58066b736e02a67bcc1cf9717c95d14e4c953cfd64c98a78b01495bb322e WHIRLPOOL b19c3de0b3bf739f2c407552f3ccc97d4cf248c13663d6c36eed1075e6cf51186d0d1a36ac752d5949f3d736e0a2f8a5e48f746ae85b8c6112c7b4d6df6f7d6b -DIST cryptography_vectors-0.8.tar.gz 21394291 SHA256 330b6601dffa7ad75eaf48aa5c693471970895a8cee86d94d2431513ace20dfe SHA512 2e33b7818a63cd44fdd0d8cfa3e2d69e8371194acfb6cf48a4b41bce055ce4da4b25eb223dff975d6fcd04c834224705c417c3ddf339cdad40662fe30cde8ce8 WHIRLPOOL
[gentoo-commits] repo/gentoo:master commit in: dev-python/certifi/
commit: 7d795808f6c5c4c4faa4801723f50b4efb838f8b Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 11:05:59 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:29:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d795808 dev-python/certifi: Version Bump Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> dev-python/certifi/Manifest | 1 + dev-python/certifi/certifi-2015.11.20.ebuild | 21 + 2 files changed, 22 insertions(+) diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest index 0c9ea25..630bd9c 100644 --- a/dev-python/certifi/Manifest +++ b/dev-python/certifi/Manifest @@ -1 +1,2 @@ +DIST certifi-2015.11.20.tar.gz 364503 SHA256 7168668372f07219439e82878b484d6216ff63224fd4e7ff4f39c56ad0b487de SHA512 d93dd596f572c4fe72c0fca205552da4d533ae094b372294741aa007c1fdcc4f452c1ea474f9a92a7e87f7f2ed82375bca3e33f0cabf22a8bc7a42a733dd8d58 WHIRLPOOL 02712c93ca05fdd4d7afced1ccfedb52fddca7b8f2e29b41681ece953f026106fdc84c02b06db6c7b7a639af9ed6796efad65e47a1ec2c2089e854128a13201d DIST certifi-2015.9.6.2.tar.gz 368588 SHA256 dc3a2b2d9d1033dbf27586366ae61b9d7c44d8c3a6f29694ffcbb0618ea7aea6 SHA512 78166fa708e7f5162bc36c5b552b1c19e316f4f540db5733167730e9d3a7610b90622546b9e49bc539d9d4de543a169046d24fbbcded98b74f68351a91d15f31 WHIRLPOOL 4c1f075ea41d00819325bd49213c39f0af3f7e0393a2ea8b4c6efbfc38e828ee8e6b807da4a43974182a65565c6eed76d491d09f03841c9f96251d15bf19f9b7 diff --git a/dev-python/certifi/certifi-2015.11.20.ebuild b/dev-python/certifi/certifi-2015.11.20.ebuild new file mode 100644 index 000..2770d0c --- /dev/null +++ b/dev-python/certifi/certifi-2015.11.20.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Python package for providing Mozilla's CA Bundle" +HOMEPAGE="http://certifi.io/; +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND="" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
[gentoo-commits] repo/gentoo:master commit in: dev-python/matplotlib/
commit: b1aeb406bf927ca3f71304535c5cb6785bec28d7 Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 10:40:46 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:29:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1aeb406 dev-python/matplotlib: Rename USE gtk to gtk2 USE gtk is ambigous and gtk2 will better represent the acutal effect the use has, similar to gtk3 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=566296 Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> dev-python/matplotlib/matplotlib-1.5.0.ebuild | 14 +- dev-python/matplotlib/metadata.xml| 3 ++- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dev-python/matplotlib/matplotlib-1.5.0.ebuild b/dev-python/matplotlib/matplotlib-1.5.0.ebuild index db96ac7..c1a2fc6 100644 --- a/dev-python/matplotlib/matplotlib-1.5.0.ebuild +++ b/dev-python/matplotlib/matplotlib-1.5.0.ebuild @@ -21,18 +21,18 @@ SLOT="0" # Fonts: BitstreamVera, OFL-1.1 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 qt5 test tk wxwidgets" +IUSE="cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets" PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" REQUIRED_USE=" doc? ( ${PY2_FLAGS} ) excel? ( ${PY2_FLAGS} ) fltk? ( ${PY2_FLAGS} ) - gtk? ( ${PY2_FLAGS} ) + gtk2? ( ${PY2_FLAGS} ) wxwidgets? ( ${PY2_FLAGS} ) test? ( cairo fltk latex pyside qt5 qt4 tk wxwidgets - || ( gtk gtk3 ) + || ( gtk2 gtk3 ) )" # #456704 -- a lot of py2-only deps @@ -47,7 +47,7 @@ COMMON_DEPEND=" media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull - gtk? ( + gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 @@ -124,10 +124,6 @@ use_setup() { fi } -_PATCHES=( - "${FILESDIR}"/${P}-backport-GH5291-2462.patch -) - python_prepare_all() { # Generates test failures, but fedora does it # local PATCHES=( @@ -210,7 +206,7 @@ python_configure() { cat >> "${BUILD_DIR}"/setup.cfg <<-EOF six = False $(use_setup fltk) - $(use_setup gtk) + $(use_setup gtk2 gtk) $(use_setup gtk3) $(use_setup wxwidgets wx) EOF diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml index 385b784..fa1693c 100644 --- a/dev-python/matplotlib/metadata.xml +++ b/dev-python/matplotlib/metadata.xml @@ -10,7 +10,8 @@ Pull dev-python/xlwt for the exceltools toolkit -Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2 +Enable x11-libs/gtk+:2 support +Enable x11-libs/gtk+:3 support Qt support via dev-python/pyside
[gentoo-commits] repo/gentoo:master commit in: virtual/python-cffi/
commit: 01e2fb3b44265d98de10900adc35179c44abfee1 Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 07:44:19 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:29:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e2fb3b virtual/python-cffi: New virtual Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> virtual/python-cffi/metadata.xml | 8 virtual/python-cffi/python-cffi-0.ebuild | 25 + 2 files changed, 33 insertions(+) diff --git a/virtual/python-cffi/metadata.xml b/virtual/python-cffi/metadata.xml new file mode 100644 index 000..6c90e34 --- /dev/null +++ b/virtual/python-cffi/metadata.xml @@ -0,0 +1,8 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + python + +j...@gentoo.org + + diff --git a/virtual/python-cffi/python-cffi-0.ebuild b/virtual/python-cffi/python-cffi-0.ebuild new file mode 100644 index 000..261af87 --- /dev/null +++ b/virtual/python-cffi/python-cffi-0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit python-r1 + +DESCRIPTION="A Virtual for Python foreign function interface" +HOMEPAGE="" +SRC_URI="" + +SLOT="0" +LICENSE="" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" +IUSE="" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep 'dev-python/cffi' 'python*')" +DEPEND=""
[gentoo-commits] repo/gentoo:master commit in: dev-python/cryptography/
commit: 79f0c13f86c0a567dc5616ea6be7fbf5afd40476 Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 11:29:15 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:29:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79f0c13f dev-python/cryptography: Version Bump Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> dev-python/cryptography/Manifest | 1 + dev-python/cryptography/cryptography-1.1.1.ebuild | 48 +++ 2 files changed, 49 insertions(+) diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest index 0c9b5e0..a960f6a 100644 --- a/dev-python/cryptography/Manifest +++ b/dev-python/cryptography/Manifest @@ -1,2 +1,3 @@ DIST cryptography-1.0.2.tar.gz 332870 SHA256 d64cd491e91ddf642c643bea16532c2a2da2da054cca6df756edadd55a8bacca SHA512 f266fbee6ab06ed6a552599dffe6d3e959dd858e6be7b81c0d4489c384fbb2b5de5ecf4f1e43e1dacbaa6ddefd1562f10961caec73cb3ed256faa03a5d4eff85 WHIRLPOOL ba8c13df5c58ab551f43ddf51cde8e85835a06eda83e5a5039e32308431b6f365692b01ea343adba6fcafe80d045a04b8ef37324e5bf1ada0adef10752f1e321 +DIST cryptography-1.1.1.tar.gz 348988 SHA256 2912923af7455fb2d2439a037242507c12caece7dd6659d62fa82a61edb2bae0 SHA512 d23b755cd57dfd983069c9ea8d8bb6f8ff6a1ef5a874de783a3686ec9ec9141f67f83956e676929188f93a1cca191a05f5172d94005ec38a8200f5d55bbfb1a7 WHIRLPOOL 829a5525de38712e0f155c2f22ce730ad33100b042ae905cf92897c2cbeda3026c97f1477bdd43cc191a4340d1993a03f26643e2493a1694b63a897143a227b9 DIST cryptography-1.1.tar.gz 348676 SHA256 059bc6428b1d0e2317f505698602642f1d8dda5b120ec573a59a430d8cb7a32d SHA512 8d5b5ac7cc2dcf7271dcd85c65c42cd815b95ec8502864da1b7c32c4a5905ecc6ae45f54d11e7b539d9ddf10d8bd3de9f40233c0b3cbdd1132b2ffbd4ebb318f WHIRLPOOL 0f154e624a51ebbc342ea082fc00a66b21024c81f3265e7d0e22e089afc5e83dcfe2857113d911db3a8e253d6fe93413ff94b91a83e97fd9405c3f08becc8a03 diff --git a/dev-python/cryptography/cryptography-1.1.1.ebuild b/dev-python/cryptography/cryptography-1.1.1.ebuild new file mode 100644 index 000..eff2cad --- /dev/null +++ b/dev-python/cryptography/cryptography-1.1.1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 + +DESCRIPTION="Library providing cryptographic recipes and primitives" +HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/; +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="|| ( Apache-2.0 BSD )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="libressl test" + +RDEPEND=" + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + $(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*') + $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy) + >=dev-python/idna-2.0[${PYTHON_USEDEP}] + >=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/six-1.4.1[${PYTHON_USEDEP}] + $(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy ) + virtual/python-ipaddress[${PYTHON_USEDEP}] + " +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + ~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}] + dev-python/hypothesis[${PYTHON_USEDEP}] + dev-python/iso8601[${PYTHON_USEDEP}] + dev-python/pretend[${PYTHON_USEDEP}] + dev-python/pyasn1-modules[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + )" + +DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst ) + +python_test() { + py.test -v -v -x || die "Tests fail with ${EPYTHON}" +}
[gentoo-commits] repo/gentoo:master commit in: dev-python/six/
commit: 24f3b61dbd6db8a41c01dc5ea8bd5bf4b87704b2 Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 11:00:44 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:29:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24f3b61d dev-python/six: Break if SITEDIR/six is a dir Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=546730 Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> dev-python/six/six-1.10.0.ebuild | 9 + 1 file changed, 9 insertions(+) diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild index 9faef64..ed0c5b8 100644 --- a/dev-python/six/six-1.10.0.ebuild +++ b/dev-python/six/six-1.10.0.ebuild @@ -26,6 +26,15 @@ PATCHES=( "${FILESDIR}"/1.9.0-mapping.patch ) +pkg_pretend() { + six_dir_check() { + local dir="${ROOT}"/$(python_get_sitedir)/six + [[ -d "${dir}" ]] \ + && die "${PN} doesn't work if ${dir} is a directory #546730" + } + python_foreach_impl six_dir_check +} + python_prepare_all() { # https://bitbucket.org/gutworth/six/issues/139/ sed \
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/pythonprop/
commit: 0be3dac38dff8837a42777dea1b3ddb180177057 Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 10:41:04 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:29:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0be3dac3 sci-visualization/pythonprop: Adopt to matplotlib USE=gtk renaming Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> sci-visualization/pythonprop/pythonprop-0.13.ebuild | 16 +++- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sci-visualization/pythonprop/pythonprop-0.13.ebuild b/sci-visualization/pythonprop/pythonprop-0.13.ebuild index a0e6bda..1b4ff07 100644 --- a/sci-visualization/pythonprop/pythonprop-0.13.ebuild +++ b/sci-visualization/pythonprop/pythonprop-0.13.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI=5 + PYTHON_COMPAT=( python2_7 ) inherit python-single-r1 @@ -16,12 +17,9 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="sci-electronics/voacapl - dev-python/matplotlib[gtk] - dev-python/basemap" +RDEPEND=" + dev-python/matplotlib[gtk2,${PYTHON_USEDEP}] + dev-python/basemap[${PYTHON_USEDEP}] + sci-electronics/voacapl +" DEPEND="${RDEPEND}" - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog NEWS TODO -}
[gentoo-commits] repo/gentoo:master commit in: dev-python/cryptography-vectors/
commit: 0936d55bdcc73ab99eb1b8f2ab57ddec93e708d3 Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 11:21:58 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:29:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0936d55b dev-python/cryptography-vectors: Version Bump Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> dev-python/cryptography-vectors/Manifest | 1 + .../cryptography-vectors-1.1.1.ebuild | 26 ++ 2 files changed, 27 insertions(+) diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest index c220ee2..63f9197 100644 --- a/dev-python/cryptography-vectors/Manifest +++ b/dev-python/cryptography-vectors/Manifest @@ -13,4 +13,5 @@ DIST cryptography_vectors-0.9.tar.gz 24983458 SHA256 d4accc8f5fb763cb65021c0e792 DIST cryptography_vectors-1.0.1.tar.gz 25005401 SHA256 e4ea240cb991a493bf2172056398b50f7c9e3cfbd809149b4887740a3d854cc4 SHA512 d77e5132f12111bed6cfa9c52cc3dd55f592980c76b9b370f1013d9d91a72c17b5bed49b9e2982b1e2aef7efccc02c0fc11f9706f7628affc94920cbc37c44a4 WHIRLPOOL c7b3a9f601997c6e0966402e08828c56ac5ee03017f1663394e69ae2cd6d4dc907b2c49d9c9a7b7893ef4f2d6fb283fd308987264c027baf21d5756be3f14508 DIST cryptography_vectors-1.0.2.tar.gz 25005614 SHA256 b849aa26a596b4ad8193d5b06a9414dab798c1f05c661321e759d5ebd944a937 SHA512 c87a915d83b8b57c8028edc3cfbd8efbf1f51b36508db4ef489481479cfc14a296fd1d76c5e013c60cdcf5458824fb16496aeabe2bb80004cf721286800d4751 WHIRLPOOL 90542095b97bf257ef871cf8b1224f5a2060cf80c4c34e44fbfaacf163020d4108c8a36aed90062ab6bb4cd65bfbc2149992eee1efd987955f1a86df551b4418 DIST cryptography_vectors-1.0.tar.gz 25003925 SHA256 e7277818b7bd99b502ee79d37cf5b9405577c39171919014756181b947ea0234 SHA512 e426e06d03b2e720cf7177a2d746dc45a2bc04455379d3231952543f3621e4829b43cedc09f7a96b7eba695b5424f8189916d4a7acafc08ca4cacb1965e672af WHIRLPOOL 397840e9c76cf8d50f85cf664d1dcab9cc9eb495c0d29830eb34d62d11c5b9f36f4e466d176d290c22febfecba85ca19358616cd3c8c967a060743175be7f852 +DIST cryptography_vectors-1.1.1.tar.gz 25028767 SHA256 7c2c682a2df72c436edb96a52b090073b4489dbb35c346724b23f2710318f19d SHA512 ca6126fa3ca27c6e77d620aede351d9ffefd61f068ec364d1679df9f018bbc891d9f7982d9adc2785117899b39760fda11540a058913cbab1738911a09661cd8 WHIRLPOOL e4ef88e801fddf55fad4210f1a294c6f64f23a60976ab0af207adedd98909c8d517b719e6630d90e99c8cfd61194d8c95a577f907491c8a55b701aa617191f00 DIST cryptography_vectors-1.1.tar.gz 25026549 SHA256 a929fbb0eac391c93c5745451a4d4157a8bc18eb2e69faf3af1d825ceacbf32c SHA512 e4d595f61bcf406a9b5422b1d6321ed18ef6c433b5557340b60d168b378a40cc7e068072a041b1190c6be00b83876b99e2bf441e154fc5a1b5ccfa51f485f731 WHIRLPOOL 5d0e82c2c07410c7e8848f6aaafbce274b4ac3ec65c7e6f73ea1e220d8433d8eae2151e0a9c28eb7d0245337f06fb7ca204a77a8febf0e60e019127a060af2ee diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.1.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.1.1.ebuild new file mode 100644 index 000..91cc437 --- /dev/null +++ b/dev-python/cryptography-vectors/cryptography-vectors-1.1.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +MY_PN=${PN/-/_} +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Test vectors for the cryptography package" +HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/; +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" + +LICENSE="|| ( Apache-2.0 BSD )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND="" + +S=${WORKDIR}/${MY_P}
[gentoo-commits] repo/gentoo:master commit in: virtual/python-cffi/
commit: 287d5b342f83ab5e29f75a030631a82b77c887ca Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 08:20:22 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:29:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=287d5b34 Drop virtual cffi virtual doesn't work, as packages need to rebuilt on bump of dev-python/cffi Signed-off-by: Justin Lecher gentoo.org> virtual/python-cffi/metadata.xml | 8 virtual/python-cffi/python-cffi-0.ebuild | 25 - 2 files changed, 33 deletions(-) diff --git a/virtual/python-cffi/metadata.xml b/virtual/python-cffi/metadata.xml deleted file mode 100644 index 6c90e34..000 --- a/virtual/python-cffi/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - -http://www.gentoo.org/dtd/metadata.dtd;> - - python - -j...@gentoo.org - - diff --git a/virtual/python-cffi/python-cffi-0.ebuild b/virtual/python-cffi/python-cffi-0.ebuild deleted file mode 100644 index 261af87..000 --- a/virtual/python-cffi/python-cffi-0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) - -inherit python-r1 - -DESCRIPTION="A Virtual for Python foreign function interface" -HOMEPAGE="" -SRC_URI="" - -SLOT="0" -LICENSE="" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" -IUSE="" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-python/cffi' 'python*')" -DEPEND=""
[gentoo-commits] dev/graaff:master commit in: dev-python/Djblets/
commit: f075bc8bd0c3f8dc657da6010452c8ff7eeffe5f Author: Hans de Graaff degraaff org> AuthorDate: Fri Nov 20 07:06:51 2015 + Commit: Hans de Graaff gentoo org> CommitDate: Fri Nov 20 07:06:51 2015 + URL:https://gitweb.gentoo.org/dev/graaff.git/commit/?id=f075bc8b dev-python/Djblets: add 0.9 Package-Manager: portage-2.2.20.1 dev-python/Djblets/Djblets-0.9.ebuild | 32 dev-python/Djblets/Manifest | 1 + 2 files changed, 33 insertions(+) diff --git a/dev-python/Djblets/Djblets-0.9.ebuild b/dev-python/Djblets/Djblets-0.9.ebuild new file mode 100644 index 000..fad7002 --- /dev/null +++ b/dev-python/Djblets/Djblets-0.9.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 versionator + +DESCRIPTION="A collection of useful extensions for Django" +HOMEPAGE="http://github.com/djblets/djblets; +SRC_URI="http://downloads.reviewboard.org/releases/${PN}/$(get_version_component_range 1-2)/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-python/django-1.6.11.1[${PYTHON_USEDEP}] + =dev-python/django-pipeline-1.3.23[${PYTHON_USEDEP}] + =dev-python/feedparser-5.1.2[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}]" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + +src_prepare() { + # Running uglify is a problem right now, so skip this step. Rather + # have newer versions than compacted javascript. + sed -e "s/'pipeline.compressors.uglifyjs.UglifyJSCompressor'/None/" -i djblets/settings.py || die +} diff --git a/dev-python/Djblets/Manifest b/dev-python/Djblets/Manifest index 732f56a..131e7f0 100644 --- a/dev-python/Djblets/Manifest +++ b/dev-python/Djblets/Manifest @@ -1 +1,2 @@ DIST Djblets-0.7.31.tar.gz 430369 SHA256 c6bdb1fed30ec1c77a8b07d670a170ecc55404363adf09b2860903a328909e12 SHA512 d0defd2a6e0caecd807e156d968b0128266d60aaf336303ec9ea3e01be1f01455bc763da02d639e677f1122f8eda8e039054ae16222879392eff332ec7b49969 WHIRLPOOL 7063209e5d3e55d89d4cc6fcfea584e24712d2427870448141eefedd29a94af0f4eb41df6097962d513ba09fa56b7cb1a1e5cf17a13646a2c3f046407b4f9977 +DIST Djblets-0.9.tar.gz 330999 SHA256 f4b6bb2e3597efa67e7cbdccd5d0403480e3a88e5cd934098c73f018b9dc25e7 SHA512 2581e63b8f7fff68097ffc2b55d1d098cfbb818a267e7fbe7bb986e1180e810f0556d0f0c0ab406c86c9bcc0e013d9d92b5f37fd4282e3ceb18ea4b4fc5196b0 WHIRLPOOL bc4f29812efe4eb1e8a78b03415aabd33dceb13b275be0df11cd3d0eb843fd65fd5a889161c53f378b818174a58ab94030a1355f769562e747d45983ecd75205
[gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/files/
commit: 889fa1375816b99303707b0da7e06d9e6cffddd2 Author: Pavel Denisov gmail com> AuthorDate: Tue Nov 10 00:02:11 2015 + Commit: Justin Lecher gentoo org> CommitDate: Thu Nov 19 01:20:29 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=889fa137 sci-misc/kaldi: Create unified diff for default_rules.mk patch Package-Manager: portage-2.2.24 .../kaldi/files/default_rules.mk.a7d9824.patch | 78 +- 1 file changed, 30 insertions(+), 48 deletions(-) diff --git a/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch b/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch index 458d453..7e60268 100644 --- a/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch +++ b/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch @@ -1,48 +1,30 @@ -*** makefiles/default_rules.mk.orig2015-10-28 22:11:07.903182744 -0400 makefiles/default_rules.mk 2015-10-29 20:43:41.081851545 -0400 -*** -*** 14,20 - LIBFILE = lib$(LIBNAME).so - #LDLIBS += -l$(LIBNAME) -endif -! LDFLAGS += -Wl,-rpath=$(shell readlink -f $(KALDILIBDIR)) -L. -LDFLAGS += $(foreach dep,$(ADDLIBS), -L$(dir $(dep)) ) -XDEPENDS = $(foreach dep,$(ADDLIBS), $(dir $(dep))/lib$(notdir $(basename $(dep))).so ) - else # Platform not supported 14,20 - LIBFILE = lib$(LIBNAME).so - #LDLIBS += -l$(LIBNAME) -endif -! LDFLAGS += -L. -LDFLAGS += $(foreach dep,$(ADDLIBS), -L$(dir $(dep)) ) -XDEPENDS = $(foreach dep,$(ADDLIBS), $(dir $(dep))/lib$(notdir $(basename $(dep))).so ) - else # Platform not supported -*** -*** 75,81 - @{ result=0;\ - for x in $(TESTFILES); do \ - printf "Running $$x ..."; \ -!./$$x >$$x.testlog 2>&1; \ - if [ $$? -ne 0 ]; then\ - echo "... FAIL $$x";\ - result=1; \ 75,81 - @{ result=0;\ - for x in $(TESTFILES); do \ - printf "Running $$x ..."; \ -!LD_LIBRARY_PATH=$(KALDILIBDIR):${LD_LIBRARY_PATH} ./$$x >$$x.testlog 2>&1;\ - if [ $$? -ne 0 ]; then\ - echo "... FAIL $$x";\ - result=1; \ -*** -*** 99,101 99,107 - # removing automatic making of "depend" as it's quite slow. - #.depend.mk: depend - -include .depend.mk -+ -+ print-binfiles: -+ @echo $(addprefix $(shell pwd)/, $(BINFILES)) -+ -+ print-libfiles: -+ @echo $(addsuffix .so, $(addprefix $(shell pwd)/lib, $(LIBNAME))) +--- makefiles/default_rules.mk.orig2015-11-06 18:43:31.0 -0400 makefiles/default_rules.mk 2015-11-09 18:42:33.609774157 -0400 +@@ -14,7 +14,7 @@ + LIBFILE = lib$(LIBNAME).so + #LDLIBS += -l$(LIBNAME) + endif +- LDFLAGS += -Wl,-rpath=$(shell readlink -f $(KALDILIBDIR)) -L. ++ LDFLAGS += -L. + LDFLAGS += $(foreach dep,$(ADDLIBS), -L$(dir $(dep)) ) + XDEPENDS = $(foreach dep,$(ADDLIBS), $(dir $(dep))/lib$(notdir $(basename $(dep))).so ) + else # Platform not supported +@@ -75,7 +75,7 @@ + @{ result=0;\ + for x in $(TESTFILES); do \ + printf "Running $$x ..."; \ +-./$$x >$$x.testlog 2>&1; \ ++LD_LIBRARY_PATH=$(KALDILIBDIR):${LD_LIBRARY_PATH} ./$$x >$$x.testlog 2>&1;\ + if [ $$? -ne 0 ]; then\ + echo "... FAIL $$x";\ + result=1; \ +@@ -99,3 +99,9 @@ + # removing automatic making of "depend" as it's quite slow. + #.depend.mk: depend + -include .depend.mk ++ ++print-binfiles: ++ @echo $(addprefix $(shell pwd)/, $(BINFILES)) ++ ++print-libfiles: ++ @echo $(addsuffix .so, $(addprefix $(shell pwd)/lib, $(LIBNAME)))
[gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/
commit: 9d956a08c867d1771a7a619dfb71d5d8274b8c93 Author: Pavel Denisov gmail com> AuthorDate: Thu Nov 19 01:15:59 2015 + Commit: Justin Lecher gentoo org> CommitDate: Thu Nov 19 01:45:39 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9d956a08 sci-misc/kaldi: Switch to user-selected BLAS/LAPACK Package-Manager: portage-2.2.24 sci-misc/kaldi/kaldi-0_p20151106.ebuild | 88 ++--- sci-misc/kaldi/metadata.xml | 3 -- 2 files changed, 58 insertions(+), 33 deletions(-) diff --git a/sci-misc/kaldi/kaldi-0_p20151106.ebuild b/sci-misc/kaldi/kaldi-0_p20151106.ebuild index 64fea67..e2e0bb6 100644 --- a/sci-misc/kaldi/kaldi-0_p20151106.ebuild +++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild @@ -4,7 +4,7 @@ EAPI="5" -inherit eutils flag-o-matic +inherit eutils toolchain-funcs flag-o-matic DESCRIPTION="A toolkit for speech recognition" HOMEPAGE="http://kaldi-asr.org/; @@ -12,62 +12,90 @@ SRC_URI="http://gentoo.akreal.net/distfiles/${P}.tar.xz; LICENSE="Apache-2.0" SLOT="0" -IUSE="doc test threads -atlas cuda" +IUSE="doc test cuda" KEYWORDS="~amd64" RDEPEND=" media-libs/speex + virtual/cblas virtual/lapack virtual/lapacke >=sci-misc/openfst-1.4.1 - atlas? ( sci-libs/atlas[threads=] ) - !atlas? ( sci-libs/openblas[-openmp,-threads] sci-libs/lapack-reference ) cuda? ( dev-util/nvidia-cuda-toolkit )" DEPEND="${RDEPEND} doc? ( app-doc/doxygen )" -REQUIRED_USE="!atlas? ( !threads )" - # We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage # user is (usually) not in the video group RESTRICT="test? ( cuda? ( userpriv ) )" src_prepare() { epatch \ - "${FILESDIR}"/configure.patch \ "${FILESDIR}"/Makefile.patch \ "${FILESDIR}"/default_rules.mk.a7d9824.patch } src_configure() { - if use atlas; then - myconf+=( --atlas-root="${EPREFIX}/usr/include/atlas" ) - if use threads; then - myconf+=( --threaded-atlas=yes ) - fi + append-cxxflags \ + -DKALDI_DOUBLEPRECISION=0 \ + -DHAVE_POSIX_MEMALIGN \ + -DHAVE_EXECINFO_H=1 \ + -DHAVE_CXXABI_H \ + -DHAVE_SPEEX \ + -DHAVE_OPENFST_GE_10400 \ + -std=c++0x \ + -Wall \ + -I.. \ + -pthread \ + -Wno-sign-compare \ + -Wno-unused-local-typedefs \ + -Winit-self \ + -rdynamic \ + -fPIC \ + $($(tc-getPKG_CONFIG) --cflags cblas) \ + $($(tc-getPKG_CONFIG) --cflags lapack) + + append-libs \ + -lspeex \ + -lfst \ + -lm \ + -lpthread \ + -ldl \ + $($(tc-getPKG_CONFIG) --libs cblas) \ + $($(tc-getPKG_CONFIG) --libs lapack) + + local cblas_provider=$(eselect cblas show) + + if [[ ${cblas_provider} =~ "atlas" ]]; then + append-cxxflags -DHAVE_ATLAS + elif [[ ${cblas_provider} =~ "mkl" ]]; then + append-cxxflags -DHAVE_MKL + elif [[ ${cblas_provider} =~ "openblas" ]]; then + append-cxxflags -DHAVE_OPENBLAS $($(tc-getPKG_CONFIG) --cflags lapacke) else - myconf+=( --openblas-root="${EPREFIX}/usr" ) - append-cxxflags "-I${EPREFIX}/usr/include/openblas" - append-libs -lreflapack + die "Build with ${cblas_provider} CBLAS is not supported" fi - # Upstream's configure script is "hand-generated" and not autotools compatible, - # for this reason econf can not be used - ./configure \ - --shared \ - --fst-root="${EPREFIX}/usr" \ - $(use cuda && echo "--use-cuda=yes --cudatk-dir=${EPREFIX}/opt/cuda" \ - || echo --use-cuda=no) \ - "${myconf[@]}" || die "failed to run configure" - use test || append-cxxflags -DNDEBUG - append-libs -lspeex - sed -i \ - -e "s:-g # -O0 -DKALDI_PARANOID:-DHAVE_SPEEX ${CXXFLAGS} :" \ - -e "s:-lm -lpthread -ldl:-lm -lpthread -ldl ${LIBS} ${LDFLAGS}:" \ - -e "s:CUDA_FLAGS = -g:CUDA_FLAGS = -O2:" \ - kaldi.mk || die "sed unix/kaldi.mk failed" + cat <<-EOF > kaldi.mk + KALDI_FLAVOR := dynamic + KALDILIBDIR := "${S}"/lib + CC = $(tc-getCXX) + RANLIB = $(tc-getRANLIB) + LDLIBS = ${LIBS} + EOF + + if use cuda; then + cat <<-EOF >> kaldi.mk + CUDA = true + CUDATKDIR = "${EPREFIX}"/opt/cuda + EOF + cat makefiles/linux_x86_64_cuda.mk >> kaldi.mk
[gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/
commit: 7fc25873fec545a84886b8520fad8a6d1e13e4f1 Author: Pavel Denisov gmail com> AuthorDate: Thu Nov 19 23:22:59 2015 + Commit: Justin Lecher gentoo org> CommitDate: Thu Nov 19 23:22:59 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7fc25873 sci-misc/kaldi: Add pkg_pretend() to check for suitable CBLAS provider Package-Manager: portage-2.2.24 sci-misc/kaldi/kaldi-0_p20151106.ebuild | 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sci-misc/kaldi/kaldi-0_p20151106.ebuild b/sci-misc/kaldi/kaldi-0_p20151106.ebuild index e2e0bb6..9657cef 100644 --- a/sci-misc/kaldi/kaldi-0_p20151106.ebuild +++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild @@ -29,6 +29,14 @@ DEPEND="${RDEPEND} # user is (usually) not in the video group RESTRICT="test? ( cuda? ( userpriv ) )" +pkg_pretend() { + local cblas_provider=$(eselect cblas show) + + if [[ ! ${cblas_provider} =~ (atlas|mkl|openblas) ]]; then + die "Build with '${cblas_provider}' CBLAS is not supported" + fi +} + src_prepare() { epatch \ "${FILESDIR}"/Makefile.patch \ @@ -66,14 +74,12 @@ src_configure() { local cblas_provider=$(eselect cblas show) - if [[ ${cblas_provider} =~ "atlas" ]]; then + if [[ ${cblas_provider} =~ atlas ]]; then append-cxxflags -DHAVE_ATLAS - elif [[ ${cblas_provider} =~ "mkl" ]]; then + elif [[ ${cblas_provider} =~ mkl ]]; then append-cxxflags -DHAVE_MKL - elif [[ ${cblas_provider} =~ "openblas" ]]; then + elif [[ ${cblas_provider} =~ openblas ]]; then append-cxxflags -DHAVE_OPENBLAS $($(tc-getPKG_CONFIG) --cflags lapacke) - else - die "Build with ${cblas_provider} CBLAS is not supported" fi use test || append-cxxflags -DNDEBUG
[gentoo-commits] proj/sci:master commit in: /
commit: 13c8caec3c78d5dbfb5c2aa9a2855acb29886627 Author: Justin Lecher gentoo org> AuthorDate: Wed Nov 18 07:13:24 2015 + Commit: Justin Lecher gentoo org> CommitDate: Wed Nov 18 07:13:24 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=13c8caec Merge pull request #538 from zasdfgbnm/patch-1 fix dependency on boost[python] sci-libs/rdkit/rdkit-2015.03.1.ebuild | 2 +- sci-libs/rdkit/rdkit-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/
commit: 24648b1c7fc42093d530c9937ea94be381e302ac Author: Pavel Denisov gmail com> AuthorDate: Mon Nov 9 23:58:05 2015 + Commit: Justin Lecher gentoo org> CommitDate: Thu Nov 19 01:20:29 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=24648b1c sci-misc/kaldi: Change dohtml to dodoc Package-Manager: portage-2.2.24 sci-misc/kaldi/kaldi-0_p20151106.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-misc/kaldi/kaldi-0_p20151106.ebuild b/sci-misc/kaldi/kaldi-0_p20151106.ebuild index a72c370..64fea67 100644 --- a/sci-misc/kaldi/kaldi-0_p20151106.ebuild +++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild @@ -87,5 +87,5 @@ src_test() { src_install() { dolib.so $(make print-libfiles) dobin $(make print-binfiles) - use doc && dohtml -r html/* + use doc && dodoc -r html }
[gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/files/, sci-misc/kaldi/
commit: c55b36e1b4aa36eb54f33d89aa5c18e2a740b98c Author: Pavel Denisov gmail com> AuthorDate: Sun Nov 8 20:28:04 2015 + Commit: Justin Lecher gentoo org> CommitDate: Thu Nov 19 01:20:29 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c55b36e1 sci-misc/kaldi: Version bump, switch to OpenBLAS math library by default, add CUDA support Package-Manager: portage-2.2.24 sci-misc/kaldi/ChangeLog | 8 ++ .../kaldi/files/default_rules.mk.a7d9824.patch | 48 sci-misc/kaldi/kaldi-0_p20151106.ebuild| 91 ++ sci-misc/kaldi/metadata.xml| 11 ++- 4 files changed, 157 insertions(+), 1 deletion(-) diff --git a/sci-misc/kaldi/ChangeLog b/sci-misc/kaldi/ChangeLog index fe47981..b40d171 100644 --- a/sci-misc/kaldi/ChangeLog +++ b/sci-misc/kaldi/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ +*kaldi-0_p20151106 (08 Nov 2015) + + 08 Nov 2015; Pavel Denisov+ +files/default_rules.mk.a7d9824.patch, +kaldi-0_p20151106.ebuild, + metadata.xml: + sci-misc/kaldi: Version bump, switch to OpenBLAS math library by default, add + CUDA support + *kaldi-0_p20150709 (18 Jul 2015) 18 Jul 2015; Pavel Denisov diff --git a/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch b/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch new file mode 100644 index 000..458d453 --- /dev/null +++ b/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch @@ -0,0 +1,48 @@ +*** makefiles/default_rules.mk.orig2015-10-28 22:11:07.903182744 -0400 +--- makefiles/default_rules.mk 2015-10-29 20:43:41.081851545 -0400 +*** +*** 14,20 + LIBFILE = lib$(LIBNAME).so + #LDLIBS += -l$(LIBNAME) +endif +! LDFLAGS += -Wl,-rpath=$(shell readlink -f $(KALDILIBDIR)) -L. +LDFLAGS += $(foreach dep,$(ADDLIBS), -L$(dir $(dep)) ) +XDEPENDS = $(foreach dep,$(ADDLIBS), $(dir $(dep))/lib$(notdir $(basename $(dep))).so ) + else # Platform not supported +--- 14,20 + LIBFILE = lib$(LIBNAME).so + #LDLIBS += -l$(LIBNAME) +endif +! LDFLAGS += -L. +LDFLAGS += $(foreach dep,$(ADDLIBS), -L$(dir $(dep)) ) +XDEPENDS = $(foreach dep,$(ADDLIBS), $(dir $(dep))/lib$(notdir $(basename $(dep))).so ) + else # Platform not supported +*** +*** 75,81 + @{ result=0;\ + for x in $(TESTFILES); do \ + printf "Running $$x ..."; \ +!./$$x >$$x.testlog 2>&1; \ + if [ $$? -ne 0 ]; then\ + echo "... FAIL $$x";\ + result=1; \ +--- 75,81 + @{ result=0;\ + for x in $(TESTFILES); do \ + printf "Running $$x ..."; \ +!LD_LIBRARY_PATH=$(KALDILIBDIR):${LD_LIBRARY_PATH} ./$$x >$$x.testlog 2>&1;\ + if [ $$? -ne 0 ]; then\ + echo "... FAIL $$x";\ + result=1; \ +*** +*** 99,101 +--- 99,107 + # removing automatic making of "depend" as it's quite slow. + #.depend.mk: depend + -include .depend.mk ++ ++ print-binfiles: ++ @echo $(addprefix $(shell pwd)/, $(BINFILES)) ++ ++ print-libfiles: ++ @echo $(addsuffix .so, $(addprefix $(shell pwd)/lib, $(LIBNAME))) diff --git a/sci-misc/kaldi/kaldi-0_p20151106.ebuild b/sci-misc/kaldi/kaldi-0_p20151106.ebuild new file mode 100644 index 000..128c268 --- /dev/null +++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic + +DESCRIPTION="A toolkit for speech recognition" +HOMEPAGE="http://kaldi-asr.org/; +SRC_URI="http://gentoo.akreal.net/distfiles/${P}.tar.xz; + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="doc test threads atlas cuda" +KEYWORDS="~amd64" + +RDEPEND=" + media-libs/speex + virtual/lapack + virtual/lapacke + >=sci-misc/openfst-1.4.1 + atlas? ( sci-libs/atlas[threads=] ) + !atlas? ( sci-libs/openblas[-openmp,-threads] sci-libs/lapack-reference ) + cuda? ( dev-util/nvidia-cuda-toolkit )" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" + +REQUIRED_USE="!atlas? ( !threads )" + +# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage +# user is (usually) not in the video group +RESTRICT="cuda? ( userpriv )" + +src_prepare() { + epatch \ + "${FILESDIR}"/configure.patch \ + "${FILESDIR}"/Makefile.patch \ + "${FILESDIR}"/default_rules.mk.a7d9824.patch +} + +src_configure() { + if use atlas; then + myconf+=( --atlas-root="${EPREFIX}/usr/include/atlas" ) +
[gentoo-commits] proj/sci:master commit in: sci-libs/rdkit/
commit: 4f6c87e3500f9750f66edd527a2fbf8fe7ac612b Author: Gao, Xiang gmail com> AuthorDate: Tue Nov 17 22:18:35 2015 + Commit: Justin Lecher gentoo org> CommitDate: Tue Nov 17 22:18:35 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4f6c87e3 fix dependency on python sci-libs/rdkit/rdkit-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/rdkit/rdkit-.ebuild b/sci-libs/rdkit/rdkit-.ebuild index 0b4f40a..be37c58 100644 --- a/sci-libs/rdkit/rdkit-.ebuild +++ b/sci-libs/rdkit/rdkit-.ebuild @@ -21,7 +21,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="dev-libs/boost python? ( - dev-libs/boost[${PYTHON_USEDEP}] + dev-libs/boost[python,${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] ) >=dev-db/sqlite-3"
[gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/
commit: 92caf979dce6cfc34b8a57e03e394b14b40d833a Author: Pavel Denisov gmail com> AuthorDate: Mon Nov 9 23:41:45 2015 + Commit: Justin Lecher gentoo org> CommitDate: Thu Nov 19 01:20:29 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=92caf979 sci-misc/kaldi: Fix IUSE Package-Manager: portage-2.2.24 sci-misc/kaldi/kaldi-0_p20151106.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-misc/kaldi/kaldi-0_p20151106.ebuild b/sci-misc/kaldi/kaldi-0_p20151106.ebuild index 128c268..63543d5 100644 --- a/sci-misc/kaldi/kaldi-0_p20151106.ebuild +++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://gentoo.akreal.net/distfiles/${P}.tar.xz; LICENSE="Apache-2.0" SLOT="0" -IUSE="doc test threads atlas cuda" +IUSE="doc test threads -atlas cuda" KEYWORDS="~amd64" RDEPEND="
[gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/
commit: 6d0c42fa63e22a8d44d8b45b243da36ad11ee57e Author: Pavel Denisov gmail com> AuthorDate: Mon Nov 9 23:55:51 2015 + Commit: Justin Lecher gentoo org> CommitDate: Thu Nov 19 01:20:29 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6d0c42fa sci-misc/kaldi: Fix RESTRICT conditions Package-Manager: portage-2.2.24 sci-misc/kaldi/kaldi-0_p20151106.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-misc/kaldi/kaldi-0_p20151106.ebuild b/sci-misc/kaldi/kaldi-0_p20151106.ebuild index 63543d5..a72c370 100644 --- a/sci-misc/kaldi/kaldi-0_p20151106.ebuild +++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild @@ -30,7 +30,7 @@ REQUIRED_USE="!atlas? ( !threads )" # We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage # user is (usually) not in the video group -RESTRICT="cuda? ( userpriv )" +RESTRICT="test? ( cuda? ( userpriv ) )" src_prepare() { epatch \
[gentoo-commits] proj/sci:master commit in: /
commit: 0a0b4bc009c4978a9d44459a3e15fc32a10080d2 Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 11:38:59 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:38:59 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0a0b4bc0 Merge remote-tracking branch 'github/master' * github/master: sci-misc/kaldi: Use cuda eclass sci-misc/kaldi: Add pkg_pretend() to check for suitable CBLAS provider sci-misc/kaldi: Switch to user-selected BLAS/LAPACK sci-misc/kaldi: Create unified diff for Makefile patch sci-misc/kaldi: Create unified diff for default_rules.mk patch sci-misc/kaldi: Change dohtml to dodoc sci-misc/kaldi: Fix RESTRICT conditions sci-misc/kaldi: Fix IUSE sci-misc/kaldi: Version bump, switch to OpenBLAS math library by default, add CUDA support fix dependency on python if rdkit don't uses python,boost won't need use fix dependency on boost[python] sci-libs/rdkit/rdkit-2015.03.1.ebuild | 2 +- sci-libs/rdkit/rdkit-.ebuild | 2 +- sci-misc/kaldi/ChangeLog | 8 ++ sci-misc/kaldi/Manifest| 1 + sci-misc/kaldi/files/Makefile.patch| 117 +-- .../kaldi/files/default_rules.mk.a7d9824.patch | 30 + sci-misc/kaldi/kaldi-0_p20151106.ebuild| 125 + sci-misc/kaldi/metadata.xml| 8 +- 8 files changed, 233 insertions(+), 60 deletions(-)
[gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/files/
commit: a1da40b60fe840950f023512d099ffb4078c11fa Author: Pavel Denisov gmail com> AuthorDate: Thu Nov 19 01:00:40 2015 + Commit: Justin Lecher gentoo org> CommitDate: Thu Nov 19 01:20:29 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a1da40b6 sci-misc/kaldi: Create unified diff for Makefile patch Package-Manager: portage-2.2.24 sci-misc/kaldi/files/Makefile.patch | 117 ++-- 1 file changed, 60 insertions(+), 57 deletions(-) diff --git a/sci-misc/kaldi/files/Makefile.patch b/sci-misc/kaldi/files/Makefile.patch index ef1a606..9fa1841 100644 --- a/sci-misc/kaldi/files/Makefile.patch +++ b/sci-misc/kaldi/files/Makefile.patch @@ -1,57 +1,60 @@ -*** Makefile.orig 2015-02-28 16:31:57.377401743 -0400 Makefile 2015-02-28 16:48:58.153175376 -0400 -*** -*** 30,36 - - # Reset the default goal, so that the all target will become default - .DEFAULT_GOAL := -! all: checkversion test_dependencies kaldi.mk mklibdir $(SUBDIRS) - -echo Done - - mklibdir: 30,36 - - # Reset the default goal, so that the all target will become default - .DEFAULT_GOAL := -! all: checkversion kaldi.mk mklibdir $(SUBDIRS) - -echo Done - - mklibdir: -*** -*** 88,103 - ext: test_dependencies ext_depend $(SUBDIRS) $(EXT_SUBDIRS) - -echo Done - -- ifndef OPENFST_VER -- $(error Please rerun configure: OPENFST_VER is not defined, likely kaldi.mk was produced by older configure script.) -- endif -- # Note: OPENFST_VER is determined by configure and added to kaldi.mk -- OPENFST_VER_NUM := $(shell echo $(OPENFST_VER) | sed 's/\./ /g' | xargs printf "%d%02d%02d") -- test_dependencies: -- ifeq ("$(shell expr $(OPENFST_VER_NUM) \< 10302)","1") -- $(error OpenFst $(OPENFST_VER) is not supported. You now need OpenFst >= 1.3.2.) -- endif -- - check_portaudio: - @[ -d ../tools/portaudio ] || ( cd ../tools; ./install_portaudio.sh ) - 88,93 -*** -*** 131,136 121,136 - ext_depend: check_portaudio - -for x in $(EXT_SUBDIRS); do $(MAKE) -C $$x depend; done - -+ print-binfiles: $(addsuffix /print-binfiles, $(SUBDIRS)) -+ -+ %/print-binfiles: -+ @$(MAKE) --no-print-directory -C $(dir $@) print-binfiles -+ -+ print-libfiles: $(addsuffix /print-libfiles, $(SUBDIRS)) -+ -+ %/print-libfiles: -+ @$(MAKE) --no-print-directory -C $(dir $@) print-libfiles -+ - - .PHONY: $(SUBDIRS) - $(SUBDIRS) : mklibdir +--- Makefile.orig 2015-11-06 18:43:31.0 -0400 Makefile 2015-11-17 20:15:14.452502675 -0400 +@@ -30,7 +30,7 @@ + + # Reset the default goal, so that the all target will become default + .DEFAULT_GOAL := +-all: checkversion test_dependencies kaldi.mk mklibdir $(SUBDIRS) ++all: kaldi.mk mklibdir $(SUBDIRS) + -echo Done + + mklibdir: +@@ -45,14 +45,6 @@ + @true + endif + +-.PHONY: checkversion +-checkversion: +-ifeq ($(shell ./configure --version),$(CONFIGURE_VERSION)) +- @echo "The version of configure script matches kaldi.mk version. Good." +-else +- $(error The kaldi.mk file was generated using a different version of configure script. Run the configure script again.) +-endif +- + biglib: $(SUBDIRS_LIB) + ifeq ($(KALDI_FLAVOR), dynamic) + ifeq ($(shell uname), Darwin) +@@ -88,16 +80,6 @@ + ext: test_dependencies ext_depend $(SUBDIRS) $(EXT_SUBDIRS) + -echo Done + +-ifndef OPENFST_VER +-$(error Please rerun configure: OPENFST_VER is not defined, likely kaldi.mk was produced by older configure script.) +-endif +-# Note: OPENFST_VER is determined by configure and added to kaldi.mk +-OPENFST_VER_NUM := $(shell echo $(OPENFST_VER) | sed 's/\./ /g' | xargs printf "%d%02d%02d") +-test_dependencies: +-ifeq ("$(shell expr $(OPENFST_VER_NUM) \< 10302)","1") +- $(error OpenFst $(OPENFST_VER) is not supported. You now need OpenFst >= 1.3.2.) +-endif +- + check_portaudio: + @[ -d ../tools/portaudio ] || ( cd ../tools; ./install_portaudio.sh ) + +@@ -131,6 +113,16 @@ + ext_depend: check_portaudio + -for x in $(EXT_SUBDIRS); do $(MAKE) -C $$x depend; done + ++print-binfiles: $(addsuffix /print-binfiles, $(SUBDIRS)) ++ ++%/print-binfiles: ++ @$(MAKE) --no-print-directory -C $(dir $@) print-binfiles ++ ++print-libfiles: $(addsuffix /print-libfiles, $(SUBDIRS)) ++ ++%/print-libfiles: ++ @$(MAKE) --no-print-directory -C $(dir $@) print-libfiles ++ + + .PHONY: $(SUBDIRS) + $(SUBDIRS) : mklibdir
[gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/
commit: f31b3eeaa38fdc2b33709436644c109e5ac6b5c7 Author: Pavel Denisov gmail com> AuthorDate: Fri Nov 20 00:16:01 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 00:16:01 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f31b3eea sci-misc/kaldi: Use cuda eclass Package-Manager: portage-2.2.24 sci-misc/kaldi/kaldi-0_p20151106.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-misc/kaldi/kaldi-0_p20151106.ebuild b/sci-misc/kaldi/kaldi-0_p20151106.ebuild index 9657cef..9a86cf6 100644 --- a/sci-misc/kaldi/kaldi-0_p20151106.ebuild +++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild @@ -4,7 +4,7 @@ EAPI="5" -inherit eutils toolchain-funcs flag-o-matic +inherit eutils toolchain-funcs cuda flag-o-matic DESCRIPTION="A toolkit for speech recognition" HOMEPAGE="http://kaldi-asr.org/; @@ -99,7 +99,7 @@ src_configure() { EOF cat makefiles/linux_x86_64_cuda.mk >> kaldi.mk sed -i \ - -e "s:CUDA_FLAGS = -g:CUDA_FLAGS = -O2:" \ + -e "s:CUDA_FLAGS = -g:CUDA_FLAGS = ${NVCCFLAGS}:" \ kaldi.mk || die "sed unix/kaldi.mk failed" fi }
[gentoo-commits] proj/sci:master commit in: sci-libs/rdkit/
commit: d3e18a1c5c48d14f6505981961d573c4a66c6e2e Author: Gao, Xiang gmail com> AuthorDate: Tue Nov 17 22:17:54 2015 + Commit: Justin Lecher gentoo org> CommitDate: Tue Nov 17 22:17:54 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d3e18a1c if rdkit don't uses python,boost won't need use if rdkit don't uses python,boost won't need use sci-libs/rdkit/rdkit-2015.03.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-libs/rdkit/rdkit-2015.03.1.ebuild b/sci-libs/rdkit/rdkit-2015.03.1.ebuild index 21b444b..38e30e9 100644 --- a/sci-libs/rdkit/rdkit-2015.03.1.ebuild +++ b/sci-libs/rdkit/rdkit-2015.03.1.ebuild @@ -18,9 +18,9 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="+python -static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND="dev-libs/boost[python] +RDEPEND="dev-libs/boost python? ( - dev-libs/boost[${PYTHON_USEDEP}] + dev-libs/boost[python,${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] ) >=dev-db/sqlite-3"
[gentoo-commits] proj/sci:master commit in: /
commit: 4e7846376ca4463f39fafdb001bb335a9e1dcffb Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 06:58:20 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 06:58:20 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4e784637 Merge pull request #528 from akreal/sci-misc/kaldi sci-misc/kaldi: Version bump, switch to OpenBLAS math library by default, add CUDA support sci-misc/kaldi/ChangeLog | 8 ++ sci-misc/kaldi/Manifest| 1 + sci-misc/kaldi/files/Makefile.patch| 117 +-- .../kaldi/files/default_rules.mk.a7d9824.patch | 30 + sci-misc/kaldi/kaldi-0_p20151106.ebuild| 125 + sci-misc/kaldi/metadata.xml| 8 +- 6 files changed, 231 insertions(+), 58 deletions(-)
[gentoo-commits] proj/sci:master commit in: sci-libs/rdkit/
commit: d74e903a793e3340ba471d976e135d580936ba77 Author: Gao, Xiang gmail com> AuthorDate: Mon Nov 16 19:40:36 2015 + Commit: Justin Lecher gentoo org> CommitDate: Mon Nov 16 19:40:36 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d74e903a fix dependency on boost[python] rdkit should requires that boost is installed with python support. sci-libs/rdkit/rdkit-2015.03.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/rdkit/rdkit-2015.03.1.ebuild b/sci-libs/rdkit/rdkit-2015.03.1.ebuild index 68ee45f..21b444b 100644 --- a/sci-libs/rdkit/rdkit-2015.03.1.ebuild +++ b/sci-libs/rdkit/rdkit-2015.03.1.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="+python -static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND="dev-libs/boost +RDEPEND="dev-libs/boost[python] python? ( dev-libs/boost[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib/
commit: 40c840c09b427b927b460ce490b28427bf64 Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Fri Nov 20 12:08:04 2015 + Commit: Andreas Hüttel gentoo org> CommitDate: Fri Nov 20 12:08:51 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40c84222 sci-libs/linux-gpib: Remove old Package-Manager: portage-2.2.25 sci-libs/linux-gpib/Manifest| 1 - sci-libs/linux-gpib/linux-gpib-3.2.20-r1.ebuild | 183 sci-libs/linux-gpib/linux-gpib-3.2.21.ebuild| 183 3 files changed, 367 deletions(-) diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest index 32a8ffc..a69e209 100644 --- a/sci-libs/linux-gpib/Manifest +++ b/sci-libs/linux-gpib/Manifest @@ -1,5 +1,4 @@ DIST gpib_firmware-2006-11-12.tar.gz 169357 SHA256 98380a8d12e6e34dccc0c1d82b48ed796c0c0f5571107d6a685524560aa8d701 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af WHIRLPOOL 44506c9d03e746f5bc88f9a2f20e07879a4c4c72f52a5dae97accb381f8ac7f5b5c0cf5c58d1045b18ed6cbda20549a1fdb7e5ab0151a1081da1ec798c683e67 -DIST linux-gpib-3.2.20.tar.gz 1254951 SHA256 cde3e77c3fd968e1ee5785abc2d6e09f0f66711fc2612abfc7b05c72c16c2e9a SHA512 679c3895ac5077b3246c43818c7c85ae53597d4a7e70ff2306978472337214952798c41eca9a4ae8be20aa3afa4bc78a7b796fccd6b63a8e1a879fcd144adea9 WHIRLPOOL 653ea123c81ccaf5d55055e70609152584adf36eb6cd0e421f10f5c86d24781e44ced125e9ac417901594c6ac83bed1f7123de27578ad3c841612bb9955eab85 DIST linux-gpib-3.2.21-ctrl-c.patch.gz 10477 SHA256 697a460ea8515788765983afb5c27ad527e6ab1e75232133c572530643351916 SHA512 4b34ecbc5a3f3170337808397df19b9cf09d3fc8a53052fb560ae7b5336b946c6b1c76ba24b0ad66d4bb5a005902fe8599bb7e981c140a68046b9f14ed5268b3 WHIRLPOOL 5656ed7d4dafeff4b766f247c4f495444d271130cbad8bedaef9b761e14b57c09b46a7ccd5e3be5ff50934f48a88a987eb71f6997aafdcd4adc486c49b2c0c5d DIST linux-gpib-3.2.21.tar.gz 1274505 SHA256 31fd86f4897239ffc55e0d4d850586d24d74144b604d6d39fd33dc59d28f7019 SHA512 539f7444e6bcd07d66cabc3abae9d40cdea3a84365bd69a4621149bc11b7b0e9826650d91d2a048d9780fab7db30005b08a4b91c77e7a26e036ed6f5adb6850b WHIRLPOOL 72a9c929d7e3b79c5c954fb6e41c4d9eb450595c6dccc877a3b47851e467e741b191a708ec3c018e4fe576e5677ffec5986970f83c020707bbbd8e2968e43153 DIST linux-gpib-4.0.2.tar.gz 1233294 SHA256 0a352a168d69ab564a2cc03ce7239370d944d187d6bc187697fb704c6e49d98f SHA512 20e504fa8e72c6c04b7cda70898cf520343d777825dfe976ea7fd11ee6aa4a8337c0badeec6c5c3c0bd20853d831802b0641c018817439677756654295ff65d6 WHIRLPOOL 8abc1afcd7010a6c585ca643c87813ab071b9a26a742d3ae3bb4349af17e16692d9f7d0b2a48c539f4c419108bcfc109e080ddc95fc8b1d28db560eab2544f74 diff --git a/sci-libs/linux-gpib/linux-gpib-3.2.20-r1.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.20-r1.ebuild deleted file mode 100644 index 02f8682..000 --- a/sci-libs/linux-gpib/linux-gpib-3.2.20-r1.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PERL_EXPORT_PHASE_FUNCTIONS=no -GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python2_7 ) - -inherit eutils linux-mod autotools perl-module python-single-r1 toolchain-funcs udev user - -DESCRIPTION="Kernel module and driver library for GPIB (IEEE 488.2) hardware" -HOMEPAGE="http://linux-gpib.sourceforge.net/; -SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz - firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~x86" -IUSE="isa pcmcia static debug guile perl php python tcl doc firmware" - -COMMONDEPEND=" - tcl? ( dev-lang/tcl:0= ) - guile? ( dev-scheme/guile:12 ) - perl? ( dev-lang/perl:= ) - php? ( dev-lang/php:= ) - python? ( ${PYTHON_DEPS} ) - firmware? ( sys-apps/fxload )" -RDEPEND="${COMMONDEPEND}" -DEPEND="${COMMONDEPEND} - virtual/pkgconfig - doc? ( app-text/docbook-sgml-utils ) - perl? ( virtual/perl-ExtUtils-MakeMaker )" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.2.15-build.patch - "${FILESDIR}"/${PN}-3.2.16-perl.patch - "${FILESDIR}"/${PN}-3.2.16-reallydie.patch -) - -pkg_setup () { - use perl && perl_set_version - use python && python_setup - linux-mod_pkg_setup - - if kernel_is -lt 2 6 8; then - die "Kernel versions older than 2.6.8 are not supported." - fi - - # https://sourceforge.net/tracker/?func=detail=3285657_id=42378=432940 - if use pcmcia && kernel_is -ge 2 6 38; then - die "pcmcia support is broken on kernels newer 2.6.38" - fi -} - -src_prepare () { - epatch ${PATCHES[@]} - epatch_user - eautoreconf -} - -src_configure() { - set_arch_to_kernel - econf \ -
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib/
commit: dda388c515172f02e7943323cb06d7f28124c35a Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Fri Nov 20 12:05:56 2015 + Commit: Andreas Hüttel gentoo org> CommitDate: Fri Nov 20 12:08:51 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dda388c5 sci-libs/linux-gpib: Version bump Package-Manager: portage-2.2.25 sci-libs/linux-gpib/Manifest| 1 + sci-libs/linux-gpib/linux-gpib-4.0.2.ebuild | 192 2 files changed, 193 insertions(+) diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest index a329b06..32a8ffc 100644 --- a/sci-libs/linux-gpib/Manifest +++ b/sci-libs/linux-gpib/Manifest @@ -2,3 +2,4 @@ DIST gpib_firmware-2006-11-12.tar.gz 169357 SHA256 98380a8d12e6e34dccc0c1d82b48e DIST linux-gpib-3.2.20.tar.gz 1254951 SHA256 cde3e77c3fd968e1ee5785abc2d6e09f0f66711fc2612abfc7b05c72c16c2e9a SHA512 679c3895ac5077b3246c43818c7c85ae53597d4a7e70ff2306978472337214952798c41eca9a4ae8be20aa3afa4bc78a7b796fccd6b63a8e1a879fcd144adea9 WHIRLPOOL 653ea123c81ccaf5d55055e70609152584adf36eb6cd0e421f10f5c86d24781e44ced125e9ac417901594c6ac83bed1f7123de27578ad3c841612bb9955eab85 DIST linux-gpib-3.2.21-ctrl-c.patch.gz 10477 SHA256 697a460ea8515788765983afb5c27ad527e6ab1e75232133c572530643351916 SHA512 4b34ecbc5a3f3170337808397df19b9cf09d3fc8a53052fb560ae7b5336b946c6b1c76ba24b0ad66d4bb5a005902fe8599bb7e981c140a68046b9f14ed5268b3 WHIRLPOOL 5656ed7d4dafeff4b766f247c4f495444d271130cbad8bedaef9b761e14b57c09b46a7ccd5e3be5ff50934f48a88a987eb71f6997aafdcd4adc486c49b2c0c5d DIST linux-gpib-3.2.21.tar.gz 1274505 SHA256 31fd86f4897239ffc55e0d4d850586d24d74144b604d6d39fd33dc59d28f7019 SHA512 539f7444e6bcd07d66cabc3abae9d40cdea3a84365bd69a4621149bc11b7b0e9826650d91d2a048d9780fab7db30005b08a4b91c77e7a26e036ed6f5adb6850b WHIRLPOOL 72a9c929d7e3b79c5c954fb6e41c4d9eb450595c6dccc877a3b47851e467e741b191a708ec3c018e4fe576e5677ffec5986970f83c020707bbbd8e2968e43153 +DIST linux-gpib-4.0.2.tar.gz 1233294 SHA256 0a352a168d69ab564a2cc03ce7239370d944d187d6bc187697fb704c6e49d98f SHA512 20e504fa8e72c6c04b7cda70898cf520343d777825dfe976ea7fd11ee6aa4a8337c0badeec6c5c3c0bd20853d831802b0641c018817439677756654295ff65d6 WHIRLPOOL 8abc1afcd7010a6c585ca643c87813ab071b9a26a742d3ae3bb4349af17e16692d9f7d0b2a48c539f4c419108bcfc109e080ddc95fc8b1d28db560eab2544f74 diff --git a/sci-libs/linux-gpib/linux-gpib-4.0.2.ebuild b/sci-libs/linux-gpib/linux-gpib-4.0.2.ebuild new file mode 100644 index 000..72a254f --- /dev/null +++ b/sci-libs/linux-gpib/linux-gpib-4.0.2.ebuild @@ -0,0 +1,192 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PERL_EXPORT_PHASE_FUNCTIONS=no +GENTOO_DEPEND_ON_PERL=no +PYTHON_COMPAT=( python2_7 ) + +inherit eutils linux-mod autotools perl-module python-single-r1 toolchain-funcs udev user + +DESCRIPTION="Kernel module and driver library for GPIB (IEEE 488.2) hardware" +HOMEPAGE="http://linux-gpib.sourceforge.net/; +SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz + firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz ) +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="isa pcmcia static debug guile perl php python tcl doc firmware" + +COMMONDEPEND=" + tcl? ( dev-lang/tcl:0= ) + guile? ( dev-scheme/guile:12 ) + perl? ( dev-lang/perl:= ) + php? ( dev-lang/php:= ) + python? ( ${PYTHON_DEPS} ) + firmware? ( sys-apps/fxload )" +RDEPEND="${COMMONDEPEND}" +DEPEND="${COMMONDEPEND} + virtual/pkgconfig + doc? ( app-text/docbook-sgml-utils ) + perl? ( virtual/perl-ExtUtils-MakeMaker )" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.2.21-build.patch + "${FILESDIR}"/${PN}-3.2.16-perl.patch + "${FILESDIR}"/${PN}-3.2.16-reallydie.patch +) + +pkg_setup () { + use perl && perl_set_version + use python && python_setup + linux-mod_pkg_setup + + if kernel_is -lt 2 6 8; then + die "Kernel versions older than 2.6.8 are not supported." + fi + + # https://sourceforge.net/tracker/?func=detail=3285657_id=42378=432940 + if use pcmcia && kernel_is -ge 2 6 38; then + die "pcmcia support is broken on kernels newer 2.6.38" + fi +} + +src_prepare () { + epatch ${PATCHES[@]} + epatch_user + eautoreconf +} + +src_configure() { + set_arch_to_kernel + econf \ + $(use_enable isa) \ + $(use_enable pcmcia) \ + $(use_enable static) \ + $(use_enable debug driver-debug) \ + $(use_enable guile guile-binding) \ + $(use_enable perl perl-binding) \ + $(use_enable php php-binding) \ + $(use_enable python python-binding) \ + $(use_enable tcl tcl-binding) \ +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/hashit/
commit: 574c764305b50c4da524d21b040b72dc3a625a24 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Nov 20 11:04:48 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Nov 20 11:04:48 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=574c7643 dev-libs/hashit: amd64 stable wrt bug #566216 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" dev-libs/hashit/hashit-0.9.7-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/hashit/hashit-0.9.7-r1.ebuild b/dev-libs/hashit/hashit-0.9.7-r1.ebuild index 55f479f..dc5c456 100644 --- a/dev-libs/hashit/hashit-0.9.7-r1.ebuild +++ b/dev-libs/hashit/hashit-0.9.7-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.pleyades.net/david/projects/${PN}/${P}.tar.bz2; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="debug" PATCHES=( "${FILESDIR}/${P}-pkgconfig.patch" )
[gentoo-commits] repo/gentoo:master commit in: dev-db/sqliteman/
commit: d2670454f18bf428756f0e3917d57410264344d9 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Nov 20 11:04:55 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Nov 20 11:04:55 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2670454 dev-db/sqliteman: amd64 stable wrt bug #566240 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild b/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild index 108154e..f6adf6c 100644 --- a/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild +++ b/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-physics/root/
commit: b0aeab3eeede114262a57f26d29736ae1ac4362e Author: Guilherme Amadio gentoo org> AuthorDate: Fri Nov 20 14:42:33 2015 + Commit: Guilherme Amadio gentoo org> CommitDate: Fri Nov 20 16:45:55 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0aeab3e sci-physics/root: Remove workaround to install some examples Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=564576 sci-physics/root/root-6.04.06.ebuild | 5 - 1 file changed, 5 deletions(-) diff --git a/sci-physics/root/root-6.04.06.ebuild b/sci-physics/root/root-6.04.06.ebuild index 1ccb466..90f9f5e 100644 --- a/sci-physics/root/root-6.04.06.ebuild +++ b/sci-physics/root/root-6.04.06.ebuild @@ -448,11 +448,6 @@ src_install() { python_optimize "${D}/usr/$(get_libdir)/root" fi use emacs && elisp-install ${PN} build/misc/*.{el,elc} - if use examples; then - # these should really be taken care of by the root make install - insinto ${DOC_DIR}/examples/tutorials/tmva - doins -r tmva/test - fi doenvd 99root # The build system installs Emacs support unconditionally in the wrong
[gentoo-commits] repo/gentoo:master commit in: sci-physics/root/
commit: 7d29a1675caa8c990854c552ccf3cb594ee7c7c0 Author: Guilherme Amadio gentoo org> AuthorDate: Fri Nov 20 16:41:17 2015 + Commit: Guilherme Amadio gentoo org> CommitDate: Fri Nov 20 16:45:55 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d29a167 sci-physics/root: install distributed INSTALL file PS: workaround with cat created a sandbox violation. Package-Manager: portage-2.2.25 sci-physics/root/root-6.04.06.ebuild | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sci-physics/root/root-6.04.06.ebuild b/sci-physics/root/root-6.04.06.ebuild index 90f9f5e..f498a73 100644 --- a/sci-physics/root/root-6.04.06.ebuild +++ b/sci-physics/root/root-6.04.06.ebuild @@ -421,7 +421,7 @@ cleanup_install() { rm -r etc/root/daemons || die # these should be in PATH mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die - rm ${DOC_DIR#/}/{INSTALL,LICENSE} || die + rm ${DOC_DIR#/}/INSTALL || die use examples || rm -r ${DOC_DIR#/}/examples || die # clean hardcoded sandbox paths @@ -460,12 +460,6 @@ src_install() { # do not copress files used by ROOT's CLI (.credit, .demo, .license) docompress -x "${DOC_DIR}"/{CREDITS,examples/tutorials} - # needed for .license command to work - cat > "${DOC_DIR}/LICENSE" <<- EOF - Please visit - https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html - for the full license test - EOF } pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: app-admin/puppetserver/
commit: e088314038b0af0a596654bc47d6d2bf6d57498f Author: Matthew Thode gentoo org> AuthorDate: Fri Nov 20 15:20:57 2015 + Commit: Matt Thode gentoo org> CommitDate: Fri Nov 20 15:20:57 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0883140 app-admin/puppetserver: bup Package-Manager: portage-2.2.20.1 app-admin/puppetserver/Manifest| 2 +- .../{puppetserver-2.1.1.ebuild => puppetserver-2.2.0.ebuild} | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest index 468a9b6..9191ff6 100644 --- a/app-admin/puppetserver/Manifest +++ b/app-admin/puppetserver/Manifest @@ -1,2 +1,2 @@ -DIST puppetserver-2.1.1.tar.gz 42547364 SHA256 206db88de533ebf0071a3d957aa21145500abb7748897b01f0de8e5d57dbff0c SHA512 850276fdd67f77f4c8e67be920ca4685fb267d6c90ed1eea41792c5f500ad4b199c198a4367a0faeb55d7aaf85ad531f50bd6704562c1c26bce499265d03a3d5 WHIRLPOOL aabce9259f99926788b9ff16e1b547e4f3c543a54c50a0bd3b0ef0e27eb5b1042981b5bbc73339b28b063798da3cd2453f45a40fcc77f9019f8db40fb5216f28 DIST puppetserver-2.1.2.tar.gz 42613471 SHA256 5b5ba875bad9d7ac6b060dab8ab02afb624878fa420d49c81954442c2d8b4048 SHA512 5b814f0268e232cef3e1b613cd0f608e14afacde2788700269687727c4a1f7dec2e353628e1714c71e086b9726972ef6d0aea2f997277e9c55eb481510430b5d WHIRLPOOL 357cf5e5c347d7942748cae3240a2aedaaab48293c4c7c7eb71b4723582a427760fe97cb954dc196a5fd87e1323ca3b2cd9e256429e5aee61f9a148a23de3537 +DIST puppetserver-2.2.0.tar.gz 42664943 SHA256 960603e0af9b7bf622db562d00516dfbbf1549ce82ad4eacf97c9a45c2c02e0d SHA512 a7413921ed2aaadfa0d9250482379e54ef7538f237a287bf3bc7226b3df45bdfd86b51768d4c36bfee7c26520c5c4189b56a2622009a8253140e5423a253198a WHIRLPOOL 6b77f4b47105600ec8f23871835852657b86a6692d4a89d104522cfcde2ad16136ef3f693857f56af4381af1320cd50d3b90ea255f59eadabc3f0edfaf92185f diff --git a/app-admin/puppetserver/puppetserver-2.1.1.ebuild b/app-admin/puppetserver/puppetserver-2.2.0.ebuild similarity index 95% rename from app-admin/puppetserver/puppetserver-2.1.1.ebuild rename to app-admin/puppetserver/puppetserver-2.2.0.ebuild index d40553c..cfc7fb3 100644 --- a/app-admin/puppetserver/puppetserver-2.1.1.ebuild +++ b/app-admin/puppetserver/puppetserver-2.2.0.ebuild @@ -101,7 +101,4 @@ pkg_postinst() { elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" elog "puppet config set --section master codedir /etc/puppetlabs/code" -# elog -# elog "the jruby needs it's own puppet gem installed..." -# elog "/opt/puppetlabs/server/apps/puppetserver/bin/puppetserver gem install puppet" }
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmikmod/, media-libs/libmikmod/files/3.2.0/
commit: 1ab8a9812c16c8207df695c18ccbea517810730b Author: Alexis Ballier gentoo org> AuthorDate: Fri Nov 20 15:20:10 2015 + Commit: Alexis Ballier gentoo org> CommitDate: Fri Nov 20 15:24:57 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ab8a981 media-libs/libmikmod: remove old Package-Manager: portage-2.2.25 Signed-off-by: Alexis Ballier gentoo.org> media-libs/libmikmod/Manifest | 3 - .../libmikmod/files/3.2.0/001_all_64bit.patch | 26 - .../libmikmod/files/3.2.0/002_all_strip-lib.patch | 13 --- .../libmikmod/files/3.2.0/003_all_multilib.patch | 35 --- .../files/3.2.0/004_all_malloc-fail.patch | 22 - .../files/3.2.0/005_all_CVE-2007-6720.patch| 109 - .../files/3.2.0/006_all_CVE-2009-0179.patch| 12 --- .../files/3.2.0/007_all_loopingvolume-fix.patch| 21 .../libmikmod/files/3.2.0/008_all_ldflags.patch| 15 --- .../libmikmod/files/3.2.0/009_all_shell.patch | 17 .../libmikmod/files/3.2.0/010_all_altivec.patch| 13 --- media-libs/libmikmod/libmikmod-3.2.0.ebuild| 63 media-libs/libmikmod/libmikmod-3.3.5.ebuild| 65 media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild | 69 - 14 files changed, 483 deletions(-) diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest index fff1d96..e418d54 100644 --- a/media-libs/libmikmod/Manifest +++ b/media-libs/libmikmod/Manifest @@ -1,4 +1 @@ -DIST libmikmod-3.2.0.tar.gz 873258 SHA256 734c8490bbf9b0c587920b92414dcfa3c2267838a0cdf698d5f1fb6bba8f661e SHA512 1f48adb4e1540bb9d2ea90c2f1fd1fb2fc494ae2dd0a6bceb20a8f7f7101f37f8c967b0ce36d5e09943d3afe9319f533867d80e5b5552439d300691bee70e33d WHIRLPOOL f7a7aed29026c66abb9e0f2bfb5d703ad5a0cab7bc0454bf5e612ed995808a2d02361eda33c7bbe0e7aaef6aa9ba5f1ed0d6eaf2853a2d6b497c6359043804c3 -DIST libmikmod-3.3.5.tar.gz 1288856 SHA256 b714ee340a04e6867f60246f679e0f40063b92f99269b6b715c8bf19ad469fb6 SHA512 ded555754dcc582a112386ad80c11a29c77d696a184a593964449a6c2c024da5d4cc59133a20d0e0e18a6fbad710a5d8ff567527654c91dff06e070749442aab WHIRLPOOL 30a72a0239257b511d1c2805b5812a57ec271263bbd306e327583a1ac0c8f83b31cdf0ff39846ddd72b650ad122ded2ea741dfdb16f6d43979a49f3c5fe2844e -DIST libmikmod-3.3.6.tar.gz 1288510 SHA256 3f363e03f7b1db75b9b6602841bbd440ed275a548e53545f980df8155de4d330 SHA512 708008d162bac1a17b090a3a56e3078bb3ce42cb0d54b1e57963881d060198e841654ec7a72212aa9dc0e5c8bd95ec1c41ddd58e2db8c6e91a29d22d7bf363a0 WHIRLPOOL 42c0a1f88620fffc4099f87ed04fc5ad1d308bce86e2df085365a3d2624d801cf27dc3c28ec054ab7c4763af4af09d16c9f44e848b4ee23b7efd09ebfa4268d0 DIST libmikmod-3.3.7.tar.gz 1226732 SHA256 4cf41040a9af99cb960580210ba900c0a519f73ab97b503c780e82428b9bd9a2 SHA512 3d2db6d0838a957f073f43f81e8ee20d803e5103e71bcbf7bb08f8a7776a77be50958522fc48e3ea9c20ee20a5a60eda8a66cd403f382ebd6c7910c6325dd4e9 WHIRLPOOL 708032fddc2260e52baee07dc00c45ac3dd0936d1c0f3f3b131dd3627fa7e1f0c699ab8184863f6435286ea4e1f83599cac76ce985ebd92a2d15ab7844d83fdf diff --git a/media-libs/libmikmod/files/3.2.0/001_all_64bit.patch b/media-libs/libmikmod/files/3.2.0/001_all_64bit.patch deleted file mode 100644 index 5aa4556..000 --- a/media-libs/libmikmod/files/3.2.0/001_all_64bit.patch +++ /dev/null @@ -1,26 +0,0 @@ -http://pkgs.fedoraproject.org/cgit/libmikmod.git/tree/libmikmod-64bit.patch - include/mikmod.h.in -+++ include/mikmod.h.in -@@ -85,7 +85,8 @@ typedef char CHAR; - - @DOES_NOT_HAVE_SIGNED@ - --#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__) -+#include -+#if __WORDSIZE == 64 - /* 64 bit architectures */ - - typedef signed char SBYTE; /* 1 byte, signed */ include/mikmod_internals.h -+++ include/mikmod_internals.h -@@ -43,7 +43,8 @@ extern "C" { - /*== More type definitions */ - - /* SLONGLONG: 64bit, signed */ --#if defined (__arch64__) || defined(__alpha) || defined (__x64_64) || defined (_LP64) || defined (__powerpc64__) -+#include -+#if __WORDSIZE == 64 - typedef long SLONGLONG; - #define NATIVE_64BIT_INT - #elif defined(__WATCOMC__) diff --git a/media-libs/libmikmod/files/3.2.0/002_all_strip-lib.patch b/media-libs/libmikmod/files/3.2.0/002_all_strip-lib.patch deleted file mode 100644 index beef612..000 --- a/media-libs/libmikmod/files/3.2.0/002_all_strip-lib.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://pkgs.fedoraproject.org/cgit/libmikmod.git/tree/libmikmod-strip-lib.patch - libmikmod/Makefile.in -+++ libmikmod/Makefile.in -@@ -51,7 +51,7 @@ - - install: $(LIB) - $(MKINSTALLDIRS) $(DESTDIR)$(libdir) -- $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(LIB) $(DESTDIR)$(libdir) -+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(LIB) $(DESTDIR)$(libdir) - - uninstall:$(LIB) - $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIB) diff --git
[gentoo-commits] repo/gentoo:master commit in: media-sound/mikmod/
commit: 348f061574febaf02e91a387f9532871821dcfa9 Author: Alexis Ballier gentoo org> AuthorDate: Fri Nov 20 15:23:24 2015 + Commit: Alexis Ballier gentoo org> CommitDate: Fri Nov 20 15:24:57 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=348f0615 media-sound/mikmod: remove old Package-Manager: portage-2.2.25 Signed-off-by: Alexis Ballier gentoo.org> media-sound/mikmod/Manifest| 1 - media-sound/mikmod/mikmod-3.2.5.ebuild | 20 2 files changed, 21 deletions(-) diff --git a/media-sound/mikmod/Manifest b/media-sound/mikmod/Manifest index 99bc8d5..38a0456 100644 --- a/media-sound/mikmod/Manifest +++ b/media-sound/mikmod/Manifest @@ -1,2 +1 @@ -DIST mikmod-3.2.5.tar.gz 285801 SHA256 da2b4b13f769a7c54119869851c8e6b9a6ca812b96fe5e2c5394441722e4e383 SHA512 e441d5dc4a3f6f2101e4db8cd3cb55f90a418d92767c143c1754c8ef33445aa4ace48a48ab8c209336c0eb3fd66590380cfbbe71c086908dfb0ae9fdd88adca5 WHIRLPOOL 9f46690799f4f1a899eaff15367512969f461ae6264024e1b1350b59fed979bac42ffcce9569558675a8f257c7de22ded1d0df9f30e4ebbe03fd109c81e8f334 DIST mikmod-3.2.6.tar.gz 278754 SHA256 04544e0edb36a19fab61233dff97430969cff378a98f5989a1378320550e2673 SHA512 7a3fbbf7b0ceff92448224a7d9d58660c8f0ecdb26fe08b1b318abf2b07dd18d472467c226c72fcefd73aa9c42da813c65b236c91f5c582e41fad33b6ee96cc5 WHIRLPOOL aa66da48f4e00e5f823ae512d3005dc4c80693d2b768a43f4ca40fbaecee71cc048f3ad9d136b3df2a78f79545bec34641b85b3fd1690ab65f09068228babec8 diff --git a/media-sound/mikmod/mikmod-3.2.5.ebuild b/media-sound/mikmod/mikmod-3.2.5.ebuild deleted file mode 100644 index 3530e48..000 --- a/media-sound/mikmod/mikmod-3.2.5.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -DESCRIPTION="A console MOD-Player based on libmikmod" -HOMEPAGE="http://mikmod.sourceforge.net/; -SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ~ia64 ppc ~sparc x86" -IUSE="" - -RDEPEND=">=media-libs/libmikmod-3.2.0 - >=sys-libs/ncurses-5.7-r7" -DEPEND="${RDEPEND}" - -DOCS="AUTHORS NEWS README"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmikmod/
commit: 45cfa5b058874c2d8c409a6e8fdd2d52a4938dc1 Author: Alexis Ballier gentoo org> AuthorDate: Fri Nov 20 15:22:50 2015 + Commit: Alexis Ballier gentoo org> CommitDate: Fri Nov 20 15:24:57 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45cfa5b0 media-libs/libmikmod: bump to 3.3.8 Package-Manager: portage-2.2.25 Signed-off-by: Alexis Ballier gentoo.org> media-libs/libmikmod/Manifest | 1 + media-libs/libmikmod/libmikmod-3.3.8.ebuild | 70 + 2 files changed, 71 insertions(+) diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest index e418d54..e396395 100644 --- a/media-libs/libmikmod/Manifest +++ b/media-libs/libmikmod/Manifest @@ -1 +1,2 @@ DIST libmikmod-3.3.7.tar.gz 1226732 SHA256 4cf41040a9af99cb960580210ba900c0a519f73ab97b503c780e82428b9bd9a2 SHA512 3d2db6d0838a957f073f43f81e8ee20d803e5103e71bcbf7bb08f8a7776a77be50958522fc48e3ea9c20ee20a5a60eda8a66cd403f382ebd6c7910c6325dd4e9 WHIRLPOOL 708032fddc2260e52baee07dc00c45ac3dd0936d1c0f3f3b131dd3627fa7e1f0c699ab8184863f6435286ea4e1f83599cac76ce985ebd92a2d15ab7844d83fdf +DIST libmikmod-3.3.8.tar.gz 1254702 SHA256 4acf6634a477d8b95f18b55a3e2e76052c149e690d202484e8b0ac7589cf37a2 SHA512 033e3977d5723c42af697bf1b9ba6b1912fff1bfbef1894e2b1919d55415efa8024046579ff6a1e9ec752a3c793acc60b616c223b3cb5d79a814746c0cf55e15 WHIRLPOOL 569dda4099e7b7b0c8f198425c9ae68f0fd6a1468e301e133482e24aef04ff85385aafe0ead3b847fb138d3c3fca06a9b588f3a896cf789143a2622d826f4cb1 diff --git a/media-libs/libmikmod/libmikmod-3.3.8.ebuild b/media-libs/libmikmod/libmikmod-3.3.8.ebuild new file mode 100644 index 000..2219384 --- /dev/null +++ b/media-libs/libmikmod/libmikmod-3.3.8.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils multilib-minimal + +DESCRIPTION="A library to play a wide range of module formats" +HOMEPAGE="http://mikmod.sourceforge.net/; +SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz" + +LICENSE="LGPL-2+ LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads" + +REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )" + +RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] ) + nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] ) + openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] ) + pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] ) + !${CATEGORY}/${PN}:2 + abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3 + !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" +DEPEND="${RDEPEND} + sys-apps/texinfo + oss? ( virtual/os-headers )" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/libmikmod-config +) + +multilib_src_configure() { + local mysimd="--disable-simd" + if use ppc || use ppc64 || use ppc-macos; then + mysimd="$(use_enable altivec simd)" + fi + if use amd64 || use x86 || use x86-fbsd || use x86-freebsd || use amd64-linux || use x86-linux || use x86-macos; then + mysimd="$(use_enable cpu_flags_x86_sse2 simd)" + fi + + # sdl, sdl2: missing multilib supported ebuilds, temporarily disabled, remember to update REQUIRED_USE + ECONF_SOURCE=${S} \ + econf \ + $(use_enable alsa) \ + $(use_enable nas) \ + $(use_enable pulseaudio) \ + --disable-sdl \ + --disable-sdl2 \ + $(use_enable openal) \ + $(use_enable oss) \ + $(use_enable coreaudio osx) \ + $(use_enable debug) \ + $(use_enable threads) \ + $(use_enable static-libs static) \ + --disable-dl \ + ${mysimd} +} + +multilib_src_install() { + emake DESTDIR="${D}" install + dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2) +} + +multilib_src_install_all() { + dodoc AUTHORS NEWS README TODO + dohtml docs/*.html + prune_libtool_files +}
[gentoo-commits] repo/gentoo:master commit in: media-sound/mikmod/
commit: 23f8f820ce1b978ccbf256bebd7e22410d7146f0 Author: Alexis Ballier gentoo org> AuthorDate: Fri Nov 20 15:24:52 2015 + Commit: Alexis Ballier gentoo org> CommitDate: Fri Nov 20 15:24:57 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23f8f820 media-sound/mikmod: bump to 3.2.7 Package-Manager: portage-2.2.25 Signed-off-by: Alexis Ballier gentoo.org> media-sound/mikmod/Manifest| 1 + media-sound/mikmod/mikmod-3.2.7.ebuild | 20 2 files changed, 21 insertions(+) diff --git a/media-sound/mikmod/Manifest b/media-sound/mikmod/Manifest index 38a0456..3fc2a4d 100644 --- a/media-sound/mikmod/Manifest +++ b/media-sound/mikmod/Manifest @@ -1 +1,2 @@ DIST mikmod-3.2.6.tar.gz 278754 SHA256 04544e0edb36a19fab61233dff97430969cff378a98f5989a1378320550e2673 SHA512 7a3fbbf7b0ceff92448224a7d9d58660c8f0ecdb26fe08b1b318abf2b07dd18d472467c226c72fcefd73aa9c42da813c65b236c91f5c582e41fad33b6ee96cc5 WHIRLPOOL aa66da48f4e00e5f823ae512d3005dc4c80693d2b768a43f4ca40fbaecee71cc048f3ad9d136b3df2a78f79545bec34641b85b3fd1690ab65f09068228babec8 +DIST mikmod-3.2.7.tar.gz 279228 SHA256 5f398d5a5ccee2ce331036514857ac7e13a5644267a13fb11f5a7209cf709264 SHA512 cd68f46418af4fedd6fef35c48c120cc8ddb66c0160107528ee8816228cac1732fb3f474a850317022d2161cd619e5694645c78690792fee743130d380684c4d WHIRLPOOL 9c884b333b960f40951b4a208ec1ddbf78a02b27c96c26ef165103dc1c9c9061fbe1907ba1788f3fea17d2e13f408c88f8a1109621b30db9b39f86cf0268aa3f diff --git a/media-sound/mikmod/mikmod-3.2.7.ebuild b/media-sound/mikmod/mikmod-3.2.7.ebuild new file mode 100644 index 000..6e34d80 --- /dev/null +++ b/media-sound/mikmod/mikmod-3.2.7.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="A console MOD-Player based on libmikmod" +HOMEPAGE="http://mikmod.sourceforge.net/; +SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86" +IUSE="" + +RDEPEND=">=media-libs/libmikmod-3.3 + >=sys-libs/ncurses-5.7-r7:0=" +DEPEND="${RDEPEND}" + +DOCS="AUTHORS NEWS README"
[gentoo-commits] repo/gentoo:master commit in: gnome-base/gvfs/
commit: cd6637d8d57823f6a1ceebbe3e12d1c105674386 Author: Patrick McLean gentoo org> AuthorDate: Fri Nov 20 18:07:27 2015 + Commit: Patrick McLean gentoo org> CommitDate: Fri Nov 20 18:07:49 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd6637d8 gnome-base/gvfs: add "google" USE flag that makes the libgdata dep optional This fixes bug 566294 Package-Manager: portage-2.2.24 gnome-base/gvfs/gvfs-1.26.2.ebuild | 5 +++-- gnome-base/gvfs/metadata.xml | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gnome-base/gvfs/gvfs-1.26.2.ebuild b/gnome-base/gvfs/gvfs-1.26.2.ebuild index edab684..b0dcce1 100644 --- a/gnome-base/gvfs/gvfs-1.26.2.ebuild +++ b/gnome-base/gvfs/gvfs-1.26.2.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/gvfs; LICENSE="LGPL-2+" SLOT="0" -IUSE="afp archive bluray cdda fuse gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs samba systemd test +udev udisks zeroconf" +IUSE="afp archive bluray cdda fuse +google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs samba systemd test +udev udisks zeroconf" REQUIRED_USE=" cdda? ( udev ) mtp? ( udev ) @@ -29,7 +29,6 @@ RDEPEND=" >=dev-libs/glib-2.45.7:2 sys-apps/dbus dev-libs/libxml2:2 - >=dev-libs/libgdata-0.17.3:=[gnome] net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) @@ -37,6 +36,7 @@ RDEPEND=" fuse? ( >=sys-fs/fuse-2.8.0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 ) + google? ( >=dev-libs/libgdata-0.17.3:=[gnome] ) gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-2.42:2.4 ) @@ -109,6 +109,7 @@ src_configure() { $(use_enable fuse) \ $(use_enable gnome-keyring keyring) \ $(use_enable gnome-online-accounts goa) \ + $(use_enable google) \ $(use_enable gphoto2) \ $(use_enable gtk) \ $(use_enable ios afc) \ diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml index 93e236d..8933979 100644 --- a/gnome-base/gvfs/metadata.xml +++ b/gnome-base/gvfs/metadata.xml @@ -15,6 +15,7 @@ applications not using gio to access the gvfs filesystems. Enable playback of Blu-ray filesystems using media-libs/libbluray Enables fuse mount points in $HOME/.gvfs for legacy application access Enable configuration panel for net-libs/gnome-online-accounts accounts + Enables support for accessing Google accounts via dev-libs/libgdata Enable the HTTP/DAV backend using net-libs/libsoup-gnome Enable app-crypt/libsecret support to store login credentials. Enable NFS client support via net-fs/libnfs.
[gentoo-commits] dev/ikelos:master commit in: media-video/get_iplayer/
commit: 501b807a623ab41dca52b68d46c50bea512fe3cf Author: layman localhost> AuthorDate: Fri Nov 20 19:09:46 2015 + Commit: Mike Auty gentoo org> CommitDate: Fri Nov 20 19:09:46 2015 + URL:https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=501b807a Allow mpv as well as mplayer. media-video/get_iplayer/Manifest| 4 ++-- media-video/get_iplayer/get_iplayer-2.94.ebuild | 3 ++- media-video/get_iplayer/get_iplayer-.ebuild | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/media-video/get_iplayer/Manifest b/media-video/get_iplayer/Manifest index b4778f8..504118b 100644 --- a/media-video/get_iplayer/Manifest +++ b/media-video/get_iplayer/Manifest @@ -1,3 +1,3 @@ DIST get_iplayer-2.94.tar.gz 276644 SHA256 24fed05b1a732652b71513b36c7e38272a961f0cef8c9b8d6688ba74105fe09a SHA512 2e91631fa8d8ef384f454a4812f35a4f8af749feba5373d6203d769d85212f09a8c69b076d245dad00739739b8cf7bdf9a3b401a42295365f9fc7494458be906 WHIRLPOOL d06ad47cf4237b707c4c2176951a035acdaf1a407004b20762494f68e992d17816abbc501a4e8d3aca46ad2c8d4bd8f4900a8f7a4ee9561d7a931093d06dd3a9 -EBUILD get_iplayer-2.94.ebuild 574 SHA256 f3254ac2c51605924294f8a36d09e76a1aa7b4145412ecc217df8472ff437f56 SHA512 e45da81947236a4f75e6b5290a6b437e8efd00cfbed8906dea1a7b87bf45c91ea73acbec997e0132baf313d36377592128ef81e6e90f52b857b920529c752fce WHIRLPOOL 0a0f7ab5f3cf9e8914602c72f1e053720aec2ab96e9bb7ab1f30c3163e8c697e322a792b6c4d30e0f4861b06d1017d7aa44ee00778fc7d139473e3e6863c5372 -EBUILD get_iplayer-.ebuild 648 SHA256 2411bea869ff7a5d52401e7ace2641b5d7bdc55ba206d08d437a7e05d083a33e SHA512 daf7c83e36f166c79fc7b73d45c248a9c57157ab19b21caee390b6fa01ec40b62c0a1a2642c59a1775039c42e618da0a9161b45f07da845257b67318a65a600b WHIRLPOOL fe6ade24bb0f31c0adebeed4339788b204d7d839ab772647e9cd49d8ed191aae7b03198edfbb30ca92386707489b5c3f17b55e4f618ccd718d912887e08fa01f +EBUILD get_iplayer-2.94.ebuild 611 SHA256 18c433513a56aad02072f0f993998513792d0b20ed4fd79af1e503603730cd79 SHA512 c77bd848c4a7d2d7b6c8e84aa7af7b66a39545f15afaab0e19b918fdf0137e503ccbb1245be868162dee20d30a2d8540c49c665fee45a3b35652cfa01ce3ef23 WHIRLPOOL 3cd6c8dfb161651c9c6b8ee1cba3f2aecdab77e5decca84b563ca488d271802a3e032bb89604fd9d8f2d778571023a89c3f72ca225082c5d82025105550789bc +EBUILD get_iplayer-.ebuild 685 SHA256 a2605f959f2ef853fa963b1dec4783fdd8f08eeb622bca2f2c09ac62031b2b8c SHA512 b3f094a080e5cf6be4bd52e7defef7f2a8ec758f3bf30d1e5568fb22dce695dce9d57992dc6aa4f851271a95882b99da56cd7ffc6619d9dbdff1a5d69338fc39 WHIRLPOOL e27670f53f2bb91834b13d1d1bedc5a002643b9ecd7f227540631b6e8e7b550f88fc5a4e52dc007e1259411b1289b377fa1fa35c7887f62ad6e1189cf2100d43 diff --git a/media-video/get_iplayer/get_iplayer-2.94.ebuild b/media-video/get_iplayer/get_iplayer-2.94.ebuild index 9df7d6a..d2c5b12 100644 --- a/media-video/get_iplayer/get_iplayer-2.94.ebuild +++ b/media-video/get_iplayer/get_iplayer-2.94.ebuild @@ -13,7 +13,8 @@ SLOT="0" KEYWORDS="~x86 ~amd64" IUSE="" -RDEPEND="media-video/mplayer +RDEPEND="|| ( media-video/mplayer + media-video/mpv ) virtual/ffmpeg media-sound/lame media-video/flvstreamer diff --git a/media-video/get_iplayer/get_iplayer-.ebuild b/media-video/get_iplayer/get_iplayer-.ebuild index d63d9e1..686a17d 100644 --- a/media-video/get_iplayer/get_iplayer-.ebuild +++ b/media-video/get_iplayer/get_iplayer-.ebuild @@ -16,7 +16,8 @@ SLOT="0" KEYWORDS="~x86 ~amd64" IUSE="" -RDEPEND="media-video/mplayer +RDEPEND="|| ( media-video/mplayer + media-video/mpv ) virtual/ffmpeg media-sound/lame media-video/flvstreamer
[gentoo-commits] repo/gentoo:master commit in: app-text/groonga/
commit: d0e5cefb1b09f5abfe531c6523c47f02de9d81d9 Author: Brian Evans gentoo org> AuthorDate: Fri Nov 20 19:45:01 2015 + Commit: Brian Evans gentoo org> CommitDate: Fri Nov 20 19:45:33 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e5cefb app-text/groonga: Version bump Package-Manager: portage-2.2.25 app-text/groonga/Manifest | 1 + app-text/groonga/groonga-5.0.9.ebuild | 92 +++ 2 files changed, 93 insertions(+) diff --git a/app-text/groonga/Manifest b/app-text/groonga/Manifest index d2f9b07..8d67ca4 100644 --- a/app-text/groonga/Manifest +++ b/app-text/groonga/Manifest @@ -1,2 +1,3 @@ DIST groonga-4.0.7.tar.gz 10990151 SHA256 ec1d19b05c7a592a316e845ff4c5549c6236cc7ea83423c0fc7831c16161bbbf SHA512 942c28205ffb2c7d3ba767ff68b342ef5b7b9fef72131782635e86682c82a4ea3dad9d5263a42563ded22db573015c9859e49dc20c812f7a6534478b22d8b9a8 WHIRLPOOL 2473c14bcc50c87bfb925e73cc3c4cd2c02915ac498a5e40aeee312ac9873857406e38e8146fabe722250f2d258b6444813d4c47726c16ce4cfceea35f207d3a DIST groonga-5.0.3.tar.gz 12421501 SHA256 d4f3e9d00cb16c0028cb32422fa666cbbfb32f47597988fd308931274d94cf52 SHA512 c4595054f46e150b0b95b3d1fb6a18098c93471ee0cdeefc54d266a710db57d6b68a6aceb1a61ede5ebb4e1b5518be64b9b96809bd85634b61c84c1923cbf158 WHIRLPOOL bbcf91770eb626dfaf5d01e04b6f4b2f4ee6fff8fad73cdca36c500560ce8d0b9dc606391b1ae0a23d2fd763ba4eddbc69f2eb8b692a5c3c59c1b21745d01de0 +DIST groonga-5.0.9.tar.gz 12851324 SHA256 4fb59009dca154ffb53f9b408dc296e6e215f8eda613a8ef184fa634e702d35d SHA512 6e89be8894737616cfcbd0edd92c94a25fb8a2f9c97bd0aab10c2d628664aa328384d6b953516fe96cec5b58fd229c42262caad4785ca9574c759d6d7177fba6 WHIRLPOOL 7f7ac215d4eb0eca0eb18e496a79c6023fe2040f2423c3b4b968d4923b800676c1ad2982880925880ffee5b92ff508b21132ecc2f9b7675612e147adfd13dd6c diff --git a/app-text/groonga/groonga-5.0.9.ebuild b/app-text/groonga/groonga-5.0.9.ebuild new file mode 100644 index 000..494462b --- /dev/null +++ b/app-text/groonga/groonga-5.0.9.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils libtool user + +DESCRIPTION="An Embeddable Fulltext Search Engine" +HOMEPAGE="http://groonga.org/; +SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz; + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib" + +RDEPEND="benchmark? ( >=dev-libs/glib-2.8 ) + libedit? ( >=dev-libs/libedit-3 ) + libevent? ( dev-libs/libevent ) + lzo? ( dev-libs/lzo ) + mecab? ( >=app-text/mecab-0.80 ) + msgpack? ( dev-libs/msgpack ) + sphinx? ( >=dev-python/sphinx-1.0.1 ) + zeromq? ( net-libs/zeromq ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND} + virtual/pkgconfig + sphinx? ( dev-python/sphinx )" + +REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )" + +pkg_setup() { + enewgroup groonga + enewuser groonga -1 -1 -1 groonga +} + +src_prepare() { + elibtoolize +} + +src_configure() { + # httpd is a bundled copy of nginx; disabled for security reasons + # prce only is used with httpd + # kytea and libstemmer are not available in portage + # ruby is only used for an http test + econf \ + --disable-groonga-httpd \ + --without-pcre \ + --without-kytea \ + --without-libstemmer \ + --with-log-path="${EROOT}var/log/${PN}.log" \ + --docdir="${EROOT}usr/share/doc/${P}" \ + --without-ruby \ + $(use_enable abort) \ + $(use_enable benchmark) \ + $(use_enable debug memory-debug) \ + $(use_enable doc document) \ + $(use_enable dynamic-malloc-change) \ + $(use_enable exact-alloc-count) \ + $(use_enable fmalloc) \ + $(use_enable futex) \ + $(use_enable libedit) \ + $(use_with libevent) \ + $(use_with lzo) \ + $(use_with mecab) \ + $(use_with msgpack message-pack "${EROOT}usr") \ + $(use_enable nfkc) \ + $(use_with sphinx sphinx-build) \ + $(use_enable static-libs static) \ + $(use_enable uyield) \ + $(use_enable zeromq) \ + $(use_with zlib) +} + +src_install() { + default + + prune_libtool_files + + newinitd "${FILESDIR}/${PN}.initd" ${PN} + newconfd "${FILESDIR}/${PN}.confd" ${PN} + + keepdir /var/{log,lib}/${PN} + fowners groonga:groonga /var/{log,lib}/${PN} + + dodoc README.md + + use examples || rm -r "${D}usr/share/${PN}"
[gentoo-commits] repo/gentoo:master commit in: app-text/groonga-normalizer-mysql/
commit: eef2cb096eb90a7af713491da8838258530333e3 Author: Brian Evans gentoo org> AuthorDate: Fri Nov 20 19:52:40 2015 + Commit: Brian Evans gentoo org> CommitDate: Fri Nov 20 19:52:40 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eef2cb09 app-text/groonga-normalizer-mysql: Version bump Package-Manager: portage-2.2.25 app-text/groonga-normalizer-mysql/Manifest | 1 + .../groonga-normalizer-mysql-1.1.0.ebuild | 38 ++ 2 files changed, 39 insertions(+) diff --git a/app-text/groonga-normalizer-mysql/Manifest b/app-text/groonga-normalizer-mysql/Manifest index cd98031..3d96708 100644 --- a/app-text/groonga-normalizer-mysql/Manifest +++ b/app-text/groonga-normalizer-mysql/Manifest @@ -1,2 +1,3 @@ DIST groonga-normalizer-mysql-1.0.6.tar.gz 430461 SHA256 7e037aa42b7a3212140674d39a8dc0d722670d744f99e019bde308db91eb4d85 SHA512 36ef0344ba73633669d12dd13b08cd336b2b77a7c76e11b52b5ce17fcf20b17a0ea8a3f68be1be91d07e3fe5a87b667664d7a503a54ba1cace3bd6c252286821 WHIRLPOOL 7e36266b5bade8bd1bb288f3936b059f57b24ea3662610999d5b9667688076b1de21d99ea21b774af43793fbef4feeb605eb4051bd95a5d0e0d36c49507307f7 DIST groonga-normalizer-mysql-1.0.9.tar.gz 527908 SHA256 bb1dc59939464f833e94de64e33b2a643f5bee03cad28d92af70af9820519e70 SHA512 878d10dc6f7280c62e9563db19a61450a0181c19d47b2a5afe3bef4bfa157abfe3de726f0d61b6b7040b3b37abd78f63cd257f48fe779ff6a1ea0ed262b70a97 WHIRLPOOL 1ef11b150934d532a97be1ac8b43280989763e76d9bbadf1faeb0a99b6a68f0066ebac8bb66f8fdfe6fcfc94f9a127d5159119746c69307305b8a3ae160d88d9 +DIST groonga-normalizer-mysql-1.1.0.tar.gz 529179 SHA256 525daffdb999b647ce87328ec2e94c004ab59803b00a71ce1afd0b5dfd167116 SHA512 a607ea875a1500b408742f52c5a0e465db4fc45101cd6b433a5fede8631fdadd6d24571ec188f70e39906178d35ad46138848bd57aaac721da32c064f3506416 WHIRLPOOL c3546878e4bd7c1a5a2b911bdf325f9846574adf45929af073d00923e7d6851c8408cd27cea861c84ab96b140cae0913093ae6cce5fca4c56c4ca08948b3 diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild new file mode 100644 index 000..554a7c2 --- /dev/null +++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils autotools + +DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers" +HOMEPAGE="http://groonga.org/; +SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz; + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="app-text/groonga" +DEPEND="${RDEPEND} + virtual/pkgconfig" +DOCS=( README.md ) + +src_prepare() { + eautoreconf +} + +src_configure() { + # ruby is only uses for tests + econf \ + --without-ruby \ + --docdir="${EROOT}usr/share/doc/${P}" +} + +src_install() { + default + + prune_libtool_files + rm -r "${D}usr/share/doc/${PN}" || die +}
[gentoo-commits] repo/gentoo:master commit in: www-client/google-chrome-unstable/
commit: 1f5ba1c8d2275a28cf6ad570fee4fd6fc2846b00 Author: Mike Gilbert gentoo org> AuthorDate: Fri Nov 20 19:29:01 2015 + Commit: Mike Gilbert gentoo org> CommitDate: Fri Nov 20 19:29:55 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f5ba1c8 www-client/google-chrome-unstable: automated update Package-Manager: portage-2.2.25 www-client/google-chrome-unstable/Manifest| 4 ++-- ...2564.8_p1.ebuild => google-chrome-unstable-48.0.2564.10_p1.ebuild} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest index f804112..61376eb 100644 --- a/www-client/google-chrome-unstable/Manifest +++ b/www-client/google-chrome-unstable/Manifest @@ -1,2 +1,2 @@ -DIST google-chrome-unstable_48.0.2564.8-1_amd64.deb 47870498 SHA256 1998d1667650b3864f154ec43ad55197b8743b56fcffbdad4a5442692e3d7101 SHA512 0e35be65548c961d1e9c9df7c9dff43f8791b477e821c79bd1aa7df04cd4c6d421b04e4498e872f2c85959391d5bf9974a95ba1590dc9981a1f90448fd424216 WHIRLPOOL 7053207b56910c120c5c2dcc8956327875bf1087b3970617c926fd71c1e76505bf60e480c0084fd25b0a443306f2b32284482bfc28cd11cf99cbbea032e554e1 -DIST google-chrome-unstable_48.0.2564.8-1_i386.deb 47645970 SHA256 4c6bfb140c627f05076f4cb297a21808b61d13c5c264ad1fc66d7dac3b47e2bc SHA512 a410d7cae3deef2a570cd7b14b63db9637cf0296e81fdd871c9f10bc6c3644bdbae80532af0ff1630daf68230bba9e5cef09e297a0d2df9a39ab42ea64ba582e WHIRLPOOL 4f997426fea60bbed8898b825303e131e188c18ae4c66ddc0c5ed5351627eebb637bb7d8b2340d939571656f2fb7bc50b721f8c025d5f9bbebdb579b43cf1dfd +DIST google-chrome-unstable_48.0.2564.10-1_amd64.deb 48350814 SHA256 76cd3d1e687746a9088634cf351b4d260e75ec93bdb8bd607c2c05ed8e8a9039 SHA512 67b3e2f8089f6e8f9bb7cb9234093a4d33d5b3bfa0d1bff118c16473aa98350fa5b90924addaa8c7b155c11cca5117723c87122191852eebe8b26b333628f27a WHIRLPOOL d2f3f9cb89895e0d82d881cb1d5b200084b4981d6704bbcecb9f9481edc083a6897c23069991f791032571824fb11db72ead95b158678874176890aa2512c62c +DIST google-chrome-unstable_48.0.2564.10-1_i386.deb 47447038 SHA256 44f2c74148e6aa5e2c344356e88e2b39db9a0b76cf9d27db3e23d6dae56fe4b6 SHA512 7bea046e025fc62fe6b3d7ecc895965d297d7d5b4df6e4d8f25ef9c688291097ecce893fd1545e61be4c4b176d44e10a5b82aab1e17baba54af1d85494d02ba1 WHIRLPOOL 4d454321e82cea21e1934028628217b221e2bdaf212b566ea4c24f39e7ef74976b090548f73381271d388f83519580ad43fcf0bd837630c2e8eefe6893780127 diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-48.0.2564.8_p1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-48.0.2564.10_p1.ebuild similarity index 100% rename from www-client/google-chrome-unstable/google-chrome-unstable-48.0.2564.8_p1.ebuild rename to www-client/google-chrome-unstable/google-chrome-unstable-48.0.2564.10_p1.ebuild
[gentoo-commits] repo/gentoo:master commit in: www-plugins/chrome-binary-plugins/
commit: 83be374eed52132f44155a4b331c7ebadb2ea12b Author: Mike Gilbert gentoo org> AuthorDate: Fri Nov 20 19:29:33 2015 + Commit: Mike Gilbert gentoo org> CommitDate: Fri Nov 20 19:30:00 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83be374e www-plugins/chrome-binary-plugins: automated update Package-Manager: portage-2.2.25 www-plugins/chrome-binary-plugins/Manifest| 8 ...ha1.ebuild => chrome-binary-plugins-47.0.2526.69_beta1.ebuild} | 0 ...a1.ebuild => chrome-binary-plugins-48.0.2564.10_alpha1.ebuild} | 0 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest index a9d1061..3842818 100644 --- a/www-plugins/chrome-binary-plugins/Manifest +++ b/www-plugins/chrome-binary-plugins/Manifest @@ -1,6 +1,6 @@ -DIST google-chrome-beta_47.0.2526.58-1_amd64.deb 47469772 SHA256 7cc64b7f209135e979a01c78f088ee86f75a5e0968afdfb2e69031638a46fa55 SHA512 2875a2ed3c840455d798d34c53d82582762b3a8dc02a452d88ba68f1ff11749909981857dc00df9edacc7a0be91fbfc97e60ee2e4b4e7121f9707cf56550febb WHIRLPOOL c4e64a9e54df93b3cbc23b682f60983176166f9f09c28c216b9fac2414f82d6ff99fef52308c1fb7d89e5c73f9b1d6d6827781a25fd41705139ecc804b2fb821 -DIST google-chrome-beta_47.0.2526.58-1_i386.deb 47137450 SHA256 9bd238abadc0c390bb393518aec8359f61439b4a531df18ce4e2644bfecdbbea SHA512 9ad5b2ed3cecab383c4bb0f9185eaf161512fff5e4cb588e407650bceaa91ed7ac0116682f79260e7ee039a726feee8f2e2a6b2aaa1b91cbdea277125ea64464 WHIRLPOOL 13295cc8e745a7d89196ff20561523151a868a6d889822305c2ea8668cb4b465cd63959dd207cbdb4632ce866eb1bf0d483268b37684f45d65dd2b866fc0aa3f +DIST google-chrome-beta_47.0.2526.69-1_amd64.deb 47749092 SHA256 4ee64918613ea0fd182e0fdbbf5a39a0ba8d859a51fc7989e7904d21a25dfb05 SHA512 a423853de756f908a7e6cc09a9bfb64167d41a55e6dbb0a570de04f4143c5fb488f3d14caa7114ff4f42ea672bde683f615cc57e66fa09e2be89141cca8bf211 WHIRLPOOL 463ce80490e64bc8f59fbec9e52700bd65d811f4aaf841ecdc6d36acbcdf99c272721fdf07a6e040bf21082ef1900a1713bc1b53be8e390640eee9e93ba24ea7 +DIST google-chrome-beta_47.0.2526.69-1_i386.deb 47275062 SHA256 9cabe93c212d626e66a62c79c3bcce5236e962e1d8924109706f8f3b03b997f9 SHA512 3910267cea409f5307385ace660dfb5d1774033f2916d2a7c184f07198306c5737b039398b429bfef40130cd5366a2ab9cac244538eee0398685de2bc99f3e01 WHIRLPOOL eb9ae7952368e1939c19e633ecb04e23a1c4a0c30ffc23d5681a887b66acc816d02c1102fb360cba67f63e040d8d74f660b4fce345d7e1ea50df827e324169e2 DIST google-chrome-stable_46.0.2490.86-1_amd64.deb 47301590 SHA256 29c434fe640825a88ca5871ce31b8cba9994776dc5c3c99e579998f14e3455ac SHA512 5fd15fa740843d4003c7fe64b7c0c45a07f26b9087a6dfb7f58d3c758f2e6045b20b4e8395c4bb790bf15d74fe56346fe2dc55c2cfbe517e8f793e1defd64013 WHIRLPOOL ceb26bfde2c58e86fd387ecc5c774a84d3cc8c69ec9ca1eb8e91e135f2bcc715c1105ba8e44e27f8c562a8747e33a0dd40f55b68194cb804069d94f4dccf DIST google-chrome-stable_46.0.2490.86-1_i386.deb 47021428 SHA256 c8e8d548af976508d235f36fd73fd91515842dab4371b8cd6732e2c8b283016d SHA512 bee7901cd1e18981460f2d8158a7568fb0efc5030c28e017b73d5abe7ecdd8344965e50bb34a911f91fd8cf93b0978e7c91f2dffde55f8209fb39674ea6dfca5 WHIRLPOOL b551f698ab5fb1e04940826d85729e04bcab6e67f2240b48aef00284704d85a6018abcde4370b4436f7d8fb22f159ea489bfc6c1b73ffd25c8ee5059239198a2 -DIST google-chrome-unstable_48.0.2564.8-1_amd64.deb 47870498 SHA256 1998d1667650b3864f154ec43ad55197b8743b56fcffbdad4a5442692e3d7101 SHA512 0e35be65548c961d1e9c9df7c9dff43f8791b477e821c79bd1aa7df04cd4c6d421b04e4498e872f2c85959391d5bf9974a95ba1590dc9981a1f90448fd424216 WHIRLPOOL 7053207b56910c120c5c2dcc8956327875bf1087b3970617c926fd71c1e76505bf60e480c0084fd25b0a443306f2b32284482bfc28cd11cf99cbbea032e554e1 -DIST google-chrome-unstable_48.0.2564.8-1_i386.deb 47645970 SHA256 4c6bfb140c627f05076f4cb297a21808b61d13c5c264ad1fc66d7dac3b47e2bc SHA512 a410d7cae3deef2a570cd7b14b63db9637cf0296e81fdd871c9f10bc6c3644bdbae80532af0ff1630daf68230bba9e5cef09e297a0d2df9a39ab42ea64ba582e WHIRLPOOL 4f997426fea60bbed8898b825303e131e188c18ae4c66ddc0c5ed5351627eebb637bb7d8b2340d939571656f2fb7bc50b721f8c025d5f9bbebdb579b43cf1dfd +DIST google-chrome-unstable_48.0.2564.10-1_amd64.deb 48350814 SHA256 76cd3d1e687746a9088634cf351b4d260e75ec93bdb8bd607c2c05ed8e8a9039 SHA512 67b3e2f8089f6e8f9bb7cb9234093a4d33d5b3bfa0d1bff118c16473aa98350fa5b90924addaa8c7b155c11cca5117723c87122191852eebe8b26b333628f27a WHIRLPOOL d2f3f9cb89895e0d82d881cb1d5b200084b4981d6704bbcecb9f9481edc083a6897c23069991f791032571824fb11db72ead95b158678874176890aa2512c62c +DIST google-chrome-unstable_48.0.2564.10-1_i386.deb 47447038 SHA256 44f2c74148e6aa5e2c344356e88e2b39db9a0b76cf9d27db3e23d6dae56fe4b6 SHA512 7bea046e025fc62fe6b3d7ecc895965d297d7d5b4df6e4d8f25ef9c688291097ecce893fd1545e61be4c4b176d44e10a5b82aab1e17baba54af1d85494d02ba1 WHIRLPOOL
[gentoo-commits] repo/gentoo:master commit in: www-client/google-chrome-beta/
commit: 3874666734e0706df6fc33b03f7060f65c689329 Author: Mike Gilbert gentoo org> AuthorDate: Fri Nov 20 19:29:22 2015 + Commit: Mike Gilbert gentoo org> CommitDate: Fri Nov 20 19:29:58 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38746667 www-client/google-chrome-beta: automated update Package-Manager: portage-2.2.25 www-client/google-chrome-beta/Manifest| 4 ++-- 0.2526.58_p1.ebuild => google-chrome-beta-47.0.2526.69_p1.ebuild} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest index 68a..9e7cff6 100644 --- a/www-client/google-chrome-beta/Manifest +++ b/www-client/google-chrome-beta/Manifest @@ -1,2 +1,2 @@ -DIST google-chrome-beta_47.0.2526.58-1_amd64.deb 47469772 SHA256 7cc64b7f209135e979a01c78f088ee86f75a5e0968afdfb2e69031638a46fa55 SHA512 2875a2ed3c840455d798d34c53d82582762b3a8dc02a452d88ba68f1ff11749909981857dc00df9edacc7a0be91fbfc97e60ee2e4b4e7121f9707cf56550febb WHIRLPOOL c4e64a9e54df93b3cbc23b682f60983176166f9f09c28c216b9fac2414f82d6ff99fef52308c1fb7d89e5c73f9b1d6d6827781a25fd41705139ecc804b2fb821 -DIST google-chrome-beta_47.0.2526.58-1_i386.deb 47137450 SHA256 9bd238abadc0c390bb393518aec8359f61439b4a531df18ce4e2644bfecdbbea SHA512 9ad5b2ed3cecab383c4bb0f9185eaf161512fff5e4cb588e407650bceaa91ed7ac0116682f79260e7ee039a726feee8f2e2a6b2aaa1b91cbdea277125ea64464 WHIRLPOOL 13295cc8e745a7d89196ff20561523151a868a6d889822305c2ea8668cb4b465cd63959dd207cbdb4632ce866eb1bf0d483268b37684f45d65dd2b866fc0aa3f +DIST google-chrome-beta_47.0.2526.69-1_amd64.deb 47749092 SHA256 4ee64918613ea0fd182e0fdbbf5a39a0ba8d859a51fc7989e7904d21a25dfb05 SHA512 a423853de756f908a7e6cc09a9bfb64167d41a55e6dbb0a570de04f4143c5fb488f3d14caa7114ff4f42ea672bde683f615cc57e66fa09e2be89141cca8bf211 WHIRLPOOL 463ce80490e64bc8f59fbec9e52700bd65d811f4aaf841ecdc6d36acbcdf99c272721fdf07a6e040bf21082ef1900a1713bc1b53be8e390640eee9e93ba24ea7 +DIST google-chrome-beta_47.0.2526.69-1_i386.deb 47275062 SHA256 9cabe93c212d626e66a62c79c3bcce5236e962e1d8924109706f8f3b03b997f9 SHA512 3910267cea409f5307385ace660dfb5d1774033f2916d2a7c184f07198306c5737b039398b429bfef40130cd5366a2ab9cac244538eee0398685de2bc99f3e01 WHIRLPOOL eb9ae7952368e1939c19e633ecb04e23a1c4a0c30ffc23d5681a887b66acc816d02c1102fb360cba67f63e040d8d74f660b4fce345d7e1ea50df827e324169e2 diff --git a/www-client/google-chrome-beta/google-chrome-beta-47.0.2526.58_p1.ebuild b/www-client/google-chrome-beta/google-chrome-beta-47.0.2526.69_p1.ebuild similarity index 100% rename from www-client/google-chrome-beta/google-chrome-beta-47.0.2526.58_p1.ebuild rename to www-client/google-chrome-beta/google-chrome-beta-47.0.2526.69_p1.ebuild
[gentoo-commits] dev/ikelos:master commit in: dev-util/pycharm-community/
commit: 0d1080e408ee455bb33e8dc732a63ffe11695733 Author: layman localhost> AuthorDate: Fri Nov 20 19:47:55 2015 + Commit: Mike Auty gentoo org> CommitDate: Fri Nov 20 19:47:55 2015 + URL:https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=0d1080e4 Bump pycharm-community edition. dev-util/pycharm-community/ChangeLog | 76 -- dev-util/pycharm-community/Manifest| 13 +++- ...4.5.3.ebuild => pycharm-community-5.0.1.ebuild} | 2 +- 3 files changed, 69 insertions(+), 22 deletions(-) diff --git a/dev-util/pycharm-community/ChangeLog b/dev-util/pycharm-community/ChangeLog index b2ed914..467228b 100644 --- a/dev-util/pycharm-community/ChangeLog +++ b/dev-util/pycharm-community/ChangeLog @@ -1,31 +1,69 @@ # ChangeLog for dev-util/pycharm-community # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/pycharm-community/ChangeLog,v 1.6 2015/06/01 12:52:12 xmw Exp $ +# (auto-generated from git log) -*pycharm-community-4.5.1 (01 Jun 2015) +*pycharm-community-4.5.3 (09 Aug 2015) +*pycharm-community-4.5.2 (09 Aug 2015) +*pycharm-community-4.0.6 (09 Aug 2015) +*pycharm-community-3.4.1 (09 Aug 2015) - 01 Jun 2015; Michael Weber+pycharm-community-4.5.1.ebuild, - pycharm-community-4.0.6.ebuild: - Version bump (thanks Manuel Rüger, 550276). + 09 Aug 2015; Robin H. Johnson +files/README.gentoo, + +metadata.xml, +pycharm-community-3.4.1.ebuild, + +pycharm-community-4.0.6.ebuild, +pycharm-community-4.5.2.ebuild, + +pycharm-community-4.5.3.ebuild: + proj/gentoo: Initial commit -*pycharm-community-4.0.6 (28 Apr 2015) + This commit represents a new era for Gentoo: + Storing the gentoo-x86 tree in Git, as converted from CVS. - 28 Apr 2015; Michael Weber +pycharm-community-4.0.6.ebuild, - -pycharm-community-4.0.4.ebuild: - Version bump (bug 546510, thanks Jeremy Murphy). + This commit is the start of the NEW history. + Any historical data is intended to be grafted onto this point. -*pycharm-community-4.0.5 (12 Mar 2015) + Creation process: + 1. Take final CVS checkout snapshot + 2. Remove ALL ChangeLog* files + 3. Transform all Manifests to thin + 4. Remove empty Manifests + 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ + 5.1. Do not touch files with -kb/-ko keyword flags. - 12 Mar 2015; Michael Weber +pycharm-community-4.0.5.ebuild: - Version bump (bug 543078, thanks mrueg). + Signed-off-by: Robin H. Johnson + X-Thanks: Alec Warner - did the GSoC 2006 migration + tests + X-Thanks: Robin H. Johnson - infra guy, herding this + project + X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo + developer, wrote Git features for the migration + X-Thanks: Brian Harring - wrote much python to improve + cvs2svn + X-Thanks: Rich Freeman - validation scripts + X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 + work in migration + X-Thanks: Michał Górny - scripts, QA, nagging + X-Thanks: All of other Gentoo developers - many ideas and lots of paint on + the bikeshed -*pycharm-community-4.0.4 (24 Feb 2015) + 24 Aug 2015; Justin Lecher metadata.xml: + Use https by default - 24 Feb 2015; Michael Weber +pycharm-community-4.0.4.ebuild: - Version bump (bug 531236). + Convert all URLs for sites supporting encrypted connections from http to + https -*pycharm-community-3.4.1 (14 Sep 2014) + Signed-off-by: Justin Lecher + + 24 Aug 2015; Mike Gilbert metadata.xml: + Revert DOCTYPE SYSTEM https changes in metadata.xml + + repoman does not yet accept the https version. + This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. + + Bug: https://bugs.gentoo.org/552720 + +*pycharm-community-4.5.4 (15 Sep 2015) + + 15 Sep 2015; Michael Weber -pycharm-community-4.5.2.ebuild, + +pycharm-community-4.5.4.ebuild: + Version bump, drop old. + + Package-Manager: portage-2.2.20.1 - 14 Sep 2014; Michael Weber +files/README.gentoo, - +metadata.xml, +pycharm-community-3.4.1.ebuild: - Import from xmw overlay (bug 369375, thanks all contributing/testing) diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest index c4c3280..64c5d20 100644 --- a/dev-util/pycharm-community/Manifest +++ b/dev-util/pycharm-community/Manifest @@ -1,5 +1,14 @@ AUX README.gentoo 169 SHA256 3bcfb4f4909ec42cbaba2645b5c88d111f47b7d5e800a8aeadf3130091fd8bab SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2 WHIRLPOOL
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/notify-webhook/
commit: 9eee3a075eeaca03f24260ea632643e418095dc3 Author: Robin H. Johnson gentoo org> AuthorDate: Fri Nov 20 19:54:59 2015 + Commit: Robin H. Johnson gentoo org> CommitDate: Fri Nov 20 19:55:17 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eee3a07 dev-vcs/notify-webhook: Bump. Upstream now has release tags. Package-Manager: portage-2.2.24 dev-vcs/notify-webhook/Manifest| 4 +- ...20140805.ebuild => notify-webhook-0.1.0.ebuild} | 10 ++-- .../notify-webhook/notify-webhook-20150308.ebuild | 57 -- 3 files changed, 7 insertions(+), 64 deletions(-) diff --git a/dev-vcs/notify-webhook/Manifest b/dev-vcs/notify-webhook/Manifest index f02465c..77247c8 100644 --- a/dev-vcs/notify-webhook/Manifest +++ b/dev-vcs/notify-webhook/Manifest @@ -1,3 +1 @@ -DIST notify-webhook-20140805.tar.gz 15078 SHA256 479d71c7ab9ba772a0b621638e80a14cbe6f34e8fbe851d8db93b118d4567e3f SHA512 8e10994ad26d6de86e7930a2299a8701bed0f04299f2ca14b070f00543368015628b89fd4cbf351f3e42e85cf98e7465dd94517243d1beb71b645d91a637e6d2 WHIRLPOOL 533e2118941edc2f9db4412477a76332fe27475ebc882eb8f567d39a846bf04c95cc693230ae32bc1c10bf24301117b7d6e04c08e45e0fe7cf181fe454504a4b -DIST notify-webhook-20150308-1ff3985...BCLibCoop:ee038b5.patch 8581 SHA256 c6167fd81e88fcb8de6c37bb2c5259f1c09e6e3a7f0b61d6b58f5f5e478e585c SHA512 c72b03cbea34884c089968e67b61e654a9d365e6b2a338363b6405ab1950aaa5a1c4f8ece73181003571a88f1983458c2e9194d6b26aa103c95c1ceed8e0dd4c WHIRLPOOL 3f4be9d58f5d1a4dff2a7978d067afb0e8fb739b6836709964dec17cc386890eb1d97b0652323acaefc7ca5bc5ae25c46f1f222323d471529e92a5640541bcae -DIST notify-webhook-20150308.tar.gz 16347 SHA256 cb9d2687eea5ab4f32f6fbc9bdb05a24c8b7755193b312a574172f6aaaca857e SHA512 7a82418d16e6cfd58b9bccaf1700c5a9258601a45a823f1b8307ee3b3c6e90ad52424421836468e34b400b07100a291fd514450a2e1b3c2d1c8dff99ee409557 WHIRLPOOL 523578237483d74d2bd4fa9f4f87277b9103c67c415fbb383629211ea91403fc11debfed70fa94069e9bd8e87a1c9e799929aa1c376244e1a2dde656609a10d8 +DIST notify-webhook-0.1.0.tar.gz 17525 SHA256 3782f588e75872e7dd25656279bab154102c476dd3b1fa24fb3af66475960d55 SHA512 1694f32b1263baecac473ffa49e6e7f9cbfdb73d1abaa88e228771e28a5ed915d9f5f21ab26b05934bdcd8694b4c4f1506763dd2f0c89c35ffa51e1d1b7d03b4 WHIRLPOOL 908e3b7e61ac8893c064d95566ee504bea1689f227ca900c27e3189e4e5be0fbe1409b24c3002feb1ee05aa85364cd2fcb620f0c4a7cdcbb1ce3c53d81bf412f diff --git a/dev-vcs/notify-webhook/notify-webhook-20140805.ebuild b/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild similarity index 66% rename from dev-vcs/notify-webhook/notify-webhook-20140805.ebuild rename to dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild index a909d47..8441e7f 100644 --- a/dev-vcs/notify-webhook/notify-webhook-20140805.ebuild +++ b/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild @@ -4,10 +4,12 @@ EAPI=5 +PYTHON_COMPAT=( python3_{3,4,5} pypy3 ) + DESCRIPTION="Git post-receive web hook notifier in Python." HOMEPAGE="https://github.com/metajack/notify-webhook; -COMMIT='c571160f155122446e97bb01c1150b4d14ea69d6' -SRC_URI="https://github.com/metajack/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +#COMMIT='c571160f155122446e97bb01c1150b4d14ea69d6' +SRC_URI="https://github.com/metajack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" @@ -17,8 +19,8 @@ IUSE="" DEPEND="dev-python/simplejson" RDEPEND="${DEPEND}" -MY_P="${PN}-${COMMIT}" -S="${WORKDIR}/${MY_P}" +#MY_P="${PN}-${COMMIT}" +#S="${WORKDIR}/${MY_P}" src_install() { dodoc *markdown diff --git a/dev-vcs/notify-webhook/notify-webhook-20150308.ebuild b/dev-vcs/notify-webhook/notify-webhook-20150308.ebuild deleted file mode 100644 index 9262564..000 --- a/dev-vcs/notify-webhook/notify-webhook-20150308.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils - -DESCRIPTION="Git post-receive web hook notifier in Python." -HOMEPAGE="https://github.com/metajack/notify-webhook; -COMMIT='1ff39853e59bb0ee37c4783da8dcf3ea14cef53f' -PATCH_COMMIT='BCLibCoop:ee038b53a48e70d9e69c86386c39b7f24736d07e' -PATCH_DELTA="${COMMIT:0:7}...${PATCH_COMMIT:0:17}" -PATCH_NAME="${P}-${PATCH_DELTA}.patch" -SRC_URI="https://github.com/metajack/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz - https://github.com/metajack/notify-webhook/compare/${PATCH_DELTA}.patch -> ${PATCH_NAME}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-python/simplejson" -DEPEND="${RDEPEND} - dev-util/patchutils" - -MY_P="${PN}-${COMMIT}" -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${P}.tar.gz -} - -# Yes, this is some creative patch mangling, to avoid a manually created -# distfile. epatch's dryrun fails on a sequence of changes that depend on each -# other, so we can clean up the patch to actually pass that check. -src_prepare() { -
[gentoo-commits] dev/ikelos:master commit in: dev-util/pycharm-community/
commit: e28c18dade6f93bde6cbfa74fd19518563cc3371 Author: layman localhost> AuthorDate: Fri Nov 20 20:31:22 2015 + Commit: Mike Auty gentoo org> CommitDate: Fri Nov 20 20:31:22 2015 + URL:https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=e28c18da Fix up the bad Manifest. dev-util/pycharm-community/Manifest | 9 - 1 file changed, 9 deletions(-) diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest index 64c5d20..a997b34 100644 --- a/dev-util/pycharm-community/Manifest +++ b/dev-util/pycharm-community/Manifest @@ -1,14 +1,5 @@ AUX README.gentoo 169 SHA256 3bcfb4f4909ec42cbaba2645b5c88d111f47b7d5e800a8aeadf3130091fd8bab SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2 WHIRLPOOL f0de5cc2a1955e210655ee10d305bcfaf6a4a7b6dba46e17eece981d50bb461e9bd5bde772462a5849ebf59e54357bcfe42a5322c614bc75c1f96202654aa605 -DIST pycharm-community-3.4.1.tar.gz 112821686 SHA256 96427b1e842e7c09141ec4d3ede627c5ca7d821c0d6c98169b56a34f9035ef64 SHA512 3f5a4c8c598ed0fe1a28335b63864a5597fe6da3d6de225ada93bbe4342b81db8cc0a96f297b5f0ebe9608b8507f9293419790805b7e24e0151175e952ecd421 WHIRLPOOL efd62eb960902ab26983f51b2904209315b5a9535d6f0c0a45bc9d90df87cafc9d2d720d20e702b1846c0d2083af4e529f6de15184d73996da6164b4b8a38ac2 -DIST pycharm-community-4.0.6.tar.gz 121278114 SHA256 7aa0ed3d743ed6886329671d2e5ae10abdac35d0595cff8d6eeb39ada9168e9a SHA512 b9a20550fac93e9d247da702d8cf2e5c56eba9cb427024d85c76d21547f2e11f037ad12f465f4fdcbd3a8ee7e080bcaebf2b081af100b03953388f97921caba5 WHIRLPOOL cbb42c85a0835c323294f9b7648f8db51fd98b2b936dd92b228ee90e0ac78231d7fe8e16dd114c73380fd1bc6061a178e30483631fc16ee90c3b7a9f2c690d74 -DIST pycharm-community-4.5.3.tar.gz 121605129 SHA256 205247b94965d9499e55d13ec701364475ff823d9353d967744750f6ceadc38d SHA512 0ae316890d6e348024f974a81cca9669c61f005a7af0cd0ef4d2f051fcb71cebbe372446f3a660f9c2a87837d7986809493499b34311a175542751d4f8597753 WHIRLPOOL e3895326751e6fd97a6ec60fc3933fc07b61337668dd18662ab22bb85f41fac1fca2511bf8eccfa0946dffa5f51f9cb24fda6019c88c88e07f281e390e6a37d9 -DIST pycharm-community-4.5.4.tar.gz 121580731 SHA256 6bdd344eb88ee50cf29e98278c87faad0d1a23a7ec84c1794b956d2633024228 SHA512 e0c90fd84d60e1ac644c2b29aef484c1768cf8832c70cbc1a7905b64e0ef0fd7ec50665b9b15fcdaad762852e42103487b59fc4c8d1e711fd3a30123f8c959eb WHIRLPOOL d3725d9f3d983edf111f8aeb903bced2df643e9b39dcff59f21c176a16d9304dfe833ee542e204d1a4f5cdfadb33025587a669f190202bbae83cd9d102250c08 DIST pycharm-community-5.0.1.tar.gz 134214228 SHA256 8e8b276954b8cc5e5afa79918c50cf60fc21bf5cddce6a6fa2e232627c8da392 SHA512 4f5d193b30e3d30c1bff7f2212ef061595e1f31587c16f2a527d85962ac500d86b4be8abe631f219386ec893693999248fdf92f3bbcd115f3593513e60df2fdd WHIRLPOOL b3b5d49541c4a9c1f6acecac017fc84794b6b33b0d8995a58143258641fe9737c226fe2d488b9f9ace364265885542cb51c07e12d34e7f70027b8d15d9104f31 -EBUILD pycharm-community-3.4.1.ebuild 787 SHA256 84765492367047fa1e01f45c8b349b1212895fd9569661c78adaffabf30f2745 SHA512 8f494c66e0ad479e15b0041a5fdd84bd3918cc6cfa0a6a748744104960f9e2a3a08deef2ae0060eb29020c9ef4282caee4107bab617e282b498255b7a995a70e WHIRLPOOL 972cc2b885e1b3831a7d7713928617bf6b4666fbd926432ea59793f1f7a11dbef1792abb0df74c0aeaaa1399bd058a28d44033da8a242f9d1a1fc302545ffb33 -EBUILD pycharm-community-4.0.6.ebuild 856 SHA256 a7d788d921effc4990c492f93d730272f7171e0c25deb0f3e50d53545963de15 SHA512 6195289d00bf1c9e8e5158f786b9e96eec4fdd119c87e9499625bb2278f6b4643c2f257ecc0c1c06cd45bbdb97440bac52d67d174ad149f9b6889bbe99af WHIRLPOOL 3714c2958d6ef0fd1a1559e214973e2561bff5289700597c4a7a5dc82d2b8d481c1416570a42da7e069946494c10097484bc6856c941381b4a5d22f55754ee99 -EBUILD pycharm-community-4.5.3.ebuild 856 SHA256 a7d788d921effc4990c492f93d730272f7171e0c25deb0f3e50d53545963de15 SHA512 6195289d00bf1c9e8e5158f786b9e96eec4fdd119c87e9499625bb2278f6b4643c2f257ecc0c1c06cd45bbdb97440bac52d67d174ad149f9b6889bbe99af WHIRLPOOL 3714c2958d6ef0fd1a1559e214973e2561bff5289700597c4a7a5dc82d2b8d481c1416570a42da7e069946494c10097484bc6856c941381b4a5d22f55754ee99 -EBUILD pycharm-community-4.5.4.ebuild 856 SHA256 a7d788d921effc4990c492f93d730272f7171e0c25deb0f3e50d53545963de15 SHA512 6195289d00bf1c9e8e5158f786b9e96eec4fdd119c87e9499625bb2278f6b4643c2f257ecc0c1c06cd45bbdb97440bac52d67d174ad149f9b6889bbe99af WHIRLPOOL 3714c2958d6ef0fd1a1559e214973e2561bff5289700597c4a7a5dc82d2b8d481c1416570a42da7e069946494c10097484bc6856c941381b4a5d22f55754ee99 EBUILD pycharm-community-5.0.1.ebuild 856 SHA256 a7d788d921effc4990c492f93d730272f7171e0c25deb0f3e50d53545963de15 SHA512 6195289d00bf1c9e8e5158f786b9e96eec4fdd119c87e9499625bb2278f6b4643c2f257ecc0c1c06cd45bbdb97440bac52d67d174ad149f9b6889bbe99af WHIRLPOOL 3714c2958d6ef0fd1a1559e214973e2561bff5289700597c4a7a5dc82d2b8d481c1416570a42da7e069946494c10097484bc6856c941381b4a5d22f55754ee99 MISC ChangeLog 2540 SHA256
[gentoo-commits] repo/gentoo:master commit in: profiles/features/selinux/
commit: 07ee7e5282b4f9af975bc7c1c389f2c9bb4c5c48 Author: Pacho Ramos gentoo org> AuthorDate: Fri Nov 20 19:38:59 2015 + Commit: Pacho Ramos gentoo org> CommitDate: Fri Nov 20 19:38:59 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07ee7e52 More masks are needed for selinux vs. systemd issues profiles/features/selinux/package.mask | 6 ++ profiles/features/selinux/package.use.mask | 4 2 files changed, 10 insertions(+) diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask index fb56442..793ed8c 100644 --- a/profiles/features/selinux/package.mask +++ b/profiles/features/selinux/package.mask @@ -3,12 +3,18 @@ # Jason Zaman(27 Jun 2015) # SystemD has no support in the SELinux policy at the moment. # Please see: https://wiki.gentoo.org/wiki/SELinux/FAQ#Can_I_use_SELinux_with_SystemD.3F +app-eselect/eselect-gnome-shell-extensions sys-apps/systemd app-admin/calamares dev-python/python-systemd gnome-base/gdm gnome-base/gnome +gnome-base/gnome-light gnome-extra/gnome-logs +gnome-extra/gnome-shell-extensions +gnome-extra/gnome-shell-frippery +gnome-extra/gnome-tweak-tool +x11-themes/zukitwo-shell gnome-extra/office-runner kde-misc/systemd-kcm net-firewall/firewalld diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask index 983b5c4..0c276eb 100644 --- a/profiles/features/selinux/package.use.mask +++ b/profiles/features/selinux/package.use.mask @@ -25,6 +25,10 @@ www-servers/uwsgi uwsgi_plugins_systemd_logger x11-wm/mutter kms x11-misc/xscreensaver gdm xfce-extra/xfswitch-plugin gdm +app-misc/workrave gnome +net-misc/wicd gnome-shell +x11-misc/gpaste gnome +x11-terms/gnome-terminal gnome-shell # Alex Brandt (6 Sep 2015) # app-emulation/rkt[rkt_stage1_src] requires systemd which isn't available with selinux.
[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/
commit: eceb532317a6e2c43d6a76da4e61f2da8030e1a3 Author: Michael Sterrett gentoo org> AuthorDate: Fri Nov 20 20:13:20 2015 + Commit: Michael Sterrett gentoo org> CommitDate: Fri Nov 20 20:13:20 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eceb5323 version bump (bug #566274) Package-Manager: portage-2.2.20.1 sci-astronomy/stellarium/Manifest | 6 ++ sci-astronomy/stellarium/stellarium-0.14.0.ebuild | 99 +++ 2 files changed, 105 insertions(+) diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest index b652c10..f788130 100644 --- a/sci-astronomy/stellarium/Manifest +++ b/sci-astronomy/stellarium/Manifest @@ -1,7 +1,13 @@ DIST stars_4_1v0_0.cat 17275482 SHA256 e0373d869d08ffac2ba78e7fbe29add6511073cd74a52b9918d8b77fb05827e7 SHA512 442fb8fa0d9a82401056a313ae2e229bb68057f3f0fd5557e966d645de1ac438c357e2b68f3deeb17ffdea78fb61ce004ab264204f42ebb19c2a00af900db217 WHIRLPOOL d19564d27fb9ac1c5c9e27eb61775c1dddb9382b1d8ea4d863aece2b88eb16fffb7863859cf589c5501fa0d1434b0b95dd41fb68f747b05f21cadf2a49927868 +DIST stars_4_1v0_1.cat 17040932 SHA256 7a2084e5e45610bbffae9448d9552d8a8dd191e5b1a07b0e47d27622fab4a979 SHA512 adf2241d0a8b58eb6b8ad5f885dd8a3a66610a63ae949f17f26e81f1ac8d1094d77879e361a0de3929e0d447b0de77142e0c7de0f1f123bd145e130fbfbe0f9a WHIRLPOOL 36267ddb117ed5100bb491760ec5589f8752bf0c655f45e78f7aad500f00d6dae1fdadd1af5d7663b81b8c2df4afed7cd07c652e056391beb531639739bd866c DIST stars_5_2v0_0.cat 46096018 SHA256 d093e25e8cb8350ef74706d7bf05455d224acb076da87bf1b784b5cf0e0d9931 SHA512 f1eb3f6ecee9da050177ad35d98104ba265d74c5d7017c7db35e25517a31fdc29c54355a1f93126a27e7210c24552c86cd95b599c9d1600c5aca7bb468005d94 WHIRLPOOL 0499b37739e22c1a0b34d99d1fcb8bed4695ff988bbf4af95b64f8fcb0473e8e2988d891def2d1842a0a8d37c588900f4fb4a011e7d0d0980a91bac1687e4fa0 +DIST stars_5_2v0_1.cat 42580300 SHA256 c4ebd18d05a805308cfac85fe224e3f0a75db6579cae65c935a0954da13f4164 SHA512 6fc0f7352d1165a0744cc932b6d379741e4614d5a95edd136522c789eaa8d1bcf05d7445f7dfd6896e8183aa64bf37b3610d87902b54542f62f2418b285892e0 WHIRLPOOL 946a7b57367ae21eae3c2ba59238b8502064d93511f43bc70b26f1383d75e403ba21e6ca0ee60f859521630a213f179ceab51f0380cbbacf92b255812cf69166 DIST stars_6_2v0_0.cat 160019110 SHA256 40a8674dead3178d9f36178f62e128047bb53784fa3ff408e473a5969a4ee379 SHA512 d693b7058bc1cce049a468e7082337d438958afc3465378df90fbfe473a6bb64fa1cadbf5e09fdb986ced3bcada7edb4a8d79ffeca1cb2b1dd4349c56313e4bb WHIRLPOOL 5f17613bdb1db1f9c4859ef39916a18c82782e4a3e15be73c2423a9d1445776d2a181b1a877df59d3776a50a54f6df4d66fc3621f74139786a3fed00c999ae06 +DIST stars_6_2v0_1.cat 148352404 SHA256 5794c7cd035f52d25608e9a2bd40c35f1d65f0327ef80c87fde93ef4047fc555 SHA512 794279407595f44bbc1e492086063d98068bf332202a5448cd83dd7afbdcf7c6c3ff2878f3016369ebb5a98552874eb4eddb38e2c40e9a163c6231b640e02977 WHIRLPOOL 1c4c12ce12dd3cd1d7a2e0e11cd34b378ae4c5f2a61f2b6a8e4889b61e78944e4caacae6a0ee78fc00ad022c90944fa7a6e3021f0f2c57c605f377c199a77486 DIST stars_7_2v0_0.cat 348268348 SHA256 730ca2d9182af5ebd4efcc5f87461ad9156caf79cadf1a79708fa970acb809fe SHA512 d6f974e5bf17616d016e6dc74bd5627c93ea53ff4844d86aebbdafac6256ac85c69f9e3d774f5c75cfe9fbca200dca4778e604dafbbb54af93d8d74e2247 WHIRLPOOL 3c8c52c5eda6f4749df0c1ddbee062037297a496705ec4a4a8325e1b9c925bb296822de3fec6857a5cac7fc45dc64ca6e0091526efec46200750ed152733ec59 +DIST stars_7_2v0_1.cat 305710678 SHA256 4d812c078f03d01c9b24bacedf6e688a4382d92468bab2aba2b96a9a0358a406 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3 WHIRLPOOL 6647e41ae573b0c2a2eb3c22ea0a34a50f077ef8c89fab35f101c08dcf1657b0a7d7d2812b73dc53c6992d25ccb3915ebdfbe7b7faafbda3bb69f81a2c82c2d9 DIST stars_8_2v0_0.cat 706781416 SHA256 91b79dcf97464b4ca0f6c604e745dac2c6ca02e25ed986dbec2de5f6d6e8a1f9 SHA512 f94360e8cca9a3261017adbddf1cb74878771d16d1d6062cead8e9343ad28d26bcfa2b23cdd0a182bc1d5fa0a000ac96f722510118b0ad38886f548f4595f03b WHIRLPOOL cf1c37274bc9ebc99d5021fccdfba92ee17509e60b708eaa47ee5cdef2ada9424bda1543c454670207e29e6cadbc178460adbfc45480bee1caebfeee95a7e211 +DIST stars_8_2v0_1.cat 559068934 SHA256 f1c0b3f25737f405ed4a2a045091d348885ffceb47258c3e32a2f4a800cac482 SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4 WHIRLPOOL a467e7aef3851ad219103a401e20896a89efe01615e5df753c63a74876442dcf22c78d838b269dca50af58e9484f1d1abfd56f2ecdfdb57fdb3e1087e2e7136e DIST stellarium-0.12.4.tar.gz 79343617 SHA256 0fae1b6e2231ccfaba8fd00abf816a88bd89b5dc61387ac84edf479b363c6684 SHA512 324a8c930281e26e91d45356cf3aab89cf708c7e64636b7e89de95af3f6d2569830caf05fb44ebef88f65dda55cb6dd18dcf4ee54d46da3910c456dc2daac478 WHIRLPOOL 8bce980d157904c4032368da335263a9afd2136386b0fd19d27e10f1c8b33712780130ed6845f26b3bac43f00d2de4aee80c47a0648a6cf6b4741bf69301f110 DIST
[gentoo-commits] proj/sci:master commit in: sci-biology/repeatmasker-libraries/
commit: f661be55eb5f418c44dbe61301f5f17037219622 Author: Martin Mokrejš fold natur cuni cz> AuthorDate: Fri Nov 20 20:59:25 2015 + Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Fri Nov 20 20:59:25 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f661be55 sci-biology/repeatmasker-libraries: version bump and improve einfo navigation for current website layout Package-Manager: portage-2.2.18 sci-biology/repeatmasker-libraries/ChangeLog | 10 ++ sci-biology/repeatmasker-libraries/metadata.xml| 5 +++ .../repeatmasker-libraries-20150807.ebuild | 36 ++ 3 files changed, 51 insertions(+) diff --git a/sci-biology/repeatmasker-libraries/ChangeLog b/sci-biology/repeatmasker-libraries/ChangeLog new file mode 100644 index 000..1c630fa --- /dev/null +++ b/sci-biology/repeatmasker-libraries/ChangeLog @@ -0,0 +1,10 @@ +# ChangeLog for sci-biology/repeatmasker-libraries +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Id$ + +*repeatmasker-libraries-20150807 (20 Nov 2015) + + 20 Nov 2015; Martin Mokrejs+metadata.xml, + +repeatmasker-libraries-20150807.ebuild: + sci-biology/repeatmasker-libraries: version bump and improve einfo navigation + for current website layout diff --git a/sci-biology/repeatmasker-libraries/metadata.xml b/sci-biology/repeatmasker-libraries/metadata.xml new file mode 100644 index 000..f17a827 --- /dev/null +++ b/sci-biology/repeatmasker-libraries/metadata.xml @@ -0,0 +1,5 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + sci-biology + diff --git a/sci-biology/repeatmasker-libraries/repeatmasker-libraries-20150807.ebuild b/sci-biology/repeatmasker-libraries/repeatmasker-libraries-20150807.ebuild new file mode 100644 index 000..d2c9432 --- /dev/null +++ b/sci-biology/repeatmasker-libraries/repeatmasker-libraries-20150807.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="A special version of RepBase used by RepeatMasker" +HOMEPAGE="http://repeatmasker.org/; +SRC_URI="repeatmaskerlibraries-${PV}.tar.gz" + +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="" + +S="${WORKDIR}/Libraries" + +RESTRICT="fetch" + +pkg_nofetch() { + einfo "Please register at http://www.girinst.org/ and go to" + einfo '"Repbase Update - RepeatMasker edition" link' + einfo 'which should take you to http://www.girinst.org/server/RepBase).' + einfo "Download repeatmaskerlibraries-${PV}.tar.gz and place it in '${DISTDIR}" + einfo "Older releases can be found at http://www.girinst.org/server/archive; +} + +src_install() { + insinto /usr/share/repeatmasker/Libraries + doins "${S}"/RepeatMaskerLib.embl + dodoc README + dohtml README.html +}
[gentoo-commits] proj/catalyst:master commit in: catalyst/base/, catalyst/targets/
commit: 3228dec78968e5f0b831cd477039decee6c79838 Author: Brian Dolbec gentoo org> AuthorDate: Fri Nov 20 21:20:35 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Nov 20 21:24:31 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3228dec7 Debug autoextension detection not working for stage2 Remove the set_source_path() re-definition from stage2. This only modified the seedcache location from the normal one to the previous build directory. This is wrong. The previous build location is normally cleaned and removed. Also, if this is actually needed, then it should be done globally and configurable. Add extra log messages to stagebase. Clean out a no longer relevant log.info message catalyst/base/stagebase.py | 17 - catalyst/targets/stage2.py | 21 - 2 files changed, 8 insertions(+), 30 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index df19c0b..69b7b0d 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -420,10 +420,15 @@ class StageBase(TargetBase, ClearBase, GenBase): self.settings["source_path"] = normpath(self.settings["storedir"] + "/tmp/" + self.settings["source_subpath"] + "/") else: + log.debug('Checking source path existence and ' + 'get the final filepath. subpath: %s', + self.settings["source_subpath"]) self.settings["source_path"] = file_check( normpath(self.settings["storedir"] + "/builds/" + self.settings["source_subpath"]) ) + log.debug('Source path returned from file_check is: %s', + self.settings["source_path"]) if os.path.isfile(self.settings["source_path"]): # XXX: Is this even necessary if the previous check passes? if os.path.exists(self.settings["source_path"]): @@ -431,14 +436,7 @@ class StageBase(TargetBase, ClearBase, GenBase): self.settings["hash_map"].generate_hash( self.settings["source_path"], hash_=self.settings["hash_function"]) - log.info('Source path set to %s', self.settings['source_path']) - if os.path.isdir(self.settings["source_path"]): - log.warning( - 'If this is not desired, remove this directory or turn off\n' - 'seedcache in the options of catalyst.conf the source path\n' - 'will then be %s', - normpath(self.settings['storedir'] + '/builds/' + - self.settings['source_subpath'])) + log.notice('Source path set to %s', self.settings['source_path']) def set_dest_path(self): if "root_path" in self.settings: @@ -749,7 +747,8 @@ class StageBase(TargetBase, ClearBase, GenBase): elif os.path.isdir(self.settings["source_path"]): # We should never reach this, so something is very wrong raise CatalystError( - "source path is a dir but seedcache is not enabled") + "source path is a dir but seedcache is not enabled: %s" + % self.settings["source_path"]) if _unpack: self.mount_safety_check() diff --git a/catalyst/targets/stage2.py b/catalyst/targets/stage2.py index ff060d2..9658a49 100644 --- a/catalyst/targets/stage2.py +++ b/catalyst/targets/stage2.py @@ -3,10 +3,8 @@ stage2 target, builds upon previous stage1 tarball """ # NOTE: That^^ docstring has influence catalyst-spec(5) man page generation. -import os from catalyst import log -from catalyst.support import normpath from catalyst.base.stagebase import StageBase @@ -19,25 +17,6 @@ class stage2(StageBase): self.valid_values=["chost"] StageBase.__init__(self,spec,addlargs) - def set_source_path(self): - if "seedcache" in self.settings["options"] and os.path.isdir(normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root")): - self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root") - else: -
[gentoo-commits] proj/catalyst:master commit in: catalyst/base/
commit: 20f6cd7ab2662ec23031b5a843a175a1236e83d3 Author: Brian Dolbec gentoo org> AuthorDate: Fri Nov 20 21:23:59 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Nov 20 21:24:31 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=20f6cd7a stagebase.py: Fix the empty .../build/default/stage* directory creation self.settings["target_path"] contained a trailing slash. This made the os.path.dirname() operation on it only drop the trailing slash. What was desired was the for the .../build/default path. catalyst/base/stagebase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 69b7b0d..62950b5 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1263,7 +1263,7 @@ class StageBase(TargetBase, ClearBase, GenBase): else: log.notice('Capture target in a tarball') # Remove filename from path - mypath = os.path.dirname(self.settings["target_path"]) + mypath = os.path.dirname(self.settings["target_path"].rstrip('/')) # Now make sure path exists ensure_dirs(mypath)
[gentoo-commits] proj/sci:master commit in: sci-biology/maker/
commit: a51248c80ee344d420c305b219c6272aae937030 Author: Martin Mokrejš fold natur cuni cz> AuthorDate: Fri Nov 20 21:08:24 2015 + Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Fri Nov 20 21:08:24 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a51248c8 sci-biology/maker: respect USE=mpi, remove hard DEPENDency on repeatmasker-libraries which are fetch restricted Package-Manager: portage-2.2.18 sci-biology/maker/ChangeLog | 8 ++-- sci-biology/maker/maker-2.31.8.ebuild | 13 ++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/sci-biology/maker/ChangeLog b/sci-biology/maker/ChangeLog index 9ad3002..62f6717 100644 --- a/sci-biology/maker/ChangeLog +++ b/sci-biology/maker/ChangeLog @@ -1,7 +1,11 @@ -# ChangeLog for sci-biology/MAKER -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# ChangeLog for sci-biology/maker +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 20 Nov 2015; Martin Mokrejsmaker-2.31.8.ebuild: + sci-biology/maker: respect USE=mpi, remove hard DEPENDency on repeatmasker- + libraries which are fetch restricted + 16 Sep 2014; Christoph Junghans MAKER-.ebuild: added license diff --git a/sci-biology/maker/maker-2.31.8.ebuild b/sci-biology/maker/maker-2.31.8.ebuild index 9ec94fe..d005e19 100644 --- a/sci-biology/maker/maker-2.31.8.ebuild +++ b/sci-biology/maker/maker-2.31.8.ebuild @@ -17,13 +17,14 @@ RESTRICT="fetch" LICENSE="|| ( GPL-2 Artistic-2 )" SLOT="0" KEYWORDS="" -IUSE="" +IUSE="mpi" # http://search.cpan.org/~rgarcia/Perl-Unsafe-Signals-0.02/ # http://search.cpan.org/~rybskej/forks-0.36/lib/forks.pm # http://search.cpan.org/~rybskej/forks-0.36/lib/forks/shared.pm # http://search.cpan.org/~dconway/IO-Prompt-0.997002/lib/IO/Prompt.pm -DEPEND="virtual/mpi +DEPEND=" + mpi? ( virtual/mpi ) dev-perl/DBI dev-perl/DBD-SQLite dev-perl/File-Which @@ -36,7 +37,6 @@ DEPEND="virtual/mpi >=sci-biology/bioperl-1.6 sci-biology/ncbi-tools || ( sci-biology/ncbi-tools++ ) sci-biology/snap - sci-biology/repeatmasker sci-biology/exonerate sci-biology/augustus" RDEPEND="${DEPEND}" @@ -46,9 +46,16 @@ S="${WORKDIR}"/maker/src pkg_nofetch() { einfo "Please visit ${HOMEPAGE} and obtain the file" einfo "maker-"${PV}".tgz and place it into ${DISTDIR}" + einfo "It is also advisable to install sci-biology/repeatmasker" + einfo "and in turn register for sci-biology/repeatmasker-libraries" } src_compile(){ perl Build.PL || die ./Build install || die } + +pkg_postinst(){ + einfo "It is also advisable to install sci-biology/repeatmasker" + einfo "and in turn register for sci-biology/repeatmasker-libraries" +}
[gentoo-commits] proj/sci:master commit in: sci-biology/maker/
commit: e32ec5ec672fcded9199d4943aaa12cf9f1b9224 Author: Martin Mokrejš fold natur cuni cz> AuthorDate: Fri Nov 20 21:26:51 2015 + Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Fri Nov 20 21:26:51 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e32ec5ec sci-biology/maker: depend on mpich2 when USE=mpi, add back hard DEPENDency on repeatmasker because install process does not continue without it, document additional perl modules not available in portage Package-Manager: portage-2.2.18 sci-biology/maker/ChangeLog | 5 sci-biology/maker/maker-2.31.8.ebuild | 56 +-- 2 files changed, 52 insertions(+), 9 deletions(-) diff --git a/sci-biology/maker/ChangeLog b/sci-biology/maker/ChangeLog index 62f6717..bf295cf 100644 --- a/sci-biology/maker/ChangeLog +++ b/sci-biology/maker/ChangeLog @@ -3,6 +3,11 @@ # $Id$ 20 Nov 2015; Martin Mokrejsmaker-2.31.8.ebuild: + sci-biology/maker: depend on mpich2 when USE=mpi, add back hard DEPENDency on + repeatmasker because install process does not continue without it, document + additional perl modules not available in portage + + 20 Nov 2015; Martin Mokrejs maker-2.31.8.ebuild: sci-biology/maker: respect USE=mpi, remove hard DEPENDency on repeatmasker- libraries which are fetch restricted diff --git a/sci-biology/maker/maker-2.31.8.ebuild b/sci-biology/maker/maker-2.31.8.ebuild index d005e19..00a88da 100644 --- a/sci-biology/maker/maker-2.31.8.ebuild +++ b/sci-biology/maker/maker-2.31.8.ebuild @@ -24,7 +24,7 @@ IUSE="mpi" # http://search.cpan.org/~rybskej/forks-0.36/lib/forks/shared.pm # http://search.cpan.org/~dconway/IO-Prompt-0.997002/lib/IO/Prompt.pm DEPEND=" - mpi? ( virtual/mpi ) + mpi? ( sys-cluster/mpich2 ) dev-perl/DBI dev-perl/DBD-SQLite dev-perl/File-Which @@ -33,29 +33,67 @@ DEPEND=" dev-perl/IO-All dev-perl/libwww-perl dev-perl/DBD-Pg + dev-perl/Want virtual/perl-Module-Build >=sci-biology/bioperl-1.6 sci-biology/ncbi-tools || ( sci-biology/ncbi-tools++ ) sci-biology/snap sci-biology/exonerate - sci-biology/augustus" + sci-biology/augustus + sci-biology/repeatmasker" RDEPEND="${DEPEND}" +# == +# STATUS MAKER v2.31.8 +# == +# PERL Dependencies: MISSING +# ! Perl::Unsafe::Signals +# ! Want +# ! forks +# ! forks::shared +# +# External Programs: MISSING +# ! RepeatMasker +# +# External C Libraries: VERIFIED +# MPI SUPPORT:DISABLED +# MWAS Web Interface: DISABLED +# MAKER PACKAGE: MISSING PREREQUISITES +# +# +# Important Commands: +# ./Build installdeps #installs missing PERL dependencies +# ./Build installexes #installs all missing external programs +# ./Build install #installs MAKER +# ./Build status #Shows this status menu +# +# Other Commands: +# ./Build repeatmasker#installs RepeatMasker (asks for RepBase) +# ./Build blast #installs BLAST (NCBI BLAST+) +# ./Build exonerate #installs Exonerate (v2 on UNIX / v1 on Mac OSX) +# ./Build snap#installs SNAP +# ./Build augustus#installs Augustus +# ./Build apollo #installs Apollo +# ./Build gbrowse #installs GBrowse (must be root) +# ./Build jbrowse #installs JBrowse (MAKER copy, not web accecible) +# ./Build webapollo #installs WebApollo (use maker2wap to create DBs) +# ./Build mpich2 #installs MPICH2 (but manual install recommended) +# Building MAKER +# +# * MISSING MAKER PREREQUISITES - CANNOT CONTINUE!! + S="${WORKDIR}"/maker/src pkg_nofetch() { einfo "Please visit ${HOMEPAGE} and obtain the file" einfo "maker-"${PV}".tgz and place it into ${DISTDIR}" - einfo "It is also advisable to install sci-biology/repeatmasker" - einfo "and in turn register for sci-biology/repeatmasker-libraries" + einfo "You must also install sci-biology/repeatmasker otherwise" + einfo "MAKER install will stop." + einfo "That in turn requires you to register at http://www.girinst.org/server/RepBase; + einfo "to obtain for sci-biology/repeatmasker-libraries" } src_compile(){ perl Build.PL || die ./Build install || die } - -pkg_postinst(){ - einfo "It is also advisable to install sci-biology/repeatmasker" - einfo "and in turn register for sci-biology/repeatmasker-libraries" -}
[gentoo-commits] proj/sci:master commit in: sci-biology/maker/
commit: 7028de3e8e30208ab7bde0da4a84a0572cb9da02 Author: Martin Mokrejš fold natur cuni cz> AuthorDate: Fri Nov 20 21:36:56 2015 + Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Fri Nov 20 21:36:56 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7028de3e sci-biology/maker: document opened Gentoo bugzilla tickets Package-Manager: portage-2.2.18 sci-biology/maker/ChangeLog | 3 +++ sci-biology/maker/maker-2.31.8.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sci-biology/maker/ChangeLog b/sci-biology/maker/ChangeLog index bf295cf..114f18d 100644 --- a/sci-biology/maker/ChangeLog +++ b/sci-biology/maker/ChangeLog @@ -3,6 +3,9 @@ # $Id$ 20 Nov 2015; Martin Mokrejsmaker-2.31.8.ebuild: + sci-biology/maker: document opened Gentoo bugzilla tickets + + 20 Nov 2015; Martin Mokrejs maker-2.31.8.ebuild: sci-biology/maker: depend on mpich2 when USE=mpi, add back hard DEPENDency on repeatmasker because install process does not continue without it, document additional perl modules not available in portage diff --git a/sci-biology/maker/maker-2.31.8.ebuild b/sci-biology/maker/maker-2.31.8.ebuild index 00a88da..7f422b9 100644 --- a/sci-biology/maker/maker-2.31.8.ebuild +++ b/sci-biology/maker/maker-2.31.8.ebuild @@ -19,10 +19,10 @@ SLOT="0" KEYWORDS="" IUSE="mpi" -# http://search.cpan.org/~rgarcia/Perl-Unsafe-Signals-0.02/ -# http://search.cpan.org/~rybskej/forks-0.36/lib/forks.pm +# http://search.cpan.org/~rgarcia/Perl-Unsafe-Signals-0.02/ # bug #566358 +# http://search.cpan.org/~rybskej/forks-0.36/lib/forks.pm # bug #566360 # http://search.cpan.org/~rybskej/forks-0.36/lib/forks/shared.pm -# http://search.cpan.org/~dconway/IO-Prompt-0.997002/lib/IO/Prompt.pm +# http://search.cpan.org/~dconway/IO-Prompt-0.997002/lib/IO/Prompt.pm # bug #566362 DEPEND=" mpi? ( sys-cluster/mpich2 ) dev-perl/DBI
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/
commit: c4b420c61290b2a553b0d02903837a9aa4c34e42 Author: Brian Evans gentoo org> AuthorDate: Fri Nov 20 20:34:39 2015 + Commit: Brian Evans gentoo org> CommitDate: Fri Nov 20 20:34:39 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4b420c6 sys-cluster/galera: Drop old version Package-Manager: portage-2.2.25 sys-cluster/galera/Manifest | 1 - sys-cluster/galera/galera-25.3.5.ebuild | 87 - 2 files changed, 88 deletions(-) diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest index 2f875c5..08cc646 100644 --- a/sys-cluster/galera/Manifest +++ b/sys-cluster/galera/Manifest @@ -1,3 +1,2 @@ -DIST galera-25.3.5-src.tar.gz 3820268 SHA256 9e6d718bac9608c69cbfc0662963b29c13659c576aaa8469b6a325d75603f7a3 SHA512 34bd01c46b080219106e140a7ff011c39ce2c9afaf6b8205daca91347ac3979a3af61bcddaf9c5cc63748b19236a2e4efa88532760b347fefa38e037f90b0995 WHIRLPOOL 055a59cc3631ccb0501c2ce4c5812ae0e001104254a97540f78a3f8feaed94b85bd82ecc3e1e4a3c2e477ab6f02d638dc8e8ea1471b8a63ca603f3a9ecd6403d DIST galera-3-25.3.10.tar.gz 2990393 SHA256 5281cef0c26e409f93184a08fe3668bc0891aeec9710ffebc66402091d005d1d SHA512 d2fc09a9d274199650e29c7492a736a6518655458b6cad9ba960282928ec2d0f8187d35ee439c93a57ecb0f1b6a66b83474128f71ad67724cc784a887fc2172d WHIRLPOOL 294feec18418f69d7f1f1d416fc9893e403555d525851e3a4c1996bd9f0bf5689588ae930f77ad8c691a0c7c30d11c62f4928519a7b3722e9976ec5ee57931e5 DIST galera-3-25.3.12.tar.gz 2989294 SHA256 2941cece3aa12d34bd454de8c3d2c4796a47dcfaef643e97d1b94462aa32e126 SHA512 6c18327d786a0c549b89a8668c302e3221d1f7586b271e927ca511ac9e8ee4413315641f6a43814b49e9231cdcd4c76dcd8e975098f768ea8d9f4638b1391e62 WHIRLPOOL b0067ade420c49d374baf901472841ff21ccbd73c1ef7eb7b48f7e591954f875fc5993664c54daa1e400e37cc0647f1a39515129e2d6789035de3dba0edb6d7e diff --git a/sys-cluster/galera/galera-25.3.5.ebuild b/sys-cluster/galera/galera-25.3.5.ebuild deleted file mode 100644 index 5a3472d..000 --- a/sys-cluster/galera/galera-25.3.5.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MY_P="${PN}-${PV}-src" - -inherit scons-utils multilib toolchain-funcs base versionator eutils user flag-o-matic -DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API" -HOMEPAGE="http://www.codership.org/; -SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 2).x/${PV}/+download/${MY_P}.tar.gz" -LICENSE="GPL-2 BSD" - -SLOT="0" - -KEYWORDS="~amd64 ~x86" -IUSE="garbd ssl test" - -CDEPEND=" -ssl? ( dev-libs/openssl:0= ) - >=dev-libs/boost-1.41 - " -DEPEND="${DEPEND} - ${CDEPEND} - dev-libs/check - >=sys-devel/gcc-4.4 - >=dev-cpp/asio-1.4.8[ssl?] - " -#Run time only -RDEPEND="${CDEPEND} - garbd? ( || ( - net-analyzer/netcat - net-analyzer/netcat6 - net-analyzer/gnu-netcat - net-analyzer/openbsd-netcat - ) )" - -S="${WORKDIR}/${MY_P}" - -pkg_preinst() { - if use garbd ; then - enewgroup garbd - enewuser garbd -1 -1 -1 garbd - fi -} - -src_prepare() { - # Remove bundled dev-cpp/asio - rm -r "${S}/asio" || die - - # Respect {C,LD}FLAGS. - epatch "${FILESDIR}/respect-flags.patch" - - #Remove optional garbd daemon - if ! use garbd ; then - rm -r "${S}/garb" || die - fi - - epatch_user -} - -src_configure() { - tc-export CC CXX - # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++, - # and -Wold-style-cast - myesconsargs=( - $(use_scons ssl ssl 1 0) - $(use_scons test tests 1 0) - strict_build_flags=0 - ) -} - -src_compile() { - escons --warn=no-missing-sconscript -} - -src_install() { - dodoc scripts/packages/README scripts/packages/README-MySQL - if use garbd ; then - dobin garb/garbd - newconfd "${FILESDIR}/garb.cnf" garbd - newinitd "${FILESDIR}/garb.sh" garbd - fi - exeinto /usr/$(get_libdir)/${PN} - doexe libgalera_smm.so -}
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/
commit: 705e51c026f924ad9f585aeb1522705477a6669f Author: Brian Evans gentoo org> AuthorDate: Fri Nov 20 20:36:16 2015 + Commit: Brian Evans gentoo org> CommitDate: Fri Nov 20 20:36:16 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=705e51c0 sys-cluster/galera: Shorten DESCRIPTION to 80 characters Package-Manager: portage-2.2.25 sys-cluster/galera/galera-25.3.10.ebuild | 2 +- sys-cluster/galera/galera-25.3.12.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/galera/galera-25.3.10.ebuild b/sys-cluster/galera/galera-25.3.10.ebuild index c6651f7..98c8a2d 100644 --- a/sys-cluster/galera/galera-25.3.10.ebuild +++ b/sys-cluster/galera/galera-25.3.10.ebuild @@ -7,7 +7,7 @@ EAPI=5 MY_P="${PN}-3-${PV}" inherit scons-utils multilib toolchain-funcs eutils user flag-o-matic -DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API" +DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API" HOMEPAGE="http://www.galeracluster.com; SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz; LICENSE="GPL-2 BSD" diff --git a/sys-cluster/galera/galera-25.3.12.ebuild b/sys-cluster/galera/galera-25.3.12.ebuild index bd9f80e..ec06eca 100644 --- a/sys-cluster/galera/galera-25.3.12.ebuild +++ b/sys-cluster/galera/galera-25.3.12.ebuild @@ -7,7 +7,7 @@ EAPI=5 MY_P="${PN}-3-${PV}" inherit scons-utils multilib toolchain-funcs eutils user flag-o-matic -DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API" +DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API" HOMEPAGE="http://www.galeracluster.com; SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz; LICENSE="GPL-2 BSD"
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/, sys-cluster/galera/files/
commit: 6364233eac2a78d83a5dddf240c677bc71055b80 Author: Brian Evans gentoo org> AuthorDate: Fri Nov 20 21:13:51 2015 + Commit: Brian Evans gentoo org> CommitDate: Fri Nov 20 21:13:51 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6364233e sys-cluster/galera: Version bump Package-Manager: portage-2.2.25 sys-cluster/galera/Manifest| 1 + .../files/galera-3.13-strip-extra-cflags.patch | 70 + sys-cluster/galera/galera-25.3.13.ebuild | 88 ++ 3 files changed, 159 insertions(+) diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest index 08cc646..f4776ed 100644 --- a/sys-cluster/galera/Manifest +++ b/sys-cluster/galera/Manifest @@ -1,2 +1,3 @@ DIST galera-3-25.3.10.tar.gz 2990393 SHA256 5281cef0c26e409f93184a08fe3668bc0891aeec9710ffebc66402091d005d1d SHA512 d2fc09a9d274199650e29c7492a736a6518655458b6cad9ba960282928ec2d0f8187d35ee439c93a57ecb0f1b6a66b83474128f71ad67724cc784a887fc2172d WHIRLPOOL 294feec18418f69d7f1f1d416fc9893e403555d525851e3a4c1996bd9f0bf5689588ae930f77ad8c691a0c7c30d11c62f4928519a7b3722e9976ec5ee57931e5 DIST galera-3-25.3.12.tar.gz 2989294 SHA256 2941cece3aa12d34bd454de8c3d2c4796a47dcfaef643e97d1b94462aa32e126 SHA512 6c18327d786a0c549b89a8668c302e3221d1f7586b271e927ca511ac9e8ee4413315641f6a43814b49e9231cdcd4c76dcd8e975098f768ea8d9f4638b1391e62 WHIRLPOOL b0067ade420c49d374baf901472841ff21ccbd73c1ef7eb7b48f7e591954f875fc5993664c54daa1e400e37cc0647f1a39515129e2d6789035de3dba0edb6d7e +DIST galera-3-25.3.13.tar.gz 2989201 SHA256 193db0c1ccf1c3cfbd46b23d26441fe022ffe82788ed467c6b2df02abc4b814d SHA512 6c83dca5f6087cfbbc6aa30ac4b3f47ce08e7d958875f5c07c260ec8e9677c0e3d9e1ebb347615e0842e85f952c8b7713ee02f6148c9049ae336b29c28dc2ade WHIRLPOOL f6fcda502c3145d0430496a4de9e2368e102769a254d905fb9594b082e9bc386ab6a40edc00e084a3dfa04f800368e45d449f94a634343a8d4f61725c849f23b diff --git a/sys-cluster/galera/files/galera-3.13-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-3.13-strip-extra-cflags.patch new file mode 100644 index 000..972152d --- /dev/null +++ b/sys-cluster/galera/files/galera-3.13-strip-extra-cflags.patch @@ -0,0 +1,70 @@ +diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript +--- a/galerautils/src/SConscript 2015-03-16 07:18:42.0 -0400 b/galerautils/src/SConscript 2015-04-07 15:03:21.661301200 -0400 +@@ -1,4 +1,4 @@ +-Import('env', 'x86', 'sysname') ++Import('env', 'sysname') + + libgalerautils_env = env.Clone() + +@@ -39,21 +39,6 @@ + crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ] + crc32c_objs = crc32c_env.SharedObject(crc32c_sources) + +-if x86: +-crc32c_env.Append(CFLAGS = ' -msse4.2') +-if sysname == 'sunos': +-# Ideally we want to simply strip SSE4.2 flag from the resulting +-# crc32.pic.o +-# (see http://ffmpeg.org/pipermail/ffmpeg-user/2013-March/013977.html) +-# but that requires some serious scons-fu, so we just don't +-# compile hardware support in if host CPU does not have it. +-from subprocess import check_call +-try: +-check_call("isainfo -v | grep sse4.2 >/dev/null 2>&1", shell=True); +-except: +-libgalerautils_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE') +-crc32c_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE') +- + libgalerautils_env.StaticLibrary('galerautils', + libgalerautils_objs + crc32c_objs) + +diff -aurN a/SConstruct b/SConstruct +--- a/SConstruct 2015-09-15 09:15:07.770091000 -0400 b/SConstruct 2015-09-15 09:18:41.160091000 -0400 +@@ -67,7 +67,7 @@ + build_target = 'all' + + # Optimization level +-opt_flags= ' -g -O3 -DNDEBUG' ++opt_flags= ' -DNDEBUG' + + # Architecture (defaults to build host type) + compile_arch = '' +@@ -97,26 +97,6 @@ + if dbug: + opt_flags = opt_flags + ' -DGU_DBUG_ON' + +-if sysname == 'sunos': +-compile_arch = ' -mtune=native' +-elif x86: +-if bits == 32: +-if machine == 'x86_64': +-compile_arch = ' -mx32' +-else: +-compile_arch = ' -m32 -march=i686' +-if sysname == 'linux': +-link_arch = ' -Wl,-melf_i386' +-else: +-compile_arch = ' -m64' +-if sysname == 'linux': +-link_arch = ' -Wl,-melf_x86_64' +-link_arch = compile_arch + link_arch +-elif machine == 's390x': +-compile_arch = ' -mzarch -march=z196 -mtune=zEC12' +-if bits == 32: +-compile_arch += ' -m32' +- + boost = int(ARGUMENTS.get('boost', 1)) + boost_pool = int(ARGUMENTS.get('boost_pool', 0)) + ssl= int(ARGUMENTS.get('ssl', 1)) diff --git a/sys-cluster/galera/galera-25.3.13.ebuild b/sys-cluster/galera/galera-25.3.13.ebuild new file mode 100644 index 000..6479436 --- /dev/null +++ b/sys-cluster/galera/galera-25.3.13.ebuild @@ -0,0 +1,88 @@ +# Copyright
[gentoo-commits] repo/gentoo:master commit in: dev-java/svgsalamander/
commit: 9d8d870c7adb23e8a68dea25031ee3ed03b9df8e Author: Patrice Clement gentoo org> AuthorDate: Fri Nov 20 22:17:58 2015 + Commit: Patrice Clement gentoo org> CommitDate: Fri Nov 20 22:18:53 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d8d870c dev-java/svgsalamander: Stable for amd64. Stable for x86 using the ALLARCHES policy. Package-Manager: portage-2.2.20.1 Signed-off-by: Patrice Clement gentoo.org> dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild b/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild index 52a794c..f16a15f 100644 --- a/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild +++ b/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" CDEPEND=" dev-java/ant-core:0
[gentoo-commits] repo/gentoo:master commit in: dev-java/svgsalamander/
commit: 7a80858a4d3ae439cc571b76d2136aef6b6c9611 Author: Patrice Clement gentoo org> AuthorDate: Fri Nov 20 22:16:55 2015 + Commit: Patrice Clement gentoo org> CommitDate: Fri Nov 20 22:18:49 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a80858a dev-java/svgsalamander: Housekeeping. Package-Manager: portage-2.2.20.1 Signed-off-by: Patrice Clement gentoo.org> ...nder-0.0-r1.ebuild => svgsalamander-0.0-r2.ebuild} | 19 --- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dev-java/svgsalamander/svgsalamander-0.0-r1.ebuild b/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild similarity index 83% rename from dev-java/svgsalamander/svgsalamander-0.0-r1.ebuild rename to dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild index 445c3a5..52a794c 100644 --- a/dev-java/svgsalamander/svgsalamander-0.0-r1.ebuild +++ b/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild @@ -3,11 +3,10 @@ # $Id$ EAPI="5" - JAVA_PKG_IUSE="doc examples source" WANT_ANT_TASKS="ant-nodeps ant-trax" -inherit eutils java-pkg-2 java-ant-2 +inherit java-pkg-2 java-ant-2 DESCRIPTION="a SVG engine for Java" HOMEPAGE="https://svgsalamander.dev.java.net/; @@ -20,18 +19,24 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" +CDEPEND=" + dev-java/ant-core:0 + dev-java/javacc:0 +" + RDEPEND=" - >=virtual/jre-1.5 - dev-java/ant-core:0" + ${CDEPEND} + >=virtual/jre-1.6" DEPEND=" - >=virtual/jdk-1.5 - dev-java/javacc:0" + ${CDEPEND} + >=virtual/jdk-1.6" + +JAVA_ANT_REWRITE_CLASSPATH="yes" java_prepare() { # Delete these so that we don't need junit # They run a dialog any way so not useful for us - ecvs_clean rm -vr test/* || die cd lib || die
[gentoo-commits] repo/gentoo:master commit in: app-misc/xmind/files/, app-misc/xmind/
commit: 2af4e45b03741e10e5496b09aa4d2e846d950467 Author: Chris Reffett gentoo org> AuthorDate: Sat Nov 21 00:06:34 2015 + Commit: Chris Reffett gentoo org> CommitDate: Sat Nov 21 00:06:34 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2af4e45b Fix wrapper script to pass command line arguments to xmind Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=563562 app-misc/xmind/files/xmind-wrapper-3.5.3 | 8 ...5.3.201506180105.ebuild => xmind-3.5.3.201506180105-r1.ebuild} | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app-misc/xmind/files/xmind-wrapper-3.5.3 b/app-misc/xmind/files/xmind-wrapper-3.5.3 new file mode 100644 index 000..b38ef14 --- /dev/null +++ b/app-misc/xmind/files/xmind-wrapper-3.5.3 @@ -0,0 +1,8 @@ +#!/bin/bash +#XMind wrapper script, copies configuration stuff into the user's local config dir if either +#the files aren't there or are older than the set in /opt (indicating that XMind has been upgraded) +if [ ! -f ~/.xmind/configuration-cathy/config.ini -o ~/.xmind/configuration-cathy/config.ini -ot /opt/xmind/XMind/configuration/config.ini ]; then + mkdir -p ~/.xmind/configuration-cathy + cp -r /opt/xmind/XMind/configuration/* ~/.xmind/configuration-cathy/ +fi +/opt/xmind/XMind/XMind "$@" diff --git a/app-misc/xmind/xmind-3.5.3.201506180105.ebuild b/app-misc/xmind/xmind-3.5.3.201506180105-r1.ebuild similarity index 97% rename from app-misc/xmind/xmind-3.5.3.201506180105.ebuild rename to app-misc/xmind/xmind-3.5.3.201506180105-r1.ebuild index 0dcc285..ebd1642 100644 --- a/app-misc/xmind/xmind-3.5.3.201506180105.ebuild +++ b/app-misc/xmind/xmind-3.5.3.201506180105-r1.ebuild @@ -64,7 +64,7 @@ src_install() { fperms a+rx "/opt/xmind/XMind/XMind" exeinto /opt/bin - newexe "${FILESDIR}/xmind-wrapper" xmind + newexe "${FILESDIR}/xmind-wrapper-3.5.3" xmind # install icons local res
[gentoo-commits] repo/gentoo:master commit in: app-misc/xmind/
commit: 9f26b8e855e786ae66080afb429c0be40b27da74 Author: Chris Reffett gentoo org> AuthorDate: Sat Nov 21 00:21:55 2015 + Commit: Chris Reffett gentoo org> CommitDate: Sat Nov 21 00:21:55 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f26b8e8 Fix desktop file's name Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=563468 ...3.5.3.201506180105-r1.ebuild => xmind-3.5.3.201506180105-r2.ebuild} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app-misc/xmind/xmind-3.5.3.201506180105-r1.ebuild b/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild similarity index 95% rename from app-misc/xmind/xmind-3.5.3.201506180105-r1.ebuild rename to app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild index ebd1642..32e785a 100644 --- a/app-misc/xmind/xmind-3.5.3.201506180105-r1.ebuild +++ b/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild @@ -72,8 +72,7 @@ src_install() { newicon -s ${res} "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png done - # make desktop entry - make_desktop_entry "xmind %F" XMind xmind Office "MimeType=application/x-xmind;" + make_desktop_entry ${PN} "XMind" ${PN} "Office" "MimeType=application/x-xmind;" } pkg_preinst() {
[gentoo-commits] repo/gentoo:master commit in: dev-java/jmdns/
commit: a7b714133d5e7de3bb86e1ea5a08d209a23e4914 Author: Patrice Clement gentoo org> AuthorDate: Fri Nov 20 22:45:29 2015 + Commit: Patrice Clement gentoo org> CommitDate: Fri Nov 20 22:45:29 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7b71413 dev-java/jmdns: Stable for amd64. Stable for x86 using the ALLARCHES policy. Package-Manager: portage-2.2.20.1 Signed-off-by: Patrice Clement gentoo.org> dev-java/jmdns/jmdns-3.4.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/jmdns/jmdns-3.4.1-r1.ebuild b/dev-java/jmdns/jmdns-3.4.1-r1.ebuild index 2ccf9ad..8fd6327 100644 --- a/dev-java/jmdns/jmdns-3.4.1-r1.ebuild +++ b/dev-java/jmdns/jmdns-3.4.1-r1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://jmdns.sourceforge.net; LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 x86" IUSE="" DEPEND=">=virtual/jdk-1.6"
[gentoo-commits] proj/sci:master commit in: sci-biology/parafly/
commit: b39d83c6d58ed27b5ee057320a727ab4228cf4dc Author: Martin Mokrejš fold natur cuni cz> AuthorDate: Fri Nov 20 23:33:19 2015 + Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Fri Nov 20 23:33:19 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b39d83c6 sci-biology/parafly: document a recent upstream bugreport from github Package-Manager: portage-2.2.18 sci-biology/parafly/ChangeLog | 4 sci-biology/parafly/parafly-20130121.ebuild | 2 ++ 2 files changed, 6 insertions(+) diff --git a/sci-biology/parafly/ChangeLog b/sci-biology/parafly/ChangeLog index 8a13e38..5a69c8c 100644 --- a/sci-biology/parafly/ChangeLog +++ b/sci-biology/parafly/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 20 Nov 2015; Martin Mokrejs+ parafly-20130121.ebuild: + sci-biology/parafly: document a recent upstream bugreport from github + *parafly-20130121 (08 Jan 2015) 08 Jan 2015; Martin Mokrejs +metadata.xml, diff --git a/sci-biology/parafly/parafly-20130121.ebuild b/sci-biology/parafly/parafly-20130121.ebuild index 4d7ab90..8b0ebd3 100644 --- a/sci-biology/parafly/parafly-20130121.ebuild +++ b/sci-biology/parafly/parafly-20130121.ebuild @@ -18,6 +18,8 @@ RDEPEND="${DEPEND}" S="${WORKDIR}"/TransDecoder_r20140704/3rd_party/parafly-r2013-01-21 +# maybe we once the CXXFLAGS and LDFLAGS mentioned +# in https://github.com/trinityrnaseq/trinityrnaseq/issues/65 ? src_configure(){ ./configure --prefix=/usr }
[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/, dev-java/hamcrest-library/files/
commit: 46ac4840a5cab580f44d5186b604acbde648ac96 Author: Patrice Clement gentoo org> AuthorDate: Fri Nov 20 22:40:12 2015 + Commit: Patrice Clement gentoo org> CommitDate: Fri Nov 20 22:40:12 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46ac4840 dev-java/hamcrest-library: Clean up old. Package-Manager: portage-2.2.20.1 Signed-off-by: Patrice Clement gentoo.org> dev-java/hamcrest-library/Manifest | 1 - .../files/1.1-remove-targets.patch | 113 - .../hamcrest-library/hamcrest-library-1.1.ebuild | 53 -- 3 files changed, 167 deletions(-) diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest index 780ede8..2bc8250 100644 --- a/dev-java/hamcrest-library/Manifest +++ b/dev-java/hamcrest-library/Manifest @@ -1,2 +1 @@ -DIST hamcrest-1.1.tgz 1670123 SHA256 a76cca2dbb38ac185f51f8551c964a356009c7adf1a19b5407f87352e2e438c8 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595 WHIRLPOOL 937d4fcde43a36eb19efb1b45e255389dcd18a853f90cc96e6421cec4db176708047e4c6de53ad7f3c11b29e4bc77725c3b70992239d9da420fa95c682615011 DIST hamcrest-1.3.tgz 3686096 SHA256 c6428e40d069fff3f99780efaae96c35ebdbf7cbfd475504254ebffcc19620c2 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 WHIRLPOOL 9edc85f8d988ba9e7d080e3240d02956775bb73857903a2ec2a72e80d5a1b8570111c97d7b9906951273a1a1db6213a77de9cc2c55a6c73246d45157fed11ed9 diff --git a/dev-java/hamcrest-library/files/1.1-remove-targets.patch b/dev-java/hamcrest-library/files/1.1-remove-targets.patch deleted file mode 100644 index 08affbc..000 --- a/dev-java/hamcrest-library/files/1.1-remove-targets.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml -index f819d3d..b24dea0 100644 a/hamcrest-1.1/build.xml -+++ b/hamcrest-1.1/build.xml -@@ -23,48 +23,11 @@ - - -- -- -- -- -- -- -- -- - - - -- -- -- -- -- -- -- -- -- -- -- - - - - - -- -- -- -- -+ -+ -+ -+ - -@@ -121,7 +84,7 @@ - destjar="build/hamcrest-unit-test-${version}.jar" - classpath=" - build/hamcrest-core-${version}.jar; --build/hamcrest-library-${version}.jar; -+build/hamcrest-library-${version}.jar; - build/hamcrest-text-${version}.jar; - build/hamcrest-integration-${version}.jar; - build/hamcrest-generator-${version}.jar"/> -@@ -164,7 +127,7 @@ - - - -- -+ - - - -@@ -221,7 +184,7 @@ - - - -- -+ - - - -@@ -261,4 +224,4 @@ - - - -- -+ diff --git a/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild deleted file mode 100644 index bb2dc08..000 --- a/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-ant-2 - -MY_PN=${PN/-library} -MY_P="${MY_PN}-${PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Core library of matchers for building test expressions" -HOMEPAGE="https://github.com/hamcrest; -SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz; - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -CDEPEND=" - dev-java/hamcrest-core:${SLOT} - dev-java/hamcrest-generator:${SLOT} - dev-java/qdox:1.6 -" -DEPEND=">=virtual/jdk-1.5 - userland_GNU? ( sys-apps/findutils ) - ${CDEPEND}" - -RDEPEND=">=virtual/jre-1.5 - ${CDEPEND}" - -JAVA_ANT_REWRITE_CLASSPATH="true" -JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar" -EANT_GENTOO_CLASSPATH="hamcrest-generator,hamcrest-core,qdox-1.6" -EANT_BUILD_TARGET="library" -EANT_EXTRA_ARGS="-Dversion=${PV}" -EANT_GENTOO_CLASSPATH_EXTRA="build/${P}.jar" - -java_prepare() { - # remove core+generator target as they are already built. - epatch "${FILESDIR}/${PV}-remove-targets.patch" - - find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files" -} - -src_install() { - java-pkg_newjar build/${PN/core/library}-${PV}.jar
[gentoo-commits] repo/gentoo:master commit in: dev-java/jmdns/
commit: 15e6c749fedcecf606c368ee689ab051ab71c0db Author: Patrice Clement gentoo org> AuthorDate: Fri Nov 20 22:46:01 2015 + Commit: Patrice Clement gentoo org> CommitDate: Fri Nov 20 22:46:01 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e6c749 dev-java/jmdns: Clean up old. Package-Manager: portage-2.2.20.1 Signed-off-by: Patrice Clement gentoo.org> dev-java/jmdns/Manifest | 2 -- dev-java/jmdns/jmdns-1.0.ebuild | 47 --- dev-java/jmdns/jmdns-3.1.4.ebuild | 29 dev-java/jmdns/jmdns-3.4.1.ebuild | 30 - 4 files changed, 108 deletions(-) diff --git a/dev-java/jmdns/Manifest b/dev-java/jmdns/Manifest index e486518..2674779 100644 --- a/dev-java/jmdns/Manifest +++ b/dev-java/jmdns/Manifest @@ -1,3 +1 @@ -DIST jmdns-1.0-Final.tar.gz 157799 SHA256 eed717e220f13e0063f09cd9b0bb9fe43dbe9d8ac68b7fa184bae5ce2864295b SHA512 62fc4e0a8ce42acb8f414299d6d59a313a3a201fb634777a77be78bff679eae4c2068959e035d82d6b6159cb1a42abfdce02509d9b511f36d8aea6eb3a19c6b4 WHIRLPOOL 060b316324596157a056abda9cdf5114b5801702ea948e8c5c44755cb32d15e919647fadfba2826766337e7525a0dbaf56c85335ce443455c047e1361190533d -DIST jmdns-3.1.4.tgz 275127 SHA256 3824642f040d358745952e8e5e8686d45a4f18a9ed4605e5b72eae8e082386ab SHA512 4c644b02f814fb8c6ea81d74ee18697eecfa2e57de73bebe2b3b1ac89c7f5b45143c55c343426bce2ac38bd0ac82aa316b5af6a704bd9732ebac6224c3ed8e44 WHIRLPOOL ba4e27f9d3f42656df816a02b41d5a81bfa866727c3a6c513607bc3d35152e66a082f809ccaada69d82dc9cf5a9d2e1af55333070161762fa14a6ea6f35bf856 DIST jmdns-3.4.1.tgz 665503 SHA256 aefc28fcb0a8d8d563abfe0b764fa91a2737aa8b19f8a8f859a96a50fe663ebe SHA512 06e01dc7ef9eabd1ba75be016d688294043a6eec53de40d20026587f2c3d82bd0b025efd9b662bbe28450940d277da0fbc30ef69293ca3e81426212d8e85d7fb WHIRLPOOL 1df820435d9d1ad72daaff2d2467eb0d5080b8e74bbb9b18da7333feabdf48b25b39cdd29d453535b00ea3f2a20231282e49a9bf845075815bef6eb498bdd9f8 diff --git a/dev-java/jmdns/jmdns-1.0.ebuild b/dev-java/jmdns/jmdns-1.0.ebuild deleted file mode 100644 index 4880390..000 --- a/dev-java/jmdns/jmdns-1.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -JAVA_PKG_IUSE="doc examples source" - -inherit java-pkg-2 - -DESCRIPTION="JmDNS is an implementation of multi-cast DNS in Java" -SRC_URI="mirror://sourceforge/${PN}/${P}-Final.tar.gz" -HOMEPAGE="http://jmdns.sourceforge.net; -IUSE="" -DEPEND=">=virtual/jdk-1.3.1" -RDEPEND=">=virtual/jre-1.3.1" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" - -src_unpack() { - unpack ${A} - cd "${S}" - rm lib/*.jar -} - -src_compile() { - echo "Compiling JmDNS..." - ejavac "${S}"/src/javax/jmdns/* || die - echo "Compiling tools..." - ejavac -classpath "${S}/src" "${S}"/src/com/strangeberry/jmdns/tools/* || die - echo "Making jars..." - echo "Main-class: com.strangeberry.jmdns.tools.Main" > jmdns-tools-manifest - jar cmf jmdns-tools-manifest jmdns.jar -C "${S}/src" com -C "${S}/src" javax || die -} - -src_install() { - java-pkg_dojar jmdns*.jar - java-pkg_dolauncher - dodoc README.txt CHANGELOG.txt - - use doc && java-pkg_dojavadoc docs - use source && java-pkg_dosrc src/{com,javax} - - if use examples; then - insinto /usr/share/doc/${P}/ - doins -r src/samples - fi -} diff --git a/dev-java/jmdns/jmdns-3.1.4.ebuild b/dev-java/jmdns/jmdns-3.1.4.ebuild deleted file mode 100644 index 20ddd5e..000 --- a/dev-java/jmdns/jmdns-3.1.4.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -JAVA_PKG_IUSE="doc examples source" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="JmDNS is an implementation of multi-cast DNS in Java" -SRC_URI="mirror://sourceforge/${PN}/${PF}.tgz" -HOMEPAGE="http://jmdns.sourceforge.net; - -LICENSE="Apache-2.0" -SLOT="3.1" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=">=virtual/jdk-1.5" -RDEPEND=">=virtual/jre-1.5" - -S="${WORKDIR}/${P}" -JAVA_SRC_DIR="src" - -src_prepare() { - rm "${S}"/build.xml - rm "${S}"/lib/*.jar || die -} diff --git a/dev-java/jmdns/jmdns-3.4.1.ebuild b/dev-java/jmdns/jmdns-3.4.1.ebuild deleted file mode 100644 index 5b50bcc..000 --- a/dev-java/jmdns/jmdns-3.4.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -JAVA_PKG_IUSE="doc examples source test" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="JmDNS is an implementation of multi-cast DNS in Java" -SRC_URI="mirror://sourceforge/${PN}/${PF}.tgz" -HOMEPAGE="http://jmdns.sourceforge.net; - -LICENSE="Apache-2.0" -SLOT="3.4" -KEYWORDS="amd64 x86"
[gentoo-commits] repo/gentoo:master commit in: dev-java/jmdns/
commit: 4a3fb7edc8c2a8ed69959f6b9328c6b612f8761b Author: Patrice Clement gentoo org> AuthorDate: Fri Nov 20 22:44:59 2015 + Commit: Patrice Clement gentoo org> CommitDate: Fri Nov 20 22:44:59 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3fb7ed dev-java/jmdns: Keyword for ppc+ppc64. Package-Manager: portage-2.2.20.1 Signed-off-by: Patrice Clement gentoo.org> dev-java/jmdns/jmdns-3.4.1-r1.ebuild | 28 1 file changed, 28 insertions(+) diff --git a/dev-java/jmdns/jmdns-3.4.1-r1.ebuild b/dev-java/jmdns/jmdns-3.4.1-r1.ebuild new file mode 100644 index 000..2ccf9ad --- /dev/null +++ b/dev-java/jmdns/jmdns-3.4.1-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +JAVA_PKG_IUSE="doc examples source test" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="JmDNS is an implementation of multi-cast DNS in Java" +SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" +HOMEPAGE="http://jmdns.sourceforge.net; + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="" + +DEPEND=">=virtual/jdk-1.6" +RDEPEND=">=virtual/jre-1.6" + +JAVA_SRC_DIR="src" + +src_prepare() { + rm "${S}"/build.xml || die + find -name "*.jar" -delete || die + find "${JAVA_SRC_DIR}" -name "*Test.java" -delete || die +}
[gentoo-commits] proj/sci:master commit in: sci-biology/trinityrnaseq/files/, sci-biology/trinityrnaseq/
commit: e1a9394386238099ece40fe0e8d7f805c23b679d Author: Martin Mokrejš fold natur cuni cz> AuthorDate: Fri Nov 20 23:54:55 2015 + Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Fri Nov 20 23:54:55 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e1a93943 sci-biology/trinityrnaseq: version bump but dropping KEYWORDS because we relocate *.pm file into vendor_perl and all 'use blah' calls to trinity-provided perl modules need to be changed to 'use trinityrnaseq::blah', or PERL5INC modified? Package-Manager: portage-2.2.18 sci-biology/trinityrnaseq/ChangeLog| 9 +++ .../trinityrnaseq/files/disable_some_plugins.patch | 20 ++ .../trinityrnaseq/trinityrnaseq-2.1.1.ebuild | 75 ++ 3 files changed, 104 insertions(+) diff --git a/sci-biology/trinityrnaseq/ChangeLog b/sci-biology/trinityrnaseq/ChangeLog index 0376bce..405ac83 100644 --- a/sci-biology/trinityrnaseq/ChangeLog +++ b/sci-biology/trinityrnaseq/ChangeLog @@ -2,6 +2,15 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ +*trinityrnaseq-2.1.1 (20 Nov 2015) + + 20 Nov 2015; Martin Mokrejs+ +files/disable_some_plugins.patch, +trinityrnaseq-2.1.1.ebuild: + sci-biology/trinityrnaseq: version bump but dropping KEYWORDS because we + relocate *.pm file into vendor_perl and all 'use blah' calls to trinity- + provided perl modules need to be changed to 'use trinityrnaseq::blah', or + PERL5INC modified? + 06 Jun 2015; Justin Lecher metadata.xml: sci-biology/trinityrnaseq: Add github to remote-id in metadata.xml diff --git a/sci-biology/trinityrnaseq/files/disable_some_plugins.patch b/sci-biology/trinityrnaseq/files/disable_some_plugins.patch new file mode 100644 index 000..43a06ae --- /dev/null +++ b/sci-biology/trinityrnaseq/files/disable_some_plugins.patch @@ -0,0 +1,20 @@ +--- trinityrnaseq-2.1.1/trinity-plugins/Makefile.ori 2015-11-21 00:34:52.310075544 +0100 trinityrnaseq-2.1.1/trinity-plugins/Makefile 2015-11-21 00:37:16.260075920 +0100 +@@ -10,7 +10,7 @@ + PARAFLY_CODE=parafly-code + TRIMMOMATIC_CODE=Trimmomatic-0.32 + +-trinity_essentials: jellyfish scaffold_iworm_contigs_target fastool_target parafly_target trimmomatic_target samtools ++trinity_essentials: scaffold_iworm_contigs_target fastool_target parafly_target + + trimmomatic_target: + ln -sf ${TRIMMOMATIC_CODE} Trimmomatic +@@ -31,7 +31,7 @@ + # cd htslib-1.2.1 && ./configure && $(MAKE) + tar xvf ${HTSLIB_CODE} && cd htslib && $(MAKE) + +-scaffold_iworm_contigs_target: htslib_target ++scaffold_iworm_contigs_target: + cd scaffold_iworm_contigs && $(MAKE) + + fastool_target: diff --git a/sci-biology/trinityrnaseq/trinityrnaseq-2.1.1.ebuild b/sci-biology/trinityrnaseq/trinityrnaseq-2.1.1.ebuild new file mode 100644 index 000..0d5ba53 --- /dev/null +++ b/sci-biology/trinityrnaseq/trinityrnaseq-2.1.1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PERL_EXPORT_PHASE_FUNCTIONS=no +inherit perl-module eutils toolchain-funcs + +# Butterfly should not require any special compilation, as its written in Java and already provided as portable precompiled software ... + +DESCRIPTION="Transcriptome assembler for RNA-seq reads" +HOMEPAGE="http://trinityrnaseq.github.io/; +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-BroadInstitute" +SLOT="0" +KEYWORDS="" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + sci-biology/parafly + =sci-biology/jellyfish-2.1.4 + >=sci-libs/htslib-1.2.1 + <=sci-biology/samtools-1.1 + >=sci-biology/trimmomatic-0.32 + dev-perl/IO-All" +# ReleaseNotes mentions that https://github.com/HpcGridRunner/HpcGridRunner/releases + +src_prepare(){ + epatch "${FILESDIR}"/disable_some_plugins.patch +} + +#src_compile(){ +# emake all +# emake plugins # bundled copies of TransDecoder, trimmomatic, fastool, parafly +#} + +src_install(){ + perl_set_version + dobin Trinity util/*.pl trinity-plugins/GAL_0.2.1/fasta_tool + # should become a new package depending on dev-perl/IO-All + dobin trinity-plugins/fstrozzi-Fastool-7c3e034f05/fastool + dodoc trinity-plugins/fstrozzi-Fastool-7c3e034f05/README.md + # + insinto /usr/share/"${PN}"/util + rm -f util/fasta_tool + doins -r util/* + # + dobin Inchworm/bin/* + cd Chrysalis + dobin MakeDepend checkLock BreakTransByPairs Chrysalis GraphFromFasta IsoformAugment JoinTransByPairs QuantifyGraph ReadsToTranscripts RunButterfly TranscriptomeFromVaryK analysis/ReadsToComponents.pl + cd "${S}" || die + insinto "${VENDOR_LIB}/${PN}" + doins util/misc/PerlLib/*.pm PerlLib/*.pm + insinto
[gentoo-commits] repo/gentoo:master commit in: www-apps/kibana-bin/, www-apps/kibana-bin/files/
commit: 3465c9e035cf4904334c586c4878d41c4d7caedb Author: Ian Delaney gentoo org> AuthorDate: Sat Nov 21 00:36:25 2015 + Commit: Ian Delaney gentoo org> CommitDate: Sat Nov 21 00:37:56 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3465c9e0 www-apps/kibana-bin: bump -> vn. 4.1.3, clean old vns. & defunct init scripts Requests made, new ebuild submitted via proxy maintainer via the gentoo bug which is under category of security bug. Gentoo bug: #566044O Package-Manager: portage-2.2.24 www-apps/kibana-bin/Manifest | 4 +-- www-apps/kibana-bin/files/kibana.initd | 39 -- www-apps/kibana-bin/files/kibana.initd-r1 | 18 -- www-apps/kibana-bin/kibana-bin-4.0.3.ebuild| 39 -- www-apps/kibana-bin/kibana-bin-4.1.1.ebuild| 39 -- ...na-bin-4.1.2.ebuild => kibana-bin-4.1.3.ebuild} | 14 www-apps/kibana-bin/metadata.xml | 1 + 7 files changed, 9 insertions(+), 145 deletions(-) diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest index 79468cc..e495012 100644 --- a/www-apps/kibana-bin/Manifest +++ b/www-apps/kibana-bin/Manifest @@ -1,3 +1 @@ -DIST kibana-4.0.3-linux-x64.tar.gz 14331227 SHA256 320a43ed11f8f3f95709ceaec11ef8192c9bc2e64ea73a5f973b43aa8a422922 SHA512 745faffd9d8d67d6322f64223b829eb8eff4fba5d2f435a72b0c52c64e1578f0f5e741285c20904b6215d0c8da2cc5833fead86fc519bb4fdc51e8d51a18c465 WHIRLPOOL 2e67b9ba702ff78b9e775517333739cb96ad7dc88ab413768b897374f5ec25daa3b861f420b54451906231eca0ce5558306613a6597a7c85d340d897da0a0a08 -DIST kibana-4.1.1-linux-x64.tar.gz 11676499 SHA256 6f42d25f337fd49f38e2af81b9ab6e0c987a199a8c0b2e1410d072f812cb4520 SHA512 d72f235704e2a85b4d993f0b5d8b6de049f05f4ff7781e122af65fca88d3966db188a8bbc877928751aacd69f8ecf4c412cd05bfa88d1a9e785fa952aeed WHIRLPOOL a60321cf7ae511dd03c2099b61ea0fe5abb479b264842150a84d6791e8b9ba6682dc1c95059800a8cf714898350ec533440eb43240fa78491836fa3b7d6ef23d -DIST kibana-4.1.2-linux-x64.tar.gz 11787239 SHA256 5f6213f7ac7ef71016a6750f09e7316ccc9bca139bc5389b417395b179bc370c SHA512 08e8a8d5582019ee977a43e25afe874cd34fe0097ed17dc4738abaf6493c224061997a2558a297748f53bbee97bcd83b1dc54d0287594ba60d917d19c0baca9b WHIRLPOOL dd537add18d7a01622541850ff7385ec72174f473c6f89d56172a41cc3eac79d49e2df3079fef3160acb6f7c390eae5afb614b14402ebdf21cfba67289fb5142 +DIST kibana-4.1.3-linux-x64.tar.gz 11800636 SHA256 f2cb5389ad0acfbc4006f739d75d5ede541483d1fa6be728bbf547a9d7ddeb4a SHA512 81549c881ec222bcac73a0cf60766752591031ea8f3d28cce98ce06458376036f119353e7b820faef2cb42b23e5f6ef96cd98c1f256b3361513e71877082301c WHIRLPOOL 0d2272361a1b07984cfa7539d4d36e2465b87cdc046ae7cd6d2b6e5da69861feca0e74d9e0ad467d7f4cef9865b72c0bcc1a769bbc6458227fe590e1f99a21b1 diff --git a/www-apps/kibana-bin/files/kibana.initd b/www-apps/kibana-bin/files/kibana.initd deleted file mode 100644 index 9effc54..000 --- a/www-apps/kibana-bin/files/kibana.initd +++ /dev/null @@ -1,39 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -command="/opt/kibana/bin/kibana" -pidfile="/run/kibana.pid" -KIBANA_USER=${KIBANA_USER:="kibana"} - -depend() { - need elasticsearch -} - -start() { - ebegin "Starting ${SVCNAME}" - - checkpath -d -o "${KIBANA_USER}" -m750 "/var/log/kibana" - - start-stop-daemon --start \ - --user $KIBANA_USER \ - --background \ - --make-pidfile \ - --pidfile $pidfile \ - --stdout /var/log/kibana/kibana.log \ - --stderr /var/log/kibana/kibana.err \ - --exec $command - - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - - start-stop-daemon --stop \ - --pidfile $pidfile - - - eend $? -} diff --git a/www-apps/kibana-bin/files/kibana.initd-r1 b/www-apps/kibana-bin/files/kibana.initd-r1 deleted file mode 100644 index 3fdcec6..000 --- a/www-apps/kibana-bin/files/kibana.initd-r1 +++ /dev/null @@ -1,18 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -KIBANA_USER=${KIBANA_USER:-kibana} - -command="/opt/kibana/bin/kibana" -pidfile="/run/kibana.pid" -command_background="true" -start_stop_daemon_args="--user=\"${KIBANA_USER}\" --stdout /var/log/kibana/kibana.log --stderr /var/log/kibana/kibana.err" - -depend() { -need elasticsearch -} - -start_pre() { -checkpath -d -o "${KIBANA_USER}" -m750 "/var/log/kibana" -} diff --git a/www-apps/kibana-bin/kibana-bin-4.0.3.ebuild b/www-apps/kibana-bin/kibana-bin-4.0.3.ebuild deleted file mode 100644 index ee1c13e..000 --- a/www-apps/kibana-bin/kibana-bin-4.0.3.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation
[gentoo-commits] repo/gentoo:master commit in: net-misc/tor/
commit: 974cdf96018069d17adbe0c5c2f23e4fb6f4f394 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Nov 21 00:44:17 2015 + Commit: Anthony G. Basile gentoo org> CommitDate: Sat Nov 21 00:45:34 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=974cdf96 net-misc/tor: version bump to 0.2.7.5 Package-Manager: portage-2.2.20.1 net-misc/tor/Manifest | 1 + net-misc/tor/tor-0.2.7.5.ebuild | 99 + 2 files changed, 100 insertions(+) diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest index f1d619e..b05bdbd 100644 --- a/net-misc/tor/Manifest +++ b/net-misc/tor/Manifest @@ -1,2 +1,3 @@ DIST tor-0.2.6.10.tar.gz 3587211 SHA256 0542c0efe43b86619337862fa7eb02c7a74cb23a79d587090628a5f0f1224b8d SHA512 4d1fd794d48ada725af829e1c1f3f3b7d8d04f2d1dd22e4f175ddc49401834f2001f04d78b011cdc7e953fe44972f2859d87078489a08ae126b44f93f6b9a438 WHIRLPOOL ba2685454ecb0dd94c568e05fb14526cd06beea6e9c6f7b27328f85c555392b6f42f35dc7860ae25299a830c7f6643963a9b9719a2557c28a7216019c96caf21 DIST tor-0.2.7.4-rc.tar.gz 4830972 SHA256 6741c3e6abfedb76be781b767b77f794ee1a0f554cc4ccf083e44d4d9dc8af67 SHA512 e637cad37d26f7ceec52e2f78ff53ff2d9e362cefe0796b91fc91c7e2b01652d0333be44e48497cb54650ece3f606b20a7201b806775e9349eef99a288420e59 WHIRLPOOL 85dc797558391dc5e577fcdcb802ea027ff4ac787acfadd90b363bd6c60c7654fa16b15de74a84152ec081dda008a122029198cee5b12bf92730c5d160f7407b +DIST tor-0.2.7.5.tar.gz 4838541 SHA256 7d2a9e4db1bd99deb8395609b59cac217b0c1ee9ff2eeb0f088b91a5d8f6aa5f SHA512 c57b3ee6ecc36456182c7130db671c5581914cddf973c9460625cd5ecd10d128f3e4832f1520269f6ab145cc0dcb218df2a19fb659b778fb31d9f69de5362678 WHIRLPOOL d80b5949f6e23d1c3f501d5175a22eb54702266d87ff5a28bb6c727cfc8b656ca717d3bd7bf9031a56748f8b743cafecae7dd7fb14d6713271df20998e5bc562 diff --git a/net-misc/tor/tor-0.2.7.5.ebuild b/net-misc/tor/tor-0.2.7.5.ebuild new file mode 100644 index 000..721cd19 --- /dev/null +++ b/net-misc/tor/tor-0.2.7.5.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic readme.gentoo systemd toolchain-funcs versionator user + +MY_PV="$(replace_version_separator 4 -)" +MY_PF="${PN}-${MY_PV}" +DESCRIPTION="Anonymizing overlay network for TCP" +HOMEPAGE="http://www.torproject.org/; +SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz + https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz; +S="${WORKDIR}/${MY_PF}" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos" +IUSE="-bufferevents libressl scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test web" + +DEPEND=" + !libressl? ( dev-libs/openssl:0=[-bindist] ) + libressl? ( dev-libs/libressl:= ) + sys-libs/zlib + dev-libs/libevent + bufferevents? ( dev-libs/libevent[ssl] ) + scrypt? ( app-crypt/libscrypt ) + seccomp? ( sys-libs/libseccomp ) + systemd? ( sys-apps/systemd )" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-tor )" + +pkg_setup() { + enewgroup tor + enewuser tor -1 -1 /var/lib/tor tor +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch + epatch_user +} + +src_configure() { + # Upstream isn't sure of all the user provided CFLAGS that + # will break tor, but does recommend against -fstrict-aliasing. + # We'll filter-flags them here as we encounter them. + filter-flags -fstrict-aliasing + + econf \ + --enable-system-torrc \ + --enable-asciidoc \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + $(use_enable stats instrument-downloads) \ + $(use_enable bufferevents) \ + $(use_enable scrypt libscrypt) \ + $(use_enable seccomp) \ + $(use_enable systemd) \ + $(use_enable tor-hardening gcc-hardening) \ + $(use_enable tor-hardening linker-hardening) \ + $(use_enable transparent-proxy transparent) \ + $(use_enable web tor2web-mode) \ + $(use_enable test unittests) \ + $(use_enable test coverage) +} + +src_install() { + readme.gentoo_create_doc + + newconfd "${FILESDIR}"/tor.confd tor + newinitd "${FILESDIR}"/tor.initd-r7 tor + systemd_dounit "${FILESDIR}/${PN}.service" + systemd_dotmpfilesd "${FILESDIR}/${PN}.conf" + + emake DESTDIR="${D}" install + + keepdir /var/lib/tor + + dodoc README ChangeLog ReleaseNotes doc/HACKING + + fperms 750 /var/lib/tor + fowners tor:tor /var/lib/tor + + insinto /etc/tor/ + newins "${FILESDIR}"/torrc-r1 torrc +} + +pkg_postinst() { + readme.gentoo_pkg_postinst + + if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -eq 8 &&
[gentoo-commits] repo/gentoo:master commit in: net-misc/tor/
commit: 33914334b1101789e11f4c21391d3e231c35c111 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Nov 21 00:45:18 2015 + Commit: Anthony G. Basile gentoo org> CommitDate: Sat Nov 21 00:45:36 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33914334 net-misc/tor: remove older unstable version Package-Manager: portage-2.2.20.1 net-misc/tor/Manifest | 1 - net-misc/tor/tor-0.2.7.4_rc.ebuild | 99 -- 2 files changed, 100 deletions(-) diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest index b05bdbd..7960002 100644 --- a/net-misc/tor/Manifest +++ b/net-misc/tor/Manifest @@ -1,3 +1,2 @@ DIST tor-0.2.6.10.tar.gz 3587211 SHA256 0542c0efe43b86619337862fa7eb02c7a74cb23a79d587090628a5f0f1224b8d SHA512 4d1fd794d48ada725af829e1c1f3f3b7d8d04f2d1dd22e4f175ddc49401834f2001f04d78b011cdc7e953fe44972f2859d87078489a08ae126b44f93f6b9a438 WHIRLPOOL ba2685454ecb0dd94c568e05fb14526cd06beea6e9c6f7b27328f85c555392b6f42f35dc7860ae25299a830c7f6643963a9b9719a2557c28a7216019c96caf21 -DIST tor-0.2.7.4-rc.tar.gz 4830972 SHA256 6741c3e6abfedb76be781b767b77f794ee1a0f554cc4ccf083e44d4d9dc8af67 SHA512 e637cad37d26f7ceec52e2f78ff53ff2d9e362cefe0796b91fc91c7e2b01652d0333be44e48497cb54650ece3f606b20a7201b806775e9349eef99a288420e59 WHIRLPOOL 85dc797558391dc5e577fcdcb802ea027ff4ac787acfadd90b363bd6c60c7654fa16b15de74a84152ec081dda008a122029198cee5b12bf92730c5d160f7407b DIST tor-0.2.7.5.tar.gz 4838541 SHA256 7d2a9e4db1bd99deb8395609b59cac217b0c1ee9ff2eeb0f088b91a5d8f6aa5f SHA512 c57b3ee6ecc36456182c7130db671c5581914cddf973c9460625cd5ecd10d128f3e4832f1520269f6ab145cc0dcb218df2a19fb659b778fb31d9f69de5362678 WHIRLPOOL d80b5949f6e23d1c3f501d5175a22eb54702266d87ff5a28bb6c727cfc8b656ca717d3bd7bf9031a56748f8b743cafecae7dd7fb14d6713271df20998e5bc562 diff --git a/net-misc/tor/tor-0.2.7.4_rc.ebuild b/net-misc/tor/tor-0.2.7.4_rc.ebuild deleted file mode 100644 index 721cd19..000 --- a/net-misc/tor/tor-0.2.7.4_rc.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils flag-o-matic readme.gentoo systemd toolchain-funcs versionator user - -MY_PV="$(replace_version_separator 4 -)" -MY_PF="${PN}-${MY_PV}" -DESCRIPTION="Anonymizing overlay network for TCP" -HOMEPAGE="http://www.torproject.org/; -SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz - https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz; -S="${WORKDIR}/${MY_PF}" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos" -IUSE="-bufferevents libressl scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test web" - -DEPEND=" - !libressl? ( dev-libs/openssl:0=[-bindist] ) - libressl? ( dev-libs/libressl:= ) - sys-libs/zlib - dev-libs/libevent - bufferevents? ( dev-libs/libevent[ssl] ) - scrypt? ( app-crypt/libscrypt ) - seccomp? ( sys-libs/libseccomp ) - systemd? ( sys-apps/systemd )" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-tor )" - -pkg_setup() { - enewgroup tor - enewuser tor -1 -1 /var/lib/tor tor -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch - epatch_user -} - -src_configure() { - # Upstream isn't sure of all the user provided CFLAGS that - # will break tor, but does recommend against -fstrict-aliasing. - # We'll filter-flags them here as we encounter them. - filter-flags -fstrict-aliasing - - econf \ - --enable-system-torrc \ - --enable-asciidoc \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - $(use_enable stats instrument-downloads) \ - $(use_enable bufferevents) \ - $(use_enable scrypt libscrypt) \ - $(use_enable seccomp) \ - $(use_enable systemd) \ - $(use_enable tor-hardening gcc-hardening) \ - $(use_enable tor-hardening linker-hardening) \ - $(use_enable transparent-proxy transparent) \ - $(use_enable web tor2web-mode) \ - $(use_enable test unittests) \ - $(use_enable test coverage) -} - -src_install() { - readme.gentoo_create_doc - - newconfd "${FILESDIR}"/tor.confd tor - newinitd "${FILESDIR}"/tor.initd-r7 tor - systemd_dounit "${FILESDIR}/${PN}.service" - systemd_dotmpfilesd "${FILESDIR}/${PN}.conf" - - emake DESTDIR="${D}" install - - keepdir /var/lib/tor - - dodoc README ChangeLog ReleaseNotes doc/HACKING - - fperms 750 /var/lib/tor - fowners tor:tor /var/lib/tor - - insinto /etc/tor/ - newins "${FILESDIR}"/torrc-r1 torrc -} - -pkg_postinst() { - readme.gentoo_pkg_postinst - - if [[ $(gcc-major-version) -eq 4 &&
[gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/
commit: 8332ad4c78e7273fd0748ad3e2e734c54a6f944f Author: Matthias Maier gentoo org> AuthorDate: Sat Nov 21 01:07:40 2015 + Commit: Matthias Maier gentoo org> CommitDate: Sat Nov 21 01:07:52 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8332ad4c net-misc/spice-gtk: Add dependency on dev-python/six (bug #566272) dev-python/six is a mandatory build-time dependency. Thanks to Fabian Köster for pointing this out Gentoo-Bugs: 566272 Package-Manager: portage-2.2.24 .../spice-gtk/{spice-gtk-0.30.ebuild => spice-gtk-0.30-r1.ebuild} | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net-misc/spice-gtk/spice-gtk-0.30.ebuild b/net-misc/spice-gtk/spice-gtk-0.30-r1.ebuild similarity index 96% rename from net-misc/spice-gtk/spice-gtk-0.30.ebuild rename to net-misc/spice-gtk/spice-gtk-0.30-r1.ebuild index 16b291a..8f6f00b 100644 --- a/net-misc/spice-gtk/spice-gtk-0.30.ebuild +++ b/net-misc/spice-gtk/spice-gtk-0.30-r1.ebuild @@ -8,7 +8,7 @@ WANT_AUTOMAKE="1.12" VALA_MIN_API_VERSION="0.14" VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python2_7 python3_4 ) inherit autotools eutils multibuild python-single-r1 vala @@ -67,11 +67,12 @@ RDEPEND=" " DEPEND="${RDEPEND} >=app-emulation/spice-protocol-0.12.10 - dev-lang/python - dev-python/pyparsing dev-perl/Text-CSV + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.0 + ${PYTHON_DEPS} >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( $(vala_depend) )
[gentoo-commits] proj/catalyst:pending commit in: catalyst/
commit: 1cb701ee64e06badb16a0086bb4e46184633c5da Author: Mike Frysinger gentoo org> AuthorDate: Thu Oct 29 00:27:46 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Oct 29 00:27:46 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1cb701ee config: tweak walking of settings for py3 Since py3 returns an iterator with dict.keys(), trying to add/del values in the loop will throw an exception. Run it through list() so we get a static copy to iterate over. catalyst/config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/catalyst/config.py b/catalyst/config.py index db81a96..5f72e15 100644 --- a/catalyst/config.py +++ b/catalyst/config.py @@ -97,7 +97,8 @@ class ParserBase(object): values[cur_array[0]] = cur_array[1:] if not self.empty_values: - for x in values.keys(): + # Make sure the list of keys is static since we modify inside the loop. + for x in list(values.keys()): # Delete empty key pairs if not values[x]: log.warning('No value set for key "%s"; deleting', x)
[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
commit: 06fd1a0cd1a957c14343d9c0440dd606a883ee12 Author: Mike Frysinger gentoo org> AuthorDate: Sun Oct 11 18:23:26 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Wed Oct 28 16:49:56 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=06fd1a0c stagebase: robustify portage_confdir setup When setting up the portage_confdir, we should make sure it exists, and that we rsync it properly (regardless of the settings given by the user). Bugzilla: https://bugs.gentoo.org/538652 Reported-by: Joshua Kinard gentoo.org> catalyst/base/stagebase.py | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 3c24dbd..6094109 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -893,8 +893,12 @@ class StageBase(TargetBase, ClearBase, GenBase): else: if "portage_confdir" in self.settings: log.info('Configuring %s...', self.settings['port_conf']) - cmd("rsync -a " + self.settings["portage_confdir"] + "/ " + - self.settings["chroot_path"] + self.settings["port_conf"], + dest = normpath(self.settings['chroot_path'] + '/' + self.settings['port_conf']) + ensure_dirs(dest) + # The trailing slashes on both paths are important: + # We want to make sure rsync copies the dirs into each + # other and not as subdirs. + cmd('rsync -a %s/ %s/' % (self.settings['portage_confdir'], dest), "Error copying %s" % self.settings["port_conf"], env=self.env) self.resume.enable("setup_confdir")
[gentoo-commits] proj/catalyst:pending commit in: targets/tinderbox/, targets/support/, targets/stage2/
commit: 3566a26eb838d0924e9f7f3cec902674347ce272 Author: Mike Frysinger gentoo org> AuthorDate: Sat Oct 24 06:53:57 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Oct 24 06:53:57 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3566a26e targets: handle new clst_VERBOSE behavior During the command line rewrite, the VERBOSE setting change from set-if-true and unset-if-false to always being set, but to true/false. Update the scripts to check for "true" now. targets/stage2/stage2-chroot.sh | 5 - targets/support/chroot-functions.sh | 4 ++-- targets/tinderbox/tinderbox-chroot.sh | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh index b426dab..6f69a62 100755 --- a/targets/stage2/stage2-chroot.sh +++ b/targets/stage2/stage2-chroot.sh @@ -5,11 +5,6 @@ source /tmp/chroot-functions.sh # Setup the environment export FEATURES="${clst_myfeatures} nodoc noman noinfo -news" -if [ "${clst_VERBOSE}" ] -then - /usr/portage/scripts/bootstrap.sh -p ${bootstrap_opts} -fi - # Set bindist USE flag if clst_BINDIST is set # The bindist functions have been taken from support/chroot-functions.sh if [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ]; then diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index fe40157..456ae4c 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -122,7 +122,7 @@ setup_myfeatures(){ } setup_myemergeopts(){ - if [ -n "${clst_VERBOSE}" ] + if [[ "${clst_VERBOSE}" == "true" ]] then clst_myemergeopts="--verbose" else @@ -284,7 +284,7 @@ run_merge() { export EPAUSE_IGNORE=0 export CONFIG_PROTECT="-*" - if [ -n "${clst_VERBOSE}" ] + if [[ "${clst_VERBOSE}" == "true" ]] then echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1 emerge ${clst_myemergeopts} -pt $@ || exit 3 diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh index 74e46d6..b93b4c1 100755 --- a/targets/tinderbox/tinderbox-chroot.sh +++ b/targets/tinderbox/tinderbox-chroot.sh @@ -12,7 +12,7 @@ rsync -avx --exclude "/root/" --exclude "/tmp/" --exclude "/usr/portage/" / \ for x in ${clst_tinderbox_packages} do - if [ -n "${clst_VERBOSE}" ] + if [[ "${clst_VERBOSE}" == "true" ]] then run_merge --usepkg --buildpkg --newuse -vp $x fi
[gentoo-commits] proj/catalyst:pending commit in: catalyst/
commit: ac0f1d1f61ed3ec00831867f2a34eea88e7160ec Author: Mike Frysinger gentoo org> AuthorDate: Mon Oct 12 03:06:02 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Mon Oct 12 03:06:02 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ac0f1d1f hash_utils: fix bad keyword w/CatalystError The exception takes "print_traceback", not "traceback". catalyst/hash_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/hash_utils.py b/catalyst/hash_utils.py index 3db61f1..1161da3 100644 --- a/catalyst/hash_utils.py +++ b/catalyst/hash_utils.py @@ -79,7 +79,7 @@ class HashMap(object): hash_) except: raise CatalystError("Error generating hash, is appropriate " + \ - "utility installed on your system?", traceback=True) + "utility installed on your system?", print_traceback=True) def calc_hash(self, file_, hash_):
[gentoo-commits] proj/catalyst:pending commit in: bin/, catalyst/arch/, catalyst/base/, catalyst/, catalyst/targets/
commit: 73a38c4393cc5cb4c0d915a99b4c6fb52bf8d23a Author: Mike Frysinger gentoo org> AuthorDate: Mon Nov 9 19:11:14 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Mon Nov 9 19:11:14 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=73a38c43 lint: fix bad indents/trailing newlines bin/catalyst | 1 - catalyst/arch/__init__.py| 1 - catalyst/base/__init__.py| 1 - catalyst/base/genbase.py | 1 - catalyst/base/stagebase.py | 2 +- catalyst/hash_utils.py | 3 --- catalyst/targets/__init__.py | 1 - 7 files changed, 1 insertion(+), 9 deletions(-) diff --git a/bin/catalyst b/bin/catalyst index 577e899..1557ab8 100755 --- a/bin/catalyst +++ b/bin/catalyst @@ -39,4 +39,3 @@ except KeyboardInterrupt: print("Aborted.") sys.exit(130) sys.exit(0) - diff --git a/catalyst/arch/__init__.py b/catalyst/arch/__init__.py index 8b13789..e69de29 100644 --- a/catalyst/arch/__init__.py +++ b/catalyst/arch/__init__.py @@ -1 +0,0 @@ - diff --git a/catalyst/base/__init__.py b/catalyst/base/__init__.py index 8b13789..e69de29 100644 --- a/catalyst/base/__init__.py +++ b/catalyst/base/__init__.py @@ -1 +0,0 @@ - diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py index 4214b45..0c8dbb9 100644 --- a/catalyst/base/genbase.py +++ b/catalyst/base/genbase.py @@ -51,4 +51,3 @@ class GenBase(object): for j in array: digest = hash_map.generate_hash(f, hash_=j) myf.write(digest) - diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index edbcaa6..df19c0b 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1067,7 +1067,7 @@ class StageBase(TargetBase, ClearBase, GenBase): % flags) if (flags is not "CFLAGS" and self.settings[flags] == self.settings["CFLAGS"]): - myf.write('%s="${CFLAGS}"\n' % flags) + myf.write('%s="${CFLAGS}"\n' % flags) elif isinstance(self.settings[flags], list): myf.write('%s="%s"\n' % (flags, ' '.join(self.settings[flags]))) diff --git a/catalyst/hash_utils.py b/catalyst/hash_utils.py index 6e08967..1134f50 100644 --- a/catalyst/hash_utils.py +++ b/catalyst/hash_utils.py @@ -126,6 +126,3 @@ class HashMap(object): result = header + "\n" + hash_result + " " + short_file + "\n" log.info('%s (%s) = %s', header, short_file, result) return result - - - diff --git a/catalyst/targets/__init__.py b/catalyst/targets/__init__.py index 8b13789..e69de29 100644 --- a/catalyst/targets/__init__.py +++ b/catalyst/targets/__init__.py @@ -1 +0,0 @@ -
[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
commit: b409bd9bb4b50f69a555e4e148057ade86a7ed16 Author: Brian Dolbec gentoo org> AuthorDate: Sat Oct 31 20:26:40 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Oct 31 20:26:40 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b409bd9b stagebase.py: Refactor the *FLAGS handling code in chroot_setup() *FLAGS settings in spec files are loaded as a list. Although the config loading code has not changed in quite some time, the code was still treating these settings as strings. I don't know why the error was not triggered long ago. The code now handle catalyst/base/stagebase.py | 46 +- 1 file changed, 17 insertions(+), 29 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 0e4d8c2..5ba9cfc 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1055,36 +1055,24 @@ class StageBase(TargetBase, ClearBase, GenBase): myf=open(makepath, "w") myf.write("# These settings were set by the catalyst build script that automatically\n# built this stage.\n") myf.write("# Please consult /usr/share/portage/config/make.conf.example for a more\n# detailed example.\n") - if "CFLAGS" in self.settings: - myf.write('CFLAGS="'+self.settings["CFLAGS"]+'"\n') - if "CXXFLAGS" in self.settings: - if self.settings["CXXFLAGS"]!=self.settings["CFLAGS"]: - myf.write('CXXFLAGS="'+self.settings["CXXFLAGS"]+'"\n') - else: - myf.write('CXXFLAGS="${CFLAGS}"\n') - else: - myf.write('CXXFLAGS="${CFLAGS}"\n') - if "FCFLAGS" in self.settings: - if self.settings["FCFLAGS"]!=self.settings["CFLAGS"]: - myf.write('FCFLAGS="'+self.settings["FCFLAGS"]+'"\n') - else: - myf.write('FCFLAGS="${CFLAGS}"\n') - else: - myf.write('FCFLAGS="${CFLAGS}"\n') - if "FFLAGS" in self.settings: - if self.settings["FFLAGS"]!=self.settings["CFLAGS"]: - myf.write('FFLAGS="'+self.settings["FFLAGS"]+'"\n') + + for flags in ["CFLAGS", "CXXFLAGS", "FCFLAGS", "FFLAGS", "LDFLAGS", + "ASFLAGS"]: + if not flags in self.settings: + continue + if flags in ["LDFLAGS", "ASFLAGS"]: + myf.write("# %s is unsupported. USE AT YOUR OWN RISK!\n" + % flags) + if (flags is not "CFLAGS" and + self.settings[flags] == self.settings["CFLAGS"]): + myf.write('%s="${CFLAGS}"\n' % flags) + elif isinstance(self.settings[flags], list): + myf.write('%s="%s"\n' + % (flags, ' '.join(self.settings[flags]))) else: - myf.write('FFLAGS="${CFLAGS}"\n') - else: - myf.write('FFLAGS="${CFLAGS}"\n') - - if "LDFLAGS" in self.settings: - myf.write("# LDFLAGS is unsupported. USE AT YOUR OWN RISK!\n") - myf.write('LDFLAGS="'+self.settings["LDFLAGS"]+'"\n') - if "ASFLAGS" in self.settings: - myf.write("# ASFLAGS is unsupported. USE AT YOUR OWN RISK!\n") - myf.write('ASFLAGS="'+self.settings["ASFLAGS"]+'"\n') + myf.write('%s="%s"\n' + % (flags, self.settings[flags])) + if "CBUILD" in self.settings: myf.write("# This should not be changed unless you know exactly what you are doing. You\n# should probably be using a different stage, instead.\n") myf.write('CBUILD="'+self.settings["CBUILD"]+'"\n')
[gentoo-commits] proj/catalyst:pending commit in: doc/, /, catalyst/
commit: b3cfe6e0c7754a9e17b681581b2a317b7861b486 Author: Mike Frysinger gentoo org> AuthorDate: Mon Oct 12 03:59:28 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Wed Oct 28 16:49:56 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b3cfe6e0 lint: fix redefined-outer-name warnings The doc module just needs a main func to hold all the variables instead of coding it all in global scope. .pylintrc | 3 +-- catalyst/log.py| 4 doc/make_subarch_table_guidexml.py | 9 +++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.pylintrc b/.pylintrc index 2a03f23..e657daf 100644 --- a/.pylintrc +++ b/.pylintrc @@ -32,10 +32,9 @@ load-plugins= # bad-continuation -- might be hard with tab indentation policy # invalid-name -- need to manage constants better # line-too-long -- figure out a length and stick to it -# redefined-outer-name -- clean up code to not do this # super-init-not-called -- fix the classes __init__ structure # no-init -- update classes w/missing __init__ functions -disable=missing-docstring, too-many-lines, too-many-branches, too-many-statements, too-few-public-methods, too-many-instance-attributes, too-many-public-methods, too-many-locals, too-many-arguments, locally-enabled, locally-disabled, fixme, broad-except, bad-whitespace, bad-continuation, invalid-name, line-too-long, redefined-outer-name, super-init-not-called, no-init +disable=missing-docstring, too-many-lines, too-many-branches, too-many-statements, too-few-public-methods, too-many-instance-attributes, too-many-public-methods, too-many-locals, too-many-arguments, locally-enabled, locally-disabled, fixme, broad-except, bad-whitespace, bad-continuation, invalid-name, line-too-long, super-init-not-called, no-init [REPORTS] diff --git a/catalyst/log.py b/catalyst/log.py index 5938199..d640dec 100644 --- a/catalyst/log.py +++ b/catalyst/log.py @@ -98,6 +98,10 @@ class CatalystFormatter(logging.Formatter): return msg +# We define |debug| in global scope so people can call log.debug(), but it +# makes the linter complain when we have a |debug| keyword. Since we don't +# use that func in here, it's not a problem, so silence the warning. +# pylint: disable=redefined-outer-name def setup_logging(level, output=None, debug=False, color=None): """Initialize the logging module using the |level| level""" # The incoming level will be things like "info", but setLevel wants diff --git a/doc/make_subarch_table_guidexml.py b/doc/make_subarch_table_guidexml.py index a6a9022..0699d2a 100755 --- a/doc/make_subarch_table_guidexml.py +++ b/doc/make_subarch_table_guidexml.py @@ -6,6 +6,7 @@ import os import re +import sys import textwrap @@ -99,11 +100,11 @@ def dump(subarch_title_to_subarch_id, subarch_id_to_pattern_arch_genericrch_id): f.close() -if __name__ == '__main__': +def main(_argv): subarch_title_to_subarch_id = dict() subarch_id_to_pattern_arch_genericrch_id = dict() - for (dirpath, dirnames, filenames) in os.walk('catalyst/arch'): + for dirpath, _dirnames, filenames in os.walk('catalyst/arch'): for _fn in filenames: if not _fn.endswith('.py'): continue @@ -114,3 +115,7 @@ if __name__ == '__main__': handle_file(fn, subarch_title_to_subarch_id, subarch_id_to_pattern_arch_genericrch_id) dump(subarch_title_to_subarch_id, subarch_id_to_pattern_arch_genericrch_id) + + +if __name__ == '__main__': + main(sys.argv[1:])
[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
commit: bed0a9c2c1585a50738ceb49561d73d37bc6e050 Author: Brian Dolbec gentoo org> AuthorDate: Sat Oct 31 20:30:35 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Oct 31 20:30:35 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bed0a9c2 stagebase.py: Clean up some long lines While I was changing code nearby, shorten some overly long lines. catalyst/base/stagebase.py | 20 +++- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 5ba9cfc..ffd84de 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1053,8 +1053,11 @@ class StageBase(TargetBase, ClearBase, GenBase): cmd("rm -f " + makepath,\ "Could not remove " + makepath, env=self.env) myf=open(makepath, "w") - myf.write("# These settings were set by the catalyst build script that automatically\n# built this stage.\n") - myf.write("# Please consult /usr/share/portage/config/make.conf.example for a more\n# detailed example.\n") + myf.write("# These settings were set by the catalyst build script " + "that automatically\n# built this stage.\n") + myf.write("# Please consult " + "/usr/share/portage/config/make.conf.example " + "for a more\n# detailed example.\n") for flags in ["CFLAGS", "CXXFLAGS", "FCFLAGS", "FFLAGS", "LDFLAGS", "ASFLAGS"]: @@ -1074,11 +1077,16 @@ class StageBase(TargetBase, ClearBase, GenBase): % (flags, self.settings[flags])) if "CBUILD" in self.settings: - myf.write("# This should not be changed unless you know exactly what you are doing. You\n# should probably be using a different stage, instead.\n") + myf.write("# This should not be changed unless you know exactly" + " what you are doing. You\n# should probably be " + "using a different stage, instead.\n") myf.write('CBUILD="'+self.settings["CBUILD"]+'"\n') if "CHOST" in self.settings: - myf.write("# WARNING: Changing your CHOST is not something that should be done lightly.\n# Please consult https://wiki.gentoo.org/wiki/Changing_the_CHOST_variable before changing.\n") + myf.write("# WARNING: Changing your CHOST is not something " + "that should be done lightly.\n# Please consult " + "https://wiki.gentoo.org/wiki/Changing_the_CHOST_variable " + "before changing.\n") myf.write('CHOST="'+self.settings["CHOST"]+'"\n') # Figure out what our USE vars are for building @@ -1090,7 +1098,9 @@ class StageBase(TargetBase, ClearBase, GenBase): myusevars.extend(self.settings["use"]) if myusevars: - myf.write("# These are the USE and USE_EXPAND flags that were used for\n# building in addition to what is provided by the profile.\n") + myf.write("# These are the USE and USE_EXPAND flags that were " + "used for\n# building in addition to what is provided " + "by the profile.\n") myusevars = sorted(set(myusevars)) myf.write('USE="' + ' '.join(myusevars) + '"\n') if '-*' in myusevars:
[gentoo-commits] proj/catalyst:pending commit in: catalyst/
commit: d307242bf41554640a8966d79f6f36738d3391ee Author: Mike Frysinger gentoo org> AuthorDate: Tue Oct 27 05:51:52 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Wed Oct 28 16:49:56 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d307242b main: extend the -c option to accept multiple files There's no real reason people can't load multiple config files, so extend the --config option into --configs and let people specify multiple ones. catalyst/defaults.py | 2 ++ catalyst/main.py | 55 +--- 2 files changed, 20 insertions(+), 37 deletions(-) diff --git a/catalyst/defaults.py b/catalyst/defaults.py index 666afca..c5162d6 100644 --- a/catalyst/defaults.py +++ b/catalyst/defaults.py @@ -46,6 +46,8 @@ confdefaults={ "storedir": "/var/tmp/catalyst", } +DEFAULT_CONFIG_FILE = '/etc/catalyst/catalyst.conf' + PORT_LOGDIR_CLEAN = \ 'find "${PORT_LOGDIR}" -type f ! -name "summary.log*" -mtime +30 -delete' diff --git a/catalyst/main.py b/catalyst/main.py index 9f563cf..176871d 100644 --- a/catalyst/main.py +++ b/catalyst/main.py @@ -21,7 +21,7 @@ from DeComp.contents import ContentsMap from catalyst import log import catalyst.config -from catalyst.defaults import confdefaults, option_messages +from catalyst.defaults import confdefaults, option_messages, DEFAULT_CONFIG_FILE from catalyst.hash_utils import HashMap, HASH_DEFINITIONS from catalyst.support import CatalystError from catalyst.version import get_version @@ -36,40 +36,19 @@ def version(): log.info('Copyright 2008-2012 various authors') log.info('Distributed under the GNU General Public License version 2.1') -def parse_config(myconfig): +def parse_config(config_files): # search a couple of different areas for the main config file myconf={} - config_file="" - default_config_file = '/etc/catalyst/catalyst.conf' - # first, try the one passed (presumably from the cmdline) - if myconfig: - if os.path.exists(myconfig): - log.notice('Using command line specified Catalyst configuration file: %s', - myconfig) - config_file=myconfig - - else: - log.critical('Specified configuration file does not exist: %s', myconfig) - - # next, try the default location - elif os.path.exists(default_config_file): - log.notice('Using default Catalyst configuration file: %s', - default_config_file) - config_file = default_config_file - - # can't find a config file (we are screwed), so bail out - else: - log.critical('Could not find a suitable configuration file') - - # now, try and parse the config file "config_file" - try: -# execfile(config_file, myconf, myconf) - myconfig = catalyst.config.ConfigParser(config_file) - myconf.update(myconfig.get_values()) - - except Exception: - log.critical('Could not find parse configuration file: %s', myconfig) + # try and parse the config file "config_file" + for config_file in config_files: + log.notice('Loading configuration file: %s', config_file) + try: + config = catalyst.config.ConfigParser(config_file) + myconf.update(config.get_values()) + except Exception as e: + log.critical('Could not find parse configuration file: %s: %s', + config_file, e) # now, load up the values into conf_values so that we can use them for x in list(confdefaults): @@ -209,9 +188,9 @@ $ catalyst -f stage1-specfile.spec""" group.add_argument('-F', '--fetchonly', default=False, action='store_true', help='fetch files only') - group.add_argument('-c', '--config', - type=FilePath(), - help='use specified configuration file') + group.add_argument('-c', '--configs', + type=FilePath(), action='append', + help='use specified configuration files') group.add_argument('-f', '--file', type=FilePath(), help='read specfile') @@ -241,7 +220,9 @@ def main(): color=opts.color) # Parse the command line options. - myconfig = opts.config + myconfigs = opts.configs + if not myconfigs: + myconfigs = [DEFAULT_CONFIG_FILE] myspecfile = opts.file mycmdline = opts.cli[:] @@ -271,7 +252,7 @@ def main(): # made it this far so start by outputting our version info version() # import configuration file and import our main module using those settings - parse_config(myconfig) +
[gentoo-commits] proj/catalyst:pending commit in: bin/
commit: 24e7da46a9a6521ff89090c555babd12cfbe589a Author: Mike Frysinger gentoo org> AuthorDate: Thu Oct 29 00:29:10 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Nov 19 03:40:51 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=24e7da46 catalyst: switch to common python entry Since the catalyst code base supports py2 & py3, we no longer need to hardcode py2 in the shebang. bin/catalyst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/catalyst b/bin/catalyst index 1557ab8..24122b2 100755 --- a/bin/catalyst +++ b/bin/catalyst @@ -1,4 +1,4 @@ -#!/usr/bin/python2 -OO +#!/usr/bin/python -OO # Maintained in full by: # Catalyst Team
[gentoo-commits] proj/catalyst:pending commit in: bin/
commit: 16f3af32eb645f3485e9e54b2bb9d128503fa9ce Author: Mike Frysinger gentoo org> AuthorDate: Thu Oct 29 00:29:52 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Nov 19 03:40:51 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=16f3af32 catalyst: add a wrapper for executing directly out of git This is a smaller wrapper to set up the environment (both python and some config options) so that all the code is used from the git repo. This way you don't have to install it in order to test things. bin/catalyst.git | 52 1 file changed, 52 insertions(+) diff --git a/bin/catalyst.git b/bin/catalyst.git new file mode 100755 index 000..eb6234b --- /dev/null +++ b/bin/catalyst.git @@ -0,0 +1,52 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +"""Run catalyst from git using local modules/scripts.""" + +from __future__ import print_function + +import os +import sys +import tempfile + +from snakeoil import process + + +def main(argv): + """The main entry point""" + source_root = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) + + pympath = source_root + pythonpath = os.environ.get('PYTHONPATH') + if pythonpath is None: + pythonpath = pympath + else: + pythonpath = pympath + ':' + pythonpath + os.environ['PYTHONPATH'] = pythonpath + + with tempfile.NamedTemporaryFile(prefix='catalyst.conf.') as conf: + # Set up a config file with paths to the local tree. + conf.write( + ('sharedir=%(source_root)s\n' +'shdir=%(source_root)s/targets\n' +'envscript=%(source_root)s/etc/catalystrc\n' +% {'source_root': source_root}).encode('utf8') + ) + conf.flush() + argv = [ + '--config', os.path.join(source_root, 'etc', 'catalyst.conf'), + '--config', conf.name, + ] + argv + + cmd = [os.path.join(source_root, 'bin', 'catalyst')] + pid = os.fork() + if pid == 0: + os.execvp(cmd[0], cmd + argv) + (_pid, status) = os.waitpid(pid, 0) + process.exit_as_status(status) + + +if __name__ == '__main__': + main(sys.argv[1:])
[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/, /, catalyst/, catalyst/targets/
commit: 9b0ba31859207264f5bf7af048d5d89725dd4025 Author: Mike Frysinger gentoo org> AuthorDate: Mon Oct 12 03:54:33 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Wed Oct 28 16:49:56 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9b0ba318 lint: convert type/types to isinstance pylint complains about using (type(...) == types.xxx) checks as it prefers isinstance(..., xxx) instead. Convert the code base to it. .pylintrc | 3 +-- catalyst/base/stagebase.py| 57 +-- catalyst/support.py | 3 +-- catalyst/targets/grp.py | 5 ++-- catalyst/targets/livecd_stage1.py | 5 ++-- catalyst/targets/netboot.py | 9 +++ catalyst/targets/netboot2.py | 11 7 files changed, 39 insertions(+), 54 deletions(-) diff --git a/.pylintrc b/.pylintrc index b3327cf..2a03f23 100644 --- a/.pylintrc +++ b/.pylintrc @@ -32,11 +32,10 @@ load-plugins= # bad-continuation -- might be hard with tab indentation policy # invalid-name -- need to manage constants better # line-too-long -- figure out a length and stick to it -# unidiomatic-typecheck -- convert to isinstance # redefined-outer-name -- clean up code to not do this # super-init-not-called -- fix the classes __init__ structure # no-init -- update classes w/missing __init__ functions -disable=missing-docstring, too-many-lines, too-many-branches, too-many-statements, too-few-public-methods, too-many-instance-attributes, too-many-public-methods, too-many-locals, too-many-arguments, locally-enabled, locally-disabled, fixme, broad-except, bad-whitespace, bad-continuation, invalid-name, line-too-long, unidiomatic-typecheck, redefined-outer-name, super-init-not-called, no-init +disable=missing-docstring, too-many-lines, too-many-branches, too-many-statements, too-few-public-methods, too-many-instance-attributes, too-many-public-methods, too-many-locals, too-many-arguments, locally-enabled, locally-disabled, fixme, broad-except, bad-whitespace, bad-continuation, invalid-name, line-too-long, redefined-outer-name, super-init-not-called, no-init [REPORTS] diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 6094109..0e4d8c2 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1,7 +1,6 @@ import os import imp -import types import shutil import sys from stat import ST_UID, ST_GID, ST_MODE @@ -297,7 +296,7 @@ class StageBase(TargetBase, ClearBase, GenBase): def set_install_mask(self): if "install_mask" in self.settings: - if type(self.settings["install_mask"])!=types.StringType: + if not isinstance(self.settings['install_mask'], str): self.settings["install_mask"]=\ ' '.join(self.settings["install_mask"]) @@ -313,14 +312,14 @@ class StageBase(TargetBase, ClearBase, GenBase): self.settings["version_stamp"] +'/' def set_source_subpath(self): - if type(self.settings["source_subpath"])!=types.StringType: + if not isinstance(self.settings['source_subpath'], str): raise CatalystError( "source_subpath should have been a string. Perhaps you have " +\ "something wrong in your spec file?") def set_pkgcache_path(self): if "pkgcache_path" in self.settings: - if type(self.settings["pkgcache_path"])!=types.StringType: + if not isinstance(self.settings['pkgcache_path'], str): self.settings["pkgcache_path"]=\ normpath(self.settings["pkgcache_path"]) else: @@ -330,7 +329,7 @@ class StageBase(TargetBase, ClearBase, GenBase): def set_kerncache_path(self): if "kerncache_path" in self.settings: - if type(self.settings["kerncache_path"])!=types.StringType: + if not isinstance(self.settings['kerncache_path'], str): self.settings["kerncache_path"]=\ normpath(self.settings["kerncache_path"]) else: @@ -536,7 +535,7 @@ class StageBase(TargetBase, ClearBase, GenBase): del self.settings[self.settings["spec_prefix"]+"/use"] if "use" not in self.settings: self.settings["use"]="" - if type(self.settings["use"])==types.StringType: + if isinstance(self.settings['use'], str): self.settings["use"]=self.settings["use"].split() # Force bindist when options ask for it @@ -554,30 +553,27 @@ class StageBase(TargetBase, ClearBase, GenBase):
[gentoo-commits] proj/catalyst:pending commit in: catalyst/
commit: f3eea23c5cf7cf4e54073f59796a25db17d18613 Author: Mike Frysinger gentoo org> AuthorDate: Mon Oct 12 02:17:26 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Mon Oct 12 02:17:26 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f3eea23c log: make sure NOTICE is an int The log module wants ints for its levels, so make sure NOTICE is not a float due to the division. This doesn't show up so much in py2, but py3 barfs on floats. catalyst/log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/log.py b/catalyst/log.py index 871c53c..5938199 100644 --- a/catalyst/log.py +++ b/catalyst/log.py @@ -39,7 +39,7 @@ del _klass # Set the notice level between warning and info. -NOTICE = (logging.WARNING + logging.INFO) / 2 +NOTICE = (logging.WARNING + logging.INFO) // 2 logging.addLevelName(NOTICE, 'NOTICE')
[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
commit: 986ef3f2a80c688059840d781d962bd3f3644538 Author: Mike Frysinger gentoo org> AuthorDate: Mon Oct 12 02:18:17 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Mon Oct 12 02:18:17 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=986ef3f2 genbase: use sorted() with dict keys In py3, the dict keys func returns a view which doesn't have a sort member. Pass the result through sorted() which works with py2 and py3. catalyst/base/genbase.py | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py index a33f924..8a1af8d 100644 --- a/catalyst/base/genbase.py +++ b/catalyst/base/genbase.py @@ -22,8 +22,7 @@ class GenBase(object): keys={} for i in self.settings["contents"].split(): keys[i]=1 - array=keys.keys() - array.sort() + array = sorted(keys.keys()) for j in array: contents = contents_map.contents(path, j, verbose=self.settings["VERBOSE"]) @@ -42,8 +41,7 @@ class GenBase(object): keys={} for i in self.settings["digests"].split(): keys[i]=1 - array=keys.keys() - array.sort() + array = sorted(keys.keys()) for f in [path, path + '.CONTENTS']: if os.path.exists(f): if "all" in array: