Version bump to catalyst-2.0.11.

This version moves make.conf and make.profile to /etc/portage.
Set the profile using eselect instead of manually.
Add support to update the seed stage3 when building the stage1.
Update arch config. Add x32 abi config.

Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64

3 files changed, 128 insertions, 15 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index 22f0cbbd9bf5..f4f9e36f94ad 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/catalyst
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.247 2012/08/29 04:53:52 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.248 2012/09/09 17:18:17 jmbsvicetto Exp $
+
+*catalyst-2.0.11 (09 Sep 2012)
+
+  09 Sep 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +catalyst-2.0.11.ebuild:
+  Version bump to catalyst-2.0.11.
+  This version moves make.conf and make.profile to /etc/portage.
+  Set the profile using eselect instead of manually.
+  Add support to update the seed stage3 when building the stage1.
+  Update arch config. Add x32 abi config.
 
   29 Aug 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   catalyst-9999.ebuild:
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index bd0511707089..e9ea2f426967 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -7,31 +7,33 @@ AUX 0001-s-etc-make.profile-etc-portage-make.profile-g-Use-ne.patch 2682 SHA256
 AUX 0002-s-etc-make.conf-etc-portage-make.conf-g-Use-new-loca.patch 18179 SHA256 1f03f1658d641c241e85e0dabf5c42c4a35e31bf6bd45b0ce4e8cc68fb079d40 SHA512 a24747d8ff01822f172dcb496396f5abc035c8f9fb95fe80814bef8f9772eeac112f95b012f738c47476312395e86286e87c3787940202bf4454110d70eed331 WHIRLPOOL 46ecee4ad89bc4719b4bf7ec8be8d6fe11d54c71aaf7d72ab072e901435148f373f904c57a8dfbf5e830b3d02dd80e5c4712bf0978564ab37f977dfda6789837
 AUX 2.0.8.1-arm-softfp.patch 1551 SHA256 54ae43557d15bd51d6227aec8160d61c07e45b1cb6b6c8f11fe1c4804772afcc SHA512 93b90a36a1c9d737a06b5b78df583f0b99ef26704b6fd615bb01dda4e101d3287ae4c4d65df2d51ce1b1ed21a2a267d6c32c7c26de785fc5b4f83b7ed480b49d WHIRLPOOL 6de731b98cec1c28280992b0228885a03beab7d281582ad27f3980771c3e521178bd88cb33791ab15be2ccd9e2d1e169c6158967fdc614cfba3b528cdcfa2bfd
 DIST catalyst-2.0.10.1.tar.bz2 909073 SHA256 3ed2217c579dcc01e13afc017dbfea869d2c99a0c169290e678fc113db6891ed SHA512 b21e576a41926b8f71a76410c2e3e593267994cb5bdb39639add001a610f6c481ac7506ec88caf6016f65ecc09c86bae9a78812b3dc2879e32046e118c0e5671 WHIRLPOOL 168d20e1ff19005b647230852d249552fd98d50e9ece0ca19b5e3b743a971255f9065f8832fb7e29ef8f561ca8f40fe1f9f8732f54c4d9d233cd2df8ab7c42ad
