From 2ed626f76cc0d2572ec96c9e9b1b38e5111e3110 Mon Sep 17 00:00:00 2001 From: Ian Delaney Date: Sun, 21 Dec 2014 05:50:07 +0000 Subject: [PATCH] drop IUSE mysql and dep dev-python/mysql-python in RDEPEND, substitute with msg via readme.gentoo eclass (suggested by floppym) informing of backend support for mysql now supported in all Cpython impls, fixes bug #532956 by zorry Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xB8072B0D --- dev-python/django/ChangeLog | 8 +++++++- dev-python/django/Manifest | 12 ++++++------ dev-python/django/django-1.7.ebuild | 15 ++++++++++----- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog index 6a80b695f1ab..384b39da44a5 100644 --- a/dev-python/django/ChangeLog +++ b/dev-python/django/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-python/django # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.147 2014/09/17 13:02:10 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.148 2014/12/21 05:49:11 idella4 Exp $ + + 21 Dec 2014; Ian Delaney django-1.7.ebuild: + drop IUSE mysql and dep dev-python/mysql-python in RDEPEND, substitute with + msg via readme.gentoo eclass (suggested by floppym) informing of backend + support for mysql now supported in all Cpython impls, fixes bug #532956 by + zorry 17 Sep 2014; Ian Delaney -django-1.4.14.ebuild, -django-1.5.9.ebuild, -django-1.6.6.ebuild, django-1.6.7.ebuild, diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest index e2226f98706a..0300fc3d8091 100644 --- a/dev-python/django/Manifest +++ b/dev-python/django/Manifest @@ -12,14 +12,14 @@ DIST Django-1.7.tar.gz 7486550 SHA256 33f781f17f145f79ee8e0b8d753498e0e0188f0b53 EBUILD django-1.4.15.ebuild 2557 SHA256 7248e0267a58f4b5a35fe2d7d4b164750921f0bccc2260bc572c23dc0a8894c2 SHA512 58380a2443d8966ff78616ff4a90645cca4cf0e1cf672077b928542931b96230caa85dbf395ae4e0af80aa962383167885a9cb1779d3cab96ccc1d3e5998742a WHIRLPOOL 8792466779f3e249ae584d32bb54f42dc990558b26b288129024b6e66e5b06c23cbed04d922c06e73b7067f6ee8fcbbe86e8ebc82dc0976811f32bef984c4640 EBUILD django-1.5.10.ebuild 2570 SHA256 4516728575bf4f4386d18ff8b7b3dfc528988a2613314ed652cbaefaac85ee87 SHA512 81c02f0e126ba9c193bce65e06b51a903f927f1b313b34b789b48e6f70ee09bfee38821fe607597e240726fc5d5a9e47a50dd6d2c60ccdd2d22aef5c9da8207d WHIRLPOOL 9cd10f6cf0686cacbc1f74c22a3bbdd66aecb7db7484f392e2b643e322bfac65b34af4fbb631734ba8f62efdf5cb52f8841a56188f072fc3f808cfe5e2430c86 EBUILD django-1.6.7.ebuild 2686 SHA256 2d4cbba335e51b7ae41580ffee14246d402684b376dd40bad70a70d7386a377a SHA512 49c124e8abcfb9e3e921f88dc7924968469939eb85581a12aaa628108d15375c79970a75f0aa936212fe6e8f4d6edd42f6044f51cd597284eb41311942d6e1c0 WHIRLPOOL 608ec69095c1e771c8a26089ae8a7584b3506a2231a620dc0f38ace5e097e31ec22bf99c0ac7ab5fa6cc632bee4cba45cb459364f81b97eaadecbc71bc0191df -EBUILD django-1.7.ebuild 2764 SHA256 d44618d4039c10051a2a6c090f39663541a261a61d95379bf7591437b94c5b45 SHA512 371f91749a84a29c624a1af6bc94295000b14cc496849c6c5fb16b40e231f665a748d80d9d2b1909c338d3b5326c9cf5e9b1df96725b63ed4b0d78794343b21c WHIRLPOOL 337e40d750c04315b05ebd519c2b3e01f1b4753f05e719c31383af13dade3204dad36722ee94d22db6029799fbcd4a0d992c7a7f948912c7a8476fee25a890de +EBUILD django-1.7.ebuild 2973 SHA256 bb55a4ee4e02ae5b0374cd4a9e1d686eeaa77ce7fdb464a0742e4944bc61ea4f SHA512 4ad6dabc355f5600e85ada102455709b69069243dcd9528682423a00f631beea2a66be02552434cbf78066e4cf1ebe96e3614121e4f3e691f4e7a7dcb124887f WHIRLPOOL 3b4dc2647c2026924500104490341e56c3e1ef5f8cb5b338d87899661e02b91202f827d86e4e682ebf3f3ee2ace6f5e3c391036f210c361a8afd62b6758904df EBUILD django-9999.ebuild 2378 SHA256 53f3f83d91d9fba975d5ee353a91b9ecadb874b2da551b234baeed7747bfae20 SHA512 521cac5140c8ddd2529c9a103ded73427e83a1107804639090cbfb186a7a691aa49c02587fa06081218960f9e34c6b971e4dc2805d160e6c2b775c3c7498afc1 WHIRLPOOL 892b0145749a5446b4b75ee41045795ddd63459d5c0024657d7477c02c8f3c32fafdab8a5e586e623f26c9554fb98a69525ba00e5c43a5e0cdfd6149fa348f86 -MISC ChangeLog 22945 SHA256 3552c514e6480435d95f1096222e2b43804386c8cbd98a92d19ead5718779537 SHA512 1dea553e946f2bcd37e7438a7bd116a23e08d3509566c8a97230c1cb017f31137cb7ed26a861afd7f6d74cd96124c020b1be8eb4200326ce73ac004e297543e1 WHIRLPOOL a36a2fd88b40fb7624408296957b4832eefc69733e9109ffba79fab05d397bb2158f647860c49a5126a484eca5ab695f842a640ab86e9ef8c0c5748cff8549e6 +MISC ChangeLog 23251 SHA256 8a117ba8b8ecbee5172a09a2f9ac6cd3b9749e5613ccfea9154b097056397faf SHA512 f0b326c40abdffe17bcece3d797ca728a37be0d2f47b66e8c6ee959e010656cc21129ed4599471aa74b0090720feda516920580dfabc3f64fad065a95159e489 WHIRLPOOL 4744e8002b9cce97b901587b07b00986ec25c91976ca43d685e973265fa0e28c5ab8e4bd863b41ac4c9a66ca4fe63e79b9662d4a8b9f5369e9a61b07f14aa01e MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlQZ9KAACgkQso7CE7gHKw2RvACgmswh0d88R3fPlp2FF8TDuAsz -m7wAn2OBj4XxtFESde0iBDXNoCdQLTAg -=tW/y +iEYEAREIAAYFAlSWX4YACgkQso7CE7gHKw30WwCgxOrnyFA9CUSPJIO1TrVqA/42 +aaMAoMgEFKEFLFlVtcTbh/FNHkjhvFFb +=PrjY -----END PGP SIGNATURE----- diff --git a/dev-python/django/django-1.7.ebuild b/dev-python/django/django-1.7.ebuild index 5c98b0841e2c..19e2b7bf822b 100644 --- a/dev-python/django/django-1.7.ebuild +++ b/dev-python/django/django-1.7.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.7.ebuild,v 1.2 2014/09/17 13:02:10 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.7.ebuild,v 1.3 2014/12/21 05:49:11 idella4 Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) PYTHON_REQ_USE='sqlite?' WEBAPP_NO_AUTO_INSTALL="yes" -inherit bash-completion-r1 distutils-r1 versionator webapp +inherit bash-completion-r1 distutils-r1 readme.gentoo versionator webapp MY_P="Django-${PV}" @@ -18,12 +18,11 @@ SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc mysql postgres sqlite test" +IUSE="doc postgres sqlite test" RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] - postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4}) ) - mysql? ( $(python_gen_cond_dep '>=dev-python/mysql-python-1.2.3[${PYTHON_USEDEP}]' python2_7) )" + postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4}) )" DEPEND="${RDEPEND} doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] ) test? ( ${PYTHON_DEPS//sqlite?/sqlite} )" @@ -71,6 +70,12 @@ src_test() { src_install() { distutils-r1_src_install webapp_src_install + + DOC_CONTENTS="Optional support for mysql as a backend to sql is available in the form of + dev-python/mysql-python for support of python 2.7 support, or dev-python/mysql-connector-python + for support of python 2.7, 3.3 & 3.4. Just emerge the package to suit the needs." + + readme.gentoo_create_doc } python_install_all() { -- 2.26.2