add a 12.3.0 version compatible with python-r1

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

3 files changed, 131 insertions, 2 deletions

diff --git a/dev-python/twisted-core/ChangeLog b/dev-python/twisted-core/ChangeLog
index 03f95a4aee62..f2b5a31edfa2 100644
--- a/dev-python/twisted-core/ChangeLog
+++ b/dev-python/twisted-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/twisted-core
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-core/ChangeLog,v 1.18 2014/01/21 04:50:48 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-core/ChangeLog,v 1.19 2014/02/19 13:44:22 ultrabug Exp $
+
+*twisted-core-12.3.0-r1 (19 Feb 2014)
+
+  19 Feb 2014; Ultrabug <ultrabug@gentoo.org> +twisted-core-12.3.0-r1.ebuild:
+  add a 12.3.0 version compatible with python-r1 wrt dev-python/carbon
+  requirements
 
   21 Jan 2014; Patrick Lauer <patrick@gentoo.org> -twisted-core-10.2.0.ebuild,
   -twisted-core-11.0.0.ebuild, -twisted-core-11.1.0.ebuild,
diff --git a/dev-python/twisted-core/Manifest b/dev-python/twisted-core/Manifest
index 9f3379ad882a..06c1d57836f2 100644
--- a/dev-python/twisted-core/Manifest
+++ b/dev-python/twisted-core/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX twistd.conf 277 SHA256 aa2ffa5b128973bc0c58a1251b8bbb56f6f890728bc902805ea2db7606416119 SHA512 76d44caebab8404f16937c2515ad9ae8236732a48c7127366f7fa22c6ed3d88ace2d33b832a6d95f775973d41b7caf75344805fe5b01e964c04eb710bf3c89fb WHIRLPOOL 89223406ed730b82c5bf7b8d62bd0f12dbe1a1ab0ac69943fb0192970ea98870d369397a0dccbf0952d9e44abfaf2e897063c6e398efc6b4a7050fbf01593289
 AUX twistd.init 562 SHA256 043e426b3ba25b0d1cfb4a04122f8e17b0890fed2b1adde79f35d4d31be87d09 SHA512 8e348df0e925b3566e364b566b2b8eef03273fe0914d11a29e464e28b13fef58cc3e7ce765f3135b393cd2eab36e9cd2277f57ddd04699e216222b093cc38011 WHIRLPOOL 0479a0346130c0a65497e47b395fb42a426c20cb0da488354f7caf00519cc21b4d4f689b4884b4f0901d13f8718bd3cfddc0b21400d4de10481e44990bd13953
 AUX twisted-core-12.0.0-fix-test-timeFormatting.patch 850 SHA256 90ff427a74a6b88fcd617795ef21ecc6732e1a3e245a70e13d8993f333e11664 SHA512 3fa895bd3bce5585834880b9d961b2e9d00538756bde37eb7d62459e75287372af6fecb3e60f6dcab3683893403b5068fd8d0d8f7126b069b1b9e9512fcad966 WHIRLPOOL ef6e388c5a124539c99b708d69cb7a32409a1b4a887f189a572c8f4f47abfbb6b83b123fe237eec5f01121542884d1b5ee14c19c08effeee5403736ecd2a6b02
@@ -8,9 +11,17 @@ AUX twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch 419
 DIST TwistedCore-12.3.0.tar.bz2 1480622 SHA256 343dd7372b05d4aa0805406bcbee7db40514b6bb48aa2840e0e56d88a8970900 SHA512 86e9bbd4b8b0b5f70b62757f9ce93fd03c2766b4cb9722028ec7863d1b9dd19e6d3771472a86f1373a8320a98f5081ac76400ac6bb25a950b6fc50fb241ebeb8 WHIRLPOOL 77cb88bd53a5c489ad8781ebef10987766dfd42d8ad3bcd599b9ba2bbc77cf41bee8507a29727cb6d88590d8cb2ac118b1eeb553c034107513502cf7ae62f6aa
 DIST TwistedCore-13.0.0.tar.bz2 1495753 SHA256 989706fd39c8a28785bdecaa0145b81f7e159b9209d463b5885be7e5c34ff32f SHA512 624d73d267742cb5b97bed2a39e78caeb01ee5fa871a0a2133455809b1d2a695f0d375c022ae21e91ef20f92fdee05a08a11db7b6b1e92ec810d3e097f929972 WHIRLPOOL 02c25eb94ad0aaafea8e1599df387607c6a1323ac55c31b0e98a366f927da2245fc839f5a3509367ed18690694f8599ebb22c0b21b8c90dfbfe2e3727a7846ff
 DIST TwistedCore-13.2.0.tar.bz2 1496299 SHA256 396ee27f0e824772bf26c636c69c2751127738127e283112e72c2de6c28e36be SHA512 90cf2019f0d5b125c7bbb5a9e3e7d2dedcd8efd5f9b2ab057e0b41f899d394b995fe599128223c82b1a634fb881ad7ae8ddc5b86b26adb28a3834c05da45f2c6 WHIRLPOOL 21a90a98b36775db4e6154c30ea697ef53f4b94a30e1be125e420019d5200cbbf31178937c41b12ffb841b028875dbc6b1234cebf8036f4165d2908c431a6de4
