add version 1.2.0-r1

* relax requirement on dev-python/requests

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x11A8217C!

4 files changed, 98 insertions, 15 deletions

diff --git a/app-emulation/docker-compose/ChangeLog b/app-emulation/docker-compose/ChangeLog
index 5ffbe28ab19b..4eb098e765c0 100644
--- a/app-emulation/docker-compose/ChangeLog
+++ b/app-emulation/docker-compose/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/docker-compose
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker-compose/ChangeLog,v 1.8 2015/04/18 00:56:57 alunduil Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker-compose/ChangeLog,v 1.9 2015/05/02 15:59:55 alunduil Exp $
+
+*docker-compose-1.2.0-r1 (02 May 2015)
+
+  02 May 2015; Alex Brandt <alunduil@gentoo.org>
+  +docker-compose-1.2.0-r1.ebuild, +files/requests-requirements.patch:
+  add version 1.2.0-r1  * relax requirement on dev-python/requests
 
   18 Apr 2015; Alex Brandt <alunduil@gentoo.org>
   -docker-compose-1.1.0_rc2.ebuild:
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index 41d625cd230a..d9b4f84ae591 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,28 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX requests-requirements.patch 392 SHA256 6d3e3acb78ab087ecb3c93cda0793d0e58fa464de0180a8c7124681788b80a93 SHA512 fc411e4d8acca68cb853aa509150229222ec408e2318813b28e8eb20a81ce35e664043ca7a48dbf825ec0c98813fb91fb1509ebab198e6a3dc559ac916ae7ee6 WHIRLPOOL bf51b01f0c1977c1e0c11f08c5f0ba6e0f1f4c9e16d42973b1d58abc6933000fbd2b39b42f98b3d640da2e6dbb5665efc97806229bab5b35c2839fefe6a632dd
 DIST docker-compose-1.2.0.tar.gz 57150 SHA256 46ef3c5cb7dd79fa7fd1d5fc5ec5be6a5c634192bc09c604c0ea75adb89cb652 SHA512 d13f6d6d22979dbc4554c003e611097627e2273f06dd13a1c666c1ba138288597ebef08f1beaf6d342721391cb49ad5ce9ae2ff03367a041fc0c53fbb62c9ac4 WHIRLPOOL c7bb3e14a4c2788eb49241ce02dcaed5e49fe60652ca1a51d13e1712f946046415f5397d5bf892b5e0451059a4aee1b156ee7bdfdf64a22d000caae7b17254c0
 DIST docker-compose-1.2.0_rc3.tar.gz 57366 SHA256 1d95191aebc31fd25b770217688407628390b5e5f09b1fd1a4e01ee0dc5fedeb SHA512 8a240648ecdb0bcb6e21ab5d217f8b7ad788732aa1648f8b6ce62db398562970fe4902e3ec9eeb528d9366195ab2d33d908b77c7d03f97322fe14a821b50d8f2 WHIRLPOOL 0776a5f1fd3fd157757910686e34b348991c17cfa0128118d09648dc42e79c97481a2e2be927ff3edebb76d0a6e66706eb9124aba840ba679d67705625c8a5f6
 DIST docker-compose-1.2.0_rc4.tar.gz 57629 SHA256 f164816b1c0349e602dfc251fc6ec674e7218a90979e5c8a7d38bf7eb061fc40 SHA512 1ae1ce6ab67615a5ca274507cdf3a782c98d379c7aa4de76917d2a1df00990dcb4210d14364a3bdb7744a56a8ac38127b41f4d91766d5c7de4f3eaefc7fb2558 WHIRLPOOL b5456e4d488054d4dec71cd2c1a720546f6bab58126ba598d3858cba666d86e42c0657431ec41fecca9b2c810a6e37ca1eeb6f5fbfc4ecdddd6ff55c491c1ced
