summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-08-25 22:50:24 +0000
committerMike Frysinger <vapier@gentoo.org>2012-08-25 22:50:24 +0000
commitb3e77802c247107a2414aba887ae9640d3d026fb (patch)
tree860769bdea28a7253b3535a2927cd8e97a9fac04 /sys-apps
parenttypo in src_uri, wrt to bug #432768 (diff)
downloadgentoo-2-b3e77802c247107a2414aba887ae9640d3d026fb.tar.gz
gentoo-2-b3e77802c247107a2414aba887ae9640d3d026fb.tar.bz2
gentoo-2-b3e77802c247107a2414aba887ae9640d3d026fb.zip
Fix paths encoded in man pages #432668 by Diego Elio Pettenò.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/smartmontools/ChangeLog6
-rw-r--r--sys-apps/smartmontools/smartmontools-5.43.ebuild7
-rw-r--r--sys-apps/smartmontools/smartmontools-9999.ebuild7
3 files changed, 13 insertions, 7 deletions
diff --git a/sys-apps/smartmontools/ChangeLog b/sys-apps/smartmontools/ChangeLog
index 8aa5f624ceb2..dcc213b3776a 100644
--- a/sys-apps/smartmontools/ChangeLog
+++ b/sys-apps/smartmontools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/smartmontools
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/ChangeLog,v 1.116 2012/08/19 23:13:57 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/ChangeLog,v 1.117 2012/08/25 22:50:24 vapier Exp $
+
+ 25 Aug 2012; Mike Frysinger <vapier@gentoo.org> smartmontools-5.43.ebuild,
+ smartmontools-9999.ebuild:
+ Fix paths encoded in man pages #432668 by Diego Elio Pettenò.
19 Aug 2012; Christoph Junghans <ottxor@gentoo.org> smartmontools-5.43.ebuild,
smartmontools-9999.ebuild:
diff --git a/sys-apps/smartmontools/smartmontools-5.43.ebuild b/sys-apps/smartmontools/smartmontools-5.43.ebuild
index 32a7dbee6a50..892961cb3099 100644
--- a/sys-apps/smartmontools/smartmontools-5.43.ebuild
+++ b/sys-apps/smartmontools/smartmontools-5.43.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-5.43.ebuild,v 1.4 2012/08/19 23:13:57 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-5.43.ebuild,v 1.5 2012/08/25 22:50:24 vapier Exp $
EAPI="3"
@@ -37,9 +37,11 @@ src_prepare() {
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.
econf \
--with-docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --with-initscriptdir="/toss-it-away" \
+ --with-initscriptdir="${EPREFIX}/etc/init.d" \
$(use_with caps libcap-ng) \
$(use_with selinux) \
$(systemd_with_unitdir)
@@ -51,7 +53,6 @@ src_install() {
doman smartctl.8
else
emake install DESTDIR="${D}" || die
- rm -rf "${ED}"/toss-it-away
newinitd "${FILESDIR}"/smartd.rc smartd
newconfd "${FILESDIR}"/smartd.confd smartd
fi
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index de21546ffb33..5137777e903f 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-9999.ebuild,v 1.11 2012/08/19 23:13:57 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-9999.ebuild,v 1.12 2012/08/25 22:50:24 vapier Exp $
EAPI="3"
@@ -37,9 +37,11 @@ src_prepare() {
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.
econf \
--with-docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --with-initscriptdir="/toss-it-away" \
+ --with-initscriptdir="${EPREFIX}/etc/init.d" \
$(use_with caps libcap-ng) \
$(use_with selinux) \
$(systemd_with_unitdir)
@@ -51,7 +53,6 @@ src_install() {
doman smartctl.8
else
emake install DESTDIR="${D}" || die
- rm -rf "${ED}"/toss-it-away
newinitd "${FILESDIR}"/smartd.rc smartd
newconfd "${FILESDIR}"/smartd.confd smartd
fi