Fix paths encoded in man pages #432668 by Diego Elio Pettenò.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 29 insertions, 17 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/Manifest b/sys-apps/smartmontools/Manifest
index 5f965377c434..25e0352b73ba 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -14,18 +14,24 @@ EBUILD smartmontools-5.39.1.ebuild 1510 SHA256 c142d94b4cd3336e6e3a21c7c1e4d6559
 EBUILD smartmontools-5.40.ebuild 1743 SHA256 1afd5d438263f3bc23198c5e1f99d8ffbcbbe04b3d4d58f8968f806cccfb2418 SHA512 d782a031365bf4972dd1631e7a5e0c68ac8505fa892821e43fe5a8775fa819469e6aaf528f1c2dc81c67e20b0623b4ec11552f267e136f18b8e5f4ffc94a8345 WHIRLPOOL 2c2850418e73403a21451f6d0f04db4ebc13c91a57b7bc24f3bb2a0c15148773b1ba925b732c7c3bf94f8b68fed9a590dcc60f1e26a5ed012d9132df15c29ce7
 EBUILD smartmontools-5.41-r1.ebuild 1697 SHA256 989605309d4ff98d4b54a216771fff3c19b65175020c7d15976d4c2d178e40e4 SHA512 3bfaf7d2846d56a30551f8f461fa21541d012f610cf012469e9cbeed593e56bc7d9c5e4070e62ad979f435c1205da9bc9ad2c40c509a01a7210db78588476911 WHIRLPOOL a7fdfc9d3ca179fe3bf576e1e8e9cc8886ec96a42e4bb4f62762c8af7a23def162b6843e7955a39ea9688f1127acaedf96bd5e24b2265914b1d1a69040c9c90c
 EBUILD smartmontools-5.42.ebuild 1705 SHA256 249715c5038d5dc3a533dae5b6fbf9b1343ccb01ad4d52d1156453dd8340b683 SHA512 380c3a51112f65280da268b339b8f230da7b4145430039c5dc8073dc456763069bf6794a1bd1fdceffda55ec2f08c767cbf494f6b4f3649a7a24a918d7cc45f2 WHIRLPOOL bdb160c54d4852fd6cf80dc520e82e031068fa5f56f84a7acaf5fa05e6d303a5f064b2bf4f84ea5b5e4a70327d104aca8a964d0084c7405730feb33ab18eba04
-EBUILD smartmontools-5.43.ebuild 1663 SHA256 c9875c5a094215cd049c30e5c49ee69418750901173c6d43ea72a8c5ca63c243 SHA512 c5f3ab0b7e9317f51b972a008ff8ce4c327e69baf69554fa260ba94f50106ec8fd94b2b6e8dbd77015589e9deff5df1f32bf62dbf9246c070f3bfcb2694fb218 WHIRLPOOL 9972fc93c9624eaea470b859ce280e28daab1caa3a3e4e1bb8756a74515582acb67c4b3c0159c85b7fbc21f9ac140334eb26b2d9ff6f7c1a9154025108cfebcd
-EBUILD smartmontools-9999.ebuild 1664 SHA256 9d7d59c3b226d43f275c614d8d86a992fbb9149f9d674cc53149b1aa62d542ea SHA512 5fe1e1a729fdf93f1bf52271f8d9178d449f451ca0ceb2897b1697f96dddbad0c8184dc03be7af623eba1d6a734f2de865ec4a0766d0a6ee2110d24ff1530b51 WHIRLPOOL a430e6887046caa53cb27097328fe34826d902e634161dd1a0c21e6604bfd27e2e1bbc9adaafca0613c6f292491842873317f36a5d96477ec59e0226ab1e5466
-MISC ChangeLog 15539 SHA256 c70fd1abada53d87489492ca7c79f94847e2beb757cf5bcf77442dcfaeac6ff1 SHA512 b864aa75dadb5d05381c83b0cf8b8fd4cd797a9f75126c992c1edb258929c6a394057629604ca3bea075a1a191228c7c4ecc355b43b7e694df139375b111460b WHIRLPOOL dd7461fe9c60b88dc7e5afad012f91e159390234d7f0a7cef02f5b9c02407c55a91cfdd799b58ac9d9ee7e64e0204c8bced52e26e2171b3fc290189c2c5e4269
+EBUILD smartmontools-5.43.ebuild 1758 SHA256 72ef01ec59bd129f0f2978246286ad0b924f5ca78e05c8e240e344e6289e895d SHA512 a45702a03b0fc1e15be21a48a4f5acb19fb043a442557b11b61ec9a22c59f1fce7329ec812588829faa51c7519ad0afac3fdc1c1b1ccde51e2dbe7878491cc69 WHIRLPOOL 9456e9a93ddd317e4d016a5c4deb36a5615faefc874455f147a90e84389476e4a2d2bcec889b20abdefd70f955d46ce69ff558cf4b95f7c3e293d8a764f2fccb
+EBUILD smartmontools-9999.ebuild 1759 SHA256 8b8d9a88e435489bb1e418a2671a464ac0e398de9833dece88dfeeff56873bdd SHA512 0e1d1539ad0e93e9eea2f8f600d1e3a8a30a389521987c9276c85185a1c5a3aac84577d5586a2d771947cee5f1091c52f95eaa8d41060c44cb5c7397609b4f0e WHIRLPOOL 074c9d107a000a4f681916ef98e47adbb94754c547477f06a2eac8e7f07727b9094095cb414345ba9ff3b96c533a600c534f0d671469a504f33cdcf639e351c4
+MISC ChangeLog 15711 SHA256 ac5cc67c067022bc3507ca6ba6041bec02e76d2fd6f001482c0e68d6238742c3 SHA512 e01cfabf0a318173cf48b276d59a6b56e423a3f64bc0f2827f4465aabea5f3b11c2f6e4d1a45411c957cf5c6356c1836aef5bc5c64e4f84a07e961f424f4782e WHIRLPOOL 5159d75c9602bd5700cd3936928e7b7582ed8cbd10d4ce5298208e472718c6f42326d2e690b65b4bacdf955b03a5a9d5143f2889459e91c41f47dd0dee23d355
 MISC metadata.xml 266 SHA256 bdf7da32dcd39df0f58aa02c64dfd1c5dda0ca1080c9b1001d8e110881a364eb SHA512 d2809f0df32816d12eb21b020e5edd68c28bf3ad42ca6c6ae24acb2a08afdf2ca85398b830de01a7377c10e929a8b0a3e74c4daa3c43710ad8b93a198ef2d049 WHIRLPOOL 3df4d283499b426832cc7964e0bb277614ec8fbe4ca5729dfc8dec28a85bdadba94076c845d898ab73e13ece50e7e595322fdfc095a6e4c8fa0b1706b1119e88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQMXM7AAoJEOeBhlrCAAWG0EIH/2wJeNebWQfSTjLecRseilby