+EBUILD docker-compose-1.2.0-r1.ebuild 1721 SHA256 eb5f52744e1dfec22e4be4fa8ee64de5025fa7a782a93a03fcfa8f0ac6afb4bf SHA512 a391f8232f61166bf280c333323d2fd2ebcd13a1c9cc9bc05ced11f2da4c382e5b90094b0148e0769903d06eba770d65fe994e0dead0bfb8d970551afd0e2d72 WHIRLPOOL 0c61b861ea7ebd3248c1452aae61d959c3f1ea1d778365efdb99c4587f016a5e29305d0123703edf7ca57aee894558f25a595a29f269ac506df08d113509f6f5
 EBUILD docker-compose-1.2.0.ebuild 1638 SHA256 b537fa910ecb1c721d0ac04258f979c6b50d4329944f3c598f9720c54df75e50 SHA512 3495a94bc20a9cf14802194759995e3a4311c2993a4f789384f01de54b7cbb728ead54e3ca97d35371ed0338d4d00c0641789c6a34877acfd7ae18847a3f53ba WHIRLPOOL 8ef5264631eb4b4c4e2a1f512b3bc4c97a06134bcd86f3a602ae387e569f3defeff3a2b80eb760bc4f418f7a5415944d351b74c2c1f9d179e0930fbfc76a3215
 EBUILD docker-compose-1.2.0_rc3.ebuild 1699 SHA256 8c5eb6c9240b3d80fab1c60be5c22cae5973bbb93e5d54952b57ef18e31d806d SHA512 dd2a2151ab5d62c2dce220d70aae1f09927cab52d4506e99a84253aa826348596fe867953a7327254e19422d4436e3df0b8b1ad2f5aee1356b7c2bedbc384cf8 WHIRLPOOL 55dd5ccffc04d4ac8576cfc4668d67103347acddbc71fbbf97dc9a91405593a2ed5a3864989c4dc929ed718ef81fc99a3389456d26405de3c4a64cefe5af9522
 EBUILD docker-compose-1.2.0_rc4.ebuild 1699 SHA256 c5b319cb6b37165b1c70ac47b25bfaf31d3c694520632021ff76290a8a0be800 SHA512 a4a4a5cf381b66f574c1eb682f425651f643b43835b9cb84ba16ff54faccf1fa078ff068f2dc6a6c8a9b60f6d0d881fe44f0fef52ce7ab6ffbc1212b5ec55e11 WHIRLPOOL a1fa3ac5cb1de9531134a20d2b654dbde1cd6275faa73ce81913e2a09ee4b23ce83d8205bf3537f4cc8539ec8a8bf1409e47dcca415ecf2f0f8ed8328866560e
-MISC ChangeLog 1414 SHA256 7877c54e6d73f51da3420c1936cd4c9ab5825d2b538c969e2edcb8edc573c20a SHA512 43c99c2d5192846924d8fd72b1c85050cd433571c5243566aff2c402cf9e10494188f0abcf382ab319411bf04db379bb0d79ff8c718255a487ffc871e69ed3df WHIRLPOOL f5a49167a2787f35ca4aff750939c3e3415e39219ef5a0f9ec3e9f3f367b8685c0ff862a68069dfc4cea0da33206e3767aef080c7a7e74007bbae1c549d4ccc9
+MISC ChangeLog 1642 SHA256 77c8585a5c28d7f95e5c9aa3fd6e941279c29a30e62c0734f224cb39137ec489 SHA512 1ffa865775ccde7fcc1042cd8c3aad96343e08161c590fa8ee5690109397d1595638e8b3c16acc9e71fa3fcfe8bb6dbc407433f42b831ace5778257087136451 WHIRLPOOL 31bbfd365703820443b59f7b3789cf012242477ed4be2d1da9385fec6be52ee9bcefc4de0d5c5342f123d85a2f6d86c6a1e45481298fa671b6cae69ec23e60de
 MISC metadata.xml 281 SHA256 4f517e212ebf30022599267011b7d752fb61f1063c90f9d442242fba23e5207f SHA512 c4d7e9c37508015a286fc8288d3c201c5779aca1252bc6ed7f25ce87555b513817d4e3fa624255e7644b24e4db0e1b976ea34810ece8f718dac3b027a3e601ba WHIRLPOOL d144bd0785d423f05e5ff568d7c7c5b6f4aa6d651d44ec9f55dce23aafc6552d0d39f8229a612109665cfb3e839ff746e64c0cb0130fe93e9f231238c61a87ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVMavaAAoJECZUyt4RqCF8MG8QAJz5e2Ze3s96B1+yZM9O9nmI
