summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-03-10 11:52:51 +0000
committerRoy Marples <roy@marples.name>2008-03-10 11:52:51 +0000
commit13b564728499e874623275801ef2eca29f5fc2fe (patch)
tree522f9f0aebf3a9340d2935421c74ad3ab986956c
parentRemove deps on coreutils (it's in system profile) and makedev. (diff)
downloaduberlord-13b564728499e874623275801ef2eca29f5fc2fe.tar.gz
uberlord-13b564728499e874623275801ef2eca29f5fc2fe.tar.bz2
uberlord-13b564728499e874623275801ef2eca29f5fc2fe.zip
Fix inherit.
-rw-r--r--sys-apps/openrc/Manifest2
-rw-r--r--sys-apps/openrc/openrc-9999.ebuild15
2 files changed, 11 insertions, 6 deletions
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 42276a0..e540ce6 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1 +1 @@
-EBUILD openrc-9999.ebuild 4178 RMD160 0a7722ea023327502cfb4314bdf471caf1333276 SHA1 a55adfe8629886985b7cd902db56a209959e3fff SHA256 25867ec78ae76002967498ebf0d5e3148658f8ad9c70b4d8eb9250e7f2683510
+EBUILD openrc-9999.ebuild 4174 RMD160 9f092e8445657f49b2e146f06613812980e66e91 SHA1 20d2f761dc54ebc965d434955852ec25fc3b4e03 SHA256 898bfd84e94a7c4abafbfacca55e55a0248fb8259d8e4602849aaa9e98dfb1ce
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 02abf68..e3a70d6 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,10 +1,15 @@
-inherit flag-o-matic eutils toolchain-funcs multilib
+if [ "${PV}" = "9999" ]; then
+GIT=git
+else
+GIT=
+fi
+
+inherit eutils flag-o-matic ${GIT} multilib toolchain-funcs
DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
HOMEPAGE="http://roy.marples.name/openrc"
if [ "${PV}" = "9999" ]; then
-inherit git
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git"
else
SRC_URI="http://roy.marples.name/${PN}/${P}.tar.bz2"
@@ -53,7 +58,7 @@ pkg_setup() {
fi
if use static && ! use pam; then
if use elibc_glibc; then
- MAKE_ARGS="${MAKE_ARG} PROGLDFLAGS=-Wl,-Bstatic"
+ MAKE_ARGS="${MAKE_ARGS} PROGLDFLAGS=-Wl,-Bstatic"
else
MAKE_ARGS="${MAKE_ARGS} PROGLDFLAGS=-static"
fi
@@ -128,8 +133,8 @@ pkg_postinst() {
"${ROOT}"etc/runlevels/boot/checkroot \
"${ROOT}"etc/runlevels/boot/rmnologin
- # Make our runlevels if they don't exist or we're a development version.
- if [ ! -e "${ROOT}"etc/runlevels -o "${PV}" = "9999" ]; then
+ # Make our runlevels if they don't exist
+ if [ ! -e "${ROOT}"etc/runlevels ]; then
einfo "Copying across default runlevels"
cp -RPp "${ROOT}"usr/share/"${PN}"/runlevels "${ROOT}"/etc
fi