diff options
author | Matthias Schwarzott <zzam@gentoo.org> | 2009-01-31 14:34:36 +0000 |
---|---|---|
committer | Matthias Schwarzott <zzam@gentoo.org> | 2009-01-31 14:34:36 +0000 |
commit | d36b226f627353c37b7335399cb0f3ab2bf140bd (patch) | |
tree | ce55c7f57212930b653eda6853cb9f5f0e0766f8 /sys-apps/openrc | |
parent | Revbump to avoid bundling of unit tests in the jar. Migrate to EAPI 1. (diff) | |
download | historical-d36b226f627353c37b7335399cb0f3ab2bf140bd.tar.gz historical-d36b226f627353c37b7335399cb0f3ab2bf140bd.tar.bz2 historical-d36b226f627353c37b7335399cb0f3ab2bf140bd.zip |
Sync 0.4.2 and 9999 ebuild. This does not change anything for 0.4.2 ebuild.
Package-Manager: portage-2.1.6.7/cvs/Linux i686
Diffstat (limited to 'sys-apps/openrc')
-rw-r--r-- | sys-apps/openrc/ChangeLog | 7 | ||||
-rw-r--r-- | sys-apps/openrc/Manifest | 12 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-0.4.2.ebuild | 13 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-9999.ebuild | 11 |
4 files changed, 26 insertions, 17 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog index 7f779049dbdc..29c6f8623ff8 100644 --- a/sys-apps/openrc/ChangeLog +++ b/sys-apps/openrc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/openrc # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.60 2009/01/28 14:57:41 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.61 2009/01/31 14:34:36 zzam Exp $ + + 31 Jan 2009; Matthias Schwarzott <zzam@gentoo.org> openrc-0.4.2.ebuild, + openrc-9999.ebuild: + Sync 0.4.2 and 9999 ebuild. This does not change anything for 0.4.2 + ebuild. 28 Jan 2009; Matthias Schwarzott <zzam@gentoo.org> openrc-9999.ebuild: Use specialized svnversion command to get commit version. diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index f1442894e699..0e0f7c6a4919 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -16,14 +16,14 @@ AUX 9999/0003-KV.patch 2569 RMD160 7ccbca71beba996aedcec5aa1def57a96c008893 SHA1 DIST openrc-0.4.1.tar.bz2 144429 RMD160 86510cb298eaa8f5f8cef4569e4df903650935de SHA1 1e56096b02a91ae7f455765f3334dfa8cc887f97 SHA256 0b6de456b1f5398089f8d4f805dcee427dced4d6245dfe1427b1994c2d2fa16b DIST openrc-0.4.2.tar.bz2 144825 RMD160 68f559ddb41f5fcc367298f258b43bf667af45c3 SHA1 da75f8a9d81639fa7e5de5b398c3b807190be520 SHA256 df6463ba76b3700d803b3fe81c9cd6d511142225ada7ff655cb71b91ca1bf8af EBUILD openrc-0.4.1-r1.ebuild 10257 RMD160 09b1f0ef469dadb4db344e87f5695cbf40a487cc SHA1 e4294348c3540c3b5bdf779ade99b08aa45074f7 SHA256 eb90bb18cd80ff2449f2071f829cb1a672059320b03d81543d8133ca85588315 -EBUILD openrc-0.4.2.ebuild 10252 RMD160 d50560f03572594330f63566b483df3cc640f6bc SHA1 4bb4fcb46455b1957b8514bbcb140d46886a06cb SHA256 68b5f6a85797974c0670efa7d6be5098d760b524a3bcebdc6f37e6cadf499414 -EBUILD openrc-9999.ebuild 9993 RMD160 b4a1ce35884fde5c2b195f09e83813588fa4233a SHA1 baad29060f8732d6edb89cc5c6220c452923fc7d SHA256 9ea1610ff81a2b9b12c7960e8815d539612a376e5176ee206aa150cf595cf928 -MISC ChangeLog 12257 RMD160 cd265191929016359b934ac4809c26d35aca9763 SHA1 e04944fe7c655229afbeb61adae462459bfc171b SHA256 909df7f124c6fac8935b17c3f6de1d67b35295e8063d630991cd8a2575f7d514 +EBUILD openrc-0.4.2.ebuild 10228 RMD160 769c35cd085c3b45d722321c1d13d35b8c4c7283 SHA1 111aa2392d965846dc9ddf1c535010eec1524ed0 SHA256 b17d081ec30ae557bf5d2664b25e51f1b0425f08d4d8eba932c5a33672555681 +EBUILD openrc-9999.ebuild 10129 RMD160 8a832f78324e5d6c72c31dbfcf86b0da2732802b SHA1 00a8eb5b146e24fc0b8ffb8b374cb2d631ad0d2d SHA256 0f2dc2caf6471ee98530b1dd038c2656be660c2d413fc346241bd5f343ace4b7 +MISC ChangeLog 12434 RMD160 4e5ae8a15c432cd208995d8a59b8330e263fe7e9 SHA1 0c6cba9acca48a9d27470833c8bf76fbdeb44d5e SHA256 e74c1517b7034516b3b66c91d20169da41790466884c23738a6820f04118ba34 MISC metadata.xml 314 RMD160 ff92ab9cd3f1f3caf25d0be59cf658343d44991c SHA1 d9febb1ce1499c949a2478defda945a3ce716f73 SHA256 4eb82a61b3697027b5ccb1a328a763308c7e090aa23f69fe87b7b7966165fb33 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkmAcmsACgkQt2vP6XvVdOfOjQCg270HGfY2kwD20GmZs/x3DO8m -QHUAoIPNg9pJgfCFPf5kBJ8PoKx/tUVz -=7mp6 +iEYEARECAAYFAkmEYYYACgkQt2vP6XvVdOeT+QCfQUagpDa4q6XHQ0LKmgOgMRwT +qiAAnjPo5gwaCDwQvdlJvGUcx3iEtcXq +=/aDt -----END PGP SIGNATURE----- diff --git a/sys-apps/openrc/openrc-0.4.2.ebuild b/sys-apps/openrc/openrc-0.4.2.ebuild index 4444b84d9441..71ab0c7df3ba 100644 --- a/sys-apps/openrc/openrc-0.4.2.ebuild +++ b/sys-apps/openrc/openrc-0.4.2.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.2.ebuild,v 1.1 2009/01/14 14:19:47 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.2.ebuild,v 1.2 2009/01/31 14:34:36 zzam Exp $ inherit eutils flag-o-matic multilib toolchain-funcs if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git" - EGIT_BRANCH="master" - inherit git + ESVN_REPO_URI="svn://roy.marples.name/openrc/trunk" + inherit subversion else SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2 mirror://gentoo/${P}.tar.bz2 @@ -58,7 +57,7 @@ pkg_setup() { src_unpack() { if [[ ${PV} == "9999" ]] ; then - git_src_unpack + subversion_src_unpack else unpack ${A} fi @@ -73,8 +72,8 @@ src_compile() { fi if [[ ${PV} == "9999" ]] ; then - local ver="git-$(git --git-dir=${EGIT_STORE_DIR}/${EGIT_PROJECT} rev-parse --verify ${EGIT_BRANCH} | cut -c1-8)" - sed -i "/^VERSION[[:space:]]*=/s:=.*:=${ver}:" Makefile + local ver="-svn-$(cd "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}"; LC_ALL=C svnversion)" + sed -i "/^SVNVER[[:space:]]*=/s:=.*:=${ver}:" src/rc/Makefile fi tc-export CC AR RANLIB diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild index 0741cbf52c37..ec0437175358 100644 --- a/sys-apps/openrc/openrc-9999.ebuild +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 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.44 2009/01/28 14:57:41 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.45 2009/01/31 14:34:36 zzam Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -173,6 +173,9 @@ pkg_preinst() { fi done + # termencoding was added in 0.2.1 and needed in boot + has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding + # openrc-0.4.0 no longer loads the udev addon enable_udev=0 if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && \ @@ -280,11 +283,13 @@ pkg_postinst() { else if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then mkdir -p "${ROOT}"/etc/runlevels/sysinit - cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* "${ROOT}"/etc/runlevels/sysinit + cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* \ + "${ROOT}"/etc/runlevels/sysinit fi if [[ ! -e ${ROOT}/etc/runlevels/shutdown/mount-ro ]] ; then mkdir -p "${ROOT}"/etc/runlevels/shutdown - cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* "${ROOT}"/etc/runlevels/shutdown + cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* \ + "${ROOT}"/etc/runlevels/shutdown fi fi |