gentoo resync : 04.01.2018

4 files changed, 21 insertions, 116 deletions

diff --git a/sys-libs/openipmi/Manifest b/sys-libs/openipmi/Manifest
index 55b6c6f6ea1a..310db5a1a6ef 100644
--- a/sys-libs/openipmi/Manifest
+++ b/sys-libs/openipmi/Manifest
@@ -1,9 +1,7 @@
 AUX openipmi-2.0.16-pthreads.patch 546 BLAKE2B 53d2f7473b0a5705eed3ff4acd3b635befe0a57041e06dd2c4660a1c04af307c0f40a0a5c89770b77442aa8386ce84e3006cd1bb88cc432b55f81cc8cec9c37e SHA512 cadbcb8a1c08b467ca550e2b8510a415ca50749e752baf3fe8cc59c67c0d6bce0009850510e02d36b306894cb1e84aac3e4d2f947c75d56f8e7443315e4f8902
 AUX openipmi-2.0.21-tinfo.patch 818 BLAKE2B 5d647663899cc6b55c2c412d8bd8164ceddfdeeee42863b40781ee7317f3f23b1b6e0d466001ead51beba286ddfe195683fc36bdadb3f279da0a881f058aa028 SHA512 2b3f7f10f6f7f1a71973f0f8f125171c33ad9149bdcd808b9b76571ac2d5a403db0b23bde0fbcb7763fba6101b5015775a3563ed77197f4a50d7ca98812f6d6d
-DIST OpenIPMI-2.0.18.tar.gz 2895686 BLAKE2B 5197b58fbf3b378b296c1b3f0ddfe02f19982a2f3a08a8e6c35647f592192f1b141f1c74d9d83cba73d9f19caa03cb6a147f31b70dddce97f04860bda5579019 SHA512 a6caf791fb6d5bd83234481ea3c84a408dad3eabc093dbc4681742d23b47b223d0a1715a71a9b977a03a80f5c350dd34f6591ece5ea0d9876cb6debfc80a39d4
 DIST OpenIPMI-2.0.22.tar.gz 3081893 BLAKE2B 6ec5ec7f61f3033a9d953df4b091522fa5bd891a93dfe648f807548e3dc0f5ffc0d15af9b687379e6749d7b97ee2fd6c7f9e713aaa7423b82bf099fb2d0fb6b8 SHA512 78017fc0b52ce6a83db45f595f50170410120c9f7394429869c177ee40ea5b924bcc0e36bb60f9368a75a2f78ff71c70ae3631ba55a207cfb6eb4f62aa44ff89
