* [gentoo-commits] gentoo-x86 commit in dev-util/catalyst: catalyst-2.0.6.916.ebuild ChangeLog catalyst-9999.ebuild catalyst-2.0.6.ebuild
@ 2011-06-22 19:36 Sebastian Pipping (sping)
0 siblings, 0 replies; only message in thread
From: Sebastian Pipping (sping) @ 2011-06-22 19:36 UTC (permalink / raw
To: gentoo-commits
sping 11/06/22 19:36:33
Modified: catalyst-2.0.6.916.ebuild ChangeLog
catalyst-9999.ebuild catalyst-2.0.6.ebuild
Log:
dev-util/catalyst: Bring 2.0.6.916 and 9999 ebuilds back in sync
(Portage version: 2.1.10.3/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-util/catalyst/catalyst-2.0.6.916.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.916.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.916.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.916.ebuild?r1=1.1&r2=1.2
Index: catalyst-2.0.6.916.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.916.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- catalyst-2.0.6.916.ebuild 14 Apr 2011 16:54:18 -0000 1.1
+++ catalyst-2.0.6.916.ebuild 22 Jun 2011 19:36:33 -0000 1.2
@@ -1,19 +1,28 @@
# 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.1 2011/04/14 16:54:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.916.ebuild,v 1.2 2011/06/22 19:36:33 sping Exp $
+# catalyst-9999 -> latest Git
+# catalyst-VER -> normal catalyst release
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
+ inherit git
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+ KEYWORDS=""
+else
+ SRC_URI="mirror://gentoo/${P}.tar.bz2
+ http://wolf31o2.org/sources/${PN}/${P}.tar.bz2"
+ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+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://wolf31o2.org/projects/catalyst"
+HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
LICENSE="GPL-2"
SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-#KEYWORDS=""
RESTRICT=""
IUSE="ccache"
@@ -38,18 +47,23 @@
einfo "them under /usr/share/doc/${PF}/examples"
einfo "and they are considered to be the authorative source of information"
einfo "on catalyst."
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
+ 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."
}
src_install() {
insinto /usr/$(get_libdir)/${PN}
exeinto /usr/$(get_libdir)/${PN}
doexe catalyst || die "copying catalyst"
- doins -r arch modules livecd || die "copying files"
+ 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}"
1.227 dev-util/catalyst/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/ChangeLog?rev=1.227&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/ChangeLog?rev=1.227&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/ChangeLog?r1=1.226&r2=1.227
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- ChangeLog 14 Apr 2011 16:54:18 -0000 1.226
+++ ChangeLog 22 Jun 2011 19:36:33 -0000 1.227
@@ -1,6 +1,11 @@
# 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.226 2011/04/14 16:54:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.227 2011/06/22 19:36:33 sping Exp $
+
+ 22 Jun 2011; Sebastian Pipping <sping@gentoo.org> catalyst-2.0.6.ebuild,
+ catalyst-2.0.6.916.ebuild, catalyst-9999.ebuild:
+ Bring 2.0.6.916 and 9999 ebuilds back in sync, remove SVN bits, update
+ homepage
*catalyst-2.0.6.916 (14 Apr 2011)
1.11 dev-util/catalyst/catalyst-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild?r1=1.10&r2=1.11
Index: catalyst-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- catalyst-9999.ebuild 5 Sep 2010 20:10:27 -0000 1.10
+++ catalyst-9999.ebuild 22 Jun 2011 19:36:33 -0000 1.11
@@ -1,32 +1,28 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.10 2010/09/05 20:10:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild,v 1.11 2011/06/22 19:36:33 sping Exp $
-# catalyst-9999 -> latest SVN
-# catalyst-9999.REV -> use SVN REV
+# catalyst-9999 -> latest Git
# catalyst-VER -> normal catalyst release
-if [[ ${PV} == 9999* ]]
-then
- [[ ${PV} == 9999.* ]] && ESVN_UPDATE_CMD="svn up -r ${PV/9999./}"
+if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
- inherit git eutils multilib
+ inherit git
SRC_URI=""
S="${WORKDIR}/${PN}"
+ KEYWORDS=""
else
- inherit eutils multilib
SRC_URI="mirror://gentoo/${P}.tar.bz2
http://wolf31o2.org/sources/${PN}/${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://wolf31o2.org/projects/catalyst"
+HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
LICENSE="GPL-2"
SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-#KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-KEYWORDS=""
RESTRICT=""
IUSE="ccache"
@@ -59,20 +55,15 @@
ewarn "mailing list and we have asked you to do so."
}
-src_unpack() {
- if [[ ${PV} == 9999* ]] ; then
- git_src_unpack
- else
- unpack ${A}
- cd "${S}"
- fi
-}
-
src_install() {
insinto /usr/$(get_libdir)/${PN}
exeinto /usr/$(get_libdir)/${PN}
doexe catalyst || die "copying catalyst"
- doins -r modules files || die "copying files"
+ 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}"
1.6 dev-util/catalyst/catalyst-2.0.6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.ebuild?r1=1.5&r2=1.6
Index: catalyst-2.0.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- catalyst-2.0.6.ebuild 19 Sep 2009 22:35:07 -0000 1.5
+++ catalyst-2.0.6.ebuild 22 Jun 2011 19:36:33 -0000 1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.5 2009/09/19 22:35:07 agaffney Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.ebuild,v 1.6 2011/06/22 19:36:33 sping Exp $
# catalyst-9999 -> latest SVN
# catalyst-9999.REV -> use SVN REV
@@ -20,7 +20,7 @@
fi
DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="http://wolf31o2.org/projects/catalyst"
+HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
LICENSE="GPL-2"
SLOT="0"
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-06-22 19:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-22 19:36 [gentoo-commits] gentoo-x86 commit in dev-util/catalyst: catalyst-2.0.6.916.ebuild ChangeLog catalyst-9999.ebuild catalyst-2.0.6.ebuild Sebastian Pipping (sping)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox