Add initscript for rrdcached, thanks to slepnoga

Package-Manager: portage-2.1.11.5/cvs/Linux i686

5 files changed, 180 insertions, 13 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 87a467c8bf83..f41a78871ee4 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.229 2012/09/06 16:25:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.230 2012/09/06 16:50:41 maksbotan Exp $
+
+*rrdtool-1.4.7-r1 (06 Sep 2012)
+
+  06 Sep 2012; Maxim Koltsov <maksbotan@gentoo.org> +files/rrdcached.confd,
+  +files/rrdcached.init, +rrdtool-1.4.7-r1.ebuild:
+  Add initscript for rrdcached, thanks to slepnoga
 
   06 Sep 2012; Jeroen Roovers <jer@gentoo.org> rrdtool-1.4.7.ebuild:
   Stable for HPPA (bug #404433).
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 90697df1bd59..9f377bdb2f59 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 0001_rrdtool-1.4.7-configure.ac.patch 492 SHA256 00ac12cee29a579532cfa82d3bba88588f4cc938667801743c40097dd38f73e5 SHA512 c91bb2ac81de4ca3002eb4526582d24067da71597218afd94c6c198686f70709afbc9d1058bab090a56cb2d8290b52809bcafdffe83aaeb54e7510040851a74c WHIRLPOOL f453a9ae54853a9d2546edc6394e71eae2c28ca77c9751b8d5add5495360c20cd5d70046d5a9a9122ec5979cfba238fe799a965814399f51588758ed5fe37b6b
+AUX rrdcached.confd 150 SHA256 f544145d142ab85f5efa578c24ab6b813c4a236af2b3ddc51d5fb2cd847cf976 SHA512 93d95057e99c98c943060cfc607285e76ac4580e9955e65ceac69b09577dd6a78b1faa9e6213345a7f011beabebce21c9447b6bd39f4091762d9974cd1a358e0 WHIRLPOOL af0317711dfd276e8047dbf285125104931a9ea696d8b73e54d41bbce7d1d7c08da0d71564346a95b485171d4990005b2f944be227962aed44b332807f300838
+AUX rrdcached.init 449 SHA256 cc1b0d349ebdbaa224d51bd271b2b299b89d10f87e75537e3618d9ea6d4dcbb4 SHA512 770000e8541b0cb2c5e70fe8b105901f5362633bcacb1d75684163ec78dda59e04adacfde3a3cc03b1cff1c44a5933146a4b1beeacd2c9fb6206de47c5af7156 WHIRLPOOL dd1936b9491ca91a1851db8252b750fa14072584b8d71c3f0f316d7a93cd34687c5c7221d1fd09bc28f4d2c0aea3065fd5d93f50668193c08e5f5cd7b0da7e42
 AUX rrdtool-1.3.8-configure.ac.patch 410 SHA256 220d42a1228d015f6bd02124b3f8c878f0b7bda2e277e9e3b15d4f05603328b5 SHA512 1fdf64c40cf9a9fbed790caa441eb06cb34e540cae11c8f46b9eb147a88d4bd33d119b38de7e1b72814719dd913b098973d30a2fa45ce7c66819bb27a977305e WHIRLPOOL a177e6aa911e22544f921ec7256928bb39a0ae4aef68f57e7bbb2277d6b64cc8fbaf0ac2a3c4c4d688b00d657422cda32b160a521e4e5debb655e1426ff25812
 AUX rrdtool-1.4.3-ruby-ldflags.patch 614 SHA256 d51f1e01a5faccc0a83a09a7aca2fa251fdfd662ba19f3670ef6591e46afec09 SHA512 abbc8eba233937c6c70ebe1b7b53685bb7263e1de5a7394cd55053e44ad9327eee3a972973fc023a7784db2bdccafbcb39067b6c53fef6083543cb122e24c109 WHIRLPOOL 5551a87742a13a6b5dbcd8fc82957a831b63c46b4aa3c758ca4e0820cf308a0a5cb008eaf40957304a30f93178b31b38c79c5b1a0d106ed7a6326be1b357c5f9
 AUX rrdtool-1.4.4-dont-link-system-lib.patch 801 SHA256 7a726fe8534a9e56d7074af827ef88e96d5176d4f68983ff5514fb137c1f12eb SHA512 fe0fe94a65dccf0145dca592e693a7815ba0438334c016a9c959f34f417beea6421600e5c5455434a61ac6b6b4641769dd293ebedc2c5adde8c711db54cba8bf WHIRLPOOL ef2350fcd6ce80e416e616cbf2a675678a1d753d45b1ff2969529a9927e079f4fb718788fb3632ccb54b59e01c03d134d49804b66af255b6b4a76efdd48abc60
 AUX rrdtool-1.4.5-automake-1.11.2.patch 857 SHA256 d72b5b9f7713832fa946f2310938f8df14b980548f789a4e629951cc4040b3ef SHA512 a2e75b2c44c61be7405ada0decae6eea8bca907ffc47794339016106927b449163b5acdc9d5c78c92b98a74deac9713798ca5ac2f5c5d6941fa19effe8bc2554 WHIRLPOOL 46a707e5aba8f7577a8d9cd40fa96886209a5f55ce3919aae9f0fd9b5209ffefb6ef103ce54155b8de2cf7fdca92a86c1bddf13f6574941aabab90e917ed1bc9
 DIST rrdtool-1.4.5.tar.gz 1348713 SHA256 1267af420533d846432e55352db89b0f2507c711f80c65e016f7484f3cb0cf1d SHA512 89cc7fb7a7c87b7ec4868501073ffd335287e9135b5941a5fe7eba33bbb3a84f23018257294916acf6b446828b8190e27b8726666e8cb6181a2c8e7d1653c44e WHIRLPOOL fecff48126d4eb89c975ae8828b59c45688f71871e66b2b8481ab2f4627b1f6666f2d446df3aa910f18dc5d976df4fab4fcfc8f966c38e0cb52e0bd89ba275f8
-DIST rrdtool-1.4.7.tar.gz 1349040 SHA256 956aaf431c955ba88dd7d98920ade3a8c4bad04adb1f9431377950a813a7af11 SHA512 5be26ba4d54700553e3d25fe416aa5e752de4b035c91ccda98cdefb0df09321528abef188cfd2049ba40f8a71edb253ff75ada4a5305fdbc6acade64cdf45d32 WHIRLPOOL 236c33d514e3e826bf2047cb20ca7bea29ef9bdabc1b2a4ebf7f14278698bddd6ad927f97a427f35044cdaaa91bd743ac8985ef7201678cae1830b29d9040b74
+DIST rrdtool-1.4.7.tar.gz 1349040 SHA256 956aaf431c955ba88dd7d98920ade3a8c4bad04adb1f9431377950a813a7af11
 EBUILD rrdtool-1.4.5-r1.ebuild 3644 SHA256 83af71703bd2b8939a9c5fe32b113407371f486ca5119290b35f664c2caf99cf SHA512 7afea2d78c344f71dbff12fcd2be8b38d346343927e5412eee7cf390ced27ef2e5f3a85e19f6d5b5d0e179388a0ea66c6a17ad3111768c4906505e7a3afb844a WHIRLPOOL 42bbcae0887f80681cd1463ae6c2faeeaab579be1fa82fb55cca62b1da987c4a64de0e504440ca645eab4835194de5e37d2baaac409c11387356b78c1a5ea6ca
 EBUILD rrdtool-1.4.5-r2.ebuild 3716 SHA256 e4f5e13d11e09fb02fa7c8753e182ca9eb8c92a27d6f40795e4a6c6da970f4ce SHA512 3c4dafe59beb7b3e75829cbb8439e2172412c483e03908b650af12f1d038d6b3e3f970e0603c32b462384fe293d89e78cfd0c2b9f102cac243d5be820dcfa9fc WHIRLPOOL 992ebcb1d4b66c9c6e691c2333792cc281802b4230fa75a4ece4623a1fb1a190de70e88916b7a24fef155947afa2bf7a169c65c33cf098bb6b1b0820eed57ae3
+EBUILD rrdtool-1.4.7-r1.ebuild 4023 SHA256 f800c3c013fb00929fbe9a52f252c01c3c289a1b4c12eab4565037906ceecbcc SHA512 9bf2d690c3c24a1303d432eca152c22d486aff77e5537950ef6a369c1845b99cf079bd71e781d797ccf09a42629b2515eb48fcb15ebe65ad9e06172c36e34db2 WHIRLPOOL da3c546bb93a27497f7a226bfdb042fbadf5ea0f829f51a3938ea2e379fa5fea7d071f4082c8fdcdf7f3754407851e134550d5c261f01167bc677f94502c43ae
 EBUILD rrdtool-1.4.7.ebuild 3842 SHA256 3d07327252670bc50b7ff592dbae2919a5afc44e76a84c12be80a5f90000d923 SHA512 482d6c4534c81d4bb87477bce139374292f1521e2b0c3b21c9c3cd63d58f47ca5d00fb55ca4df8dfc2556cb0ce7652930073b51d1dd7931181f1b479a89eebe1 WHIRLPOOL 37cb2fcd505da9af448c397dbc582a72c25a3ca92a481102c021ee345da94cd7d95d5b9fe6aa16ad135f0024daff7a74e0f544629e6bb85f7aed646902879e57
-MISC ChangeLog 34624 SHA256 8729d7204aa1d8ff8940070484c9afd4bddd7bff624f8666fcf95c3d340f4b26 SHA512 e9d3377aa20e14aea05f6fe3771099baeec8039ecd5d53ac1d9520f358ec8038c102b42c5686af7a8b7461351a64f21dee6068ffb85e07581353b95d4a95e168 WHIRLPOOL d42a6686f4e1c771504715931e66a7e1e1b2eb0aeb27920795c525de70ffd89c3dca81f92baf74cf126ab848d299aa2969457d24b372b79e4e0a8a02aaac9cf4
+MISC ChangeLog 34842 SHA256 b28aa79cc9cee319becb09a5f26046e28d5e35505304d8c0dc59d019af92e91c SHA512 846d4db6a2b1189484453ff8a01946d20cd98050cc7477df97b1453622fac5e701fec6ff506bae66f2b14e356388f9df04edfd625362e296bf6ed589a3d48fbd WHIRLPOOL 562b3141c51c71a08f4b85dc95bbaf235d4150068352881a171e2fcfb25bed55a0a5fa5603e395403fe0f9ebcd8f0eefebdf246d92e087cc90ab8aac733b46b7
 MISC metadata.xml 314 SHA256 e08a5acfe66fb546b0ea85e9598baca57ff3979094399e1c60507a718a5151c5 SHA512 2eb70d707167c60e86ff9e13139a57858d0f6382413434d877f11b63c47d1bce38da67165fbb0b9754840e7661d733ef40c7c0112f5b974d245f8c97d5082f0d WHIRLPOOL b026e9b4394948337e3cddb988419df464bae13b8d620b493599f58dca6491eed7e57e3fbc8fdf710847f7d2ecaa6858a2614d4bf1f7839402fe9b13501e57c6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlBIznIACgkQVWmRsqeSphPd6QCeP7q+wx8T3UqX5+5qqa1bWvMA
-5YoAnAlVhT/DBzvEUk1gEZfu0/KnvKkL
-=XWaa
------END PGP SIGNATURE-----
diff --git a/net-analyzer/rrdtool/files/rrdcached.confd b/net-analyzer/rrdtool/files/rrdcached.confd
new file mode 100644
index 000000000000..0463a7923461
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdcached.confd
@@ -0,0 +1,8 @@
+RRCACHE_ARGS="-l unix:/var/run/rrdcached.sock -j /var/lib/rrdcached/journal/ -F  -b /var/lib/rrdcached/db/ -B"
+
+USER=""
+GROUP=""
+
+MODE=""
+
+MAXWAIT=30
diff --git a/net-analyzer/rrdtool/files/rrdcached.init b/net-analyzer/rrdtool/files/rrdcached.init
new file mode 100644
index 000000000000..e8daa17247b5
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdcached.init
@@ -0,0 +1,14 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/files/rrdcached.init,v 1.1 2012/09/06 16:50:41 maksbotan Exp $
+
+command="/usr/bin/rrdcached"
+command_args="${RRCACHE_ARGS} -p /run/rrdcached.pid"
+start_stop_daemon_args="--quiet"
+description="RRDtool data caching daemon"
+
+depend() {
+	need localmount net
+	use logger
+}
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild
new file mode 100644
index 000000000000..0d6125d7054d
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild,v 1.1 2012/09/06 16:50:41 maksbotan Exp $
+
+EAPI="4"
+
+GENTOO_DEPEND_ON_PERL="no"
+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/"
+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 lua perl python ruby rrdcgi tcl tcpd"
+
+# This versions are minimal versions upstream tested with.
+RDEPEND="
+	>=media-libs/libpng-1.5.10
+	>=dev-libs/libxml2-2.7.8
+	>=x11-libs/cairo-1.10.2[svg]
+	>=dev-libs/glib-2.28.7
+	>=x11-libs/pango-1.28
+	lua? ( dev-lang/lua[deprecated] )
+	perl? ( dev-lang/perl )
+	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 )
+	tcl? ( dev-lang/tcl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	dbi? ( dev-db/libdbi )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-apps/gawk"
+
+DISTUTILS_SETUP_FILES=("bindings/python|setup.py")
+
+pkg_setup() {
+	use python && python_pkg_setup
+}
+
+src_prepare() {
+	epatch	"${FILESDIR}"/0001_"${P}"-configure.ac.patch
+	epatch	"${FILESDIR}/${PN}"-1.4.5-automake-1.11.2.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
+}
+
+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 \
+		--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) \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	use python && distutils_src_compile
+}
+
+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
+
+	use python && distutils_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() {
+	use python && distutils_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."
+}
+
+pkg_postrm() {
+	use python && distutils_pkg_postrm
+}