+EBUILD twisted-core-12.3.0-r1.ebuild 3514 SHA256 69d95cdf6434819babd1c5d611820131beb823d2fc04078692a29f5f856170bc SHA512 b88f6282e11587f66f9af582242371ba961e38cd06e6a20ceb6659497a52b17610efb44550a7cc2ae79b9d5a8692b390bbafd20d72e883d3a929dbcd839d2de7 WHIRLPOOL 7368d38449cdeac78b177e6a74008f577683f8dc652a6196424c7cddf51a2db9adb591ca83514fbbe2836ca7e83834e5f46dffbee7da70d0d54ffdc8474542b3
 EBUILD twisted-core-12.3.0.ebuild 4053 SHA256 1c301699804e7adfe22714a0531e0827a4dd30af3167bcfcce13683b60cb3f49 SHA512 63bcb8d39f79ebe8681c5523f046c1bb791ef651a057446f65f3d8f1249814a1634d07b0e055e805e0d8cee2f24fb0ee3a28df83eed025aa77103c3a059535cc WHIRLPOOL 6461c2350bf5cfe54567df082354dc0323147082b77fc049ac32ed834fcf89824972f926493d425ca3e5a3c7da38c2e02d10b0b53bca8dbbeb5f969966eae78a
 EBUILD twisted-core-13.0.0-r3.ebuild 3371 SHA256 d12110e492b0b1a1edd3697c5c8eac8b3da4256a4eab064ef25d4a8a4b262214 SHA512 04a9923fc4aee63fd7b4ec147b7fa0933e7b3b9668c01abfab539b3ebbfd60ad02fc05ccdd39335cb7896573fa929bd655f8919df5763102c284be5bee37455b WHIRLPOOL 3371cc21d61770002a10eeae1444bbdbbe97d10850d0307a2d5c00297f5c27a03b7088ebe5b3d183c0dda9eff49908d7a13ec618e1a3fff0df141d3f5649b5d9
 EBUILD twisted-core-13.0.0.ebuild 4064 SHA256 ca54cd79eeacf2a7c7c4eb1452d95211923c5e61f36423a7d391cee922e0d399 SHA512 922af44bd9195e3b81d830b64d746b61800b39d0215a2f59f097c16f22838fb2ff9dbbccea229dd2188673989e07d606b6671efd837b88700a427ad8d6f68d19 WHIRLPOOL bbad029afa37665e519b293120ed6d2899dfcb6df49b67e2437bf907554abb6d36e3b6722e87e50ac0c8212e5e81dd50e36051f844829f6657159b6dc07c8b08
 EBUILD twisted-core-13.2.0.ebuild 3698 SHA256 4efc2fb7e66e669d08dcdf799c11008eacb463475270636ed93ab38fccbaf580 SHA512 60f9373e83225a32b5762f0e02992b14dace6d91b2619a218b5907239f9a117ae517fd548397791d0ba54a11651d54aa8dc687370c54a8b492263911352adc60 WHIRLPOOL 307143e61caa8ff8622f6abb7d2b6f6f31bc596a1f4d3effcbccf0a878e838ec374329841b0255ca0612fd2de22e89f59e011faacfa65820269ba66b9fdb9421
