[gentoo-commits] repo/gentoo:master commit in: net-analyzer/cacti/

[Jeroen Roovers]

commit:     ec8fdbb1cb9b40b967189656f339479351268e5e
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 15 17:22:40 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Mar 15 17:23:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec8fdbb1

net-analyzer/cacti: Fix documentation installation path (bug #611342 by Juergen 
Rose).

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 net-analyzer/cacti/{cacti-1.0.4.ebuild => cacti-1.0.4-r1.ebuild} | 9 +++++----
 net-analyzer/cacti/{cacti-1.0.5.ebuild => cacti-1.0.5-r1.ebuild} | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/cacti/cacti-1.0.4.ebuild 
b/net-analyzer/cacti/cacti-1.0.4-r1.ebuild
similarity index 95%
rename from net-analyzer/cacti/cacti-1.0.4.ebuild
rename to net-analyzer/cacti/cacti-1.0.4-r1.ebuild
index f2641066e9c..71f1fc11394 100644
--- a/net-analyzer/cacti/cacti-1.0.4.ebuild
+++ b/net-analyzer/cacti/cacti-1.0.4-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+WEBAPP_MANUAL_SLOT="yes"
 inherit eutils webapp
 
 # Support for _p* in version.
@@ -11,6 +12,7 @@ DESCRIPTION="Cacti is a complete frontend to rrdtool"
 HOMEPAGE="http://www.cacti.net/";
 SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz";
 
+SLOT="${PV}"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="snmp doc"
@@ -38,13 +40,12 @@ src_prepare() {
 src_compile() { :; }
 
 src_install() {
-       webapp_src_preinst
-
        dodoc docs/{CHANGELOG,txt/manual.txt}
-       docinto html
-       doins -r docs/html/
+       dodoc -r docs/html/
        rm -rf docs
 
+       webapp_src_preinst
+
        edos2unix `find -type f -name '*.php'`
 
        dodir ${MY_HTDOCSDIR}

diff --git a/net-analyzer/cacti/cacti-1.0.5.ebuild 
b/net-analyzer/cacti/cacti-1.0.5-r1.ebuild
similarity index 95%
rename from net-analyzer/cacti/cacti-1.0.5.ebuild
rename to net-analyzer/cacti/cacti-1.0.5-r1.ebuild
index f2641066e9c..71f1fc11394 100644
--- a/net-analyzer/cacti/cacti-1.0.5.ebuild
+++ b/net-analyzer/cacti/cacti-1.0.5-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+WEBAPP_MANUAL_SLOT="yes"
 inherit eutils webapp
 
 # Support for _p* in version.
@@ -11,6 +12,7 @@ DESCRIPTION="Cacti is a complete frontend to rrdtool"
 HOMEPAGE="http://www.cacti.net/";
 SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz";
 
+SLOT="${PV}"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="snmp doc"
@@ -38,13 +40,12 @@ src_prepare() {
 src_compile() { :; }
 
 src_install() {
-       webapp_src_preinst
-
        dodoc docs/{CHANGELOG,txt/manual.txt}
-       docinto html
-       doins -r docs/html/
+       dodoc -r docs/html/
        rm -rf docs
 
+       webapp_src_preinst
+
        edos2unix `find -type f -name '*.php'`
 
        dodir ${MY_HTDOCSDIR}