Add catalyst-2.9999.ebuild for catalyst_2 git branch. Clean up other ebuilds.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

7 files changed, 157 insertions, 81 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index 8a97bbe643d8..c7527535dbf6 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/catalyst
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.232 2011/07/16 18:25:50 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.233 2011/07/17 00:29:56 mattst88 Exp $
+
+*catalyst-2.9999 (17 Jul 2011)
+
+  17 Jul 2011; Matt Turner <mattst88@gentoo.org> catalyst-2.0.6.ebuild,
+  catalyst-2.0.6.916.ebuild, catalyst-2.0.6.918.ebuild,
+  +catalyst-2.9999.ebuild, catalyst-9999.ebuild:
+  Add catalyst-2.9999.ebuild for catalyst_2 git branch. Clean up other ebuilds.
 
 *catalyst-2.0.6.918 (16 Jul 2011)
 
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index e709d6c77838..ce36f5b5ccf4 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,29 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 DIST catalyst-2.0.6.916.tar.bz2 807678 RMD160 2603b46b38258a2812888416da71c99cd0d7d3a4 SHA1 49ce32a3fcbd5c171a29d0f921b54479c691c18d SHA256 434e59d1233d9215a6deda5f12a64af1241ba3fcaae4ee63145cd9b488b5a968
 DIST catalyst-2.0.6.918.tar.bz2 824436 RMD160 95a1417972bcf32f51d574aa1c1178dc26d648e8 SHA1 09999720c779da7bb5f7ecbd76e079a22a908643 SHA256 620183ccc27c406225abbf9bc5420e65ecbb95ab9f73fa357fda6b373eab951c
 DIST catalyst-2.0.6.tar.bz2 797947 RMD160 c85ea4008fb94fbb5dc896883968a503aec11b28 SHA1 2df2301ae8faee31e96448d7fa5682ae19abf64d SHA256 aa3e03ec2d3f0f6b62b8d8c8a39b197dd91fa3ea60cd96999c3b1c03f9877af3
