Version bump to 2.0.15.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x974CA72A

3 files changed, 123 insertions, 16 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index 048dded5bcff..8b7baecf242e 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,11 @@
 # 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.266 2013/08/08 02:48:35 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.267 2013/11/14 00:46:40 mattst88 Exp $
+
+*catalyst-2.0.15 (14 Nov 2013)
+
+  14 Nov 2013; Matt Turner <mattst88@gentoo.org> +catalyst-2.0.15.ebuild:
+  Version bump to 2.0.15.
 
 *catalyst-2.0.14 (08 Aug 2013)
 
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 92e7adea614b..dc365f02a677 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -3,26 +3,28 @@ Hash: SHA256
 
 DIST catalyst-2.0.12.2.tar.bz2 907893 SHA256 411d531b6de8c8c1bc9fa9502af3a4882e94e9db8b911bb48e4a0fcfc1efe7e8 SHA512 12349f6249363a94a72a71d05b2fe6ee13593b5ea67e1cb9a054c5ece896ff68f89d1af6341b98238ba6a6510e2737f81dcc2606649c10681235315663ab04ae WHIRLPOOL 1769a78f615c8e0eec2167dd9d6ab873e24801ecb5e4634037898933c6f5a1dbb189d967a628be6f8811f6769eadc91c5003ddbb6bd58eb05efbbd5110f740c7
 DIST catalyst-2.0.14.tar.bz2 873415 SHA256 5a2f506026bde6df5d7ad5d94c3dbea0c151422b2201c347eafbaee135915586 SHA512 75e09be72e124ed4af1489af0688ed3858b36d25d76f331d8bfd1d45256fe068b9eb21c783541863f41786d9c91565695387582fc759bea5ef046ad2fa51eb1a WHIRLPOOL fd8c4660ccf11d6a6d89ebbdf20f69467e32984cd5a721c6d34ad3a0a94bb149e020ceefb7a21863aa30ebbdc27e3b5875b3d22fcb2381f6834ac56112335001
+DIST catalyst-2.0.15.tar.bz2 873335 SHA256 80fc39e6f6b7c32fb84f51333d8bf62a56a1ee068eb83cf2b03cb21c1f163e51 SHA512 9e61ba61eaa806424041f7edd1680b55dfd69bdea5b292aff305b4b3ef03349d82a47d8ab876baf7bf888e03810d79c6a00d74dc748082a1ed180ec1ed7043bd WHIRLPOOL 03c0f1137f59c57d106df4210104000c498a4c7ff2ae5bcc6e6c7a23d3d0c4c35ed125c036a0468859706da82af799641c1abe1b18c716c230c6ab657b4b765c
 EBUILD catalyst-2.0.12.2.ebuild 3445 SHA256 a2b6908576341478f9c9ce82aa6eb91c6792c63d9a686f264cb45ead4b97e65e SHA512 9dd07991477b853172de76d5fb3012986fbe326cd433e38af0112271fcfa42686c94e7150ebb6d47d7ff5a45d007bdb539ac29976922441d47e173e69ff87cf8 WHIRLPOOL 501ccb857ceb2482680d38fd286b3418df0a79682c5135836778708b23c3a643eb30adad9f4a2fad03ba850e3aa32bb57701ca99b264ceafaac77f97a2b85084
 EBUILD catalyst-2.0.14.ebuild 3225 SHA256 337c82a4b0905cdfa5ae9619901e50275017955eb4583d900784f6089a33d316 SHA512 c6f76c3d3e516cffa99e7e8d664bd3c09e262d011df2fc0bb63d815701da1dfbfda53d98b6721c9614c660670de6e6e994e2ae5ad5b9ef923da5bcd28a8efd82 WHIRLPOOL bd428e0ee655ad5db0469e0e4383773fd7c27dc4b6934d0c3664cfdf3c19650f77dc9dbeee0d86c82e95d508df5096d30d62b8f06775164dfcf49e4a0dbf4ae7
