Move the ruby bindings to a separate package to facilitate building them for all ruby targets, bug 427662.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 171 insertions, 5 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index d751ff0dd897..77cc9c8e2097 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.262 2014/05/19 00:35:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.263 2014/05/20 06:01:00 graaff Exp $
+
+*rrdtool-1.4.8-r1 (20 May 2014)
+
+  20 May 2014; Hans de Graaff <graaff@gentoo.org> +rrdtool-1.4.8-r1.ebuild:
+  Move the ruby bindings to a separate package to facilitate building them for
+  all ruby targets, bug 427662.
 
   19 May 2014; Jeroen Roovers <jer@gentoo.org> rrdtool-1.4.8.ebuild:
   Remove obsolete comment, too.
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index e6ec5fc3529b..fea4ab66f840 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -5,13 +5,14 @@ AUX rrdcached.confd 150 SHA256 f544145d142ab85f5efa578c24ab6b813c4a236af2b3ddc51
 AUX rrdcached.init 449 SHA256 cc1b0d349ebdbaa224d51bd271b2b299b89d10f87e75537e3618d9ea6d4dcbb4 SHA512 770000e8541b0cb2c5e70fe8b105901f5362633bcacb1d75684163ec78dda59e04adacfde3a3cc03b1cff1c44a5933146a4b1beeacd2c9fb6206de47c5af7156 WHIRLPOOL dd1936b9491ca91a1851db8252b750fa14072584b8d71c3f0f316d7a93cd34687c5c7221d1fd09bc28f4d2c0aea3065fd5d93f50668193c08e5f5cd7b0da7e42
 AUX rrdtool-1.4.7-configure.ac.patch 492 SHA256 00ac12cee29a579532cfa82d3bba88588f4cc938667801743c40097dd38f73e5 SHA512 c91bb2ac81de4ca3002eb4526582d24067da71597218afd94c6c198686f70709afbc9d1058bab090a56cb2d8290b52809bcafdffe83aaeb54e7510040851a74c WHIRLPOOL f453a9ae54853a9d2546edc6394e71eae2c28ca77c9751b8d5add5495360c20cd5d70046d5a9a9122ec5979cfba238fe799a965814399f51588758ed5fe37b6b
 DIST rrdtool-1.4.8.tar.gz 1379482 SHA256 de95b9f5aa488b0683600aad5a07c316f8d98cbe8d00aa0a1c87e2b2ef89f3d6 SHA512 c525978829508e1db393092c948d8db910554f42e1221acc4064a8f546ceac5d68943f603c6f0ef0e6510bbe5f606cfe6862672145ea1b630cd2b7fd07fa805b WHIRLPOOL f3926aed715a80c8d8287b057c39bbe614d81ebf9f24d1e285a9a438594d5c4c66b59934cc7c6be0550f0f729f319b01a46efc32ccf0b412563c43cf74a21564
+EBUILD rrdtool-1.4.8-r1.ebuild 4188 SHA256 75a9582ab9bd143ba6f54f9aca8ee49dda43908914d1cb9d7ef4745e80b19c7d SHA512 9fa5163dd4c8cad1e41ee78c67b6d8d81e4dc30330a8657446fbbb4fb05423baa64319c7b803368006f3aa5960a93949126e4e053ea8dba6425cbf684cfbf60e WHIRLPOOL 4553cc161c0904f4c76d196aecbca616a6bd687d3f49742d9005c9d474df11e57e816213d588ca92b9a3e0a6365fde0d12412b0ebbea62df5a8908e8fc94de74
 EBUILD rrdtool-1.4.8.ebuild 4172 SHA256 5fac5d8fb9d5dedb53dc1c7f7311fa13b7c4ada26fb3cb1880a3c2a128d0dca5 SHA512 07ca0440306002f8223e6c92e6a5dbd7a7caae3df048f2c077b62f73a408a0361d5d5c8a39493120320f1782fcd4cca76e028b697fc4ac78deb38fcbd8fb0e70 WHIRLPOOL d892e7db2fe6fddac534964c3d4ae6af66e80f74ce588285d328a97e5697ef5c9772b63941137c1a1313f5eae06350bea9543b63302d705935cee28798ac0a3e
