bump, re-make of enable-4-rogue-tests.patch for new version, drop old

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

9 files changed, 48 insertions, 452 deletions

diff --git a/dev-python/enable/ChangeLog b/dev-python/enable/ChangeLog
index a8c1cc65b448..34a5b24f20d2 100644
--- a/dev-python/enable/ChangeLog
+++ b/dev-python/enable/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/enable
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/ChangeLog,v 1.23 2013/04/15 19:31:48 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/ChangeLog,v 1.24 2013/05/14 13:57:21 idella4 Exp $
+
+*enable-4.3.0 (14 May 2013)
+
+  14 May 2013; Ian Delaney <idella4@gentoo.org> +enable-4.3.0.ebuild,
+  -enable-3.4.0.ebuild, -enable-3.4.1.ebuild, -enable-4.0.0.ebuild,
+  -enable-4.1.0.ebuild, -enable-4.2.0-r1.ebuild, -enable-4.2.0.ebuild,
+  files/enable-4-rogue-tests.patch:
+  bump, re-make of enable-4-rogue-tests.patch for new version, drop old
 
   15 Apr 2013; Ian Delaney <idella4@gentoo.org> enable-4.2.0-r1.ebuild:
   minor corrections/tidyup
diff --git a/dev-python/enable/Manifest b/dev-python/enable/Manifest
index 74faa666c914..d7d216eceafe 100644
--- a/dev-python/enable/Manifest
+++ b/dev-python/enable/Manifest
@@ -2,25 +2,16 @@
 Hash: SHA256
 
 AUX enable-3.3.0-nofreetype.patch 4459 SHA256 b0ed8b1fea4514633b856d2d6790f1ef8b64e63986865e6d02cf8315138baaac SHA512 b341685bd1a680b3870277e2b1c96b9cf16c7f63aab26b1add09735a5ef7335fe20659abae9467278ea7e8c10a4ccf4abd91299f96b58f5cfcd2d9bcab6c115a WHIRLPOOL 05d113b6697e74f9c10e1b8d9cf9d376cc671a2260a5d105ba66e75a44c59e64e6bde55d1e9adf54a7f843888cc9b9fe0a7315d762e2b4a7109e743fc436f805
-AUX enable-4-rogue-tests.patch 2219 SHA256 c751309d63cd863da3d12bdd191ef35ae7b037c0a525c235b5efbf847d651082 SHA512 d9184e00a42b20f474deee4f6f8461b12b0845d495ea912fb8a1f39531e55cf49bc0c4c0d840f0972a91651da2443c3b502e9aee8f5ea5b979453f7203ac36b3 WHIRLPOOL 567fa3cda86ce03d7f3d97c0e4297ef8e16589630b6ec6f1487982032179ad06014922c5040facec23e5336226b21d6967f05577dd6f615b8c08d37c960c1159
-DIST Enable-3.4.0.tar.gz 2703753 SHA256 f536541227f3aa7f2d74e24228f9e25a4aed910d10811205c106555b7ee0341c SHA512 9b753caa1aaea3e6b3d434a2b21b4d3ee1e053cd2132e7ddd0fde2c5dd8b33a14fa7eb1a515510d0186fb133d4c35e2a9dde19268cc6ebb08b458a357f9dfdfd WHIRLPOOL 419d3b691caaeb904ec726e009a0a6367c2ac55f8c6db5e0de71df89fd6e4c535e371528d0a108edbfb1dd2b3af6dc73eba32a80e3fc28240fc7ee2bc48c37f2
-DIST Enable-3.4.1.tar.gz 2726048 SHA256 0b17c7764bb8e31b0d0c5ba439b6cf9e43810688e869afff826889e0ae3b8b8c SHA512 8635912bb8ea91aeb441b235aa8be773bfaf5f56924dd5eb4996304e8d51fe898ef6d37b207b36ba755bcafcc66201558ffad033c9ae7e57bec98f570748a6ce WHIRLPOOL ea42c0f59ccc30657984da28d2a5600bfcb801a1a29dfb6728823580310a8058fecef1908a315efb2a4668487dcfe04f483af22f1cbf338719f27c063d80881a
+AUX enable-4-rogue-tests.patch 1831 SHA256 bd083563de3937991b50eb3d8d4514ca296832c7e8211cd83a3e9523e7aa64ed SHA512 beb3760719be59b864db645e8e286ddbc24d74ff598f9d08d1b27ab97d173695ecdf0378d85954faeb49a4deef5206f5e6d26fa76dcd915a74db52e1ee2661d7 WHIRLPOOL cc1ad883d671525ab69702652fb4b4aa10082db1e71e67a6ed4c6db7fb52db9391ae08d8a5412aef1519827bf4f1e2e3a58a274093272353d80db6a5c0701668
 DIST enable-4-TestsPaths.patch 20524 SHA256 481643dd38d5b20efcfbf6bc5256f00c45a3adcb3b73ee9b492d2cc97c140a67 SHA512 c49b9c3fce8b2ea601407f9698e2a12f4b3eeac4d6f6dc4da77fccb75d99d8668008d688c8e5a268da96c7b8cc522892c794aae6fa97e3878b9439b6ea832942 WHIRLPOOL df0f5448d4458cd9b0f94478973ac24fa001ecf65b0852a66188701d0c32509075998211b80734ec3312bde92cba7b5489a78f328a56d34502ff1927df4db1ca