-DIST OpenIPMI-2.0.23-rc1.tar.gz 3225557 BLAKE2B d67e0f0f401c174cba805cf7ce6d46a9133e5bb87f40776f91200ace3f27be023373d26ae74900dbf8c211c8d246a28105f347fd1e6f6d83ba9d92cf984ac11a SHA512 4da3d74073fe19573b8bc5fda15ecfa4d500a074559155456010e0bac8a8c2d345e30c086a851a9a4e7266165dd9a7a6d8f618e65bad3c2b18fe86d8f4c362ab
-EBUILD openipmi-2.0.18-r1.ebuild 2698 BLAKE2B 2d3c429b771afe74334bd724534d4c06362138f81d10b6f1b00ccbd37f46cd6307ab377de149f1ff3b0b5a5177890493c0eb35aec40efe52b11798345f2d063b SHA512 2ebfd8d50855851c97019df5042958585417de4726cf4d95df1400db2af5935b41586160fd403f5bc98f003a60a2cd5d609b27605e1b8f0472ac04b1e4af2bdf
-EBUILD openipmi-2.0.22.ebuild 2737 BLAKE2B 860afd5558cebd9669cb4dd16ba8e56a65544e6b82d222718489d6853de7ac35498b4e95b0571c67748180ad3fc342cfb1c031a153d2275dd9f03569c8564c61 SHA512 f54d1fef56e74d71695020899e293de400ab225b443d6852dd35f5d9966dab904e4bc70e849fd63708cc885ebd6a96bcd3d35deec000e78220fb54aafa883e3a
-EBUILD openipmi-2.0.23_rc1.ebuild 2745 BLAKE2B 5b2bba682ee6115ea71caa1445ba535116023ab4beeae432fac35abf3dbac230c7bb4dde9886e344e352354f28dc532a65e6b38e31beecf6de38a4893582cf50 SHA512 ca67943c717f30059aa426dad6669013d4dc940c5e5b1c581e17123496b3163c5d1152e86158dfd156b5bd0eb437070bb33767028a643998fdbd4d1faa11d804
+DIST OpenIPMI-2.0.24.tar.gz 3211633 BLAKE2B 56658e0c06ae2d192415fb5d71fe13afc5819a7b2412af8f51d829a11f3ad10faf592b5da4cb51e43667303385ca2c1f8413045bc444f045d6f3e0f6dc553682 SHA512 de1e0a46d7e25af06e07a0f5b8e23deac14d2bca854fbe09b221e776b46b5cf13b5af6b7ee1e8d0984eb792aa4bd095d66d98775674809feafe0a357ca95d677
+EBUILD openipmi-2.0.22.ebuild 2739 BLAKE2B e6e55f84f94eff0f39eb041fe7b1d82f81bcaab2f0eb55c0010bde1e2ace70f4d493663a44ff9b859851556c7e78f7f4835ce8f4df96db2d8cb1a04a0f4ccdda SHA512 43e979f877e17c82ca317ea41d73e84cc9af65496b198b5b0c4f81251f0b47713022de672b105ba447f6e880d42546fa2140ca9dc4fe60f90cdf5c709eb3f5dc
+EBUILD openipmi-2.0.24.ebuild 2664 BLAKE2B ff7eba5bbcfddae292fef31f6af242eec6121673170501fd812f85230aba1a3cb19baab753fcb7ad98cfa0d816b6834f4fe55541b857ed1a92aa09185efa70ca SHA512 6f519bab6f691853867e93969f5b8c90c93f8b17c6fa7f38d9f283b247f5ceb994a322a1a0fed7cd0d77f6ab8c907513bea67942566e04550395af588c2bac91
 MISC metadata.xml 347 BLAKE2B 4857bbfde0e588b4ad2ac893f826affe46d77ead16c7565fa775580c23fdd35df745a9050b599d0ff333290a155b48cf6d571065abd8b2fe5cc4b2e136f3efc1 SHA512 f67b97714b2b543109c2bc90d8f474df13e8915b7a14fdc3a16b62f1dfbc59ac27c8e64d19429b87a63ee2c1e4812cee26d8fb797591028484b2072b1951231f
