Attachment #292291 for bug #324377




# catalyst-2.9999       -> catalyst_2 branch from Git
# catalyst-VER          -> normal catalyst release

EAPI=3

if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"

	SRC_URI="mirror://gentoo/${P}.tar.bz2"
	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
fi
PYTHON_DEPEND="*:2.6"
inherit eutils multilib python

DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"

IUSE="ccache"

DEPEND=""
RDEPEND="app-crypt/shash
	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() {
	python_pkg_setup
	if use ccache ; then
		einfo "Enabling ccache support for catalyst."
	else

		/etc/catalyst/catalyst.conf
	dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
		/etc/catalyst/catalyst.conf
	python_convert_shebangs -r 2 "${ED}"
}

pkg_postinst() {

Lines 6-12 Link Here

(-)catalyst.orig/catalyst-2.0.6.918.ebuild (-2 / +6 lines)
6	# catalyst-2.9999 -> catalyst_2 branch from Git	6	# catalyst-2.9999 -> catalyst_2 branch from Git
7	# catalyst-VER -> normal catalyst release	7	# catalyst-VER -> normal catalyst release
8		8
9	EAPI=2	9	EAPI="3"
10		10
11	if [[ ${PV} == 9999* \|\| ${PV} == 2.9999* ]]; then	11	if [[ ${PV} == 9999* \|\| ${PV} == 2.9999* ]]; then
12	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"	12	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
Lines 19-25 Link Here
19	http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2"	19	http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2"
20	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"	20	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
21	fi	21	fi
22	inherit eutils multilib	22
		23	PYTHON_DEPEND="*:2.6"
		24	inherit eutils multilib python
23		25
24	DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"	26	DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
25	HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"	27	HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
Lines 38-43 Link Here
38	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"	40	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
39		41
40	pkg_setup() {	42	pkg_setup() {
		43	python_pkg_setup
41	if use ccache ; then	44	if use ccache ; then
42	einfo "Enabling ccache support for catalyst."	45	einfo "Enabling ccache support for catalyst."
43	else	46	else
Lines 93-96 Link Here
93	einfo "catalyst project page at:"	96	einfo "catalyst project page at:"
94	einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"	97	einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
95	echo	98	echo
		99	python_convert_shebangs -r 2 "${ED}"
96	}	100	}




# catalyst-2.9999       -> catalyst_2 branch from Git
# catalyst-VER          -> normal catalyst release

EAPI="3"
PYTHON_DEPEND="*:2.6"
inherit eutils multilib python

SRC_URI="mirror://gentoo/${P}.tar.bz2
	http://wolf31o2.org/sources/${PN}/${P}.tar.bz2"


IUSE="ccache"

DEPEND=""
RDEPEND="app-crypt/shash
	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() {
	python_pkg_setup
	if use ccache ; then
		einfo "Enabling ccache support for catalyst."
	else

		/etc/catalyst/catalyst.conf
	dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
		/etc/catalyst/catalyst.conf
	python_convert_shebangs -r 2 "${ED}"
}

pkg_postinst() {

Return to bug 324377

Lines 6-12 Link Here

(-)catalyst.orig/catalyst-2.0.6.916.ebuild (-4 / +6 lines)
6	# catalyst-2.9999 -> catalyst_2 branch from Git	6	# catalyst-2.9999 -> catalyst_2 branch from Git
7	# catalyst-VER -> normal catalyst release	7	# catalyst-VER -> normal catalyst release
8		8
9	EAPI=2	9	EAPI=3
10		10
11	if [[ ${PV} == 9999* \|\| ${PV} == 2.9999* ]]; then	11	if [[ ${PV} == 9999* \|\| ${PV} == 2.9999* ]]; then
12	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"	12	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
Lines 18-24 Link Here
18	SRC_URI="mirror://gentoo/${P}.tar.bz2"	18	SRC_URI="mirror://gentoo/${P}.tar.bz2"
19	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"	19	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
20	fi	20	fi
21	inherit eutils multilib	21	PYTHON_DEPEND="*:2.6"
		22	inherit eutils multilib python
22		23
23	DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"	24	DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
24	HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"	25	HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
Lines 29-42 Link Here
29	IUSE="ccache"	30	IUSE="ccache"
30		31
31	DEPEND=""	32	DEPEND=""
32	RDEPEND="dev-lang/python	33	RDEPEND="app-crypt/shash
33	app-crypt/shash
34	virtual/cdrtools	34	virtual/cdrtools
35	ccache? ( dev-util/ccache )	35	ccache? ( dev-util/ccache )
36	ia64? ( sys-fs/dosfstools )	36	ia64? ( sys-fs/dosfstools )
37	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"	37	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
38		38
39	pkg_setup() {	39	pkg_setup() {
		40	python_pkg_setup
40	if use ccache ; then	41	if use ccache ; then
41	einfo "Enabling ccache support for catalyst."	42	einfo "Enabling ccache support for catalyst."
42	else	43	else
Lines 85-90 Link Here
85	/etc/catalyst/catalyst.conf	86	/etc/catalyst/catalyst.conf
86	dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \	87	dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
87	/etc/catalyst/catalyst.conf	88	/etc/catalyst/catalyst.conf
		89	python_convert_shebangs -r 2 "${ED}"
88	}	90	}
89		91
90	pkg_postinst() {	92	pkg_postinst() {

Lines 6-12 Link Here

(-)catalyst.orig/catalyst-2.0.6.ebuild (-3 / +7 lines)
6	# catalyst-2.9999 -> catalyst_2 branch from Git	6	# catalyst-2.9999 -> catalyst_2 branch from Git
7	# catalyst-VER -> normal catalyst release	7	# catalyst-VER -> normal catalyst release
8		8
9	inherit eutils multilib	9	EAPI="3"
		10	PYTHON_DEPEND="*:2.6"
		11	inherit eutils multilib python
		12
10	SRC_URI="mirror://gentoo/${P}.tar.bz2	13	SRC_URI="mirror://gentoo/${P}.tar.bz2
11	http://wolf31o2.org/sources/${PN}/${P}.tar.bz2"	14	http://wolf31o2.org/sources/${PN}/${P}.tar.bz2"
12		15
Lines 22-35 Link Here
22	IUSE="ccache"	25	IUSE="ccache"
23		26
24	DEPEND=""	27	DEPEND=""
25	RDEPEND="dev-lang/python	28	RDEPEND="app-crypt/shash
26	app-crypt/shash
27	virtual/cdrtools	29	virtual/cdrtools
28	ccache? ( dev-util/ccache )	30	ccache? ( dev-util/ccache )
29	ia64? ( sys-fs/dosfstools )	31	ia64? ( sys-fs/dosfstools )
30	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"	32	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
31		33
32	pkg_setup() {	34	pkg_setup() {
		35	python_pkg_setup
33	if use ccache ; then	36	if use ccache ; then
34	einfo "Enabling ccache support for catalyst."	37	einfo "Enabling ccache support for catalyst."
35	else	38	else
Lines 71-76 Link Here
71	/etc/catalyst/catalyst.conf	74	/etc/catalyst/catalyst.conf
72	dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \	75	dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
73	/etc/catalyst/catalyst.conf	76	/etc/catalyst/catalyst.conf
		77	python_convert_shebangs -r 2 "${ED}"
74	}	78	}
75		79
76	pkg_postinst() {	80	pkg_postinst() {