-EBUILD catalyst-2.0.6.916.ebuild 3186 RMD160 e5be0f31588cbc10343c5fd49d02c903de3745a3 SHA1 4685590a1ba55eb62fddea8a6af8bfc6355e3a01 SHA256 56e081c65d90e00a88b6f579bb01982f21b6cce6e0dcccd3435e57356011d0cb
-EBUILD catalyst-2.0.6.918.ebuild 3266 RMD160 5876f9eac8bc12edb3866bfdab2ee61c9b7f4a2b SHA1 d2b5212dadc923a586fdf9f070a0c1b1b4d0e166 SHA256 27633d30801b1a44ac2c26dd18411c643ce9145e7dfdf090f957738d3f3f816c
-EBUILD catalyst-2.0.6.ebuild 2878 RMD160 8b03efe74072e6bcc7df9aa89b2df9856e709f27 SHA1 899a6fd8d2a175c9af971eaff70b61b5d7e1f75d SHA256 d69fde05e64183e488bd9d61cd522181bcc7c01b4cd60093c64f699769af0d8c
-EBUILD catalyst-9999.ebuild 3254 RMD160 bc72fba3aae41272470156119e55eea0c28f733b SHA1 49855e25991879c2fd41a4787644513bc14e74ee SHA256 0fcaa6dcbadf8499d975a5e1ffd019e5f03d7f4a50b006af8bf36f95cf323ba1
-MISC ChangeLog 49188 RMD160 4e85f924fd7f925c999251d64e1b7999344a60a0 SHA1 d7d175ffef4881a48cc01c75a5966b763d8ff9f9 SHA256 aef516320ee1491d2b14623ecd54aa23b890636bf06df6dff4ffd0aae4426dfa
+EBUILD catalyst-2.0.6.916.ebuild 3103 RMD160 28da13264820837d8954f23850842d9cac833b10 SHA1 f9270c3f3fa675d8e4f23d3e1e23969a4fa2eba9 SHA256 01d29221bb8726f08fa9dd436d35151f23c74ddd5ad7b8202948f37e93fa8cef
+EBUILD catalyst-2.0.6.918.ebuild 3180 RMD160 fdf5b91dc30a64663117bef23b91fc4b506fcdd8 SHA1 2705e0e37ec464c7c4aa404d42ab4ec0395393e2 SHA256 2a24f61341135ea20ef23439ad06d7fd0f2b3a7211d584e494d4e1363691ea87
+EBUILD catalyst-2.0.6.ebuild 2596 RMD160 e3e85df411a895936ab972bf95a2a1bf9511c4d0 SHA1 2d6fa109ee0438ccf27a927b7aee8fcb5e6a8b24 SHA256 de3a642e7bf39eb3d25dee7d531a537a68573a47dea7759a5de0352c2f9c5207
+EBUILD catalyst-2.9999.ebuild 3203 RMD160 08dc2c063cdc0c06e0c1244b70160941c1f7491f SHA1 6d82fd2e86c0fce7a20b48e1dde9a9ec21c5b93d SHA256 215d4ca26b4bf019b76554f4f9f15cf2ee69728a4ee440e670aabdd857a5fb05
+EBUILD catalyst-9999.ebuild 3176 RMD160 d4ad095eddce8774f5c80a58fb87bb343bbf643d SHA1 7563471b7e4a814afa2366d19b7bd882343c157a SHA256 e4b4d3b8090454d7e085f353f4a29d98df57466114eb8d2ecef07a29f65e7f81
+MISC ChangeLog 49475 RMD160 4b9104cf50b548623607f5281e8083be7335a9e7 SHA1 dfcaa8c1b33863749cfa8e6b030f82b245e23fd1 SHA256 52dcb6eebd8ad3bbf9a389da6bbd2248c42c6ca703c3a29a750cf3e0715d458c
 MISC metadata.xml 302 RMD160 963f1d00b35f824f4ebb4ecbe565b5d9603ee3ee SHA1 61841e2ff22153be6bd9cb5cacc34fbb6f391b37 SHA256 52c8f4e22cff9920c9a11b04ee574b28cd6fbf71a8212259d9d19122e0ddf955
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOIddVAAoJEC8ZTXQF1qEPg+oP/Rwli5J4bR4t5jXnTrmljNMC
-xifDLcLQ4MdamF5I54yVVZgZk3BLvDaufECMY4f0s6HMYZRyRLS/2o45AOxms376
-fyDLC3AqL5q4JRS4ofY3tRwSaRKOssl0L5uxJSF7V/EBO+eAUkXHWowD4Bj3Oiz3
-vjDYkEve6+X2G/VLDJe/GK81JF6STcPE8VhCYilwwiIiSwlmAXRNhKeWdjXz5Nnq
-gplKxZLlLx1p1G2pwCp7ad1P630e82081XHTqJvpu+/Oc/6W7eDOqBN6vp/T6g/s
-0/Xzi21QR4d1dGpqqcqI4sBZ4Q5kNtSRtAwijSjEJtyhyVb0NRvQapWs91RtOI95
-lsuD+Hj0KdBvymn8QexFfbEguPjtew9sbEK9/UJe+Vw+caoLpdH+uAr54cP07DoU
-CqmdzcxIwh8Mj4ayKQ2Z3Qcczj0ta6m+UfHzWOqbVcllZjRPVmRf7Vla/bjjT6O5
-Gx/gReTm7tIvNb1GqJ4tC0nB1qqz7MGIBqhycld7pXE9GIjhLrhmL9CyfCzu3Qde
-lfbDU6sCLprIHgVqhS1hHcau/YBdqKgZxntNh5UFHzwgckQvI+rXp+/ze1VdcR06
-w31G48QEXKPl3qaOsve5DkMwhwNnVIpr9DOcWFzyV54JyvS7HmLxXCD7S+6GYAJp
-jJHqkiDWuOCclvfxQJUI
-=eH8T
+iEYEARECAAYFAk4iLTEACgkQTVUdg23rv510lwCgklVo4ilgEJOjVU6frk0AdrSX
+fJkAoIEPck8Ez2DvDzjkZ1MIFjXRTHZM
+=x+nh
 -----END PGP SIGNATURE-----