-DIST enable-4.0.0.tar.gz 2471266 SHA256 c3ec3043fd2ac5837de2575efec985a6fc0ae597aa70d96f6734c78ce3cde01a SHA512 2101f1b7b6cce840815224d1fcbc80b72f41df5fea26617f4889c3d32787e8df06cad6948ade3c1a3ddedf1811f2708e3a2c36cf4c8b42611a8cc27481e40ffd WHIRLPOOL 94c4cbd0a2d7ded06a2c7f430de2f60138c88f86dbafc69fe4c8d154652d9fb704a3499b377c8df23febf9791988eacb6d1bbb3913de230f794af34826c4577c
-DIST enable-4.1.0.tar.gz 2472676 SHA256 b0de7a3eda78c5c527d58a98627c8cabadc71c7f1ee4e360fa3a6d8b087da264 SHA512 b21b267f207ab8770e96044f10610c1557b3ce7a4e8b688889684a371dd98ac70a03177e53bebbfad1da5f6416f3c08b33d96c49494fc625a48c9d2080076582 WHIRLPOOL 9af634d0534b3e2a659f74c4f62a0d65a972b7ee773d38d9cb3c0d31deb31a579d3367a64c767b001630dc04d565302afe3395c5b019434235aba98a2b330881
-DIST enable-4.2.0.tar.gz 2477946 SHA256 48c510bb833cbc9142babcb1914feac2cf64d5133a8ba7cdcdf0d1d782fafbd7 SHA512 10e401dbd96dbceee9ff3c83a3186845255d319d1750d310fb1601499603bb2fed460834ad10877e7bc343e60ddb08419d9192d0b9a9734ac4a3dc01332c78d1 WHIRLPOOL 8865dfd84b7237fb6df9664b6e5167de47fd915bbf58a8c8f352469d6055aa2fc43f7bee4f05392baab6ecf58900d311d2f5ae29418f6b186d35d10d49b4a872
-EBUILD enable-3.4.0.ebuild 2137 SHA256 5eaa55be2676816c66c9616688dc74aa482310411dd1b393724c9557cabbe9dc SHA512 7fb29dcfd789e81c446b26181918091b8e66884af2dd3d01a0c2ffc16b91c5dbfc9f18d9a5b2b74c0bf28dbfc5219c2e6173e80e5e8a8c84d96af6adb602c10f WHIRLPOOL 5c137833357c17881ffdb61e6bc9961f19a7cf601af002f0a2401b59e9daa7777e158d942a20f8941175f1a3c0b1947278f20c0e19fc9673bf1999c24ff2cb39
-EBUILD enable-3.4.1.ebuild 2004 SHA256 c1eacc5b76d1b2cdcf2155a359869e83ea48c035b878a31926c01a5f4434a23c SHA512 6d29e47f7515950af1eea7ef757918b1a6bed55f5753a161f04de4c786297a8d0257b970b8e78f2c4e881fbd00b2635199d5f82184c2ae4cec1b8b1bd771132a WHIRLPOOL c2924aaad4b8860827e776b6774e3d4c707c13844146891275cee4465da05e5b4b6c40247d4a5984cb6fbf0e8a47486f1fffbf98db8ba73d17dac3763599cb9f
-EBUILD enable-4.0.0.ebuild 1670 SHA256 e624954a26eb7b780b8768d05a492c6a3b06d9618b5a81fd21527f3ca248c3ae SHA512 e1f55e4bc998f9c394e6b6f61722dd962df10c1e7897196c3022a3db3f287d3ecfd60ad12530f12ab2fe295aa5bc9d7096588fe8e8065c840695eaecefbc2107 WHIRLPOOL cc9dcaf00faed60844600c0a9e3ed577de3ca7cc4da2ea89fa813bf9ec554af5deeb14998394566e9a9aaffb92e176e42d860eff42a05dcaf0af85c87870d024
-EBUILD enable-4.1.0.ebuild 1831 SHA256 6cea7cd914aed858f93858342079b830e9ea8a35670e6a938f051697c7539688 SHA512 c1ab3f7badc58911fc8fc599160d0c29b73b0bfde8fb31e49ebf607adeda4ca5a31f374537dd76279e87834c0e846f2848dc790c54393884cda7622b8fd7041b WHIRLPOOL 6ef132c4a89e985213975f33ee38c7ccf5b9ecdd5b59b891bd367aba6309e5e8f409402aa50f39711d4087bb53cf8dd4fe2211120c961ff4c3f604d8396e04bf
-EBUILD enable-4.2.0-r1.ebuild 1775 SHA256 97027b07b7a42dd17833451dc9c1b89b98d7821c51e4da885004d2a486e033a9 SHA512 4b1d633b5bf1fc7a4e954cc82f8ce21b980bc5656caa4629fc179db0792a436c776763d4edb481f0a798d89bfc1bc292fc8b3eeec8c10f29bf84e8b71a9de7d3 WHIRLPOOL ef026270b4c2ed9b5f954ecf30be1934f013d872bbeee4426a71fbb0a4a8dff23208e68310a1d108aed8b5fa66f92daf42ca880c9a51fa19f423d8671e57c76c
-EBUILD enable-4.2.0.ebuild 1865 SHA256 44d4e64de7d1747da562ce1f8864364c310dbe39c4dbd057012e9b85a9ff4a54 SHA512 09a66ea9aade8cfe89c16166375dc06165ee53025d9ace4898e8deac27f1ca11d436d658726f98302ef2038e6bd81f4950b431b8f46545fbecb50b6c3c0da0f5 WHIRLPOOL 6a425d8daa2b4a2210c5d32ffc42dc80393ced9801d08f61798df829a3809e0017516c3e04adc76826e7fb201a2d84fafae1988b8d9ea21971efa79b3c73294d
-MISC ChangeLog 3443 SHA256 76c4461ecc4e47d34a1ef34e13dc0bfd58e51e78834bee2517247fc0beab83da SHA512 569e26d1173f728270db1cf8e7adb12d8f9e018c6ca0da09b474626c721747a7eba9a9e24b13f98ade0c5df4c291ffa7de6beaa199a5ee7919ed7d5a31d6fbb7 WHIRLPOOL 4a7f875dd8746029479251b6882358875a306c0deef39fff4ae1334358ebb1338be5712a30307ad5141bbf77437029f773b8a19e34b4f396357e66cc74a30a1b
+DIST enable-4.3.0.tar.gz 2497925 SHA256 4496703f99fdc935e451b05bd2057685349635e6002e66b5c6398f40c40d764c SHA512 fa50d87a65a20d175a32d4c443ced328a7a17350190e1cfa662f56f754297d1a1c5fcd4b056001b7d4fd5c6a39e36c72625bd34a97924baef96991b5f230a384 WHIRLPOOL 1482fa3c2e47114ab0b1c3be6cadf06b4e98901318f2b38025cc926c5f532e76c238dd489dde45c49251bfa20356388ac45ccc781407c1bd169cd35421aab58a
+EBUILD enable-4.3.0.ebuild 1704 SHA256 f7bca51ce02476059c59f8b72b5c2fe9f4b3bc663f7cdbfefd59866c04510ea3 SHA512 2b1f573918376919edf92bea8450f4b7610ab07fae29f7464aea71e7f854fe7d63ec9a8d09722a70b1005399ee577edb8861a99bcf2f1144dc2df15b92fe00ff WHIRLPOOL 97e872dd0e6ee070e06e53bab7ef49d49938dbf4ecd9619d01d9cffc47f4696ce9ee20d1dfe37a2afac229991182d5683b3115f26da81b9a1ebfc1c61fda6111
+MISC ChangeLog 3790 SHA256 fe1c9d9c4e710780320baca2968a27486d6009766b0fde652e36ddb1b1af2d00 SHA512 c868a474bf5aca929137f13480f0c981f8b500e9660f56c8dee16237af2531dbf4ec06f86a1eee27d1db6b91cce388cc1608f958637b03ef50d2918f6be162a4 WHIRLPOOL 6981aef6504f1f68dbf1ebd38b341ae1f49307ff8c563f38f2708b0544f9a2072fee68e343363e5ff98e37f4c5d5e2e77db2d3f8387161878b44e63a89454177
 MISC metadata.xml 498 SHA256 76e81e5d17bf2f1a443e9e5adca8fd6c8328170195bd7eed99b29541833113fb SHA512 5a8c3e5259f06e8df641fea1634efdb3a69c6405a4b9c208a0f9c1d13adc93041ad2cc47ce5e6dd623e7ad27fc531a574f11393a07bd073f710fa7a5006e1572 WHIRLPOOL f836670ac9e15fd7121b2fb4e536f0450f3feeb22b95b3080e70d69012a7b7fe2e866a77e699b18c76d7f295d586f6b46010907632ac7e6221b26fd1f9a3569b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFsVa0ACgkQso7CE7gHKw2I9ACglYcFgGpG/w1zMVNSZCAPEGje
