From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QNSa6-0008SJ-AS for garchives@archives.gentoo.org; Fri, 20 May 2011 16:29:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EC061C060; Fri, 20 May 2011 16:29:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3ABCA1C060 for ; Fri, 20 May 2011 16:29:35 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 91A641B4057 for ; Fri, 20 May 2011 16:29:34 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2230) id 257A020054; Fri, 20 May 2011 16:29:33 +0000 (UTC) From: "Tomas Chvatal (scarabeus)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, scarabeus@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: ChangeLog openrc-9999.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog openrc-9999.ebuild X-VCS-Directories: sys-apps/openrc X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Message-Id: <20110520162933.257A020054@flycatcher.gentoo.org> Date: Fri, 20 May 2011 16:29:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 983f9063014c2d6fbf4859a7b608f033 scarabeus 11/05/20 16:29:33 Modified: ChangeLog openrc-9999.ebuild Log: Migrate to EAPI=3D4. Acked by William and Jeremy. =20 (Portage version: 2.2.0_alpha34/cvs/Linux x86_64) Revision Changes Path 1.151 sys-apps/openrc/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/Ch= angeLog?rev=3D1.151&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/Ch= angeLog?rev=3D1.151&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/Ch= angeLog?r1=3D1.150&r2=3D1.151 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- ChangeLog 13 May 2011 19:06:47 -0000 1.150 +++ ChangeLog 20 May 2011 16:29:33 -0000 1.151 @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/openrc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.150 201= 1/05/13 19:06:47 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.151 201= 1/05/20 16:29:33 scarabeus Exp $ + + 20 May 2011; Tom=C3=A1=C5=A1 Chv=C3=A1tal openr= c-9999.ebuild: + Migrate to EAPI=3D4. Acked by William and Jeremy. =20 13 May 2011; Ra=C3=BAl Porcel openrc-0.8.2-r1.ebu= ild: alpha/arm/ia64/sh/sparc stable wrt #295613 1.83 sys-apps/openrc/openrc-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/op= enrc-9999.ebuild?rev=3D1.83&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/op= enrc-9999.ebuild?rev=3D1.83&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/op= enrc-9999.ebuild?r1=3D1.82&r2=3D1.83 Index: openrc-9999.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- openrc-9999.ebuild 17 Apr 2011 21:02:51 -0000 1.82 +++ openrc-9999.ebuild 20 May 2011 16:29:33 -0000 1.83 @@ -1,23 +1,21 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v = 1.82 2011/04/17 21:02:51 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v = 1.83 2011/05/20 16:29:33 scarabeus Exp $ =20 -EAPI=3D"1" +EAPI=3D4 =20 -inherit eutils flag-o-matic multilib toolchain-funcs +EGIT_REPO_URI=3D"git://git.overlays.gentoo.org/proj/${PN}.git" +[[ ${PV} =3D=3D "9999" ]] && SCM_ECLASS=3D"git-2" +inherit eutils flag-o-matic multilib toolchain-funcs ${SCM_ECLASS} +unset SCM_ECLASS =20 -if [[ ${PV} =3D=3D "9999" ]] ; then - EGIT_REPO_URI=3D"git://git.overlays.gentoo.org/proj/openrc.git" - inherit git - KEYWORDS=3D"" -else +DESCRIPTION=3D"OpenRC manages the services, startup and shutdown of a ho= st" +HOMEPAGE=3D"http://www.gentoo.org/proj/en/base/openrc/" +if [[ ${PV} !=3D "9999" ]] ; then SRC_URI=3D"mirror://gentoo/${P}.tar.bz2" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s39= 0 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" fi =20 -DESCRIPTION=3D"OpenRC manages the services, startup and shutdown of a ho= st" -HOMEPAGE=3D"http://www.gentoo.org/proj/en/base/openrc/" - LICENSE=3D"BSD-2" SLOT=3D"0" IUSE=3D"debug elibc_glibc ncurses pam selinux unicode kernel_linux kerne= l_FreeBSD" @@ -60,15 +58,14 @@ export MKTERMCAP=3D$(usev ncurses) } =20 -src_unpack() { +src_prepare() { + sed -i 's:0444:0644:' mk/sys.mk || die + sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile || die #241342 + if [[ ${PV} =3D=3D "9999" ]] ; then - git_src_unpack - else - unpack ${A} + local ver=3D"git-${EGIT_VERSION:0:6}" + sed -i "/^GITVER[[:space:]]*=3D/s:=3D.*:=3D${ver}:" mk/git.mk || die fi - cd "${S}" - sed -i 's:0444:0644:' mk/sys.mk - sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile #241342 =20 # Allow user patches to be applied without modifying the ebuild epatch_user @@ -77,13 +74,8 @@ src_compile() { make_args =20 - if [[ ${PV} =3D=3D "9999" ]] ; then - local ver=3D"git-$(echo ${EGIT_VERSION} | cut -c1-8)" - sed -i "/^GITVER[[:space:]]*=3D/s:=3D.*:=3D${ver}:" mk/git.mk - fi - tc-export CC AR RANLIB - emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed" + emake ${MAKE_ARGS} } =20 # set_config