Bump

Package-Manager: portage-2.2.20/cvs/Linux x86_64

3 files changed, 94 insertions, 12 deletions

diff --git a/dev-python/sqlalchemy/ChangeLog b/dev-python/sqlalchemy/ChangeLog
index 1981026c85d5..e3ee8a586070 100644
--- a/dev-python/sqlalchemy/ChangeLog
+++ b/dev-python/sqlalchemy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/sqlalchemy
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.160 2015/05/15 07:12:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.161 2015/05/26 02:29:17 patrick Exp $
+
+*sqlalchemy-1.0.4 (26 May 2015)
+
+  26 May 2015; Patrick Lauer <patrick@gentoo.org> +sqlalchemy-1.0.4.ebuild:
+  Bump
 
   15 May 2015; Pacho Ramos <pacho@gentoo.org> sqlalchemy-0.7.10.ebuild:
   x86 stable wrt bug #530600
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index e60bfac5e545..f47efaef4f29 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 0.9.7-test-fix.patch 1453 SHA256 4c78479dfda8ba88f9c2aa1d54e2b4b38d3bff2ae2c3a391f9bb6892706a75f8 SHA512 71c83a7d1411230d92a5a393d70da18a2e56c2dfb3e0221af41e77f8fa108070c778b5010f14abfffd866fff9939e710b3792c5ee4609990eb74d8655f83f0bd WHIRLPOOL a7ac8c3fe7d0af947f9c0f268ba3a2137ea4ec551489a7c9d2d6cde863dcd4a1cfc9e1f68db001dd8658619781c8281c904a7aacf3ad20f012e623ce83e2554f
 AUX lru_cache_timestamping.patch 1088 SHA256 e4bbc35e94b5091f9abb1cede122d2773bfa3f96a21a62a090fb1c1733a9f0ac SHA512 9d7ad6990b312dec26ede2c1c0717447cb034c4d701435aa278dd9d0214115c6d94d02c6a608c0aab0e28da69c3bfa7cf8bc1c9d61b3bc3dfdca1eb47f63eda8 WHIRLPOOL 149302829080935d5f620c7d6f97cb939b027b944f24c5d5650e009cbbe1bdba8ce2f7172eb2ca761b5a3ab1513c078710f679ccd61b23909423e4b2c1b0ae10
 AUX sqlalchemy-0.7-logging.handlers.patch 466 SHA256 3e2034457bbd4f4cd775f41cad156e27006c0b87cb3bec502b9b405a969d1099 SHA512 a09af91fdd6a1cc9f219c9b45fbe2fa5d9a675d2c2dc769545af52fda44ced40f673426975a09dd943e6ba5087cf0c0caa771c106e0eb755c3ed97c4ddc267fa WHIRLPOOL 8691dd7dbb09a45296dc6890644b06de63bd779cefbfe7b90d2d5753d7d752c5f6836151e26734090e69e928deb396b9a7c70fe8c980bf1a8442e623211ebdc6
@@ -18,6 +15,7 @@ DIST SQLAlchemy-0.9.8.tar.gz 4080098 SHA256 de3ac04ecab0a7e0af64eee30a71e723ba58
 DIST SQLAlchemy-0.9.9.tar.gz 4213948 SHA256 72a51f6ae99116ea969381f65fe471aafe14c21f6760f259b46f919f21345f91 SHA512 a28c83645ddddc17825f7d76443350ef22b23be72524aeb22665b4f8b92e0bf7dd79f9628841732973a565f5edb64b687f9e49daa1af11b1778b854b66728fa0 WHIRLPOOL e60a8ef79da0547b58a53c5f567e6abeba7408cd4cc398feaa7c61dcad7fa344dd31691fee25d4738bc25bb956ecf2b20cbeb6caf29114066dfbec26c2f07695
 DIST SQLAlchemy-1.0.0.tar.gz 4462558 SHA256 85286929727ff4aaad63785655c3baa413521b4d4955b81aa14d2f2cfb5b84cb SHA512 87c8d01d9b87748b8c374f64fa2978a093c9e130437c627922d9f92e2c9a97182cb596353f4f567a6594fe7229ae69bc681cc58d1d06fdf8dad07c0c29c681b4 WHIRLPOOL 6cda898ed4f5d6bf4d190e2159a565abcab957ed99f7ac5a56302b69e197e09bc8236d653c3fb4f835a6a468c1a8b449a4bb091bfc484b347c547f9fc93089c7
 DIST SQLAlchemy-1.0.3.tar.gz 4492091 SHA256 3c25d5e038b4f49d8492c18608ead181b09b7a38d301faccecc12b80e2c2f6c1 SHA512 4d66b58c8213d67cc0c568045bf15d92dcd1bfc2f7491e16ea04bdc2d1d8ccc08021b18cfd5b9275d9131f5bcf02b2bdba37c4518d88d4d61a69d77ea32d6b46 WHIRLPOOL 41d002987c558191b7837ca3406c79cf5f467dda76a6b1b1edd82c60829319712335f4c85300f8cdbd7b50cae3f06ca2efbf4f5809d684b7a0373a089ee4401b
