diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/Manifest index 36fbc466a2..c8bdef502e 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/Manifest @@ -1 +1 @@ -DIST smartmontools-7.2.tar.gz 992256 BLAKE2B 9f671656e610404b0ab8b6ec51421b4046c64d16331cff821a8d9dbf34dd6c4be4fa63d3a2eaffe2aa869b09acf5f18b9c9750f76e33423710ef9166212e3a92 SHA512 d7e724295b5d53797b5e4136eea5f5cc278db81e4016ba65142438b8c68c54f85a32c582c147a1590b9bc8f74a58952bcb57b9923dd69d34582530a0985799ea +DIST smartmontools-7.3.tar.gz 1043932 BLAKE2B 119fd4aded487796ffd38050ddf8c7dd69cc6f3950650cb0315846292fd4a6594d949d87c51ed46717d6aaadb332c68f655514d1fde89600d51f3fe36f8df1ca SHA512 08afe8b0a6a39e742160cd4e4c03fc7aff7b1ae8681b906360f0932277dc99e361b7606b2373bdf42425cf9453480a5f4344bc040ebc2fa26a03bd52f02a6ac0 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/files/smartmontools-update-drivedb b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/files/smartmontools-update-drivedb index b7d1bb9524..270789c53d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/files/smartmontools-update-drivedb +++ b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/files/smartmontools-update-drivedb @@ -1,5 +1,3 @@ #!/bin/sh -# Hide stdout until a --quiet switch is added: -# https://github.com/smartmontools/smartmontools/issues/110 -/usr/sbin/update-smart-drivedb > /dev/null +/usr/sbin/update-smart-drivedb -q diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.3.ebuild similarity index 84% rename from sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.2-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.3.ebuild index 39f90ac1de..5ad4bb1c96 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.3.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit autotools flag-o-matic systemd -if [[ ${PV} == "9999" ]] ; then +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 + inherit autotools subversion else SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" fi DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation" @@ -22,13 +22,15 @@ IUSE="caps +daemon selinux static systemd +update-drivedb" DEPEND=" caps? ( - static? ( sys-libs/libcap-ng[static-libs] ) - !static? ( sys-libs/libcap-ng ) + static? ( sys-libs/libcap-ng:=[static-libs] ) + !static? ( sys-libs/libcap-ng:= ) ) selinux? ( - sys-libs/libselinux - )" -RDEPEND="${DEPEND} + sys-libs/libselinux:= + ) +" +RDEPEND=" + ${DEPEND} daemon? ( virtual/mailx ) selinux? ( sec-policy/selinux-smartmon ) systemd? ( sys-apps/systemd ) @@ -50,7 +52,10 @@ REQUIRED_USE="( src_prepare() { default - eautoreconf + + if [[ ${PV} == 9999 ]] ; then + eautoreconf + fi } src_configure() { @@ -110,16 +115,16 @@ src_install() { # 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 + rm -f "${ED}${db_path}/drivedb.h" || die # Bug #622072 - find "${ED%/}"/usr/share/doc -type f -exec chmod a-x '{}' \; || die + 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="${EROOT}usr/share/${PN}/drivedb.h" - local db_path="${EROOT}var/db/${PN}" + local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h" + local db_path="${EROOT}/var/db/${PN}" if [[ ! -f "${db_path}/drivedb.h" ]] ; then # No initial database found diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-9999.ebuild index c3e86bfcdb..9772d62599 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-9999.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit autotools flag-o-matic systemd -if [[ ${PV} == "9999" ]] ; then +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 + inherit autotools subversion else SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" fi DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation" @@ -22,13 +22,15 @@ IUSE="caps +daemon selinux static systemd +update-drivedb" DEPEND=" caps? ( - static? ( sys-libs/libcap-ng[static-libs] ) - !static? ( sys-libs/libcap-ng ) + static? ( sys-libs/libcap-ng:=[static-libs] ) + !static? ( sys-libs/libcap-ng:= ) ) selinux? ( - sys-libs/libselinux - )" -RDEPEND="${DEPEND} + sys-libs/libselinux:= + ) +" +RDEPEND=" + ${DEPEND} daemon? ( virtual/mailx ) selinux? ( sec-policy/selinux-smartmon ) systemd? ( sys-apps/systemd ) @@ -50,7 +52,10 @@ REQUIRED_USE="( src_prepare() { default - eautoreconf + + if [[ ${PV} == 9999 ]] ; then + eautoreconf + fi } src_configure() { @@ -110,16 +115,16 @@ src_install() { # 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 + rm -f "${ED}${db_path}/drivedb.h" || die # Bug #622072 - find "${ED%/}"/usr/share/doc -type f -exec chmod a-x '{}' \; || die + 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="${EROOT}usr/share/${PN}/drivedb.h" - local db_path="${EROOT}var/db/${PN}" + local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h" + local db_path="${EROOT}/var/db/${PN}" if [[ ! -f "${db_path}/drivedb.h" ]] ; then # No initial database found