Avoid installing example for non-installed feature rrdcgi, helps to please shebang...

Package-Manager: portage-2.2.00.15842-prefix/cvs/SunOS i386

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 22685f66de3113d79d9bf18bb04a0ad827fcb3d0..d3b5d089b596b8452bf4be57daad6dd99484fe2b 100644 (file)
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.204 2010/05/29 16:28:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.205 2010/06/08 11:55:01 grobian Exp $
+
+  08 Jun 2010; Fabian Groffen <grobian@gentoo.org> rrdtool-1.4.3.ebuild:
+  Avoid installing examples for non-installed features, helps to please
+  shebang check from Prefix Portage.
 
   29 May 2010; Jeroen Roovers <jer@gentoo.org> rrdtool-1.4.3.ebuild,
   +files/rrdtool-1.4.3-ruby-ldflags.patch:

diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index bfa5598e36a98704a3d3a02fd5192c9f5431da7f..90ddf4d3d446b5c28b4dc230d6b745d6d7e4cea6 100644 (file)
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -17,6 +17,6 @@ EBUILD rrdtool-1.3.8-r1.ebuild 2791 RMD160 f2773ddce102fddb879420fa1231af599c349
 EBUILD rrdtool-1.3.8.ebuild 2602 RMD160 f7bee371d1410101e74c6152885ba58a9487bc40 SHA1 5fa8c902b737ecda779c4bf14fc1074e0b50e4ff SHA256 044d1cc514e3d07595f81bfe53a7729f80718f5d25dcbaeed39c9203ce42a0a1
 EBUILD rrdtool-1.3.9.ebuild 2776 RMD160 bb5a72c574c337bfebdadf2f11bb3da594b0ebf3 SHA1 18a3a7b9f8877c9747e4c9cc73d482c5280d7da8 SHA256 58bb63b2b6903945414c85015306561e6be685c9b7b307dc2e88f76d66af7141
 EBUILD rrdtool-1.4.2.ebuild 2773 RMD160 1925709cb77ef0b782dd9af09b21e3ab1f0ac8ed SHA1 a2eb17dcfea2b211e41a64e1fe745a10ddc94676 SHA256 2fc595a30197c34ad3a8f19e300223d1ea9dd503a5fe7582a6e7b97be16af37d
-EBUILD rrdtool-1.4.3.ebuild 2816 RMD160 a85061bfe6a1013e91464a1184b2bb980e9bd866 SHA1 382a3ddfb66075c0facef8a412d3c975d9ae9729 SHA256 a475b8dfc3905ff549d0dd7e7abbb721cc0f7a343503bcd9a3e49c29d2c6e52f
-MISC ChangeLog 30766 RMD160 0b06c31f6d3edfdaf73566147504f22cb4a30bdc SHA1 bfcfaae13f65413696ff0e9853ca087285d46c22 SHA256 1345b4303ddee70e34e24dbc9ecc39dbb0136a3342afa94ced81ae8ba3f4d1c2
+EBUILD rrdtool-1.4.3.ebuild 2995 RMD160 db6f8d3041175e39fbc1452590090cf8fb0a19ef SHA1 e6beb54c20f9368982ebd30a52494d20f4d74b8d SHA256 742837bcf2d4f13390dbf635b7d0fb36b0fbbdbc2623562379127e421390870f
+MISC ChangeLog 30953 RMD160 7c18f1d7b78dfff427dc04a8bd71af6437c2e5ed SHA1 08c678eb3c5befc82514f601a6d67484a60ab94f SHA256 19e048d5e12a111d547e433148cacfccfbf26b6140a70c99b0531f75a48f8d4b
 MISC metadata.xml 376 RMD160 78da9054230eb8ed5474d75d1a0f7419eb1e45f9 SHA1 b7645e63557b4d5049032390ee07d86c5411fc96 SHA256 ccdb09cfa58f274722a7b61fb666c96c5d1c55d828fff44abc9415e56c056bb7

diff --git a/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild
index 48f81c6d3b8a8343c627453ddaf13252fc1bf6e1..c70983abcbce13dbd2ec2e4645632767ffebc67f 100644 (file)
--- a/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild,v 1.2 2010/05/29 16:28:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild,v 1.3 2010/06/08 11:55:01 grobian Exp $
 
 EAPI="3"
 
@@ -67,6 +67,12 @@ src_install() {
                rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
        fi
 
+       if use !rrdcgi ; then
+               # uses rrdcgi, causes invalid shebang error in Prefix, useless
+               # without rrdcgi installed
+               rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
+       fi
+
        if use perl ; then
                perl_delete_localpod
                perl_delete_packlist