diff options
| -rw-r--r-- | dev-libs/kdiagram/kdiagram-2.6.0.ebuild | 8 | ||||
| -rw-r--r-- | dev-util/kup/kup-0.3.4-r1.ebuild (renamed from dev-util/kup/kup-0.3.4.ebuild) | 19 | ||||
| -rw-r--r-- | dev-util/kup/metadata.xml | 3 | ||||
| -rw-r--r-- | eclass/ELT-patches/ppc64le/2.4.2 | 32 | ||||
| -rw-r--r-- | eclass/ELT-patches/ppc64le/2.4.4 | 21 | ||||
| -rw-r--r-- | eclass/libtool.eclass | 6 | ||||
| -rw-r--r-- | sys-apps/openrc/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/openrc/openrc-0.17.ebuild | 336 | ||||
| -rw-r--r-- | sys-apps/openrc/openrc-0.18.4.ebuild | 347 | ||||
| -rw-r--r-- | sys-apps/openrc/openrc-0.19.1.ebuild | 347 | ||||
| -rw-r--r-- | sys-devel/libtool/files/libtool-2.4.6-ppc64le.patch | 111 | ||||
| -rw-r--r-- | sys-devel/libtool/libtool-2.4.6-r2.ebuild | 2 | ||||
| -rw-r--r-- | sys-devel/libtool/libtool-2.4.6-r3.ebuild (renamed from sys-devel/libtool/libtool-2.4.6.ebuild) | 22 | ||||
| -rw-r--r-- | sys-devel/libtool/libtool-9999.ebuild | 12 |
14 files changed, 216 insertions, 1053 deletions
diff --git a/dev-libs/kdiagram/kdiagram-2.6.0.ebuild b/dev-libs/kdiagram/kdiagram-2.6.0.ebuild index 9c835083b7e8..3225ca85c9ea 100644 --- a/dev-libs/kdiagram/kdiagram-2.6.0.ebuild +++ b/dev-libs/kdiagram/kdiagram-2.6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,10 +15,12 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" fi -DEPEND=" +RDEPEND=" $(add_qt_dep qtgui) $(add_qt_dep qtprintsupport) $(add_qt_dep qtsvg) $(add_qt_dep qtwidgets) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + $(add_qt_dep linguist-tools) +" diff --git a/dev-util/kup/kup-0.3.4.ebuild b/dev-util/kup/kup-0.3.4-r1.ebuild index d1581e0ac10f..b4681218e06f 100644 --- a/dev-util/kup/kup-0.3.4.ebuild +++ b/dev-util/kup/kup-0.3.4-r1.ebuild @@ -1,7 +1,11 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ +EAPI=6 + +inherit eutils + DESCRIPTION="kernel.org uploader tool" HOMEPAGE="https://www.kernel.org/pub/software/network/kup" SRC_URI="mirror://kernel/software/network/kup/${P}.tar.gz" @@ -9,7 +13,6 @@ SRC_URI="mirror://kernel/software/network/kup/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=" dev-lang/perl @@ -17,10 +20,10 @@ RDEPEND=" dev-perl/Config-Simple " -src_install () { - dobin kup - dobin gpg-sign-all - dobin kup-server - doman kup.1 - dodoc README +DOCS=( README ) + +src_install() { + dobin "${PN}" "${PN}-server" gpg-sign-all + doman "${PN}.1" + einstalldocs } diff --git a/dev-util/kup/metadata.xml b/dev-util/kup/metadata.xml index 097975e3adc2..0ae91bddd943 100644 --- a/dev-util/kup/metadata.xml +++ b/dev-util/kup/metadata.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person"> + <email>monsieurp@gentoo.org</email> + </maintainer> </pkgmetadata> diff --git a/eclass/ELT-patches/ppc64le/2.4.2 b/eclass/ELT-patches/ppc64le/2.4.2 new file mode 100644 index 000000000000..8d3b116a3dec --- /dev/null +++ b/eclass/ELT-patches/ppc64le/2.4.2 @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/580792 +https://bugs.gentoo.org/581314 +https://debbugs.gnu.org/23348 + +this adds support for ppc64le to older versions. most of this is upstream already. + +--- a/m4/libtool.m4 ++++ b/m4/libtool.m4 +@@ -1329,6 +1329,9 @@ + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; ++ ppc64le-*linux*|powerpc64le-*linux*) ++ LD="${LD-ld} -m elf32lppclinux" ++ ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; +@@ -1345,9 +1348,12 @@ + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; +- ppc*-*linux*|powerpc*-*linux*) ++ powerpc-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; ++ powerpcle-*linux*|powerpc64le-*linux*) ++ LD="${LD-ld} -m elf64lppc" ++ ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; diff --git a/eclass/ELT-patches/ppc64le/2.4.4 b/eclass/ELT-patches/ppc64le/2.4.4 new file mode 100644 index 000000000000..0d86521653aa --- /dev/null +++ b/eclass/ELT-patches/ppc64le/2.4.4 @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/580792 +https://bugs.gentoo.org/581314 +https://debbugs.gnu.org/23348 + +this fixes ppc64le handling in newer libtool versions + +--- a/m4/libtool.m4 ++++ b/m4/libtool.m4 +@@ -1386,10 +1386,10 @@ + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; +- powerpcle-*linux*) ++ powerpcle-*linux*|powerpc64le-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; +- powerpc-*linux*) ++ powerpc-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass index 47ef8128defa..9f56c202ffc2 100644 --- a/eclass/libtool.eclass +++ b/eclass/libtool.eclass @@ -144,7 +144,7 @@ elibtoolize() { local deptoremove= local do_shallow="no" local force="false" - local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed target-nm" + local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed target-nm ppc64le" for x in "$@" ; do case ${x} in @@ -417,6 +417,10 @@ elibtoolize() { ELT_walk_patches "${d}/configure" "${p}" ret=$? ;; + ppc64le) + ELT_walk_patches "${d}/configure" "${p}" + ret=$? + ;; *) # ltmain.sh patches are applied above ;; diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index e6dc9b5bb357..e42f7388d74f 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -1,6 +1,3 @@ -DIST openrc-0.17.tar.bz2 160533 SHA256 45818d9ef4659e8dd924a1468a091255c305daee5417f94d9515f0e125298b30 SHA512 6e69b036d113f066b0dd0bfe55e019328e0e77cff6c93f0a3e55751aa0a72411aa3b1efe8b4327e156a9612e4155863b0a81c9eda043c12904bb36e861b71399 WHIRLPOOL de45daf6f4aebe632ea9fcb46408e63f0aed6c9b9129fb5510f348f20cf1c62aa42e7dce47a7f19a441696596fa57494642e7334a42c415fdbc865cb80a18eff -DIST openrc-0.18.4.tar.bz2 157237 SHA256 2c8bf1c6f52fcf4c1f6945a2836ba2551a7d93015aa63ba5a2e1d2851c2942e4 SHA512 13f5dbc1292ce94c2e42a35e582bbba12e4bba943640952ea4cecc7ff5c60175d362055a4f5e213f218236ab4a040a5dff01a47c8bc007237554744d8a89a48a WHIRLPOOL f1f44effad80863276339af5bce1b3a9068d9c5ae7f7c3b571fb883b376c9083c207980c6d05170b0a18c0902ad1e2d76a1bafb0f11721b0522308e2cb7c67b4 -DIST openrc-0.19.1.tar.bz2 159598 SHA256 5628c04b12e2f51f25e59c303bdccbf545ba0db25484adcca48e70d0712ce0e6 SHA512 303db4475fd02aa3aa161dbd8794a45c2633b9fe96aaab67b81014fa3915bed1aa51cff57128f4413cf9f2329ce1f2012e460e089c39f01ac6eb061a95844329 WHIRLPOOL a4e8720579b8983cb3c2c9b4dd983c1b7bf45e053aa0c9545f31e36c22e44d06e55198d4143dc0a6bca3b7d00b151b43d1da439b2479044344ca12f3151711f1 DIST openrc-0.21.7.tar.bz2 168104 SHA256 0d4bb11cfac9950687dfbc1a72a90e337af25bb39edc032cb0b807cfe0d04c3d SHA512 26edf47e0eae0b62b651484bcbe73a5ccda2032ecbcc303f280bbf671fd1a8a1394d206228bd12e5157e8214210eb124898d11acc78cdef0d9145a952754f6bc WHIRLPOOL 5731326b0879759f58b3e251e3b1c4cc6dcc17bee3ebf1d8ef4b689dff5ec39d429cde9c3d4f2901c8a592aaad7253bfca69a0caaa2ae77b6f45f9afe6e66df4 DIST openrc-0.22.4.tar.gz 214321 SHA256 d428890c12936b502d79018667dc6094d0e801c558f118b49e44c5f34636073b SHA512 c85f6a87d03203f665d010ae357e7e1e2cae0158b12075376f3fe928daeffa14139ccc3dc2f24613cec25eb145b8f7dd64e067bd07493001570659095e60c296 WHIRLPOOL 3e50761d5626da03a74ce6de634ae08d79fa190d811fc8e661a56be66b3f0a6d28ee24f6045183914ebabd14280f535920d34c591e384df5d016e7cca49c209b DIST openrc-0.23.2.tar.gz 209569 SHA256 244a9902a98694a7fd59ad3dec49bd9e61a6b22864795ed31ef8fc81aa474251 SHA512 6c8483d36812d21ba45bf3c386c6f1c03a9c01c10f48b7e7eb26707d105568b8017ba8a7728a794ac0ac6fedab10cea2bc9587f4d5ddb1957001e03f872e8f18 WHIRLPOOL 88f61ab81562bdcb1b616441f01cbc3b45aca45d0a55bf41e3a9d6b733b3dfec429bf3c1645811c187c21038674e56d3e32e6035062685b45765fb3b85740e3c diff --git a/sys-apps/openrc/openrc-0.17.ebuild b/sys-apps/openrc/openrc-0.17.ebuild deleted file mode 100644 index 28d954838973..000000000000 --- a/sys-apps/openrc/openrc-0.17.ebuild +++ /dev/null @@ -1,336 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils flag-o-matic multilib pam toolchain-funcs - -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" -HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="git://github.com/OpenRC/${PN}.git" - inherit git-r3 -else - SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs - tools unicode kernel_linux kernel_FreeBSD" - -COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) - ncurses? ( sys-libs/ncurses:0= ) - pam? ( - sys-auth/pambase - virtual/pam - ) - tools? ( dev-lang/perl ) - audit? ( sys-process/audit ) - kernel_linux? ( - sys-process/psmisc - !<sys-process/procps-3.3.9-r2 - ) - selinux? ( - sys-apps/policycoreutils - sys-libs/libselinux - ) - !<sys-apps/baselayout-2.1-r1 - !<sys-fs/udev-init-scripts-27" -DEPEND="${COMMON_DEPEND} - virtual/os-headers - ncurses? ( virtual/pkgconfig )" -RDEPEND="${COMMON_DEPEND} - !prefix? ( - kernel_linux? ( >=sys-apps/sysvinit-2.86-r6 ) - kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) - ) - selinux? ( - sec-policy/selinux-base-policy - sec-policy/selinux-openrc - ) -" - -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/gitver.mk || die - fi - - # Allow user patches to be applied without modifying the ebuild - epatch_user -} - -src_compile() { - unset LIBDIR #266688 - - MAKE_ARGS="${MAKE_ARGS} - LIBNAME=$(get_libdir) - LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc - MKNET=$(usex newnet) - MKSELINUX=$(usex selinux) - MKAUDIT=$(usex audit) - MKPAM=$(usev pam) - 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="Gentoo ${brand}" - use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" - export DEBUG=$(usev debug) - 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 - - # install the gentoo pam.d file - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon - - # install documentation - dodoc ChangeLog *.md - 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 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 - has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt -} - -# >=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 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." - ewarn - 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." - ewarn - 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 - - # Updated for 0.13.2. - ewarn "Bug https://bugs.gentoo.org/show_bug.cgi?id=427996 was not" - ewarn "fixed correctly in earlier versions of OpenRC." - ewarn "The correct fix is implemented in this version, but that" - ewarn "means netmount needs to be added to the default runlevel if" - ewarn "you are using nfs file systems." - ewarn - - 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.18.4.ebuild b/sys-apps/openrc/openrc-0.18.4.ebuild deleted file mode 100644 index f13551780fba..000000000000 --- a/sys-apps/openrc/openrc-0.18.4.ebuild +++ /dev/null @@ -1,347 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils flag-o-matic multilib pam toolchain-funcs - -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" -HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="git://github.com/OpenRC/${PN}.git" - inherit git-r3 -else - SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs - tools unicode kernel_linux kernel_FreeBSD" - -COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) - ncurses? ( sys-libs/ncurses:0= ) - pam? ( - sys-auth/pambase - virtual/pam - ) - tools? ( dev-lang/perl ) - audit? ( sys-process/audit ) - kernel_linux? ( - sys-process/psmisc - !<sys-process/procps-3.3.9-r2 - ) - selinux? ( - sys-apps/policycoreutils - sys-libs/libselinux - ) - !<sys-apps/baselayout-2.1-r1 - !<sys-fs/udev-init-scripts-27" -DEPEND="${COMMON_DEPEND} - virtual/os-headers - ncurses? ( virtual/pkgconfig )" -RDEPEND="${COMMON_DEPEND} - !prefix? ( - kernel_linux? ( >=sys-apps/sysvinit-2.86-r6 ) - kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) - ) - selinux? ( - sec-policy/selinux-base-policy - sec-policy/selinux-openrc - ) -" - -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/gitver.mk || die - fi - - # Allow user patches to be applied without modifying the ebuild - epatch_user -} - -src_compile() { - unset LIBDIR #266688 - - MAKE_ARGS="${MAKE_ARGS} - LIBNAME=$(get_libdir) - LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc - MKNET=$(usex newnet) - MKSELINUX=$(usex selinux) - MKAUDIT=$(usex audit) - MKPAM=$(usev pam) - 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="Gentoo ${brand}" - use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" - export DEBUG=$(usev debug) - 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 - - # install the gentoo pam.d file - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon - - # install documentation - dodoc ChangeLog *.md - 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 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 - has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt - - if ! has_version ">=sys-apps/openrc-0.18.3"; then - add_boot_init mtab - if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then - ewarn "${EROOT}etc/mtab will be replaced with a" - ewarn "symbolic link to /proc/self/mounts on the next" - ewarn "reboot." - ewarn "Change the setting in ${EROOT}etc/conf.d/mtab" - ewarn "if you do not want this to happen." - 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 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." - ewarn - 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." - ewarn - 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 - - # Updated for 0.13.2. - ewarn "Bug https://bugs.gentoo.org/show_bug.cgi?id=427996 was not" - ewarn "fixed correctly in earlier versions of OpenRC." - ewarn "The correct fix is implemented in this version, but that" - ewarn "means netmount needs to be added to the default runlevel if" - ewarn "you are using nfs file systems." - ewarn - - 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.19.1.ebuild b/sys-apps/openrc/openrc-0.19.1.ebuild deleted file mode 100644 index 886098d2b444..000000000000 --- a/sys-apps/openrc/openrc-0.19.1.ebuild +++ /dev/null @@ -1,347 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils flag-o-matic multilib pam toolchain-funcs - -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" -HOMEPAGE="https://github.com/openrc/openrc/" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="git://github.com/OpenRC/${PN}.git" - inherit git-r3 -else - SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs - tools unicode kernel_linux kernel_FreeBSD" - -COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) - ncurses? ( sys-libs/ncurses:0= ) - pam? ( - sys-auth/pambase - virtual/pam - ) - tools? ( dev-lang/perl ) - audit? ( sys-process/audit ) - kernel_linux? ( - sys-process/psmisc - !<sys-process/procps-3.3.9-r2 - ) - selinux? ( - sys-apps/policycoreutils - sys-libs/libselinux - ) - !<sys-apps/baselayout-2.1-r1 - !<sys-fs/udev-init-scripts-27" -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 ) - ) - selinux? ( - sec-policy/selinux-base-policy - sec-policy/selinux-openrc - ) -" - -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/gitver.mk || die - fi - - # Allow user patches to be applied without modifying the ebuild - epatch_user -} - -src_compile() { - unset LIBDIR #266688 - - MAKE_ARGS="${MAKE_ARGS} - LIBNAME=$(get_libdir) - LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc - MKNET=$(usex newnet) - MKSELINUX=$(usex selinux) - MKAUDIT=$(usex audit) - MKPAM=$(usev pam) - 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="Gentoo ${brand}" - use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" - export DEBUG=$(usev debug) - 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 - - # install the gentoo pam.d file - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon - - # install documentation - dodoc ChangeLog *.md - 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 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 - has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt - - if ! has_version ">=sys-apps/openrc-0.18.3"; then - add_boot_init mtab - if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then - ewarn "${EROOT}etc/mtab will be replaced with a" - ewarn "symbolic link to /proc/self/mounts on the next" - ewarn "reboot." - ewarn "Change the setting in ${EROOT}etc/conf.d/mtab" - ewarn "if you do not want this to happen." - 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 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." - ewarn - 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." - ewarn - 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 - - # Updated for 0.13.2. - ewarn "Bug https://bugs.gentoo.org/show_bug.cgi?id=427996 was not" - ewarn "fixed correctly in earlier versions of OpenRC." - ewarn "The correct fix is implemented in this version, but that" - ewarn "means netmount needs to be added to the default runlevel if" - ewarn "you are using nfs file systems." - ewarn - - 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-devel/libtool/files/libtool-2.4.6-ppc64le.patch b/sys-devel/libtool/files/libtool-2.4.6-ppc64le.patch new file mode 100644 index 000000000000..78d86c72956b --- /dev/null +++ b/sys-devel/libtool/files/libtool-2.4.6-ppc64le.patch @@ -0,0 +1,111 @@ +From 020afd7d6410f73bc205206abe1b88b4890b83b1 Mon Sep 17 00:00:00 2001 +From: Leno Hou <lenohou@gmail.com> +Date: Sun, 24 Apr 2016 00:46:53 +0800 +Subject: [PATCH] [m4/libtool.m4] linker error for powerpc64le-unknown-linux-gnu + +Hi all, + + 1) As we might know, Gentoo has powerpc64le-unknown-linux-gnu compiler + +leno@localhost ~ $ powerpc64le-unknown-linux-gnu-gcc -v + +Using built-in specs. + +COLLECT_GCC=/usr/powerpc64le-unknown-linux-gnu/gcc-bin/5.3.0/powerpc64le-unknown-linux-gnu-gcc + +COLLECT_LTO_WRAPPER=/usr/libexec/gcc/powerpc64le-unknown-linux-gnu/5.3.0/lto-wrapper + +Target: powerpc64le-unknown-linux-gnu + +Configured with: +/var/tmp/portage/sys-devel/gcc-5.3.0/work/gcc-5.3.0/configure +--host=powerpc64le-unknown-linux-gnu --build=powerpc64le-unknown-linux-gnu +--prefix=/usr --bindir=/usr/powerpc64le-unknown-linux-gnu/gcc-bin/5.3.0 +--includedir=/usr/lib/gcc/powerpc64le-unknown-linux-gnu/5.3.0/include +--datadir=/usr/share/gcc-data/powerpc64le-unknown-linux-gnu/5.3.0 +--mandir=/usr/share/gcc-data/powerpc64le-unknown-linux-gnu/5.3.0/man +--infodir=/usr/share/gcc-data/powerpc64le-unknown-linux-gnu/5.3.0/info +--with-gxx-include-dir=/usr/lib/gcc/powerpc64le-unknown-linux-gnu/5.3.0/include/g++-v5 +--with-python-dir=/share/gcc-data/powerpc64le-unknown-linux-gnu/5.3.0/python +--enable-languages=c,c++,fortran --enable-obsolete --enable-secureplt +--disable-werror --with-system-zlib --enable-nls --without-included-gettext +--enable-checking=release --with-bugurl=https://bugs.gentoo.org/ +--with-pkgversion='Gentoo 5.3.0 p1.0, pie-0.6.5' --enable-libstdcxx-time +--enable-shared --enable-threads=posix --enable-__cxa_atexit +--enable-clocale=gnu --disable-multilib --enable-altivec +--disable-fixed-point --enable-targets=all --disable-libgcj +--enable-libgomp --disable-libmudflap --disable-libssp --disable-libcilkrts +--enable-lto --without-isl --enable-libsanitizer + +Thread model: posix + +gcc version 5.3.0 (Gentoo 5.3.0 p1.0, pie-0.6.5) + + 2) And the supported emulations + +leno@localhost ~ $ powerpc64le-unknown-linux-gnu-ld -V +GNU ld (Gentoo 2.25.1 p1.1) 2.25.1 + Supported emulations: + elf64lppc + elf32lppc + elf32lppclinux + elf32lppcsim + + 3) But when I set CHOST="powerpc64le-unkown-linux-gnu" in Gentoo and +execute aclocal, automake, libtoolize --copy --force, autoconf. When I +glance in the latest m4/libtool.m4 : + +if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in +... + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; +... + *64-bit*) + case $host in +... + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; +... + +seems linked to $LD='$LD-ld -m elf64ppc' and failed to compile packages. + + 4) Below is my workaround patch and works fine for this case. If this is +OK for you, Could this to be merged in upstream? Thanks + +URL: https://debbugs.gnu.org/23348 +URL: https://bugs.gentoo.org/581314 +--- + m4/libtool.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/m4/libtool.m4 b/m4/libtool.m4 +index ee292aff5bca..758b6951ae07 100644 +--- a/m4/libtool.m4 ++++ b/m4/libtool.m4 +@@ -1417,10 +1417,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; +- powerpcle-*linux*) ++ powerpcle-*linux*|powerpc64le-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; +- powerpc-*linux*) ++ powerpc-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) +-- +2.11.1 + diff --git a/sys-devel/libtool/libtool-2.4.6-r2.ebuild b/sys-devel/libtool/libtool-2.4.6-r2.ebuild index 7f0bb8047724..6b50e643998a 100644 --- a/sys-devel/libtool/libtool-2.4.6-r2.ebuild +++ b/sys-devel/libtool/libtool-2.4.6-r2.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-2 else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" fi DESCRIPTION="A shared library tool for developers" diff --git a/sys-devel/libtool/libtool-2.4.6.ebuild b/sys-devel/libtool/libtool-2.4.6-r3.ebuild index 71a9b47a26fd..9ac2aa64355d 100644 --- a/sys-devel/libtool/libtool-2.4.6.ebuild +++ b/sys-devel/libtool/libtool-2.4.6-r3.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="4" +EAPI="5" LIBTOOLIZE="true" #225559 WANT_LIBTOOL="none" @@ -47,11 +46,24 @@ src_prepare() { use vanilla && return 0 epatch "${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105 + epatch "${FILESDIR}"/${P}-link-specs.patch + epatch "${FILESDIR}"/${P}-link-fsanitize.patch #573744 + epatch "${FILESDIR}"/${P}-link-fuse-ld.patch + epatch "${FILESDIR}"/${P}-libtoolize-slow.patch + epatch "${FILESDIR}"/${P}-libtoolize-delay-help.patch + epatch "${FILESDIR}"/${P}-sed-quote-speedup.patch #542252 + epatch "${FILESDIR}"/${P}-ppc64le.patch #581314 pushd libltdl >/dev/null AT_NOELIBTOOLIZE=yes eautoreconf popd >/dev/null AT_NOELIBTOOLIZE=yes eautoreconf epunt_cxx + + # Make sure timestamps don't trigger a rebuild of man pages. #556512 + if [[ ${PV} != "9999" ]] ; then + touch doc/*.1 + export HELP2MAN=false + fi } src_configure() { @@ -60,6 +72,10 @@ src_configure() { # cause problems for people who switch /bin/sh on the fly to other # shells, so just force libtool to use /bin/bash all the time. export CONFIG_SHELL=/bin/bash + + # Do not bother hardcoding the full path to sed. Just rely on $PATH. #574550 + export ac_cv_path_SED=$(basename "$(type -P sed)") + ECONF_SOURCE=${S} econf --disable-ltdl-install } diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild index e46a9feace7d..22a5d3c10437 100644 --- a/sys-devel/libtool/libtool-9999.ebuild +++ b/sys-devel/libtool/libtool-9999.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 +EAPI="5" LIBTOOLIZE="true" #225559 WANT_LIBTOOL="none" @@ -27,7 +26,8 @@ IUSE="vanilla" # Pull in libltdl directly until we convert packages to the new dep. RDEPEND="sys-devel/gnuconfig >=sys-devel/autoconf-2.69 - >=sys-devel/automake-1.13" + >=sys-devel/automake-1.13 + dev-libs/libltdl:0" DEPEND="${RDEPEND} app-arch/xz-utils" [[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man" @@ -65,6 +65,10 @@ src_configure() { # cause problems for people who switch /bin/sh on the fly to other # shells, so just force libtool to use /bin/bash all the time. export CONFIG_SHELL=/bin/bash + + # Do not bother hardcoding the full path to sed. Just rely on $PATH. #574550 + export ac_cv_path_SED=$(basename "$(type -P sed)") + ECONF_SOURCE=${S} econf --disable-ltdl-install } |