Update the ebuild for the new python structure.

Package-Manager: portage-2.2.8_p51/cvs/Linux x86_64
Manifest-Sign-Key: 0x65E309F2189DB0B8

3 files changed, 33 insertions, 81 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index e6a8137394eb..16e97e296784 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,9 @@
 # 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.272 2014/01/18 11:38:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.273 2014/03/02 15:54:54 dolsen Exp $
+
+  02 Mar 2014; Brian Dolbec <dolsen@gentoo.org> catalyst-9999.ebuild:
+  Swap out the ebuild for the new python structure.
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> catalyst-2.0.12.2.ebuild,
   catalyst-2.0.14.ebuild, catalyst-2.0.15.ebuild, catalyst-2.0.16.ebuild,
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index fb14ba4ff4a7..6a1fe937043a 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -11,23 +11,19 @@ EBUILD catalyst-2.0.15.ebuild 3092 SHA256 941fbb2cbb04fce4c45cb6ec8ce71083f75e72
 EBUILD catalyst-2.0.16.ebuild 3155 SHA256 96330cb79d0a318eb8e71c12832b71e06d8f01483fc3042da809caf16c0577f4 SHA512 b2e5438f39a7627d03d79b7062cb039a5b4cb8c9dbef9f836ca7d34e37ed530c95ba4a288e987a06141b7b61f9c928ea95fa425d2bd03a195000189a2a66d8fe WHIRLPOOL 1264383ed4eb1b31fe647c3ec4f7fed5944b76638669f1473d28d2dcfc5bf5fcf04fa032014f11fd4dd1e024c3fd7a57031ffd9f0ce01ef2865e90e96cdf3f31
 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 3076 SHA256 3df1c16e91fdd98185bf2aec66f9931604997dc2ca84dbf81e72bf4d8befa0b9 SHA512 d76811ed38512b22aaa11e11efd1ed3d3f1e24e6b39759ec109bef22b8781a4a6dcbb6764841a6550a9c5b853e034c8ad7461d68f7a5ddbeb28f378fa3fc38d6 WHIRLPOOL 4b317491ee030d6d360d00c2aee5b516b0583cd2d97a7751bde65d9f3cbc4ebdd3f44daea726fd8dfafa5f6fd63c916f5d6bddee76de8f8007e534178f0c7de7
