summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/coreutils/Manifest6
-rw-r--r--sys-apps/coreutils/coreutils-8.26.ebuild2
-rw-r--r--sys-apps/coreutils/coreutils-8.28-r1.ebuild210
-rw-r--r--sys-apps/coreutils/metadata.xml1
-rw-r--r--sys-apps/dbus/Manifest4
-rw-r--r--sys-apps/dbus/dbus-1.12.0.ebuild (renamed from sys-apps/dbus/dbus-1.10.22.ebuild)15
-rw-r--r--sys-apps/etckeeper/Manifest1
-rw-r--r--sys-apps/etckeeper/files/etckeeper-1.18.3-gentoo.patch78
-rw-r--r--sys-apps/fakeroot/Manifest2
-rw-r--r--sys-apps/fakeroot/fakeroot-1.22.ebuild2
-rw-r--r--sys-apps/inxi/Manifest6
-rw-r--r--sys-apps/inxi/inxi-2.3.43.ebuild (renamed from sys-apps/inxi/inxi-2.3.0_p20160807-r1.ebuild)17
-rw-r--r--sys-apps/inxi/inxi-2.3.4_p20161104-r1.ebuild28
-rw-r--r--sys-apps/logwatch/Manifest5
-rw-r--r--sys-apps/logwatch/files/logwatch-7.4.3+-openssh-hpn.patch16
-rw-r--r--sys-apps/logwatch/files/logwatch.tmpfile1
-rw-r--r--sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild108
-rw-r--r--sys-apps/logwatch/logwatch-9999.ebuild95
-rw-r--r--sys-apps/lshw/Manifest2
-rw-r--r--sys-apps/lshw/lshw-02.18b.ebuild2
-rw-r--r--sys-apps/openrc/Manifest2
-rw-r--r--sys-apps/openrc/openrc-0.34.6.ebuild329
-rw-r--r--sys-apps/osinfo-db-tools/Manifest2
-rw-r--r--sys-apps/osinfo-db-tools/osinfo-db-tools-1.1.0.ebuild2
-rw-r--r--sys-apps/osinfo-db/Manifest6
-rw-r--r--sys-apps/osinfo-db/osinfo-db-20170326.ebuild2
-rw-r--r--sys-apps/osinfo-db/osinfo-db-20170423.ebuild2
-rw-r--r--sys-apps/osinfo-db/osinfo-db-20170813.ebuild2
-rw-r--r--sys-apps/paludis/Manifest4
-rw-r--r--sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild148
-rw-r--r--sys-apps/paludis/paludis-9999.ebuild2
-rw-r--r--sys-apps/portage/Manifest6
-rw-r--r--sys-apps/portage/portage-2.3.12.ebuild2
-rw-r--r--sys-apps/portage/portage-2.3.13.ebuild2
-rw-r--r--sys-apps/portage/portage-2.3.8.ebuild2
-rw-r--r--sys-apps/smartmontools/Manifest5
-rw-r--r--sys-apps/smartmontools/smartmontools-6.5.ebuild103
-rw-r--r--sys-apps/smartmontools/smartmontools-6.6.ebuild150
-rw-r--r--sys-apps/smartmontools/smartmontools-9999.ebuild4
-rw-r--r--sys-apps/systemd/Manifest2
-rw-r--r--sys-apps/systemd/systemd-233-r6.ebuild2
-rw-r--r--sys-apps/udevil/Manifest2
-rw-r--r--sys-apps/udevil/udevil-0.4.4-r3.ebuild2
-rw-r--r--sys-apps/util-linux/Manifest6
-rw-r--r--sys-apps/util-linux/util-linux-2.30.2.ebuild6
-rw-r--r--sys-apps/util-linux/util-linux-2.31.ebuild4
-rw-r--r--sys-apps/util-linux/util-linux-9999.ebuild4
47 files changed, 1136 insertions, 268 deletions
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 996b09ebd2c4..45fca0dc733a 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -9,11 +9,13 @@ DIST coreutils-8.27-patches-1.1.tar.xz 7800 SHA256 8b8996a38913971c955c7b7e428d0
DIST coreutils-8.27.tar.xz 5285648 SHA256 8891d349ee87b9ff7870f52b6d9312a9db672d2439d289bc57084771ca21656b SHA512 abf3280aaa54e9bd5851df0eda2af1de1017ca174633e52d1e592455d46ea0e99812dda46d2f320e979553cef271485d8818c595bba6ed31264511a511c93679 WHIRLPOOL dcc092f41fb4802563062a4aa5a71e2841a7ddc46dec4acc47af3d9a4bee2372ddae7990ac6f3cf00568f43c3103c8290338964040e111861f080e064960803d
DIST coreutils-8.28-man.tar.xz 43832 SHA256 d72c3fa79ae328a4fd1107102e8946755aa2e908044e1efcf1e71ef206dca042 SHA512 363cf595e0f6fc69eb6a9d1ca258a5f012404cee99887494ab6e40fe2c6de5e49e7cad953aecb394c5612043efe6b407e657811d8251b10e159c97b849dd8b3e WHIRLPOOL 7b10dbde06caf00d4b789cdb60a7d0c73aec65a90e889698daeccd04eefd8df08142261ea5fde8d3d455f35b2eddf07182bf92e2522e63e8ece412379e0cb0d1
DIST coreutils-8.28-patches-1.0.tar.xz 7264 SHA256 fe9e8f347d104472d357ad80212996d0c9ddb97cec6166d38f4c340a02f4633c SHA512 b358b827eaff789ea8a3838f53f81efb08a6caa5318ac93dab112ec90052174c05d219e1c0170106bb1ed65bd4e37ffc36b742bf3661cc64ee4b166db741bbbc WHIRLPOOL ece3be79d296507341433bf60b0e7bd6846c3d0a8acfff19d1fba17ec45a13f5504c41bb320bd39358ae9f5e2efd5311e2a7ef6ec1119872f990455f9aa9c94d
+DIST coreutils-8.28-patches-1.1.tar.xz 7336 SHA256 bdd7ed0ef973bc1095df329225659a928ed061695651e2b54de79ac15690f517 SHA512 af47aaa614550e5cd82b2386fafd9f90beb0564b8bbedfe92238906e7c6f040fb7468c1929f0951d4f98038b6e1df7da2408204be78219e6a041658507385957 WHIRLPOOL 4a90ffa0a35b81d3d20c29128b0d39e08136d499201ac875781d9e851142d36c111031b333b6bfb81db692e75e7b3cc9673c4339d8d183d0d8df2371444dca4e
DIST coreutils-8.28.tar.xz 5252336 SHA256 1117b1a16039ddd84d51a9923948307cfa28c2cea03d1a2438742253df0a0c65 SHA512 1e592d0dd03b9227bf92af9a82bed6dc3bcbee46e984c7fb09833dea0962e86b309aa34d5e43823b73d4522c066bfa5cdc8ec694aa190910fb246ff32ceb63a1 WHIRLPOOL 58bdd9681d07794da70dc012d03de2f791bc8e40a16de85302cbb5ea247f6d81f0a92c3b90d655b9947057c5e5eb99b9347152d41150c1a613dd1f891942a73f
EBUILD coreutils-8.25.ebuild 5839 SHA256 0d18564c2dc7106d9882bb4e7597c0fc910c7dbfb0e7a802ff23d8dc2ab57310 SHA512 86a917921cfd7c20755c2570c58438f7bfe923f8838e91508300a745a4417038cc81112a50972f288a02ff3acbb0405ac01784170fbebd62c9ac4c1e40294816 WHIRLPOOL 2e08adaa8f170ae83ab956867d576d7b105a02f109108e7af3d06fd152a553c9633e009ad699657f366ad2809743316f368d98b72f03e9a20be84b602709ac36
-EBUILD coreutils-8.26.ebuild 5863 SHA256 2593c865c6c60ad50f5f61ca3d18857ddc63784b0e9e8d9b668a620b0da9e5d0 SHA512 5583c226f1dcfe303f06301432bf00952fb7fcd5eb86959aeb1189777d64e85c2c96d331c4f833d513a86512ede04de9435c6ae2c79866dab721a5ca7faeafdb WHIRLPOOL 986f5c0bc72bf8003708ff64da97eb068c48f76a54d088ca54a8822112a2896fa9b74144479105d687c17321c92987c24efb7e5a867904cb291632c2a73b9672
+EBUILD coreutils-8.26.ebuild 5858 SHA256 6d65397b7c880200051a618774f1097b51497e025d458fa196486ed4ed3ce2e3 SHA512 fc8a6d01fb2e3885b876756dbc0c4a78e0300d470ca2e845de5045f6dc79f8d004b7069ca5df40bfee05662bbc01d05107ad793c868e2b6451b757fb2e149e14 WHIRLPOOL 2e023cef38d1f28f433e488e0116f057041b6a4c0f0ec812cbba1c5c2a75cf1ee1a19945a0ab7d1fc9816a375bfe1c6a2cab4806422f4ac4444fc46c8980512c
EBUILD coreutils-8.27.ebuild 5901 SHA256 e48b42c3d0eae8703c22b7b0d0d638a210e11c7caba036bfde9bce8871529f08 SHA512 a230b81b5913e0b98efe30f2876587178539c9dd462424c4eb71f5572fd496e4b0224f76cef92be973601f022f439ee36da393fabf4b70c2bfec71785321e8cd WHIRLPOOL 948e7a87be1e56fee5e879af681860dd5bcc9b02e30435d84117cc790b0ba5f368f6f49a6615246a061dc014f1a44c65ef293907358b0531957779c87c066c6a
+EBUILD coreutils-8.28-r1.ebuild 6486 SHA256 0693b93bc2ef3808fadbb6ed690823594c9e8656dc804e1b66cd1b3b9323ba85 SHA512 57b0f0e8dc6cc0396bfe9394b595f66331f25eb8c8b76af3851fcf9a1d8a61fe96388c58b316edba67568ae20f3d0b1e342b14e03a221267bd45d3ce26e564e2 WHIRLPOOL 8055c4a96cbd929556b1e21bd921d7a02ecdfe49636fb92014950c64ead4f0210f4bf3898721fff314585262eb46855116f359933b3c6e1d0839cb0a53c4fa1a
EBUILD coreutils-8.28.ebuild 5869 SHA256 c42674858864cb12c270e9431888f93778bc2996425f97691b952dea08fa0c61 SHA512 8c98e0e5cee83a5d3a6c138fde77888dc8b6df45e16e2cb48f93bffd91391a957be2489656b95030c1be14f04400a98b4cbde258e4a78559ac2de24cd8199d70 WHIRLPOOL 1cc452904196ade41ee491ce83e92d3263e63b3abb2ecf2b05bfa9c52460fedf0e0609ea8edefddf3ec32054febfbd0ba23954d6b236812168018dcf4c976017
MISC ChangeLog 7611 SHA256 95cfa59136c273c96f0197f728a444d3337cf408e6d974d07553188148c77d14 SHA512 a1a429745e1d5b7efb21b321abd21e1b064bde4f271bbd600f6be3dd32dced5e04cea1fe8a2bc9abf12fdadde55ccefea1257730d5d944f5dc1b97d98d25e4ff WHIRLPOOL 93253eca9c20b770912675ad30f312e803fc1bf8cd17f59e0fd02446298d4f327e8f9c90ab4c90636fd9b4bc0dcbaf3ba477b3ba86f6820ff4040a676e057529
MISC ChangeLog-2015 57093 SHA256 368347193225a6204bd2454ecbdf549ca614cb8fc5e183ac14c2f767288323e9 SHA512 ef4eff9a3d748641bf1b745599e951308801e1d00d67c5504d17e4d740f5cd7f0c75cd5ee34c8345e8017ee8b6397b84a41df84b4f342ff899a04fd35a0c8f28 WHIRLPOOL 43464de8d0d85fa5b35797c95049591d0a225e4e6f0ab596d8c637da0538f0605c15c35749195fea181b9d5e6a75ea7573a96dbe9da70f28e131a47c913d43b5
-MISC metadata.xml 738 SHA256 1b3907f92a4f6f20b1267d1c4a2b4d126e2a27b9820f6a3b2cb671b438edeeb6 SHA512 c074b29033dae300fa02fb35edf0b595bf00bd5616bac8af5b88525980dc8542dc336145b19942d0f849189b7abe0201f2a40d86d0ed02ddad602eb131b3a87a WHIRLPOOL 206dd26110118d307e0f1654b9e20e26805c90f968c1c00ffc71878503bd6112510ee334a44a031d05884fe8f3576a07efcab630f4823f5527c5d32adc918938
+MISC metadata.xml 869 SHA256 444c175ba81a34c5d0ff0ba41c12f629ddd9b7153c7f27e0b35861559a8fb3fc SHA512 19e07c93cbe1cfe087eb7fdc8647aa4c264f1e6a193a0ed4e1ceb302bda92565aa76966b6ef2efa15d7535082ef0e6a1454fee20eca4797466f5de5e37ac4957 WHIRLPOOL 8d7d7ef9124fbf096143b8ca21c5f69a482d97fca751b69b017d004fc5ddbbe1a3f9a40170f72b9ba4a9fd0b09e833eee0ee17e9003cf96ff7d5c4e0763113e8
diff --git a/sys-apps/coreutils/coreutils-8.26.ebuild b/sys-apps/coreutils/coreutils-8.26.ebuild
index d2e18b884f50..6b9584bd0abd 100644
--- a/sys-apps/coreutils/coreutils-8.26.ebuild
+++ b/sys-apps/coreutils/coreutils-8.26.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="acl caps gmp hostname kill multicall nls selinux static userland_BSD vanilla xattr"
LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
diff --git a/sys-apps/coreutils/coreutils-8.28-r1.ebuild b/sys-apps/coreutils/coreutils-8.28-r1.ebuild
new file mode 100644
index 000000000000..9950e8168921
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-8.28-r1.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# To generate the man pages, unpack the upstream tarball and run:
+# ./configure --enable-install-program=arch,coreutils,hostname,kill
+# make
+# cd ..
+# tar cf - coreutils-*/man/*.[0-9] | xz > coreutils-<ver>-man.tar.xz
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit eutils flag-o-matic python-any-r1 toolchain-funcs
+
+PATCH_VER="1.1"
+DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
+HOMEPAGE="https://www.gnu.org/software/coreutils/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+ mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
+ https://dev.gentoo.org/~whissi/dist/${PN}/${P}-patches-${PATCH_VER}.tar.xz
+ mirror://gentoo/${P}-man.tar.xz
+ https://dev.gentoo.org/~polynomial-c/dist/${P}-man.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
+IUSE="acl caps gmp hostname kill multicall nls selinux static test userland_BSD vanilla xattr"
+
+LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
+ caps? ( sys-libs/libcap )
+ gmp? ( dev-libs/gmp:=[static-libs] )
+ xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
+ selinux? ( sys-libs/libselinux )
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )
+ app-arch/xz-utils
+ test? (
+ dev-lang/perl
+ dev-perl/Expect
+ !userland_BSD? (
+ dev-util/strace
+ )
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]')
+ )"
+RDEPEND+="
+ hostname? ( !sys-apps/net-tools[hostname] )
+ kill? (
+ !sys-apps/util-linux[kill]
+ !sys-process/procps[kill]
+ )
+ !app-misc/realpath
+ !<sys-apps/util-linux-2.13
+ !<sys-apps/sandbox-2.10-r4
+ !sys-apps/stat
+ !net-mail/base64
+ !sys-apps/mktemp
+ !<app-forensics/tct-1.18-r1
+ !<net-fs/netatalk-2.0.3-r4"
+
+pkg_setup() {
+ if use test ; then
+ python-any-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ if ! use vanilla ; then
+ use_if_iuse unicode || rm -f "${WORKDIR}"/patch/000_all_coreutils-i18n.patch
+ #rm "${WORKDIR}"/patch/001_all_coreutils-gen-progress-bar.patch || die
+ eapply "${WORKDIR}"/patch/*.patch
+ fi
+
+ eapply_user
+
+ # Since we've patched many .c files, the make process will try to
+ # re-build the manpages by running `./bin --help`. When doing a
+ # cross-compile, we can't do that since 'bin' isn't a native bin.
+ # Also, it's not like we changed the usage on any of these things,
+ # so let's just update the timestamps and skip the help2man step.
+ set -- man/*.x
+ touch ${@/%x/1}
+
+ # Avoid perl dep for compiled in dircolors default #348642
+ if ! has_version dev-lang/perl ; then
+ touch src/dircolors.h
+ touch ${@/%x/1}
+ fi
+}
+
+src_configure() {
+ local myconf=(
+ --with-packager="Gentoo"
+ --with-packager-version="${PVR} (p${PATCH_VER:-0})"
+ --with-packager-bug-reports="https://bugs.gentoo.org/"
+ --enable-install-program="arch,$(usev hostname),$(usev kill)"
+ --enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
+ --enable-largefile
+ $(use caps || echo --disable-libcap)
+ $(use_enable nls)
+ $(use_enable acl)
+ $(use_enable multicall single-binary)
+ $(use_enable xattr)
+ $(use_with gmp)
+ )
+ if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
+ export fu_cv_sys_stat_statfs2_bsize=yes #311569
+ export gl_cv_func_realpath_works=yes #416629
+ fi
+
+ export gl_cv_func_mknod_works=yes #409919
+ use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
+ use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
+ use userland_BSD && myconf+=( -program-prefix=g --program-transform-name=s/stat/nustat/ )
+ # kill/uptime - procps
+ # groups/su - shadow
+ # hostname - net-tools
+ econf ${myconf[@]}
+}
+
+src_test() {
+ # Known to fail with FEATURES=usersandbox (bug #439574):
+ # - tests/du/long-from-unreadable.sh} (bug #413621)
+ # - tests/rm/deep-2.sh (bug #413621)
+ # - tests/dd/no-allocate.sh (bug #629660)
+ if has usersandbox $FEATURES ; then
+ ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+ "Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+ fi
+
+ # Non-root tests will fail if the full path isn't
+ # accessible to non-root users
+ chmod -R go-w "${WORKDIR}"
+ chmod a+rx "${WORKDIR}"
+
+ # coreutils tests like to do `mount` and such with temp dirs
+ # so make sure /etc/mtab is writable #265725
+ # make sure /dev/loop* can be mounted #269758
+ mkdir -p "${T}"/mount-wrappers
+ mkwrap() {
+ local w ww
+ for w in "$@" ; do
+ ww="${T}/mount-wrappers/${w}"
+ cat <<-EOF > "${ww}"
+ #!${EPREFIX}/bin/sh
+ exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@"
+ EOF
+ chmod a+rx "${ww}"
+ done
+ }
+ mkwrap mount umount
+
+ addwrite /dev/full
+ #export RUN_EXPENSIVE_TESTS="yes"
+ #export FETISH_GROUPS="portage wheel"
+ env PATH="${T}/mount-wrappers:${PATH}" \
+ emake -j1 -k check
+}
+
+src_install() {
+ default
+
+ insinto /etc
+ newins src/dircolors.hin DIR_COLORS
+
+ if [[ ${USERLAND} == "GNU" ]] ; then
+ cd "${ED%/}"/usr/bin || die
+ dodir /bin
+ # move critical binaries into /bin (required by FHS)
+ local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
+ mkdir mknod mv pwd rm rmdir stty sync true uname"
+ mv ${fhs} ../../bin/ || die "could not move fhs bins"
+ if use kill; then
+ mv kill ../../bin/ || die
+ fi
+ # move critical binaries into /bin (common scripts)
+ local com="basename chroot cut dir dirname du env expr head mkfifo
+ mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
+ mv ${com} ../../bin/ || die "could not move common bins"
+ # create a symlink for uname in /usr/bin/ since autotools require it
+ local x
+ for x in ${com} uname ; do
+ dosym ../../bin/${x} /usr/bin/${x}
+ done
+ else
+ # For now, drop the man pages, collides with the ones of the system.
+ rm -rf "${ED%/}"/usr/share/man
+ fi
+
+}
+
+pkg_postinst() {
+ ewarn "Make sure you run 'hash -r' in your active shells."
+ ewarn "You should also re-source your shell settings for LS_COLORS"
+ ewarn " changes, such as: source /etc/profile"
+
+ # Help out users using experimental filesystems
+ if grep -qs btrfs "${EROOT%/}"/etc/fstab /proc/mounts ; then
+ case $(uname -r) in
+ 2.6.[12][0-9]|2.6.3[0-7]*)
+ ewarn "You are running a system with a buggy btrfs driver."
+ ewarn "Please upgrade your kernel to avoid silent corruption."
+ ewarn "See: https://bugs.gentoo.org/353907"
+ ;;
+ esac
+ fi
+}
diff --git a/sys-apps/coreutils/metadata.xml b/sys-apps/coreutils/metadata.xml
index b75c0df6a5f9..9241968a4690 100644
--- a/sys-apps/coreutils/metadata.xml
+++ b/sys-apps/coreutils/metadata.xml
@@ -8,6 +8,7 @@
<longdescription>Standard GNU file utilities (chmod, cp, dd, dir, ls, ...), text utilities (sort, tr, head, wc, ...), and shell utilities (whoami, who, ...)
</longdescription>
<use>
+ <flag name="caps">Add Linux capabilities support in output of file utilities (ls, dir, ...) via <pkg>sys-libs/libcap</pkg></flag>
<flag name="hostname">Build the hostname program</flag>
<flag name="kill">Build the kill program</flag>
<flag name="multicall">Build all tools into a single `coreutils` program akin to busybox to save space</flag>
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 4f0a0e5ceed2..a8421d62e2b5 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -2,11 +2,11 @@ AUX 80-dbus 341 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca
AUX dbus-enable-elogind.patch 2801 SHA256 faffcaa5b295f49fcedeed2c9ece5298949096be3062fd99a4bf1a6ac3ad1ea0 SHA512 84c5eacc9c305ce1fa9f7a50407b7e836a20c679273cef06004ff57665c27818d2c33e0cfa9ea91ae89c50da4f7b9a92077e607f0f17b9300892d16e881a7d9a WHIRLPOOL 728386f60ca307cfaad68096358f619936e0b73d9bf368d7473d154178b5ede5fc0c56581a63e21d253a44ed3e4aa6503d5e16a838931f8ba7944486aa85ee15
AUX dbus.initd-r1 852 SHA256 00a1a8f254d4f40b6f98a2777809b9c45ad81c4aeb4c0592793dd839777990bd SHA512 e5a884269b777b4cfe889dde2bf1f2a6ea8eb68ef044668887946a95960342283386815adedd116d2d668be51ba229714a5a5ec49a2cc1a813f384fc899e30c9 WHIRLPOOL 80e47f97e3d7811725115cc259f04308ac8aae3a6f7dc3c7205e03fa68a84a32ebe12f46d19991d40b4cc4b5a65d999391a7db2bcb8b9209239c515872dc0e4f
DIST dbus-1.10.18.tar.gz 1986589 SHA256 6049ddd5f3f3e2618f615f1faeda0a115104423a7996b7aa73e2f36e38cc514a SHA512 726f97d0a2016f4f0625ba332e93e2d33bb16857cd35cb6c79da0f44fff297df948c3df62c31ffbec34713a7b85b3ff5b65f31517fe3511ddbd3bf18bd4748ed WHIRLPOOL ee164e1f6de80595fbfbcbad65d78dab4b91b5ec4e1ce88e1c4015f1c1b531f09796d54db163b2c2eceb3b92261f8a57852d2e0b29f71d9c65f9b91684433d9e
-DIST dbus-1.10.22.tar.gz 1989350 SHA256 e2b1401e3eedc7b5c9a2034d31254c886e1fcbc7858006e0a1c59158fe4b7b97 SHA512 c5c0040717ecef66b788c5bcda94463c079502b5004639b3c1e93bb92b4de5d9be8b3fe43e18843f1d9e50411f742ba8a869375b57d479882f8aee46b613c545 WHIRLPOOL efc4a6efc78ac5ce3ba34b512ef4d74fb5f3cda563b4dcead1baf4f2d77d578fb54e8f9e69c1aa6ddf5f776bc050be69f1086428f293c0032f47acbaf66669eb
DIST dbus-1.10.24.tar.gz 1991358 SHA256 71184eb27638e224579ffa998e88f01d0f1fef17a7811406e53350735eaecd1b SHA512 fc0b88b756affdb4fc7a62e84a6f7757121293afeadc38acf8aac48b6c2b82531e136a575be2ab503a39d7669cb7b609a021e20c1064e28c965c091e94c4f68c WHIRLPOOL a155789d60ee4d92defbf0952310d92f8ed5b51fc9c41d1c0df4e6fbebed363d8a6c526bd9c4a136a4e1c1d2eb3cd00fdfd7bfdceb8defe4b589f4cd9d90489d
+DIST dbus-1.12.0.tar.gz 2062151 SHA256 39af0d9267391434b549c5c4adc001b735518c96f7630c3fe7162af1d13ef3c0 SHA512 e9a65ac8fb6ded25872e2a84027182a854c81b03c5b6beaaa5012854b8f0a499175757eea3f47a0752a159de353d485664fe5d05903af7ce51ff891f9a6dbac0 WHIRLPOOL 8c065973ea280f990952d9088dbe53df091293f90617b1b26f4710b7d32aca1fd950d0ab6e55db13aa576afc00eaf0fac10edd7c6e0a30394872073f84892a07
EBUILD dbus-1.10.18.ebuild 7511 SHA256 a91cb39f5704feb7497545c4d770e612c968ceb78936a97aef580c8d600c6778 SHA512 1623a683105edaf9f495b18ca770ff788e528302a50235fe584b9eab2b91cd655a5ed0eb3b3e60ca810382a7637a7bdfa736b8b1129a86e56e4040bb16a4d81b WHIRLPOOL b6380ab4f4f40e53fd53818b65a811c1741f4067e266703a544cee116ad1c188134739974f0856ec0ebd80bb6204a19e003525de8be19b8070368a52df86a0fc
-EBUILD dbus-1.10.22.ebuild 7399 SHA256 fb0ed8f765e4ac9838db61efd5a4e1dec90f6db5abf19675988eac796628e40f SHA512 47928864e7bad3b9fecd146ff1f876d21d3f18b34d2667c40153160906633a915c54a8a20f0d3c12c18f432f6dd0764e2cb61f4433a7bbace908ffd8d0955bb1 WHIRLPOOL 533a927597fc777912a1fe37f4287d626263c555b9f34e068bc0289eeb672fefdd743719555c4adf28bef884b1f3de5f77b522110e60f339e339249bb233b8b0
EBUILD dbus-1.10.24.ebuild 7400 SHA256 5f87bf90da7ab2d808cee299ab05c11c1e8fe5294235bf2de71ce1d2e612e3c0 SHA512 4bede00f1cee6da6680303d989331773838530783921d0ffa8a7d2b1876a4856d2b6db13fbf38dbd66ab8f40375cc7e10648ee6d1ef0948781ed9d04793485ba WHIRLPOOL a3e2897ac8fd90c8282cb92b6ac3e662a5228e8a8e4cc6e3fccc8df9cacc44b83d9937679039e7ca328b42c8414991a8df28c33d2af38fe7dc6752e4a762978b
+EBUILD dbus-1.12.0.ebuild 7431 SHA256 c86933590eced435e5873ade1809bf5708c5fedd0dbeedb59b7f575ec3829db6 SHA512 65b53b951b363e4b2d616e40d5839cd38d0f5d372ad1e7ea8aacc24128d02deb250ceb5697f6162e30eb1431637b651bbccf45a5bd131f4896b0f852231a0908 WHIRLPOOL e01886d2a7a2bc6c82ccecd75d007b0adcbb1d848f363b7b84e93cba337a0a9105b2df867bec4750660fceef43efb46481f23b5471a58d83340a453b04ec35cb
MISC ChangeLog 9352 SHA256 8e03346e0ae584eb88d682c055d933a48e391f6c9c727ea63532bf36d48879a9 SHA512 d430313fcde1019c4d7fb17c8cc2c963b09724735c1a8749d0f4589be5938a9c4c782eb81f8c02e2fa5cb7f0b78a43cd72bcb39c794d01073f36f272c56b72fb WHIRLPOOL 4ce3bc545c5c97af2add27f6fa052aa5d2c6869f8785cbfcd61f6e98dfe6b1708c93a95ae3056dc2d54d3b142c015f15bbab365f57e3635901194c9321e8148c
MISC ChangeLog-2015 67682 SHA256 486a3ac56b453a793052b5aa08f3b744c3fce8a9dfa4c4f6b346d7d5941ddb51 SHA512 78be573f852f7a79cc5a13457b1bf22fb4310808a886618614e570ffbf40589a8c68b49478c8662577c2188bbb17a20c8d003c8804173334338f92e6d16c2051 WHIRLPOOL 379bc4232b10c300020793f142b83264bcc7376585eb7359dcdcf71d48253dc5d5f3aeb175a5eb311246ffad9e247e25971a33237ed5c7d372a4ce5d66d81913
MISC metadata.xml 595 SHA256 6d305cf7793900dc499713dac0ed55f3214a75ad77fb1810c5818edeb3cbbe67 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738 WHIRLPOOL 89fc7303a15a510e2ec4bf90f05e7525de34f8d88f2f5125573cc4a735b5299836007dde76ba75307a4ea1fc84042c37396e6cc3daf4f23197422fce05058403
diff --git a/sys-apps/dbus/dbus-1.10.22.ebuild b/sys-apps/dbus/dbus-1.12.0.ebuild
index cbd855261fc8..4c7d2839e1f6 100644
--- a/sys-apps/dbus/dbus-1.10.22.ebuild
+++ b/sys-apps/dbus/dbus-1.12.0.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
"
CDEPEND="
- >=dev-libs/expat-2
+ >=dev-libs/expat-2.1.0
selinux? ( sys-libs/libselinux )
elogind? ( sys-auth/elogind )
systemd? ( sys-apps/systemd:0= )
@@ -35,10 +35,11 @@ CDEPEND="
DEPEND="${CDEPEND}
app-text/xmlto
app-text/docbook-xml-dtd:4.4
+ sys-devel/autoconf-archive
virtual/pkgconfig
doc? ( app-doc/doxygen )
test? (
- >=dev-libs/glib-2.36:2
+ >=dev-libs/glib-2.40:2
${PYTHON_DEPS}
)
"
@@ -54,6 +55,10 @@ DOC_CONTENTS="
# out of sources build dir for make check
TBD="${WORKDIR}/${P}-tests-build"
+PATCHES=(
+ "${FILESDIR}/${PN}-enable-elogind.patch"
+)
+
pkg_setup() {
enewgroup messagebus
enewuser messagebus -1 -1 -1 messagebus
@@ -73,9 +78,7 @@ src_prepare() {
-e '/"dispatch"/d' \
bus/test-main.c || die
- eapply "${FILESDIR}/${PN}-enable-elogind.patch"
-
- eapply_user
+ default
# required for bug 263909, cross-compile so don't remove eautoreconf
eautoreconf
@@ -121,7 +124,7 @@ multilib_src_configure() {
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
--with-dbus-user=messagebus
$(use_with X x)
- )
+ )
if [[ ${CHOST} == *-darwin* ]]; then
myconf+=(
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 63bcedfa363a..206bee02c848 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -2,7 +2,6 @@ AUX 99etckeeper 60 SHA256 237108fb8d1b16ba51410acea5963991de7a2eef9db7594d67a7f7
AUX bashrc 116 SHA256 ed9584cd6fdc180dbd3c3d332b07f0287698c9a5602664b8442fea2743141e5a SHA512 8ea8195aa7d65370382c05c92951157b133914d946eec17da4cec32e469130553bdffd91261ce571f5cd31577d5381818ab2deb3f1e6ac872f054dd2798ceb0e WHIRLPOOL b15d4a65c31d7243993204619b2b4d9b1f4bcf539abf43d20fc8fce9d9eabd928a466b5139e66c35430f0e9c9c103344b4ceffa328a4374a7d45dbef0cb4e672
AUX bashrc-r1 114 SHA256 1d29da179b460ecc317097fe3d1ab341ef34c45855e2531580aa6cdce44cb776 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c WHIRLPOOL 56a311167c8e2ee4f7d0e2de11a305750f8075fa117f8b057a59c8684112806908685ba9326a5902478f821a8921fdb05984762bd24abbae60e2a9a5ff55db6c
AUX etckeeper-1.18-gentoo.patch 3066 SHA256 41e51a02799d3b16b89b175b2171ed0259ef0ef46d963a0159318457287a0ddb SHA512 7cec9bbf989bf6dd0651fee386d180670b796d918d93523bb14a89a80851a3452e488f13c39ec751e1907a460ef34c32afb7fdb6696d7193afb6d70cdd9bb049 WHIRLPOOL 17da4841c502ac8aa9a28ab1c81f92b6ca82a6d99f8830491bce04fff3ea1b8a6ee18fadb488eaa35de5ad331c37b4577d4f187449e494a619a56ee8127e6ad3
-AUX etckeeper-1.18.3-gentoo.patch 2798 SHA256 33758c7cd9a0b2046e047cdeb8274ee3469238eaa0ebe1957b57ae527cf8a05e SHA512 b788d22d2c6da9356fbca0324d45b5c84ac50a0477ec6454898bb7f072a5b8d3ab752c4a022c59119599ae67d995bdb748f750c7281fa7e76876aee462b3589c WHIRLPOOL 6dbb02a10489e29f8cd178d41fbbd422e13be7493652c133fc662d5725e46498556be910c77ddbffd42ecb69a51d4187e966a796935a963f905dbf21ddebb063
AUX etckeeper-1.18.6-gentoo.patch 2812 SHA256 6df09dedd270b875fcbb5bfde1ed9457bccb4341734a4c73ed38a715ee8ded55 SHA512 2f399e12c7bbeef539fd846532068c18fd0becdab505cbe56759c6eb7f9c4463eff49526858ffa745d4bc50619685dab81811db257506f9b537bbd7af9986958 WHIRLPOOL 7c90ce4fd899b0e06d4b12d72469017d2d1f37f3d7dd11d95541ded97ad3b45f8d654644a5f7ea629cb724a9973d6f3367572ab989702eef17d5823b7b180fd9
DIST etckeeper-1.18.1.tar.gz 56366 SHA256 80adee6e17bfc41359ffb85a401d9a510ae25956950adbfdd07a0bda36d99e9b SHA512 5b5019d3f8c22ee0486c9102d7dbdc7e86921d432df49c15733e5ed23651c2be87b52e295208be691ef1e44a515d960fcf4f812eaca17f2806e2f5055222ca35 WHIRLPOOL 890b38f761f49a5a4713fa850bc18e09688ed8fb04d9b41f3727f868448fb1ba1ecf92750df777fc6011a3f88abeb8756105fbdc60ebf6fd3e693360764fb27c
DIST etckeeper-1.18.6.tar.gz 73487 SHA256 7db1a2b48c011b5e04ec95af559de8d1d243bdcdf6cd591b3b0b46d1f21e9602 SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c WHIRLPOOL 41805cff70804abe574831ec1bb2bc4e2e5079ff97c777f2597f8af4f6e972009312b5f1760a0c17e0db0f150266b94cdc1f49afb8e15401d8c57ad540112324
diff --git a/sys-apps/etckeeper/files/etckeeper-1.18.3-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.3-gentoo.patch
deleted file mode 100644
index 8661d391f9c6..000000000000
--- a/sys-apps/etckeeper/files/etckeeper-1.18.3-gentoo.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 026fa7c012a8c44cadfa56f605c0671639a6b04c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
-Date: Tue, 16 Feb 2016 00:19:07 +0100
-Subject: [PATCH] Support Gentoo's package managers
-
-
-diff --git a/Makefile b/Makefile
-index 70bddfa..6090a4e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -58,7 +58,6 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper)
- mkdir -p $(DESTDIR)$(prefix)/lib/zypp/plugins/commit
- $(INSTALL) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py
- endif
-- -$(PYTHON) ./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed"
- echo "** installation successful"
-
- clean: etckeeper.spec etckeeper.version
-diff --git a/etckeeper.conf b/etckeeper.conf
-index 0d268bd..81214c7 100644
---- a/etckeeper.conf
-+++ b/etckeeper.conf
-@@ -31,11 +31,21 @@ DARCS_COMMIT_OPTIONS="-a"
-
- # The high-level package manager that's being used.
- # (apt, pacman, pacman-g2, yum, dnf, zypper etc)
--HIGHLEVEL_PACKAGE_MANAGER=apt
-+#HIGHLEVEL_PACKAGE_MANAGER=apt
-+
-+# Gentoo specific:
-+# For portage this is emerge
-+# For paludis this is cave
-+HIGHLEVEL_PACKAGE_MANAGER=emerge
-
- # The low-level package manager that's being used.
- # (dpkg, rpm, pacman, pacmatic, pacman-g2, etc)
--LOWLEVEL_PACKAGE_MANAGER=dpkg
-+#LOWLEVEL_PACKAGE_MANAGER=dpkg
-+
-+# Gentoo specific:
-+# For portage this is qlist
-+# For paludis this is cave
-+LOWLEVEL_PACKAGE_MANAGER=qlist
-
- # To push each commit to a remote, put the name of the remote here.
- # (eg, "origin" for git). Space-separated lists of multiple remotes
-diff --git a/list-installed.d/50list-installed b/list-installed.d/50list-installed
-index 129447f..79d67f2 100755
---- a/list-installed.d/50list-installed
-+++ b/list-installed.d/50list-installed
-@@ -21,5 +21,9 @@ else
- pacmatic -Q
- elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pkgng ]; then
- pkg info -E "*"
-+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then
-+ qlist -ICv
-+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = cave ]; then
-+ cave print-packages -r installed
- fi
- fi
-diff --git a/update-ignore.d/01update-ignore b/update-ignore.d/01update-ignore
-index 7347287..5dbb398 100755
---- a/update-ignore.d/01update-ignore
-+++ b/update-ignore.d/01update-ignore
-@@ -99,6 +99,10 @@ writefile () {
- ignore "*.pacorig"
- ignore "*.pacsave"
- nl
-+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" -o "$LOWLEVEL_PACKAGE_MANAGER" = "cave" ]; then
-+ comment "new and old versions of conffiles, stored by emerge"
-+ ignore "._cfg*"
-+ nl
- fi
-
- comment "old versions of files"
---
-2.7.1
-
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index 7fd2122e909b..2a203afc6a84 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -11,7 +11,7 @@ EBUILD fakeroot-1.19.ebuild 836 SHA256 de099168490518d2d4dbc53f4f4bd636699405073
EBUILD fakeroot-1.20.2-r1.ebuild 1008 SHA256 d9746d683e948a4a6609b8c590763aa046ca42b14504dc36092500ab88296171 SHA512 de5fb74abfe42b1a6fe4a3aaf2c25db69c5ccb4616195f721f66bd0491e3560d50c79086f40cc12d8749632d413c75af77156010043186e99e063e726468741e WHIRLPOOL d12e98f38c7fb0a1ae0bb852dfb3a56fa1168571eebcbec9939896478f6fd25b7f787980d8dfc47a8c94c87e4e40a0b67d274b1fa879a7ac29cf937c3d2db93d
EBUILD fakeroot-1.20.2.ebuild 921 SHA256 ef94a2c5df96ea2c0104adbd14e5c7ef97a0ab3496ca813528f0c2a8062e9d97 SHA512 72f0bd48be4ab63a2c012d01ce58a639c31ecdf2c7d5319d45d4b7554258d82b30636e66127f8e8578390b4ce54a0d9166466644570a266c173b92eaa380f21e WHIRLPOOL 5d8e07143930db5944bfb9b3be92a9b1f5c3a3a8fcc7348524084bb9bce8cb512e866b7e586188eeafcc899996d82ef74f1033eb8f24184403e5041d00799675
EBUILD fakeroot-1.20.ebuild 917 SHA256 e5e2b3dfa8deae2dbf4316ad9edba0ba90d62fa73cefd369292d3bbf88a9c226 SHA512 178ef091b3a1ba0b314390bd5e4ca4c7da91efff9b053fc97f16e21fc2b5b634c38f4df40b2c712952f6efd6b8aa4358c3e3533a8f6523ba58b68ff88c44ae92 WHIRLPOOL df80e241fd91721dfd289fb7f769117846ff5e0c3bec2731c46018bb1be0a82c598c6418780d9fb58078e2def289e31378e55e084b15a9e23b1ce17eba6881fd
-EBUILD fakeroot-1.22.ebuild 1041 SHA256 00babc935bd6a6602e78fb1f7ce1f648bf80c1e9e7e92909d73c08273ea7d01c SHA512 584c1f474c2f8a6cf72210bf37e3b92d1c33bb1559ce188b89b714fefbcb8b39741779e21f442f985ff60985ef162c9c23ba5e9fa7bd4ddeab8b96bfd9a79f02 WHIRLPOOL 4402598f6e15d8c66d110ead26eb12c6c508539837faf3cc42c876b1edf7b64132d0b58afa46baba09d6e7cda61e4e369568189f29859d8f661ebb10c4c1d1b6
+EBUILD fakeroot-1.22.ebuild 1039 SHA256 79bbfbe5340796138bac351d09f5bce9625c539d305124eb1268bee53750ab9a SHA512 710e40e5de2c3f67c764b058b81611e70aba309403daaeb407e07873fc5e7e376caae3969202cfe0fce4e6e11d85e7b716061bf81f18834bf914275c1d79d59a WHIRLPOOL 78dda732638cc89c04b98bc51b409ec04818d110f0ed711d2fd7744b6436a24fef41a73d289d95339b9ee9cc97c8b582768d8299003286561cf959d81d2b5b85
MISC ChangeLog 3481 SHA256 2982a484d6cc7a8e4d017812e6e3ee587d5e524db9722866e41c67c412461476 SHA512 4d5f6ac2bdc0e25ad3fc879096d759b3adec7dc2fd7b9b3ff6721d4c8bc0b4ba8f2a963387ac6e7477e1e68e37be6b89c0f20b4f6e5b88171222f2d131aca709 WHIRLPOOL 14ec521b4336fc299d3eee695e10f0ce74ab676d2956e539e1196efe6ea6ae77cb0823ce28aa1972810f67e63a4470834502373f8a349b635f91d139aee67c16
MISC ChangeLog-2015 12966 SHA256 4fc52018ed3ea26a859336695afb623625a03fc5611e7d215a343b443c5b212e SHA512 559bdb467e31c70c1ed76272a0640e910338510742584751c2b79ccb5d899899e882bced12ba0d3a1854d72d6b40993188d3ea075ef6b4b7da2b0ac812918a3c WHIRLPOOL a2a179102e270aff3af52e04716b8923fbaec0a0a4267a40f1d36213f2a818af1409f5f8b907d1a53e10301a722e34562e98135f12fe3485fcf55eed24b0b442
MISC metadata.xml 257 SHA256 c1d4bdabe699c6d9fcdf3b7794a13b45f69e3826b814b422e4ca7e6893b99012 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1 WHIRLPOOL 4afcbc79dd61237c778735b39060b3e294fdc07da5b0da6f7b40db92649ac71febddd7a0265502e102d8eec9664fd5af2071fff9428bfcb0a6bf06cf70c68a3d
diff --git a/sys-apps/fakeroot/fakeroot-1.22.ebuild b/sys-apps/fakeroot/fakeroot-1.22.ebuild
index f933c92e7297..379d8d74759a 100644
--- a/sys-apps/fakeroot/fakeroot-1.22.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="acl debug static-libs test"
DEPEND="
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index 9f5f94fc723a..2ea91a4e3595 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -1,14 +1,12 @@
-DIST inxi-2.3.0_p20160807.tar.gz 407468 SHA256 da9bf61c2134291d8f65f5cd270a7026d83ea28f44450c7973e1f5f7aa529313 SHA512 58f91c7b44cfa6a53fba7fdd8300ab5b9bca86a1c558524ad6f26f79123f4e642531543f9d5d04134ca5028323bc9e6db128a15e0c17b41254ff9463db1080f9 WHIRLPOOL eb502482b76a55c2fa7d3c9972fa0b46ee4e12af208073bc2ff4b22d6880868ddd576b1c345905f19fae4ee6469d4dc5fdbdaef0acf4d944e8a390974fa54881
DIST inxi-2.3.34_p20170805.tar.gz 449836 SHA256 c051cea0f6f1113406e3b2a776c841649d4c8cfbbdaf4a568a25bbb497447e44 SHA512 c3b2a5d91a0fa0840ad602e6a147bc65dec83c966c8fc2a72e39fe6737ef4e0d57edcb5e47602311a8eedd2fb6d51619f4e44ad2be4ce8b5e259049e2c238a18 WHIRLPOOL 211d0ed25c061e7cacd09a6750dde8c0ca03999cf33ee35c4423bd892e5e363564307f4ce61a40948706da3a4e2b232a53e379a5c78ba62b891b0f45b895c98d
DIST inxi-2.3.36_p20170816.tar.gz 452116 SHA256 d5648d2b6a32da364bf5d9f9eb3b275a1512a2143f13433caace97b6b42e1fde SHA512 9326fd8787449c6b52fad3188086a59deb2614100ccf8c49023c78d21ff4ab08a434ba1b95bc48f8867499e30179df602ff53934611bbe952b223c8bdadc40bf WHIRLPOOL 85952282335221856aeb6f2b844df89fc0c7a852a2676aad333bd13a42d48ef1bf06da1a3309bb93355221b0e976679ab8b5076da6cae9d57ce6009c1af05a00
DIST inxi-2.3.37.tar.gz 454862 SHA256 5c728fefbe33800ab7ce8d5536f52fbb0aff560f48ba525f148fc48e034fe1c1 SHA512 0a47cd920e80c518d6d6987945eb9526ee1ce7f6bf62754196e05736db44fbced615d29b6e12787bf55f769ed9963dff0088c96f9dbe13dae7f57744b0172802 WHIRLPOOL e4271b8d6493e4d48ad15fc8d5d4bb86fd3251bb1fc8b2292c2f538076f29b53aef156f97233bbbb0a9acae52fa987672797832fe33f29fd6a8b40b154608de5
-DIST inxi-2.3.4_p20161104.tar.gz 415379 SHA256 b4e1377e9c67dd7836542542edd9facdad6fa9cf37d3b8cc0c3c98bf31f463c0 SHA512 4803433bb483119a0c7b50eea07b39878a39005224fbda0ddc7e52bf88abbd0184c8476277b15c80a156d4d1b9d51297f15c8d1c63b95dc3e40399cc50afe850 WHIRLPOOL 9b0688a163a29dfb07d4228624cd9cfd2f8010f189b914ad06b3ba76ef62f8765d861986946d9045f257561716ebf1bbdfe7f305fe9614671992ca02e523ef6f
+DIST inxi-2.3.43.tar.gz 457941 SHA256 b2f5c9b751d6cc92fb035a91ad0249d22936862eaa8786db2dc314625e973298 SHA512 33c9ae788ab139f5a2511a3b5bd51276dafb3b847920345b02ad717e1da71f9a78fffc9e55b1085c91d014c2da940b1c64f72db9b59f7bb8d7e442bbbc0bd947 WHIRLPOOL 2debec1c84f0a97b05c0e93e098716816377c4bb7ed4b1a3ce3caad76665d71d8f13ebbee6403a333121d7ae7a8a8d3e3d9e93314eb3d07da716b542c86c28d2
DIST inxi-2.3.8_p20170114.tar.gz 422139 SHA256 ecad1522c786555c7b11d3066878f94fc276b205fb63faad06c9ff6f708bf558 SHA512 400d6cceb9282f46f1de30d436f334813d725867e0614a0ef694dc33066139dd7daf4730c007186b7037705f5debb72fa0ad9357619cdbc93152b4d585ba17e6 WHIRLPOOL 0734dc38929c404c2ef08017606558aa55ccdc8c290adec8640db30e800d0ba4b1c8c89d3f9c221b5ea6e02f1f0ca8c429326fe8bec57e5c7a75999c95b24a23
-EBUILD inxi-2.3.0_p20160807-r1.ebuild 687 SHA256 6da49904afd4b2e13b98836b5a03e11bcdb9f33b9dccb0634b3ac82902298828 SHA512 a4e00b2f909ed6692a43fc4de657424772b58f1ef33d0e8e2f5fb9af896d2ea227eafe03e47c31c1b7afa5ad7e49851db46d3d0f5b10d643a29070a6b2ca418b WHIRLPOOL 45b6881dfe895b446202b5f6329fe57daf9a25ee39d5f967ebfcf823e56841fb8aaf6e5398972ef7b4fbb5fedd7efb84983460d317c01b0505e2452d3e2d5e34
EBUILD inxi-2.3.34_p20170805.ebuild 691 SHA256 184f16596be8c7168743e15379e4e32271f14e295c291c796b2ff95b125e9365 SHA512 24467d736e6b750f18c78f8d9a1e384f6e5fe1fb5bd04f28de4ee18f11e1f9c4f5581ba1355b820bb0de3def71808ca274a4f2708ab2256f4e147dc005f97201 WHIRLPOOL 6ef84aa77668dd15a5fde1e7de005149c0dc081a1e07c1c518317b6d8a08c466873e6892e1bd113fc4922ddae9256ec7764cdac12d30d1dc8cf88503c518b363
EBUILD inxi-2.3.36_p20170816.ebuild 691 SHA256 c5e95d03c3e6218ef9a69b5d6aa89ee158ed510e6776b92ad80d64aec009f897 SHA512 6924100f657e0968d49eb5576cab42719124608c7ac65ed6d58db7573b00c1dfdd0932e988cfe3b97ce129acbd1b3703042740c01c379c10e2ced7916c57625f WHIRLPOOL bd57aa4238130cbcd99f643dc40fab5e086ef8aa1496f70ddee8e34c1c87738cb0aa44e1b16c9bc9bf81c23e95d40e143cd1ab63f23be3dac053dc413853071a
EBUILD inxi-2.3.37.ebuild 705 SHA256 9426170994e9f03248156bbaa0c18568913097bb84a402ca95116a9a509e0f9b SHA512 a8f83bfea602259ed133fce417d78a92670e8df7a5522445a9abad078b12432b5cf66e95ba44d96b9a43299d40b8e0a5f4feb5d01a11f2347da397b42db73074 WHIRLPOOL 8cc560db05149a2f997cf1b4fc282dfcb95e6b7ce4812fdfcbc60a5bc7e889f8d9129d20c53f9f422d1db167a937ef8a0260c40508780d5b34326fe563b11f15
-EBUILD inxi-2.3.4_p20161104-r1.ebuild 688 SHA256 db05b277b7403c8c003fbb049937f7483fdca0ceebd1ca9110c9a33ff38dae23 SHA512 10b098f7e9f6d355fcf4bcd9811bea81009d1160ff1381703f16c030753093d148854061df78b00064f28a130db65d602a78511cd932e88a6f8a3e16179d28d5 WHIRLPOOL 338f27f21c891da2b4bdbee4ed226ff7fb0e2354a37ae60192b5d55c3f81c3eb8661bdd0e0ecadde8a28927676de71979addd36db677b85bfaf04d86aeb738ab
+EBUILD inxi-2.3.43.ebuild 824 SHA256 6e55ccc980a2d0214b7bfb55b870ebe8c0f78c7e9f376b587c9e821e0f2cae57 SHA512 6c10b5de4e364dd85779bad53ad36d6e66099698c37c9925173eb18ee9e139f40943450d736728338f64026c9f40fd43f1fffc24ad3035be113c2bce35216ec0 WHIRLPOOL a86224c6e6b9d549e581ade72a332f2fede981e94308e351cee860ac742b28f17926d0868ac6729113692228ac53f56ee24e6c1771a6eb260e0f0717f929758e
EBUILD inxi-2.3.8_p20170114.ebuild 686 SHA256 5a66030904ebedef92cb35fe6ad8b0ae9922a7f64d7130799c28c7e66f48c718 SHA512 8504fbaba115a62659a722c40af8a7481f21c57cb081e0d7e9e7fd62733cee68ab5eb9fd71681f8588a8adcc732db5e74053ecd428716bdf068cc37c83d23008 WHIRLPOOL c2437044bdc9139bd5399ac7cd1e14d68251368f9b147395f0283661ede9b8fc8d8172fb955a260ecebc781a317164336c4897286c3fdc2a9546296e4230a961
MISC ChangeLog 4021 SHA256 168dbf7c3dc087f9b1363d43d8819ccc5b4d043453946d07cfcdf41e4c53b396 SHA512 dada5d7153f85e68ab68de3acfe19300b9c0c13499b75a1a7b03b68caf9c99540d9f2799543bee541c652b806383a1d444456ad2a08c6aa8bc6f66624074d9d9 WHIRLPOOL 6fbed63bec13f0cfab3ab7e2f7f2f67cb8a0967679fc9ef27050208cde968d5a6c4388a70b2dac96dfcd0a5ab6ec1eca71789b7a0f18728e8e96e7f4d9ea39e8
MISC ChangeLog-2015 542 SHA256 4b4d7a01227ee5bfbede709b75ebd8ceed19113b4ba4c218988aa900d28e1109 SHA512 65a9e13cf46e6f33b17eb1e087d18c03898581c18878879f7a9008c6271d5c22ae22e9a1cfebdc8c88d6a2dfed5f61d39e8bcfcb57bcf688eabb171db39fc870 WHIRLPOOL df373036faf356cacf4d15ea331b6a96ea2a4e55f3c231bfd025c7c439c75327cb824612e964c6d698cd548db41a607da56e85bdd54c22c36254c83acd1b5271
diff --git a/sys-apps/inxi/inxi-2.3.0_p20160807-r1.ebuild b/sys-apps/inxi/inxi-2.3.43.ebuild
index 09afef734064..d970013c44ce 100644
--- a/sys-apps/inxi/inxi-2.3.0_p20160807-r1.ebuild
+++ b/sys-apps/inxi/inxi-2.3.43.ebuild
@@ -3,7 +3,8 @@
EAPI=6
-MY_COMMIT=c2a22b3e2590d896d4b0a8fd298f505cc1d787f5 #because upstream refuses to tag commits with version numbers
+MY_COMMIT="0e7227d25cbf9e83f7fc6af5e1bcb919855f9ecf"
+# ^^ because upstream refuses to tag commits with version numbers
DESCRIPTION="The CLI inxi collects and prints hardware and system information"
HOMEPAGE="https://github.com/smxi/inxi"
@@ -11,18 +12,22 @@ SRC_URI="https://github.com/smxi/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="bluetooth hddtemp opengl"
DEPEND=""
RDEPEND=">=app-shells/bash-3.0
sys-apps/pciutils
sys-apps/usbutils
+ bluetooth? ( net-wireless/bluez )
+ hddtemp? ( app-admin/hddtemp )
+ opengl? ( x11-apps/mesa-progs )
"
+
S="${WORKDIR}/smxi-${PN}-${MY_COMMIT:0:7}"
src_install() {
- dobin "${PN}"
- unpack "./${PN}.1.gz"
- doman "${PN}.1"
+ dobin ${PN}
+ unpack ./${PN}.1.gz
+ doman ${PN}.1
}
diff --git a/sys-apps/inxi/inxi-2.3.4_p20161104-r1.ebuild b/sys-apps/inxi/inxi-2.3.4_p20161104-r1.ebuild
deleted file mode 100644
index 619a8b5cb19b..000000000000
--- a/sys-apps/inxi/inxi-2.3.4_p20161104-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_COMMIT=89e18d245bc34fc5be5f5baddac2ccd8106be050 #because upstream refuses to tag commits with version numbers
-
-DESCRIPTION="The CLI inxi collects and prints hardware and system information"
-HOMEPAGE="https://github.com/smxi/inxi"
-SRC_URI="https://github.com/smxi/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=app-shells/bash-3.0
- sys-apps/pciutils
- sys-apps/usbutils
- "
-S="${WORKDIR}/smxi-${PN}-${MY_COMMIT:0:7}"
-
-src_install() {
- dobin "${PN}"
- unpack "./${PN}.1.gz"
- doman "${PN}.1"
-}
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index d773bfa96fbc..72ae2c6c8106 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,7 +1,12 @@
AUX logwatch 125 SHA256 6f65d08d413b7129730816988e4ff49ece532f59e50ccf6a345b2797a854ec6d SHA512 20cdf61fe9e9bfe336c6b7e1f33c982c34e61370431179a2f766da8e1b56f8452c85d75fbba4f459f9c4761a7a932c309d0ba7253aeb6e3b31b220c00106e504 WHIRLPOOL b26d6d421f53c51a5e76dcda5669bd2571843d6b3bf52d862adf553eb6b6793d26b25cebf5aae9273c74c5c71009761031e820aa3a9cd714571e02be9b8a7dbc
AUX logwatch-7.4.2-openssh-hpn.patch 880 SHA256 2ec29c7cb32b3ef62f8a86dab548f9e7a5efef943c9eefbfbc980984448ce49d SHA512 f80ef051e07254869dad4c7221564d09d2f52c2fceb2fa4c802f67b83f4569ed9405d07d85b21a1fc67f75b552a82fa4b4a9e69578829f51a5e49e50cb79f0b8 WHIRLPOOL 3a70bc3d56b45b7cc608c8a1313982605974a5cec09b8f17e00e8d80e4af8c5f6dff3bad8e5a6b6a0a480abf6e96dc05647d83ac5177053f026e9197b158a90e
+AUX logwatch-7.4.3+-openssh-hpn.patch 885 SHA256 56634909fa3c537244e6ebad97db8ed5889601f8b1586fca444901a5594e3a4c SHA512 5a11509507631c1f8f74830e1ef24fc522fe62dffd5f3778849b82462b8e73c1b5cb0ab6c7ed2f1ea35e9d2c4b5674eee532a650b0d69e71219cf029e41b978a WHIRLPOOL 7165dedb590d4f4a931910fbba3bd0f825d15dc749d7f9b1ff6b0509fd627c3da28fdc83eb4e5bc243140f4a7708c808d83d28519639e4f3a1adf1e8b69f8d7a
+AUX logwatch.tmpfile 39 SHA256 659fb7ec74bd0795c8ada05ecdacc6b4ead1da28af46526bc21b8ea06d5716b0 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd WHIRLPOOL 38986fc0733d3ca823a6a0d92e8913bbadb456c65f146b2fec93ec6d3bfb56288a4d8e0c075d9409cd868bd1054d295f6bc7d86fbedc9471c88b282e0649c032
DIST logwatch-7.4.3.tar.gz 462552 SHA256 1dbdc48d65e150f2dbb43f1e4f4700d94166e053b1c7bbbdedf4ad670283720e SHA512 716d87238f487010f2bdf230fc66c16f3c3fe769e6bef04b0e7881c6b0563e1a4b4741235b8a40a16ab21d3803562e87e6bcf5cfbd0ace42414f1d1feae7a13a WHIRLPOOL abe7870020029f86f037f4c96dff96b6c542eb36df9f110c755d6de28965c6418dd4d03a2e6932ff8db7079f22ea396d352aa6b8ebba81576b588017b4694d02
+DIST logwatch-7.4.3_p20171025.zip 704529 SHA256 8e93ffb0ecbccb30d35ad01ba838879456e98b7b74bc274f90bab1b63ec37568 SHA512 aeaf57aa8d4e89b716766bf89a6b58dcb18f1ba6de864b913d93474f784f382e322b6dbfdf9671c8b91404d399d770146ead9959b1202e91b4672e70f6abb268 WHIRLPOOL e40e65acf1bbc0c6c5ec0dfe43ca396b19d001900eb0e11bf7df95d4cc8359a82c9630761fd1745a91be0da40452999fc17baaa5cf1343a4cde036121696589a
EBUILD logwatch-7.4.3.ebuild 2051 SHA256 d349249dd7a1e0ad82bec946b75df4c71854e5f85d57459cae37db818cd0dcff SHA512 311e5ce37341ce3ff2ab033b301f0264df8f6dcb6615efb2ea2920a7d365c1a6b19244d9a7d6644c249f33348c2371076935b86df2470378e0659476518aa457 WHIRLPOOL bf942c975248bb181c23592154a75b31fc8c6214c8a8a34120bc5338c4fb0b6bf8bdad079829ffc864205a80707ecc00a22bd7d5101c518dec7d4674d013a171
+EBUILD logwatch-7.4.3_p20171025.ebuild 2832 SHA256 8372be9d2f340fd35d075a15b3f7288c6838018cdf3868180537720a3a458ec9 SHA512 2c8a06ee255b6c4f2ca8d42805668cd58eeb287b95d91758118da8edd7c5cb80f04addfe175d1bdde5a87b5c1136fbfd435287029d9e22f35c917ff6ba62177e WHIRLPOOL 15f55fef46bf8bab27aed2dfd17e4283f4171d17594491cb2aa50e2ae5963e76a8b36e5a888ccec233064d3d380e1614a1cfbab6fcd5d82fa62d89adc761f0e2
+EBUILD logwatch-9999.ebuild 2426 SHA256 42505c752a9817bde5bf891015160ede0c7e53cd8b1d46d6f624b0d205bf664a SHA512 ccbe5db0bc4ad431766e82c7b1a680c2cc1288a93fb3fa653eb744591ae32aab920467853792cf79ae2b3d2b62f03652bb1f7b6a6207615daac88716bf6d2252 WHIRLPOOL e2d2919793f05d75205445be8099ab92508bcca4664b95bf4736fd333ef08732ca72a28143218e767e119bf2a49b50cf23aa4c5aff539317a90dcdae32a16662
MISC ChangeLog 4905 SHA256 002324069f7c6bffeb8659aabc079c51ba260f4e3dee482766e80435621c477b SHA512 1b4b5395d556705f1bb545541cea88b71b9d7e8605975d7b3e468f17d626df52e6279f3b3ae1d2be19b2af4db1cab288ccf729f1642e5abb88502948b61b8cfc WHIRLPOOL ca56c2d5faa38f0cef09a8b340a7d08e8f6567deba8bf246634baedc9752c0b71ae1600032a5897288797d017bbdf2e520b703a91bc93d0379327f8dc787dd31
MISC ChangeLog-2015 13525 SHA256 4adbda52a29f2728dceda9277c0449d6cc909769feb9fe1f0067cdae8a9a1b5d SHA512 1a893ca5ce4d97a206889a6ccb5d75988f1ad545a4194194dd83ec06a8213bac6cfe5db216b7a6b21ca003f812ea317cf593d6a8a28fdc2dd13f7593c6ada015 WHIRLPOOL b235fb5914b612e4c4d404734246b8b62b1b3639c0b15f7caa4582647153215e684084a8c6f777c83af4e77a205d360da06bf397f15ae3be352c66fce5ed1d3c
MISC metadata.xml 328 SHA256 4086b273d7f5312bef52d8ab72297b42180cd1385c32de9d0841f5f0bf7a459d SHA512 5feb78397d5abc4fc758c61c2c972032eca10f9fcbdbb6efcbae764c5ab1aaa09fd4f9a31082682dfd8e0ff865147fff22787b8d116bc7a954a4fdc42cf7b3e7 WHIRLPOOL 1895fcd2b76d48f16d7485eb4de486665573a823dc346212008222a0a516728e0070345b9926636f5a475d6018396eb13e5804c9e4dba01755144caf4c4f36b0
diff --git a/sys-apps/logwatch/files/logwatch-7.4.3+-openssh-hpn.patch b/sys-apps/logwatch/files/logwatch-7.4.3+-openssh-hpn.patch
new file mode 100644
index 000000000000..426253df85d0
--- /dev/null
+++ b/sys-apps/logwatch/files/logwatch-7.4.3+-openssh-hpn.patch
@@ -0,0 +1,16 @@
+Add an 'ignore' line for the HPN patch that we enable on our openssh by default.
+
+https://sourceforge.net/tracker/?func=detail&aid=3257504&group_id=312875&atid=1316824
+
+--- a/scripts/services/sshd
++++ b/scripts/services/sshd
+@@ -315,7 +315,8 @@ while (defined(my $ThisLine = <STDIN>)) {
+ ($ThisLine =~ /Found matching \w+ key:/ ) or
+ ($ThisLine =~ /User child is on pid \d/ ) or
+ ($ThisLine =~ /Nasty PTR record .* is set up for [\da-fA-F.:]+, ignoring/) or
+- ($ThisLine =~ /Disconnected from [\da-fA-F.:]* port \d*/ )
++ ($ThisLine =~ /Disconnected from [\da-fA-F.:]* port \d*/ ) or
++ ($ThisLine =~ /^SSH: Server;L[Tt]ype: /)
+ ) {
+ # Ignore these
+ } elsif ( my ($Method,$User,$Host,$Port,$Key,$FingerP) = ($ThisLine =~ /^Accepted (\S+) for ((?:invalid user )?\S+) from ([\d\.:a-f]+)(?:%\w+)? port (\d+) ssh[12](?:: (\w+) (.+))?/) ) {
diff --git a/sys-apps/logwatch/files/logwatch.tmpfile b/sys-apps/logwatch/files/logwatch.tmpfile
new file mode 100644
index 000000000000..86bd4cc7b3bf
--- /dev/null
+++ b/sys-apps/logwatch/files/logwatch.tmpfile
@@ -0,0 +1 @@
+d /var/cache/logwatch 0770 root root -
diff --git a/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild b/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild
new file mode 100644
index 000000000000..2cb75e82997f
--- /dev/null
+++ b/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit tmpfiles
+
+MY_COMMIT="d36589f22a322a5ec4d77618b408803f4d193c2e"
+
+PATCHES=( "${FILESDIR}"/${PN}-7.4.3+-openssh-hpn.patch )
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
+ inherit git-r3
+else
+ SRC_URI="https://sourceforge.net/code-snapshots/git/l/lo/logwatch/git.git/logwatch-git-${MY_COMMIT}.zip -> ${P}.zip"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="Analyzes and Reports on system logs"
+HOMEPAGE="http://www.logwatch.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND="virtual/cron
+ virtual/mta
+ virtual/mailx
+ dev-lang/perl
+ dev-perl/Date-Calc
+ dev-perl/Date-Manip
+ dev-perl/Tie-IxHash
+ dev-perl/Sys-CPU
+ dev-perl/Sys-MemInfo"
+
+S="${WORKDIR}/${PN}-git-${MY_COMMIT}"
+
+src_prepare() {
+ default
+
+ sed \
+ -e "s:my \$Version = '7.4.3';:my \$Version = '${PV}';:" \
+ -e "s:my \$VDate = '04/27/16';:my \$VDate = '10/25/17';:" \
+ -i scripts/logwatch.pl || die
+}
+
+src_install() {
+ dodir /usr/share/logwatch/lib
+ dodir /usr/share/logwatch/scripts/services
+ dodir /usr/share/logwatch/scripts/shared
+ dodir /usr/share/logwatch/default.conf/logfiles
+ dodir /usr/share/logwatch/default.conf/services
+ dodir /usr/share/logwatch/default.conf/html
+ keepdir /etc/logwatch
+
+ # logwatch.pl requires cache dir (bug #607668)
+ newtmpfiles "${FILESDIR}"/logwatch.tmpfile ${PN}.conf
+
+ newsbin scripts/logwatch.pl logwatch.pl
+
+ exeinto /usr/share/logwatch/lib
+ doexe lib/*.pm
+
+ exeinto /usr/share/logwatch/scripts/services
+ doexe scripts/services/*
+
+ exeinto /usr/share/logwatch/scripts/shared
+ doexe scripts/shared/*
+
+ insinto /usr/share/logwatch/default.conf
+ doins conf/logwatch.conf
+
+ insinto /usr/share/logwatch/default.conf/logfiles
+ doins conf/logfiles/*
+
+ insinto /usr/share/logwatch/default.conf/services
+ doins conf/services/*
+
+ insinto /usr/share/logwatch/default.conf/html
+ doins conf/html/*
+
+ # Make sure logwatch is run before anything else #100243
+ exeinto /etc/cron.daily
+ newexe "${FILESDIR}"/logwatch 00-logwatch
+
+ doman logwatch.8
+ dodoc README HOWTO-Customize-LogWatch
+
+ # Do last due to insopts modification.
+ insinto /usr/share/logwatch/scripts/logfiles
+ insopts -m755
+ doins -r scripts/logfiles/*
+}
+
+pkg_postinst() {
+ # Migration from /etc/cron.daily/logwatch -> /etc/cron.daily/00-logwatch (bug #100243)
+ if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
+ local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
+ [[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
+ && rm -f "${ROOT}"/etc/cron.daily/logwatch \
+ || ewarn "You have two logwatch files in /etc/cron.daily/"
+ fi
+
+ # Trigger cache dir creation to allow immediate use of logwatch (bug #607668)
+ tmpfiles_process ${PN}.conf
+}
diff --git a/sys-apps/logwatch/logwatch-9999.ebuild b/sys-apps/logwatch/logwatch-9999.ebuild
new file mode 100644
index 000000000000..93f1e8caf378
--- /dev/null
+++ b/sys-apps/logwatch/logwatch-9999.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit tmpfiles
+
+PATCHES=()
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
+ inherit git-r3
+else
+ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="Analyzes and Reports on system logs"
+HOMEPAGE="http://www.logwatch.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/cron
+ virtual/mta
+ virtual/mailx
+ dev-lang/perl
+ dev-perl/Date-Calc
+ dev-perl/Date-Manip
+ dev-perl/Tie-IxHash
+ dev-perl/Sys-CPU
+ dev-perl/Sys-MemInfo"
+
+src_install() {
+ dodir /usr/share/logwatch/lib
+ dodir /usr/share/logwatch/scripts/services
+ dodir /usr/share/logwatch/scripts/shared
+ dodir /usr/share/logwatch/default.conf/logfiles
+ dodir /usr/share/logwatch/default.conf/services
+ dodir /usr/share/logwatch/default.conf/html
+ keepdir /etc/logwatch
+
+ # logwatch.pl requires cache dir (bug #607668)
+ newtmpfiles "${FILESDIR}"/logwatch.tmpfile ${PN}.conf
+
+ newsbin scripts/logwatch.pl logwatch.pl
+
+ exeinto /usr/share/logwatch/lib
+ doexe lib/*.pm
+
+ exeinto /usr/share/logwatch/scripts/services
+ doexe scripts/services/*
+
+ exeinto /usr/share/logwatch/scripts/shared
+ doexe scripts/shared/*
+
+ insinto /usr/share/logwatch/default.conf
+ doins conf/logwatch.conf
+
+ insinto /usr/share/logwatch/default.conf/logfiles
+ doins conf/logfiles/*
+
+ insinto /usr/share/logwatch/default.conf/services
+ doins conf/services/*
+
+ insinto /usr/share/logwatch/default.conf/html
+ doins conf/html/*
+
+ # Make sure logwatch is run before anything else #100243
+ exeinto /etc/cron.daily
+ newexe "${FILESDIR}"/logwatch 00-logwatch
+
+ doman logwatch.8
+ dodoc README HOWTO-Customize-LogWatch
+
+ # Do last due to insopts modification.
+ insinto /usr/share/logwatch/scripts/logfiles
+ insopts -m755
+ doins -r scripts/logfiles/*
+}
+
+pkg_postinst() {
+ # Migration from /etc/cron.daily/logwatch -> /etc/cron.daily/00-logwatch (bug #100243)
+ if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
+ local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
+ [[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
+ && rm -f "${ROOT}"/etc/cron.daily/logwatch \
+ || ewarn "You have two logwatch files in /etc/cron.daily/"
+ fi
+
+ # Trigger cache dir creation to allow immediate use of logwatch (bug #607668)
+ tmpfiles_process ${PN}.conf
+}
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 3eb828fae180..ef20755b7343 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -4,7 +4,7 @@ AUX lshw-02.18b-gettext-array.patch 924 SHA256 0a714fd5c4e106bdd87b321dc2c5b9558
DIST lshw-B.02.16.tar.gz 1845891 SHA256 809882429555b93259785cc261dbff04c16c93d064db5f445a51945bc47157cb SHA512 ad3bd3d7b6f36f912265f0853f5aa37158c6d420a90a5e84b3e8fcd8a3c6137f7505cb5361e3eceb49954332d2466c686c946dcda8db0da3d51b3c48e343c2ab WHIRLPOOL 8e3200b726432859965be744c6afa437ffb4b57166084432064621773018b6f997a282ddea813916bc7faeced22a1286044b91bd69422b83372f03cf0878ca2d
DIST lshw-B.02.18.tar.gz 2322176 SHA256 ae22ef11c934364be4fd2a0a1a7aadf4495a0251ec6979da280d342a89ca3c2f SHA512 4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47 WHIRLPOOL 42a76daa9426dbca1f9acd9afc5e66542ea87e4e6cc53c2a125443d3338765ce55845981d1d50b380201dc10c8f0cae6fd1eb573573eb7262ce87c85d74f3e20
EBUILD lshw-02.16b-r2.ebuild 1578 SHA256 f8e14606435cd2a8ea7b63ea20a0aa814a625fa25fc248604eb8059ac5c8fb51 SHA512 04bdbaab93a5afea433f2bda35b1254c3bbf3b6ce9f918acfdb2d7bf33f0f0d08df5473a7506efe10e04be8036d18e8d9e4ae0f7a37955d906893af546dc99a7 WHIRLPOOL 1c06cd8a5fc6cc3d7634582be3380e3b4f9179edbbd2ec1c14d5c40fcac7d2bfb1e96f175c32f8861db19bc9d7a39791c8d200b44c28fc7df621c2aa9a1119fa
-EBUILD lshw-02.18b.ebuild 1733 SHA256 c132f4be4a6a683c1f132898574b920b20078aa3cfc23777566a4932cd1e91c5 SHA512 71ba3f14b2b0a074c4718cc8a01c96b81db4b848d1dbab6ae56ddb510f22c4118dbf3556afddcd966171f4be3c8ad70c840e29fb7374b213e826d6617f3f3dc5 WHIRLPOOL 31d7b44e52cd941cbfdfa0ece98d76c0f110c72d826429ca351583efa052a1409926d81dada6e891fb11520e93330c432541d2c3792d7ace22e3d42f275fb3e9
+EBUILD lshw-02.18b.ebuild 1732 SHA256 14b424d8248c524f7e4215def592191552c8c691c17580b31619623c48550f54 SHA512 2bb39c60194d9648309c2990ab0b354ad758abe3a46e25e21b1aec5444f87b4652a47fa63f71c9242cf9b8bbc05e997e552259b309b48f95f2094914da84629f WHIRLPOOL 5c55363939beb795af1d0f9f9c1b716a0acbd106bf29ea44481d9547ab681ce4eb55546a34bd81ef1ce435cca7c39402435c8bc91551e897169bd0ade1096232
MISC ChangeLog 3814 SHA256 0d1b50caaf76df36646baf5439f54572d6da1e16fd63d42aaf29aa7d91e01cb5 SHA512 c2c3507d1ca0e12cfc07c3a0dffd8865e264fefeed0ba2390e5be9c3df1874a782b546a5540be5fda081228931553c0c4da7bef8fc0cbe31ded9e721651bf6fe WHIRLPOOL 8efbb8e044d7171f32946bba36b8cbe376559ae1f5f748f351a322be268d64e8343152653a35b6989e2885766a05522d3cdfbf2b4ea46b7c47386197e6631a46
MISC ChangeLog-2015 14670 SHA256 2ef10eddb9a1be131708ee0af8db0abf5d06d3179fe8f9887355a04499050f43 SHA512 5cc4886c2865cb99c5e90d60de96b861cf031fc4a0821c5c75f6b27ee098e980624e5ba78e12224b9ddf5dc54e33ae78939480d00327d0abdc59a994a28d045f WHIRLPOOL b0eab89bee9d39e40a7a8f22f3aa80347a1c9f138c2b3ddcf6fde670d020e9b9c4a65d9115385e0e89435307b0d07e9f14924f0cdcc9fca9b8d4e15d69f354c4
MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild
index ce73d9167e88..e9da0f61c0d1 100644
--- a/sys-apps/lshw/lshw-02.18b.ebuild
+++ b/sys-apps/lshw/lshw-02.18b.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
IUSE="gtk sqlite static"
REQUIRED_USE="static? ( !gtk )"
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 5648f0b916be..17c04e24eed8 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -18,6 +18,7 @@ DIST openrc-0.34.2.tar.gz 226006 SHA256 f2b81f2661a1834db6477f5af9363334370874fa
DIST openrc-0.34.3.tar.gz 226693 SHA256 8e4c1f99727b7b91766fcd65e0a303240528bf0cb123a65e33adc904c67bf2bd SHA512 516849d20fba93cf560aaeb51b29fa495265b317b37fc48e193876b131f770665235560fcb2e64e7c7a8046699daafee170887cdb19144938cbf669724505f3b WHIRLPOOL 286ecab65a1a1de429ad5f9a4241b25d0aef146d3a47429550d05f7cc68fdc4c36bff933eaff77c6b1bfa3e18a313e19dc5a531fd35cace825e54e67d0f7d163
DIST openrc-0.34.4.tar.gz 227129 SHA256 b9d70a8e32a9fa4078864a9aad4e60efba3c0ccfa54ac777a538f62a2c1eebe5 SHA512 f502a8411929d153d4d2e5e4f4052691c6ff85432eb0b8a5534c7880d9b58b3ac919f04af1f1be38c76cd8dec3740bc718b486c06f06f08ba41d311d963250ec WHIRLPOOL 56e34c17ecacc9b42611815a757da33db84571bf2d7c39d8cdc252b170a8c5a5b811b50c0a7d0671dd1c71679d6625deadce10f025ec066d4a6fdf559587af59
DIST openrc-0.34.5.tar.gz 227278 SHA256 dad1ccddd3adef9ac3039e1402ad530cc5a54b351ceddbfefc3ad1b96298f97e SHA512 2e743b7d8f287bab8c74e9cac46935a7895483fd181d969a8e3a6709ccd6d222255b509730b9165f191626774fc372e426049678796d72e4d43541b8232674c7 WHIRLPOOL 855497ba5a444afa3eb1445f92169944115385ba9637ccc05da1bb8943c49fcee2eb7378be3d33d2bff420d8b5a663e2c6176a036a71bbfb08e15213dc9dcd9d
+DIST openrc-0.34.6.tar.gz 227096 SHA256 e4e6a1cb1e764c0a81831be72e08009ce6c1381adb3b96f115a2f8d72a666e2c SHA512 2e17fbc628c0753f4459678764911d787b8d40f309f978ddbdfdc4dfc5d3033a2ac35be00fb9ad558030249d215b9494a0e5eb43e41d3123aeca032032c82541 WHIRLPOOL c41365081fdc1eecde817e23ec665f80c28065fac72a1d58edeee676b83c53db7a422524a00ded35de818a1d775f9719afb7ce608d3d974a5e3e89fc86844f3b
DIST openrc-0.34.tar.gz 225678 SHA256 fa95e111d884f60f967bfa78353f683615f599bbf449b89c0663eb173769fc73 SHA512 8ff0e3234db06ddeb7c930251f13ec9e4488e4c9776dfe46bb0c1af09835cb34655084bebb6638eb07e47a7f5ef95c1aaed9d06dfa3eaef9e36e9b7a7910f820 WHIRLPOOL aacc1b4636bbbf29d091d7322154898c98cd13947450a0d81cacc080803c1241fe3cbe3e731553c94e5e5ddb2e9c626de53efa9885a4e7be23399637099f1e4d
EBUILD openrc-0.27.2.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625fc6fbfbf7b2f31ce8f7c2e1 SHA512 c63261e84ac5225167034db09feb5772a244de09b2ca084078122b7a968f737dff1eb3a1b8fb76333c7c7f57299bd30ae4c5a49a0ad120459474be30aea360d6 WHIRLPOOL 45fc659935bc090b2ec8568dec93407b8c4a851e73b1138643a4584ef1b3d9e9c485ba1e10a0a303be6825f35f92ee026fc2f640158d3e7c7add3b3f1dcf5a67
EBUILD openrc-0.28.ebuild 10123 SHA256 850255977878f273ec0fb3f0bfa117f4637dc3507f855e5d549b3eaad904f6f2 SHA512 f32502ebbd8e1a8e13044cd23d8b0e136eaf26e86001ae5f225640f085069c78921392a492614d3d1b734542bb0f99a9c781706158bdf5cd1ec91634d9f89e72 WHIRLPOOL 40fff2659443e04b037a5d722f0380423977c70001cd10076020ea5a6107ab8c7436ea0727ad00a0371a707daa90dda840bd4143ba5e2b180165dcc07fd15186
@@ -35,6 +36,7 @@ EBUILD openrc-0.34.2.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7
EBUILD openrc-0.34.3.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
EBUILD openrc-0.34.4.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
EBUILD openrc-0.34.5.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
+EBUILD openrc-0.34.6.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
EBUILD openrc-0.34.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
EBUILD openrc-9999.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
MISC ChangeLog 18468 SHA256 b0c4464a2179009f3683606b8c9ed6b6f1e5c543e5dee53d0b44e9cd51804d94 SHA512 f1269f5f534a2fb2c5643b8cb5735e969e4bc18f2f8474c23784cfebc92ac72a3ed77f00eafa7430ec2944b4a5476a4688172d9fc47a32eb04bbb43893a80143 WHIRLPOOL a912f296cb7272dded544d045cc9dee06c9319fc500dbdef9e000300c3fc73aaae4e72c7574428ce4dddeedcd2055e594acf315cfa53db95d48aaf20c8a8907a
diff --git a/sys-apps/openrc/openrc-0.34.6.ebuild b/sys-apps/openrc/openrc-0.34.6.ebuild
new file mode 100644
index 000000000000..15376774cd7c
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.34.6.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic 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="https://github.com/OpenRC/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ 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
+ 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
+ )
+ audit? ( sys-process/audit )
+ kernel_linux? (
+ sys-process/psmisc
+ !<sys-process/procps-3.3.9-r2
+ )
+ selinux? (
+ sys-apps/policycoreutils
+ >=sys-libs/libselinux-2.6
+ )
+ !<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[selinux?]
+ virtual/tmpfiles
+ )
+ kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+ )
+ selinux? (
+ >=sec-policy/selinux-base-policy-2.20170204-r4
+ >=sec-policy/selinux-openrc-2.20170204-r4
+ )
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+ default
+
+ 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
+}
+
+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)"
+
+ 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 gentoo pam.d files
+ newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+ newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-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
+ if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
+ cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
+ "${EROOT}"etc/runlevels
+ 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-vpn/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
+}
diff --git a/sys-apps/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest
index d2819ee72af0..99d4f8164911 100644
--- a/sys-apps/osinfo-db-tools/Manifest
+++ b/sys-apps/osinfo-db-tools/Manifest
@@ -1,3 +1,3 @@
DIST osinfo-db-tools-1.1.0.tar.gz 481935 SHA256 a141cd2fc07c30d84801b5dbf6b11f2c2e708b0e81216277d052ac0b57fe546b SHA512 52e08e67b75fb84c7d7721dd76f1bf09f71c27deffc4d8391234aec939863de4e96cbd8fc9783944b2493fef183518a21ff185ec5a5d9934adc6d3c67bf0f972 WHIRLPOOL e80ff164d6af0aab33ad1b025490893e226c28792b4ba8e585c0a17a8188e05f311268b26048367f8347bf97d31b59f7a523218e7262e8c578d4becebb70a0e5
-EBUILD osinfo-db-tools-1.1.0.ebuild 758 SHA256 e3dcc3169d7002607c826c31c6bbb5d6e5cf555fc2f9ee0d44e8b0be60c44882 SHA512 7525aa39af972b0cdd54ff30cc68d48fd608cc22b8c8bf1d2a3bfdab836b0e69a38c0d326a94266217de812b84e18e6d1192c0c026c075f6af629d3a3f4946b8 WHIRLPOOL e58fd789283eab70d8a45122e85dd5f38671b798019c0572256b4589d4ef62471976fd36b2c1699f143f27bea09030a226a812c7d9c7745811000d6f424c534d
+EBUILD osinfo-db-tools-1.1.0.ebuild 765 SHA256 d02d3beb5c636cc15815bbb845fb55e8738b6c4a717d0a518597f92f6e3138ce SHA512 dc2e71d375aa5425eb6c18ff260a2d3c97b53b492d82ece7d13c8c61efe0d26b3964c81cdc36dffc9031f55543823f5d59bb98c2e5418c7cea05ad6852a3be46 WHIRLPOOL 261149ee7c4251a064e8b92f2c19eeb3a0dacbb8baa05cbd4f17f9e7f9e56d7cc5603680f85cae41c5f0ee0434bdc2032d27419ba414d8c437381c547d594bac
MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.1.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.1.0.ebuild
index 99298c8f8751..227de4efa581 100644
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.1.0.ebuild
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
# Blocker on old libosinfo as osinfo-db-validate was part of it before
RDEPEND="
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 1184fd86902a..074a3efd4809 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,7 +1,7 @@
DIST osinfo-db-20170326.tar.xz 62696 SHA256 348e216cf26f905190de2bef321d2c0d3f3953775370cf6f58b81f4cc40ac7ee SHA512 06470488ea7442f1dacd2309a7c85ec90f05f55ad3b1f138e32e620f13b70addc203710e7c4cac840151899035fe61ca0ca93d73fdfbb7232d1425e9e5a593c5 WHIRLPOOL f4f23f1f14bbd0a1f827e9cf234d7a5ab6df50057fc96ad2633152b538884cf1391c3cb7d74b6c88ced12d192df47f3e479280d61654102ff8289795788f3a84
DIST osinfo-db-20170423.tar.xz 63508 SHA256 1f21ba0bbee71fefbec9b71a63289f4456aa64b205ed071c0bcd8ca7d21dfa3b SHA512 5ca13ced160f19dced65f3552e17a0379a47a05f1aa3bdd533550022f0023050b6cc1b43b2da6cff3fa10451f81560fbb0db241a11ed072b9f101db1bd301833 WHIRLPOOL a3fe710504ad85cfcd716d4b6d72a09fca428f8260980a9d794cac24cb1a2e25d654a9a299f86414f13b0f72ed3e2d0fa2bc4fb5d67a843b64a8bb8e815ef5a1
DIST osinfo-db-20170813.tar.xz 64424 SHA256 dc3922822d930947f4a80b24bbc2d2be6c09569215a053bc909f3aa58a18316d SHA512 0ae4906b5c3eb400ca397f0c3baf5146b8197ee2dc712b1b89dd2f443f9505aee208327f008118628407b54ce52390a8b6138425f3f6f974b94f4a8d79955653 WHIRLPOOL 78a2b63cab1fd6980a0d9654b9567950be71b42e5a2030d528aec9039af3394a4dca88e2241c09dcf81976a7228d4668329af27337cc8ef1164d8d5f84e587d6
-EBUILD osinfo-db-20170326.ebuild 657 SHA256 6c0ba87a38cc424ff2d5e1f73613becaad0525bdbac295e3344da845b1dfac3d SHA512 815012453a905dbcd4b641e86af5b52e3aea236b88c0df233d256e7ab35f3a47f3ce8d1e337f1ca5a609a34f0a512e4bcfc0adc2ec7d0f4b45cf807cfb95b954 WHIRLPOOL d12b2eaab4878bd5cfd6c469cec686e84c2d5764a2ed6efa9cebd6f6a566c879252d5eedfb982014a112af5b1800632c38a5ac076270db110dac74d0001104f8
-EBUILD osinfo-db-20170423.ebuild 666 SHA256 9c6de69d52ae268948739fa84ba6eff7598f893e682a1823f7127562a8a23ced SHA512 d01657ba7714a19ee5ff67d00321492a3bfe4711800b19518ae3ad779568ecb2262c312f6b95a56d838ce6cd5bbef0ac629881b90110dbe0d0da0b97f60605c3 WHIRLPOOL 770db9205993f4c67f5ce1f5e05b46c02803c3ace2312511b4034bbd99de5b6ef36ca45b9f82c014af2133baf4b8790050f8bbad2842c4a424c145d4e129bb34
-EBUILD osinfo-db-20170813.ebuild 666 SHA256 9c6de69d52ae268948739fa84ba6eff7598f893e682a1823f7127562a8a23ced SHA512 d01657ba7714a19ee5ff67d00321492a3bfe4711800b19518ae3ad779568ecb2262c312f6b95a56d838ce6cd5bbef0ac629881b90110dbe0d0da0b97f60605c3 WHIRLPOOL 770db9205993f4c67f5ce1f5e05b46c02803c3ace2312511b4034bbd99de5b6ef36ca45b9f82c014af2133baf4b8790050f8bbad2842c4a424c145d4e129bb34
+EBUILD osinfo-db-20170326.ebuild 664 SHA256 e132734a8a7e51bcdf112214cdf47abe1ec917b313fd19296b6fd8b27f0b9354 SHA512 6a2cb98de0fc6d4c9af1cfd084cf56d614c9b480aff815bb74edaf8c391179c0e01d476d847e0e10425f8c9080a7223c6e8798cfcc79215c84310ca7278b7c18 WHIRLPOOL 9f1aae96d656829f233c6acd4ef704b7c2eeb35662210b5905ac851f7611d796a5414792225a463ca9fe342e8c20a6963ebd87d3a3dccca671335661097f436a
+EBUILD osinfo-db-20170423.ebuild 673 SHA256 1a84eb3187805837826736077bea7cf667c14c7f6cf13937980dbb80c3ca8715 SHA512 269fa69e7055e1c83f98052ad4cbf7dcfe86819e1cf0e759e6fb693c1ef576ef9c1244c71e23955d2acbae915a657f2cc1dbca601cb5d7301631a91a93844431 WHIRLPOOL 1e63dd8f8ffb443a06f832c0513ef04092a9f24226e9c59edb2e9d417b678be80570c69f6bc62ecc912eea2e3275c35bac3283d27d74630fdc54771956651fc7
+EBUILD osinfo-db-20170813.ebuild 673 SHA256 1a84eb3187805837826736077bea7cf667c14c7f6cf13937980dbb80c3ca8715 SHA512 269fa69e7055e1c83f98052ad4cbf7dcfe86819e1cf0e759e6fb693c1ef576ef9c1244c71e23955d2acbae915a657f2cc1dbca601cb5d7301631a91a93844431 WHIRLPOOL 1e63dd8f8ffb443a06f832c0513ef04092a9f24226e9c59edb2e9d417b678be80570c69f6bc62ecc912eea2e3275c35bac3283d27d74630fdc54771956651fc7
MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/sys-apps/osinfo-db/osinfo-db-20170326.ebuild b/sys-apps/osinfo-db/osinfo-db-20170326.ebuild
index f27b34e1494a..25e22501b45f 100644
--- a/sys-apps/osinfo-db/osinfo-db-20170326.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20170326.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-apps/osinfo-db/osinfo-db-20170423.ebuild b/sys-apps/osinfo-db/osinfo-db-20170423.ebuild
index 719da8f12a56..c9a011444bf3 100644
--- a/sys-apps/osinfo-db/osinfo-db-20170423.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20170423.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-apps/osinfo-db/osinfo-db-20170813.ebuild b/sys-apps/osinfo-db/osinfo-db-20170813.ebuild
index 719da8f12a56..c9a011444bf3 100644
--- a/sys-apps/osinfo-db/osinfo-db-20170813.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20170813.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 5dcff3afe07c..4feb7d797964 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,8 +1,10 @@
DIST paludis-2.6.0.tar.bz2 1885055 SHA256 bde018c89fce95c2cc793d9171e5a51748ad682d06f839fab394e233257aaf4c SHA512 78a9c0a19703dbbc07934de389b749ab83365454e29b19c323d6c03304162e35ff4d92f7ac1f28067ad853057f2422be43418b3c6a57a193c4b8dd5a4e81eba4 WHIRLPOOL dc4f4ecad0ccbb4b8e6b1b4d0a2c71772b5be244f09dc5456fe42d5510b6b7432ca087f99ae86b2bbbd05b18f70a15371dca1193ead556751faffd01ef227dd6
DIST paludis-3.0.0_pre20170219.tar.xz 1004380 SHA256 02b9f5e270edc31b967f58615390b3a6c8268ee000d4d1c093aa04651c4e5681 SHA512 46b970c3585aeba1151442256850d4ad1acd28ca911277459d84dfe2fa480c310e5a9cde83baa7f185a76837b84959ec2d01ee9c4f85ba4a9664993b82d61eb6 WHIRLPOOL 8e2384cca652e71bfb5620ed6e6f6b33568342dec1fa2b8403f9074ca83e3a71106de5061cf08240db91fe34d1c779e689bb8057d18a75cabfe641af2d3eb747
+DIST paludis-f8e58ee1d02d2476ae92ebc3737e42b8b6a36891.tar.xz 1004024 SHA256 575c528026663c1c2bb89c5f16c488ab48f305756fff80a8524cad6fbb39a5dc SHA512 813592b6f164d7994000ff1740e003049e040e7d58832bb1393a1f4facf428806b57bbf97855b830f75acf4b20e963093e9993b110f76f44e25afb9a8a1eaa1e WHIRLPOOL 95e2989c401455a10ba34b9690631c467fdf3dd6a08dd7a12d16985234f6698ccce5f3d8d98ba75495fadddc660bb171742b7ce81c122c6eaf6bbd0a33e5df49
EBUILD paludis-2.6.0.ebuild 3765 SHA256 f2fbe43ec2e715b3b6418325050d8ce855441b2cf3cd0bbc8f3ddaf4a3f0bb99 SHA512 585d750b8e8d6c48f8260acaeee567771adfa12cea0f8bfc7b7b069c280d29fd2d28784856c002f8ba51c3eb4e40835fe86b775cb3a6c35361aec37006ed300c WHIRLPOOL db3926f89b4019fffe8ced33a720fd0d72443751d3b0f11c2b120028b9874d05accbe4d8f9c332b2909bb787351e5abbafdcd42b2c2dbec4e3bad0833452a52e
EBUILD paludis-3.0.0_pre20170219.ebuild 3766 SHA256 85b630a4f1e8dacab093afd56711aea3c26f0864bea12d8c383efd513e7e8968 SHA512 23cf386093f2f0c59d706b8a166550600dfc677e58986636846c0f180ed59629868f2a3d4c73df3d4bad00550ccaa5e22cddcbdfdf8195b9a15665db99cfa365 WHIRLPOOL fad8ae221b5b9be16430851f1e08fa145adc65e3e994cbb68ab2c453164e93f1f1e2606c053a234829d4410a8c77615929745741a0d84d737578b35d4516e582
-EBUILD paludis-9999.ebuild 3621 SHA256 848cd527c5f2d77878796a0de4378ec82b6e937395bfa5f179a6b1948a5cb599 SHA512 0e10e521b42d36c471fc8afaa59c5e7b6d380e32426bbd69f33568af445afdd42a3f0d4cd10c1448b40e7f2bac8783920dc93c5e78e80ca43b234b5fcf071014 WHIRLPOOL aee3869301770a0188744cbd453556af938872af596861887eb278bd9cf754067a5065aeffa84ec04983ce6509b974a82aeafa572164f3426c47151c99801f8a
+EBUILD paludis-3.0.0_pre20170808.ebuild 3784 SHA256 5b995d55d510edfb2e46719b7a8f90d854657473d218760bc6d9edac16f987b4 SHA512 ce2783f67cfccdeb3c8bde767890f9fdbf8af3c68228ce333d5bb9b92d73bf0bb69d7947b8e678817b58e3420ceecf7d99ea6a4ff2fd3eae79644fce175d02f0 WHIRLPOOL 23ac48637db7f05d94c9dedd2060f5e9ed8b12e2fa4591226e7882e3ec1cefb6f4f1d07d2a8dec5137ef37de966cd869482849333410057f09aa5884ba3246bc
+EBUILD paludis-9999.ebuild 3633 SHA256 a7ada7764b0ccfef1a64aafaa8d49b820d73446d2310ecf544ef832597b86e68 SHA512 5ecdff9a67ac467dbc7c925f2ad77eb98344f01d0b6ccfda938a3ee3a6681d4af7f108713d2764154cd5d7b251078fce2c70c6aba0629ab40efbd090e265962d WHIRLPOOL 58118348a283eef6dbd0cd9d7063fe50ff042bdfdb578ec6e72889854379d43c18be97844bc83b76de252fa2862f923cc761aaef485f6ecb7156d71ce346bf3f
MISC ChangeLog 5959 SHA256 4018cab68a86f029bccc207bc84b15ae4502823335bc14f8265591f6bd1df0a1 SHA512 6e432a3a695e60a4380daf1741e4fd218fe3fed7a548622f13fc07cfa7b73ead4145c52879f3a722e81050005f2521afad3a036d4541dd7ebf0c623a108564ab WHIRLPOOL 34f5497ed1e1d62cb40c18b07d071a657f79fe94f23bca5037e0e7bb8f33aa3698edfb5b1ef61f30b982e111bfd86bf51f3517a4cf54e47ed88a98bdecb0efb7
MISC ChangeLog-2015 40901 SHA256 53512c036950cc0304a1714a2a7b116940c4b14057137058e1ba778d0152e98f SHA512 d7e9b4646d3d450bfa8e74690b55cb8f56c1aa4a62d9fe1f3add02819955de39d563cf7878f09b54bce5d188f2cb41e83dd6839cf91205aebbd3322c3e09ae7b WHIRLPOOL 2ebd68e3f12f72b448dc5c71d2fb3529df4e1d7af81bad24844ae5010028340eff8686861d3b61a5f5cd396d157effe6b02832213e776c1efabde3f91ee6423b
MISC metadata.xml 706 SHA256 c45c21c0c85d887b499d8c6b5576ae41c39ac7593c80529d06c61afb962c9e33 SHA512 ab32599364fb289dc43d8dc1574ee472585f014c663d2c80209700596b455e074346ab35e69bd05fee86a451902852790f1bb9dcd37f2118e8e8bc24b90a01ec WHIRLPOOL d35b406e15b8de19ff12cdebc8702e1a482228358b37da2b47f58f43986b895e9097a4f2332e5779051095ebe98aae9efcf43e5ca30851f79e6633a953f43e6e
diff --git a/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild b/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild
new file mode 100644
index 000000000000..d37eafd6067a
--- /dev/null
+++ b/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+RUBY_VER=2.3
+
+inherit bash-completion-r1 cmake-utils python-single-r1 user
+
+MY_P=paludis-f8e58ee1d02d2476ae92ebc3737e42b8b6a36891
+DESCRIPTION="paludis, the other package mangler"
+HOMEPAGE="http://paludis.exherbo.org/"
+SRC_URI="https://git.exherbo.org/paludis/paludis.git/snapshot/${MY_P}.tar.xz"
+
+IUSE="doc pbins pink python ruby ruby_targets_ruby${RUBY_VER/./} search-index test +xml"
+LICENSE="GPL-2 vim"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+COMMON_DEPEND="
+ >=app-admin/eselect-1.2.13
+ >=app-shells/bash-3.2:0
+ dev-libs/libpcre:=[cxx]
+ sys-apps/file:=
+ pbins? ( >=app-arch/libarchive-3.1.2:= )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-libs/boost-1.41.0:=[python,${PYTHON_USEDEP}] )
+ ruby? ( dev-lang/ruby:${RUBY_VER} )
+ search-index? ( >=dev-db/sqlite-3:= )
+ xml? ( >=dev-libs/libxml2-2.6:= )"
+
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils
+ >=app-text/asciidoc-8.6.3
+ app-text/htmltidy
+ app-text/xmlto
+ >=sys-devel/gcc-4.7
+ doc? (
+ app-doc/doxygen
+ python? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ ruby? ( dev-ruby/syntax[ruby_targets_ruby${RUBY_VER/./}] )
+ )
+ virtual/pkgconfig
+ test? ( >=dev-cpp/gtest-1.6.0-r1 )"
+
+RDEPEND="${COMMON_DEPEND}
+ sys-apps/sandbox"
+
+PDEPEND="app-eselect/eselect-package-manager"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ ruby? ( ruby_targets_ruby${RUBY_VER/./} )"
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ if id paludisbuild >/dev/null 2>/dev/null ; then
+ if ! groups paludisbuild | grep --quiet '\<tty\>' ; then
+ eerror "The 'paludisbuild' user is now expected to be a member of the"
+ eerror "'tty' group. You should add the user to this group before"
+ eerror "upgrading Paludis."
+ die "Please add paludisbuild to tty group"
+ fi
+ fi
+ fi
+}
+
+pkg_setup() {
+ enewgroup "paludisbuild"
+ enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty"
+
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Fix the script shebang on Ruby scripts.
+ # https://bugs.gentoo.org/show_bug.cgi?id=439372#c2
+ sed -i -e "1s/ruby/&${RUBY_VER/./}/" ruby/demos/*.rb || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DOXYGEN=$(usex doc)
+ -DENABLE_GTEST=$(usex test)
+ -DENABLE_PBINS=$(usex pbins)
+ -DENABLE_PYTHON=$(usex python)
+ -DENABLE_PYTHON_DOCS=$(usex doc) # USE=python implicit
+ -DENABLE_RUBY=$(usex ruby)
+ -DENABLE_RUBY_DOCS=$(usex doc) # USE=ruby implicit
+ -DENABLE_SEARCH_INDEX=$(usex search-index)
+ -DENABLE_VIM=ON
+ -DENABLE_XML=$(usex xml)
+
+ -DPALUDIS_COLOUR_PINK=$(usex pink)
+ -DRUBY_VERSION=${RUBY_VER}
+ -DPALUDIS_ENVIRONMENTS=all
+ -DPALUDIS_DEFAULT_DISTRIBUTION=gentoo
+ -DPALUDIS_CLIENTS=all
+ -DCONFIG_FRAMEWORK=eselect
+
+ # GNUInstallDirs
+ -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ dobashcomp bash-completion/cave
+
+ insinto /usr/share/zsh/site-functions
+ doins zsh-completion/_cave
+}
+
+src_test() {
+ # Work around Portage bugs
+ local -x PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
+ local -x BASH_ENV=/dev/null
+
+ if [[ ${EUID} == 0 ]] ; then
+ # hate
+ local -x PALUDIS_REDUCED_UID=0
+ local -x PALUDIS_REDUCED_GID=0
+ fi
+
+ cmake-utils_src_test
+}
+
+pkg_postinst() {
+ local pm
+ if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then
+ pm=$( source "${ROOT}"/etc/env.d/50package-manager ; echo "${PACKAGE_MANAGER}" )
+ fi
+
+ if [[ ${pm} != paludis ]] ; then
+ elog "If you are using paludis or cave as your primary package manager,"
+ elog "you should consider running:"
+ elog " eselect package-manager set paludis"
+ fi
+}
diff --git a/sys-apps/paludis/paludis-9999.ebuild b/sys-apps/paludis/paludis-9999.ebuild
index 89cf081c10bc..cecf2cc4dee7 100644
--- a/sys-apps/paludis/paludis-9999.ebuild
+++ b/sys-apps/paludis/paludis-9999.ebuild
@@ -78,7 +78,7 @@ src_prepare() {
# https://bugs.gentoo.org/show_bug.cgi?id=439372#c2
sed -i -e "1s/ruby/&${RUBY_VER/./}/" ruby/demos/*.rb || die
- eapply_user
+ cmake-utils_src_prepare
}
src_configure() {
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a8b558831e2b..bbf41cc883e4 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,10 +3,10 @@ DIST portage-2.3.12.tar.bz2 944929 SHA256 4a6b6c1d038131d141b932b1ad93768a7823ac
DIST portage-2.3.13.tar.bz2 945477 SHA256 f3ed1445cf2bbfc6c5986873aff055e4caa3b695f37e033930ad2533bdea8d24 SHA512 71d9ea6c9a889572f60e7e501e9f8739db588cffd98a431303906eb90c1f7bb85c55f6779cbfb921630149d1b3174539fe2357fbeffbbe9857998907e3215ad3 WHIRLPOOL af9140e46d7e94994b276d93389c4953de77c77e9bf132c20b85bfdd477aaaeef2bb05293e94058158cf7800711ae7d1ff694d6ec9fd5e940849fd538b86c501
DIST portage-2.3.6.tar.bz2 943085 SHA256 2f57545fcb142a4b23c2052c523d3d858754b232be21455ee6c6cd3ff0903cc2 SHA512 5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055 WHIRLPOOL d0258c579597690e8bf2cc2a3ecc36d543e67a728c302a9b16ae361086023a7e059ac1a9e2e64f026b7d975d6b619d3b981062227042098ed3afc1b86658b636
DIST portage-2.3.8.tar.bz2 938062 SHA256 19b73658dca848d215c5527d1d020c8106352007a84d7675e5efd0a7b9b48a8a SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8 WHIRLPOOL 0c576bbd8aaf8b27fa1746c863ac02b2a5f361d9011d17250ffbe4b830a8a6bf10a0aee48b5181a8aa6c55d8ad81ad411195da2a6253e9b324d3c7397053fe29
-EBUILD portage-2.3.12.ebuild 8216 SHA256 4396a5edc8391d04c412e20694e71311dc34a288ab1dd67b1455aa29524f8fde SHA512 8f5e923a644abc5cb704ba3cc0ab54c8dc254cb77e3f9fab207d40b6aa80dcffb2e6aedeaab649108a744ebd1d88c827cde81fa131e3e94360db921fcaf853f9 WHIRLPOOL a39d650d8fdba9181c1e1220bf9868467e31360e474ceca40f0548eebb1bd3eba088203fb86f62c5a674ca8f532e9180d916ed707cf0833623f74770d81faaa7
-EBUILD portage-2.3.13.ebuild 8216 SHA256 4396a5edc8391d04c412e20694e71311dc34a288ab1dd67b1455aa29524f8fde SHA512 8f5e923a644abc5cb704ba3cc0ab54c8dc254cb77e3f9fab207d40b6aa80dcffb2e6aedeaab649108a744ebd1d88c827cde81fa131e3e94360db921fcaf853f9 WHIRLPOOL a39d650d8fdba9181c1e1220bf9868467e31360e474ceca40f0548eebb1bd3eba088203fb86f62c5a674ca8f532e9180d916ed707cf0833623f74770d81faaa7
+EBUILD portage-2.3.12.ebuild 8220 SHA256 08733d496146447491d9dc76828ecca92f9bc2db6f1c0600735369276c24a28b SHA512 01c64f9252eddec365801614582182d509f969fd83889d003a3081df96f92dc2f3b707231ef74357fdd049eedef726e95304d3ceec0c334504ca186ee5cd0f01 WHIRLPOOL 71f49ac7ab731414fa5b2d149cf754ebeabf851bed1fc4ee0826cdd6aa5f582b717e87863c0ee5871d541108e208758394c8d7cea5affc0e4a045059a8d232cc
+EBUILD portage-2.3.13.ebuild 8220 SHA256 08733d496146447491d9dc76828ecca92f9bc2db6f1c0600735369276c24a28b SHA512 01c64f9252eddec365801614582182d509f969fd83889d003a3081df96f92dc2f3b707231ef74357fdd049eedef726e95304d3ceec0c334504ca186ee5cd0f01 WHIRLPOOL 71f49ac7ab731414fa5b2d149cf754ebeabf851bed1fc4ee0826cdd6aa5f582b717e87863c0ee5871d541108e208758394c8d7cea5affc0e4a045059a8d232cc
EBUILD portage-2.3.6.ebuild 8661 SHA256 9590a689915eea31ffc5dd347154719d70cfb4b000a60e0f6e6294fe0c3e1df7 SHA512 53301757289cc37690020ac7b5379d026ff1e87f9d558c913eae213d0f33b75261045616c9259fe28684aa1031c27d4f58a52438e67eb91a97d186a80ad298a4 WHIRLPOOL c70770b2e9ac8b9af931d9f9918af82ac20eda198a33d9cc19c5d457701fe09c3cd5d45fb756457b05209cc0594c2b0b4efe3d544e1966d759c6a27fcf5b0743
-EBUILD portage-2.3.8.ebuild 8207 SHA256 dd61d45fccf60247d105993e2c73fb16a3ab59322add5701b636361b035ce6ec SHA512 24985286ffe9d4adc99aa65b26b4a15784b7edc84187a3a85b22751854f4845ea00573493a949f5aa6c3f270e4b52138a246006b71c9e6cc04ea402b820aee48 WHIRLPOOL e4ae75b7b4ee0ecf71328dcaebcfc4bb440e3c700156c2a17db3455b54066241285e8c625a5e2a2167c0d8ef31ec855d09219ab7cae1f5285057e95a1bb77165
+EBUILD portage-2.3.8.ebuild 8211 SHA256 39b5c3e56de53bb619091fe7a9a56e48ccc564fa281ba1e0d249532c96c2cfc5 SHA512 d803ac927d8a6f7fb00f629bca8a1bf94200d4ecbc83740afb32041b865dcfd13ca4329eda9693ceab20d2bcec30b132e23fd0b62cef262f246297f0d6ff748a WHIRLPOOL 22b8e205b1cd3683178eafc8359b3e8447279963cea00cb0276ff7a3e38eb3d438b992f48d8ad496288e3c8ebeaa95526711fa6651a8dbadc6cfe65fa344199a
EBUILD portage-9999.ebuild 7697 SHA256 c7d91c34e7fb25283f6ac634a00686273fd3f286ecfb9fc1ab3bc685ae8fd9c4 SHA512 6b8342034752512df0345d386f67c025b0ba15439ae5758783b16973d16b3b3b4d866abfb65bac2e26424e270294bebe26e43f12539ef141891b567dc0f000ce WHIRLPOOL 0b2b3f122d57a5c9d3dd63ea09c7a7bd05e1eaf298cd5018d400543cd825469e108fdd981c06518d24a37f7a339195fb01b04480143c0d9f93cce18093119c42
MISC ChangeLog 16208 SHA256 6196c5e06a7043cd46882ba3258ead8c490a89e650695d390b58f03d68639c0d SHA512 70e1da4a0b81f7c7fe902229d85ade010dfdb5e377f68577fd1f6d7ff75c92b6cc172fd3cbb171e18f40565e2679a14aab70b756e6eebce8f7076502ff9b2465 WHIRLPOOL 4b7dcff2f27e863ef276ee14ddb30adebd175c8a8913d1618c5fec36a9590d19d712878977b7c049f67730d15594a61cfb7839bdde35b30a697c540d59346706
MISC ChangeLog-2012 133873 SHA256 157a7eb13d4cf2e2c94bfcb7e91f218af1ea88f5ff20c24a50546950a9839c94 SHA512 1241f4ccd7b31bdd340649417257b0e95202992feb66e0cd4d41fc2d35bf0baeac19680f34a831d2fefce0c0fec03aa6e7a191f783e59cf9b93aaf266f010a3f WHIRLPOOL b027bdba0f5ccc1b3a2dc18df92d82b473af5e55536816b7177071c1ae1a89e4d50d42c2093fa1bbe28b92a42014fbefbfc9e7daa4e6426ebecbd5bffc3d479f
diff --git a/sys-apps/portage/portage-2.3.12.ebuild b/sys-apps/portage/portage-2.3.12.ebuild
index af287ccb8752..35e02ea5602d 100644
--- a/sys-apps/portage/portage-2.3.12.ebuild
+++ b/sys-apps/portage/portage-2.3.12.ebuild
@@ -131,7 +131,7 @@ python_prepare_all() {
einfo "Adjusting repos.conf ..."
sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-i cnf/repos.conf || die "sed failed"
- if prefix-guest ; then
+ if use prefix-guest ; then
sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
diff --git a/sys-apps/portage/portage-2.3.13.ebuild b/sys-apps/portage/portage-2.3.13.ebuild
index af287ccb8752..35e02ea5602d 100644
--- a/sys-apps/portage/portage-2.3.13.ebuild
+++ b/sys-apps/portage/portage-2.3.13.ebuild
@@ -131,7 +131,7 @@ python_prepare_all() {
einfo "Adjusting repos.conf ..."
sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-i cnf/repos.conf || die "sed failed"
- if prefix-guest ; then
+ if use prefix-guest ; then
sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
diff --git a/sys-apps/portage/portage-2.3.8.ebuild b/sys-apps/portage/portage-2.3.8.ebuild
index 1269aa43bf0e..12b9b2935fe9 100644
--- a/sys-apps/portage/portage-2.3.8.ebuild
+++ b/sys-apps/portage/portage-2.3.8.ebuild
@@ -131,7 +131,7 @@ python_prepare_all() {
einfo "Adjusting repos.conf ..."
sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-i cnf/repos.conf || die "sed failed"
- if prefix-guest ; then
+ if use prefix-guest ; then
sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index aacf334322b0..6eb65c730660 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -4,11 +4,12 @@ AUX smartd.systemd 258 SHA256 72ef7a3ad0e56a144a19aa2b05a0adb147c76cc95e19ac5eb2
AUX smartmontools-update-drivedb 42 SHA256 53a766a094ef63b925e2c3f8c08322b67c2ab40b1f2b84d414e5de4f6747aca8 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8 WHIRLPOOL 3dd62cd6e26a18c9fe5555a1d3feb2597eea6773c857a2cf559331486fc0ef2ef67a0bcb7d1e03b14631d0c8809daae7688d6e1f83f02e8867b0dc23dfcafb55
DIST smartmontools-6.4.tar.gz 822539 SHA256 eab75600c1eda9c34b13097db71138ab376f3dad8a6a4667fb4d1d081feb7a85 SHA512 366cd55ec668da1ca8a3d9ba79d5bee6e0c59032936b7f2f161f8fbb1c9f869c505d715cc10562b6241f808bb8b534feaf9d9fd752f6cb1593ee893611742adc WHIRLPOOL 72af8a0a4754bd75da9e98a008c64c083579fe27bdbd0655da81c8fe7a258dbc305cafd05f2f21d1954918ab8ff040cf1d54b916a1ce82fb8da64ba2e49b4de0
DIST smartmontools-6.5.tar.gz 855642 SHA256 89e8bb080130bc6ce148573ba5bb91bfe30236b64b1b5bbca26515d4b5c945bc SHA512 dca7a6363ab7280ee4197155025f624c978886dcc94fc47b524f6f849138b62c471e966c0d4bf59c7bba50519dc122264618e5ded80a406863ddd10b43d928d3 WHIRLPOOL 639bb5c847c4e0e0f7156b764140f4382f650826eb3d59db6a712468e944a40788c87bbbe0149b9a4d1480947492b007b5875969e611213409f247ff4383fbd6
+DIST smartmontools-6.6.tar.gz 903847 SHA256 51f43d0fb064fccaf823bbe68cf0d317d0895ff895aa353b3339a3b316a53054 SHA512 64bb533dac29f62ddd662a16a12c97df1af9cbac9ac526ce7af0b3bff9da49cf265a2030d91a7160452b56a67e80d7f34c9b4e45bbb320114f55695e2cb5cfaf WHIRLPOOL 7a34444977ae069ecf52f9de67077cf67d56a5888bec159ef7e2b19977f821fed8d8b5bca872c6df17cf12a9cb21c0df37dd9bbb44f295774ef93e93f9552bb3
EBUILD smartmontools-6.4-r1.ebuild 2534 SHA256 bfe58954437b13cc6fbf2a41cd1955dc67142ad5d86cf047f05ab2103c0c9e39 SHA512 1b0d02e5d4a493cd7926a93c92b3b78951f3580228ca19864113dbb09f12ce936866d50d528bdfb66f94b88b8f99660fa5d7181a81008b4badfaa7ef362a187c WHIRLPOOL 11a73a52a10bf7dedb37d3ff95fe6d69038f67ee25ee561c4fba2b2d44bd6fb958e814a6267a3dd2c709b37a53147a59bbe3e62a6b9129e79e44f61aa7fef9d0
EBUILD smartmontools-6.4.ebuild 1639 SHA256 8a750c037710240049acaf6759199fa9bcc8e2521c8eec155871854c410120c8 SHA512 c9b07c80d4e4355bc2c4ebce895efe35ed70d5a31eab3eb8298c1cc947a42cb1c4bb81d57cb46816619580067aeec246f49bc581a788abb7c912d0ef898f8448 WHIRLPOOL f74cbde502853bffc5c88d8ef14202c908a772bd1e9a6a779f3958282655e5ec049666a75d339647d6f5cd9e3697ca4eaa616bc5462f90588e33ecccb2cc9ecb
EBUILD smartmontools-6.5-r1.ebuild 4043 SHA256 1d843bfd187ad2f8a0c004faa6f91dc7f5c0709e65dc41a42a6420c3c7037f1a SHA512 7bc661356535cf00b2783f4a4bf323eae05c688d3db0ef81e7ccccb8d8aeeff24b2bbfca50b233d96b0f22d2aecf2d39f5bcd53d90b9076424b3c744f48341a5 WHIRLPOOL 7a1733fee7150b8850904ddb7fa0bda3a6905e09f084e5acdff4b0c84072e8bc1811f79c9fcc0a752ac2b84070fa9336475cfde87ef308672aefc8f76755d51e
-EBUILD smartmontools-6.5.ebuild 2726 SHA256 2a194cd89589b0a1be1be3ffe2ecce9c5740ff0069cb2cd209ccd92da895ee3c SHA512 15871d06fa4d9038ecdbb5d6e669526fd035e09cb43dee4fc9688fa3e9d1e5775ba46eb12c720d638ab5f7c0d808495f66c1fa7e404247f933c5c450411462cf WHIRLPOOL aa0fde02f7f195fddaf74a7a63a45c199b05d94a0c41a51d9d644f7ce7864527b5173e321f9fe0048ed3755716ae82dcca66279832bf8a4eb9c83f8488b7618a
-EBUILD smartmontools-9999.ebuild 4043 SHA256 1d843bfd187ad2f8a0c004faa6f91dc7f5c0709e65dc41a42a6420c3c7037f1a SHA512 7bc661356535cf00b2783f4a4bf323eae05c688d3db0ef81e7ccccb8d8aeeff24b2bbfca50b233d96b0f22d2aecf2d39f5bcd53d90b9076424b3c744f48341a5 WHIRLPOOL 7a1733fee7150b8850904ddb7fa0bda3a6905e09f084e5acdff4b0c84072e8bc1811f79c9fcc0a752ac2b84070fa9336475cfde87ef308672aefc8f76755d51e
+EBUILD smartmontools-6.6.ebuild 4094 SHA256 3829d523fe27d2fd5ffe702bf38f80546d2677a59ac61b3339ed2df6420c569f SHA512 3b284a9deccd3b3e9e02d38565bc2a844f3e9478f20811742c35e5bd57cec653471f742921f37a0a48f1d5a533e51eeda11455e6bfb5fbf93eaba478d3174f2a WHIRLPOOL 1ee4f564c93171335e562ee2aaf5cf9a71a1532efe7fb60c00bdabc1a446c6c25fa3914f08bd79b84f27242e7ec6f6223664fc09d842832a04b2bfb345081c6b
+EBUILD smartmontools-9999.ebuild 4094 SHA256 3829d523fe27d2fd5ffe702bf38f80546d2677a59ac61b3339ed2df6420c569f SHA512 3b284a9deccd3b3e9e02d38565bc2a844f3e9478f20811742c35e5bd57cec653471f742921f37a0a48f1d5a533e51eeda11455e6bfb5fbf93eaba478d3174f2a WHIRLPOOL 1ee4f564c93171335e562ee2aaf5cf9a71a1532efe7fb60c00bdabc1a446c6c25fa3914f08bd79b84f27242e7ec6f6223664fc09d842832a04b2bfb345081c6b
MISC ChangeLog 5978 SHA256 ddb411f5922e15aa38c9850ff7b341b4b285fe0052dde1710e85a026d1170a5c SHA512 1a482b6059ce1f49f2d1c468389b520963942e4d8b02e0e883452a024a9b1557ce0d33cdb365f170568ea69a9050f61482656579a5179be3ff0d61c84a039d7f WHIRLPOOL 8113cae9710da5e3a758cca8b8760c4c30aef3ae7f2881a1b9028f1ce15539389f1d50a72c97839fb9ffba15d7df94ab904080e8f47c0412491bacc30001c815
MISC ChangeLog-2015 20152 SHA256 f3ec99b8e802612e8f3dccf301c1f8ce46066fa26b1bf58c1eb34ec4e606fb3e SHA512 3969af254861ddb1bef5c129fc691732356ee56fd5ed29f3a76273593182c90d21239050c7d449560334976ae7d315d06fb25d3f815fe6c98b4ce93771b68d6c WHIRLPOOL 2c7d3763680d2572c2ee8f8f3c5a2da0bf6f602c06deb57d842ceea07f0a695d36ed92829166b4d29c10eb21090e65cc064d297d8f2a537c3a4aab93d0bcff8b
MISC metadata.xml 718 SHA256 774df2c60538f51bdb39e35b0fddeaed32fa18b0d11efe6a4eb52187d84b57c4 SHA512 a6a07e57bd09402839295ee859481d784445afadb12ffd644c6de3af41a4a763225f63d098c328193123d72cdad3b98e278256bb3e67b104015399def014ee54 WHIRLPOOL e0c7fcd97abb35522e21de6436f621f00f4ae8bbc6137c65f543e25bcda702a89329b6419d954ae59965b3d5dfb048f175746a43cfe6c23af8a95c2733518481
diff --git a/sys-apps/smartmontools/smartmontools-6.5.ebuild b/sys-apps/smartmontools/smartmontools-6.5.ebuild
deleted file mode 100644
index dfe72e1dfdd6..000000000000
--- a/sys-apps/smartmontools/smartmontools-6.5.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic systemd
-if [[ ${PV} == "9999" ]] ; then
- ESVN_REPO_URI="https://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools"
- ESVN_PROJECT="smartmontools"
- inherit subversion autotools
-else
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
-fi
-
-DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
-HOMEPAGE="https://www.smartmontools.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps minimal selinux static update_drivedb"
-
-DEPEND="
- caps? (
- static? ( sys-libs/libcap-ng[static-libs] )
- !static? ( sys-libs/libcap-ng )
- )
- selinux? (
- sys-libs/libselinux
- )"
-RDEPEND="${DEPEND}
- !minimal? ( virtual/mailx )
- selinux? ( sec-policy/selinux-smartmon )
-"
-
-src_prepare() {
- if [[ ${PV} == "9999" ]] ; then
- eautoreconf
- fi
-}
-
-src_configure() {
- use minimal && einfo "Skipping the monitoring daemon for minimal build."
- use static && append-ldflags -static
- # The build installs /etc/init.d/smartd, but we clobber it
- # in our src_install, so no need to manually delete it.
- myeconfargs=(
- --docdir="${EPREFIX}/usr/share/doc/${PF}"
- --with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292
- --with-initscriptdir="${EPREFIX}/etc/init.d"
- $(use_with caps libcap-ng)
- $(use_with selinux)
- $(systemd_with_unitdir)
- $(use_with update_drivedb update-smart-drivedb)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- local db_path="/var/db/${PN}"
-
- if use minimal ; then
- dosbin smartctl
- doman smartctl.8
- else
- default
- newinitd "${FILESDIR}"/smartd-r1.rc smartd
- newconfd "${FILESDIR}"/smartd.confd smartd
-
- keepdir "${db_path}"
- if use update_drivedb ; then
- # Move drivedb.h file out of PM's sight (bug #575292)
- mv "${ED}${db_path}/drivedb.h" "${T}" || die
-
- exeinto /etc/cron.monthly
- doexe "${FILESDIR}/${PN}-update-drivedb"
- fi
- fi
-}
-
-pkg_postinst() {
- if ! use minimal ; then
- local db_path="/var/db/${PN}"
-
- if [[ -f "${db_path}/drivedb.h" ]] ; then
- ewarn "WARNING! The existing copy of the drive database has been replaced with the version that"
- ewarn "was shipped with this release of ${PN}. You may want to update the"
- ewarn "database by: "
-
- if ! use update_drivedb ; then
- ewarn "re-merging ${PN} with USE='update_drivedb', then"
- fi
- ewarn "running the following command as root:"
- ewarn ""
- ewarn "/usr/sbin/update-smart-drivedb"
- fi
-
- if use update_drivedb ; then
- # Move drivedb.h to /var/db/${PN} (bug #575292)
- mv "${T}"/drivedb.h "${db_path}" || die
- fi
- fi
-}
diff --git a/sys-apps/smartmontools/smartmontools-6.6.ebuild b/sys-apps/smartmontools/smartmontools-6.6.ebuild
new file mode 100644
index 000000000000..4b26ca97c630
--- /dev/null
+++ b/sys-apps/smartmontools/smartmontools-6.6.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic systemd
+if [[ ${PV} == "9999" ]] ; then
+ ESVN_REPO_URI="https://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools"
+ ESVN_PROJECT="smartmontools"
+ inherit subversion
+else
+ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
+HOMEPAGE="https://www.smartmontools.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps +daemon selinux static update_drivedb"
+
+DEPEND="
+ caps? (
+ static? ( sys-libs/libcap-ng[static-libs] )
+ !static? ( sys-libs/libcap-ng )
+ )
+ kernel_FreeBSD? (
+ sys-freebsd/freebsd-lib[usb]
+ )
+ selinux? (
+ sys-libs/libselinux
+ )"
+RDEPEND="${DEPEND}
+ daemon? ( virtual/mailx )
+ selinux? ( sec-policy/selinux-smartmon )
+ update_drivedb? (
+ app-crypt/gnupg
+ || (
+ net-misc/curl
+ net-misc/wget
+ www-client/lynx
+ dev-vcs/subversion
+ )
+ )
+"
+
+REQUIRED_USE="( caps? ( daemon ) )"
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ use static && append-ldflags -static
+ # The build installs /etc/init.d/smartd, but we clobber it
+ # in our src_install, so no need to manually delete it.
+ myeconfargs=(
+ --docdir="${EPREFIX}/usr/share/doc/${PF}"
+ --with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292
+ --with-initscriptdir="${EPREFIX}/etc/init.d"
+ $(use_with caps libcap-ng)
+ $(use_with selinux)
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ $(use_with update_drivedb gnupg)
+ $(use_with update_drivedb update-smart-drivedb)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ local db_path="/var/db/${PN}"
+
+ if use daemon; then
+ default
+
+ newinitd "${FILESDIR}"/smartd-r1.rc smartd
+ newconfd "${FILESDIR}"/smartd.confd smartd
+ systemd_newunit "${FILESDIR}"/smartd.systemd smartd.service
+ else
+ dosbin smartctl
+ doman smartctl.8
+
+ local DOCS=( AUTHORS ChangeL* COPYING INSTALL NEWS README TODO )
+ einstalldocs
+ fi
+
+ if use update_drivedb ; then
+ if ! use daemon; then
+ dosbin "${S}"/update-smart-drivedb
+ fi
+
+ exeinto /etc/cron.monthly
+ doexe "${FILESDIR}/${PN}-update-drivedb"
+ fi
+
+ if use daemon || use update_drivedb; then
+ keepdir "${db_path}"
+
+ # Install a copy of the initial drivedb.h to /usr/share/${PN}
+ # so that we can access that file later in pkg_postinst
+ # even when dealing with binary packages (bug #575292)
+ insinto /usr/share/${PN}
+ doins "${S}"/drivedb.h
+ fi
+
+ # Make sure we never install drivedb.h into the db location
+ # of the acutal image so we don't record hashes because user
+ # can modify that file
+ rm -f "${ED%/}${db_path}/drivedb.h" || die
+
+ # Bug #622072
+ find "${ED%/}"/usr/share/doc -type f -exec chmod a-x '{}' \; || die
+}
+
+pkg_postinst() {
+ if use daemon || use update_drivedb; then
+ local initial_db_file="${EPREFIX%/}/usr/share/${PN}/drivedb.h"
+ local db_path="${EPREFIX%/}/var/db/${PN}"
+
+ if [[ ! -f "${db_path}/drivedb.h" ]] ; then
+ # No initial database found
+ cp "${initial_db_file}" "${db_path}" || die
+ einfo "Default drive database which was shipped with this release of ${PN}"
+ einfo "has been installed to '${db_path}'."
+ else
+ ewarn "WARNING: There's already a drive database in '${db_path}'!"
+ ewarn "Because we cannot determine if this database is untouched"
+ ewarn "or was modified by the user you have to manually update the"
+ ewarn "drive database:"
+ ewarn ""
+ ewarn "a) Replace '${db_path}/drivedb.h' by the database shipped with this"
+ ewarn " release which can be found in '${initial_db_file}', i.e."
+ ewarn ""
+ ewarn " cp \"${initial_db_file}\" \"${db_path}\""
+ ewarn ""
+ ewarn "b) Run the following command as root:"
+ ewarn ""
+ ewarn " /usr/sbin/update-smart-drivedb"
+
+ if ! use update_drivedb ; then
+ ewarn ""
+ ewarn "However, 'update-smart-drivedb' requires that you re-emerge ${PN}"
+ ewarn "with USE='update_drivedb'."
+ fi
+ fi
+ fi
+}
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index 499584db4c39..4b26ca97c630 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=6
inherit autotools flag-o-matic systemd
if [[ ${PV} == "9999" ]] ; then
@@ -35,6 +35,7 @@ RDEPEND="${DEPEND}
daemon? ( virtual/mailx )
selinux? ( sec-policy/selinux-smartmon )
update_drivedb? (
+ app-crypt/gnupg
|| (
net-misc/curl
net-misc/wget
@@ -63,6 +64,7 @@ src_configure() {
$(use_with caps libcap-ng)
$(use_with selinux)
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ $(use_with update_drivedb gnupg)
$(use_with update_drivedb update-smart-drivedb)
)
econf "${myeconfargs[@]}"
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 1fbb3a5d8420..ccad78fe9de8 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -21,7 +21,7 @@ DIST systemd-233.tar.gz 4660737 SHA256 8b3e99da3d4164b66581830a7f2436c0c8fe697b5
DIST systemd-235.tar.gz 6586406 SHA256 25811f96f5a027bf2a4c9383495cf5b623e385d84da31e473cf375932b3e9c52 SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993 WHIRLPOOL 05e50b31f7b3b1cd756abd1580dddae0e114953857564133784fc43b9ecd0e203ee534aaf76531ca7af5c43b03b9b73c6cbbbb1caf5afb17502555cc52fe06cd
EBUILD systemd-233-r4.ebuild 13626 SHA256 0dc86e550d767d12e945975267f4a6ff6c4a862f049253e966c9f2db699310f6 SHA512 3527bc62210aba9c50f663d8023440b73ae6185f1a90e6e31a48b6dcc13ac2dc0b312c433cbe74e942cb50ad894d4dd4212d81caf50d17971c9f965cae9535a0 WHIRLPOOL 8b4f723d82d0101b30838c5c21c89bdc1f23d18291ea3e5fd97f28357e8e35d6365725129cd4edda7d7b14f18b5e2cfe370971522a2d822f686fd61d1d08ab5d
EBUILD systemd-233-r5.ebuild 13669 SHA256 6ecc5fa2a1f6b7864113e59972a3bf150eb836ea43d06c5b4f84fd1cb6eae325 SHA512 722307b55c7621f119dee2e483bb7271d5a460945bd938adee6e679345a3549eaf060c96493b54e7a5bcb94a2821ce31949cfaeb5b1a43aeef36b673ecc39d7c WHIRLPOOL f1e5aabea3ff94eb2ee4576b5d34fb411c8bda9f01293b9579215b0e51a8103c93149befd25543c68d20855f0eff9804da7074449ec0db12b93d59b6cff4625f
-EBUILD systemd-233-r6.ebuild 13701 SHA256 c7be4562bb304c75ad812b64718bac7fae72996f1faafa570c3b80f14f61e3a4 SHA512 e2c5009cf2c88eff7560b7ae95032734a3afa1cc220afcf1c823bbfcd9c45df4ce8501ce8979d9f39ea2bec4c8de2c63c9e03e602dde0dcbf1cbecb2ccac2ce7 WHIRLPOOL 014d85330595c075c2f2c2aea3b1046ec9794de42caa596ea9f8b863039e31a2811e46d2a0bfa9c8074c0ce5f8878f4240b26f6129acf8c3ad12cf4ecae028d8
+EBUILD systemd-233-r6.ebuild 13700 SHA256 c904d0a2fdc4b366ad4ec28b8745454f210ee50b4657994a704d67de09cbd0b6 SHA512 fa4e5a7adb361da720263cbac6e3cdb177a37a16b1ae5ed828c4d106a8770d3a3b900a178bfc6198b645dc07980eb462d61a25dcac6d01d581ae2454e3d8711a WHIRLPOOL bb8214b8e5a19a8499971cbbf56af842c159e88c254f74c10b7be7172513ee8ea8330e2dff107db9b395d6a1b490c203ab153c6e10035bce58750b2afbb4896a
EBUILD systemd-235-r1.ebuild 13401 SHA256 bde936448268da8906d49ae5d0032cc496c38c32830414059a715af514c4c537 SHA512 240341672cc795a7bce946e5d44f9cc30f7099d6954b352fa13e142d185dd1fdf1bd665eb510355c6317c81d29e491cd7d41b5d7b28c8860f092767ea81b4ce1 WHIRLPOOL 6c707048afd34b9d7f51823661a833e312c0067bc38b6de9ed2e5afc51c3cc7134017adfa25ddc6de9aa368da7ec375238f33ef9c7b11cc0c05b37218402e635
EBUILD systemd-9999.ebuild 13196 SHA256 0e18985198be157839accf26bfc358a784ad2f3b9b596fd8636f461bb2320fb1 SHA512 90b0283fb318638e572edcd03d04ba4545ffef50ea877c97277b43db8ddb95b9784e834072a51aa3954c8088c4a946390f5f3b2d651fbc6c959c74058b606dc1 WHIRLPOOL f790ba07e2bdb3f99f905a5dfd027891b8337e661e0ca5f88cf414c165f3e7924f9ec584e8b6baf2d8bcf053b49583d0bcac2d19e7acdf0d175fb5a681c4bdea
MISC ChangeLog 20141 SHA256 b01beaf5824021996a73fbd2fb1749b390e13c13eb309d336934fc758a73fd57 SHA512 041097f0655b5464023c1365d6e2813def67ffcdf6d2ae28c48497280bf3ed1ba49fca24ef661cb30de4af97ab1cee53575b4f51cb985fcc700535f3d4432481 WHIRLPOOL 854111ca90d15661843afd4c026028949b7d6f8916e750a2537f22993225aef0ef4076c0ff3d818609a9b166ca926ba152e26d2e3d30510a646a5bcb6b5c04fb
diff --git a/sys-apps/systemd/systemd-233-r6.ebuild b/sys-apps/systemd/systemd-233-r6.ebuild
index c76b4fcf5883..60e2467db82b 100644
--- a/sys-apps/systemd/systemd-233-r6.ebuild
+++ b/sys-apps/systemd/systemd-233-r6.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
else
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz
!doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz )"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86"
+ KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86"
fi
PYTHON_COMPAT=( python{3_4,3_5,3_6} )
diff --git a/sys-apps/udevil/Manifest b/sys-apps/udevil/Manifest
index 922a9dc166e6..0ea18584a1c6 100644
--- a/sys-apps/udevil/Manifest
+++ b/sys-apps/udevil/Manifest
@@ -5,7 +5,7 @@ AUX udevil-0.4.4-stat.patch 230 SHA256 7d53ad7e72e2df27a1f1255ffc7300d439fc495b6
DIST udevil-0.4.4.tar.gz 477254 SHA256 ad2fd8375bd62622718a04235e9772119459089938dbb78e657955e595822b7c SHA512 adce4916e06d1cc4965521abbcbc2901e53930691167f431cb18e28d3ef8bde740e95a6a5f40dfc58dfd7b4b661b4475d3dd2b6174a5d7a55ae7c65629b82327 WHIRLPOOL 6bd7b5e6792e9f556113260a86f1aa29b795a0d7ddc577f86fd286d2a95515ac32e80bdfc4677a1aa59b0efcbddd8e40eec83db4e63439e8d1fead6061b64bec
EBUILD udevil-0.4.4-r1.ebuild 1922 SHA256 05af2aa6c95b622e93df2bb2dad452cab0bded25d5592ab7955ee75b6fcc2cdd SHA512 9ccb1b2e9fd377c02cedea8ee3e8bc7ee0b0ccf1647b733d34122969d24a284e40d251c3d0e294aeab1b830589d60621e793071e46d523bfe34ef12b5deacad9 WHIRLPOOL 7ddf3dcad74f00201448e8ae5524bd937f4010dcb78434052fe14979a942a91dc4c6d21e4c1d8983ca408e3521f3f591a477520fa0b751cc20882187e2059580
EBUILD udevil-0.4.4-r2.ebuild 1988 SHA256 f6ee9de831cb6f8235c3eeb7127f1d7039b0fd916e0cdea500ceb01d70882eae SHA512 6802bb465b172e4a42fad2366bcb4ae1ae05b0c48f772e0ca545df5ef8409ad21c1dad721a9838fea188e6ba4bb7e693d03f18fa73895d60074641ca1050ab8a WHIRLPOOL f94e9ff0a12f908ec9878fe21d3c4126e5da19513f4182ee573935919bf464a4e9c7895c681890ddaa7926f158a96bd164b02cdc911061150e28367b9ffd97c5
-EBUILD udevil-0.4.4-r3.ebuild 1990 SHA256 db92d55454f0d3df2b4a3d665f181463d41d87204fac38e49acfa9ac43c9c65c SHA512 b4781c12890498449630411fb44a73a39cf275eac2c90505e9b4fcd11240e53b22e844aed244deb47b29d159bb48508311335dbb7ebcc85074ebe954762eaa3c WHIRLPOOL ab1db4be3a38528703a2fca6ab79d15a90ae419a370b1dc1fbaf120308d3548c3404944f71ab2cf3727276c7a239bec1b54f2b3ba651a62f3c5af556df49eb02
+EBUILD udevil-0.4.4-r3.ebuild 1989 SHA256 17a69458fa121923fc18539979a4bf9b2c824f46721ff4d303d9069468c86f73 SHA512 dc1d1d46004a1633ecab5096383caa64e12df393ca79cc0688dbbbfbdb6bb55712435e3703d0970e387c494157bfe6085dc50b73f5ae7f440629f553d348c797 WHIRLPOOL 8590306b69dc85ba52757b9cc0751d004a54b745c782b51c08545fc4683d45c0fe15e0c026e904af3aa32e1ab5dbe8b6ff65292a2152405aaa5bd69c84243180
MISC ChangeLog 3959 SHA256 aa418acf34e960d98d918762b8a55e4d9e1f44f22661b48dc436aa797021ca26 SHA512 7d02c9bc4694df61743affdff7f8161628afa7419a83085e5c61f44923ed3486cb15d4b32789a67dd4667e06b4c4731f022463f17dd77579eb3c45e12cc2e1dd WHIRLPOOL 81ae4cbeda83abded9fb344c8228d80d231b7183d767346d5c380a71ac6b4a0c7b517524ff4f32857ad1b2cdf0e2235fc7e6b9b69e4d6f28f3fbb9e7a42edc07
MISC ChangeLog-2015 5481 SHA256 c86c51c498a065cdf33aba0962d5de945b648291970a0a6e5b9f55e3d6ac4f96 SHA512 02c89098f801288505b02525df2c7b234da43061c01dfe094055db625402511d4474d276c9005754ea2a4851b33a6982d7570a83c80fe398b431d7094afd427f WHIRLPOOL 2e26ffbb1994f1ae3b36dae8585efcc424c06ddd7a87d0da7c8e6115495528737c6c3fbf953e09c74659675d51a0dfff48a3c60e3f4dbc5ad210d2832753b816
MISC metadata.xml 453 SHA256 c833a6570cffb4afd017770ef61616f99c4a86d5ffb86d6426fc8dcd5fe664e8 SHA512 92443a23495fc46cfba373d4e712d2e530080b68e4ebceff8cec159d71bf581eb3ea66c1c85134f4edcce3740a22d7eb00d9c5339efa6445318bf2f98028d78a WHIRLPOOL cb33dcf0cebb2cf16160bbcad9a04ea6a1402f3fb54aa6a8c10376415cdd3627cf08f508edce8cdee851393395ca3af87a34b8e5e80dd7b575d37e7d17d75a2c
diff --git a/sys-apps/udevil/udevil-0.4.4-r3.ebuild b/sys-apps/udevil/udevil-0.4.4-r3.ebuild
index b59ad33132fd..fc14c4677245 100644
--- a/sys-apps/udevil/udevil-0.4.4-r3.ebuild
+++ b/sys-apps/udevil/udevil-0.4.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/IgnorantGuru/udevil/archive/${PV}.tar.gz -> ${P}.tar
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=app-shells/bash-4.0:*
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 67b8e161ffed..2c03cc7e18da 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -8,9 +8,9 @@ DIST util-linux-2.31.tar.xz 4503892 SHA256 f9be7cdcf4fc5c5064a226599acdda6bdf3d8
EBUILD util-linux-2.28.2.ebuild 5508 SHA256 dcbe429af2023147f49d14efc6079f77b640fd5098a50131bf4773404ac43c53 SHA512 7ce97d8d0325171d047508c3081fa3adadc79837f0821a4c5d63683e52353186328501d09bb0b884f3715ac443757a557c1c205f79c451a93f20c65035fe9516 WHIRLPOOL ce00e83c6e4a432f195d1997823bfb26b995cdf2b6c9b77f5b55b25ab5b1a3c9294e3985274c65b77b44bf1ded47ff7e7ec7b38d8f0dbf8e8811b0bdad741c96
EBUILD util-linux-2.29.2-r1.ebuild 6022 SHA256 6579bc49e505806dc5eb5511c204cbebcf1a72837544afd10ee0b2d187eb5cd0 SHA512 ede52a77a6cba1f06f6ae18ae64d2f836e6f5babc2d407409878867e7ef46614ffbd6f8267ceffb51d374d1ab87955d5ebfb3e92863078845aea06488dee6fe5 WHIRLPOOL f658c636808f16da62d95eb8805ad32a9b1c891256a9ec15a75ee81e1ed2db0a1a97e354a33571dbd8edcfb044eb828106a955f883015a173aa9d2ea3ebc8c63
EBUILD util-linux-2.30.1.ebuild 6073 SHA256 1c3a5ed5a02034c10b341cc69d20727399f13db6fde950487d57133b79cc0acc SHA512 f6f247c6119337f79e3ab559de54b35ff8c892633323606e687c957c8b2db540487c9b8b5b37554ae59e29946ad0cdac563cbc2ca7a99cb723c69398aac52366 WHIRLPOOL 86feef252078e51fb3cf1961c513998ae67c709355b19069f86255ec9d27155bc9b93334b5bbca28dfcbf596ba6e3d8e66a161134234ef14a30febc4ff90391b
-EBUILD util-linux-2.30.2.ebuild 6073 SHA256 1c3a5ed5a02034c10b341cc69d20727399f13db6fde950487d57133b79cc0acc SHA512 f6f247c6119337f79e3ab559de54b35ff8c892633323606e687c957c8b2db540487c9b8b5b37554ae59e29946ad0cdac563cbc2ca7a99cb723c69398aac52366 WHIRLPOOL 86feef252078e51fb3cf1961c513998ae67c709355b19069f86255ec9d27155bc9b93334b5bbca28dfcbf596ba6e3d8e66a161134234ef14a30febc4ff90391b
-EBUILD util-linux-2.31.ebuild 6095 SHA256 edcafd9c1c11ee19d546d0710f965009a48291f76f6f88e35eee8e2f27f995e0 SHA512 92133a47e65461d7fbe99479061ca1f49de6c647937ae2b08c35f504992a96d9e011976a13fda03c004d0834e80caa36f8e3d5c50438fc6dc35b53fbd3443f9b WHIRLPOOL cb4cbfa45498aad32228e904f436eadaf3a46ec29a45c183a5692c18a0ab8348dd00cfdebce5aa466d9c45a0bf229ec2f2bdf263f08e5b64f67a26712f3a6a9b
-EBUILD util-linux-9999.ebuild 6095 SHA256 edcafd9c1c11ee19d546d0710f965009a48291f76f6f88e35eee8e2f27f995e0 SHA512 92133a47e65461d7fbe99479061ca1f49de6c647937ae2b08c35f504992a96d9e011976a13fda03c004d0834e80caa36f8e3d5c50438fc6dc35b53fbd3443f9b WHIRLPOOL cb4cbfa45498aad32228e904f436eadaf3a46ec29a45c183a5692c18a0ab8348dd00cfdebce5aa466d9c45a0bf229ec2f2bdf263f08e5b64f67a26712f3a6a9b
+EBUILD util-linux-2.30.2.ebuild 6078 SHA256 7738fea05145e91be27914b58319ed949828da3f780c9e1da8d2ccfef95e9f24 SHA512 8bd2951332ea3d3d6ded756d5e5ef42aad87931e5e9899ceeb74df8b54dde5482ae1df7879907e01f19c476d37f397f895e6c6de3d982be4cb88c3d71bfd5b1f WHIRLPOOL daaeb35303054f047af8bf6427e0928f53185a6f37a88b96d4d28bf2347d4c61ed8072794e28b7a2f44432fad92c5329316b53d95caf111c1c6e2572b25dac32
+EBUILD util-linux-2.31.ebuild 6108 SHA256 5dbc92df3e0848fb368c92baa2b01af980f5df31331afdc33729f8c4bcd7f3a3 SHA512 206118f5ff5fa5d4b21c734965c967d5eaf5934d57aef26199196b9800b89f252d17d676d4c288846062a0ff3d5304edeeda005f7dd62a427b3f6e19bc049da1 WHIRLPOOL f1b97a364d43fb44ecf93155a76641a4df4a13ea5a8ac6ab5f28474cdbfcca7f367c77c0a1d48c5aa78d2126f012fb437ddb73ade438f7a221e39465e34b8996
+EBUILD util-linux-9999.ebuild 6108 SHA256 5dbc92df3e0848fb368c92baa2b01af980f5df31331afdc33729f8c4bcd7f3a3 SHA512 206118f5ff5fa5d4b21c734965c967d5eaf5934d57aef26199196b9800b89f252d17d676d4c288846062a0ff3d5304edeeda005f7dd62a427b3f6e19bc049da1 WHIRLPOOL f1b97a364d43fb44ecf93155a76641a4df4a13ea5a8ac6ab5f28474cdbfcca7f367c77c0a1d48c5aa78d2126f012fb437ddb73ade438f7a221e39465e34b8996
MISC ChangeLog 12932 SHA256 d8b36c6a1492c24f0ff0c47ed2ba5a83168ff61b7e608da5d6d2f7b1ded9dca5 SHA512 3af940e4798129722304739796183a7f185e2bb46653e68722ec99caced6b8bc4a985e54511fba0feae333036928fc8daf4a74c081f589acf9ff23f5efd4afa6 WHIRLPOOL 51a5399b50e743a84499d5c0363103beaa140effc16d37eeaaa3f86172037533a737d0124c5c2bdb95177fabdfc79ae110dc42e88e886cd2d103559b0964a2d9
MISC ChangeLog-2015 79222 SHA256 8f46bfb6fa3cf29ae15a63d9d482a64044196af6ccd6605972d93da5f9c78b37 SHA512 794cfd5f96e6da3247693c3adef7df1ce451c51e790d0b8f43ba221918053130bf39d4a8a3a8ef642ace608d979b604ba2c55ff348490b0dace4e6d9e53119b5 WHIRLPOOL af58c38f736bfe76bf98a72982165d72fb8523a4d5082d601179a1f93fa405e58c15854b899eb8614618bda566d2f682c7221a5c45984fadb4b555dbe7deb30b
MISC metadata.xml 947 SHA256 07970446e1e05479e7a582190e17aaab8190197b6771c779d89d177a8036b619 SHA512 3822f7f3ccd120bbc788c64db0b79d55ad892bed99d01f8e0988c57ca7277a1936e03dbffd2898e68a2b6da25c301bc2cafb1da9658cdbbdfee1c9fb65e1699c WHIRLPOOL d0d33c91a68b44b8d4207b7acaeb0d180591944cacd5fe8fc918b161f24c107d5c69a17831e620eeab7504364f725a427272ac242041ed9da289f3ed3196ac6f
diff --git a/sys-apps/util-linux/util-linux-2.30.2.ebuild b/sys-apps/util-linux/util-linux-2.30.2.ebuild
index c8d83a120f7f..2db8cbfc824b 100644
--- a/sys-apps/util-linux/util-linux-2.30.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.30.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit ltprune toolchain-funcs libtool flag-o-matic bash-completion-r1 \
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
pam python-single-r1 multilib-minimal systemd
MY_PV="${PV/_/-}"
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
else
[[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+ KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
fi
@@ -181,7 +181,7 @@ multilib_src_install_all() {
dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
# e2fsprogs-libs didnt install .la files, and .pc work fine
- prune_libtool_files
+ find "${ED}" -name "*.la" -delete || die
if use pam; then
newpamd "${FILESDIR}/runuser.pamd" runuser
diff --git a/sys-apps/util-linux/util-linux-2.31.ebuild b/sys-apps/util-linux/util-linux-2.31.ebuild
index 81b95f587ee9..6c4f284810f7 100644
--- a/sys-apps/util-linux/util-linux-2.31.ebuild
+++ b/sys-apps/util-linux/util-linux-2.31.ebuild
@@ -5,7 +5,7 @@ EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit ltprune toolchain-funcs libtool flag-o-matic bash-completion-r1 \
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
pam python-single-r1 multilib-minimal systemd
MY_PV="${PV/_/-}"
@@ -182,7 +182,7 @@ multilib_src_install_all() {
dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
# e2fsprogs-libs didnt install .la files, and .pc work fine
- prune_libtool_files
+ find "${ED}" -name "*.la" -delete || die
if use pam; then
newpamd "${FILESDIR}/runuser.pamd" runuser
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 81b95f587ee9..6c4f284810f7 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit ltprune toolchain-funcs libtool flag-o-matic bash-completion-r1 \
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
pam python-single-r1 multilib-minimal systemd
MY_PV="${PV/_/-}"
@@ -182,7 +182,7 @@ multilib_src_install_all() {
dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
# e2fsprogs-libs didnt install .la files, and .pc work fine
- prune_libtool_files
+ find "${ED}" -name "*.la" -delete || die
if use pam; then
newpamd "${FILESDIR}/runuser.pamd" runuser