Version bump

Package-Manager: portage-2.2.10/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x65E309F2189DB0B8

5 files changed, 22 insertions, 221 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index 16e97e296784..dc2c1def739c 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/catalyst
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.273 2014/03/02 15:54:54 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.274 2014/05/18 22:49:31 dolsen Exp $
+
+*catalyst-2.0.17 (18 May 2014)
+
+  18 May 2014; Brian Dolbec <dolsen@gentoo.org> -catalyst-2.0.12.2.ebuild,
+  -catalyst-2.0.14.ebuild, -catalyst-2.0.15.ebuild, +catalyst-2.0.17.ebuild:
+  Version bump, remove old versions.
 
   02 Mar 2014; Brian Dolbec <dolsen@gentoo.org> catalyst-9999.ebuild:
   Swap out the ebuild for the new python structure.
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 6a1fe937043a..f896d63b650e 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,29 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST catalyst-2.0.12.2.tar.bz2 907893 SHA256 411d531b6de8c8c1bc9fa9502af3a4882e94e9db8b911bb48e4a0fcfc1efe7e8 SHA512 12349f6249363a94a72a71d05b2fe6ee13593b5ea67e1cb9a054c5ece896ff68f89d1af6341b98238ba6a6510e2737f81dcc2606649c10681235315663ab04ae WHIRLPOOL 1769a78f615c8e0eec2167dd9d6ab873e24801ecb5e4634037898933c6f5a1dbb189d967a628be6f8811f6769eadc91c5003ddbb6bd58eb05efbbd5110f740c7
-DIST catalyst-2.0.14.tar.bz2 873415 SHA256 5a2f506026bde6df5d7ad5d94c3dbea0c151422b2201c347eafbaee135915586 SHA512 75e09be72e124ed4af1489af0688ed3858b36d25d76f331d8bfd1d45256fe068b9eb21c783541863f41786d9c91565695387582fc759bea5ef046ad2fa51eb1a WHIRLPOOL fd8c4660ccf11d6a6d89ebbdf20f69467e32984cd5a721c6d34ad3a0a94bb149e020ceefb7a21863aa30ebbdc27e3b5875b3d22fcb2381f6834ac56112335001
-DIST catalyst-2.0.15.tar.bz2 873335 SHA256 80fc39e6f6b7c32fb84f51333d8bf62a56a1ee068eb83cf2b03cb21c1f163e51 SHA512 9e61ba61eaa806424041f7edd1680b55dfd69bdea5b292aff305b4b3ef03349d82a47d8ab876baf7bf888e03810d79c6a00d74dc748082a1ed180ec1ed7043bd WHIRLPOOL 03c0f1137f59c57d106df4210104000c498a4c7ff2ae5bcc6e6c7a23d3d0c4c35ed125c036a0468859706da82af799641c1abe1b18c716c230c6ab657b4b765c
 DIST catalyst-2.0.16.tar.bz2 878929 SHA256 4578cbbc36a5d913b51967faad6feb9b8bb10a04794fe44e73b71790fa389142 SHA512 460ee4c996a7197f2d3e2504ef5ff205c74c0e7ca763a67dc57932a8df6199334fef3b234d90da1717d3f59b36081a29c768a864efa82129cd4f6e2de34ac3a8 WHIRLPOOL e43861bcb7286f85e8d0857d32f4e0ba9f39eea5bae2eac05e0b9e782ee2edad2a8171e1a0ea451c7ee67b21f2210f8ff3f2a9e37c16d16552c6c46e74637233