diff --git a/dev-util/catalyst/catalyst-2.0.6.916.ebuild b/dev-util/catalyst/catalyst-2.0.6.916.ebuild
index f7d8e5d71636..f43cbebc742d 100644
--- a/dev-util/catalyst/catalyst-2.0.6.916.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.6.916.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.916.ebuild,v 1.4 2011/06/27 05:04:18 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.916.ebuild,v 1.5 2011/07/17 00:29:56 mattst88 Exp $
 
 # catalyst-9999         -> latest Git
+# catalyst-2.9999       -> catalyst_2 branch from Git
 # catalyst-VER          -> normal catalyst release
 
 EAPI=2
 
-if [[ ${PV} == 9999* ]]; then
+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://wolf31o2.org/sources/${PN}/${P}.tar.bz2"
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
 	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 fi
 inherit eutils multilib
@@ -50,11 +50,13 @@ pkg_setup() {
 	einfo "and they are considered to be the authorative source of information"
 	einfo "on catalyst."
 	echo
-	ewarn "The git master branch (what you get with this -9999 ebuild) for catalyst"
-	ewarn "now contains the work-in-progress code for catalyst-3.x. Be aware that"
-	ewarn "it's very likely that it will not be in a working state at any given"
-	ewarn "point. Please do not file bugs until you have posted on the gentoo-catalyst"
-	ewarn "mailing list and we have asked you to do so."
+	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
 }
 
 src_install() {
@@ -63,9 +65,6 @@ src_install() {
 	doexe catalyst || die "copying catalyst"
 	if [[ ${PV} == 9999* ]]; then
 		doins -r modules files || die "copying files"
-
-		# arch files don't live in modules/ in catalyst_2
-		[[ ${EGIT_BRANCH} == "catalyst_2" ]] && { doins -r arch || die "copying files"; }
 	else
 		doins -r arch modules livecd || die "copying files"
 	fi
diff --git a/dev-util/catalyst/catalyst-2.0.6.918.ebuild b/dev-util/catalyst/catalyst-2.0.6.918.ebuild
index 2bdde3bc298a..0cee8ca37fd0 100644
--- a/dev-util/catalyst/catalyst-2.0.6.918.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.6.918.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.918.ebuild,v 1.1 2011/07/16 18:25:50 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.918.ebuild,v 1.2 2011/07/17 00:29:56 mattst88 Exp $
 
 # catalyst-9999         -> latest Git
+# catalyst-2.9999       -> catalyst_2 branch from Git
 # catalyst-VER          -> normal catalyst release
 
 EAPI=2
 
-if [[ ${PV} == 9999* ]]; then
+if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
 	inherit git-2
 	SRC_URI=""
@@ -15,8 +16,7 @@ if [[ ${PV} == 9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		http://wolf31o2.org/sources/${PN}/${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
@@ -51,11 +51,13 @@ pkg_setup() {
 	einfo "and they are considered to be the authorative source of information"
 	einfo "on catalyst."
 	echo
-	ewarn "The git master branch (what you get with this -9999 ebuild) for catalyst"
-	ewarn "now contains the work-in-progress code for catalyst-3.x. Be aware that"
-	ewarn "it's very likely that it will not be in a working state at any given"
-	ewarn "point. Please do not file bugs until you have posted on the gentoo-catalyst"
-	ewarn "mailing list and we have asked you to do so."
+	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
 }
 
 src_install() {
@@ -64,9 +66,6 @@ src_install() {
 	doexe catalyst || die "copying catalyst"
 	if [[ ${PV} == 9999* ]]; then
 		doins -r modules files || die "copying files"
-
-		# arch files don't live in modules/ in catalyst_2
-		[[ ${EGIT_BRANCH} == "catalyst_2" ]] && { doins -r arch || die "copying files"; }
 	else
 		doins -r arch modules livecd || die "copying files"
 	fi
diff --git a/dev-util/catalyst/catalyst-2.0.6.ebuild b/dev-util/catalyst/catalyst-2.0.6.ebuild
index 1be42a67497f..774a909ce8a3 100644
--- a/dev-util/catalyst/catalyst-2.0.6.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.6.ebuild
@@ -1,23 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.ebuild,v 1.6 2011/06/22 19:36:33 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.ebuild,v 1.7 2011/07/17 00:29:56 mattst88 Exp $
 
-# catalyst-9999         -> latest SVN
-# catalyst-9999.REV     -> use SVN REV
+# catalyst-9999         -> latest Git
+# catalyst-2.9999       -> catalyst_2 branch from Git
 # catalyst-VER          -> normal catalyst release
 
-if [[ ${PV} == 9999* ]]
-then
-	[[ ${PV} == 9999.* ]] && ESVN_UPDATE_CMD="svn up -r ${PV/9999./}"
-	ESVN_REPO_URI="svn://anonsvn.gentoo.org/catalyst/trunk"
-	inherit subversion eutils multilib
-	SRC_URI=""
-	S=${WORKDIR}/trunk
-else
-	inherit eutils multilib
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		http://wolf31o2.org/sources/${PN}/${P}.tar.bz2"
-fi
+inherit eutils multilib
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://wolf31o2.org/sources/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
 HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
@@ -54,12 +45,8 @@ pkg_setup() {
 }
 
 src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		subversion_src_unpack
-	else
-		unpack ${A}
-		cd "${S}"
-	fi
+	unpack ${A}
+	cd "${S}"
 }
 
 src_install() {
diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
new file mode 100644
index 000000000000..b97fc999b5de
--- /dev/null
+++ b/dev-util/catalyst/catalyst-2.9999.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2011 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.1 2011/07/17 00:29:56 mattst88 Exp $
+
+# catalyst-9999         -> latest Git
+# catalyst-2.9999       -> catalyst_2 branch from Git
+# catalyst-VER          -> normal catalyst release
+
+EAPI=2
+
+if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
+	EGIT_BRANCH="catalyst_2"
+	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
+
+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"
+
+DEPEND="app-text/asciidoc"
+RDEPEND="dev-lang/python
+	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
+}
+
+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
+}
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index b5a7094a4e08..6274ab1fb119 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2011 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.14 2011/06/27 05:04:18 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild,v 1.15 2011/07/17 00:29:56 mattst88 Exp $
 
 # catalyst-9999         -> latest Git
+# catalyst-2.9999       -> catalyst_2 branch from Git
 # catalyst-VER          -> normal catalyst release
 
 EAPI=2
 
-if [[ ${PV} == 9999* ]]; then
+if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
 	inherit git-2
 	SRC_URI=""
@@ -15,7 +16,7 @@ if [[ ${PV} == 9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		http://wolf31o2.org/sources/${PN}/${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
@@ -28,7 +29,7 @@ SLOT="0"
 RESTRICT=""
 IUSE="ccache"
 
-DEPEND=""
+DEPEND="app-text/asciidoc"
 RDEPEND="dev-lang/python
 	app-crypt/shash
 	virtual/cdrtools
@@ -36,10 +37,6 @@ RDEPEND="dev-lang/python
 	ia64? ( sys-fs/dosfstools )
 	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
 
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
 pkg_setup() {
 	if use ccache ; then
 		einfo "Enabling ccache support for catalyst."
@@ -54,11 +51,13 @@ pkg_setup() {
 	einfo "and they are considered to be the authorative source of information"
 	einfo "on catalyst."
 	echo
-	ewarn "The git master branch (what you get with this -9999 ebuild) for catalyst"
-	ewarn "now contains the work-in-progress code for catalyst-3.x. Be aware that"
-	ewarn "it's very likely that it will not be in a working state at any given"
-	ewarn "point. Please do not file bugs until you have posted on the gentoo-catalyst"
-	ewarn "mailing list and we have asked you to do so."
+	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
 }
 
 src_install() {
@@ -67,9 +66,6 @@ src_install() {
 	doexe catalyst || die "copying catalyst"
 	if [[ ${PV} == 9999* ]]; then
 		doins -r modules files || die "copying files"
-
-		# arch files don't live in modules/ in catalyst_2
-		[[ ${EGIT_BRANCH} == "catalyst_2" ]] && { doins -r arch || die "copying files"; }
 	else
 		doins -r arch modules livecd || die "copying files"
 	fi