+DIST catalyst-2.0.11.tar.bz2 909191 SHA256 6fed91ac834179f676905f6fa544fb642b18b95ec1c89420432ef05fb9fde7da SHA512 935d42f72bc5e181ef0eff4862e414a52914b7ac82d6e75c2d80c1a4d055b428da2c2d255c35cf851bcb729aca1a9c8ee0301923433d4c7fedb03bc1f06d5ca3 WHIRLPOOL e91a01b2d0f17e2d7c371d05362a658e7ddc7142982ae84efb71db9327e933227651d6efaeb8c86b0d5305e350632a2adac0ff81fed888588fe6078cb049ab7b
 DIST catalyst-2.0.7.1.tar.bz2 901524 SHA256 77998b27cd8136c03380c1fdb271c69eae72891fe8177f0bf95b64c9f5fe82d6 SHA512 e3e9b16ee846553f9b31d8b7b417cf59962802128b91a5703c3f68e3cbea44a9f0c30bdce5328142236dc49498125014d6d75c020c0413466e9d8d7c92929636 WHIRLPOOL ec46052664edf65f3e9ae1653d09ecd4407ef0ebb53f27646b1a4ae0f22dc47321ad4e54eedc4abd33eb3c18ed1dd69c041fd4ad705165e0b2d95efed22c2db1
 DIST catalyst-2.0.8.1.tar.bz2 891272 SHA256 b13dbe3c8b41eba38f9e9b920bb763b034af19f38711499a2e539ebfe4bf860c SHA512 969f2b41e417b45c5928281948c9fe7873eca33409320725ab7502c70efd79af6243b5d0eaee2023747c38ddb31455ae3a87ed237b850c41da38bbd7385b0105 WHIRLPOOL a8ac00a17530efbe79e16765309b8395a118a27b40cf7f0da53946fc3376b508ae4b0697f3845b970407c146e15ab67f287734e4d7bedf7227529c2292087a1e
 EBUILD catalyst-2.0.10.1.ebuild 3371 SHA256 e32e3138e592f76d53bdec0eaa1393e80676170406d23c46aa232a8edcbe7efc SHA512 986c8a502429f2a1946be1022e6da9c0fec405ac08c069bbe01adeb3e89617953f5597ff810810e34f24e2bda8c099ad931dfbe5d1d8a6b48010914331b16d55 WHIRLPOOL 672d49e224cbde9d1fbd095848ad5230564efb616e3cb288619248a91941adcd9e168f1c7e49c801795efcce5a35de07a01b4e7a40bc8fbb55d4e5fb2f1c7fd3
+EBUILD catalyst-2.0.11.ebuild 3321 SHA256 da84740e9a92344a2a9ac9ac8bafd90322408c283aae6746deb629c6693a360e SHA512 09f511783f12389e188b1066d194cbaf82438df9ededc94d4de840a467ea4951368387b4666c05ad1aa133a906ab84d3e290e9ad9dddad5dd8391f2706b3b339 WHIRLPOOL f0b031f8245e7a01314527890aa28c83b3b29ca408030e49468a0f9cf03c74adf15f90c17bc148b44077fdfbea9dee0ea39aea861dad063908f789cb2a91d4ea
 EBUILD catalyst-2.0.7.1-r1.ebuild 3257 SHA256 b382cb53f3df782fa5874a4e981c4877245018cb3967996cc07ded310d9a2ebd SHA512 e91648730002d0fcea499046e38e7f9da50e8c6b37e027094a886b5a8cf4a3368e76c4ec61c7250960939dd4942e68e23d060efc1c04af32df1034bad608ab6c WHIRLPOOL 74220fa22e1f394447c6a242a0238d6564dd8989cd1234086fad2a50df5a154539a7e9e20bfd5ae407722e04af31365c6f382546c9c352ce90eeea24f266e39c
 EBUILD catalyst-2.0.7.1.ebuild 3194 SHA256 ae30a34239ba12bd11bb3fdf80439d54fca57ee4de09e8f88468f0a3e39ffe86 SHA512 f5f2dbac123787d834fce69c447073d3c7652078ebfd34747cfd12e4aea1208d62980051ba2cae3e829f0910b28594a1d7094b6639da8185b9fabcf12c60b4ac WHIRLPOOL bce745a6cfb4a64a24039d0d8bc0e384620120c7f19370ecf0bf6bd541b1c91706d740502557628abae80ceb6723a69293c7b491fd6bc0c5f8bc822bfca7c78d
 EBUILD catalyst-2.0.8.1-r1.ebuild 3310 SHA256 209f5200809e6cae79ab45e7beb4b5e5d037ba3b45e501c52a0012e1e20da543 SHA512 801b271e3d7c416bbb9439d8680c5dd39b823e84cd2c2caa7cfb7e1fab0b38202da62c8588edbac84c1081fac1da7d25bdb3f106e76e2c04d06c3b835a40de6f WHIRLPOOL 42f14f42ca34eae0ea179aea7b87f5066f1d76b2f6d6c43995d1f12144c34d0fb43438f8867a1fde4aa8433b52e2840367cdaaf0646e04615635d226238573c5
 EBUILD catalyst-2.0.8.1-r2.ebuild 3356 SHA256 5d739e441bf1337f7680fe7a3a244615588c45ac4edcc6d0eafd511503dfaade SHA512 ed6ef4ebfb38e9b575bb61e231fda9c65c8a9af50ea376fef6ad7cddf4e0d1a9df41e79fd162bdbcf1ba2833f9b8f95168888f37e563f7d3b41a0438e8c46fca WHIRLPOOL 9a70af12aecb783372746aab3b4cb4fd6c0b6be3e5a7322e13e9cf835fc89d0426acebbd5b22d611ef6f3f2939650d8a1cbd5b1bbb98a0dad06392449bcae648
 EBUILD catalyst-2.9999.ebuild 3306 SHA256 070a8cc1ba8302ee923975caa598948ce4abed85593421b2a8464cd0f45fd805 SHA512 e03d047f4ba3d0663809e9a593b56f445cf2f98ccf2558ba210650d271e7fd09d7e92915ed0df4f19800ddbc475f4794e4e4c05fc30f3fd136a5bc9a7fbc3cd1 WHIRLPOOL e315872e2572d2260cf4f3c1787e868111f4628758ac1b06c141477a89af4ff3207a60f34e27c2066733c5f685482966c55c6c9e593db43ddd9895869f887186
 EBUILD catalyst-9999.ebuild 3311 SHA256 8b9f5b72b0dc4a055fb50a699da4c6a54580c42f89d836d9a5a815ac3693286b SHA512 32654a8ff8786e6bb74a2371fb03ed8530247ee82605fc13d6d7bbfddc8f204b5c76c3f74fd5e750fc2e7df8acae420f875dca1ee38f97255e4e4e5a4a9f97e6 WHIRLPOOL 9180e4170eb3265abf8f3d3fb0363fc14cb6d880033f789470e893d94b07a7b820607e89e88d0f9cc0036255e91c4f18e92c02e331febf8a1e7fded3fd88903b