-EBUILD catalyst-2.0.12.2.ebuild 3449 SHA256 e9c3a11d17bad9e1b9b7d244b3699beceae4169107de116645d34a4019d4f88d SHA512 acc929ad5387603a4b5dfcd36ca8067f03ca4d4a39fc46b9c81dfbbed87b976e51a87d8f9878a8b565826c5dffa0bd8fd1c43de1794e3499ebb340e8d5342b32 WHIRLPOOL 74a58e6ac84df1f9a9b4de2116fd1f7b1b05478b3bed5be14995a5e6a12a787aca9dac07efa9e7ef8f242bd897da68c68400a871a34645f66da3226677de2090
-EBUILD catalyst-2.0.14.ebuild 3229 SHA256 685e5d451e463bbd99a18191ad34cc8694c51acc085d7ee56a9c299bf6723819 SHA512 5650b9bc9e7cbff3168a4305e7220f011b175ac4ea5c3306f55a4121d6d7f98e7f42286dbcb72689cf338095fc246843d7032dc8b9c952eba64a76df76722e18 WHIRLPOOL 6c2d6f5746883ab7eb8e5820bf27b07dcdf72195a39a382be5b2af9be8ebc6c2f56970f4dba5ecf2aea5b91dabc2306fa5e8d6978be5c912eb3e03fa3e97c30c
-EBUILD catalyst-2.0.15.ebuild 3092 SHA256 941fbb2cbb04fce4c45cb6ec8ce71083f75e7232abfd0a44480cc288e8f2f679 SHA512 dba00390683b5bdb896c103f9ffb4ee1b2fe1dc9ed7d442e168d08664487721edb6180fea0747bd480af20971e26e94e6c8e435ff5578bce5be0efe4df0a2445 WHIRLPOOL 2d9a15c0eac01c663ee30efd0655b3f9ee7882b6af8936cb9107d4efac006007a5135128b81a1826f0f4018a75dd174293e39058b5ae151eed9840bc8cf12fed
+DIST catalyst-2.0.17.tar.bz2 861341 SHA256 5f4142598d921e5174ff06f9571856760a324e79db5f3b63caf0d1a16adc813c SHA512 9d7b9ad383dcc5d4ba058596c0b607eb9601b28025d9300f63e68d78cbd5bca8fa3f3e03a81dc6b233021e773ba4301df0bf5cec51ca4368eb3577a68d33a92c WHIRLPOOL e97fc120141cc4f9f5c297652d8b43313780f615429c0eb3d9b85cba40aeca01dcbc6efb0f8d388cc5e7debabb2563cfc9b5a5aa00e3d00d306aed0f799fc642
 EBUILD catalyst-2.0.16.ebuild 3155 SHA256 96330cb79d0a318eb8e71c12832b71e06d8f01483fc3042da809caf16c0577f4 SHA512 b2e5438f39a7627d03d79b7062cb039a5b4cb8c9dbef9f836ca7d34e37ed530c95ba4a288e987a06141b7b61f9c928ea95fa425d2bd03a195000189a2a66d8fe WHIRLPOOL 1264383ed4eb1b31fe647c3ec4f7fed5944b76638669f1473d28d2dcfc5bf5fcf04fa032014f11fd4dd1e024c3fd7a57031ffd9f0ce01ef2865e90e96cdf3f31
