[dev-util/catalyst-9999] Update ebuild now that 9999 (master) = catalyst_2 branch. Prepare work for creating a catalyst-3.9999 to

follow the catalyst_3 branch.
[dev-util/catalyst-2.0.7.1] Fix copyright.

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

4 files changed, 30 insertions, 24 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index 0e9e9ada7720..22f0cbbd9bf5 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,12 @@
 # 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.246 2012/07/27 05:14:07 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.247 2012/08/29 04:53:52 jmbsvicetto Exp $
+
+  29 Aug 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  catalyst-9999.ebuild:
+  [dev-util/catalyst-9999] Update ebuild now that 9999 (master) = catalyst_2
+  branch. Prepare work for creating a catalyst-3.9999 to 
+  follow the catalyst_3 branch.
 
 *catalyst-2.0.10.1 (27 Jul 2012)
 
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 1ae7012a1c19..bd0511707089 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -11,27 +11,27 @@ DIST catalyst-2.0.7.1.tar.bz2 901524 SHA256 77998b27cd8136c03380c1fdb271c69eae72
 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.7.1-r1.ebuild 3257 SHA256 b382cb53f3df782fa5874a4e981c4877245018cb3967996cc07ded310d9a2ebd SHA512 e91648730002d0fcea499046e38e7f9da50e8c6b37e027094a886b5a8cf4a3368e76c4ec61c7250960939dd4942e68e23d060efc1c04af32df1034bad608ab6c WHIRLPOOL 74220fa22e1f394447c6a242a0238d6564dd8989cd1234086fad2a50df5a154539a7e9e20bfd5ae407722e04af31365c6f382546c9c352ce90eeea24f266e39c