-MISC ChangeLog 58538 SHA256 f53cf999a467405a166acd0cf34322aaf55c11591b1e6b25d2520acf18662538 SHA512 f60aafbd6d3ce3139102a04937c623e34f4206440537ce559d7e0c9a6851c8e0cb8f9193cb7a9ae7a5e9caa68973aecb51c575ed385a2781c77ad486ce2ca8fa WHIRLPOOL e91412ea3db3e55485a3948b5d305f919cd7a4e23c3afce686e1ca531d21956863ba9739a77e1ef335f248c18282f8ccb4367be8e08a25941839ecc5b1a180c3
+EBUILD catalyst-9999.ebuild 1611 SHA256 af96e44b2c122d4f98b268c2da788511faa8308098a7dc8a5261fc9dd3d31050 SHA512 643f4827189b3ef2f56bdfccdd6df2368e51da030e1088e481c358bb9474b4ca7101d597b5429ea998c98b3f41792809037fff82720081e5c51ba93f13581635 WHIRLPOOL a718b1c5d9ca40845e621a9583f63b1e7eda03de2f39ff513df9729bafce8bfd2a37f1aa7d9c172aff3ac4d39aca0211ff972032a7b701192cd970431a830760
+MISC ChangeLog 58661 SHA256 ffc40c121028845b1c2d3170001bb563ce0e8193543544eb5558da215aee24e1 SHA512 db5769f23a1235e34bc67cf7607a7a9bc47942e890c7fa1673d1b9e099b35e92f0c67c263f3718e9241bf3de2f160bfdbe7821ecba67064170ccf8c0c49ad41e WHIRLPOOL 383cfa3149f6c8581b3ad553e29862b8aa27a89a409800a13939093386b71832087a61154d1f86f09ebe0eef30998c72eb03c745655ea32ee4f35c614d95b76d
 MISC metadata.xml 302 SHA256 52c8f4e22cff9920c9a11b04ee574b28cd6fbf71a8212259d9d19122e0ddf955 SHA512 bd15682c5b17cde8b9b0ffe4559839eb2419b070659c388a21f3bba6b94d4a3861cbb76328c996c107e5fde9e4e4fd09e1f54d99e6d76df1ef25f1f52e557a2a WHIRLPOOL 5951e4d293d63763c8d1b922b6e7a88b3b8c3db0a3db5cae5bd4457920a8e14c338ff202d5d074e1893facddc8a04b83d83cefd6bd13d65029364d905f2c1450
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2megAAoJEPGu1DbS6WIAKFMQAI6w4EswEwxBs0acfJBCyPVH
-Bqi8Eje9ewbey2x2M5euSzU/VXXJrRlsPlV4a3bdviVp8LuHU5OkByddRUMWoWGH
-H3VTkSY6g+S/LUdbo0D+gp9CLAVJSaKKI8jSFsQwkwLXLGycux1FpT+AG5OkNkfD
-ex06xWgRB+orAZBBd2vYaBzRWTZ56A2JtTb5eiApfL4Av1KLP9NLLtKSjnDR6UEh
-kbM772RAXIF/ej6e97A3/bk76C1/itYm7PCWR80/N/NdWGWua+le2gKVrDgIPWv9
-TD8AP/bQIcJPMqgHFMGcETz9Bt+WtK/nRgclBki3urx3M8RLCbGkOjZJqyEuBCIk
-tLMxi6FZ4OlQ0/kvmOiKJN/ULLs3TOiDxnNraIAddyX3ju7psFLOw2+NEGrz6CVc
-fd0UmbvZHZjXhUA36MMFlO/AA68QA+YS+LjweqOAQCuRya/9c6sgpWL1pUAtYhHP
-RsL3rbbV19LXe2yPpS5PV11SzfKNKrTlSlzcUyeXTkaKIESQJ6GHVZhNj4yfBtUT
-jM+all/VX28qrRUF2TQMrlVc29gAyEvw4As6Adk7v4M+DeWGcSZisj+UmJmcU27p
-KyJQyuGyTfYuK8yHJ3kBL+olQr8rX2zrrb7hprgEv9IThKD7ACG7Uu3tPemMT/uV
-jSPI2bk6r5qrXYrYE3AA
-=qBGi
+iQF8BAEBCABmBQJTE1RLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4Njg4RkQxQ0M3MUMxQzA0RUFFQTQyMzcy
+MjE0RDkwQTAxNEYxN0NCAAoJECIU2QoBTxfL15kH/34kdCxuQzms4/sS82UM7DhN
+Gc6tOi/QX3OHzJMCjaZmMrSWioUL1W6+MFhWZvx87/FBdY3S1jbGYuQVkOACA0K3
+NXieY8bN6L/QgsCvEbiVl+tF+zi7vHP7HorsjYvZI5jJqRPqu9698ZAoyhsU7HrW
+pPvGqT/q8NAaEClOudJMSZ/O2IlRk4iVAlxcq1+gTmr7lKrnttEiLt2tUfkqH5l8
+kg5P4klCTMLs0oOYUbkge2r2gDR2XtfY13ZmeBploywpLx22vdXupKA3UCDdnIkR
+Gj50aF2SUxf4V3rAqEyRbV/7attKwGcFQ8xYDj428blG9SDV/E4lHA2Tnu5s0Uo=
+=/Iub
 -----END PGP SIGNATURE-----
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 061b4403792c..f61affc2ecd8 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,14 +1,13 @@
 # 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-9999.ebuild,v 1.32 2014/01/18 11:38:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild,v 1.33 2014/03/02 15:54:54 dolsen Exp $
 
 EAPI=5
 
 if [[ ${PV} == *9999* ]]; then
 	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git
-		http://dev.gentoo.org/~dolsen/catalyst/"
-	EGIT_MASTER="master"
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
+	EGIT_BRANCH="master"
 	SRC_URI=""
 	KEYWORDS=""
 	S="${WORKDIR}/${PN}"
@@ -21,18 +20,18 @@ fi
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit eutils multilib python-single-r1 ${SRC_ECLASS}
+inherit distutils-r1 multilib ${SRC_ECLASS}
 
 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"
-IUSE="ccache kernel_linux"
+IUSE="ccache doc kernel_linux"
 
 DEPEND="
 	app-text/asciidoc
-	${PYTHON_DEPS}
+	>=dev-python/snakeoil-0.5.2
 "
 RDEPEND="
 	app-arch/lbzip2
@@ -43,68 +42,22 @@ RDEPEND="
 	x86? ( >=sys-boot/syslinux-3.72 )
 	ccache? ( dev-util/ccache )
 	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-	${PYTHON_DEPS}
 "
 
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-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
-
-	python-single-r1_pkg_setup
+python_prepare_all() {
+	python_export_best
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version
 }
 
-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
-
-	# Here is where we actually enable ccache
-	use ccache && \
-		sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
-			files/catalyst.conf
-
-	sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
-		files/catalyst.conf
-
-	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
-
-	python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
-	python_optimize "${ED}"
+python_compile_all() {
+	# build the man pages and docs
+	emake
 }
 
-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"
+python_install_all(){
+	distutils-r1_python_install_all
+	if use doc; then
+		dodoc files/HOWTO.html files/docbook-xsl.css
+	fi
 }