diff options
Diffstat (limited to 'net-analyzer/rrdtool')
| -rw-r--r-- | net-analyzer/rrdtool/ChangeLog | 5 | ||||
| -rw-r--r-- | net-analyzer/rrdtool/Manifest | 18 | ||||
| -rw-r--r-- | net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild | 32 |
3 files changed, 42 insertions, 13 deletions
diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog index f10994c6f2d6..fa3b08843c3d 100644 --- a/net-analyzer/rrdtool/ChangeLog +++ b/net-analyzer/rrdtool/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/rrdtool # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.213 2011/10/02 00:00:11 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.214 2011/10/02 00:54:44 radhermit Exp $ + + 02 Oct 2011; Tim Harder <radhermit@gentoo.org> rrdtool-1.4.5-r1.ebuild: + Improve python support (bug #315085 by Arfrever). 02 Oct 2011; Tim Harder <radhermit@gentoo.org> +rrdtool-1.0.50.ebuild: Re-add old version for FlowScan. diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest index 9896b766ace5..4c8ce4acd22a 100644 --- a/net-analyzer/rrdtool/Manifest +++ b/net-analyzer/rrdtool/Manifest @@ -9,17 +9,17 @@ DIST rrdtool-1.3.8.tar.gz 1021427 RMD160 e05cada9d1df11ed474536c1f6e11d7cc4c0807 DIST rrdtool-1.4.5.tar.gz 1348713 RMD160 9c45c3be7bcb8e17260055a33e936f307884914f SHA1 56638e8aedd5d5522152e86746e382b75dc48c35 SHA256 1267af420533d846432e55352db89b0f2507c711f80c65e016f7484f3cb0cf1d EBUILD rrdtool-1.0.50.ebuild 2699 RMD160 9437bd6dcdc9a746e6d1ed4e3acbf8e1743fd22f SHA1 c499d29e873de476025b44a65dc9d91c16e4d0a6 SHA256 641512476009621f7402074a8bdfb19634c8ef55d038dc41f6fd59aee8bf87c9 EBUILD rrdtool-1.3.8.ebuild 2675 RMD160 3c3f86284ec51257d8c0ababc429223a5be454d8 SHA1 c2ee49578fbd4ba40e7ed20479c23d0533cf1ee6 SHA256 b487a17f6fee97af87d53d496e59d64df86af93abe4feba0337846b352b80829 -EBUILD rrdtool-1.4.5-r1.ebuild 3156 RMD160 c51e670a585b9b629521888305cbfc83c4e0dd31 SHA1 bdd00375b8e400ad9cb6e8d96c3103e446cecc65 SHA256 476d31eb4d463bb455a8cdc2d35112d546a7777ea66f155649f63d961db99633 -MISC ChangeLog 32527 RMD160 5a2fa8c00e6c05a207d0ab88d642571b0255c157 SHA1 38772102644a29fefe65dda662d38392abc841a5 SHA256 c2646cbea025eaba19420327700a7b1ad8d60731a7f757890fd5d6b88d7d9d9c +EBUILD rrdtool-1.4.5-r1.ebuild 3637 RMD160 82679b38aad0e2239ffa5df29cb8fa6594740e19 SHA1 df97f94f04382c3e3e1bbb87ec9f79941ef68e5b SHA256 8071750d4fdb586aa28efe43476adccf199bd8d1a4ea9621a88ee2724fec52b7 +MISC ChangeLog 32654 RMD160 65b65e92f6eafb3cd02ca84704cfea8a5f5ad258 SHA1 c5d63a898c1a2f265c2478b2d21a91f9bb982424 SHA256 36f5c46a8ee7f143dbceb516fdd83d74c2322ea8aaf7569007008c7d91af309d MISC metadata.xml 376 RMD160 78da9054230eb8ed5474d75d1a0f7419eb1e45f9 SHA1 b7645e63557b4d5049032390ee07d86c5411fc96 SHA256 ccdb09cfa58f274722a7b61fb666c96c5d1c55d828fff44abc9415e56c056bb7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJOh6mRAAoJEEqz6FtPBkyjo1EH/irESe+7v+iAvVKhSozG13z8 -1GXy1CKzr0crzT/ThmSx0oduC2xneaLa/nbrfXN2shfFEcmiozWGUjUYmjeMdZAs -xtUBu5R1rXOJ8GJmVBBgP64GjGhSrqQ7XYlImZLpF0LGDB323A+cvBn0Nb9VBhMd -JbZ0cloB3elCItNLdGxMotBfoz/vlXl+zJZ7C9F1e5YgBlPfzpUrVGyHhN8WGkOl -yB9/7hZQakC3Vz1lwVfv7gq1ceNWqm79GrgDLo36cQu3H7whafWj5vyYxJXt0trq -gRvjrypx9bWb71+/56BupwbmwpOJTG5P5w9d2Nj1Gc3zKEiSQ7H1Bo5Bh5o4R8w= -=9U7W +iQEcBAEBCgAGBQJOh7ZaAAoJEEqz6FtPBkyjChwIAKFryJXG8STVBl3N4qxmP4Et +Ji47409uodyumvRqqKafWvrO0Onb7mNmmSDEsWOczbYP1+vd5+WqGDxj2Es4c09n +RjRwc/aiY8HARaoDWk2BHMH1kw7i1E23FIpHM3Ty2PJTizTKm2PR2khCuFqBOLoS +55SaZx0c5HxLzwceJYV5my9MrhMim1iRqDS+/D/Fkm3+E5xDyy7j+m5ZNjTlEe7X +hHkg8iFQUUfBXElQUFkxVwX5d9uNOQURQaFXGz7pK3QuMb4zzngjufdSlbyPCpBv +AkVmxvCtLLzuKj7HsEcv4xlmTDNT2aFIjhExbZ8L3kgG4uIqk1/9hd8Ls6cd4nU= +=Pz2C -----END PGP SIGNATURE----- diff --git a/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild index aa454ddb9db0..74c4e2f8a936 100644 --- a/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild +++ b/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild @@ -1,11 +1,15 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ EAPI="3" GENTOO_DEPEND_ON_PERL="no" -inherit eutils flag-o-matic multilib perl-module autotools +PYTHON_DEPEND="python? 2" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.* *-jython" + +inherit eutils distutils flag-o-matic multilib perl-module autotools DESCRIPTION="A system to store and display time-series data" HOMEPAGE="http://oss.oetiker.ch/rrdtool/" @@ -25,7 +29,6 @@ RDEPEND=" >=x11-libs/pango-1.17 lua? ( dev-lang/lua ) perl? ( dev-lang/perl ) - python? ( dev-lang/python ) ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 ) tcl? ( dev-lang/tcl )" @@ -33,11 +36,21 @@ DEPEND="${RDEPEND} dev-util/pkgconfig sys-apps/gawk" +DISTUTILS_SETUP_FILES=("bindings/python|setup.py") + +pkg_setup() { + use python && python_pkg_setup +} + src_prepare() { epatch "${FILESDIR}/${PN}-1.3.8-configure.ac.patch" # epatch "${FILESDIR}/${PN}-1.4.3-ruby-ldflags.patch" epatch "${FILESDIR}/${PN}-1.4.4-dont-link-system-lib.patch" sed -i '/PERLLD/s:same as PERLCC:same-as-PERLCC:' configure.ac #281694 + + # Python bindings are built/installed manually + sed -e "/^all-local:/s/ @COMP_PYTHON@//" -i bindings/Makefile.am + eautoreconf } @@ -64,6 +77,11 @@ src_configure() { $(use_enable python) } +src_compile() { + default + use python && distutils_src_compile +} + src_install() { emake DESTDIR="${D}" install || die "make install failed" @@ -82,12 +100,16 @@ src_install() { perl_delete_packlist fi + use python && distutils_src_install + dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO find "${ED}"usr -name '*.la' -exec rm -f {} + } pkg_postinst() { + use python && distutils_pkg_postinst + ewarn "rrdtool dump 1.3 does emit completely legal xml. Basically this means that" ewarn "it contains an xml header and a DOCTYPE definition. Unfortunately this" ewarn "causes older versions of rrdtool restore to be unhappy." @@ -100,3 +122,7 @@ pkg_postinst() { ewarn "upgraded from rrdtool-1.2.x and don't have any font installed to make" ewarn "lables visible, please, install some font, e.g. media-fonts/dejavu." } + +pkg_postrm() { + use python && distutils_pkg_postrm +} |