+DIST SQLAlchemy-1.0.4.tar.gz 4580773 SHA256 9eb568d6381c6a45e3cc5616333deab653a15b3c6f9958419abeb055b400400e SHA512 fb33ba351b8ef10a41d74ecb8489baa6c83a5a3844ce6303926bd23baec35cac40676d74ffe86ad561899c6698b9f197e800ea845d241078e5e1c1e2b84aa712 WHIRLPOOL 013d32d85d12045084729152d39ee26b6d34155bda4bd5f9d8f463f83f02f822b0d3ef7c55f6426224bed59629abe73545e5eda25cfc31e4e7036949cff7085e
 EBUILD sqlalchemy-0.7.10.ebuild 1799 SHA256 12cedc287f65d1e8a64a1ddfdc88ac4c9bd96b9e3a82a9b5da4e57054a5a3ba4 SHA512 0162f8fcb6ba95857ade018d0758814481ef999cba2ad4feee4a507c819c0e0b9481622b33e559d2f7bdfe994c9490e4767156b1ce778a81f7cfa7377bb9baed WHIRLPOOL 0343b58d3d337e2eec93c47debf0cb5adce431cefe71444dd2f6839d5a2d6935452b532a2da77f76f66bba4c162d3832f7ccc7a2a48c50b3ae9bf2132d1bdc8e
 EBUILD sqlalchemy-0.7.9.ebuild 1960 SHA256 3a0393d89956f4a5874b13d305668c82a16916154d13a96648a1da4b0138cc58 SHA512 b9641ec4785d6d5a41fe7ce3414e5da1638b5f6b45c6358fd7a686bad824213f93d65c148770bc1476b99e8416331ccb11a5f7b74a3d4c01f5d3a3d1e826e334 WHIRLPOOL ce77a226a3c02a6560868b27d055e90b0b6bc235900afe08e2bffe0505e7e0406f231d53a00a71a779019bb3bff160b855b22d7c65ba2f88f7cca6e0437a91c7
 EBUILD sqlalchemy-0.8.0.ebuild 2080 SHA256 095505f1bf1731f67be284cce424e9078ccdc57166eb20f6b973c9500c05f02f SHA512 1d5c4ddeabdf5a3735c5c92fab21a0b4c15d5b7180c82dc9243522071a43347f1ddc6fd0f5b64090e491258f9b93152db9ade93592f072e7fd07f03080d78298 WHIRLPOOL 1918d861a28d6a02eeed44dba702fbe267540a4b1596ef35ad7fc148e271776171172bc84b46e8d211e72b59c5c33e3ec0611937152c4ba84632c6739f88af48
@@ -32,12 +30,6 @@ EBUILD sqlalchemy-0.9.8.ebuild 2581 SHA256 be48b18cfd8c17704d32e1cc0eecac84342af
 EBUILD sqlalchemy-0.9.9.ebuild 2592 SHA256 5dab5c6efde6b1ec6c258271dccb4eb1addba66344fc854559e914e3d3f58f8c SHA512 2ce94435ff719614836b83be548603076686a5ad66f324ef8fa740510c4572a42e2b7b0c19c7319194ba842708ed88df2eb72c0c5f64f8bc8795e4739d31014b WHIRLPOOL 041c4530fa3f85b84df453f222ff7c90279bacc2d6c71f45edd4a0fa9f5f41eea8fbcbdd6817af1ac3a358488070105f983d16bb6c6bfa8ac5ad3b4b7affc05b
 EBUILD sqlalchemy-1.0.0.ebuild 2598 SHA256 dfa10d1f2ea7ba2f5f27b7cace824ce95dde086d3678734498a564cc37d63a11 SHA512 f6104d5ad4ef862a534a523688981b140c665d00ae5c1fc81de3d81a9a72ad40abc6ad3675c6126ea066f882af78ade3f5494215739a82655fa95f034f7b0952 WHIRLPOOL b4973f8a46138f6dc516d1d8813a7ad7364675106b64afc0e79c0edd5146518824444600d58b8d015515167ab0181f473b98f62e7b6f183862598bcebb2da4cb
 EBUILD sqlalchemy-1.0.3.ebuild 2598 SHA256 6d8805f5ca1ce9d1d88aff02bb11e93d6a322709fc939da15e50004c2b401e5c SHA512 490429ea93f62a532c641600f0edfecf9448afcba2ed31a1907fb8cec1ceb8f1c264eb23f1cdc7b01057f1facfd4d051a850c0e9081d2524cc884f39faa39315 WHIRLPOOL c4698217861f03b46a4422827c7990d1f11b68a0216db108e6ca4111a81c11fa1b2b03dce2453209799f7bda91f11ea332899579ba273c3503d50736ddf694e4
