Migrate to EAPI=4. Acked by William and Jeremy.

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

3 files changed, 28 insertions, 32 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 6d6045cb85f2..250a485a64c4 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -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 2011/05/13 19:06:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.151 2011/05/20 16:29:33 scarabeus Exp $
+
+  20 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> openrc-9999.ebuild:
+  Migrate to EAPI=4. Acked by William and Jeremy.
 
   13 May 2011; Raúl Porcel <armin76@gentoo.org> openrc-0.8.2-r1.ebuild:
   alpha/arm/ia64/sh/sparc stable wrt #295613
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 2c0cdc004773..a1a4b41b63e9 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -11,13 +11,13 @@ EBUILD openrc-0.6.8.ebuild 14186 RMD160 7eee5fa69add6020e41a1e21145d25eba307b94c
 EBUILD openrc-0.7.0.ebuild 14237 RMD160 542e5cd3ae6d064c04f82930fe1f39e34064f8fe SHA1 4212faba9a7741a69a96881d4eef40e4b782112a SHA256 28f69ab8df400048363b27e49c667ee12d6dea80164ea523eba889d28ad64540
 EBUILD openrc-0.8.2-r1.ebuild 14120 RMD160 ad67dbc537464dfe8896293a6751194125e6744f SHA1 96b406df7b587f6e7d5bf2d876520d609593d8b7 SHA256 6c394fcbcd050ceace6f6a5b0b709d97e1679471992cb03d5dec573cf824e183
 EBUILD openrc-0.8.2.ebuild 14128 RMD160 e1672e74f11ddf98e113fa577603bdc16d7c1b6b SHA1 7de036d35651eaa82d02ff4962f9c25919d5595b SHA256 8d0bd4b6605f1561537f0df75203514226fa4f92aa2f983ddc2c758db67354ec
-EBUILD openrc-9999.ebuild 14128 RMD160 0c06229c897ab30f8417df8c7a5e4ee17ae0d29e SHA1 03f927795e20975a2884d4e91af7ce0bfb1a4f80 SHA256 2991088bba4db1ad9985e9564dbce9ec1027e418c2ab639a9eeb36c55cf1cfd8
-MISC ChangeLog 28054 RMD160 4ddf554fd95a536791413e71e30d8b14477cc41d SHA1 fcc207f6d3db8a48377048bb59278fee0f1c9e66 SHA256 45474f6cdf39e4e72979455494342037eb564731e4a53d5713bd6e1e8f475736
+EBUILD openrc-9999.ebuild 14048 RMD160 5b40a84c136ab4d2ab260e9cf8fda0d696c817c2 SHA1 5ec7294a350a4b5e3344dc6007f8292028e289aa SHA256 eba97830f772d2284b674682032c1741201da5d1c09b9933dbd5e343516b58d9
+MISC ChangeLog 28182 RMD160 ff90f2da34fe3bcf1b296785e7d83486ec81ee41 SHA1 3d73f23b6a68232aa3dab15c2a76a16b0b158c36 SHA256 cde28f2dfacf6bd0b23093c07db85d917d8e76ff67f4f77ab4ac21b1c9e610be
 MISC metadata.xml 159 RMD160 b92bb52b0f2ee2c0ee08ac8b32f98c3521f9d480 SHA1 aac3cb897981c4918f5f2244d192b5bcc6727d36 SHA256 ca2e1a5ac106397eca5111140a1b07830e4d5dfacbeadba359fe17896c33a6c8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3NgU0ACgkQuQc30/atMkBaYQCfV5L+VbKXCI9t+plh3+ZSWFw5
-9W8AoKDDk0JSmZiy2qKLuK6BBRzQAvlX
-=6vmM
+iEYEARECAAYFAk3WlvIACgkQHB6c3gNBRYeZagCeIzKkmY6bsNl13e6XKWereSea
+PXcAoMG9rdXEqaIinFNplYBBG2jOSxAs
+=HW9v
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 2bf78f278cbb..2b843107bb91 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -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 $
 
-EAPI="1"
+EAPI=4
 
-inherit eutils flag-o-matic multilib toolchain-funcs
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git"
+[[ ${PV} == "9999" ]] && SCM_ECLASS="git-2"
+inherit eutils flag-o-matic multilib toolchain-funcs ${SCM_ECLASS}
+unset SCM_ECLASS
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git"
-	inherit git
-	KEYWORDS=""
-else
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/"
+if [[ ${PV} != "9999" ]] ; then
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 fi
 
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/"
-
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="debug elibc_glibc ncurses pam selinux unicode kernel_linux kernel_FreeBSD"
@@ -60,15 +58,14 @@ pkg_setup() {
 	export MKTERMCAP=$(usev ncurses)
 }
 
-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} == "9999" ]] ; then
-		git_src_unpack
-	else
-		unpack ${A}
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${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
 
 	# Allow user patches to be applied without modifying the ebuild
 	epatch_user
@@ -77,13 +74,8 @@ src_unpack() {
 src_compile() {
 	make_args
 
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-$(echo ${EGIT_VERSION} | cut -c1-8)"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk
-	fi
-
 	tc-export CC AR RANLIB
-	emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed"
+	emake ${MAKE_ARGS}
 }
 
 # set_config <file> <option name> <yes value> <no value> test
@@ -94,13 +86,14 @@ set_config() {
 	[[ ${val} == "#" ]] && com="#" && val='\2'
 	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
 }
+
 set_config_yes_no() {
 	set_config "$1" "$2" YES NO "${@:3}"
 }
 
 src_install() {
 	make_args
-	emake ${MAKE_ARGS} DESTDIR="${D}" install || die
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
 
 	# install the readme for the new network scripts
 	dodoc README.newnet