+EBUILD catalyst-2.0.17.ebuild 3149 SHA256 b764e9f01aa95ed08169775ce267a4fa1edff43903f864934ed37f4685330e2d SHA512 c672617d6325a43d0a1975ee6875d6368b939ee11d374cc5355cc3a2771d6dbd523c0ac02c657161f27bc7ff95821ccbb8ab9682ce88d866458dbaff9af81fdb WHIRLPOOL 4c97e1ccf4749dc019091f477193e426ca6cc3210f6af1b62e357db1fe6b552ef27e05b180fc00058df9ff74e0776d5e82b5e97e0202192b057f996f9c1a3a41
 EBUILD catalyst-2.0.9999.ebuild 3056 SHA256 ca0a13dc03a936b54b0e6bfe64122ed653dcb1bc60976ed2612f4b6a305a91b8 SHA512 c6aa7faba3821edba40612b86ecb265339edf466798d297b251dd1af1e4b51e512c769d271fbb714c9ab72ed3dce55cda2462003b5e8ba4b26dbfda7b6cf82cf WHIRLPOOL 285670aa406f7f7f7f73cef9a7950d276429c10a6cb39796ffac369b9d68f4a53a28adf5122fc2bba56916a9b64c3ed7ce7a20994591c97afeed92dfe7dfa5de
 EBUILD catalyst-2.9999.ebuild 1632 SHA256 124adf991b51763910ee64979a9d4c17aa2a742d811648011047798f6d7b2c2b SHA512 54f2232cc559dc07edcc5fae49d27e35feba74d79b0ca88113747293654eac0714b75e8ce89fa2f35fe53638d40cc8d07b8c672dee7e829c306150c3a7f4183b WHIRLPOOL d08748d7864942924aaad5d52aad98119918d492f20716307429d72b5ddad25354ba6b43968ae7a529ff372ed443dd18eaea3b33a40dc641c2b39cf29cd8f750
 EBUILD catalyst-9999.ebuild 1611 SHA256 af96e44b2c122d4f98b268c2da788511faa8308098a7dc8a5261fc9dd3d31050 SHA512 643f4827189b3ef2f56bdfccdd6df2368e51da030e1088e481c358bb9474b4ca7101d597b5429ea998c98b3f41792809037fff82720081e5c51ba93f13581635 WHIRLPOOL a718b1c5d9ca40845e621a9583f63b1e7eda03de2f39ff513df9729bafce8bfd2a37f1aa7d9c172aff3ac4d39aca0211ff972032a7b701192cd970431a830760
-MISC ChangeLog 58661 SHA256 ffc40c121028845b1c2d3170001bb563ce0e8193543544eb5558da215aee24e1 SHA512 db5769f23a1235e34bc67cf7607a7a9bc47942e890c7fa1673d1b9e099b35e92f0c67c263f3718e9241bf3de2f160bfdbe7821ecba67064170ccf8c0c49ad41e WHIRLPOOL 383cfa3149f6c8581b3ad553e29862b8aa27a89a409800a13939093386b71832087a61154d1f86f09ebe0eef30998c72eb03c745655ea32ee4f35c614d95b76d
+MISC ChangeLog 58883 SHA256 c010affe23dab7fd35295c0ad156a5a8e97fa42b4e5bda0efda1bafbbe0dca2d SHA512 8c40e24e3fe947e8cafde15297e939b8fe7b8de386e87233c6eb2cf91fb8e12fd2b161dddbe764ed33aa04fb2690f7b768cc65e76f50726fc34f30604c41ad08 WHIRLPOOL 7fcba16fb5973622da2adc9280f3b03d7c9546f80a07d005e256d7dadcb57892a92965b015a31472f4cd7f3af77131fe148a28f709b945f38c6f9ce783a6468b
 MISC metadata.xml 302 SHA256 52c8f4e22cff9920c9a11b04ee574b28cd6fbf71a8212259d9d19122e0ddf955 SHA512 bd15682c5b17cde8b9b0ffe4559839eb2419b070659c388a21f3bba6b94d4a3861cbb76328c996c107e5fde9e4e4fd09e1f54d99e6d76df1ef25f1f52e557a2a WHIRLPOOL 5951e4d293d63763c8d1b922b6e7a88b3b8c3db0a3db5cae5bd4457920a8e14c338ff202d5d074e1893facddc8a04b83d83cefd6bd13d65029364d905f2c1450
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQF8BAEBCABmBQJTE1RLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJTeTjgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4Njg4RkQxQ0M3MUMxQzA0RUFFQTQyMzcy
-MjE0RDkwQTAxNEYxN0NCAAoJECIU2QoBTxfL15kH/34kdCxuQzms4/sS82UM7DhN
-Gc6tOi/QX3OHzJMCjaZmMrSWioUL1W6+MFhWZvx87/FBdY3S1jbGYuQVkOACA0K3
-NXieY8bN6L/QgsCvEbiVl+tF+zi7vHP7HorsjYvZI5jJqRPqu9698ZAoyhsU7HrW
-pPvGqT/q8NAaEClOudJMSZ/O2IlRk4iVAlxcq1+gTmr7lKrnttEiLt2tUfkqH5l8
-kg5P4klCTMLs0oOYUbkge2r2gDR2XtfY13ZmeBploywpLx22vdXupKA3UCDdnIkR
-Gj50aF2SUxf4V3rAqEyRbV/7attKwGcFQ8xYDj428blG9SDV/E4lHA2Tnu5s0Uo=
-=/Iub
+MjE0RDkwQTAxNEYxN0NCAAoJECIU2QoBTxfLQJEH/jJxodavWG49gkf+3mcEvRsw
+SJzn7wPobvrdP646Axc74XIVD5FUeOEmrcArKeboJNFLfN4XY6Zlq6UTI8YuoywU
+AFvjeB5XocwfBPHy469IXaxTDVmLhZUVBKofA0jzeu8lM/nYP1jOwXw6c+QSdJ7p
+LkZZbwI/sbPBfBAcupmECQaBVAcuT1JQSDf9D8f3A8FVj9i2Rc66CkSbTi5s8snh
+87o3rKLg+I9YGLm+j4P5jbovG4x0zaJK2zTR3Sa6F4kbdBGvriGF34Qqq6diAyE+
+DKroG3gRFEQJm6eTXFtsFUZPKxRVl95nrNKBeX5MIuIznfKX5jimHc7YhImv7yE=
+=VXS3
 -----END PGP SIGNATURE-----
