summaryrefslogtreecommitdiff
path: root/sys-apps/openrc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
commit7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /sys-apps/openrc
parentb284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
gentoo resync : 15.12.2019
Diffstat (limited to 'sys-apps/openrc')
-rw-r--r--sys-apps/openrc/Manifest2
-rw-r--r--sys-apps/openrc/openrc-9999.ebuild16
2 files changed, 5 insertions, 13 deletions
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 9aa50db8c5d5..af2bff7b4e18 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -4,5 +4,5 @@ DIST openrc-0.41.2.tar.gz 245302 BLAKE2B ab80dc4f3a7c2c464fe64cdfa7fd31363d5a9d2
DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
EBUILD openrc-0.41.2.ebuild 5249 BLAKE2B 324f3a9e2a9753a79dc547f7615478d05f8500582638646b5ca71b235fbbdec4b54adf20a1e9ffd07ec572e1880f7d5854d35503172325a4817b2b070a60c70e SHA512 296a87cf7bf0476f51b1a2410ff1e69f9275b2d3e319a268e211cc2e3d96e8e58fbfda47c203d8cb5d46cc4ac4dcdc4b2a39193dc299ef4a9478319b1d32489f
EBUILD openrc-0.42.1.ebuild 5362 BLAKE2B f54e7d19eb62bc7326dafd03c6beba37ef00c9a0a9e78b5735e5b08694b3c7da0eb6a9eb17f2825976f0ff12904ead87744e96489ea398d74b100e0cd393899b SHA512 c573bc86ded84c6ff4f4349663b4dee73689a496ab35ca81518bc83be162d10087d790c114e992ce975a5bc19e76d3d7e8a78e0db1c44868a60d8cec6d70ec3e
-EBUILD openrc-9999.ebuild 5362 BLAKE2B f54e7d19eb62bc7326dafd03c6beba37ef00c9a0a9e78b5735e5b08694b3c7da0eb6a9eb17f2825976f0ff12904ead87744e96489ea398d74b100e0cd393899b SHA512 c573bc86ded84c6ff4f4349663b4dee73689a496ab35ca81518bc83be162d10087d790c114e992ce975a5bc19e76d3d7e8a78e0db1c44868a60d8cec6d70ec3e
+EBUILD openrc-9999.ebuild 5025 BLAKE2B 1d41d1b9f89a5d84a80728f01be9f18b7506fd008bc00e096f9c70493434796429b8360e94532ec8adc99b3f7ca6016bb63f7fdbb25ceda95cd7e6a94113dc0f SHA512 74c80635d4760fc100065e64c826650d8047133ed92f9748e2dcebe4224d8cd1947d1b22739c50fde56bd0236aeef7aaeeefb31222605c170c435edf6d3aa8f1
MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 3e6f63ea18b9..b8f8498162b4 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic pam toolchain-funcs usr-ldscript
+inherit flag-o-matic pam toolchain-funcs
DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
HOMEPAGE="https://github.com/openrc/openrc/"
@@ -18,8 +18,8 @@ fi
LICENSE="BSD-2"
SLOT="0"
-IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs
- sysv-utils unicode"
+IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils
+ unicode"
COMMON_DEPEND="
ncurses? ( sys-libs/ncurses:0= )
@@ -76,7 +76,7 @@ src_compile() {
MKSYSVINIT=$(usex sysv-utils)
MKAUDIT=$(usex audit)
MKPAM=$(usev pam)
- MKSTATICLIBS=$(usex static-libs)
+ MKSTATICLIBS=no
MKZSHCOMP=yes
SH=$(usex bash /bin/bash /bin/sh)"
@@ -108,14 +108,6 @@ set_config_yes_no() {
src_install() {
emake ${MAKE_ARGS} DESTDIR="${D}" install
- # move the shared libs back to /usr so ldscript can install
- # more of a minimal set of files
- # disabled for now due to #270646
- #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
- #gen_usr_ldscript -a einfo rc
- gen_usr_ldscript libeinfo.so
- gen_usr_ldscript librc.so
-
keepdir /lib/rc/tmp
# Setup unicode defaults for silly unicode users