2.0.9 can't be released yet, so i'm forced to add patches here

Package-Manager: portage-2.1.11.5/cvs/Linux ia64
RepoMan-Options: --force

4 files changed, 159 insertions, 2 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index 1f1259e5bb34..da6964c637bc 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.244 2012/05/15 16:54:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.245 2012/07/08 16:19:56 armin76 Exp $
+
+*catalyst-2.0.8.1-r2 (08 Jul 2012)
+
+  08 Jul 2012; Raúl Porcel <armin76@gentoo.org>
+  +files/2.0.8.1-arm-softfp.patch, +catalyst-2.0.8.1-r2.ebuild:
+  2.0.9 can't be released yet, so i'm forced to add patches here
 
 *catalyst-2.0.8.1-r1 (15 May 2012)
 
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 98ed4f6ddc47..33032910dfda 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,13 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0001-Add-new-T-purgetmponly-option.patch 2970 SHA256 94c247c848c3e2ded833802ddabd297e7f9af961c19a6fe3dd9b0ab3d5ea3c1b SHA512 c013b351b7097538221a1833a94405d192ce7810dbf9b87538762893fdfe3e518a8531bb98076e279d4e1cacbd86925b010ed2400563f857b5700c89e86337c4 WHIRLPOOL e3314085fe82909218b33ada4b0f188c6a8fc039350fd6cc81f75172054e69f0c083b8352605b72fdfb1ad241401de7bd044d0952d1aeb083fac0ad114ba1408
 AUX 0001-add-etc-make.profile-to-cleanables-too.patch 782 SHA256 6d68579676276cb0dc75b5d40157be96529927cbf0f11c5798640dde89098b46 SHA512 7b3e5da135ec76547103d065c874309715c3d2325f25c5d5ced7580d21000018c839836b17e9deb6e43eb49521cc9c521697b356dbb831eae6116bbfdcb30021 WHIRLPOOL 3828d4dd4e22938a6c0498c76b12bd8562a10e500a1b4c41e540d05b04000d045b862f946cd532cc2636a266013ecf7d3e481d4630490a59e2f6c0fd5d520d1c
 AUX 0001-s-etc-make.profile-etc-portage-make.profile-g-Use-ne.patch 2682 SHA256 7cc392a9917b4721a3989d13d66d6ec561ebb4b4105ff5b5ae7b31f489514f66 SHA512 226021f0d32c42237f4f7356ed4dee2ad1afa9ba2ab8660be58cbab898eedbe919451526089e6812507eb5bc59335d8fbcca66946d0c5d9a5a1b06577b58b157 WHIRLPOOL b6371974b3405cdf8070905e6ffb43efbf1ebcc02a67964e9099d0b2e0582f7fb65cd963ce4fc07541c61408f06491478e2c8c2925dc03e0623ccb81a8fddea5
 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.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.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.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 52316 SHA256 bf35b93a652f44beb0918fbb7813e2f9362bcd75d58a475eef9d0e8371633ae9 SHA512 7fedb6a8ebcda82e3fc7e82df64ee39267880e384bd5fc1b4136e37ee6af11f3f668c0c8676a6f83fd4e3babc9a2b62b9455926d7b870bc829f3c9be383e474d WHIRLPOOL ee22c923ecda8335f0eefc6405cbc64566aeefcfa1bac4dc76f54375c65727cb34af78b4ce746a8303d95e29751b318d6f834c6974e88646be8d558631bed4a8