diff --git a/dev-util/catalyst/catalyst-2.0.12.2.ebuild b/dev-util/catalyst/catalyst-2.0.12.2.ebuild
deleted file mode 100644
index a11649066a55..000000000000
--- a/dev-util/catalyst/catalyst-2.0.12.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.12.2.ebuild,v 1.5 2014/01/18 11:38:05 vapier Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
-	inherit git-2
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-fi
-inherit eutils multilib python
-
-DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ccache kernel_linux"
-
-DEPEND="app-text/asciidoc"
-RDEPEND="app-arch/lbzip2
-	app-crypt/shash
-	virtual/cdrtools
-	ccache? ( dev-util/ccache )
-	ia64? ( sys-fs/dosfstools )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
-
-pkg_setup() {
-	if use ccache ; then
-		einfo "Enabling ccache support for catalyst."
-	else
-		ewarn "By default, ccache support for catalyst is disabled."
-		ewarn "If this is not what you intended,"
-		ewarn "then you should add ccache to your USE."
-	fi
-	echo
-	einfo "The template spec files are now installed by default.  You can find"
-	einfo "them under /usr/share/doc/${PF}/examples"
-	einfo "and they are considered to be the authorative source of information"
-	einfo "on catalyst."
-	echo
-	if [[ ${PV} == *9999* ]]; then
-		ewarn "The ${EGIT_BRANCH:-master} branch (what you get with this ${PV} ebuild) contains"
-		ewarn "work-in-progress code. Be aware that it's likely that it will not"
-		ewarn "be in a working state at any given point. Please do not file bugs"
-		ewarn "until you have posted on the gentoo-catalyst mailing list and we"
-		ewarn "have asked you to do so."
-	fi
-	python_set_active_version 2
-}
-
-src_prepare() {
-	python_convert_shebangs 2 catalyst modules/catalyst_lock.py
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/${PN}
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe catalyst || die "copying catalyst"
-	if [[ ${PV} == 3.9999* ]]; then
-		doins -r modules files || die "copying files"
-	else
-		doins -r arch modules livecd || die "copying files"
-	fi
-	for x in targets/*; do
-		exeinto /usr/$(get_libdir)/${PN}/$x
-		doexe $x/* || die "copying ${x}"
-	done
-	make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
-	insinto /etc/catalyst
-	doins files/catalyst.conf files/catalystrc || die "copying configuration"
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/* || die
-	dodoc README ChangeLog AUTHORS
-	doman files/catalyst.1 files/catalyst-spec.5
-	# Here is where we actually enable ccache
-	use ccache && \
-		dosed 's:options="autoresume kern:options="autoresume ccache kern:' \
-		/etc/catalyst/catalyst.conf
-	dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
-		/etc/catalyst/catalyst.conf
-}
-
-pkg_postinst() {
-	einfo "You can find more information about catalyst by checking out the"
-	einfo "catalyst project page at:"
-	einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-	echo
-	elog "update_seed syntax has changed to make it more flexible."
-	elog "This is an optional setting supported by stage1 that runs an emerge"
-	elog "command on the seed stage before starting the stage1 build. (example:"
-	elog "'--update dev-libs/mpfr dev-libs/mpc dev-libs/gmp')"
-}
diff --git a/dev-util/catalyst/catalyst-2.0.14.ebuild b/dev-util/catalyst/catalyst-2.0.14.ebuild
deleted file mode 100644
index 7411ac487434..000000000000
--- a/dev-util/catalyst/catalyst-2.0.14.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.14.ebuild,v 1.2 2014/01/18 11:38:05 vapier Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
-	inherit git-2
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-fi
-inherit eutils multilib python
-
-DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ccache kernel_linux"
-
-DEPEND="app-text/asciidoc"
-RDEPEND="app-arch/lbzip2
-	app-crypt/shash
-	virtual/cdrtools
-	x86? ( >=sys-boot/syslinux-3.72 )
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	ia64? ( sys-fs/dosfstools )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
-
-pkg_setup() {
-	if use ccache ; then
-		einfo "Enabling ccache support for catalyst."
-	else
-		ewarn "By default, ccache support for catalyst is disabled."
-		ewarn "If this is not what you intended,"
-		ewarn "then you should add ccache to your USE."
-	fi
-	echo
-	einfo "The template spec files are now installed by default.  You can find"
-	einfo "them under /usr/share/doc/${PF}/examples"
-	einfo "and they are considered to be the authorative source of information"
-	einfo "on catalyst."
-	echo
-	if [[ ${PV} == *9999* ]]; then
-		ewarn "The ${EGIT_BRANCH:-master} branch (what you get with this ${PV} ebuild) contains"
-		ewarn "work-in-progress code. Be aware that it's likely that it will not"
-		ewarn "be in a working state at any given point. Please do not file bugs"
-		ewarn "until you have posted on the gentoo-catalyst mailing list and we"
-		ewarn "have asked you to do so."
-	fi
-	python_set_active_version 2
-}
-
-src_prepare() {
-	python_convert_shebangs 2 catalyst modules/catalyst_lock.py
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/${PN}
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe catalyst || die "copying catalyst"
-	if [[ ${PV} == 3.9999* ]]; then
-		doins -r modules files || die "copying files"
-	else
-		doins -r arch modules livecd || die "copying files"
-	fi
-	for x in targets/*; do
-		exeinto /usr/$(get_libdir)/${PN}/$x
-		doexe $x/* || die "copying ${x}"
-	done
-	make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
-	insinto /etc/catalyst
-	doins files/catalyst.conf files/catalystrc || die "copying configuration"
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/* || die
-	dodoc README AUTHORS
-	doman files/catalyst.1 files/catalyst-spec.5
-	# Here is where we actually enable ccache
-	use ccache && \
-		dosed 's:options="autoresume kern:options="autoresume ccache kern:' \
-		/etc/catalyst/catalyst.conf
-	dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
-		/etc/catalyst/catalyst.conf
-}
-
-pkg_postinst() {
-	einfo "You can find more information about catalyst by checking out the"
-	einfo "catalyst project page at:"
-	einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-	echo
-}
diff --git a/dev-util/catalyst/catalyst-2.0.15.ebuild b/dev-util/catalyst/catalyst-2.0.17.ebuild
index 4a574266abbe..bf6394c287be 100644
--- a/dev-util/catalyst/catalyst-2.0.15.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.15.ebuild,v 1.3 2014/01/18 11:38:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.17.ebuild,v 1.1 2014/05/18 22:49:31 dolsen Exp $
 
 EAPI=5
 
@@ -15,11 +15,12 @@ else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2
 		http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
 		http://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
-		http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
+		http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
+		http://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 fi
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit eutils multilib python-single-r1 ${SRC_ECLASS}