| 1 |
commit: 6d7bfdd19f9d581568b9b9522644535bb1c48f61 |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 7 19:28:40 2021 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 7 19:29:12 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d7bfdd1 |
| 7 |
|
| 8 |
sys-apps/openrc: convert live ebuild to use upstream meson build |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 11 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/openrc/openrc-9999.ebuild | 58 +++++++++++++------------------------- |
| 14 |
1 file changed, 19 insertions(+), 39 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild |
| 17 |
index 1b2b297f302..2c2da59b749 100644 |
| 18 |
--- a/sys-apps/openrc/openrc-9999.ebuild |
| 19 |
+++ b/sys-apps/openrc/openrc-9999.ebuild |
| 20 |
@@ -3,22 +3,22 @@ |
| 21 |
|
| 22 |
EAPI=7 |
| 23 |
|
| 24 |
-inherit flag-o-matic pam toolchain-funcs |
| 25 |
+inherit flag-o-matic meson pam toolchain-funcs |
| 26 |
|
| 27 |
DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" |
| 28 |
HOMEPAGE="https://github.com/openrc/openrc/" |
| 29 |
|
| 30 |
-if [[ ${PV} == "9999" ]]; then |
| 31 |
+if [[ ${PV} =~ ^9{4,}$ ]]; then |
| 32 |
EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git" |
| 33 |
inherit git-r3 |
| 34 |
else |
| 35 |
- SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 36 |
+ SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 37 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
| 38 |
fi |
| 39 |
|
| 40 |
LICENSE="BSD-2" |
| 41 |
SLOT="0" |
| 42 |
-IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils unicode" |
| 43 |
+IUSE="audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode" |
| 44 |
|
| 45 |
COMMON_DEPEND=" |
| 46 |
ncurses? ( sys-libs/ncurses:0= ) |
| 47 |
@@ -55,37 +55,20 @@ RDEPEND="${COMMON_DEPEND} |
| 48 |
|
| 49 |
PDEPEND="netifrc? ( net-misc/netifrc )" |
| 50 |
|
| 51 |
-src_prepare() { |
| 52 |
- default |
| 53 |
- if [[ ${PV} == "9999" ]] ; then |
| 54 |
- local ver="git-${EGIT_VERSION:0:6}" |
| 55 |
- sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die |
| 56 |
- fi |
| 57 |
-} |
| 58 |
- |
| 59 |
-src_compile() { |
| 60 |
- MAKE_ARGS="${MAKE_ARGS} |
| 61 |
- LIBNAME=$(get_libdir) |
| 62 |
- LIBDIR=${EPREFIX}/$(get_libdir) |
| 63 |
- LIBEXECDIR=${EPREFIX}/lib/rc |
| 64 |
- MKBASHCOMP=yes |
| 65 |
- MKNET=$(usex newnet) |
| 66 |
- MKSELINUX=$(usex selinux) |
| 67 |
- MKSYSVINIT=$(usex sysv-utils) |
| 68 |
- MKAUDIT=$(usex audit) |
| 69 |
- MKPAM=$(usev pam) |
| 70 |
- MKSTATICLIBS=no |
| 71 |
- MKZSHCOMP=yes |
| 72 |
- OS=Linux |
| 73 |
- SH=$(usex bash /bin/bash /bin/sh)" |
| 74 |
- |
| 75 |
- use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" |
| 76 |
-export BRANDING="Gentoo Linux" |
| 77 |
- export DEBUG=$(usev debug) |
| 78 |
- export MKTERMCAP=$(usev ncurses) |
| 79 |
- |
| 80 |
- tc-export CC AR RANLIB |
| 81 |
- emake ${MAKE_ARGS} |
| 82 |
+src_configure() { |
| 83 |
+ local emesonargs=( |
| 84 |
+ $(meson_feature audit) |
| 85 |
+ "-Dbranding=\"Gentoo Linux\"" |
| 86 |
+ $(meson_use newnet) |
| 87 |
+ -Dos=Linux |
| 88 |
+ $(meson_use pam) |
| 89 |
+ $(meson_feature selinux) |
| 90 |
+ -Dshell=$(usex bash /bin/bash /bin/sh) |
| 91 |
+ $(meson_use sysv-utils sysvinit) |
| 92 |
+ -Dtermcap=$(usev ncurses) |
| 93 |
+ ) |
| 94 |
+ # export DEBUG=$(usev debug) |
| 95 |
+ meson_src_configure |
| 96 |
} |
| 97 |
|
| 98 |
# set_config <file> <option name> <yes value> <no value> test |
| 99 |
@@ -102,7 +85,7 @@ set_config_yes_no() { |
| 100 |
} |
| 101 |
|
| 102 |
src_install() { |
| 103 |
- emake ${MAKE_ARGS} DESTDIR="${D}" install |
| 104 |
+ meson_install |
| 105 |
|
| 106 |
keepdir /lib/rc/tmp |
| 107 |
|
| 108 |
@@ -129,9 +112,6 @@ src_install() { |
| 109 |
|
| 110 |
# install documentation |
| 111 |
dodoc ChangeLog *.md |
| 112 |
- if use newnet; then |
| 113 |
- dodoc README.newnet |
| 114 |
- fi |
| 115 |
} |
| 116 |
|
| 117 |
pkg_preinst() { |
Archives