-7+23pZI7DTPZA3+2RJLv9Cl7xe1B/UrRcqFs4ReHBwNQAO3tBtyhLrozwNikKWWC
-yHosinjKsk5oMCZwZtYbCP+EFRH1szgNfodh4w25j7grut9Zs+NybLMG3auFKGeE
-2aw8QVAdgJFSky1VV69qvU+nLIrQnXQv7F36m8L0rJoBYvHYYTm6q/UnPygYjNfk
-q1OE1fR3UGObT+JcCYxsIxYevlfIlRAriR/wPXkWHz3lcb028cA3e7rhjwNTGxY8
-7ybt+o8pIASpSiTRqV938Alr39xLD1YMfsgVi3Uax4/exuz/JeY542PhW2NLzUM8
-uFl9nfDXPf/NSOzn1oMWhnmIwwLFLwVOhlLjSkfZeNT7CKG6MZO0l/R9Bh5VLZrD
-RiRmFfWMjXNm8WR23FglevM+FomeHsanD5Tf3VX+sSGxMvmWEJM70mzl6XkG2VQs
-TCNjz16+13NcL5D8Di5+mCg0pZs9G41Jk5dkMtYuCZGmiLH3UR2X+zZWVVyS4TlR
-f1u2CJ/WdeC0aycywqpRjL3Zm9XV8NZECd0X5fnlI8nDlOgn3jnv4iOSRBQCW8lk
-wJFQ+0yXKpn+iA0BrXPZXZTh9L1RN0nM1eEC4kpxIlc2pBL3arWXuPTS02bgc5ND
-o5WjMU3n5Zsb7qWMGYsS
-=M1Ar
+iQIcBAEBCAAGBQJVRPR8AAoJECZUyt4RqCF8jBQQAIwqCDKu1YIBjwtLSIhngJ9C
+FP3yXpVmi0noGxcFyxk0LCKuU+nb3fXHncbudVli18BEx4862eGdgwGPBq8ZwxCG
+j5NRx0kG2Qx8fs1mZwCBYcEpgCZKOhN35nmVI4xmvC9prPfa7LFqNlUzyotnSTjn
+AZynzORPYgltg/sRtvtGatee3ADm9UxwOVL/GTtxRB+ir0PWGfaKLGs/WHn8NLSx
+7Pwx6tYVKI1j95BVMqoXrdVx7DcEG/lFTkGYQNzUySkdDWRL657wnuBPYHUCXwoQ
+TreunvDrkCWj9e49raW2Z4Q41faR/xOWJgch0vfXohk4mwnn7pdgZGfJ6Hto0EUI
+8OLa5LkaoKBX5l6/o+T9nroC+cDunMqdJoReW7Gq5Fj44npBRqPONaB35ktqFn+R
+i+lnWIe0KD0BuVJjunaCjDhYm7m+yEuhfVxPcSO2Nqbipp8lmpkiTUJr8TwB4x2D
+3djwJvcLd6e5toArsABXK5Me/0XTvUofVMQbll9BUnC0SShJ+fYx2eePvDHE1zo1
+x/teKJjnm4beI09EapBP7AmX9UBmhECwqxbXrsx4zKeKeYWo5Z1AZfpqtg55G/aJ
+zaXrxxlRw/8iLVsEzjnU4FxQCr+r6frok5BXOppK/GoWR+QwgxA6vysYqRLVECOM
+wKaYNYq8bHcsBm6nr4gS
+=hyru
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/docker-compose/docker-compose-1.2.0-r1.ebuild b/app-emulation/docker-compose/docker-compose-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..2b12579ea750
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.2.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker-compose/docker-compose-1.2.0-r1.ebuild,v 1.1 2015/05/02 15:59:55 alunduil Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.3.2[${PYTHON_USEDEP}]
+	<dev-python/dockerpty-0.4[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/docker-py-1.2[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.8.1[${PYTHON_USEDEP}]
+	<dev-python/texttable-0.9[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.11.0[${PYTHON_USEDEP}]
+	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${CDEPEND}
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/requests-requirements.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	distutils-r1_python_install_all
+}
diff --git a/app-emulation/docker-compose/files/requests-requirements.patch b/app-emulation/docker-compose/files/requests-requirements.patch
new file mode 100644
index 000000000000..a897baf34618
--- /dev/null
+++ b/app-emulation/docker-compose/files/requests-requirements.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 39ac0f6..91d8b5b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -27,7 +27,7 @@ def find_version(*file_paths):
+ install_requires = [
+     'docopt >= 0.6.1, < 0.7',
+     'PyYAML >= 3.10, < 4',
+-    'requests >= 2.2.1, < 2.6',
++    'requests >= 2.2.1',
+     'texttable >= 0.8.1, < 0.9',
+     'websocket-client >= 0.11.0, < 1.0',
+     'docker-py >= 1.0.0, < 1.2',