[dev-util/catalyst] Update live ebuilds to follow master, catalyst_2 and catalyst_3 branches.

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

5 files changed, 149 insertions, 25 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index f4f9e36f94ad..431e31171a53 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,13 @@
 # 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.248 2012/09/09 17:18:17 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.249 2012/09/25 05:59:37 jmbsvicetto Exp $
+
+*catalyst-3.9999 (25 Sep 2012)
+
+  25 Sep 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +catalyst-3.9999.ebuild, catalyst-2.9999.ebuild, catalyst-9999.ebuild:
+  [dev-util/catalyst] Update live ebuilds to follow master, catalyst_2 and
+  catalyst_3 branches.
 
 *catalyst-2.0.11 (09 Sep 2012)
 
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index e9ea2f426967..726a1beab110 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -16,24 +16,25 @@ EBUILD catalyst-2.0.7.1-r1.ebuild 3257 SHA256 b382cb53f3df782fa5874a4e981c487724
 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 53705 SHA256 c57a38e588aeaf0ebdb053096147537f92751c0e8a57264fa42f68266630c7bc SHA512 b131abd9d618c73b46bf2487ce1b094733df71380a8188e1815327db6ea1795a99aeb01fd83981b2b2e4c440333f41001839d4c4ba07ae379ee8541a1496f02e WHIRLPOOL 59bb10869b41b0003b301fe74c35aef164dd644e2ff0d3bab3291d9fbb50f5e63bbafe6299cb3b8c0912cadcdfbd2b4934a1859c7ae997d1198e2c4e0f2d759b
+EBUILD catalyst-2.9999.ebuild 3372 SHA256 bf55b80080552c927bef00ff7ba6bd36372fab4dc5d019f706c28ff98d53ed2d SHA512 8c711e90435c7a5a9d699f629adc3ea59e7f61e9b9b70da25ab81530266fbc915d1ee773ff5e0821adeb10ea93f2070210c4a9e5da7a64ea4b2d7c9c76b452e3 WHIRLPOOL c6a1c028c72f37a71955dd9038a7800005c96eefcac9f404858ab823e4237f9fa0a8b3d85ef483a3ddd0ab76f1db2e8776521a5e4d32c2f43138e700111fa2a2
+EBUILD catalyst-3.9999.ebuild 3372 SHA256 25a793124daf75dcc4495cb4c3bbb8e009ac6156527a0d8fe85caa8ceb1224ac SHA512 39c44da271ef7066ba850e000bd55c573e815964d5fbad805c701f7976389c464e2636b9c468cac4ced84cae7af4ea284ccedd8fce7b86d7a79a7c37f4285fd9 WHIRLPOOL 3bae28a6893e11d415944e9f98a4fcdc7ae92e3e0530b32cbf1a4f83e490f539ed43f5e12c4c818eebd7800854dacb4820a8b424eda9318bd3a14ab80f07c679
+EBUILD catalyst-9999.ebuild 3371 SHA256 dfd6f3a107b70b7f11cfc08c333215d88432fa8cda86a9fcf5678dc17bafabeb SHA512 da41a6914d79de2b6ab782008b00dfbda9c41be9a55dcc29e025e047c3398163e6085db81c74bd98f9578a9a2a2b1763a18e8bc4d710771b926ed612d10ad818 WHIRLPOOL d71bf698895c6f75b3157b66b1fdf35694b1a0f7374a4342e3ff68ab645f25a99cc15921217196cf6dcf3e8ee197d2e5190c1514cabaabe44ec6a81184b03008
+MISC ChangeLog 53976 SHA256 60e70663dd104ba90e67fab2a7b89448e1788dc9c2903e47e4018e47eb11c64d SHA512 480f980e6c9b06fbf1de9d6ba271ef950288e9a848eedcd6d2f6c93d30f4909bac1dd27dbfbbac6de9319ab2882f31333fc5115de187e6ca19f5562e1841c223 WHIRLPOOL 7e815fabfd535669e41feb421b3ab09783d83ddc701bf2bae7c41696649cd0f122ac2aaa6047858f52357365dc841b73be0f90bd481f187ab7be6951a8ff7a2d
 MISC metadata.xml 302 SHA256 52c8f4e22cff9920c9a11b04ee574b28cd6fbf71a8212259d9d19122e0ddf955 SHA512 bd15682c5b17cde8b9b0ffe4559839eb2419b070659c388a21f3bba6b94d4a3861cbb76328c996c107e5fde9e4e4fd09e1f54d99e6d76df1ef25f1f52e557a2a WHIRLPOOL 5951e4d293d63763c8d1b922b6e7a88b3b8c3db0a3db5cae5bd4457920a8e14c338ff202d5d074e1893facddc8a04b83d83cefd6bd13d65029364d905f2c1450
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-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
+iQIcBAEBCAAGBQJQYUhCAAoJEC8ZTXQF1qEPu10QALfAmdiVMKeJqiEiGkommFnk
+mZRh0L2m4P5INF1VkcIAYV0uorOYTTWHlRffZ5377IxvvPqT9FciXr2DQlSn2U5S
+nxED8kE+1MVnBZ/sx16/v4LAbAhqM/AvUBQo3vvJrZEoJY9VYAFdlsymVZsOdL48
+dq+MlBgLZrZd3991RM7miN4ylV/7G11NTHF6UGmvHSKK3739lr1RCOmgq+un7BHL
+kC1LSRMsTAJGahmoEAKfmDL8oKG7a5S2JRaEE4l/5Fhhn+pkxDyooW+dR7YgcglJ
+MIxqyjUHjNKHtG2DUimF3VNqS+MItlic7npXXm9dbtzogMt70XCTarOUY1uhrmVf
+abNdExWtq7xLgecJ9sswsaWAGXlhF3bl8/XaRKYIprA2Zrv2UMVJd2sDv8GX3JjQ
+TGzPougP9J37fnFWXIq3soZmlnECe+DAqldTHfG+/lgW/5dTN61XkkJKh0ZbNAZn
+7qFk+kQLOjTYLOSh2Akuc3zDEXWcfcv3exCbawqDnl5HxxveqM77e+UAULVIrzVd
+BmfUoMxRc8LcJ3ceHDNt7aF1P0O5YPiFSvqkPTZ2geTSFwm1k1NPdLnAAMcl1OBL
+sbpjQ55/i3j95LsRbjILljYIwlbiJeUC+KD/7rF8pix3SawAZVq0aKcK5fevBIN2
+U19M1PW0Vz8AQRa7SppN
+=a/Lk
 -----END PGP SIGNATURE-----
diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
index 0e89a189da35..2d80a21ca6ad 100644
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.9999.ebuild
@@ -1,20 +1,25 @@
 # 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.9999.ebuild,v 1.6 2012/05/15 16:54:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.9999.ebuild,v 1.7 2012/09/25 05:59:37 jmbsvicetto 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* || ${PV} == 2.9999* ]]; then
+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"
@@ -51,7 +56,7 @@ pkg_setup() {
 	einfo "and they are considered to be the authorative source of information"
 	einfo "on catalyst."
 	echo
-	if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
+	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"
@@ -69,7 +74,7 @@ src_install() {
 	insinto /usr/$(get_libdir)/${PN}
 	exeinto /usr/$(get_libdir)/${PN}
 	doexe catalyst || die "copying catalyst"
-	if [[ ${PV} == 9999* ]]; then
+	if [[ ${PV} == 3.9999* ]]; then
 		doins -r modules files || die "copying files"
 	else
 		doins -r arch modules livecd || die "copying files"
diff --git a/dev-util/catalyst/catalyst-3.9999.ebuild b/dev-util/catalyst/catalyst-3.9999.ebuild
new file mode 100644
index 000000000000..a4bf78179450
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.9999.ebuild
@@ -0,0 +1,106 @@
+# 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.1 2012/09/25 05:59:37 jmbsvicetto Exp $
+
+# catalyst-9999         -> latest 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-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
+}
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index e1a1a3ab390f..f46c9e5fb6b7 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.21 2012/08/29 04:53:52 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild,v 1.22 2012/09/25 05:59:37 jmbsvicetto Exp $
 
 # catalyst-9999         -> latest Git
 # catalyst-3.9999       -> catalyst_3 branch from Git
@@ -9,12 +9,17 @@
 EAPI=3
 PYTHON_DEPEND="2"
 
-if [[ ${PV} == 9999* || ${PV} == 3.9999* ]]; then
+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"
@@ -51,7 +56,7 @@ pkg_setup() {
 	einfo "and they are considered to be the authorative source of information"
 	einfo "on catalyst."
 	echo
-	if [[ ${PV} == 9999* || ${PV} == 3.9999* ]]; then
+	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"