Add new 3.0 development branch ebuild, remove catalyst_3 branch ebuild

Package-Manager: portage-2.2.0_alpha179_p5/cvs/Linux x86_64
Manifest-Sign-Key: 0x65E309F2189DB0B8

4 files changed, 67 insertions, 125 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index 23ec01872bca..36ee1202c7db 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/catalyst
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.262 2013/04/13 07:04:57 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.263 2013/06/16 14:58:39 dolsen Exp $
+
+  16 Jun 2013; Brian Dolbec <dolsen@gentoo.org> +catalyst-2.9999.ebuild,
+  -catalyst-3.9999.ebuild:
+  Add new 3.0 development branch live ebuild. Remove catalyst_3 live ebuild.
 
   13 Apr 2013; Matt Turner <mattst88@gentoo.org> catalyst-9999.ebuild:
   syslinux is only available on x86/amd64. Only require it there.
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 5ab43172ac5d..e247c98497da 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -9,24 +9,20 @@ EBUILD catalyst-2.0.11.ebuild 3426 SHA256 05cd804d7837cbb31f1ebce9d79f7ab20b861d
 EBUILD catalyst-2.0.12.1.ebuild 3441 SHA256 cbe9ee7f167ea2bc3f5a4f90a47355755490213b486ced1a1ca00ec16b194be8 SHA512 25a2596d4c32529858d76f31c5a5aa38d58974207b989585767ffc515381c2601f9dc3e2f3752daf1730c140c6aa0edf3044d83ed344eca7f05dd3a16c2ee17e WHIRLPOOL caad9bb5ae8d59c60ab8369f3624cd21dff8aba015fcc6188be7e2f37cc51a56d5c85320d1a0feb5b8972aeea7c91e8fd633d032aab35ea2b7a509f068fc8966
 EBUILD catalyst-2.0.12.2.ebuild 3736 SHA256 bda9c0d131c90dde2b24b5693962f416218b2c967a1c5b02329774edc16a2a82 SHA512 19f5082202b564a1620265f72b62cf1efa1820f507466fb1373f3bf68cb2023b66e1dff8b1a72a075865c34495f8385d870dbf3d3f3f2c6d2e08a09c8b022316 WHIRLPOOL f7ed38f756c31b636cfd3ad47bf0befc129373859c02d0caf50cb827dd1b8c78e5f3293f1896964581622d4a55f0559094046aa2ba6f59ae6d1f64e65f7afde0
 EBUILD catalyst-2.0.12.ebuild 3439 SHA256 f124207b5d99ab7c719e72469c6c7a6a5f1c2e40ad8fa30b7fe284b324cdb828 SHA512 f970ec1d7fb140594a831c285c4bf69e16608adbff2a47e4e16f27b480825fec11941e79ef722c4bdb725df31e77a88b27ba1c38901a313ba558351cc787739a WHIRLPOOL d8f871a0901da4eaa5ecab088f341c0db21a5241536384774d7afad7e6e809373d88e54b59176b0f904e51355e861c21cf515517702d2fc1100c55e997be5cf8
-EBUILD catalyst-3.9999.ebuild 3441 SHA256 e6c8f559dc628137c1cc08d2a41cf52b8c365aa0cf83f128b3ec6934fd4a0755 SHA512 8b35e3dc2cd432f5f0ea8e48bf727f1bd2be22c9c2e027361d4075a10321db8d88db8cebf8accb1dc439ddfa234163936b227405e066c9069a4ec1132a5fa8d3 WHIRLPOOL c388a69260347c6e7c5686f307b874328b0f018476f605ba7316b0559eb80fa65d4aafa2d485a803c7720d8e639e0c388dbc34a68ee847799f781b6c26c329d8
+EBUILD catalyst-2.9999.ebuild 1209 SHA256 2eb2859679e692eba0a4fce2acab02e4444e9e1fd32abda6d095234c845ba681 SHA512 d67f3a216666ad2595fecb7e9638732b43d8116972c7e565958b1cd848bbf42b1c44a8fbc50a6749aa41a6702e745834f2712234dd62bc0359ae558d8dff361c WHIRLPOOL b9ef2c75e2917a397c8aa087ea2523081b8ee2b6b74c194d973d7011ca126420d5db8d1211602e20499fef51182ee0e3a26562e0978bfe7a44d62a8ee0ae7d1a
 EBUILD catalyst-9999.ebuild 3523 SHA256 9f09f75bf57ad52b8bf486de913ee87db02b9e116cb1556f1d0776a321933381 SHA512 dcb70e60ebf28ad4ecfd56cc209d795ec02ba90408b79a52e2e2a499b4c98f3fa6526559f3a0ab38812ea4288009e79b3a7639e040435c1c0dd1b45144ebe6ce WHIRLPOOL dcec0a0be2f23357fe2158d1138217617c233de9b564131366d808843dd65a64b42aef021bab8c988ccfe880cecf4881a975cfdcca02080823dc33add8a811e0
