From fb099e79fd692bdd54b7b3b5765a33c65d721578 Mon Sep 17 00:00:00 2001 From: Devan Franchini Date: Mon, 12 Jan 2015 01:13:54 +0000 Subject: [PATCH] Adds patch to fix bug #536280, bumps layman to 2.2.0-r6 Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xA8C8FBCF --- app-portage/layman/ChangeLog | 11 ++++++-- app-portage/layman/Manifest | 17 +++++++----- .../layman-2.2.0-adds-kwargs-debug.patch | 27 +++++++++++++++++++ ...2.2.0-r5.ebuild => layman-2.2.0-r6.ebuild} | 7 ++--- 4 files changed, 50 insertions(+), 12 deletions(-) create mode 100644 app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch rename app-portage/layman/{layman-2.2.0-r5.ebuild => layman-2.2.0-r6.ebuild} (91%) diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog index 35204152c3ec..71cf7d70e292 100644 --- a/app-portage/layman/ChangeLog +++ b/app-portage/layman/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-portage/layman -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.221 2014/11/23 16:33:01 zlogene Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.222 2015/01/12 01:13:30 twitch153 Exp $ + +*layman-2.2.0-r6 (12 Jan 2015) + + 12 Jan 2015; Devan Franchini + +files/layman-2.2.0-adds-kwargs-debug.patch, +layman-2.2.0-r6.ebuild, + -layman-2.2.0-r5.ebuild: + Adds patch to fix bug #536280, bumps layman to 2.2.0-r6 23 Nov 2014; Mikle Kolyada layman-2.2.0-r5.ebuild: Add ~sparc keyword wrt bug #524040 diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest index 5b020e94d2bd..5abf007d58eb 100644 --- a/app-portage/layman/Manifest +++ b/app-portage/layman/Manifest @@ -5,6 +5,7 @@ AUX layman-2.0.0.doctest.patch 933 SHA256 929fe74035671d2b95c61464f3d83c9c160692 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 AUX layman-2.1.0-local_overlay.patch 1039 SHA256 6bfec3e5befcba9adb5839f77136cd7c9e52f2aeef5ae50dc879d0ba416fe19a SHA512 7de5fbd980cd591c9b8815a4a2b24a445ffabc5ffa3b2fabb11bc237d13812b44e8b4363185cd7bd110dcc09dd83ceb5f78786f2410cd39a54b47e71f6f988bd WHIRLPOOL 0e9afb2bbc6eb33718152e584a80cd34fbd0dc88c2ad395d1e562364c382bb11482a66e4725186b49ed79195f1916811630d9d358801ee795e2ba0a043039f89 +AUX layman-2.2.0-adds-kwargs-debug.patch 974 SHA256 2346151ed6e9405a38a4f383cf4ace3b815e4917cf6d7345f04670587f7bdb81 SHA512 bf68f17609b9cdef66bb296bd526915da8ee39305f7b2ef565bae34c0b09aa50a256804d420ea1d1a1296ad628a23e1d26e2f26ab7693bb32e4ec540281903e8 WHIRLPOOL 3e031386f437ec59bdd02ddcbc80549e777058bbcb3f301c4d4908bea29ff3f323971587176c37b12400713ac6bb8c70d16d1126dd678ddaf2be0e9a5a9d0a40 AUX layman-2.2.0-removes-doctest-remnants.patch 6172 SHA256 88c9e11cd7d86472eadccdeb137495d0cd135d0c57e9732946ef1da1bfe4227a SHA512 9c8f81269d7219a6a1d0ca6365be3e49c6c407810670a5acf71edf8d47255772e67631a018b1f1a1a4bc0f1981663882d30c2480af1e90fef09030bf2e12935e WHIRLPOOL 013713afe2c76ce71be09f0e89ea0961a43b861edb7493eb488d9233055b8f79e4e4839778c68d98ffa4d55a99599f47d3ada6dd3c12aa5801e26edc7a634e2d 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 @@ -12,16 +13,18 @@ DIST layman-2.2.0.tar.gz 116210 SHA256 4a10cfd3eb354e993886369995ae9b1243418e037 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-r5.ebuild 2230 SHA256 a5049297c1f6980923decc0593693e2422fde155ce7632daa892bf6cf5410604 SHA512 2c08dd81dd481ba87709c11acb72ce87278fb1ad8f203dde6a2faf7c7e301c09ec8f35d0bc9c4595b6bf31f8fb048b7f80023f26c83ce3b20ef0549a75e246c2 WHIRLPOOL b3f07dd7875d04778a5fa08282382040233c148b3b04c06c5deb4860ad66ec8097de25cbe3f2c7066333d93f26391b3bd744d15feb8d11071428c2d601a400f1 +EBUILD layman-2.2.0-r6.ebuild 2281 SHA256 0c3b1bc5eb37a5a328b05532cda944aea70fc74089028751875bd959993e344c SHA512 ba8b50ea6b0a69c811eba51a6ec911d76bad001e336a34d95f41015e8dd41ea32530a6ecbb8412fdc61cdb97bed962e69b06b80865cd21de246f39c9c30daa53 WHIRLPOOL 1e2b5083831e8968f1a82d68686b1c6c1f80558b0b5a021a3bf982b5673beea4c7f63ab9e8afe588ad7dd78c3e4251d575283d2db11dec16ab20349658667390 EBUILD layman-9999.ebuild 2078 SHA256 d3f7662fbe1a2da57a4499ce53abfd6a82d9fa5e695b240ca2c48259cc83a5c5 SHA512 104848cb99c2a7ad156cf6c8c8504e583c22a882252b31236081f459b076b2ba3620a5eee24e997123762c346008cc05812f80d1d56911d642996bb485932d09 WHIRLPOOL f2e5b19199ccb915553a793718a587daf387ad08d7428f04d989ac4279326c6014837c867426924ff2f1c96636a71a5b5e615133e9fc106608b798768c30c656 -MISC ChangeLog 33086 SHA256 3d1ac9cbe1371d4114860474e8f76b40aec5083a6ddd1c9f2396c841fb2bcd7f SHA512 46012d652726c2d8b1d4bc779c2dc9bed18a462c8bd0650fe56c2c6794545588ef09ace5d8122476212d52dfd2eb6c19c7ff944add3fc28f2fc1c4af9e27a22d WHIRLPOOL ed41977623d065e9401687e2c26cf215b9f6404f5d844674ddc2a506a4febc529629c8378d2fe4e5e0185b778831609907680e1c457dfed535ae94b78f895ca2 +MISC ChangeLog 33332 SHA256 c2dfc01fab8d0a73a767cdbcabb962c13f3726794fccf09ce8d58de75c315b4f SHA512 f716cbdcbad9835ff572c65e3d9323a93cd9bfb970c3c7cdc2d1140a26463763db252de6d54ccb05314de9b4b93e6fdae98779a7e67af5b8143ab88b3d8901d6 WHIRLPOOL 68c030fe9cf5a51d56597e09c616d2c4abf8dfa0e07b42ab69514d27fdc7136dcd5dc931842d8b3672fa8755d50585a0bec7132a54bc2f27f8ad89b84298d178 MISC metadata.xml 1112 SHA256 c0f4114d39fe44573ccdbdd47edb3f2a574f7592d674d4f6e6fc79b58ac93e84 SHA512 735ffc1958cccd12b2077643ebc65bd80b9359e54f9b5648dedf1d027b85a7527b30c7aa6975742de986ecaa1705b69154e159db6f215f82cc486e70577ecf3d WHIRLPOOL be506a371d8ae9d3f4e5b161c1a9324816505c4efa35b41fef85558c59741a9adbcfdd523f219da90bdc85aba473a564401a1c101172462f113e3473eea44009 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iJwEAQEIAAYFAlRyC+cACgkQG9wOWsQutdZ9ZgQAj/OnoU3kN8y9+rAg0W9S3uMz -Lkka0NLcecgv55X1EMSq7ICcCRqkmZdLaTa9JsME4iEh86r7ku8J7cEbC0y1C8pf -KwhhQpiY9wAAZU79/Jdve5/V+oC16tTPUOG9LuK6febxZAau/CWK5b9JtHV5nUs6 -pTd1XfkVz/iOoO0p/p0= -=movz +iQEcBAEBCAAGBQJUsx/PAAoJEEAKp6Qwg9Y3vZgH/R9vnu/vitL13ZdSrv/7o93X +aaik82j/F3zW0oJUqTVJlCBsPVoQpgfWHbb7AVCsBWKuz+XSVj/l6NoyZHOBHhZn +pzj9YIR7l1EC1qUEuqDcQSijbYVZRkHycyBdL2WtLANpesH7Ia4dFhhZQvm8Q1Z9 +7YyiRvC8yrYALryFRfXmaiEpoheg3s7Vu9qczYoP4irFd9THdvMIlqUYMpnhDkJZ +Dmj7/JcRkc26lYqhSHdK/u0xE1AgTmHDhgDunEFt9GartdL1ceqsGHYwyupQ7CoE +iLwYai1HuitLXF4o4U57O3K40D6gCDymjtABcKomsMsrmxJlE/X4JGumpKKOfc0= +=FITZ -----END PGP SIGNATURE----- diff --git a/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch b/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch new file mode 100644 index 000000000000..559a1c80fd65 --- /dev/null +++ b/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch @@ -0,0 +1,27 @@ +From: Devan Franchini +Date: Sun, 7 Dec 2014 23:12:36 -0500 +Subject: [PATCH] Adds kwargs-debug and modifies kwargs-info level to 5 + +--- a/layman/overlays/archive.py ++++ b/layman/overlays/archive.py +@@ -50,7 +50,8 @@ class ArchiveOverlay(OverlaySource): + connector_output = { + 'info': self.output.debug, + 'error': self.output.error, +- 'kwargs-info': {'level': 2}, ++ 'kwargs-info': {'level': 5}, ++ 'kwargs-debug': {'level': 2}, + 'kwargs-error': {'level': None}, + } + +--- a/layman/remotedb.py ++++ b/layman/remotedb.py +@@ -120,6 +120,7 @@ class RemoteDB(DbBase): + 'info': self.output.info, + 'error': self.output.error, +- 'kwargs-info': {'level': 2}, ++ 'kwargs-info': {'level': 5}, ++ 'kwargs-debug': {'level': 2}, + 'kwargs-error':{'level': None}, + } + diff --git a/app-portage/layman/layman-2.2.0-r5.ebuild b/app-portage/layman/layman-2.2.0-r6.ebuild similarity index 91% rename from app-portage/layman/layman-2.2.0-r5.ebuild rename to app-portage/layman/layman-2.2.0-r6.ebuild index 4f8d24cf667e..7c0fafa98397 100644 --- a/app-portage/layman/layman-2.2.0-r5.ebuild +++ b/app-portage/layman/layman-2.2.0-r6.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-2.2.0-r5.ebuild,v 1.4 2014/11/23 16:33:01 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.2.0-r6.ebuild,v 1.1 2015/01/12 01:13:30 twitch153 Exp $ EAPI="5" @@ -55,6 +55,7 @@ pkg_setup() { python_prepare_all() { distutils-r1_python_prepare_all epatch "${FILESDIR}"/${P}-removes-doctest-remnants.patch + epatch "${FILESDIR}"/${P}-adds-kwargs-debug.patch rm "${S}"/"${PN}"/tests/dtest.py eprefixify etc/layman.cfg layman/config.py } @@ -62,7 +63,7 @@ python_prepare_all() { python_test() { for suite in layman/tests/{dtest,external}.py ; do PYTHONPATH="." "${PYTHON}" ${suite} \ - || die "test suite '${suite}' failed" + || die "test suite '${suite}' failed" done } -- 2.26.2