+MISC ChangeLog 52531 SHA256 c0829d5a631f899d3097f10d96cec37683206d3d8227a4a2afa3f6948a3d8244 SHA512 f15bc2b2b9a1fa27e82f3b3932be0ba3cddb228142c5cb91df8915c87802dc063244646f8b69d9aaac721065a4739d700545e2b50f7b98ec8f17cebaeb2b2580 WHIRLPOOL 1371f5f5676a8e0838600db353043a288dcc0a07934ec52521c8b1eefafb1b4e868527a358b6fd443b34d93f57ceea0b29b7fddeee3219ceb69ab2642c677940
 MISC metadata.xml 302 SHA256 52c8f4e22cff9920c9a11b04ee574b28cd6fbf71a8212259d9d19122e0ddf955 SHA512 bd15682c5b17cde8b9b0ffe4559839eb2419b070659c388a21f3bba6b94d4a3861cbb76328c996c107e5fde9e4e4fd09e1f54d99e6d76df1ef25f1f52e557a2a WHIRLPOOL 5951e4d293d63763c8d1b922b6e7a88b3b8c3db0a3db5cae5bd4457920a8e14c338ff202d5d074e1893facddc8a04b83d83cefd6bd13d65029364d905f2c1450
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk/5szUACgkQuQc30/atMkCafgCgpD3D9tc71TJS1S3fyIOu153m
+98oAn1fC8MOSNGK6muy/GM8Fdu4cruJe
+=RadJ
+-----END PGP SIGNATURE-----
diff --git a/dev-util/catalyst/catalyst-2.0.8.1-r2.ebuild b/dev-util/catalyst/catalyst-2.0.8.1-r2.ebuild
new file mode 100644
index 000000000000..815fe0713d3c
--- /dev/null
+++ b/dev-util/catalyst/catalyst-2.0.8.1-r2.ebuild
@@ -0,0 +1,103 @@
+# 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.8.1-r2.ebuild,v 1.1 2012/07/08 16:19:56 armin76 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
+
+	epatch "${FILESDIR}"/${PV}-arm-softfp.patch
+}
+
+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/files/2.0.8.1-arm-softfp.patch b/dev-util/catalyst/files/2.0.8.1-arm-softfp.patch
new file mode 100644
index 000000000000..51ae1e718740
--- /dev/null
+++ b/dev-util/catalyst/files/2.0.8.1-arm-softfp.patch
@@ -0,0 +1,36 @@
+diff -ur catalyst-2.0.8.1.orig//arch/arm.py catalyst-2.0.8.1/arch/arm.py
+--- catalyst-2.0.8.1.orig//arch/arm.py	2012-07-07 20:28:46.788719269 +0200
++++ catalyst-2.0.8.1/arch/arm.py	2012-07-07 20:29:28.099721112 +0200
+@@ -67,28 +67,28 @@
+ 	"Builder class for armv6j target"
+ 	def __init__(self,myspec):
+ 		generic_arm.__init__(self,myspec)
+-		self.settings["CHOST"]="armv6j-unknown-linux-gnueabi"
++		self.settings["CHOST"]="armv6j-softfp-linux-gnueabi"
+ 		self.settings["CFLAGS"]+=" -march=armv6j -mfpu=vfp -mfloat-abi=softfp"
+ 
+ class arch_armv6z(generic_arm):
+ 	"Builder class for armv6z target"
+ 	def __init__(self,myspec):
+ 		generic_arm.__init__(self,myspec)
+-		self.settings["CHOST"]="armv6z-unknown-linux-gnueabi"
++		self.settings["CHOST"]="armv6z-softfp-linux-gnueabi"
+ 		self.settings["CFLAGS"]+=" -march=armv6z -mfpu=vfp -mfloat-abi=softfp"
+ 
+ class arch_armv6zk(generic_arm):
+ 	"Builder class for armv6zk target"
+ 	def __init__(self,myspec):
+ 		generic_arm.__init__(self,myspec)
+-		self.settings["CHOST"]="armv6zk-unknown-linux-gnueabi"
++		self.settings["CHOST"]="armv6zk-softfp-linux-gnueabi"
+ 		self.settings["CFLAGS"]+=" -march=armv6zk -mfpu=vfp -mfloat-abi=softfp"
+ 
+ class arch_armv7a(generic_arm):
+ 	"Builder class for armv7a target"
+ 	def __init__(self,myspec):
+ 		generic_arm.__init__(self,myspec)
+-		self.settings["CHOST"]="armv7a-unknown-linux-gnueabi"
++		self.settings["CHOST"]="armv7a-softfp-linux-gnueabi"
+ 		self.settings["CFLAGS"]+=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
+ 
+ class arch_armv6j_hardfp(generic_arm):
\ No newline at end of file