diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
commit | c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch) | |
tree | 9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /sys-apps/pkgcore | |
parent | 2891d29af8907ce881662f4a02844926d7a293c7 (diff) |
gentoo resync : 12.01.2019
Diffstat (limited to 'sys-apps/pkgcore')
-rw-r--r-- | sys-apps/pkgcore/Manifest | 4 | ||||
-rw-r--r-- | sys-apps/pkgcore/pkgcore-0.9.4.ebuild | 58 | ||||
-rw-r--r-- | sys-apps/pkgcore/pkgcore-9999.ebuild | 24 |
3 files changed, 13 insertions, 73 deletions
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest index dc846cd37873..d861777c69fa 100644 --- a/sys-apps/pkgcore/Manifest +++ b/sys-apps/pkgcore/Manifest @@ -1,6 +1,4 @@ -DIST pkgcore-0.9.4.tar.gz 593025 BLAKE2B f7df069a4e2f9c790eb79c7fab74cba447eb5b411f2f2f113269e962154efb06787568be0ed2020a2912d7715cde2b1b0343049233c849735fb8b26da79a8c18 SHA512 c38fb5e4860e9b0442acfa60c431464b69791ffb2e6fe2429ae832c3ca66a54f4d263c031e6f72ae39080dd72b1058d93a5707009c1f9d9d02247b24f6001043 DIST pkgcore-0.9.7.tar.gz 592202 BLAKE2B fa16380e89ad2fb2a05d8f08387c3cfa2203b4e6faad3fc4758d572eb08d6c64f781eef8c2d56151f1facec3a202325d4c4a271a1a3ced88df7371f2af75dbf3 SHA512 cb996fd35a8e4e73acfacf1942d498932ec092a282397bd41df72eea26b6d08c15e01b96ece8ebb6876e84281d85d4f8ef81e1f2ef107adff1b984ee592d6a6f -EBUILD pkgcore-0.9.4.ebuild 1431 BLAKE2B 2d851e84a63106f9add0c0748cf2b39a4481698285b050a98ce0419e1c819b6116323936c273014f99f1916543b87cd23bdb18a2fad2ded1f6924787c1a3179f SHA512 fe0cd648df1713c8c442e880677515c9768b26afd19505168f69eb810866fe37cc970c04a6b64240646022c3bebeb09be861ecb5277569203d001f1cc8136da9 EBUILD pkgcore-0.9.7.ebuild 1497 BLAKE2B 97b9457800e9cccef06aba9b566adbea6c7798fb1275b08646afb4bc2145f0e65375055d4430e06ee063b95b00417006a0824d6285be2cff420934561adf921f SHA512 07ad1813bc307022300766e424ae9b09a995300c802d2f89557be74dbb3783da1cdec9b56c409d6bcc647c2be49aa1524a8b63ab2f14f965d6f099a2e8deeeb5 -EBUILD pkgcore-9999.ebuild 1378 BLAKE2B c09691826d38885886db6d58bf5bd27b1e88eaddd2aca495c389ad3a29eebefbd991a297bb932d3532468e36fc81d7be124d72f2ca8586a17b11da95a350ff87 SHA512 20e37e0e2c79b181f7f2f591468df50bf52c96041048af142ef27ae15d76c20e5448c829d104066fc54ef595261ac76fc97667e3334be5518fc8ea715fd38132 +EBUILD pkgcore-9999.ebuild 1498 BLAKE2B 339396606f12de41e0f85965c9ecc73cef2b723b63888dd972e109feabaee5307b35eef503efc9a4de63c6d2d8aab4fb91fb526dff4577b6af1ebbdaa5b3e53a SHA512 402a372ad4cfe4d9eb7d06c074fe200dbd61bb138e1749212d49d02848ee475e0fb1c6711a238a0c5647457c4bb4611110b4d94ef5909f6ab274533d4e93bbc3 MISC metadata.xml 409 BLAKE2B 42709aa3a13109a21d1cfa0db9ef758216a2e902d68a10f0db14b4019464a702ef0c91079d0856f9389a2221886bbd3d5d5480ca99efc708543d198d00b7ed3e SHA512 ec04202f105a62a697511c7a89dad118b3618fdce4044c25648492e1557a95b9e29c01a08fca21e106273485471af98c52a6db6b2a40605a67a632938faebd29 diff --git a/sys-apps/pkgcore/pkgcore-0.9.4.ebuild b/sys-apps/pkgcore/pkgcore-0.9.4.ebuild deleted file mode 100644 index 9d7becddcc56..000000000000 --- a/sys-apps/pkgcore/pkgcore-0.9.4.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -DISTUTILS_IN_SOURCE_BUILD=1 -inherit distutils-r1 - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git" - inherit git-r3 -else - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - SRC_URI="https://github.com/pkgcore/${PN}/releases/download/v${PV}/${P}.tar.gz" -fi - -DESCRIPTION="a framework for package management" -HOMEPAGE="https://github.com/pkgcore/pkgcore" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0" -IUSE="doc test" - -if [[ ${PV} == *9999 ]] ; then - SPHINX="dev-python/sphinx[${PYTHON_USEDEP}]" -else - SPHINX="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" -fi -RDEPEND=">=dev-python/snakeoil-0.7.0[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - ${SPHINX} - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) ) -" - -pkg_setup() { - # disable snakeoil 2to3 caching... - unset PY2TO3_CACHEDIR -} - -python_compile_all() { - esetup.py build_man $(usex doc "build_docs" "") -} - -python_test() { - esetup.py test -} - -python_install_all() { - distutils-r1_python_install install_man \ - $(usex doc "install_docs --path="${ED%/}"/usr/share/doc/${PF}/html" "") - distutils-r1_python_install_all -} - -pkg_postinst() { - python_foreach_impl pplugincache -} diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild index 28296ac77537..34a210caba47 100644 --- a/sys-apps/pkgcore/pkgcore-9999.ebuild +++ b/sys-apps/pkgcore/pkgcore-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7} ) DISTUTILS_IN_SOURCE_BUILD=1 inherit distutils-r1 @@ -21,25 +21,24 @@ LICENSE="|| ( BSD GPL-2 )" SLOT="0" IUSE="doc test" -if [[ ${PV} == *9999 ]] ; then - SPHINX="dev-python/sphinx[${PYTHON_USEDEP}]" -else - SPHINX="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" -fi +RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]" if [[ ${PV} == *9999 ]]; then - RDEPEND+=" =dev-python/snakeoil-9999[${PYTHON_USEDEP}]" + RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]" else RDEPEND+=" >=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]" fi DEPEND="${RDEPEND} - ${SPHINX} dev-python/setuptools[${PYTHON_USEDEP}] dev-python/pyparsing[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) test? ( dev-python/pytest[${PYTHON_USEDEP}] ) " python_compile_all() { - esetup.py build_man $(usex doc "build_docs" "") + local esetup_args=( $(usex doc "--enable-html-docs" "") ) + # only build man pages for live ebuilds if doc USE flag is enabled + [[ ${PV} == *9999 ]] && esetup_args+=( $(usex doc "--enable-man-pages" "") ) + esetup.py build "${esetup_args[@]}" } python_test() { @@ -47,8 +46,9 @@ python_test() { } python_install_all() { - distutils-r1_python_install install_man \ - $(usex doc "install_docs --path="${ED%/}"/usr/share/doc/${PF}/html" "") + esetup.py install_docs \ + --docdir="${ED%/}/usr/share/doc/${PF}" \ + --mandir="${ED%/}/usr/share/man" distutils-r1_python_install_all } |