-MISC ChangeLog 23143 SHA256 0246f813f0c334b1df4c9fddc4de42ad8f612bda6581fb2b617d636735203e84 SHA512 53597301ec996fdb1f3cdf4ceaa337ed240384563776e12b637df11b2b55b8f58eeeed6bdcd43c8bf846f48f33f645e8b3568a193a6f9e461a16441024056baf WHIRLPOOL 2982d88d64c6ea920dee474fa71d03291e820d260f9260b68153a6ba1d0d0517b01c83d478ddedfdb9fc0091c8c5db2d22036ae6f318df2d3b572b7c6d950b60
+EBUILD sqlalchemy-1.0.4.ebuild 2598 SHA256 ab0a214c2abad3e66140cb63c5a760d192c37f6d6ed649b3331784c41a51ecb8 SHA512 7ccb5b23888d974af648fce32c6cff8aedb65eb0aa564f13d70ca64add94c0e7c84b14d483e4ee3bf8de825f062277e51bd25a9c00a9a816ca3d14aa18cd888e WHIRLPOOL f54797ec809b7a3c93aded74914868fb2c33c5f8f1c368b4bca335b36f9ac1b894c13ca88092a81d7ae54982579cd0dfcc57453b1095367d5c810f9549f4eef3
+MISC ChangeLog 23262 SHA256 012e881e65cf9e2c414902982d9ec382bddb79dbdd0d29207fb2f2f322a4a953 SHA512 8358a956c1280d5b117c7ee22fefff4e8043466a6eb6c9903c9fe8e2cbf16ea19d73dfaf01b2c2f51a4546879d1046562433272a45d23480ac52b801333a894d WHIRLPOOL 59321f7814cb5567a701dc9527d3be2253c815675b946ff54a9de7e0670141fd0e9eafcd69e74c042383a11b9aa80a66fe311cf9bc0e8d424271f220a902716d
 MISC metadata.xml 233 SHA256 77ca0910fec09997d5679f4de22c824a0b0de12d9ac12b253ad544ae7357f720 SHA512 1521eab2401d4b820c053a13680ec44b9bf4931516f4f4c1508ca92b288bf6cae2db36a875ddc5c2475e862c16d3e92cb662c093958950ead4eb72e463abcff6 WHIRLPOOL 9279e4a60e5c11a72f329dcc13bd9c18d3bbfc1fcaab98f46df1336835f407a8471b4a76b61e74a5fa1bb8e24156cd5e3c2e8418752a412479f37b6193b74ec6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEUEAREIAAYFAlVVnEoACgkQCaWpQKGI+9TOngCYtrLHFfmrKvjmh7nH4VXtTv7z
-hQCdGneUfBl51F/V20W9ASS+fwP32JM=
-=kyO0
------END PGP SIGNATURE-----
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.4.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.4.ebuild
new file mode 100644
index 000000000000..4f59e83841a1
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.0.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-1.0.4.ebuild,v 1.1 2015/05/26 02:29:17 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ http://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples +sqlite test"
+REQUIRED_USE="test? ( sqlite )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? (	dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Create copies of necessary files in BUILD_DIR.
+	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
+	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null
+	if [[ "${EPYTHON}" == "python3.2" ]]; then
+		2to3 --no-diffs -w test
+	fi
+	# Recently upstream elected to make the testsuite also pytest capable
+	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	py.test test || die "Testsuite failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if ! has_version dev-python/mysql-python; then
+		        elog "For MySQL support, install dev-python/mysql-python"
+		fi
+
+		if ! has_version dev-python/pymssql; then
+			elog "For mssql support, install dev-python/pymssql"
+		fi
+
+		if ! has_version dev-python/psycopg:2; then
+			elog "For postgresql support, install dev-python/psycopg:2"
+		fi
+	fi
+
+	elog "mysql backend support can be enabled by installing mysql-python for cpython py2.7 only,"
+	elog "or mysql-connector-python for support of cpythons 2.7 3.3 and 3.4"
+}