From: Samuli Suominen Date: Sun, 7 Aug 2011 08:13:58 +0000 (+0000) Subject: Disable building librrd.a and librrd_th.a and delete matching libtool files wrt ... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=da3b23647f78b9feab82ece461868ff1492ca341;p=gentoo.git Disable building librrd.a and librrd_th.a and delete matching libtool files wrt #362895 by Cesko Voeten. Open a bug if you need USE="static-libs". Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64 --- diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog index 9a221e5671c1..4194cbc77d35 100644 --- a/net-analyzer/rrdtool/ChangeLog +++ b/net-analyzer/rrdtool/ChangeLog @@ -1,6 +1,12 @@ # 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.209 2011/06/01 02:28:58 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.210 2011/08/07 08:13:58 ssuominen Exp $ + +*rrdtool-1.4.5-r1 (07 Aug 2011) + + 07 Aug 2011; Samuli Suominen +rrdtool-1.4.5-r1.ebuild: + Disable building librrd.a and librrd_th.a and delete matching libtool files + wrt #362895 by Cesko Voeten. Open a bug if you need USE="static-libs". *rrdtool-1.4.5 (01 Jun 2011) diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest index a8fd0c269048..078aedffc104 100644 --- a/net-analyzer/rrdtool/Manifest +++ b/net-analyzer/rrdtool/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX rrdtool-1.2.15-newstyle-resize.patch 5231 RMD160 acdd68b7a7f422c615cfac824516beaeb782eb5e SHA1 973b40a3954942dd3306d5781f31faf4f88c257d SHA256 e55f1e7f0c4d3649b6790cb56247eaf5518a359ef662a959848805e416239fd1 AUX rrdtool-1.3.8-configure.ac.patch 410 RMD160 7bc8ae6bf64fbc8602c0e4a4571c74d9afea818b SHA1 b28a7f253ff66d788a29d491ef57f11c6721bb16 SHA256 220d42a1228d015f6bd02124b3f8c878f0b7bda2e277e9e3b15d4f05603328b5 @@ -25,13 +25,14 @@ EBUILD rrdtool-1.3.9.ebuild 2776 RMD160 bb5a72c574c337bfebdadf2f11bb3da594b0ebf3 EBUILD rrdtool-1.4.2.ebuild 2773 RMD160 1925709cb77ef0b782dd9af09b21e3ab1f0ac8ed SHA1 a2eb17dcfea2b211e41a64e1fe745a10ddc94676 SHA256 2fc595a30197c34ad3a8f19e300223d1ea9dd503a5fe7582a6e7b97be16af37d EBUILD rrdtool-1.4.3.ebuild 2995 RMD160 db6f8d3041175e39fbc1452590090cf8fb0a19ef SHA1 e6beb54c20f9368982ebd30a52494d20f4d74b8d SHA256 742837bcf2d4f13390dbf635b7d0fb36b0fbbdbc2623562379127e421390870f EBUILD rrdtool-1.4.4.ebuild 3068 RMD160 5c3fab4259ff2288172c0cb65021346e9f5bef57 SHA1 da82aae94eecdb00759ecdbd879c1db37de56ddb SHA256 11cf898e8bba6c06f4ea9b57c223262bd5e7a62ef5572406da50a666029912a8 +EBUILD rrdtool-1.4.5-r1.ebuild 3155 RMD160 adc9352a01c80b71cb572ec35b9e78a46eb8ba5a SHA1 a909569809597b007aec42136d8969fc2f3bf130 SHA256 663746906cd300571c46fe6bcdd5a70e9d5a26a112d6b6511a773250b6822a69 EBUILD rrdtool-1.4.5.ebuild 3073 RMD160 3264296ea8f939659f43592e2cef045bea8d0a15 SHA1 d634acff2537a6e4598fd8652a59ddaeedd39fe2 SHA256 e9f9f47a9b932c6e82ecee886289e555e879da6047524b6786165f76639fb70d -MISC ChangeLog 31606 RMD160 b918ce421e480e7ea6662c3da3b90651088ec481 SHA1 b8f2b569a2ec72e14fc41fe9557c6d4bfaa6ee22 SHA256 22e7b7520ba3af3afaf8f5547032f16d586ac3bbe674d3616f0333c3ff12443c +MISC ChangeLog 31877 RMD160 3bf8fb755fec9c214657f3c908f3b2387213e150 SHA1 f0c19c247ab165e08793bde674b9af82018f4d14 SHA256 0f8d9b8756769fb483fe2bcb9a16b705fbf8b95c10b8c37c13ae93f743583937 MISC metadata.xml 376 RMD160 78da9054230eb8ed5474d75d1a0f7419eb1e45f9 SHA1 b7645e63557b4d5049032390ee07d86c5411fc96 SHA256 ccdb09cfa58f274722a7b61fb666c96c5d1c55d828fff44abc9415e56c056bb7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk3lo/YACgkQVWmRsqeSphPSZwCeK6XuWvMqljuQzQSNOIzD+AVW -rwYAn1kv3ii6OmI9LmElIoWvGeLJhI+u -=ys9c +iF4EAREIAAYFAk4+SIEACgkQXkR9YqOcLPFJKQD/YPiwGQnXRwzpcy9Yc9C0MHmQ +6JRyOcRt/Gagt0kdPywBAI6K9xHlHadSlwCaSrra+LtpAEf2hX3qBGsy3RfTQlVW +=/Bvg -----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 new file mode 100644 index 000000000000..fb8de1fa8f73 --- /dev/null +++ b/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild @@ -0,0 +1,101 @@ +# 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.1 2011/08/07 08:13:58 ssuominen Exp $ + +EAPI="3" + +GENTOO_DEPEND_ON_PERL="no" +inherit eutils flag-o-matic multilib perl-module autotools + +DESCRIPTION="A system to store and display time-series data" +HOMEPAGE="http://oss.oetiker.ch/rrdtool/" +SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris" +IUSE="doc lua perl python ruby rrdcgi tcl" + +# This versions are minimal versions upstream tested with. +RDEPEND=" + >=media-libs/libpng-1.2.10 + >=dev-libs/libxml2-2.6.31 + >=x11-libs/cairo-1.4.6[svg] + >=dev-libs/glib-2.12.12 + >=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 !dev-ruby/ruby-rrd ) + tcl? ( dev-lang/tcl )" + +DEPEND="${RDEPEND} + sys-apps/gawk" + +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 + eautoreconf +} + +src_configure() { + filter-flags -ffast-math + + export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF} + + # to solve bug #260380 + [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__ + + econf \ + --disable-static \ + $(use_enable rrdcgi) \ + $(use_enable lua) \ + $(use_enable lua lua-site-install) \ + $(use_enable ruby) \ + $(use_enable ruby ruby-site-install) \ + $(use_enable perl) \ + $(use_enable perl perl-site-install) \ + --with-perl-options=INSTALLDIRS=vendor \ + $(use_enable tcl) \ + $(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \ + $(use_enable python) +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + if ! use doc ; then + 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 + fi + + dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO + + find "${ED}"usr -name '*.la' -exec rm -f {} + +} + +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." + ewarn + ewarn "To restore a new dump with an old rrdtool restore version, either remove" + ewarn "the xml header and the doctype by hand (both on the first line of the dump)" + ewarn "or use rrdtool dump --no-header." + ewarn + ewarn "Note: rrdtool-1.3.x doesn't have any default font bundled. Thus if you've" + 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." +}