From 31a9398967ea59c92b8904281a28a3d735d79ef7 Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Sun, 8 Feb 2015 18:51:08 +0000 Subject: [PATCH] Version bump, add sync plugin support to 9999 Package-Manager: portage-2.2.16/cvs/Linux x86_64 Manifest-Sign-Key: 0xD80F5F1E1245142E --- app-portage/layman/ChangeLog | 8 ++- app-portage/layman/Manifest | 30 ++++++++- app-portage/layman/layman-2.3.0.ebuild | 89 ++++++++++++++++++++++++++ app-portage/layman/layman-9999.ebuild | 10 +-- app-portage/layman/metadata.xml | 1 + 5 files changed, 130 insertions(+), 8 deletions(-) create mode 100644 app-portage/layman/layman-2.3.0.ebuild diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog index 94569a8af174..d272374eec40 100644 --- a/app-portage/layman/ChangeLog +++ b/app-portage/layman/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-portage/layman # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.224 2015/01/17 09:52:50 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.225 2015/02/08 18:50:41 dolsen Exp $ + +*layman-2.3.0 (08 Feb 2015) + + 08 Feb 2015; Brian Dolbec +layman-2.3.0.ebuild, + layman-9999.ebuild: + Version bump. Add portage plugin USE flag and installation to layman-9999. 17 Jan 2015; Patrick Lauer layman-2.2.0-r7.ebuild: Fix #525896, tests now actually run and fail diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest index 5e2bfbbd2a4f..9e53d8fb4ae8 100644 --- a/app-portage/layman/Manifest +++ b/app-portage/layman/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX layman-2.0.0.doctest.patch 933 SHA256 929fe74035671d2b95c61464f3d83c9c16069293f5fc24a93f3a88083649ef4f SHA512 37a3bf04ba5185bf7f885321a4a925e24218d6e283b4c9d85e4935e0fb3dacf4fa543fa79e146c44bcbf833e7348dc49270cd0baa562a5e2539fc792b91abaf8 WHIRLPOOL 593deab62ed74124b386d6167283ddb08ba2c004c32288501697d09bf0e611067ed2b49bf52596543c036ac5a434efea63dd30f715815bddea97d3c05198bc84 AUX layman-2.0.0.svn_upgrade.patch 2447 SHA256 a0c1bf027cb63b9000b58d67a419198c7311514d31a78862db9203a0e4808362 SHA512 a3b9d0a0049aef011ddaadc627c38c9730e547aa4941fc1081ea7727f228e72080314a1cc376fa96ba23efe365529795a1b501c90b76561f6c4bff9aba72eb1f WHIRLPOOL 921529390429f8c4cd008769438ba005e01104a45bb0a966827a9dcf19089f0e16cc3ccf434fe6eb1c6947db0f4f7c7c5f9ab65bfba9f7a42bb17f343e8e9865 AUX layman-2.1.0-incorrect-import-make-conf-fix.patch 930 SHA256 7636ad62ee54078c9596b8f60a6e5ef05d277959a2783dc9fc9d2c5d43c5d429 SHA512 2fbb70c82a8731a2413fd9fef4d0dc110b87ac0a9fece40bf67b95b214912c23baa366432076e76a14e3b5512c89654a6f298b1d53c06b381093d10995da7094 WHIRLPOOL d1f2523e0d1de42ae36216fe31db606f1f9f1bc011fec90521eddb0d82bf8780129282b52d5f7e1b33f1bf7aff205b67eaef9fd06f9526bf10ed1d3657284d88 @@ -8,10 +11,31 @@ AUX layman-2.2.0-removes-doctest-remnants.patch 6172 SHA256 88c9e11cd7d86472eadc DIST layman-2.0.0.tar.gz 81184 SHA256 5843035ae4cc069693c05cf9821dae3d89d3ea7e2115b8137ea5a4a6c2807f33 SHA512 30756464d71ab1e047036550b6500d7e57999d808ebe3efba1d1ae6c037f8ca777ba704a4981d75a90285133635027a7bc13f1890f34823de33ae991ed99e2da WHIRLPOOL ec362189c4757ee032dc93e079ea0f5b291d5652231a84f1175fb308ca5622882d5008f23fd6a3d5143ff0dc98c91632d19c2e6604dcaa9b6a550bc902d79c1a DIST layman-2.1.0.tar.gz 94150 SHA256 cb96306c84da1d49ff54a31f7511c62c859565361bd59164516cd2812c439987 SHA512 1fa21392157c811c7751b8e3a11b858308c48720e377871bdd5afc525ebb50a92772064aa1148a4c20e3019f77b676ff65552439a71361d498952e362398c67f WHIRLPOOL 77643bedb4167eb371357444328d439c8b433cfc22a8bf9e39693feb68b701ec158064db8d22da0e6eb5260f27d5604d8b252a67930b38d8bed5921822f71c29 DIST layman-2.2.0.tar.gz 116210 SHA256 4a10cfd3eb354e993886369995ae9b1243418e0370c6aabd4d0ef6c5b387b7a2 SHA512 34cac041d7b64274debdbc42cab079fd3bb3aee511ea9e80db726df0f828207d79a5262788483ced5cbf49924e3aa4f19fe21439c98dceea973d8f83473c2e41 WHIRLPOOL 8c5d3cbbfef35c6294dfac899cb42f49e0761745573721e38b7d6c9ac48031f95bbb961c9d8dd9d309e4672cc1e5b050107ba025a9f28127e5d7d6d9a73a6e9a +DIST layman-2.3.0.tar.gz 119223 SHA256 76559b8e202c012d124deac01b92bbe70b550afe711144a3b1e301c5d8bbd0f2 SHA512 d110fb1781017d87e995098ecb48c4223347323d67534b584a393dc4354b761a6d960fd31e6e6787b5f37fa7e63b357c49486042c7cb527f78dd5beb5373627d WHIRLPOOL 76c82f08b18830e925ffd4c97b490753de2e7d0b3c71a82a0a75fd776ed3af84d2ba2fe06dab25e5e4d2ea400b0f0b66eda65f1f4eded0521ec579a1a0c1b17f EBUILD layman-2.0.0-r1.ebuild 1794 SHA256 21f8fbad6d554b7d174e7b4530c73ca2c84611a3c2cdec138a58c0141a5c386f SHA512 ccfd9b8bbb9a9c419973a80de00c74220af898615f4b72dfe3ed38a39bab0024313ce2f9d7de20b6f023b9acc258f6015b549b08a2056e91fcba41b14cd41282 WHIRLPOOL 2cc3986c877587ab38bba2778617b87458ccb6a7b20f9dc10cd4b1916100f1af83b36787daacae4bf94cb64e55b0d005396807e549c9899c5ddbaffe9837848e EBUILD layman-2.0.0-r3.ebuild 1835 SHA256 b06fd605e6efcfe7d83ef25f84202e2b782ff2105789e8dab5dc4d2278af2769 SHA512 8c2005cd431aab37410db4bddcfdb3f1bf6c36507447ad00b63403cafc57be3fd27166ebb205be76c9e1063cd4ed535df76838bf780a381dd91f1656f24b34e4 WHIRLPOOL f37604983bda4ed11742b29050a1c1fc93ee5cedf8c2efd444f54dd1907a17398b709f01f9508aca0ce9654cafdd1a664efde30a97ba526b04f11433db8d1715 EBUILD layman-2.1.0-r3.ebuild 1931 SHA256 b01c456a1e2ee8c83f26accf7af019995ef5a23d988670ca2e04392a4cd0bc2a SHA512 81d4ea0e4663fb303a6846cf4e552e0dc684a88464c077ed2449c7973e981115804f30b479e3c7eec89a9885052b8422c0a1b9583ba8889e6c8b0eeda0b6467f WHIRLPOOL d5cee46f3d9c6a9c8038d2a08bebb0d28c2363dc59f7f9bcaf10a850e201ad70b6caa835d62ef0eca5bc9acc8018a9904b4ce24ea7cd174cb49e1bf88b8ea6b2 EBUILD layman-2.2.0-r7.ebuild 2334 SHA256 231039e38858c8ffeb2693ed462781e64c91ed0b9adca39f2198eade237a0c68 SHA512 baa8cf68a7ca0f0b8b92fedf0f909905d6fad51a4fe6b29eeed119ccbe256b8c09e82ff6cfcecbf237bcbad43b205380808c4e037b73d4c5dc6e80ec0d4c57e6 WHIRLPOOL 1950adc38a7002d4895fee09db91af98a1dfb3e7304bdc66cd67b3d42cc8dd59ba563fbd603006a873838eb9f4f4705fff3036322ef66fded2e806c70c655252 -EBUILD layman-9999.ebuild 2078 SHA256 d3f7662fbe1a2da57a4499ce53abfd6a82d9fa5e695b240ca2c48259cc83a5c5 SHA512 104848cb99c2a7ad156cf6c8c8504e583c22a882252b31236081f459b076b2ba3620a5eee24e997123762c346008cc05812f80d1d56911d642996bb485932d09 WHIRLPOOL f2e5b19199ccb915553a793718a587daf387ad08d7428f04d989ac4279326c6014837c867426924ff2f1c96636a71a5b5e615133e9fc106608b798768c30c656 -MISC ChangeLog 33769 SHA256 f3eebc58fc40c0f2deac74167fca6e0595eeb7398da1e4f893196afaf3818d9e SHA512 cf505935ff025b9d7465eabd04464fc943b565c87d5ab7b5d18ead4ada1fb82b966345c2ac8a9bf72c7ea10ce5cfa9c673f66bbde48d2b7492b5738516c734fa WHIRLPOOL 009fd5953cc47621cd4ac0f4265da7a2b4ed78cb6952772fba1449b1e9c9533710dee2ce9ec80fb7b420737be9835ce00d13d245c760e06a0a2f16a7b2eb1951 -MISC metadata.xml 1112 SHA256 c0f4114d39fe44573ccdbdd47edb3f2a574f7592d674d4f6e6fc79b58ac93e84 SHA512 735ffc1958cccd12b2077643ebc65bd80b9359e54f9b5648dedf1d027b85a7527b30c7aa6975742de986ecaa1705b69154e159db6f215f82cc486e70577ecf3d WHIRLPOOL be506a371d8ae9d3f4e5b161c1a9324816505c4efa35b41fef85558c59741a9adbcfdd523f219da90bdc85aba473a564401a1c101172462f113e3473eea44009 +EBUILD layman-2.3.0.ebuild 2113 SHA256 7e05931577c5ea333ab18b0eca319316242249dcc61c7b9ef914de686a79e1cc SHA512 7f2640125ba71896bbbb0669cabd5086b90d2306477473dca6ae1b09b072a1940fb2b523e3d3fa1dfcf76be936f5c1234bb96e56bca394dd9f5c333b27cdedf7 WHIRLPOOL ec016521de2f4e6e938c540b090d270075847129b2e0e833b918d6f97199448b4213fc3202440b7308a1be05255c2f05db264b33a5ae4a6db9b741e50fbb4cab +EBUILD layman-9999.ebuild 2217 SHA256 1effecdd87d799ebe88e75c41d58b171cf43bf1e8503da390b123b560458f48f SHA512 c9bd0c933f8c2ca4b2d8356421f44fffa79edc1df854e4056dec4a35d342b86baf25d917281e1563c03708df601bf88a10628b52b2beb06e0d40f9eeb3034cbf WHIRLPOOL a71663a6f492ea333cebad1c05d46e384a1dcc7951f351287296d8aad993060efd6b1f16ede8730b65fceb294477d7a46afbb0e6e322a172e88e9390de0f1b09 +MISC ChangeLog 33967 SHA256 c603ce3e9cc8dd6b1a71deb30fddd5d7db9ab74c4b2e93f68e4b4ee47a672dd1 SHA512 4a30ccd241aa69a7fe7e4faf90a6419583516aa6449afd0fe77110ce1458c04eb2a2e047a3d7ba32ccf1614f35ddc5489d02368afcf522cc072e0cc7f046b578 WHIRLPOOL 3196d610708a6a834de8277665816ab6b2c3577f123d7348bb79170ff1d0d38f7ccb7a3a0adbf502e2399d7a3e5e89d9219d66709a546fbbdf7e1ed918ec341d +MISC metadata.xml 1206 SHA256 91ecca0f2e8a69033cb48416df21f41ef72bbb36a290d76f6339759f5a5ddf90 SHA512 536aacb83998f905b5c6525e4d6e633ec970552b2d3e87897b14f8b64f40c19036f21d8f2f4687ae90bd4ccf341efec0f5c3cd4d002121998522894c2ab9e62d WHIRLPOOL 5f109b206942a9dcf045d521e7acc40f5f81a9d6a1f1679ebc308b44b94eac84ffaa558bfaba817a8ac0e4d019d902a030cd0e493b7eed177d81867470c01897 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0 + +iQJ8BAEBCABmBQJU17AOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBNUQ3Qzc0RTA4MUNDNzBEQjRBNEFBRjVG +QkJEMDg3Mjc1ODIwRUQ4AAoJEPu9CHJ1gg7YQNEP/1v1ejI4gcQ0Jg7FToYOnR5R +esiTOoIpAy7FftX0WvwaAnv7rjm7itcD3dFymwNTLJwwxZPH6Jf+8jQwdWSfWWmm +UwJMt6Wxbbv5R+b3val/pNcbBD/t6KRUJKtexwGHBd7prRKnDz2qfkxQW20Z8zgb +Se1bawIxK2uXIkYbsMkZbIk3YQ0tQmK6/w+EldjuGhSDuOKx0Zw8b7P0Pew0R31l +HUcbJn9YwPlhEZAu4uBwor7UIw5pBB1rBvxD5uCvCoj3rSUV4XRkXBf0ZXoiOC7G +RU3DKKLKeMud+NVYLzq83fFiGzorgbajpRUMDcAVKhQJY4kSorBOYPrHUo+EnkaN +zHp6mGoId4b4GrggU9SeaCnQORMfLeMBLiw8k3lYabC1mNoMC80grxmURenK6zk5 +feJLU4HYJ8Bsu7cXvKqjzzaTjoU9NOl8aghfphpq+jFr4VOgQJzjEn7Pr2m99iBV +3C63ZrAZ9KQH7PImSHQkQWJrgWzJYlrE7OyzqvFnwOdt4AXJ3gvLQ2my5ZSZ8SGd +e67QBaewEfW6d7jUMG5nmISaeerQb5Nl8qkz0lxMsO10t8fBMSx8HPHaVYLAEEJD +wtYaBbfVTkJvUT88QjkxOSCYGuXq0Ofa0Jn5k8pVet1J3bxx9R+a9cWMmf8VIxJN +gh/IEN4Iq7h9IubMQ3fC +=tEgB +-----END PGP SIGNATURE----- diff --git a/app-portage/layman/layman-2.3.0.ebuild b/app-portage/layman/layman-2.3.0.ebuild new file mode 100644 index 000000000000..a172ae3b2fac --- /dev/null +++ b/app-portage/layman/layman-2.3.0.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.3.0.ebuild,v 1.1 2015/02/08 18:50:41 dolsen Exp $ + +EAPI="5" + +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) +PYTHON_REQ_USE="xml(+)" + +inherit eutils distutils-r1 linux-info prefix + +DESCRIPTION="Tool to manage Gentoo overlays" +HOMEPAGE="http://layman.sourceforge.net" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial squashfs subversion sync-plugin-portage test" + +DEPEND="test? ( dev-vcs/subversion )" + +RDEPEND=" + bazaar? ( dev-vcs/bzr ) + cvs? ( dev-vcs/cvs ) + darcs? ( dev-vcs/darcs ) + git? ( dev-vcs/git ) + mercurial? ( dev-vcs/mercurial ) + g-sorcery? ( app-portage/g-sorcery ) + subversion? ( + || ( + >=dev-vcs/subversion-1.5.4[http] + >=dev-vcs/subversion-1.5.4[webdav-neon] + >=dev-vcs/subversion-1.5.4[webdav-serf] + ) + ) + sync-plugin-portage? ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] ) + !sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + gpg? ( dev-python/pyGPG ) + >=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}] + " + +layman_check_kernel_config() { + local CONFIG_CHECK + use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS" + [[ -n ${CONFIG_CHECK} ]] && check_extra_config +} + +pkg_pretend() { + layman_check_kernel_config +} + +pkg_setup() { + layman_check_kernel_config +} + +python_prepare_all() { + esetup.py setup_plugins + distutils-r1_python_prepare_all + #rm "${S}"/"${PN}"/tests/dtest.py + eprefixify etc/layman.cfg layman/config.py +} + +python_test() { + for suite in layman/tests/external.py ; do + PYTHONPATH="." "${PYTHON}" ${suite} \ + || die "test suite '${suite}' failed" + done +} + +python_install_all() { + distutils-r1_python_install_all + + insinto /etc/layman + doins etc/layman.cfg + + doman doc/layman.8 + dohtml doc/layman.8.html + + keepdir /var/lib/layman + keepdir /etc/layman/overlays +} + +pkg_postinst() { + # now run layman's update utility + einfo "Running layman-updater..." + "${EROOT}"/usr/bin/layman-updater + einfo +} diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild index c9236fe64ebd..f45e5514b543 100644 --- a/app-portage/layman/layman-9999.ebuild +++ b/app-portage/layman/layman-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.39 2014/10/14 21:41:25 twitch153 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.40 2015/02/08 18:50:41 dolsen Exp $ EAPI="5" @@ -17,7 +17,7 @@ EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/layman.git" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial squashfs subversion test" +IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial squashfs subversion sync-plugin-portage test" DEPEND="test? ( dev-vcs/subversion ) app-text/asciidoc" @@ -37,7 +37,8 @@ RDEPEND=" ) ) gpg? ( =dev-python/pyGPG-9999 ) - sys-apps/portage[${PYTHON_USEDEP}] + sync-plugin-portage? ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] ) + !sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) >=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}] " @@ -56,6 +57,7 @@ pkg_setup() { } python_prepare_all() { + esetup.py setup_plugins distutils-r1_python_prepare_all eprefixify etc/layman.cfg layman/config.py } diff --git a/app-portage/layman/metadata.xml b/app-portage/layman/metadata.xml index e3caad80f524..5f6237c6c7d9 100644 --- a/app-portage/layman/metadata.xml +++ b/app-portage/layman/metadata.xml @@ -20,5 +20,6 @@ Support dev-vcs/mercurial based overlays Support mounting squashfs image overlays locally read-only Support dev-vcs/subversion based overlays + Install the sys-apps/portage sync module -- 2.26.2