-MISC ChangeLog 38889 SHA256 404501e178f64ee14b977720a2e9c499d5c831580b5c1697693e316b445622c6 SHA512 8b866da2e2a9f188fbef6f2e574c4197bff3088ef727b022ccf0db3e4939c32874560787ba5a49675d98ec8d52da000c6ac383d6d555eeb277367a33f76ee35a WHIRLPOOL 02a37bce7b434f0bdf19519ff5e35c0acfe5bdc59c93a829f291185198f3cf648f81c50dadf9844dae31fcc7f16f3e53a97c30cd7222075aecfc5c70b7b16b1a
+MISC ChangeLog 39113 SHA256 8bed1e4797baac88d86ae85b86e3141f82e983f1456a678281760ba1c21068e0 SHA512 6bd6143a35b57166c1b37d690d02edfe48c7a0b215841380af5eedbf7bb4adae8ccf1370b07611f6efaeea51ba347add34256fd907ca2652bd8d84d94d339792 WHIRLPOOL 535a6783646e00034997464559aec842514edb5c6aad33e38ea6254cf8c23cf7b69eeaf33e654b272192851dce8da3f700dc3364eb406f49510c31146fea96df
 MISC metadata.xml 382 SHA256 61ecf5c79b1a7801d054184a5b79c9ecfbe89d3633b8eb8f29e2297ef4f201ab SHA512 f30109bc3a89232a2b4f55afebaf6322ab70b0bd38b53e2650259192cca547bf69cdbe5640d43576a9ac0fb637eb447053ad8a6cb4f3fc1bf49746eb821bf905 WHIRLPOOL b34ad3e79ae530ac2ef811e561cdb5a0666eb873a575c4aed970daf330be5ab6490aa12cc15dc13c53387c6c3530ccd572e1abb4a7a0cf351c5c77136dc38f8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlN5UeAACgkQVWmRsqeSphM9rACfUHSCKpL9+pG2ANZPmLNkpCqL
-TioAmgMRViIEfPAdtzkvLG8wLtVIfG/6
-=BZvb
+iF4EAREIAAYFAlN676MACgkQiIP6VqMIqNfNewD/RZvP/2dApXqawX/YmAOeGMm8
+Q43xVWnNKJSWr1rLiFMA/RMmotFdP1JfwT6BF2Kj1JLq7Hj20KxptHs3FPJyzU8e
+=Cx+I
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
new file mode 100644
index 000000000000..16ca9bc2a4aa
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild,v 1.1 2014/05/20 06:01:00 graaff Exp $
+
+EAPI="5"
+
+DISTUTILS_OPTIONAL="true"
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python2_7 )
+inherit eutils distutils-r1 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 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="dbi doc +graph lua perl python ruby rrdcgi static-libs tcl tcpd"
+
+PDEPEND="
+	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.28.7[static-libs(+)?]
+	>=dev-libs/libxml2-2.7.8[static-libs(+)?]
+	dbi? ( dev-db/libdbi[static-libs(+)?] )
+	graph? (
+		>=media-libs/libpng-1.5.10[static-libs(+)?]
+		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
+		>=x11-libs/pango-1.28
+	)
+	lua? ( dev-lang/lua[deprecated] )
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	tcl? ( dev-lang/tcl )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+DEPEND="
+	${RDEPEND}
+	sys-apps/groff
+	virtual/pkgconfig
+	virtual/awk
+"
+
+python_compile() {
+	cd bindings/python || die 'can not enter to python bindings directory'
+	distutils-r1_python_compile
+}
+
+python_install() {
+	cd bindings/python || die 'can not enter to python bindings directory'
+	distutils-r1_python_install
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4.7-configure.ac.patch
+
+	# bug 456810
+	# no time to sleep
+	sed -i \
+		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
+		-e 's|^sleep 1$||g' \
+		configure.ac || die
+
+	# Python bindings are built/installed manually
+	sed -i \
+		-e '/^all-local:/s| @COMP_PYTHON@||' \
+		bindings/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -ffast-math
+
+	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+
+	# to solve bug #260380
+	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
+
+	# Stub configure.ac
+	local myconf=()
+	if ! use tcpd; then
+		myconf+=( "--disable-libwrap" )
+	fi
+	if ! use dbi; then
+		myconf+=( "--disable-libdbi" )
+	fi
+
+	econf \
+		$(use_enable graph rrd_graph) \
+		$(use_enable lua lua-site-install) \
+		$(use_enable lua) \
+		$(use_enable perl perl-site-install) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable rrdcgi) \
+		$(use_enable static-libs static) \
+		$(use_enable tcl) \
+		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
+		--with-perl-options=INSTALLDIRS=vendor \
+		--disable-ruby-site-install \
+		--disable-ruby \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	default
+
+	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
+
+	use python && distutils-r1_src_install
+
+	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
+
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+
+	keepdir /var/lib/rrdcached/journal/
+	keepdir /var/lib/rrdcached/db/
+
+	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
+	newinitd "${FILESDIR}"/rrdcached.init rrdcached
+}
+
+pkg_postinst() {
+	ewarn "Since version 1.3, rrdtool dump emits completely legal xml.  Basically this"
+	ewarn "means that it contains an xml header and a DOCTYPE definition.  Unfortunately"
+	ewarn "this 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 ">=net-analyzer/rrdtool-1.3 does not have any default font bundled. Thus if"
+	ewarn ">you've 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."
+}