| 1 |
radhermit 11/10/02 00:54:44 |
| 2 |
|
| 3 |
Modified: rrdtool-1.4.5-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Improve python support (bug #315085 by Arfrever). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha60/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: rrdtool-1.4.5-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- rrdtool-1.4.5-r1.ebuild 1 Oct 2011 06:59:07 -0000 1.2 |
| 23 |
+++ rrdtool-1.4.5-r1.ebuild 2 Oct 2011 00:54:44 -0000 1.3 |
| 24 |
@@ -1,11 +1,15 @@ |
| 25 |
# Copyright 1999-2011 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.5-r1.ebuild,v 1.2 2011/10/01 06:59:07 radhermit Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild,v 1.3 2011/10/02 00:54:44 radhermit Exp $ |
| 29 |
|
| 30 |
EAPI="3" |
| 31 |
|
| 32 |
GENTOO_DEPEND_ON_PERL="no" |
| 33 |
-inherit eutils flag-o-matic multilib perl-module autotools |
| 34 |
+PYTHON_DEPEND="python? 2" |
| 35 |
+SUPPORT_PYTHON_ABIS="1" |
| 36 |
+RESTRICT_PYTHON_ABIS="3.* *-jython" |
| 37 |
+ |
| 38 |
+inherit eutils distutils flag-o-matic multilib perl-module autotools |
| 39 |
|
| 40 |
DESCRIPTION="A system to store and display time-series data" |
| 41 |
HOMEPAGE="http://oss.oetiker.ch/rrdtool/" |
| 42 |
@@ -25,7 +29,6 @@ |
| 43 |
>=x11-libs/pango-1.17 |
| 44 |
lua? ( dev-lang/lua ) |
| 45 |
perl? ( dev-lang/perl ) |
| 46 |
- python? ( dev-lang/python ) |
| 47 |
ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 ) |
| 48 |
tcl? ( dev-lang/tcl )" |
| 49 |
|
| 50 |
@@ -33,11 +36,21 @@ |
| 51 |
dev-util/pkgconfig |
| 52 |
sys-apps/gawk" |
| 53 |
|
| 54 |
+DISTUTILS_SETUP_FILES=("bindings/python|setup.py") |
| 55 |
+ |
| 56 |
+pkg_setup() { |
| 57 |
+ use python && python_pkg_setup |
| 58 |
+} |
| 59 |
+ |
| 60 |
src_prepare() { |
| 61 |
epatch "${FILESDIR}/${PN}-1.3.8-configure.ac.patch" |
| 62 |
# epatch "${FILESDIR}/${PN}-1.4.3-ruby-ldflags.patch" |
| 63 |
epatch "${FILESDIR}/${PN}-1.4.4-dont-link-system-lib.patch" |
| 64 |
sed -i '/PERLLD/s:same as PERLCC:same-as-PERLCC:' configure.ac #281694 |
| 65 |
+ |
| 66 |
+ # Python bindings are built/installed manually |
| 67 |
+ sed -e "/^all-local:/s/ @COMP_PYTHON@//" -i bindings/Makefile.am |
| 68 |
+ |
| 69 |
eautoreconf |
| 70 |
} |
| 71 |
|
| 72 |
@@ -64,6 +77,11 @@ |
| 73 |
$(use_enable python) |
| 74 |
} |
| 75 |
|
| 76 |
+src_compile() { |
| 77 |
+ default |
| 78 |
+ use python && distutils_src_compile |
| 79 |
+} |
| 80 |
+ |
| 81 |
src_install() { |
| 82 |
emake DESTDIR="${D}" install || die "make install failed" |
| 83 |
|
| 84 |
@@ -82,12 +100,16 @@ |
| 85 |
perl_delete_packlist |
| 86 |
fi |
| 87 |
|
| 88 |
+ use python && distutils_src_install |
| 89 |
+ |
| 90 |
dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO |
| 91 |
|
| 92 |
find "${ED}"usr -name '*.la' -exec rm -f {} + |
| 93 |
} |
| 94 |
|
| 95 |
pkg_postinst() { |
| 96 |
+ use python && distutils_pkg_postinst |
| 97 |
+ |
| 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 |
@@ -100,3 +122,7 @@ |
| 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_postrm() { |
| 107 |
+ use python && distutils_pkg_postrm |
| 108 |
+} |
| 109 |
|
| 110 |
|
| 111 |
|
| 112 |
1.214 net-analyzer/rrdtool/ChangeLog |
| 113 |
|
| 114 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/ChangeLog?rev=1.214&view=markup |
| 115 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/ChangeLog?rev=1.214&content-type=text/plain |
| 116 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/ChangeLog?r1=1.213&r2=1.214 |
| 117 |
|
| 118 |
Index: ChangeLog |
| 119 |
=================================================================== |
| 120 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v |
| 121 |
retrieving revision 1.213 |
| 122 |
retrieving revision 1.214 |
| 123 |
diff -u -r1.213 -r1.214 |
| 124 |
--- ChangeLog 2 Oct 2011 00:00:11 -0000 1.213 |
| 125 |
+++ ChangeLog 2 Oct 2011 00:54:44 -0000 1.214 |
| 126 |
@@ -1,6 +1,9 @@ |
| 127 |
# ChangeLog for net-analyzer/rrdtool |
| 128 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 129 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.213 2011/10/02 00:00:11 radhermit Exp $ |
| 130 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.214 2011/10/02 00:54:44 radhermit Exp $ |
| 131 |
+ |
| 132 |
+ 02 Oct 2011; Tim Harder <radhermit@g.o> rrdtool-1.4.5-r1.ebuild: |
| 133 |
+ Improve python support (bug #315085 by Arfrever). |
| 134 |
|
| 135 |
02 Oct 2011; Tim Harder <radhermit@g.o> +rrdtool-1.0.50.ebuild: |
| 136 |
Re-add old version for FlowScan. |
Archives