+EBUILD catalyst-2.0.15.ebuild 3225 SHA256 2b270032187ac37f9a195ebbe4c65608e0d5a488534429159ccc93724c4ab843 SHA512 1440d1742fa933f1a5228f7a57279501e1e30ae72479d51a7c909f0c6a05bd17b740879cd0dd9e45fdca30e37a022bc70064afe8de10306c955ee615ec40bf5e WHIRLPOOL 4f82fc80fd2c83da3901bd2ed294d6a37435f753f07fff66a4d5bb5a0e7362000eb97e82a245eb990685a57cc89b8f814599e8c4ae163011358ff964def1ebb7
 EBUILD catalyst-2.9999.ebuild 1209 SHA256 2eb2859679e692eba0a4fce2acab02e4444e9e1fd32abda6d095234c845ba681 SHA512 d67f3a216666ad2595fecb7e9638732b43d8116972c7e565958b1cd848bbf42b1c44a8fbc50a6749aa41a6702e745834f2712234dd62bc0359ae558d8dff361c WHIRLPOOL b9ef2c75e2917a397c8aa087ea2523081b8ee2b6b74c194d973d7011ca126420d5db8d1211602e20499fef51182ee0e3a26562e0978bfe7a44d62a8ee0ae7d1a
 EBUILD catalyst-9999.ebuild 3227 SHA256 254705920493164f6b97e036812d2f7927cd52116dd2b003ba4337e70b5d1f3d SHA512 145ce4c9fd1681688144ad44aca6ae3d35f659d2f792991f49b694d59d3163fa47001b21b3b383b86a5a037e510a069cf4480bc8340a9a158f697303b24049dc WHIRLPOOL c8e0a96dd0c29be0de7f71e94361e7498133977586b4cdbf4b1b9799ff5ebb027d7d58d005b94f21057b0a70b774dd609a16031ad0755947b2180ce73ab783e7