diff --git a/sys-libs/openipmi/openipmi-2.0.18-r1.ebuild b/sys-libs/openipmi/openipmi-2.0.18-r1.ebuild
deleted file mode 100644
index e2cc89751394..000000000000
--- a/sys-libs/openipmi/openipmi-2.0.18-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils autotools python-single-r1
-
-DESCRIPTION="Library interface to IPMI"
-HOMEPAGE="https://sourceforge.net/projects/openipmi/"
-MY_PN="OpenIPMI"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc x86"
-IUSE="crypt snmp perl tcl python"
-S="${WORKDIR}/${MY_P}"
-RESTRICT='test'
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-libs/gdbm
-	sys-libs/ncurses:0=
-	crypt? ( dev-libs/openssl:0= )
-	snmp? ( net-analyzer/net-snmp )
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-1.3.21
-	virtual/pkgconfig"
-# Gui is broken!
-#		python? ( tcl? ( tk? ( dev-lang/tk dev-tcltk/tix ) ) )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Bug #338499: The installed OpenIPMIpthread.pc depends on a non-existing
-	# pthread.pc. We patch it to link -lpthread directly instead.
-	epatch "${FILESDIR}/${PN}-2.0.16-pthreads.patch"
-	# Bug #290763: The buildsys tries to compile+optimize the py file during
-	# install, when the .so might not be been added yet. We just skip the files
-	# and use python_optimize ourselves later instead.
-	sed -r -i \
-		-e '/INSTALL.*\.py[oc] /d' \
-		-e '/install-exec-local/s,OpenIPMI.pyc OpenIPMI.pyo,,g' \
-		swig/python/Makefile.{am,in}
-
-	# Bug #298250: parallel install fix.
-	sed -r -i \
-		-e '/^install-data-local:/s,$, install-exec-am,g' \
-		cmdlang/Makefile.{am,in}
-
-	# We touch the .in and .am above because if we use the below, the Perl stuff
-	# is very fragile, and often fails to link.
-	#cd "${S}"
-	#elibtoolize
-	#eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-	myconf="${myconf} `use_with snmp ucdsnmp yes`"
-	myconf="${myconf} `use_with crypt openssl yes`"
-	myconf="${myconf} `use_with perl perl yes`"
-	myconf="${myconf} `use_with tcl tcl yes`"
-	myconf="${myconf} `use_with python python yes`"
-
-	# GUI is broken
-	#use tk && use python && use !tcl && \
-	#	ewarn "Not building Tk GUI because it needs both Python AND Tcl"
-	#if use python && use tcl; then
-	#	myconf="${myconf} `use_yesno tk tkinter yes`"
-	#else
-	#	myconf="${myconf} `use_yesno tk tkinter no`"
-	#fi
-
-	myconf="${myconf} --without-tkinter"
-	myconf="${myconf} --with-glib --with-swig"
-	# these binaries are for root!
-	econf ${myconf} --bindir=/usr/sbin
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README* FAQ ChangeLog TODO doc/IPMI.pdf lanserv/README.emulator
-	newdoc cmdlang/README README.cmdlang
-
-	use python && python_optimize
-}
diff --git a/sys-libs/openipmi/openipmi-2.0.22.ebuild b/sys-libs/openipmi/openipmi-2.0.22.ebuild
index d6e064b0e91d..3daad1105d0b 100644
--- a/sys-libs/openipmi/openipmi-2.0.22.ebuild
+++ b/sys-libs/openipmi/openipmi-2.0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ RESTRICT='test'
 
 RDEPEND="
 	dev-libs/glib:2
-	sys-libs/gdbm
+	sys-libs/gdbm:=
 	sys-libs/ncurses:0=
 	crypt? ( dev-libs/openssl:0= )
 	snmp? ( net-analyzer/net-snmp )
diff --git a/sys-libs/openipmi/openipmi-2.0.23_rc1.ebuild b/sys-libs/openipmi/openipmi-2.0.24.ebuild
index 3f4ded19e175..caa0c823d905 100644
--- a/sys-libs/openipmi/openipmi-2.0.23_rc1.ebuild
+++ b/sys-libs/openipmi/openipmi-2.0.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ RESTRICT='test'
 
 RDEPEND="
 	dev-libs/glib:2
-	sys-libs/gdbm
+	sys-libs/gdbm:=
 	sys-libs/ncurses:0=
 	crypt? ( dev-libs/openssl:0= )
 	snmp? ( net-analyzer/net-snmp )
@@ -73,12 +73,19 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=()
-	myconf+=( $(use_with snmp ucdsnmp yes) )
-	myconf+=( $(use_with crypt openssl yes) )
-	myconf+=( $(use_with perl perl yes) )
-	myconf+=( $(use_with tcl tcl yes) )
-	myconf+=( $(use_with python python yes) )
+	local myconf=(
+		# these binaries are for root!
+		--bindir=/usr/sbin
+		--with-glib
+		--with-glibver=2.0
+		--with-swig
+		--without-tkinter
+		$(use_with snmp ucdsnmp yes)
+		$(use_with crypt openssl yes)
+		$(use_with perl perl yes)
+		$(use_with tcl tcl yes)
+		$(use_with python python yes)
+	)
 
 	# GUI is broken
 	#use tk && use python && use !tcl && \
@@ -89,10 +96,7 @@ src_configure() {
 	#	myconf+=( --without-tkinter )
 	#fi
 
-	myconf+=( --without-tkinter )
-	myconf+=( --with-glib --with-glibver=2.0 --with-glib12=no --with-swig )
-	# these binaries are for root!
-	econf ${myconf[@]} --bindir=/usr/sbin
+	econf "${myconf[@]}"
 }
 
 src_install() {