| 1 |
commit: a7f08b04e4230e81dc33603597d9e2cd7ba7f8f3 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 2 01:51:38 2017 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 2 01:57:48 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7f08b04 |
| 7 |
|
| 8 |
app-portage/layman: Version bump, Fix pyGPG dep on recent versions |
| 9 |
|
| 10 |
Cheange the pyGPG dep to >=-0.2. |
| 11 |
Clean out old ~arch versions. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.3_p38, Repoman-2.3.1_p31 |
| 14 |
|
| 15 |
app-portage/layman/Manifest | 1 + |
| 16 |
app-portage/layman/layman-2.1.0-r3.ebuild | 72 ----------------- |
| 17 |
app-portage/layman/layman-2.2.0-r7.ebuild | 89 --------------------- |
| 18 |
app-portage/layman/layman-2.3.0-r1.ebuild | 93 ---------------------- |
| 19 |
app-portage/layman/layman-2.4.1-r1.ebuild | 4 +- |
| 20 |
...{layman-2.4.0-r1.ebuild => layman-2.4.2.ebuild} | 5 +- |
| 21 |
app-portage/layman/layman-9999.ebuild | 4 +- |
| 22 |
7 files changed, 8 insertions(+), 260 deletions(-) |
| 23 |
|
| 24 |
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest |
| 25 |
index 416c82c..125f87c 100644 |
| 26 |
--- a/app-portage/layman/Manifest |
| 27 |
+++ b/app-portage/layman/Manifest |
| 28 |
@@ -4,3 +4,4 @@ DIST layman-2.2.0.tar.gz 116210 SHA256 4a10cfd3eb354e993886369995ae9b1243418e037 |
| 29 |
DIST layman-2.3.0.tar.gz 119223 SHA256 76559b8e202c012d124deac01b92bbe70b550afe711144a3b1e301c5d8bbd0f2 SHA512 d110fb1781017d87e995098ecb48c4223347323d67534b584a393dc4354b761a6d960fd31e6e6787b5f37fa7e63b357c49486042c7cb527f78dd5beb5373627d WHIRLPOOL 76c82f08b18830e925ffd4c97b490753de2e7d0b3c71a82a0a75fd776ed3af84d2ba2fe06dab25e5e4d2ea400b0f0b66eda65f1f4eded0521ec579a1a0c1b17f |
| 30 |
DIST layman-2.4.0.tar.gz 130052 SHA256 0dd9dbcd05b5bf062139308cb812507b2c3310dd81f25c9cdc4c8f643b3f74c8 SHA512 011ac0e7dfed8415b875898ff1eecfe77ba5a68ccac208d8f5c693b9b880355ffef572490bb98ede62092bea1a84298bbd72e6c93a234fdfa319e96551e7eb07 WHIRLPOOL 0fdcd09ef4347f9450897237befd6fa73187a3e5ed0eff6b08345846ff270cd9751a3f38277f7b53baffb3b9a3e18e10f08ebe33c228ed7f7ccd01ce81d05a76 |
| 31 |
DIST layman-2.4.1.tar.gz 130388 SHA256 545792a15a0a2514c79f1b3090aceef15e413c656f294b6ff84f8a36da7aa2da SHA512 bdb713d4c7d3773129b45a385068278958040759bb564e48cfda4dda9da5224ccaa7833fce3d06151ed1fecddbb6f1a059db6e71534d0e887dff12640af6c806 WHIRLPOOL b6ef18f8f3633e9bb2a08df620306441f8352174dc66f2bbb68613cff0796e0914f7008de4f185167815ba3267c3b63a4fe22d2bcd794f70cd78bc20e706d7d8 |
| 32 |
+DIST layman-2.4.2.tar.gz 137893 SHA256 e84f8b745dd160bacf7b08dfd95b5c6d117dc8721edca370600f29ef0676ff92 SHA512 9d32269f51f896c554e6cbf8a674c50009bce48dd83dfe773b08b75bafd567eb75c26c227ab3a60bc83c1ed511862a3979b8d851befe8ad16fd0847eb91337cf WHIRLPOOL eba1844f2279071947601a8baa9424db24e5bd1ba2d9ac14f90e4ae2c3e0b566dabf10378cf6286225d85d11940add45239df8cb5b150eea227b47223ce65485 |
| 33 |
|
| 34 |
diff --git a/app-portage/layman/layman-2.1.0-r3.ebuild b/app-portage/layman/layman-2.1.0-r3.ebuild |
| 35 |
deleted file mode 100644 |
| 36 |
index 9628c45..00000000 |
| 37 |
--- a/app-portage/layman/layman-2.1.0-r3.ebuild |
| 38 |
+++ /dev/null |
| 39 |
@@ -1,72 +0,0 @@ |
| 40 |
-# Copyright 1999-2017 Gentoo Foundation |
| 41 |
-# Distributed under the terms of the GNU General Public License v2 |
| 42 |
-# $Id$ |
| 43 |
- |
| 44 |
-EAPI="5" |
| 45 |
- |
| 46 |
-PYTHON_COMPAT=( python{2_7,3_4} pypy ) |
| 47 |
-PYTHON_REQ_USE="xml(+)" |
| 48 |
- |
| 49 |
-inherit eutils distutils-r1 prefix |
| 50 |
- |
| 51 |
-DESCRIPTION="Tool to manage Gentoo overlays" |
| 52 |
-HOMEPAGE="http://layman.sourceforge.net" |
| 53 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 54 |
- |
| 55 |
-LICENSE="GPL-2" |
| 56 |
-SLOT="0" |
| 57 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 58 |
-IUSE="bazaar cvs darcs +git mercurial subversion test" |
| 59 |
- |
| 60 |
-DEPEND="test? ( dev-vcs/subversion )" |
| 61 |
- |
| 62 |
-RDEPEND=" |
| 63 |
- bazaar? ( dev-vcs/bzr ) |
| 64 |
- cvs? ( dev-vcs/cvs ) |
| 65 |
- darcs? ( dev-vcs/darcs ) |
| 66 |
- git? ( dev-vcs/git ) |
| 67 |
- mercurial? ( dev-vcs/mercurial ) |
| 68 |
- subversion? ( |
| 69 |
- || ( |
| 70 |
- >=dev-vcs/subversion-1.5.4[http] |
| 71 |
- >=dev-vcs/subversion-1.5.4[webdav-neon] |
| 72 |
- >=dev-vcs/subversion-1.5.4[webdav-serf] |
| 73 |
- ) |
| 74 |
- ) |
| 75 |
- sys-apps/portage[${PYTHON_USEDEP}] |
| 76 |
- >=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}] |
| 77 |
- " |
| 78 |
- |
| 79 |
-python_prepare_all() { |
| 80 |
- distutils-r1_python_prepare_all |
| 81 |
- epatch "${FILESDIR}"/${P}-local_overlay.patch |
| 82 |
- epatch "${FILESDIR}"/${P}-incorrect-import-make-conf-fix.patch |
| 83 |
- eprefixify etc/layman.cfg layman/config.py |
| 84 |
-} |
| 85 |
- |
| 86 |
-python_test() { |
| 87 |
- for suite in layman/tests/{dtest,external}.py ; do |
| 88 |
- PYTHONPATH="." "${PYTHON}" ${suite} \ |
| 89 |
- || die "test suite '${suite}' failed" |
| 90 |
- done |
| 91 |
-} |
| 92 |
- |
| 93 |
-python_install_all() { |
| 94 |
- distutils-r1_python_install_all |
| 95 |
- |
| 96 |
- insinto /etc/layman |
| 97 |
- doins etc/layman.cfg |
| 98 |
- |
| 99 |
- doman doc/layman.8 |
| 100 |
- dohtml doc/layman.8.html |
| 101 |
- |
| 102 |
- keepdir /var/lib/layman |
| 103 |
- keepdir /etc/layman/overlays |
| 104 |
-} |
| 105 |
- |
| 106 |
-pkg_postinst() { |
| 107 |
- # now run layman's update utility |
| 108 |
- einfo "Running layman-updater..." |
| 109 |
- "${EROOT}"/usr/bin/layman-updater |
| 110 |
- einfo |
| 111 |
-} |
| 112 |
|
| 113 |
diff --git a/app-portage/layman/layman-2.2.0-r7.ebuild b/app-portage/layman/layman-2.2.0-r7.ebuild |
| 114 |
deleted file mode 100644 |
| 115 |
index b947ad8..00000000 |
| 116 |
--- a/app-portage/layman/layman-2.2.0-r7.ebuild |
| 117 |
+++ /dev/null |
| 118 |
@@ -1,89 +0,0 @@ |
| 119 |
-# Copyright 1999-2017 Gentoo Foundation |
| 120 |
-# Distributed under the terms of the GNU General Public License v2 |
| 121 |
-# $Id$ |
| 122 |
- |
| 123 |
-EAPI="5" |
| 124 |
- |
| 125 |
-PYTHON_COMPAT=( python{2_7,3_4} pypy ) |
| 126 |
-PYTHON_REQ_USE="xml(+)" |
| 127 |
- |
| 128 |
-inherit eutils distutils-r1 linux-info prefix |
| 129 |
- |
| 130 |
-DESCRIPTION="Tool to manage Gentoo overlays" |
| 131 |
-HOMEPAGE="http://layman.sourceforge.net" |
| 132 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 133 |
- |
| 134 |
-LICENSE="GPL-2" |
| 135 |
-SLOT="0" |
| 136 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 137 |
-IUSE="bazaar cvs darcs +git g-sorcery mercurial squashfs subversion test" |
| 138 |
- |
| 139 |
-DEPEND="test? ( dev-vcs/subversion )" |
| 140 |
- |
| 141 |
-RDEPEND=" |
| 142 |
- bazaar? ( dev-vcs/bzr ) |
| 143 |
- cvs? ( dev-vcs/cvs ) |
| 144 |
- darcs? ( dev-vcs/darcs ) |
| 145 |
- git? ( dev-vcs/git ) |
| 146 |
- mercurial? ( dev-vcs/mercurial ) |
| 147 |
- g-sorcery? ( app-portage/g-sorcery ) |
| 148 |
- subversion? ( |
| 149 |
- || ( |
| 150 |
- >=dev-vcs/subversion-1.5.4[http] |
| 151 |
- >=dev-vcs/subversion-1.5.4[webdav-neon] |
| 152 |
- >=dev-vcs/subversion-1.5.4[webdav-serf] |
| 153 |
- ) |
| 154 |
- ) |
| 155 |
- sys-apps/portage[${PYTHON_USEDEP}] |
| 156 |
- >=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}] |
| 157 |
- " |
| 158 |
- |
| 159 |
-layman_check_kernel_config() { |
| 160 |
- local CONFIG_CHECK |
| 161 |
- use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS" |
| 162 |
- [[ -n ${CONFIG_CHECK} ]] && check_extra_config |
| 163 |
-} |
| 164 |
- |
| 165 |
-pkg_pretend() { |
| 166 |
- layman_check_kernel_config |
| 167 |
-} |
| 168 |
- |
| 169 |
-pkg_setup() { |
| 170 |
- layman_check_kernel_config |
| 171 |
-} |
| 172 |
- |
| 173 |
-python_prepare_all() { |
| 174 |
- distutils-r1_python_prepare_all |
| 175 |
- epatch "${FILESDIR}"/${P}-removes-doctest-remnants.patch |
| 176 |
- epatch "${FILESDIR}"/${P}-change-for-upstream-ssl-fetch.patch |
| 177 |
- epatch "${FILESDIR}"/${P}-adds-kwargs-debug.patch |
| 178 |
- rm "${S}"/"${PN}"/tests/dtest.py |
| 179 |
- eprefixify etc/layman.cfg layman/config.py |
| 180 |
-} |
| 181 |
- |
| 182 |
-python_test() { |
| 183 |
- for suite in layman/tests/external.py ; do |
| 184 |
- PYTHONPATH="." "${PYTHON}" ${suite} \ |
| 185 |
- || die "test suite '${suite}' failed" |
| 186 |
- done |
| 187 |
-} |
| 188 |
- |
| 189 |
-python_install_all() { |
| 190 |
- distutils-r1_python_install_all |
| 191 |
- |
| 192 |
- insinto /etc/layman |
| 193 |
- doins etc/layman.cfg |
| 194 |
- |
| 195 |
- doman doc/layman.8 |
| 196 |
- dohtml doc/layman.8.html |
| 197 |
- |
| 198 |
- keepdir /var/lib/layman |
| 199 |
- keepdir /etc/layman/overlays |
| 200 |
-} |
| 201 |
- |
| 202 |
-pkg_postinst() { |
| 203 |
- # now run layman's update utility |
| 204 |
- einfo "Running layman-updater..." |
| 205 |
- "${EROOT}"/usr/bin/layman-updater |
| 206 |
- einfo |
| 207 |
-} |
| 208 |
|
| 209 |
diff --git a/app-portage/layman/layman-2.3.0-r1.ebuild b/app-portage/layman/layman-2.3.0-r1.ebuild |
| 210 |
deleted file mode 100644 |
| 211 |
index db189a5..00000000 |
| 212 |
--- a/app-portage/layman/layman-2.3.0-r1.ebuild |
| 213 |
+++ /dev/null |
| 214 |
@@ -1,93 +0,0 @@ |
| 215 |
-# Copyright 1999-2016 Gentoo Foundation |
| 216 |
-# Distributed under the terms of the GNU General Public License v2 |
| 217 |
-# $Id$ |
| 218 |
- |
| 219 |
-EAPI="5" |
| 220 |
- |
| 221 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy ) |
| 222 |
-PYTHON_REQ_USE="xml(+)" |
| 223 |
- |
| 224 |
-inherit eutils distutils-r1 linux-info prefix |
| 225 |
- |
| 226 |
-DESCRIPTION="Tool to manage Gentoo overlays" |
| 227 |
-HOMEPAGE="http://layman.sourceforge.net" |
| 228 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 229 |
- |
| 230 |
-LICENSE="GPL-2" |
| 231 |
-SLOT="0" |
| 232 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86" |
| 233 |
-IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial squashfs subversion sync-plugin-portage test" |
| 234 |
- |
| 235 |
-DEPEND="test? ( dev-vcs/subversion ) |
| 236 |
- >=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}] |
| 237 |
-" |
| 238 |
- |
| 239 |
-RDEPEND=" |
| 240 |
- bazaar? ( dev-vcs/bzr ) |
| 241 |
- cvs? ( dev-vcs/cvs ) |
| 242 |
- darcs? ( dev-vcs/darcs ) |
| 243 |
- git? ( dev-vcs/git ) |
| 244 |
- mercurial? ( dev-vcs/mercurial ) |
| 245 |
- g-sorcery? ( app-portage/g-sorcery ) |
| 246 |
- subversion? ( |
| 247 |
- || ( |
| 248 |
- >=dev-vcs/subversion-1.5.4[http] |
| 249 |
- >=dev-vcs/subversion-1.5.4[webdav-neon] |
| 250 |
- >=dev-vcs/subversion-1.5.4[webdav-serf] |
| 251 |
- ) |
| 252 |
- ) |
| 253 |
- sync-plugin-portage? ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] ) |
| 254 |
- !sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
| 255 |
- gpg? ( dev-python/pyGPG ) |
| 256 |
- >=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}] |
| 257 |
- " |
| 258 |
- |
| 259 |
-layman_check_kernel_config() { |
| 260 |
- local CONFIG_CHECK |
| 261 |
- use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS" |
| 262 |
- [[ -n ${CONFIG_CHECK} ]] && check_extra_config |
| 263 |
-} |
| 264 |
- |
| 265 |
-pkg_pretend() { |
| 266 |
- layman_check_kernel_config |
| 267 |
-} |
| 268 |
- |
| 269 |
-pkg_setup() { |
| 270 |
- layman_check_kernel_config |
| 271 |
-} |
| 272 |
- |
| 273 |
-python_prepare_all() { |
| 274 |
- python_setup |
| 275 |
- esetup.py setup_plugins |
| 276 |
- distutils-r1_python_prepare_all |
| 277 |
- #rm "${S}"/"${PN}"/tests/dtest.py |
| 278 |
- epatch "${FILESDIR}"/${P}-dir_check.patch |
| 279 |
- eprefixify etc/layman.cfg layman/config.py |
| 280 |
-} |
| 281 |
- |
| 282 |
-python_test() { |
| 283 |
- for suite in layman/tests/external.py ; do |
| 284 |
- PYTHONPATH="." "${PYTHON}" ${suite} \ |
| 285 |
- || die "test suite '${suite}' failed" |
| 286 |
- done |
| 287 |
-} |
| 288 |
- |
| 289 |
-python_install_all() { |
| 290 |
- distutils-r1_python_install_all |
| 291 |
- |
| 292 |
- insinto /etc/layman |
| 293 |
- doins etc/layman.cfg |
| 294 |
- |
| 295 |
- doman doc/layman.8 |
| 296 |
- dohtml doc/layman.8.html |
| 297 |
- |
| 298 |
- keepdir /var/lib/layman |
| 299 |
- keepdir /etc/layman/overlays |
| 300 |
-} |
| 301 |
- |
| 302 |
-pkg_postinst() { |
| 303 |
- # now run layman's update utility |
| 304 |
- einfo "Running layman-updater..." |
| 305 |
- "${EROOT}"/usr/bin/layman-updater |
| 306 |
- einfo |
| 307 |
-} |
| 308 |
|
| 309 |
diff --git a/app-portage/layman/layman-2.4.1-r1.ebuild b/app-portage/layman/layman-2.4.1-r1.ebuild |
| 310 |
index 3176efa..dcbaeed 100644 |
| 311 |
--- a/app-portage/layman/layman-2.4.1-r1.ebuild |
| 312 |
+++ b/app-portage/layman/layman-2.4.1-r1.ebuild |
| 313 |
@@ -1,4 +1,4 @@ |
| 314 |
-# Copyright 1999-2016 Gentoo Foundation |
| 315 |
+# Copyright 1999-2017 Gentoo Foundation |
| 316 |
# Distributed under the terms of the GNU General Public License v2 |
| 317 |
# $Id$ |
| 318 |
|
| 319 |
@@ -35,7 +35,7 @@ RDEPEND=" |
| 320 |
>=dev-vcs/subversion-1.5.4[webdav-serf] |
| 321 |
) |
| 322 |
) |
| 323 |
- gpg? ( =dev-python/pyGPG-0.2 ) |
| 324 |
+ gpg? ( >=dev-python/pyGPG-0.2 ) |
| 325 |
sync-plugin-portage? ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] ) |
| 326 |
!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
| 327 |
>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}] |
| 328 |
|
| 329 |
diff --git a/app-portage/layman/layman-2.4.0-r1.ebuild b/app-portage/layman/layman-2.4.2.ebuild |
| 330 |
similarity index 96% |
| 331 |
rename from app-portage/layman/layman-2.4.0-r1.ebuild |
| 332 |
rename to app-portage/layman/layman-2.4.2.ebuild |
| 333 |
index 7ae3358..c17c906 100644 |
| 334 |
--- a/app-portage/layman/layman-2.4.0-r1.ebuild |
| 335 |
+++ b/app-portage/layman/layman-2.4.2.ebuild |
| 336 |
@@ -1,4 +1,4 @@ |
| 337 |
-# Copyright 1999-2016 Gentoo Foundation |
| 338 |
+# Copyright 1999-2017 Gentoo Foundation |
| 339 |
# Distributed under the terms of the GNU General Public License v2 |
| 340 |
# $Id$ |
| 341 |
|
| 342 |
@@ -35,12 +35,13 @@ RDEPEND=" |
| 343 |
>=dev-vcs/subversion-1.5.4[webdav-serf] |
| 344 |
) |
| 345 |
) |
| 346 |
- gpg? ( =dev-python/pyGPG-0.2 ) |
| 347 |
+ gpg? ( >=dev-python/pyGPG-0.2 ) |
| 348 |
sync-plugin-portage? ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] ) |
| 349 |
!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
| 350 |
>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}] |
| 351 |
" |
| 352 |
|
| 353 |
+ |
| 354 |
layman_check_kernel_config() { |
| 355 |
local CONFIG_CHECK |
| 356 |
use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS" |
| 357 |
|
| 358 |
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild |
| 359 |
index 41ba82e..a7d8292 100644 |
| 360 |
--- a/app-portage/layman/layman-9999.ebuild |
| 361 |
+++ b/app-portage/layman/layman-9999.ebuild |
| 362 |
@@ -1,4 +1,4 @@ |
| 363 |
-# Copyright 1999-2016 Gentoo Foundation |
| 364 |
+# Copyright 1999-2017 Gentoo Foundation |
| 365 |
# Distributed under the terms of the GNU General Public License v2 |
| 366 |
# $Id$ |
| 367 |
|
| 368 |
@@ -37,7 +37,7 @@ RDEPEND=" |
| 369 |
>=dev-vcs/subversion-1.5.4[webdav-serf] |
| 370 |
) |
| 371 |
) |
| 372 |
- gpg? ( =dev-python/pyGPG-9999 ) |
| 373 |
+ gpg? ( >=dev-python/pyGPG-0.2 ) |
| 374 |
sync-plugin-portage? ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] ) |
| 375 |
!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
| 376 |
>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}] |
Archives