-MISC ChangeLog 57266 SHA256 45e71a9a5df00a40dae6d2b56beb24f51e0388740491ef4b81edff2809cfe901 SHA512 3dbd270fa8a4c37d0829994ffa3994b375a01440e1d4fd8f42f3eaf74a41a06131f00956ec3b18569f23bc685172d6401e2c768765610ba8ae86e644343c9355 WHIRLPOOL 520f5153f1b40c3d190919f2516e6f3fa64d41dcd0fc7ee204288aa42ce7abd3961e3ff2774b0a8b5d5f0d7b9f056e6d75b82ebfdb66ca9bcba675b75caef07f
+MISC ChangeLog 57399 SHA256 1855a9db97bed7a3151bf74766d23ed87129e3cba1cab2bb779dda61d9cfb7a9 SHA512 b95cb47579ee14907686e43ac263e7e41012221fa63d091a6606fb2389eb6023e0f7818ff57fb0a8a74584bf4468aaa380d293f533462401b3a4fda13bf3b752 WHIRLPOOL 1feee56995bb234631fab0b18af507e56746946f0c54f7a560e806f4e5ee97fd7652050a1dde8eadaccfde66786c67b0d03053696c81b8eda28e51c8882ef0d4
 MISC metadata.xml 302 SHA256 52c8f4e22cff9920c9a11b04ee574b28cd6fbf71a8212259d9d19122e0ddf955 SHA512 bd15682c5b17cde8b9b0ffe4559839eb2419b070659c388a21f3bba6b94d4a3861cbb76328c996c107e5fde9e4e4fd09e1f54d99e6d76df1ef25f1f52e557a2a WHIRLPOOL 5951e4d293d63763c8d1b922b6e7a88b3b8c3db0a3db5cae5bd4457920a8e14c338ff202d5d074e1893facddc8a04b83d83cefd6bd13d65029364d905f2c1450
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSAwczAAoJEA/daC2XTKcqO2MP/i2WyD5f9F/3ulLcCURcSHkV
-u9Uj1EUFoog4tSMjGZu8z8R0rqzyStye1u4hocIYOovVGG72BFSUd0JcY9l0Cdkv
-A7BA8VhrgDN9A8vLDML/zpsIsJnILa+7IrrTI+TIuQCFgWeiUDeqENZ51OF4DVBJ
-cEqtSRdYLA3nH/oAUtg8hhL4GZXfch+3MYN3FeXBGbLBgzzcRdWHqoSiuU9oOxhm
-tzbvWI3doA5oup6FlyzxUlTYAoINpj/7+T6w71maOZ543CpAG8QywFGnQLgR0Qdd
-/ZQc3klqoPF5zceWpMsiTBXNXMCT8zA6lVHgm5xFvl1BwKwA5DlNTXG1uRZl6T72
-dUzd8UySIK3lt4+iOK38pLeA89v7BAfPAzDe3xjRURE/jgeHkhvEsrndqxCcpypa
-tLku585Uew7hmP1fsrsi93XFs582a4UpdK7GVR8PqQzpEXDoXXLy/5ktl0LZkN1K
-WlUlQIrB45e0aIBtMEM2EqjRuA7FI74d+EiLvWCHBBpcTcHoxysRvnz0M+ZsJZPD
-31yZnRVnoGCR6f3aFiy5vuQj3RAaYBgC/XVZj7EAGNNjxUDWcGDi9MZt1nzRe1T8
-eu7K8Hh13SL/SXCw8tMxn+r6S1ASoMJ1KqCSkFlvWbap2vM8RMPH0YQ/PPlU01hf
-xb2fohGs54skX3En2Mqs
-=3gZV
+iQIcBAEBCAAGBQJShB12AAoJEA/daC2XTKcqyw4P/3CQnZ1hWsF+QO1O3bgn7MES
+6VQDIEhRgOdpVOuda+VZr5AO6syg9jCO4+koy5CX9sHdcKqt3PTRy438krI+Ehll
+IMWTpZqiEWIxq9kEWW4NeAV4Ds7AUqEQTKwO7/fb8V9i+Hd4bfGXdKFH/ylTfzSU
+7QiddCkqGpptGSr54/9x2Q84CzRs8Yn549WhXAZBB68Z/hTilEfW94L3k/R3Zzjc
+ehraDvN3SFQKzuwUEY7ZxShuUnYqo5ZxpHs1nLDVsU30pFTr+thKB9RF8ujgcIe8
+uCIZTNAmQnJa4m6Cik+ckFalyND8rfTWuQBegp3LHapoYINF8nmmh3U0rkpIqjLg
+JyqrJSttdc07Az4GKa0UQQQH3vDRl61fO+EU+5zirdLwX/S9ms7rATRrnPkN377O
+rdN/tn4F93eUzVyyiJBCa3JJdsZlUgbjCMXhUGHYE+SuEo1FK3o0LDTfYRZzzljQ
+1iTBYQTLShrum+adkBPdtFVaqufb6gUQb/e0fs/Ebqj1x93iEa47FmG9W8cZI3dD
+zQPnG/Z3hkYpsYUki1d3XJ8iO3vmwFmyQr7RBq0lM5WnzwORM2lXhmyTFAPsXXpv
+029ndt10CeUCAE7g9dUUEQYPMcvIvYmHKojLXYogCJelV6RFgvT95V2zc9ZUfJBv
+IIGJVB5bEnFYKsyB05Ed
+=AWOV
 -----END PGP SIGNATURE-----
diff --git a/dev-util/catalyst/catalyst-2.0.15.ebuild b/dev-util/catalyst/catalyst-2.0.15.ebuild
new file mode 100644
index 000000000000..fd32b3a11047
--- /dev/null
+++ b/dev-util/catalyst/catalyst-2.0.15.ebuild
@@ -0,0 +1,100 @@
+# 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.0.15.ebuild,v 1.1 2013/11/14 00:46:40 mattst88 Exp $
+
+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=""
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		http://dev.gentoo.org/~mattst88/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
+	x86? ( >=sys-boot/syslinux-3.72 )
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	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 AUTHORS
+	doman files/catalyst.1 files/catalyst-spec.5
+	# 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
+}