diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-11-16 16:37:33 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-11-16 16:37:33 +0000 |
| commit | 8bcd1ab482a6db18ffe2d37446192b19b32635d3 (patch) | |
| tree | 423d67fd933187bfa142265833e0e6fb1cfc1134 /dev-util | |
| parent | Stable for HPPA (bug #442432). (diff) | |
| download | historical-8bcd1ab482a6db18ffe2d37446192b19b32635d3.tar.gz historical-8bcd1ab482a6db18ffe2d37446192b19b32635d3.tar.bz2 historical-8bcd1ab482a6db18ffe2d37446192b19b32635d3.zip | |
Fix py3 crasher by restricting py3. Fixes bug#443514.
Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/osc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/osc/Manifest | 32 | ||||
| -rw-r--r-- | dev-util/osc/osc-0.136.0.ebuild | 10 | ||||
| -rw-r--r-- | dev-util/osc/osc-9999.ebuild | 10 |
4 files changed, 37 insertions, 21 deletions
diff --git a/dev-util/osc/ChangeLog b/dev-util/osc/ChangeLog index d0bd28272088..1ccee8133e64 100644 --- a/dev-util/osc/ChangeLog +++ b/dev-util/osc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/osc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.7 2012/11/15 21:05:23 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.8 2012/11/16 16:37:07 scarabeus Exp $ + + 16 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> osc-0.136.0.ebuild, + osc-9999.ebuild: + Fix py3 crasher by restricting py3. Fixes bug#443514. 15 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> osc-0.136.0.ebuild, osc-9999.ebuild: diff --git a/dev-util/osc/Manifest b/dev-util/osc/Manifest index f505ee5a5de9..3bdb4111ba0d 100644 --- a/dev-util/osc/Manifest +++ b/dev-util/osc/Manifest @@ -2,24 +2,24 @@ Hash: SHA256 DIST osc-0.136.0.tar.gz 282525 SHA256 ea3188b4c29d4507bfb03ff2690a3eee6f0e63390f72ed3f67a7856b10bd1b88 SHA512 1bcf1f7f3b6c593151b622acdf4d8c8651713264c0a630f641f6b50d1c1f7155981a6be418f40c7bfda9bba31811e29354759d9e920073d9c17bc83094d42390 WHIRLPOOL 814c17e7e8ab03f5660eb682ab949a34b2d966a9d047f9856507f0a656403aa9a4ccbeb3e09a286e34fa606b96ded10caf85797ab3e0c1797b68e9578622854f -EBUILD osc-0.136.0.ebuild 1196 SHA256 89a286ac1777d8f4c53ab8418b98db508f1df7812dd6aa66a743b333a9f2b6d9 SHA512 8f65258cb0a8d2ba006fd0387727a313809ddc3cbbc371e65b5044b162f58f3d007173397e1dda145d10b122905165b30f8c1c30d1f6e30dc80264b593fc22c4 WHIRLPOOL d22fc01327900b0ca7d8e50e62376c21c80d1d806bc60c651245ca8fe37baf2eb2f25ffd8817c2b884b910325d407913042776f18adfbbff4d150160291875d2 -EBUILD osc-9999.ebuild 1195 SHA256 d45f53dacd29caa1321429f75a35a58753fb3246a88daf3aed19085f35ecc796 SHA512 01db7c4e9bcbbdf38390f84d8a39e95b3c884707c7c73f569375894aef8cee36afbe32dd7447fdd4ad553025b83a333d114614b3d07041cc848a6488b3236f28 WHIRLPOOL da4b92813566200f59a27cdabc3ce75e8e50fecc2139e48a93daff0a95e4dc3ac32b0ea994478bf4bdfd60a5af7c240f22386bd232e203fe0074bf5b5c39a84a -MISC ChangeLog 1370 SHA256 2cf80a115f0cf5edb9f673b67ae6d910d177eb4a179381696ce6b87689ad2a3c SHA512 cd19f725239b82838750b070aad5a968b8e73aaa53cd7102052ff53bf752c7a12a3bdd3739b775183067ac10f4b464f95b414c373ab3ece544d678d1b19cc3b4 WHIRLPOOL f120b6c1720843716d1f2ac2bb1cc98473bb3ac6b4642242fee22690385312f86c6d6d6717f3f97c4fd540c037915068206caac3cf42ad70e6c237bb68ba42d9 +EBUILD osc-0.136.0.ebuild 1282 SHA256 40317101b8d800b330641f69bcf95c73ca0a8b8e8b9eeed3cf347d1c0b4f37e6 SHA512 a51e5dfa1d16e8049e621f02f901fb04ca6670534880e8d7d7ae29978225309313ec667d2639653ba6d32909c4bd92138044e98279103ea514c16c8934e999f9 WHIRLPOOL 969dd485445563e7e33841517695133c0eb1dc702c1d9bd229fc691a533cde9deaabaa489cdc4faca6306c8cfccf2aef884aabd3706a3985e75a5f167b7b4acd +EBUILD osc-9999.ebuild 1281 SHA256 970c0f4c14ea88eb6d2e5b77d4239608b6631b9026fc52ea98fb0d5195a3fd77 SHA512 b2bedd569abe11326d0f05df9fe50e3b1614fef2ed8853f225a16237d43d32198fd6318b83bae409e675ee7fe789318c5057a5bc0071486ea29185fb554bfeba WHIRLPOOL 103e620909623880f02d76b094a3006d79873247503993e804e76765b01c8ccfb57423760cdfa8f6b59e4044351562a43e791a151efae0d27693e80edb4e2b4d +MISC ChangeLog 1521 SHA256 2db489992cd77d6eac35ec030b3375353ca927c6a15516f506e5b6936e30fc44 SHA512 10df46930e2a77690a66b203a8c5f0b5add3e9451464de71e06b6d718ecdecfc494be77d00a6b5eeb65c8b2da95063880b675c5759002fc9fddf22982ba24c1e WHIRLPOOL f214b765f1892f098574e5e634fa99cb2ef7680bb8d0a8e8c7381ed227763d8fd812d3fdb019ab3acb7e1ddae8e83c488dad6256e52411ca58e08a3392f6a675 MISC metadata.xml 424 SHA256 4bf5a94b109655c334bb88c7902710dd20bb839cc7703b151cb0f4e81e16214b SHA512 fea1d6531a95d555bc7a18acb5cdfffc032f7d60fdf0eeff82d081567de202896c493cd34948b3872d0434c87bcaee1954dabd2029228578ae1d77f799e433c0 WHIRLPOOL 9c70abf73332bd9665013a3495e60a9f240d28e67ad88636ea7b2bda0a235ad664cad1848151edbb55a4c92a0b128d5eba1e665c347d56adbb3f77e941950d5b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJQpVkYAAoJEOSiRoyO7jvoXXoQAKtXlA4Pdz1YBjpocnuqpesA -MhYvWk7IzRJQXvlO6lQCSe49D5Fcy+xp66ttd76pJluJrtsFbrAE82hN4YgBzm0N -2FKrgOatM7KkXikGbFnYrin8UfJZKF0greB7KD7Wvu8+I8DfUX44LZNA1UtTuo8k -Z3y3f053OzoW4Ool03TH1baf05mT3g30FOpgdCXh2CKOIAyuj37+n5aS03ieQCne -XP9fiVIqZzDHbQiSWF98FSz3SIqVrwzctwuILT9NsIh0fDiW8ei4AV+AnTeN991q -aBuC1Upc+QD6psvUNmtLIFKjrYAsOZnpJxLMnHzLokDTTPSs0/FHqW8kHnBNFqeL -BV+bUZtOgwMYeOPU/hHNxYN3o3tzb+JGx3GW136K5em8ktSvM+fuhD9jr1C+QAvk -wxH8TztZjOA8uMbgvFaLWjzY/TKHO+8hGodO/MBml24xFCADmIq1nw4NV5Lbztrf -cbpUkEOkIXUEyy4U0vcTI9lbSPdYH1kbG1qAZLIeI272ycihckYC0McUq1xi4IDn -BBO6ula1GFkz5fYMsRxYtShg5SatwKHjDoAYqk0ZycbyVH1eQW59oIVwqn4IZw+X -JOM5CxOfMzBUZqFTiI8wbd5WKZ3VQ73DPUUunX9HGLSOBSwcWYjmZDq7dZ10EmUN -I1dfYwDqqsa8SKp6SCBm -=bUPx +iQIcBAEBCAAGBQJQpmvMAAoJEOSiRoyO7jvoKVsQAK8n2PkFYVfDKeel0pauFQa9 +RJuY3mA3a4+LYYaE5TSx4E77ptOpUlnowmdHV0DqlJuNH9QMy/ZyDAGs1d1qcDZK +Uv2XvtujoF8jbBk+BO3D9PpytnFDOdc+WvhO+nPYHd8hJhDmDc6J4LqMrlZzSfmf +V4SAkGcpkVd7I6anUwQh8ky2giEIp3sg+WtiWFVoN3ptsxGbqE20qOS0OFTBWTsk +Bgr+jkgjryTj6JmgkY5i9erbO6ttI4TrLjiqAqfHPEbCnEoKlMFGWGUm/mDRNoHd ++PqBvRTm/umg4Jha79I+5IW/0y6j1ozL0aTIVX5OSAhWSIk6pu+6jQmdMBa/Dl0d +vjLd5ZgXWz232FhSkEe2QErOqHtL8+F1EtDY2rMesyZLXQmianLPP6lOB7PK+5lA +EqAWAgsqOHDAB+oTh0/2ECmpWzT3E3b8MOmT7L6V2RI5cJr4jjWh8BM1/LMB3LmS +TootrrgNJFYBYClGxrwdTRMuQZDnyR6BfFZAJ3weHbunBs9uIgXvB0rPMfRSFLTD +8Tz9AhVI8rsoh0EOT7g5IoWLkMzzmPg1fOr3wXiW7wrAgFguj6CW76a6IZja8zyU +M8utAXJoWNu0T1HBROeTTWrZHN0HRopfjffTlDT8tduPXCBKra6HsjR+GuAwVSkW +44qF01JkdGT2ryXKBgGG +=VSqB -----END PGP SIGNATURE----- diff --git a/dev-util/osc/osc-0.136.0.ebuild b/dev-util/osc/osc-0.136.0.ebuild index b06bae47a256..2f7b45ef81c0 100644 --- a/dev-util/osc/osc-0.136.0.ebuild +++ b/dev-util/osc/osc-0.136.0.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.136.0.ebuild,v 1.3 2012/11/15 21:05:23 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.136.0.ebuild,v 1.4 2012/11/16 16:37:07 scarabeus Exp $ -EAPI=4 +EAPI=5 EGIT_REPO_URI="git://github.com/openSUSE/osc.git" +PYTHON_DEPEND="2:2.6" if [[ "${PV}" == "9999" ]]; then EXTRA_ECLASS="git-2" @@ -37,6 +38,11 @@ RDEPEND="${DEPEND} dev-util/obs-service-meta " +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + src_install() { distutils_src_install dosym osc-wrapper.py /usr/bin/osc diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-9999.ebuild index c1640c2259ce..ca0b5dbc5e13 100644 --- a/dev-util/osc/osc-9999.ebuild +++ b/dev-util/osc/osc-9999.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-9999.ebuild,v 1.5 2012/11/15 21:05:23 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-9999.ebuild,v 1.6 2012/11/16 16:37:07 scarabeus Exp $ -EAPI=4 +EAPI=5 EGIT_REPO_URI="git://github.com/openSUSE/osc.git" +PYTHON_DEPEND="2:2.6" if [[ "${PV}" == "9999" ]]; then EXTRA_ECLASS="git-2" @@ -37,6 +38,11 @@ RDEPEND="${DEPEND} dev-util/obs-service-meta " +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + src_install() { distutils_src_install dosym osc-wrapper.py /usr/bin/osc |