-MISC ChangeLog 56527 SHA256 a1043fecdd37bdde50e96ddb30d6157a8b3b911260b7e2cece17a3039e07ad65 SHA512 075b2f02830b6cd0842642694cab8fbf08b6cbad13835d16bcc420e986f7a0256d976dcd947003e1ad1f9c2e3166ead70ff679b4f06a61be05cbfb1058908d7f WHIRLPOOL 9470ca4753b08601a770677973609e5a3d2d8cf449d76dfe6d8981c7ee9692f22a55b2c35c9bbf2eddaccdf39bfe37e129bb6c3d9170713c1ab6f25eadfcc51b
+MISC ChangeLog 56703 SHA256 cac564422e3e39c26ecdb78397d2f12e64709d6733dac585c6455ebbcb12012c SHA512 97f1c8abe5ec0e0ae1679708e81c60a7ca2b304da82096be9e724e5552174ec77169968e4d2417d05e1bf5d04a81b466c8ec58893aa6839e2bfc6b84aa283fff WHIRLPOOL 5f94cbffccf0a44a321c0d48260c937925abe73480c8147e054f187d232d71059a26ac8be06d8bd70cc3fa38458b2ae561140f029dd8341e1d46c38fe1c623da
 MISC metadata.xml 302 SHA256 52c8f4e22cff9920c9a11b04ee574b28cd6fbf71a8212259d9d19122e0ddf955 SHA512 bd15682c5b17cde8b9b0ffe4559839eb2419b070659c388a21f3bba6b94d4a3861cbb76328c996c107e5fde9e4e4fd09e1f54d99e6d76df1ef25f1f52e557a2a WHIRLPOOL 5951e4d293d63763c8d1b922b6e7a88b3b8c3db0a3db5cae5bd4457920a8e14c338ff202d5d074e1893facddc8a04b83d83cefd6bd13d65029364d905f2c1450
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRaQOqAAoJEA/daC2XTKcqTZoQAIdFLCmNStkM9Sb33LG1OndT
-rkYLWjsWA6efONf7g7JA6NDKHuT2RdQ9Ac7davSI4uaCiGWN92xLuCeorXDsTVC5
-dX1jlQZY5KFOIZBt73fRq29ykm/mC6anvr8Fgvpn2zPs4Oxc9ZHOSexsA+3SRUHZ
-BAZwB2s/r3lXCGWqriR+pAEAx+BaNA5xhJjujW/cqlJICUuTJbat7wxklOj2TP+W
-52XxW7HeMMLYIxw4kcTF3OTo3xzYFd+B3lloz8JwVLCR7xM/U6mGzGyOGqeFawNW
-ZAX7PRzOFDr4XhOn8uSR5gtmK7YJP4OgfoKwWPg9pbDINtSJZYvDwyi/KLORiRTN
-Xdui8GJv7C99B5RpdMEZhnzzWn8um4zWx/HtIUWCWNibvtXxgHHf1DKU62zRgMNN
-whW3SsfBesgLUOAm3lCPcfNQ3UEngMjZc1dQel7F0nlPGjHy4lnl2+myP7Vceafy
-CcuZyG/jiDyzqx2GP3zxa8ZN4oOiGQKOkj3fi+0TIN3gghjiX+Bqk3yMs25zYVVH
-0qkDuxqEdd5S22hzMO30oCPBZctNySxjbjVwOfayDzlzstq91nz+8fGXduPTTyoF
-IUlmf4X6bDv6qacem9a2j4CR//cBfZONE6HSzC4e4mELK94/tBai4JiFXySvf7tn
-s18Bz38WKkGO///4Udz7
-=iTtl
+iQF8BAEBCABmBQJRvdKRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4Njg4RkQxQ0M3MUMxQzA0RUFFQTQyMzcy
+MjE0RDkwQTAxNEYxN0NCAAoJECIU2QoBTxfL2QYH/16UgHdJdQivaiay2oN0XicE
+0Tz3qFKzqxylHUHZ+s6UGX94YIBMbl50eIcYWzlVNS6+anjQvZ8+SihCDtcmsnF/
+dDqwjp8me/YsQRfKLs1avof7EykRx2g9HxfBima0OcCIBqcIFXFlWw2Xxer23phG
+Ri288E45KTZmxzg8/bMKLC5u+9hPC+h07Oy54pJVIlL4kLOsa2VbxAiu5Jhh2B1u
+qBC/1TnNyftm6T3OMX+GWKU3ajMSjcvkGB1fT3Vj00IQMNWgFdKz3LpS3/dposJs
+VgAqZot14w3kXqssLqwljsv8hdo5fRvbm5rlkS8iwMZc2Gy8LNKaeRNttYhTogs=
+=BGZa
 -----END PGP SIGNATURE-----
diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
new file mode 100644
index 000000000000..b451ee767753
--- /dev/null
+++ b/dev-util/catalyst/catalyst-2.9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.9999.ebuild,v 1.11 2013/06/16 14:58:39 dolsen Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1 git-2
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux."
+HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
+EGIT_MASTER="master"
+EGIT_BRANCH="3.0"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ccache doc kernel_linux"
+
+KEYWORDS=""
+
+DEPEND="app-text/asciidoc
+	>=dev-python/snakeoil-0.5.2"
+
+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 )"
+
+python_prepare_all() {
+	python_export_best
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version
+}
+
+python_compile_all() {
+	# build the man pages and docs
+	emake
+}
+
+python_install_all(){
+	distutils-r1_python_install_all
+	if use doc; then
+		dodoc files/HOWTO.html files/docbook-xsl.css
+	fi
+}
diff --git a/dev-util/catalyst/catalyst-3.9999.ebuild b/dev-util/catalyst/catalyst-3.9999.ebuild
deleted file mode 100644
index e05b74ddf0a0..000000000000
--- a/dev-util/catalyst/catalyst-3.9999.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-3.9999.ebuild,v 1.3 2012/11/02 16:06:10 zerochaos Exp $
-
-# catalyst-9999         -> latest Git
-# catalyst-2.9999       -> catalyst_2 branch from Git
-# catalyst-3.9999       -> catalyst_3 branch from Git
-# catalyst-VER          -> normal catalyst release
-
-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=""
-
-	case ${PV} in
-		2.9999) EGIT_BRANCH="catalyst_2" ;;
-		3.9999) EGIT_BRANCH="catalyst_3" ;;
-	esac
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm 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
-	# 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
-}