-MISC ChangeLog 27961 SHA256 89b72519fe9ae1b0a98a7d8c48be6e202c5bea02b519baa8de45161525b617a2 SHA512 3e3b70992721e6582ea9f63ecbcb8a9624bb73f08f2c3b065708caaeeead39cf4e8f58457f03cc997b3f4a5a0d2d39a23910f470ffd093f7b548dfa9e8fc4046 WHIRLPOOL 035f3074deeda983fe769424564a18e57ae66d2a21b7e1cbd98d736f0952c11b1dc43eef512d6024335aab312a055cb64a9cc9a028ca7ef61973e7aa95a657fd
+MISC ChangeLog 28166 SHA256 a8fdfb93b5ca421413eda4bb68057742e2df5d3fce8712b0bfaf0e852912a8df SHA512 5c613cbd0ac7fe8e0e429378ccb6ca1a3f6731ee40983b72a6482b4783a3aecd86e21863c88e1cf900ac3339dd168b07d1beba5642330d9b6590ed59f0ac8785 WHIRLPOOL 76ad9332108a7aa4ab5d5ab1b5eb724a51b2f4b7bd4dbfd545cadeedd14c65da656623fc865917e9896eb31c00fd996e5578665e653384888d78ba2e3a0354c9
 MISC metadata.xml 516 SHA256 702ffca7fc318ecb382067e3bccf620bebd7da614430ea82de24445b9f75524c SHA512 7ade57c91b31b32af447632af4d7d8dfb33ebb21cc507b4dad0e3d51c31a45933d33418326ed65584dfcebced63ba4a365bccd84876321ce78a1b62493ae9e01 WHIRLPOOL 1bfd6c2e9e9bcf8f927dc29a720a0d7d2fe8dfe5b475a57da87cff21f8a5aa51c730941898f3348e85f763504ffd999b1e94413921d39f0d5161e3c23ad43507
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlMEtT0ACgkQKiQSS7ZY+hPvNgEAx2V6+GZAUKxIlOjK3pIvB5n/
+RkaIKWU2o2Sy/0Vcj5oA/3ywJPi/F57aFiBU4FAcTFXRlljHCecfU5Qrbi5gj5n7
+=UTy6
+-----END PGP SIGNATURE-----
diff --git a/dev-python/twisted-core/twisted-core-12.3.0-r1.ebuild b/dev-python/twisted-core/twisted-core-12.3.0-r1.ebuild
new file mode 100644
index 000000000000..823c7ba5c9dd
--- /dev/null
+++ b/dev-python/twisted-core/twisted-core-12.3.0-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-core/twisted-core-12.3.0-r1.ebuild,v 1.1 2014/02/19 13:44:23 ultrabug Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils flag-o-matic twisted-r1
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt gtk serial"
+
+DEPEND="net-zope/zope-interface[${PYTHON_USEDEP}]
+	crypt? ( >=dev-python/pyopenssl-0.10[${PYTHON_USEDEP}] )
+	gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# Give a load-sensitive test a better chance of succeeding.
+	"${FILESDIR}/${PN}-2.1.0-echo-less.patch"
+
+	# Skip a test if twisted conch is not available
+	# (see Twisted ticket #5703)
+	"${FILESDIR}/${PN}-12.1.0-remove-tests-conch-dependency.patch"
+
+	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
+	"${FILESDIR}/${PN}-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
+)
+
+# Needed to make the sendmsg extension work
+# (see http://twistedmatrix.com/trac/ticket/5701 )
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+python_prepare_all() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed \
+			-e "s/test_newPluginsOnReadOnlyPath/_&/" \
+			-e "s/test_deployedMode/_&/" \
+			-i twisted/test/test_plugin.py
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local CFLAGS CXXFLAGS
+
+	if [[ ${EPYTHON} != python3* ]]; then
+		# Needed to make the sendmsg extension work
+		# (see http://twistedmatrix.com/trac/ticket/5701 )
+
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# NOTE: on pypy a couple of failures (refcounting, version-checking) is
+	# expected
+
+	distutils_install_for_testing
+
+	pushd "${TEST_DIR}"/lib > /dev/null || die
+
+	# Skip broken tests.
+	sed -e "s/test_buildAllTarballs/_&/" -i twisted/python/test/test_release.py || die "sed failed"
+
+	# http://twistedmatrix.com/trac/ticket/5375
+	sed -e "/class ZshIntegrationTestCase/,/^$/d" -i twisted/scripts/test/test_scripts.py || die "sed failed"
+
+	# tap2rpm is already skipped if rpm is not installed, but fails for me on a Gentoo box with it present.
+	# I currently lack the cycles to track this failure down.
+	rm twisted/scripts/test/test_tap2rpm.py
+
+	# Prevent it from pulling in plugins from already installed twisted packages.
+	rm -f twisted/plugins/__init__.py
+
+	# An empty file doesn't work because the tests check for doc strings in all packages.
+	echo "'''plugins stub'''" > twisted/plugins/__init__.py || die
+
+	if ! "${TEST_DIR}"/scripts/trial twisted; then
+		die "Tests failed with ${EPYTHON}"
+	fi
+
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	cd "${D%/}$(python_get_sitedir)" || die
+
+	# create 'Twisted' egg wrt bug #299736
+	local egg=( Twisted_Core*.egg-info )
+	[[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found"
+	ln -s "${egg[0]}" "${egg[0]/_Core/}" || die
+
+	# own the dropin.cache so we don't leave orphans
+	touch twisted/plugins/dropin.cache || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}