From 24fd814c326e282c4321965c31f341dad77e270d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Jan 2021 11:28:34 +0000 Subject: gentoo resync : 08.01.2021 --- sys-apps/smartmontools/Manifest | 8 +- sys-apps/smartmontools/metadata.xml | 2 +- sys-apps/smartmontools/smartmontools-7.1-r1.ebuild | 147 ++++++++++++++++++++ sys-apps/smartmontools/smartmontools-7.1.ebuild | 147 -------------------- sys-apps/smartmontools/smartmontools-7.2.ebuild | 151 +++++++++++++++++++++ sys-apps/smartmontools/smartmontools-9999.ebuild | 26 ++-- 6 files changed, 319 insertions(+), 162 deletions(-) create mode 100644 sys-apps/smartmontools/smartmontools-7.1-r1.ebuild delete mode 100644 sys-apps/smartmontools/smartmontools-7.1.ebuild create mode 100644 sys-apps/smartmontools/smartmontools-7.2.ebuild (limited to 'sys-apps/smartmontools') diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest index 1ddc5466e766..93c51edacdbc 100644 --- a/sys-apps/smartmontools/Manifest +++ b/sys-apps/smartmontools/Manifest @@ -2,6 +2,8 @@ AUX smartd-r1.rc 614 BLAKE2B ec80520e3c8762e39d89eadc63e16bb9d9d4f7dec84507faeba AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6cc0ccba2baaff7cf48acffea0a4becb47d470c691855a046617d3f8e934eeebd54df7030ef4877 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437 AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a29450201f312369acdbf429c8e0c7c4162de8854ca945b2082cb734dbbbb1326df39e4fb1adf271f215329bd2105 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8 DIST smartmontools-7.1.tar.gz 971468 BLAKE2B de3e1b10997903cb9bf6107f1bd1be9587b66af08a94e368dc9ed3aa6d69ba93d6b41d1ba60076275603702d9d0b47b26e376d3c9f020eb18fde5af4b686485b SHA512 440b2a957da10d240a8ef0008bd3358b83adb9eaca0f8d3e049b25d56a139c61dcd0bb4b27898faef6f189a27e159bdca3331e52e445c0eebf35e5d930f9e295 -EBUILD smartmontools-7.1.ebuild 4042 BLAKE2B 26d0154010e29e986f8c08953b1c9b6bd949957bb1011ba0f473b63270f29dd2682263a8d1919eec423c0af3496e87127774566f155da3f90ca080e53422a7cc SHA512 e7f302e6564a4f3f16bb0d29900c1f37f22811b38f13a144bdfbb42360aa777321c2ee64c529d7793de68f494f48ee28bc26b92b0226c4a1a2859f98132a263a -EBUILD smartmontools-9999.ebuild 4050 BLAKE2B a8ce8d55bcf3dda65d4e31f71feedc4f867a985e74dccdb4da9aff8e7cbfc80db1bbd7aeacb3809f154507ac4aa05b40fde8e865182169733cdb6dd1fc3dd058 SHA512 b84bddbec5e896f9fa60600d5a60c142ec6b23482fbf8239bb74297eab20c231850aa2c63cfd6b2a3be29db7f278417d7eed72e0f43cf4556628a53d1051220f -MISC metadata.xml 628 BLAKE2B 1998d18fb38795b682ec935d8e994a93176e6bff49db77adcfc6a168e297515b7ac6a121b1acbb0743182d7dd4696b898cf6a8eeda0a290e0c75598036ef4951 SHA512 86ac56fbb2b15c7c4fa4e80607b5a3ceefd7300ade482d6d6adaf8e22c7a95797e10b1a03aacb34cf07c02e7d0fbd8437954d1c94c395afedc1c61c24202e3d6 +DIST smartmontools-7.2.tar.gz 992256 BLAKE2B 9f671656e610404b0ab8b6ec51421b4046c64d16331cff821a8d9dbf34dd6c4be4fa63d3a2eaffe2aa869b09acf5f18b9c9750f76e33423710ef9166212e3a92 SHA512 d7e724295b5d53797b5e4136eea5f5cc278db81e4016ba65142438b8c68c54f85a32c582c147a1590b9bc8f74a58952bcb57b9923dd69d34582530a0985799ea +EBUILD smartmontools-7.1-r1.ebuild 4042 BLAKE2B 46c72078bf69257c1a9658337d49bbb3da43387ca8a05679f552c3879caad128e3c63c045a524f4d93d11b51893577b118a7cf6bd59b4b93922914a297fd7a28 SHA512 223826860e45decc575cb74465f3f6a5e503749bfd430a39f938e490391ca410ce8d9f0dd894c6acf137d8dc8fffc16fcce45eb05d123cdb9b7b41c27618653f +EBUILD smartmontools-7.2.ebuild 4115 BLAKE2B a2d0de1ebe9e37cf4d58c6dd4477ba572219eea5b48f5a524aa0eade68e03bc781feef5bd93be3a13862cc4cf41a731736008b3eb1763edcab6a11fd4ac4fdc4 SHA512 d2e932dd464c65f1b402f0d615c121b195a4da4e843b1a69c30bb042ea773f08d0179d715b389e7e6a85a59a156fba88e418f4c17770afcafcf3366796bc4233 +EBUILD smartmontools-9999.ebuild 4115 BLAKE2B a2d0de1ebe9e37cf4d58c6dd4477ba572219eea5b48f5a524aa0eade68e03bc781feef5bd93be3a13862cc4cf41a731736008b3eb1763edcab6a11fd4ac4fdc4 SHA512 d2e932dd464c65f1b402f0d615c121b195a4da4e843b1a69c30bb042ea773f08d0179d715b389e7e6a85a59a156fba88e418f4c17770afcafcf3366796bc4233 +MISC metadata.xml 628 BLAKE2B a619effbf00a8b83df53ae6b7e191ed97af2e996ba3f025328021b67b49a167c3eae0be016b1fe106bef263a8b29e5add385f067efaef18ea07da451ede84ebc SHA512 ae5c3076410f080d87db55935a6254768ed07faf5bafed2ed9bb9d469b263b6bd8d418a1e50d1030aa6873f0c82014887ef7f2df8e032b6487f782f72a1ea54e diff --git a/sys-apps/smartmontools/metadata.xml b/sys-apps/smartmontools/metadata.xml index cb72f5108e40..4ee89aff231c 100644 --- a/sys-apps/smartmontools/metadata.xml +++ b/sys-apps/smartmontools/metadata.xml @@ -8,7 +8,7 @@ Build against sys-libs/libcap-ng to allow smartd to drop its privileges. Install the monitoring daemon (smartd) and associated scripts. - Install a script to update the drivedb file. + Install a script to update the drivedb file. smartmontools diff --git a/sys-apps/smartmontools/smartmontools-7.1-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.1-r1.ebuild new file mode 100644 index 000000000000..158bfd6444fc --- /dev/null +++ b/sys-apps/smartmontools/smartmontools-7.1-r1.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2021 Gentoo Authors +# 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 ~amd64-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 systemd update-drivedb" + +DEPEND=" + caps? ( + static? ( sys-libs/libcap-ng[static-libs] ) + !static? ( sys-libs/libcap-ng ) + ) + selinux? ( + sys-libs/libselinux + )" +RDEPEND="${DEPEND} + daemon? ( virtual/mailx ) + selinux? ( sec-policy/selinux-smartmon ) + systemd? ( sys-apps/systemd ) + 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=( + --with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292 + --with-initscriptdir="${EPREFIX}/etc/init.d" + #--with-smartdscriptdir="${EPREFIX}/usr/share/${PN}" + $(use_with caps libcap-ng) + $(use_with selinux) + $(use_with systemd libsystemd) + $(use_with update-drivedb gnupg) + $(use_with update-drivedb update-smart-drivedb) + $(usex systemd "--with-systemdsystemunitdir=$(systemd_get_systemunitdir)" '') + ) + 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 + 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="${EROOT}/usr/share/${PN}/drivedb.h" + local db_path="${EROOT}/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-7.1.ebuild b/sys-apps/smartmontools/smartmontools-7.1.ebuild deleted file mode 100644 index 0b1811bc1f8c..000000000000 --- a/sys-apps/smartmontools/smartmontools-7.1.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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 ~amd64-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 systemd update_drivedb" - -DEPEND=" - caps? ( - static? ( sys-libs/libcap-ng[static-libs] ) - !static? ( sys-libs/libcap-ng ) - ) - selinux? ( - sys-libs/libselinux - )" -RDEPEND="${DEPEND} - daemon? ( virtual/mailx ) - selinux? ( sec-policy/selinux-smartmon ) - systemd? ( sys-apps/systemd ) - 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=( - --with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292 - --with-initscriptdir="${EPREFIX}/etc/init.d" - #--with-smartdscriptdir="${EPREFIX}/usr/share/${PN}" - $(use_with caps libcap-ng) - $(use_with selinux) - $(use_with systemd libsystemd) - $(use_with update_drivedb gnupg) - $(use_with update_drivedb update-smart-drivedb) - $(usex systemd "--with-systemdsystemunitdir=$(systemd_get_systemunitdir)" '') - ) - 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 - 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="${EROOT}/usr/share/${PN}/drivedb.h" - local db_path="${EROOT}/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-7.2.ebuild b/sys-apps/smartmontools/smartmontools-7.2.ebuild new file mode 100644 index 000000000000..bcbd184c16d7 --- /dev/null +++ b/sys-apps/smartmontools/smartmontools-7.2.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2021 Gentoo Authors +# 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 ~amd64-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 systemd +update-drivedb" + +DEPEND=" + caps? ( + static? ( sys-libs/libcap-ng[static-libs] ) + !static? ( sys-libs/libcap-ng ) + ) + selinux? ( + sys-libs/libselinux + )" +RDEPEND="${DEPEND} + daemon? ( virtual/mailx ) + selinux? ( sec-policy/selinux-smartmon ) + systemd? ( sys-apps/systemd ) + update-drivedb? ( + app-crypt/gnupg + || ( + net-misc/curl + net-misc/wget + www-client/lynx + dev-vcs/subversion + ) + ) +" + +REQUIRED_USE="( + caps? ( daemon ) + static? ( !systemd ) +)" + +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=( + --with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292 + --with-initscriptdir="${EPREFIX}/etc/init.d" + #--with-smartdscriptdir="${EPREFIX}/usr/share/${PN}" + $(use_with caps libcap-ng) + $(use_with selinux) + $(use_with systemd libsystemd) + $(use_with update-drivedb gnupg) + $(use_with update-drivedb update-smart-drivedb) + $(usex systemd "--with-systemdsystemunitdir=$(systemd_get_systemunitdir)" '') + ) + econf "${myeconfargs[@]}" +} + +src_install() { + local db_path="/var/db/${PN}" + insopts -m0644 -p # preserve timestamps + + if use daemon; then + default + + newinitd "${FILESDIR}"/smartd-r1.rc smartd + newconfd "${FILESDIR}"/smartd.confd smartd + 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="${EROOT}/usr/share/${PN}/drivedb.h" + local db_path="${EROOT}/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 9c4544209c16..bcbd184c16d7 100644 --- a/sys-apps/smartmontools/smartmontools-9999.ebuild +++ b/sys-apps/smartmontools/smartmontools-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -18,7 +18,7 @@ HOMEPAGE="https://www.smartmontools.org" LICENSE="GPL-2" SLOT="0" -IUSE="caps +daemon selinux static systemd update_drivedb" +IUSE="caps +daemon selinux static systemd +update-drivedb" DEPEND=" caps? ( @@ -32,7 +32,7 @@ RDEPEND="${DEPEND} daemon? ( virtual/mailx ) selinux? ( sec-policy/selinux-smartmon ) systemd? ( sys-apps/systemd ) - update_drivedb? ( + update-drivedb? ( app-crypt/gnupg || ( net-misc/curl @@ -43,7 +43,10 @@ RDEPEND="${DEPEND} ) " -REQUIRED_USE="( caps? ( daemon ) )" +REQUIRED_USE="( + caps? ( daemon ) + static? ( !systemd ) +)" src_prepare() { default @@ -61,8 +64,8 @@ src_configure() { $(use_with caps libcap-ng) $(use_with selinux) $(use_with systemd libsystemd) - $(use_with update_drivedb gnupg) - $(use_with update_drivedb update-smart-drivedb) + $(use_with update-drivedb gnupg) + $(use_with update-drivedb update-smart-drivedb) $(usex systemd "--with-systemdsystemunitdir=$(systemd_get_systemunitdir)" '') ) econf "${myeconfargs[@]}" @@ -70,6 +73,7 @@ src_configure() { src_install() { local db_path="/var/db/${PN}" + insopts -m0644 -p # preserve timestamps if use daemon; then default @@ -84,7 +88,7 @@ src_install() { einstalldocs fi - if use update_drivedb ; then + if use update-drivedb ; then if ! use daemon; then dosbin "${S}"/update-smart-drivedb fi @@ -93,7 +97,7 @@ src_install() { doexe "${FILESDIR}/${PN}-update-drivedb" fi - if use daemon || use update_drivedb; then + if use daemon || use update-drivedb; then keepdir "${db_path}" # Install a copy of the initial drivedb.h to /usr/share/${PN} @@ -113,7 +117,7 @@ src_install() { } pkg_postinst() { - if use daemon || use update_drivedb; then + if use daemon || use update-drivedb; then local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h" local db_path="${EROOT}/var/db/${PN}" @@ -137,10 +141,10 @@ pkg_postinst() { ewarn "" ewarn " /usr/sbin/update-smart-drivedb" - if ! use update_drivedb ; then + if ! use update-drivedb ; then ewarn "" ewarn "However, 'update-smart-drivedb' requires that you re-emerge ${PN}" - ewarn "with USE='update_drivedb'." + ewarn "with USE='update-drivedb'." fi fi fi -- cgit v1.2.3