diff options
author | BlackNoxis <steven.darklight@gmail.com> | 2015-04-21 22:24:48 +0300 |
---|---|---|
committer | BlackNoxis <steven.darklight@gmail.com> | 2015-04-21 22:24:48 +0300 |
commit | b70efef53cc9de063fe3974dd56d672a92e57a9f (patch) | |
tree | afd40e71be8de842afd562eda001b21abc9019c3 /sys-apps | |
parent | 0fc61a35b43840a592037ab8bf88af6142527e3c (diff) | |
parent | 9a2973bcf4baaf0fa7848cd93e45ea1b7cd1a110 (diff) |
Merge branch 'master' of github.com:Rogentos/kogaion-desktop
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/openrc/Manifest | 1 | ||||
-rw-r--r-- | sys-apps/openrc/files/openrc-kogaion-config-2.patch (renamed from sys-apps/openrc/files/openrc-sabayon-config-2.patch) | 0 | ||||
-rw-r--r-- | sys-apps/openrc/files/openrc-kogaion-config.patch (renamed from sys-apps/openrc/files/openrc-sabayon-config.patch) | 0 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-0.10.5.ebuild | 12 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-0.11.8.ebuild | 14 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-0.12.4.ebuild | 14 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-0.12_pre1-r1.ebuild | 14 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-0.12_pre1-r2.ebuild | 12 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-0.12_pre1.ebuild | 16 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-0.13.11.ebuild | 356 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-0.8.2-r1.ebuild | 6 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-0.8.3-r1.ebuild | 12 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-0.9.8.1.ebuild | 12 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-0.9.9.3.ebuild | 14 |
14 files changed, 420 insertions, 63 deletions
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index 06ab1adb..307aa969 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -1,6 +1,7 @@ DIST openrc-0.10.5.tar.bz2 171742 SHA256 27677142a7aa47a1c7e863fd4bce0d092aca7870012812e4f7a690a14f1e242c DIST openrc-0.11.8.tar.bz2 174860 SHA256 e1f7c5ed98a63178c20f3d023a7d35fe416e8e7db2f0cf78ff346a6d2f7949a9 SHA512 aaea9f1e1d08c367beb6d35bcc1d258eb9d7b71a659c05088f9027b0558aae068b2ad7c221cf8ff8b8950f5a4a5c187ee7b986ce2d475a9e3cccda74d040f780 WHIRLPOOL 69217f13dd05e9a443d906281ada167d6892615eb5db7c372ba535a3d4a21ac3111fad9d54ef06650c3b488b848180bbfe5257dbc83f62f5ecf60724dec2900c DIST openrc-0.12.4.tar.bz2 131914 SHA256 c4edda2fff4b613f50b9cc265bb457a9ab0170fbc1fe7c26eccd4a5d63b2625c SHA512 14e188e382dfe02037d3e4211fa3265152d5ec92ca491b1e86154c0615583ddfc0a2592ca849ab453068dd60000886e57e7da024036fa58d7474acdbb6b92208 WHIRLPOOL 7bdc2c310ee6e87a439574f377a3c1541a118b4122d098d727f6d4464e9f645e5a4d40bedfc82f401b53e640e78494f74fac94f9b6813eb202cc18d1c5391280 +DIST openrc-0.13.11.tar.bz2 150680 SHA256 30edffa8b39d5e68129ddd9e8cd8dfde8ca8cfafc8b470124d7323a32a4a443c SHA512 1dd9d86f5f2f13e196d2724b978c0aaabf7a73c487bf2f8f759d82c856faa754b612d5252dacedb042ba308ff7e9a745dea88b78654a693c39f5d720f0f92ada WHIRLPOOL 2849260c60811e88467b2d0916afa37bc4c7a6e2159abf70a2f5bad2cf97586b801993f45ed86145dfecbc93166298c6302a78602bbfe1957d2f159a3cde11dc DIST openrc-0.8.2.tar.bz2 161165 SHA256 5d603869f78692947b60528f12b3107372a9e4a469621be7bc47d3829c16f8a1 DIST openrc-0.8.3.tar.bz2 162474 SHA256 38ce2538bffe38c00055aadb85597f6f517b3e9f760dc1ed4a27ddf28cb9f4b4 DIST openrc-0.9.8.1.tar.bz2 166841 SHA256 ba83fd5409a4a1626f35adfd06e61675585f5ae29e14dadab958016e24d2a995 diff --git a/sys-apps/openrc/files/openrc-sabayon-config-2.patch b/sys-apps/openrc/files/openrc-kogaion-config-2.patch index 7e392460..7e392460 100644 --- a/sys-apps/openrc/files/openrc-sabayon-config-2.patch +++ b/sys-apps/openrc/files/openrc-kogaion-config-2.patch diff --git a/sys-apps/openrc/files/openrc-sabayon-config.patch b/sys-apps/openrc/files/openrc-kogaion-config.patch index 440171f9..440171f9 100644 --- a/sys-apps/openrc/files/openrc-sabayon-config.patch +++ b/sys-apps/openrc/files/openrc-kogaion-config.patch diff --git a/sys-apps/openrc/openrc-0.10.5.ebuild b/sys-apps/openrc/openrc-0.10.5.ebuild index a48cb922..7a6a67a4 100644 --- a/sys-apps/openrc/openrc-0.10.5.ebuild +++ b/sys-apps/openrc/openrc-0.10.5.ebuild @@ -73,13 +73,13 @@ src_prepare() { # Allow user patches to be applied without modifying the ebuild epatch_user - # Rogentos custom config - epatch "${FILESDIR}/${PN}-sabayon-config-2.patch" + # Kogaion custom config + epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch epatch "${FILESDIR}/${PN}-netmount-fix.patch" epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" - # Rogentos bug fixes + # Kogaion bug fixes epatch "${FILESDIR}/${PN}-0.9.9.3-do-not-print-error-if-tmplog-cannot-be-read.patch" } @@ -143,7 +143,7 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/openrc.logrotate openrc - # Rogentos customization, do not bug user with annoying updates (for now) + # Kogaion customization, do not bug user with annoying updates (for now) mv "${D}"/etc/conf.d/keymaps "${D}"/etc/conf.d/keymaps.example || \ die "cannot move keymaps" mv "${D}"/etc/conf.d/hwclock "${D}"/etc/conf.d/hwclock.example || \ @@ -183,7 +183,7 @@ add_boot_init_mit_config() { pkg_preinst() { local conf_file - # Rogentos customization, still protect conf files from being removed + # Kogaion customization, still protect conf files from being removed # as no longer owned by package for conf_file in "${ROOT}/etc/conf.d/keymaps" "${ROOT}/etc/conf.d/hwclock"; do if [ -e "${conf_file}" ]; then @@ -369,7 +369,7 @@ migrate_from_baselayout_1() { pkg_postinst() { local conf_file - # Rogentos customization, do not bug user with tedious, useless config file updates + # Kogaion customization, do not bug user with tedious, useless config file updates for conf_file in "${ROOT}/etc/conf.d/keymaps" "${ROOT}/etc/conf.d/hwclock"; do if [ -e "${conf_file}.ebuild_preserved" ]; then cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die diff --git a/sys-apps/openrc/openrc-0.11.8.ebuild b/sys-apps/openrc/openrc-0.11.8.ebuild index fb5daebd..6284e791 100644 --- a/sys-apps/openrc/openrc-0.11.8.ebuild +++ b/sys-apps/openrc/openrc-0.11.8.ebuild @@ -48,13 +48,13 @@ src_prepare() { # Allow user patches to be applied without modifying the ebuild epatch_user - # Rogentos custom config - epatch "${FILESDIR}/${PN}-sabayon-config-2.patch" + # Kogaion custom config + epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch epatch "${FILESDIR}/${PN}-netmount-fix.patch" epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" - # Rogentos bug fixes + # Kogaion bug fixes epatch "${FILESDIR}/${PN}-0.9.9.3-do-not-print-error-if-tmplog-cannot-be-read.patch" } @@ -76,7 +76,7 @@ src_compile() { if use selinux; then MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes" fi - export BRANDING="Rogentos ${brand}" + export BRANDING="Kogaion ${brand}" if ! use static-libs; then MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no" fi @@ -142,7 +142,7 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/openrc.logrotate openrc - # Rogentos customization, do not bug user with annoying updates (for now) + # Kogaion customization, do not bug user with annoying updates (for now) mv "${ED}"/etc/conf.d/keymaps "${ED}"/etc/conf.d/keymaps.example || \ die "cannot move keymaps" mv "${ED}"/etc/conf.d/hwclock "${ED}"/etc/conf.d/hwclock.example || \ @@ -182,7 +182,7 @@ add_boot_init_mit_config() { pkg_preinst() { local conf_file - # Rogentos customization, still protect conf files from being removed + # Kogaion customization, still protect conf files from being removed # as no longer owned by package for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do if [ -e "${conf_file}" ]; then @@ -386,7 +386,7 @@ migrate_from_baselayout_1() { pkg_postinst() { local conf_file - # Rogentos customization, do not bug user with tedious, useless config file updates + # Kogaion customization, do not bug user with tedious, useless config file updates for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do if [ -e "${conf_file}.ebuild_preserved" ]; then cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die diff --git a/sys-apps/openrc/openrc-0.12.4.ebuild b/sys-apps/openrc/openrc-0.12.4.ebuild index 0bc61a82..551e6461 100644 --- a/sys-apps/openrc/openrc-0.12.4.ebuild +++ b/sys-apps/openrc/openrc-0.12.4.ebuild @@ -56,13 +56,13 @@ src_prepare() { # Allow user patches to be applied without modifying the ebuild epatch_user - # RogentOS custom config - epatch "${FILESDIR}/${PN}-sabayon-config-2.patch" + # Argent custom config + epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch epatch "${FILESDIR}/${PN}-netmount-fix.patch" epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" - # RogentOS bug fixes + # Argent bug fixes epatch "${FILESDIR}/${PN}-0.9.9.3-do-not-print-error-if-tmplog-cannot-be-read.patch" # Linux 3.10 and EFI @@ -87,7 +87,7 @@ src_compile() { MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" brand="FreeBSD" fi - export BRANDING="RogentOS ${brand}" + export BRANDING="Argent ${brand}" use newnet || MAKE_ARGS="${MAKE_ARGS} MKNET=oldnet" use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" export DEBUG=$(usev debug) @@ -147,7 +147,7 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/openrc.logrotate openrc - # RogentOS customization, do not bug user with annoying updates (for now) + # Argent customization, do not bug user with annoying updates (for now) mv "${ED}"/etc/conf.d/keymaps "${ED}"/etc/conf.d/keymaps.example || \ die "cannot move keymaps" mv "${ED}"/etc/conf.d/hwclock "${ED}"/etc/conf.d/hwclock.example || \ @@ -193,7 +193,7 @@ add_boot_init_mit_config() { pkg_preinst() { local conf_file - # RogentOS customization, still protect conf files from being removed + # Argent customization, still protect conf files from being removed # as no longer owned by package for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do if [ -e "${conf_file}" ]; then @@ -264,7 +264,7 @@ migrate_udev_mount_script() { pkg_postinst() { local conf_file - # RogentOS customization, do not bug user with tedious, useless config file updates + # Argent customization, do not bug user with tedious, useless config file updates for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do if [ -e "${conf_file}.ebuild_preserved" ]; then cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die diff --git a/sys-apps/openrc/openrc-0.12_pre1-r1.ebuild b/sys-apps/openrc/openrc-0.12_pre1-r1.ebuild index cc6b258a..62fff71d 100644 --- a/sys-apps/openrc/openrc-0.12_pre1-r1.ebuild +++ b/sys-apps/openrc/openrc-0.12_pre1-r1.ebuild @@ -50,8 +50,8 @@ src_prepare() { # Allow user patches to be applied without modifying the ebuild epatch_user - # RogentOS custom config - epatch "${FILESDIR}/${PN}-sabayon-config-2.patch" + # Argent custom config + epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch epatch "${FILESDIR}/${PN}-netmount-fix.patch" epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" @@ -81,7 +81,7 @@ src_compile() { if use selinux; then MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes" fi - export BRANDING="RogentOS ${brand}" + export BRANDING="Argent ${brand}" if ! use static-libs; then MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no" fi @@ -147,7 +147,7 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/openrc.logrotate openrc - # RogentOS customization, do not bug user with annoying updates (for now) + # Argent customization, do not bug user with annoying updates (for now) mv "${ED}"/etc/conf.d/keymaps "${ED}"/etc/conf.d/keymaps.example || \ die "cannot move keymaps" mv "${ED}"/etc/conf.d/hwclock "${ED}"/etc/conf.d/hwclock.example || \ @@ -187,7 +187,7 @@ add_boot_init_mit_config() { pkg_preinst() { local conf_file - # RogentOS customization, still protect conf files from being removed + # Argent customization, still protect conf files from being removed # as no longer owned by package for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do if [ -e "${conf_file}" ]; then @@ -202,7 +202,7 @@ pkg_preinst() { # manager doesnt go throwing etc-update crap at us -- postinst is # too late to prevent that. this behavior also lets us keep the # file in the CONTENTS for binary packages. - # RogentOS, use cp -d as per Gentoo bug #462674 + # Argent, use cp -d as per Gentoo bug #462674 [[ -e "${EROOT}"etc/conf.d/net ]] && \ cp -d "${EROOT}"etc/conf.d/net "${ED}"/etc/conf.d/ @@ -392,7 +392,7 @@ migrate_from_baselayout_1() { pkg_postinst() { local conf_file - # RogentOS customization, do not bug user with tedious, useless config file updates + # Argent customization, do not bug user with tedious, useless config file updates for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do if [ -e "${conf_file}.ebuild_preserved" ]; then cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die diff --git a/sys-apps/openrc/openrc-0.12_pre1-r2.ebuild b/sys-apps/openrc/openrc-0.12_pre1-r2.ebuild index f8cd6271..90a059d6 100644 --- a/sys-apps/openrc/openrc-0.12_pre1-r2.ebuild +++ b/sys-apps/openrc/openrc-0.12_pre1-r2.ebuild @@ -49,8 +49,8 @@ src_prepare() { # Allow user patches to be applied without modifying the ebuild epatch_user - # RogentOS/Argent custom config - epatch "${FILESDIR}/${PN}-sabayon-config-2.patch" + # Argent custom config + epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch epatch "${FILESDIR}/${PN}-netmount-fix.patch" epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" @@ -83,7 +83,7 @@ src_compile() { if use selinux; then MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes" fi - export BRANDING="RogentOS ${brand}" + export BRANDING="Argent ${brand}" if ! use static-libs; then MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no" fi @@ -149,7 +149,7 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/openrc.logrotate openrc - # RogentOS/Argent customization, do not bug user with annoying updates (for now) + # Argent customization, do not bug user with annoying updates (for now) mv "${ED}"/etc/conf.d/keymaps "${ED}"/etc/conf.d/keymaps.example || \ die "cannot move keymaps" mv "${ED}"/etc/conf.d/hwclock "${ED}"/etc/conf.d/hwclock.example || \ @@ -189,7 +189,7 @@ add_boot_init_mit_config() { pkg_preinst() { local conf_file - # RogentOS/Argent customization, still protect conf files from being removed + # Argent customization, still protect conf files from being removed # as no longer owned by package for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do if [ -e "${conf_file}" ]; then @@ -394,7 +394,7 @@ migrate_from_baselayout_1() { pkg_postinst() { local conf_file - # RogentOS/Argent customization, do not bug user with tedious, useless config file updates + # Argent customization, do not bug user with tedious, useless config file updates for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do if [ -e "${conf_file}.ebuild_preserved" ]; then cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die diff --git a/sys-apps/openrc/openrc-0.12_pre1.ebuild b/sys-apps/openrc/openrc-0.12_pre1.ebuild index 731eb5a2..eb803e30 100644 --- a/sys-apps/openrc/openrc-0.12_pre1.ebuild +++ b/sys-apps/openrc/openrc-0.12_pre1.ebuild @@ -50,13 +50,13 @@ src_prepare() { # Allow user patches to be applied without modifying the ebuild epatch_user - # RogentOS custom config - epatch "${FILESDIR}/${PN}-sabayon-config-2.patch" + # Argent custom config + epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch epatch "${FILESDIR}/${PN}-netmount-fix.patch" epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" - # RogentOS bug fixes + # Argent bug fixes epatch "${FILESDIR}/${PN}-0.9.9.3-do-not-print-error-if-tmplog-cannot-be-read.patch" } @@ -78,7 +78,7 @@ src_compile() { if use selinux; then MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes" fi - export BRANDING="RogentOS ${brand}" + export BRANDING="Argent ${brand}" if ! use static-libs; then MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no" fi @@ -144,7 +144,7 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/openrc.logrotate openrc - # RogentOS customization, do not bug user with annoying updates (for now) + # Argent customization, do not bug user with annoying updates (for now) mv "${ED}"/etc/conf.d/keymaps "${ED}"/etc/conf.d/keymaps.example || \ die "cannot move keymaps" mv "${ED}"/etc/conf.d/hwclock "${ED}"/etc/conf.d/hwclock.example || \ @@ -184,7 +184,7 @@ add_boot_init_mit_config() { pkg_preinst() { local conf_file - # Rogentos customization, still protect conf files from being removed + # Kogaion customization, still protect conf files from being removed # as no longer owned by package for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do if [ -e "${conf_file}" ]; then @@ -199,7 +199,7 @@ pkg_preinst() { # manager doesnt go throwing etc-update crap at us -- postinst is # too late to prevent that. this behavior also lets us keep the # file in the CONTENTS for binary packages. - # RogentOS, use cp -d as per Gentoo bug #462674 + # Argent, use cp -d as per Gentoo bug #462674 [[ -e "${EROOT}"etc/conf.d/net ]] && \ cp -d "${EROOT}"etc/conf.d/net "${ED}"/etc/conf.d/ @@ -389,7 +389,7 @@ migrate_from_baselayout_1() { pkg_postinst() { local conf_file - # RogentOS customization, do not bug user with tedious, useless config file updates + # Argent customization, do not bug user with tedious, useless config file updates for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do if [ -e "${conf_file}.ebuild_preserved" ]; then cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die diff --git a/sys-apps/openrc/openrc-0.13.11.ebuild b/sys-apps/openrc/openrc-0.13.11.ebuild new file mode 100644 index 00000000..551e6461 --- /dev/null +++ b/sys-apps/openrc/openrc-0.13.11.ebuild @@ -0,0 +1,356 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit eutils flag-o-matic multilib pam toolchain-funcs + +DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" +HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="git://github.com/OpenRC/${PN}.git" + inherit git-2 +else + SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +fi + +LICENSE="BSD-2" +SLOT="0" +IUSE="debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs + tools unicode kernel_linux kernel_FreeBSD" + +COMMON_DEPEND=">=sys-apps/baselayout-2.1-r1 + kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) + elibc_glibc? ( >=sys-libs/glibc-2.5 ) + ncurses? ( sys-libs/ncurses ) + pam? ( sys-auth/pambase ) + tools? ( dev-lang/perl ) + kernel_linux? ( + sys-process/psmisc + ) + selinux? ( sec-policy/selinux-openrc ) + !<sys-fs/udev-init-scripts-17 + !<sys-fs/udev-133" +DEPEND="${COMMON_DEPEND} + virtual/os-headers + ncurses? ( virtual/pkgconfig )" +RDEPEND="${COMMON_DEPEND} + !prefix? ( + kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) ) + kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) + )" + +PDEPEND="netifrc? ( net-misc/netifrc )" + +src_prepare() { + sed -i 's:0444:0644:' mk/sys.mk || die + + if [[ ${PV} == "9999" ]] ; then + local ver="git-${EGIT_VERSION:0:6}" + sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die + fi + + # Allow user patches to be applied without modifying the ebuild + epatch_user + + # Argent custom config + epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" + epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch + epatch "${FILESDIR}/${PN}-netmount-fix.patch" + epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" + + # Argent bug fixes + epatch "${FILESDIR}/${PN}-0.9.9.3-do-not-print-error-if-tmplog-cannot-be-read.patch" + + # Linux 3.10 and EFI + epatch "${FILESDIR}/0001-efivarfs-Support-EFI-variable-access-in-3.10-kernels.patch" +} + +src_compile() { + unset LIBDIR #266688 + + MAKE_ARGS="${MAKE_ARGS} + LIBNAME=$(get_libdir) + LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc + MKSELINUX=$(usex selinux) + MKSTATICLIBS=$(usex static-libs) + MKTOOLS=$(usex tools)" + + local brand="Unknown" + if use kernel_linux ; then + MAKE_ARGS="${MAKE_ARGS} OS=Linux" + brand="Linux" + elif use kernel_FreeBSD ; then + MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" + brand="FreeBSD" + fi + export BRANDING="Argent ${brand}" + use newnet || MAKE_ARGS="${MAKE_ARGS} MKNET=oldnet" + use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" + export DEBUG=$(usev debug) + export MKPAM=$(usev pam) + export MKTERMCAP=$(usev ncurses) + + tc-export CC AR RANLIB + emake ${MAKE_ARGS} +} + +# set_config <file> <option name> <yes value> <no value> test +# a value of "#" will just comment out the option +set_config() { + local file="${ED}/$1" var=$2 val com + eval "${@:5}" && val=$3 || val=$4 + [[ ${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() { + 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 + + if ! use kernel_linux; then + keepdir /$(get_libdir)/rc/init.d + fi + keepdir /$(get_libdir)/rc/tmp + + # Backup our default runlevels + dodir /usr/share/"${PN}" + cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die + rm -rf "${ED}"/etc/runlevels + + # Setup unicode defaults for silly unicode users + set_config_yes_no /etc/rc.conf unicode use unicode + + # Cater to the norm + set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')' + + # On HPPA, do not run consolefont by default (bug #222889) + if use hppa; then + rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont + fi + + # Support for logfile rotation + insinto /etc/logrotate.d + newins "${FILESDIR}"/openrc.logrotate openrc + + # Argent customization, do not bug user with annoying updates (for now) + mv "${ED}"/etc/conf.d/keymaps "${ED}"/etc/conf.d/keymaps.example || \ + die "cannot move keymaps" + mv "${ED}"/etc/conf.d/hwclock "${ED}"/etc/conf.d/hwclock.example || \ + die "cannot move hwclock" + + # install the gentoo pam.d file + newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon + + # install documentation + dodoc README.busybox + if use newnet; then + dodoc README.newnet + fi +} + +add_boot_init() { + local initd=$1 + local runlevel=${2:-boot} + # if the initscript is not going to be installed and is not + # currently installed, return + [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \ + || return + [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return + + # if runlevels dont exist just yet, then create it but still flag + # to pkg_postinst that it needs real setup #277323 + if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then + mkdir -p "${EROOT}"etc/runlevels/${runlevel} + touch "${EROOT}"etc/runlevels/.add_boot_init.created + fi + + elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" + ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd} +} +add_boot_init_mit_config() { + local config=$1 initd=$2 + if [[ -e ${EROOT}${config} ]] ; then + if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then + add_boot_init ${initd} + fi + fi +} + +pkg_preinst() { + local conf_file + # Argent customization, still protect conf files from being removed + # as no longer owned by package + for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do + if [ -e "${conf_file}" ]; then + cp -p "${conf_file}" "${conf_file}.ebuild_preserved" # don't die + fi + done + + local f LIBDIR=$(get_libdir) + + # avoid default thrashing in conf.d files when possible #295406 + if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then + ( + unset hostname HOSTNAME + source "${EROOT}"etc/conf.d/hostname + : ${hostname:=${HOSTNAME}} + [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" + ) + fi + + # set default interactive shell to sulogin if it exists + set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin + + # termencoding was added in 0.2.1 and needed in boot + has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding + + # swapfiles was added in 0.9.9 and needed in boot (february 2012) + has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles + + if ! has_version ">=sys-apps/openrc-0.11"; then + add_boot_init sysfs sysinit + fi + + if ! has_version ">=sys-apps/openrc-0.11.3" ; then + migrate_udev_mount_script + add_boot_init tmpfiles.setup boot + fi + + # these were added in 0.12. + if ! has_version ">=sys-apps/openrc-0.12"; then + add_boot_init loopback + add_boot_init tmpfiles.dev sysinit + + # ensure existing /etc/conf.d/net is not removed + # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier + # this needs to stay in openrc ebuilds for a long time. :( + # Added in 0.12. + if [[ -f "${EROOT}"etc/conf.d/net ]]; then + einfo "Modifying conf.d/net to keep it from being removed" + cat <<-EOF >>"${EROOT}"etc/conf.d/net + +# The network scripts are now part of net-misc/netifrc +# In order to avoid sys-apps/${P} from removing this file, this comment was +# added; you can safely remove this comment. Please see +# /usr/share/doc/netifrc*/README* for more information. +EOF + fi + fi +} + +# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev. +migrate_udev_mount_script() { + if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \ + ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then + add_boot_init udev-mount sysinit + fi + return 0 +} + +pkg_postinst() { + local conf_file + # Argent customization, do not bug user with tedious, useless config file updates + for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do + if [ -e "${conf_file}.ebuild_preserved" ]; then + cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die + elif [ ! -e "${conf_file}" ]; then + cp -p "${conf_file}.example" "${conf_file}" # don't die + fi + chown root:root "${conf_file}" # don't die + done + + local LIBDIR=$(get_libdir) + + # Make our runlevels if they don't exist + if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then + einfo "Copying across default runlevels" + cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc + rm -f "${EROOT}"etc/runlevels/.add_boot_init.created + else + if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then + mkdir -p "${EROOT}"etc/runlevels/sysinit + cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \ + "${EROOT}"etc/runlevels/sysinit + fi + if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then + mkdir -p "${EROOT}"etc/runlevels/shutdown + cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \ + "${EROOT}"etc/runlevels/shutdown + fi + fi + + if use hppa; then + elog "Setting the console font does not work on all HPPA consoles." + elog "You can still enable it by running:" + elog "# rc-update add consolefont boot" + fi + + # Handle the conf.d/local.{start,stop} -> local.d transition + if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then + elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}" + elog "files to ${EROOT}etc/local.d" + mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start + mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop + chmod +x "${EROOT}"etc/local.d/*{start,stop} + fi + + if use kernel_linux && [[ "${EROOT}" = "/" ]]; then + if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then + ewarn "The dependency data could not be migrated to /run/openrc." + ewarn "This means you need to reboot your system." + fi + fi + + # update the dependency tree after touching all files #224171 + [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u + + if ! use newnet && ! use netifrc; then + ewarn "You have emerged OpenRc without network support. This" + ewarn "means you need to SET UP a network manager such as" + ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd," + ewarn "net-misc/NetworkManager, or net-misc/badvpn." + ewarn "Or, you have the option of emerging openrc with the newnet" + ewarn "use flag and configuring /etc/conf.d/network and" + ewarn "/etc/conf.d/staticroute if you only use static interfaces." + fi + + if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then + ewarn "Please add the network service to your boot runlevel" + ewarn "as soon as possible. Not doing so could leave you with a system" + ewarn "without networking." + fi + + ewarn "In this version of OpenRC, the loopback interface no longer" + ewarn "satisfies the net virtual." + ewarn "If you have services now which do not start because of this," + ewarn "They can be fixed by adding rc_need=\"!net\"" + ewarn "to the ${EROOT}etc/conf.d/<servicename> file." + ewarn "You should also file a bug against the service asking that" + ewarn "need net be dropped from the dependencies." + ewarn "The bug you file should block the following tracker:" + ewarn "https://bugs.gentoo.org/show_bug.cgi?id=439092" + + ewarn "This version of OpenRC doesn't enable nfs mounts automatically any" + ewarn "longer. In order to mount nfs file systems, you must use the" + ewarn "nfsmount service from the nfs-utils package." + ewarn "See bug https://bugs.gentoo.org/show_bug.cgi?id=427996 for" + ewarn "more information on this." + + elog "You should now update all files in /etc, using etc-update" + elog "or equivalent before restarting any services or this host." +} diff --git a/sys-apps/openrc/openrc-0.8.2-r1.ebuild b/sys-apps/openrc/openrc-0.8.2-r1.ebuild index 8e23d158..87abd7c3 100644 --- a/sys-apps/openrc/openrc-0.8.2-r1.ebuild +++ b/sys-apps/openrc/openrc-0.8.2-r1.ebuild @@ -51,7 +51,7 @@ make_args() { if use selinux; then MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes" fi - export BRANDING="Rogentos ${brand}" + export BRANDING="Kogaion ${brand}" } pkg_setup() { @@ -73,8 +73,8 @@ src_unpack() { # Allow user patches to be applied without modifying the ebuild epatch_user - # Rogentos custom config - epatch "${FILESDIR}/${PN}-sabayon-config.patch" + # Kogaion custom config + epatch "${FILESDIR}/${PN}-kogaion-config.patch" epatch "${FILESDIR}/${PN}-enable-interactive.patch" epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch epatch "${FILESDIR}/${PN}-netmount-fix.patch" diff --git a/sys-apps/openrc/openrc-0.8.3-r1.ebuild b/sys-apps/openrc/openrc-0.8.3-r1.ebuild index 8d06e9bb..9962aee9 100644 --- a/sys-apps/openrc/openrc-0.8.3-r1.ebuild +++ b/sys-apps/openrc/openrc-0.8.3-r1.ebuild @@ -49,7 +49,7 @@ make_args() { if use selinux; then MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes" fi - export BRANDING="Rogentos ${brand}" + export BRANDING="Kogaion ${brand}" } pkg_setup() { @@ -73,8 +73,8 @@ src_prepare() { # Allow user patches to be applied without modifying the ebuild epatch_user - # Rogentos custom config - epatch "${FILESDIR}/${PN}-sabayon-config.patch" + # Kogaion custom config + epatch "${FILESDIR}/${PN}-kogaion-config.patch" epatch "${FILESDIR}/${PN}-enable-interactive.patch" epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch epatch "${FILESDIR}/${PN}-netmount-fix.patch" @@ -146,7 +146,7 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/openrc.logrotate openrc - # Rogentos customization, do not bug user with annoying updates (for now) + # Kogaion customization, do not bug user with annoying updates (for now) mv "${D}"/etc/conf.d/keymaps "${D}"/etc/conf.d/keymaps.example || \ die "cannot move keymaps" mv "${D}"/etc/conf.d/hwclock "${D}"/etc/conf.d/hwclock.example || \ @@ -182,7 +182,7 @@ add_boot_init_mit_config() { } pkg_preinst() { - # Rogentos customization, still protect conf files from being removed + # Kogaion customization, still protect conf files from being removed # as no longer owned by package for conf_file in "${ROOT}/etc/conf.d/keymaps" "${ROOT}/etc/conf.d/hwclock"; do if [ -e "${conf_file}" ]; then @@ -364,7 +364,7 @@ migrate_from_baselayout_1() { } pkg_postinst() { - # Rogentos customization, do not bug user with tedious, useless config file updates + # Kogaion customization, do not bug user with tedious, useless config file updates for conf_file in "${ROOT}/etc/conf.d/keymaps" "${ROOT}/etc/conf.d/hwclock"; do if [ -e "${conf_file}.ebuild_preserved" ]; then cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die diff --git a/sys-apps/openrc/openrc-0.9.8.1.ebuild b/sys-apps/openrc/openrc-0.9.8.1.ebuild index 713e29a1..2873edbf 100644 --- a/sys-apps/openrc/openrc-0.9.8.1.ebuild +++ b/sys-apps/openrc/openrc-0.9.8.1.ebuild @@ -51,7 +51,7 @@ make_args() { if use selinux; then MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes" fi - export BRANDING="Rogentos ${brand}" + export BRANDING="Kogaion ${brand}" if ! use static-libs; then MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no" fi @@ -75,8 +75,8 @@ src_prepare() { # Allow user patches to be applied without modifying the ebuild epatch_user - # Rogentos custom config - epatch "${FILESDIR}/${PN}-sabayon-config.patch" + # Kogaion custom config + epatch "${FILESDIR}/${PN}-kogaion-config.patch" epatch "${FILESDIR}/${PN}-enable-interactive-2.patch" epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch epatch "${FILESDIR}/${PN}-netmount-fix.patch" @@ -141,7 +141,7 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/openrc.logrotate openrc - # Rogentos customization, do not bug user with annoying updates (for now) + # Kogaion customization, do not bug user with annoying updates (for now) mv "${D}"/etc/conf.d/keymaps "${D}"/etc/conf.d/keymaps.example || \ die "cannot move keymaps" mv "${D}"/etc/conf.d/hwclock "${D}"/etc/conf.d/hwclock.example || \ @@ -180,7 +180,7 @@ add_boot_init_mit_config() { } pkg_preinst() { - # Rogentos customization, still protect conf files from being removed + # Kogaion customization, still protect conf files from being removed # as no longer owned by package for conf_file in "${ROOT}/etc/conf.d/keymaps" "${ROOT}/etc/conf.d/hwclock"; do if [ -e "${conf_file}" ]; then @@ -364,7 +364,7 @@ migrate_from_baselayout_1() { pkg_postinst() { local LIBDIR=$(get_libdir) - # Rogentos customization, do not bug user with tedious, useless config file updates + # Kogaion customization, do not bug user with tedious, useless config file updates for conf_file in "${ROOT}/etc/conf.d/keymaps" "${ROOT}/etc/conf.d/hwclock"; do if [ -e "${conf_file}.ebuild_preserved" ]; then cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die diff --git a/sys-apps/openrc/openrc-0.9.9.3.ebuild b/sys-apps/openrc/openrc-0.9.9.3.ebuild index c439dd12..ddbb9494 100644 --- a/sys-apps/openrc/openrc-0.9.9.3.ebuild +++ b/sys-apps/openrc/openrc-0.9.9.3.ebuild @@ -49,7 +49,7 @@ make_args() { if use selinux; then MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes" fi - export BRANDING="Rogentos ${brand}" + export BRANDING="Kogaion ${brand}" if ! use static-libs; then MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no" fi @@ -73,13 +73,13 @@ src_prepare() { # Allow user patches to be applied without modifying the ebuild epatch_user - # Rogentos custom config - epatch "${FILESDIR}/${PN}-sabayon-config-2.patch" + # Kogaion custom config + epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch epatch "${FILESDIR}/${PN}-netmount-fix.patch" epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" - # Rogentos bug fixes + # Kogaion bug fixes epatch "${FILESDIR}/${PN}-0.9.9.3-do-not-print-error-if-tmplog-cannot-be-read.patch" } @@ -140,7 +140,7 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/openrc.logrotate openrc - # Rogentos customization, do not bug user with annoying updates (for now) + # Kogaion customization, do not bug user with annoying updates (for now) mv "${D}"/etc/conf.d/keymaps "${D}"/etc/conf.d/keymaps.example || \ die "cannot move keymaps" mv "${D}"/etc/conf.d/hwclock "${D}"/etc/conf.d/hwclock.example || \ @@ -180,7 +180,7 @@ add_boot_init_mit_config() { pkg_preinst() { local conf_file - # Rogentos customization, still protect conf files from being removed + # Kogaion customization, still protect conf files from being removed # as no longer owned by package for conf_file in "${ROOT}/etc/conf.d/keymaps" "${ROOT}/etc/conf.d/hwclock"; do if [ -e "${conf_file}" ]; then @@ -366,7 +366,7 @@ migrate_from_baselayout_1() { pkg_postinst() { local conf_file - # Rogentos customization, do not bug user with tedious, useless config file updates + # Kogaion customization, do not bug user with tedious, useless config file updates for conf_file in "${ROOT}/etc/conf.d/keymaps" "${ROOT}/etc/conf.d/hwclock"; do if [ -e "${conf_file}.ebuild_preserved" ]; then cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die |