-EBUILD catalyst-2.0.7.1.ebuild 3191 SHA256 35e9e9d1ac7c53f786e72cabba37e2fe2fe9b4c2b3dfdf3bf46bf9e3a4cbf585 SHA512 56a54d052c1f084892d26bd62cfbca36ef142e672b67c4777d158b94baa0cc2e3755572adb2e0ab4e8348f4d5a65633766fe8515da60b363beec1d938697cad6 WHIRLPOOL 5920168a6359b48339b84084bf4c5c29c9da7b1cb9d337adb27ef251f91fdd6f044a142c76e3fd9b80a09ba7ace5eea43f84f03b97286f9f082aa804c26dfad6
+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 3305 SHA256 c53aa1d2e2fe185511525160b0d6e6e055b6db519688de8b497f5417a5996c98 SHA512 3103904c061b28070ec7c32b6f4969b020ff4be88f968e46a1e5a82acc51042f5391560cb767334607862e3db8a5fddfa25fa925a3fe4697c4b506f4594715fc WHIRLPOOL 7e8e806eb364e58e7dfc8f008a71dee9aea614336b002dfd745980f57c1d56fe2931490715fb92765ff9ff244d071a56cbe2a1c49d3e05eecfcd74bdc0a757f9
-MISC ChangeLog 53058 SHA256 8d39f905b648c4b2df9c46267312a324956d243200b2de3cbebab5cdfd65bf46 SHA512 11583de08b0ade3a5aaa6b61afae44bc9ea9e481cf9c48153ac4aa5009182b8b8715d558e771c20ee8578fdf86bcbc10710f66f60e6236a6e1e154261c559846 WHIRLPOOL 44dc3c0775b7fdacfcbca8c80773470d4b8c28d28d9a539923e35935a28ad838fc6bf0d36888fb6922ebd21cb1c5a64a0299cc193fd41eb1fc0d3d34b2e5543b
+EBUILD catalyst-9999.ebuild 3311 SHA256 8b9f5b72b0dc4a055fb50a699da4c6a54580c42f89d836d9a5a815ac3693286b SHA512 32654a8ff8786e6bb74a2371fb03ed8530247ee82605fc13d6d7bbfddc8f204b5c76c3f74fd5e750fc2e7df8acae420f875dca1ee38f97255e4e4e5a4a9f97e6 WHIRLPOOL 9180e4170eb3265abf8f3d3fb0363fc14cb6d880033f789470e893d94b07a7b820607e89e88d0f9cc0036255e91c4f18e92c02e331febf8a1e7fded3fd88903b
+MISC ChangeLog 53317 SHA256 7aa72085eeee29ec32dc4d1699f261bd45e260a4755b17070e28a4bba8a761f3 SHA512 272678b75c55bdd117248e97655a274042377bd68c9f862cb207624298eeadb1ba52e1385c5935c095930dd8faf35384fa422fc643457e7b206580851272e64a WHIRLPOOL b542d63f752c92240edde4f748af70d613db4a3080ef1e8fa1f84d7c28769bd3e64625cc4dcd3c5ea63232d94501b8653e6b5ca864ed18ccd816fc063b92a339
 MISC metadata.xml 302 SHA256 52c8f4e22cff9920c9a11b04ee574b28cd6fbf71a8212259d9d19122e0ddf955 SHA512 bd15682c5b17cde8b9b0ffe4559839eb2419b070659c388a21f3bba6b94d4a3861cbb76328c996c107e5fde9e4e4fd09e1f54d99e6d76df1ef25f1f52e557a2a WHIRLPOOL 5951e4d293d63763c8d1b922b6e7a88b3b8c3db0a3db5cae5bd4457920a8e14c338ff202d5d074e1893facddc8a04b83d83cefd6bd13d65029364d905f2c1450
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQEiObAAoJEC8ZTXQF1qEPFoEP/R9t+aT/9xTOl7sjC1saf5IS
-z/Wm0uh92CdR0vpt4fY3V9Ni+fmjkR4pucBAJB1v5Ws2bLdO0rLtTMlCaWon1+pH
-4yZtpkPYSZkeMlj8hFD4FTpLafLhxr3ZM2C40VbsiWcZn0YtOW0wq5//mHE/3oZX
-VItF1CGl5savigYW7RHDwjBvfWTCzRdRM+l4tlzr8sRbdCpnkpPupBCe+EgxfGh6
-qtCXC7uIn4Df4vvfoM5h2GFYsC7Iyq077Gj7jDhjwy3lVodbYk4ifgPV/3ekuO1/
-+Bq7ePz3hRPm+zzYhUcP1D7HJCavZsrkwOhQTTSBdn/f7d7jLfmMN2ffGSWvvf9E
-f64JeH0WYJzKb0Y/uaQMuIpO71bXI/lxbVxkgEda47d4xkHksO/sUnndnApcUCVq
-AZ4M7Q7lvc7zpMfmy7jKYJQiqhdqTJM+qkSrFD+VUK9uVZZiSmzo11cUMVGNDAXa
-AKMf0M41K+5sIc+TUU/usnlZNTJmFN6G3A7dv9BzCP18QncMQI607b6Ve67pkok/
-8pPbignyl8i2xPAn4Nu/AcNfj6Am8OHk5YhFfb5qmc3eHkCm8AReC8dYARLw5AY/
-BBKWniNCyxLNja7m8cQBMxTfL/09TIwUmXHCK3pBWWyLXWD3BOQhVMgmDwgC48Im
-dMMdJlEJ0GO48hYpgckN
-=anmR
+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/
 -----END PGP SIGNATURE-----
diff --git a/dev-util/catalyst/catalyst-2.0.7.1.ebuild b/dev-util/catalyst/catalyst-2.0.7.1.ebuild
index 4ccd72365fe5..fea57fc1392a 100644
--- a/dev-util/catalyst/catalyst-2.0.7.1.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.7.1.ebuild,v 1.2 2012/05/03 03:50:25 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.7.1.ebuild,v 1.3 2012/08/29 04:53:52 jmbsvicetto Exp $
 
 # catalyst-9999         -> latest Git
 # catalyst-2.9999       -> catalyst_2 branch from Git
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index b8f90f930746..e1a1a3ab390f 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,15 +1,15 @@
 # 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.20 2012/05/15 16:54:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild,v 1.21 2012/08/29 04:53:52 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* || ${PV} == 3.9999* ]]; then
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
 	inherit git-2
 	SRC_URI=""
@@ -51,7 +51,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* || ${PV} == 3.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 +69,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"