-YBBV2Jzx3AyLwIN3yUapy7sdLBDSSCWhrR+4QPGzUN6l1QPZwaG7owFVV9AFr97U
-xu29IIg+5GqdM/x6MMDz7YkQ/FzJ1RlQLbFnHJ4Ra8KWnJLncECq2kIi3q4ZOYtM
-B8YERWRjmuT1mGpTrwgAA9NiZMH4quYYNrwGglVwFehGFsfPrwXtavhjDxmJIWNZ
-6W9rDHNKCTwhiWETAM/wZrFGz8UPSQ8VFRc3MfpzQqaFgBODl7BFA1P+lBnaQh0a
-Wl8HOOfoUu8QmPhSQUAqmxG2wrMcaU81Gd/Fu1pCIuFjRjOs3eMsKz6pJORpAuA=
-=QjOn
+iQIcBAEBCAAGBQJQOVbHAAoJELEHsLL7fEFWCYkP/3pPhscaQSKDkrZOw0a9i7C4
+e+CKh7uFcqmMsoz+y1Kwbx5CoT3INX190i3it1sq94KXQy6zSwwPgxeaMHGsgoFs
+MFvGZBptzFZUiJtUW3OpKGMvmPcWuxlfgjDoRAVSsmfCzjZK35sUbEEniVfpBjNh
+noJYbAWeB1kCgOHRd+MKU5tTgclxEWSkmc82R3GWHW15xYh9C4linnyjbEylX/eQ
+HxVNcOU6+pjsB+33d0QkwbiEwB2MSMFRuuovZtUG9hEgXF2tZXvd9BQ2wprY4528
+BhO7V9tES2VLtZ0QXneytw2kdClFn1+Xd19FwtZDaGBdU1Xq27Jk/+0Bo9UKmCfT
+oWYcbAk0x7zvIYQnyznhNCkkdsSCCDCUozvjN0PIbQZ8Y64yejf9MBXDAWlUoCDD
+hf5Nmm5xMrm63FC4un0GVYWIjdTAoAY9mfHIZXT16AENMhErj7Nm4jGiFK5o0NnW
+bGW7y91/EY8O56CmcrqqdBEooD0dFsdydcb/Kt9vFvuxgkOjB3lCJj+vc4Ypjwyi
+V6D6Zf7TsxHofOWCefVHSv0iEl/y7dTIgeMhYAkNYmyleqzjCqaO4UQJki6x7szL
+Nh6M1LR+lxZa6MwLD/o1r8e6vs6YkAHzdWuY4fRnh54tc1RNSlQGxujH6rGCsffK
+PEPgKMjzr2zHhZIQ4PzP
+=JNBP
 -----END PGP SIGNATURE-----
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