-FhwAnRXh+b3aA3bk9GFq5ycCD9uLmZ/M
-=eRqV
+iEYEAREIAAYFAlGSQtIACgkQso7CE7gHKw2gugCfWmoEJBGGXH9GUlCJ+rGDmc/C
+7IkAnRrPIVq7Bks5vi0tZjSRg9mvmpPt
+=oPli
 -----END PGP SIGNATURE-----
diff --git a/dev-python/enable/enable-3.4.0.ebuild b/dev-python/enable/enable-3.4.0.ebuild
deleted file mode 100644
index fa51659f7e2c..000000000000
--- a/dev-python/enable/enable-3.4.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-3.4.0.ebuild,v 1.4 2012/02/24 09:37:06 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils eutils virtualx
-
-MY_PN="Enable"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
-HOMEPAGE="http://code.enthought.com/projects/enable/ http://pypi.python.org/pypi/Enable"
-SRC_URI="http://www.enthought.com/repo/ETS/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND=">=dev-python/enthoughtbase-3.1.0
-	dev-python/numpy
-	dev-python/reportlab
-	dev-python/setuptools
-	>=dev-python/traitsgui-3.6.0[wxwidgets]
-	>=media-libs/freetype-2
-	virtual/opengl
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	dev-python/cython
-	doc? ( dev-python/sphinx )
-	test? (
-		dev-python/coverage
-		dev-python/nose
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-		x11-apps/xhost
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="docs/*.txt"
-PYTHON_MODNAME="enthought"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# "${S}/enthought/enable2/tests" does not exist.
-	sed -e "s:,enthought/enable2/tests::" -i setup.cfg || die "sed setup.cfg failed"
-
-	epatch "${FILESDIR}/${PN}-3.3.0-nofreetype.patch"
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		emake html || die "Generation of documentation failed"
-		popd > /dev/null
-	fi
-}
-
-src_test() {
-	VIRTUALX_COMMAND="distutils_src_test" virtualmake
-}
-
-src_install() {
-	find -name "*LICENSE.txt" -delete
-	distutils_src_install
-
-	if use doc; then
-		pushd docs/build/html > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _static || die "Installation of documentation failed"
-		popd > /dev/null
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* || die "Installation of examples failed"
-	fi
-}
diff --git a/dev-python/enable/enable-3.4.1.ebuild b/dev-python/enable/enable-3.4.1.ebuild
deleted file mode 100644
index 03e8d993b898..000000000000
--- a/dev-python/enable/enable-3.4.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-3.4.1.ebuild,v 1.2 2012/02/24 09:37:06 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils eutils virtualx
-
-MY_PN="Enable"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
-HOMEPAGE="http://code.enthought.com/projects/enable/ http://pypi.python.org/pypi/Enable"
-SRC_URI="http://www.enthought.com/repo/ETS/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND=">=dev-python/enthoughtbase-3.1.0
-	dev-python/numpy
-	dev-python/reportlab
-	dev-python/setuptools
-	>=dev-python/traitsgui-3.6.0[wxwidgets]
-	>=media-libs/freetype-2
-	virtual/opengl
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	dev-python/cython
-	doc? ( dev-python/sphinx )
-	test? (
-		dev-python/coverage
-		dev-python/nose
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-		x11-apps/xhost
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="docs/*.txt"
-PYTHON_MODNAME="enthought"
-
-src_prepare() {
-	distutils_src_prepare
-
-	epatch "${FILESDIR}/${PN}-3.3.0-nofreetype.patch"
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		emake html || die "Generation of documentation failed"
-		popd > /dev/null
-	fi
-}
-
-src_test() {
-	VIRTUALX_COMMAND="distutils_src_test" virtualmake
-}
-
-src_install() {
-	find -name "*LICENSE.txt" -delete
-	distutils_src_install
-
-	if use doc; then
-		pushd docs/build/html > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _static || die "Installation of documentation failed"
-		popd > /dev/null
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* || die "Installation of examples failed"
-	fi
-}
diff --git a/dev-python/enable/enable-4.0.0.ebuild b/dev-python/enable/enable-4.0.0.ebuild
deleted file mode 100644
index 3d934676c732..000000000000
--- a/dev-python/enable/enable-4.0.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.0.0.ebuild,v 1.4 2012/02/24 09:37:06 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils virtualx
-
-DESCRIPTION="Enthought Tool Suite: drawing and interaction packages"
-HOMEPAGE="http://code.enthought.com/projects/enable/ http://pypi.python.org/pypi/enable"
-SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND="dev-python/numpy
-	dev-python/reportlab
-	>=dev-python/traitsui-4.0
-	>=media-libs/freetype-2
-	virtual/opengl
-	x11-libs/libX11"
-DEPEND="dev-python/setuptools
-	dev-lang/swig
-	dev-python/cython
-	doc? ( dev-python/sphinx )
-	test? (
-		${RDEPEND}
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-	)"
-
-DOCS="docs/*.txt"
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		emake html || die "Generation of documentation failed"
-		popd > /dev/null
-	fi
-}
-
-src_test() {
-	VIRTUALX_COMMAND="distutils_src_test" virtualmake
-}
-
-src_install() {
-	find -name "*LICENSE*.txt" -delete
-	distutils_src_install
-
-	if use doc; then
-		pushd docs/build/html > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _static || die "Installation of documentation failed"
-		popd > /dev/null
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* || die "Installation of examples failed"
-	fi
-}
diff --git a/dev-python/enable/enable-4.1.0.ebuild b/dev-python/enable/enable-4.1.0.ebuild
deleted file mode 100644
index 5e7be4697777..000000000000
--- a/dev-python/enable/enable-4.1.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.1.0.ebuild,v 1.5 2012/11/29 16:30:12 mr_bones_ Exp $
-
-EAPI=4
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-PYTHON_TESTS_RESTRICTED_ABIS="2.6"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils virtualx
-
-DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
-HOMEPAGE="http://code.enthought.com/projects/enable/ http://pypi.python.org/pypi/enable"
-SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz
-	http://dev.gentoo.org/~idella4/${PN}-4-TestsPaths.patch"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND="dev-python/numpy
-	dev-python/reportlab
-	>=dev-python/traitsui-4
-	>=media-libs/freetype-2
-	virtual/opengl
-	x11-libs/libX11"
-DEPEND="dev-python/setuptools
-	dev-lang/swig
-	dev-python/cython
-	doc? ( dev-python/sphinx )
-	test? (
-		${RDEPEND}
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-	)"
-
-DOCS="docs/*.txt"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# Remove check for Darwin systems, set py.test style xfails,
-	# Re-set import paths in tests, 'enabling' enable to find its own in source modules!!?!
-	epatch "${DISTDIR}"/${PN}-4-TestsPaths.patch \
-		"${FILESDIR}"/${PN}-4-rogue-tests.patch
-}
-
-src_compile() {
-	distutils_src_compile
-	use doc && emake -C docs html
-}
-
-src_test() {
-	# Hardcoding build-2.7, 2.7 being the only fully capable candidate
-	VIRTUALX_COMMAND="python_execute_nosetests -P $(ls -d build-2.7/lib.linux-*/):." virtualmake
-}
-
-src_install() {
-	find -name "*LICENSE*.txt" -delete
-	distutils_src_install
-
-	use doc && dohtml -r docs/build/html/*
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/enable/enable-4.2.0.ebuild b/dev-python/enable/enable-4.2.0.ebuild
deleted file mode 100644
index b46cc0a09e21..000000000000
--- a/dev-python/enable/enable-4.2.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.2.0.ebuild,v 1.5 2013/04/03 08:59:47 patrick Exp $
-
-EAPI=4
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-PYTHON_TESTS_RESTRICTED_ABIS="2.6"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils virtualx
-
-DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
-HOMEPAGE="http://code.enthought.com/projects/enable/ http://pypi.python.org/pypi/enable"
-SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz
-	http://dev.gentoo.org/~idella4/${PN}-4-TestsPaths.patch"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="dev-python/numpy
-	dev-python/reportlab
-	>=dev-python/traitsui-4
-	>=media-libs/freetype-2
-	virtual/opengl
-	virtual/glu
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	dev-lang/swig
-	dev-python/cython
-	doc? ( dev-python/sphinx )
-	test? (
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-	)"
-
-DOCS="docs/*.txt"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# Remove check for Darwin systems, set py.test style xfails,
-	# Re-set import paths in tests, 'enabling' enable to find its own in source modules!!?!
-	epatch "${DISTDIR}"/${PN}-4-TestsPaths.patch \
-		"${FILESDIR}"/${PN}-4-rogue-tests.patch
-}
-
-src_compile() {
-	distutils_src_compile
-	use doc && emake -C docs html
-}
-
-src_test() {
-	# Hardcoding build-2.7, 2.7 being the only fully capable candidate
-	VIRTUALX_COMMAND="python_execute_nosetests -P $(ls -d build-2.7/lib.linux-*/):." virtualmake
-}
-
-src_install() {
-	find -name "*LICENSE*.txt" -delete
-	distutils_src_install
-
-	use doc && dohtml -r docs/build/html/*
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/enable/enable-4.2.0-r1.ebuild b/dev-python/enable/enable-4.3.0.ebuild
index 22c7c2337edc..8e2e1003cbdf 100644
--- a/dev-python/enable/enable-4.2.0-r1.ebuild
+++ b/dev-python/enable/enable-4.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.2.0-r1.ebuild,v 1.2 2013/04/15 19:31:48 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.3.0.ebuild,v 1.1 2013/05/14 13:57:21 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -51,13 +51,8 @@ python_test() {
 }
 
 python_install_all() {
-	find -name "*LICENSE*.txt" -delete
-	distutils-r1_python_install_all
-
 	use doc && dohtml -r docs/build/html/*
 
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
 }
diff --git a/dev-python/enable/files/enable-4-rogue-tests.patch b/dev-python/enable/files/enable-4-rogue-tests.patch
index 02e5474972df..f08f7b00ce36 100644
--- a/dev-python/enable/files/enable-4-rogue-tests.patch
+++ b/dev-python/enable/files/enable-4-rogue-tests.patch
@@ -1,53 +1,47 @@
-tests skipped that; access the network, are expected fails, target Darwin system. 
-diff -ur enable-4.2.0.orig/enable/savage/svg/tests/test_document.py enable-4.2.0/enable/savage/svg/tests/test_document.py
---- enable/savage/svg/tests/test_document.py	2011-12-22 07:11:25.000000000 +0800
-+++ enable/savage/svg/tests/test_document.py	2012-11-29 10:01:51.449181783 +0800
-@@ -61,6 +61,8 @@
-             self.document.getBrushFromState().color[-1],
+diff -ur enable-4.3.0.orig/enable/savage/svg/tests/test_document.py enable-4.3.0/enable/savage/svg/tests/test_document.py
+--- enable/savage/svg/tests/test_document.py	2013-03-28 21:58:28.000000000 +0800
++++ enable/savage/svg/tests/test_document.py	2013-05-14 21:23:18.641569707 +0800
+@@ -63,6 +63,7 @@
              0
          )
-+
+ 
 +    @unittest.skip("This tests accesses the internet")
      def testURLFallback(self):
          self.document.state["fill"] = "url(http://google.com) red"
          self.assertEqual(
-@@ -73,6 +75,7 @@
-     def testDefault(self):
-         got = document.valueToPixels("12")
-         self.assertEqual(got, 12)
-+    @unittest.expectedFailure
-     def testPointConversion(self):
-         got = document.valueToPixels('14pt')
-         self.assertEqual(got, 22)
-diff -ur enable-4.2.0.orig/enable/tests/kiva_graphics_context_test_case.py enable-4.2.0/enable/tests/kiva_graphics_context_test_case.py
---- enable/tests/kiva_graphics_context_test_case.py	2011-12-22 07:11:25.000000000 +0800
-+++ enable/tests/kiva_graphics_context_test_case.py	2012-11-29 13:22:15.262079475 +0800
-@@ -7,7 +7,7 @@
+diff -ur enable-4.3.0.orig/enable/tests/kiva_graphics_context_test_case.py enable-4.3.0/enable/tests/kiva_graphics_context_test_case.py
+--- enable/tests/kiva_graphics_context_test_case.py	2013-03-28 21:58:28.000000000 +0800
++++ enable/tests/kiva_graphics_context_test_case.py	2013-05-14 21:24:53.897573114 +0800
+@@ -1,4 +1,3 @@
+-
+ import numpy as np
+ import unittest
  
+@@ -8,6 +7,7 @@
  class TestGCErrors(unittest.TestCase):
      """Test some cases where a ValueError should be raised."""
--
-+    @unittest.expectedFailure	
+ 
++    @unittest.expectedFailure
      def test_bad_image_size(self):
          arr = np.array([[1, 2], [3, 4]], dtype=np.uint8)
          gc = GraphicsContext((50, 50))
-diff -ur enable-4.2.0.orig/kiva/quartz/__init__.py enable-4.2.0/kiva/quartz/__init__.py
---- kiva/quartz/__init__.py	2011-12-22 07:11:26.000000000 +0800
-+++ kiva/quartz/__init__.py	2012-11-29 15:23:35.641412031 +0800
-@@ -2,10 +2,10 @@
+diff -ur enable-4.3.0.orig/kiva/quartz/__init__.py enable-4.3.0/kiva/quartz/__init__.py
+--- kiva/quartz/__init__.py	2013-03-28 21:58:28.000000000 +0800
++++ kiva/quartz/__init__.py	2013-05-14 21:32:10.473588730 +0800
+@@ -2,16 +2,3 @@
  # :Copyright: 2004, Enthought, Inc.
  # :License:   BSD Style
  
--from macport import get_macport as _get_macport
-+#from macport import get_macport as _get_macport
- 
+-from mac_context import get_mac_context
+-
+-
 -def get_macport(dc):
 -    """
--    Returns the m_macPort of a wxDC (or child class) instance.
+-    Returns the Port or the CGContext of a wxDC (or child class) instance.
 -    """
--    return _get_macport(str(dc.this))
-+#def get_macport(dc):
-+    #"""
-+    #Returns the m_macPort of a wxDC (or child class) instance.
-+    #"""
-+    #return _get_macport(str(dc.this))
+-    if 'GetCGContext' in dir(dc):
+-        ptr = dc.GetCGContext()
+-        return int(ptr)
+-    else:
+-        from macport import get_macport as _get_macport
+-        return _get_macport(str(dc.this))