From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1261784-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 680DE13835A
for <garchives@archives.gentoo.org>; Tue, 16 Mar 2021 00:06:34 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6A570E0843;
Tue, 16 Mar 2021 00:06:33 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 4235FE0843
for <gentoo-commits@lists.gentoo.org>; Tue, 16 Mar 2021 00:06:33 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id E1CB0335D1A
for <gentoo-commits@lists.gentoo.org>; Tue, 16 Mar 2021 00:06:31 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5CDC95AE
for <gentoo-commits@lists.gentoo.org>; Tue, 16 Mar 2021 00:06:30 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1615853173.231859817524d7ed84dcd83459355986ba923364.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/rrdtool/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
X-VCS-Directories: net-analyzer/rrdtool/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 231859817524d7ed84dcd83459355986ba923364
X-VCS-Branch: master
Date: Tue, 16 Mar 2021 00:06:30 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b8b5b381-1bf3-40b9-9c14-4b5b807881d9
X-Archives-Hash: a4ca95fb8f9b8661768283eb71378119
commit: 231859817524d7ed84dcd83459355986ba923364
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 00:02:49 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 00:06:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23185981
net-analyzer/rrdtool: modernise ebuild, fix dependencies
* Fix setuptools BDEPEND
* Use BDEPEND fully
* Sort phase definitions
* Drop unused eclass
* Add missing || dies
* Make style consistent (inc. Bash tests, semicolons)
Closes: https://bugs.gentoo.org/759292
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild | 85 +++++++++++++-------------
1 file changed, 43 insertions(+), 42 deletions(-)
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
index 8e87060d737..6dbe3765730 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
@@ -9,26 +9,30 @@ GENTOO_DEPEND_ON_PERL=no
LUA_COMPAT=( lua5-{1..4} luajit )
PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools lua perl-module distutils-r1 flag-o-matic multilib
+inherit autotools lua perl-module distutils-r1 flag-o-matic
MY_P=${P/_/-}
DESCRIPTION="A system to store and display time-series data"
HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
SLOT="0/8.0.0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
+
RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
lua? (
${LUA_REQUIRED_USE}
test? ( graph )
- )"
+ )
+"
-CDEPEND="
+RDEPEND="
>=dev-libs/glib-2.28.7:2[static-libs(+)?]
>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
dbi? ( dev-db/libdbi[static-libs(+)?] )
@@ -44,39 +48,25 @@ CDEPEND="
tcl? ( dev-lang/tcl:0= )
tcpd? ( sys-apps/tcp-wrappers )
"
-
-DEPEND="
- ${CDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
sys-apps/groff
virtual/pkgconfig
virtual/awk
- test? ( sys-devel/bc )
-"
-RDEPEND="
- ${CDEPEND}
-"
-BDEPEND="test? (
- lua? ( ${LUA_DEPS} )
-)"
-PDEPEND="
- ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
+ python? ( $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') )
+ test? (
+ sys-devel/bc
+ lua? ( ${LUA_DEPS} )
+ )
"
+
+PDEPEND="ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )"
+
PATCHES=(
"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
"${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
)
-S=${WORKDIR}/${MY_P}
-
-python_compile() {
- cd bindings/python || die
- distutils-r1_python_compile
-}
-
-python_install() {
- cd bindings/python || die
- distutils-r1_python_install
-}
pkg_setup() {
use python && python-single-r1_pkg_setup
@@ -86,7 +76,7 @@ src_prepare() {
default
# At the next version bump, please see if you actually still need this
# before adding versions
- if ! [ -f doc/rrdrados.pod ]; then
+ if ! [[ -f doc/rrdrados.pod ]] ; then
cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
else
die "File already exists: doc/rrdrados.pod. Remove this code!"
@@ -105,7 +95,7 @@ src_prepare() {
-e '/^all-local:/s| @COMP_PYTHON@||' \
bindings/Makefile.am || die
- if ! use graph; then
+ if ! use graph ; then
sed -i \
-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
@@ -122,20 +112,20 @@ src_configure() {
filter-flags -ffast-math
- export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+ 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
+ if ! use tcpd ; then
myconf+=( "--disable-libwrap" )
fi
- if ! use dbi; then
+ if ! use dbi ; then
myconf+=( "--disable-libdbi" )
fi
- if ! use rados; then
+ if ! use rados ; then
myconf+=( "--disable-librados" )
fi
@@ -158,6 +148,11 @@ src_configure() {
${myconf[@]}
}
+python_compile() {
+ cd bindings/python || die
+ distutils-r1_python_compile
+}
+
lua_src_compile() {
pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
@@ -189,17 +184,23 @@ lua_src_test() {
LUA_CPATH="${PWD}/.libs/?.so" emake LUA="${LUA}" test
- popd
+ popd || die
}
src_test() {
export LC_ALL=C
+
default
- if use lua; then
+ if use lua ; then
lua_foreach_impl lua_src_test
fi
}
+python_install() {
+ cd bindings/python || die
+ distutils-r1_python_install
+}
+
lua_src_install() {
pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
@@ -209,24 +210,24 @@ lua_src_install() {
LUA_INSTALL_CMOD="${ED}/$(lua_get_cmod_dir)" \
install
- popd
+ popd || die
}
src_install() {
default
if ! use doc ; then
- rm -rf "${ED}"/usr/share/doc/${PF}/{html,txt}
+ rm -rf "${ED}"/usr/share/doc/${PF}/{html,txt} || die
fi
- if use lua; then
+ if use lua ; then
lua_foreach_impl lua_src_install
fi
- if use !rrdcgi ; then
+ 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
+ rm -f "${ED}"/usr/share/${PN}/examples/cgi-demo.cgi || die
fi
if use perl ; then
@@ -236,7 +237,7 @@ src_install() {
dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
- find "${ED}"/usr -name '*.la' -exec rm -f {} +
+ find "${ED}"/usr -name '*.la' -exec rm -f {} + || die
keepdir /var/lib/rrdcached/journal/
keepdir /var/lib/rrdcached/db/