1 |
abcd 10/05/26 17:03:57 |
2 |
|
3 |
Modified: rrdtool-1.4.2.ebuild ChangeLog |
4 |
Log: |
5 |
Bump to EAPI=3, add prefix keywords, clean up ebuild |
6 |
(Portage version: 2.2_rc67/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.5 net-analyzer/rrdtool/rrdtool-1.4.2.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild?rev=1.5&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild?rev=1.5&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild?r1=1.4&r2=1.5 |
14 |
|
15 |
Index: rrdtool-1.4.2.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild,v |
18 |
retrieving revision 1.4 |
19 |
retrieving revision 1.5 |
20 |
diff -u -r1.4 -r1.5 |
21 |
--- rrdtool-1.4.2.ebuild 25 Nov 2009 03:53:43 -0000 1.4 |
22 |
+++ rrdtool-1.4.2.ebuild 26 May 2010 17:03:56 -0000 1.5 |
23 |
@@ -1,9 +1,10 @@ |
24 |
-# Copyright 1999-2009 Gentoo Foundation |
25 |
+# Copyright 1999-2010 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild,v 1.4 2009/11/25 03:53:43 jer Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild,v 1.5 2010/05/26 17:03:56 abcd Exp $ |
29 |
|
30 |
-EAPI="2" |
31 |
+EAPI="3" |
32 |
|
33 |
+GENTOO_DEPEND_ON_PERL="no" |
34 |
inherit eutils flag-o-matic multilib perl-module autotools |
35 |
|
36 |
DESCRIPTION="A system to store and display time-series data" |
37 |
@@ -12,7 +13,7 @@ |
38 |
|
39 |
LICENSE="GPL-2" |
40 |
SLOT="0" |
41 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
42 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" |
43 |
IUSE="doc lua perl python ruby rrdcgi tcl" |
44 |
|
45 |
# This versions are minimal versions upstream tested with. |
46 |
@@ -31,10 +32,6 @@ |
47 |
DEPEND="${RDEPEND} |
48 |
sys-apps/gawk" |
49 |
|
50 |
-pkg_setup() { |
51 |
- use perl && perl-module_pkg_setup |
52 |
-} |
53 |
- |
54 |
src_prepare() { |
55 |
epatch "${FILESDIR}/rrdtool-1.3.8-configure.ac.patch" |
56 |
sed -i '/PERLLD/s:same as PERLCC:same-as-PERLCC:' configure.ac #281694 |
57 |
@@ -44,7 +41,10 @@ |
58 |
src_configure() { |
59 |
filter-flags -ffast-math |
60 |
|
61 |
- export RRDDOCDIR=/usr/share/doc/${PF} |
62 |
+ export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF} |
63 |
+ |
64 |
+ # to solve bug #260380 |
65 |
+ [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__ |
66 |
|
67 |
econf $(use_enable rrdcgi) \ |
68 |
$(use_enable lua) \ |
69 |
@@ -54,7 +54,7 @@ |
70 |
$(use_enable perl) \ |
71 |
$(use_enable perl perl-site-install) \ |
72 |
$(use_enable tcl) \ |
73 |
- $(use_with tcl tcllib /usr/$(get_libdir)) \ |
74 |
+ $(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \ |
75 |
$(use_enable python) |
76 |
} |
77 |
|
78 |
@@ -62,20 +62,15 @@ |
79 |
emake DESTDIR="${D}" install || die "make install failed" |
80 |
|
81 |
if ! use doc ; then |
82 |
- rm -rf "${D}"/usr/share/doc/${PF}/{html,txt} |
83 |
+ rm -rf "${ED}"usr/share/doc/${PF}/{html,txt} |
84 |
fi |
85 |
|
86 |
- use perl && fixlocalpod |
87 |
+ use perl && perl_delete_localpod |
88 |
|
89 |
dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO |
90 |
} |
91 |
|
92 |
-pkg_preinst() { |
93 |
- use perl && perl-module_pkg_preinst |
94 |
-} |
95 |
- |
96 |
pkg_postinst() { |
97 |
- use perl && perl-module_pkg_postinst |
98 |
ewarn "rrdtool dump 1.3 does emit completely legal xml. Basically this means that" |
99 |
ewarn "it contains an xml header and a DOCTYPE definition. Unfortunately this" |
100 |
ewarn "causes older versions of rrdtool restore to be unhappy." |
101 |
@@ -88,11 +83,3 @@ |
102 |
ewarn "upgraded from rrdtool-1.2.x and don't have any font installed to make" |
103 |
ewarn "lables visible, please, install some font, e.g. media-fonts/dejavu." |
104 |
} |
105 |
- |
106 |
-pkg_prerm() { |
107 |
- use perl && perl-module_pkg_prerm |
108 |
-} |
109 |
- |
110 |
-pkg_postrm() { |
111 |
- use perl && perl-module_pkg_postrm |
112 |
-} |
113 |
|
114 |
|
115 |
|
116 |
1.201 net-analyzer/rrdtool/ChangeLog |
117 |
|
118 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/ChangeLog?rev=1.201&view=markup |
119 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/ChangeLog?rev=1.201&content-type=text/plain |
120 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/ChangeLog?r1=1.200&r2=1.201 |
121 |
|
122 |
Index: ChangeLog |
123 |
=================================================================== |
124 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v |
125 |
retrieving revision 1.200 |
126 |
retrieving revision 1.201 |
127 |
diff -u -r1.200 -r1.201 |
128 |
--- ChangeLog 8 Dec 2009 19:45:37 -0000 1.200 |
129 |
+++ ChangeLog 26 May 2010 17:03:56 -0000 1.201 |
130 |
@@ -1,6 +1,9 @@ |
131 |
# ChangeLog for net-analyzer/rrdtool |
132 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
133 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.200 2009/12/08 19:45:37 ranger Exp $ |
134 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
135 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.201 2010/05/26 17:03:56 abcd Exp $ |
136 |
+ |
137 |
+ 26 May 2010; Jonathan Callen <abcd@g.o> rrdtool-1.4.2.ebuild: |
138 |
+ Bump to EAPI=3, add prefix keywords, clean up ebuild |
139 |
|
140 |
08 Dec 2009; Brent Baude <ranger@g.o> rrdtool-1.2.30.ebuild, |
141 |
rrdtool-1.3.8.ebuild: |