-MISC ChangeLog 53317 SHA256 7aa72085eeee29ec32dc4d1699f261bd45e260a4755b17070e28a4bba8a761f3 SHA512 272678b75c55bdd117248e97655a274042377bd68c9f862cb207624298eeadb1ba52e1385c5935c095930dd8faf35384fa422fc643457e7b206580851272e64a WHIRLPOOL b542d63f752c92240edde4f748af70d613db4a3080ef1e8fa1f84d7c28769bd3e64625cc4dcd3c5ea63232d94501b8653e6b5ca864ed18ccd816fc063b92a339
+MISC ChangeLog 53705 SHA256 c57a38e588aeaf0ebdb053096147537f92751c0e8a57264fa42f68266630c7bc SHA512 b131abd9d618c73b46bf2487ce1b094733df71380a8188e1815327db6ea1795a99aeb01fd83981b2b2e4c440333f41001839d4c4ba07ae379ee8541a1496f02e WHIRLPOOL 59bb10869b41b0003b301fe74c35aef164dd644e2ff0d3bab3291d9fbb50f5e63bbafe6299cb3b8c0912cadcdfbd2b4934a1859c7ae997d1198e2c4e0f2d759b
 MISC metadata.xml 302 SHA256 52c8f4e22cff9920c9a11b04ee574b28cd6fbf71a8212259d9d19122e0ddf955 SHA512 bd15682c5b17cde8b9b0ffe4559839eb2419b070659c388a21f3bba6b94d4a3861cbb76328c996c107e5fde9e4e4fd09e1f54d99e6d76df1ef25f1f52e557a2a WHIRLPOOL 5951e4d293d63763c8d1b922b6e7a88b3b8c3db0a3db5cae5bd4457920a8e14c338ff202d5d074e1893facddc8a04b83d83cefd6bd13d65029364d905f2c1450
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQPaBTAAoJEC8ZTXQF1qEP8XMP/23j+qJfIswURXX3SJqDNkne
-m3OpMGnt4Y0JkONs+WKiEnrcYe+OWd9lx9XoKGuwoedARba4qOFhPZNEX7rmikcP
-tUe9pGwJi9mdsl42Nv64nx3oo/rIwHRhmUPhmWPrKlSvuTfKEjETC3kQ7tmnY7uV
-LsGgVqPxG2v/vFXu7L7StFHH5lp0Xn9fb0Ar6wjL+0CSxSJxzTPmRCxgti6aW2fs
-rH2THmGpU0tXHzV13vPq/TnIHGsJL1jdFlBslfspYwu5bryqmTwm2tSiq88Jgbc8
-v/6szQc+qGP/Crdn1kNGj4Na2lu5MIC7l/1k9wIOsO297GQkcSkgkKPTdq3O4wQL
-8R7gUYyA4jxl7Asy9gdz5DwUDGZ5vqUD3NzPeozO6IUXTMJqFMRP6wgXVa7TE8/e
-3enzLmSV1hEfb7a2mT/+DF/AJDazqEMaskKx0nyVIFdHhPxwCAenXEGj+5M8JyPp
-g0tz5KlnI6jY3p6UktlxvB2iKrIR6lKcJFxEPFtcpYbORAS5wlkpAfZmAXPB3LQS
-zItPtiqA60lM6m/549rNDhD9EwX32s37CU2AtPvdojCRXm1fVQykMSXsP/9ToQZR
-M9o73nhvSMMKzVb1L2FF+Z6StwT+1BmyAr4K5+IC3A3IsU+nWPSjVz809vh7slQ1
-5T21XQsLoCoIPCsKdCNd
-=yIB/
+iQIcBAEBCAAGBQJQTM9FAAoJEC8ZTXQF1qEP9+IP/253ffRoaOtV36sZkD3dmUS8
+Xe86wvaEF70daKWZtAZFf7tHtdwOjerMGA/LMWmqAVr4PVWqDaR0c9WMvvPvYNSE
+UL8VRT4pHQPBVlwJUoeSogGag53H25pWGT0Exbg/W2V6Bz0gbHQlvdIG5Js8ZFdZ
+Z44xVuBzXNXG/uE/PfhENbChJx7kT4nqdE1JIVCgsbkt9WdvD6PFMFKD8OKNF0OH
+WNDgkE5wu1RjJc8HM51HQAmTaXbihOSx3mB2icGILJEIupoB5AQBy9mfv/0b7QqP
+cmTNG9T0MRazhgq9PzZZBXjgvXzQmlbRwxQ2qhKHsXQQNZ0uX/oZ6aPMZzGhrVDY
+4GgSrhCpMdavykH2e57H1BXdHVcyk5GrDSN6kKdLnMxda2qFg3pEzQYY3rM+OpVI
+v1cxHJSgDhMliT1pnoGIc5Ip3nu+1/3Ww/ROZ39gS4bgr/olGa7c5gaJf0/wefZW
+iseLyDNkE7slUI9sEXSdttJm9JBqB/yQMR2jnzArIfpLzurjEjeZWQw1oQnqJ/3h
+fyBVhHNhTRmPcpdB9hTntXdW5xq1lFqYxCWf+gfpY5pOdxq1m/nwzk3xCOZ1CUao
+aJRA+PfZVQU7KX0uiXuLflB32mExWI1wt+BIsFIJmdL1NtCeeZjc2aaI8pNuDbq6
+6RouSmeq27yDX/lO8knk
+=bkrO
 -----END PGP SIGNATURE-----
diff --git a/dev-util/catalyst/catalyst-2.0.11.ebuild b/dev-util/catalyst/catalyst-2.0.11.ebuild
new file mode 100644
index 000000000000..d57e2e2f1e1b
--- /dev/null
+++ b/dev-util/catalyst/catalyst-2.0.11.ebuild
@@ -0,0 +1,101 @@
+# 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-2.0.11.ebuild,v 1.1 2012/09/09 17:18:17 jmbsvicetto Exp $
+
+# catalyst-9999         -> latest Git
+# catalyst-2.9999       -> catalyst_2 branch from Git
+# catalyst-VER          -> normal catalyst release
+
+EAPI=3
+PYTHON_DEPEND="2"
+
+if [[ ${PV} == 9999* || ${PV} == 2.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/~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-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* || ${PV} == 2.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} == 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
+}