gentoo resync : 14.05.2020

7 files changed, 13 insertions, 267 deletions

diff --git a/sys-libs/openipmi/Manifest b/sys-libs/openipmi/Manifest
index 5f52d428f23b..724822850734 100644
--- a/sys-libs/openipmi/Manifest
+++ b/sys-libs/openipmi/Manifest
@@ -1,12 +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
 AUX openipmi-2.0.26-readline.patch 291 BLAKE2B 82885b89bda01db81472e6dd72883450dc83e78a2a8f6f49d0909d828009897f2bcd7218fbfc971c4f2a0e368e1a80024040ce17f23a3d349a1da7a56ea146dd SHA512 f2d401bfcc155f0488cf1f23942a177e29de6439b42a8521ff35e9cc61601ce00cd7e458f651e422ab8cee2f901b85431414dd8e2bcf41f633e0f09c82d27b23
 AUX openipmi-2.0.26-tinfo.patch 808 BLAKE2B fc7545b3610c9ba6a2d8d7075a8db3384659945bd7d85758342438f261fedce67bace7795a74ff6010f68d04d8ae33936b6c60780986c9e0d66e93061577132f SHA512 2deae71fd039126cb3dd0a348658ddbf568345c782c2467a4712d36006217f86eaf86950c821d36a400aea4cf18409684e8abd3b1e504928f5bc6d4cf943c4bb
-DIST OpenIPMI-2.0.22.tar.gz 3081893 BLAKE2B 6ec5ec7f61f3033a9d953df4b091522fa5bd891a93dfe648f807548e3dc0f5ffc0d15af9b687379e6749d7b97ee2fd6c7f9e713aaa7423b82bf099fb2d0fb6b8 SHA512 78017fc0b52ce6a83db45f595f50170410120c9f7394429869c177ee40ea5b924bcc0e36bb60f9368a75a2f78ff71c70ae3631ba55a207cfb6eb4f62aa44ff89
-DIST OpenIPMI-2.0.26.tar.gz 3124706 BLAKE2B 08afeae1063b404dec3d6f9e5decdf9ac516c0096d8db3c42ff275c280267aa6a202cf4c63c5044cf1d24a95ecd617ad36c15e5c98c6b9cdad2647227f649ae6 SHA512 ffd1ea60727973238461c95373c71e28da04e2fd163bfcb8f5ef9a8ac197b554773231c064cac71c64fc7ccd720085a781fe3c6c8ed3c9dc5cc8ca88fff6f2d0
 DIST OpenIPMI-2.0.27.tar.gz 3125193 BLAKE2B 86639a86803e49393aefbaf5b1d1fee8e2bf399b2772bdee7d07a00d5e6657efe5cdf962cacb0397f9de5deb0b18edc05783c3388f4fc19e1ee2de4c01be0663 SHA512 44aa2eb97559514d61654434f24bf8e87c3f89ea7095fd3d46c1a889e16c128f29ca19cfb9747afc7fd432ada84406ee884bc8b9c65e28b8bd033d368b744fe3
-EBUILD openipmi-2.0.22.ebuild 2760 BLAKE2B 1755a490ede8a7a5a6a5313ffb589017ac113014d3c104a5b94a72d65f47dc2521c90b3e2bb8278d32c688f895209279ae826473885a9704dd2c3fa81b711076 SHA512 19eea699731abd90b3ff0cd9ceba7d79908d71f189592dd8a9344eac847b818a5fc95f5d0af6fb40d0684f1e13712e3a4bd9479d83aedcc204b7dee1f2a2184f
-EBUILD openipmi-2.0.26.ebuild 2540 BLAKE2B 68cd72d29de0e55011fa93c0c48db72cc6726e1b1fd67055d6d77937b9e7df032eb94c5b56f033a36a4945e81854b176ff2a0229fea64058cd67827a45787435 SHA512 82cda168439eb503b409085f16a8b4ddb74357eabc8fc2d2335d0830002dc284170c79bbb3caee5daff2431f4c9b10292ff6bc6220028a3c3a44d371b21f2422
-EBUILD openipmi-2.0.27-r1.ebuild 2328 BLAKE2B 801d566abb85f4c015f9ad9393b2d33f11c2820fd7f03ea7e3635b3d449e60f76b93ff8ec7d1f78ea13bef1e8d02ff57bdf47bb065efac85fe021436ec272560 SHA512 d2238bcc740b0cf0bc88bfa2704971df8deb846d36abc18086ce62287a67ccd6395bb4a7018a8714bceba1083cfbaf1604ce39402eb50a0bf1e1a1097838124d
-EBUILD openipmi-2.0.27.ebuild 2576 BLAKE2B ab9848f52cb082869193255baa9c6e5f97011ed84755228771670f5e88c421d52dd12994bfa363a7ac4e7b2f8cad15d625020f09bf85e55c86e24696b8a8f8a9 SHA512 544afc4392b57bbef97ffc141bfd3a14e3e13f1aec10a5a725c9a686411e5314b40d209e0b0813644652a6e22aa5a2f5f322c0ebaf588c155a574b91e72d01db
+DIST OpenIPMI-2.0.28.tar.gz 3118911 BLAKE2B 0f4192dc536ec1767ee72cf9f0d2c3b021e5f8e88b4029846a27c3b6561a3c63d44f4bad7ced234a171504804d2d9cdd90d0c6a6dc178f9f76ea52f6df20b9d0 SHA512 faaca335f7ff582f396d588c6b3736b4e2756a9914becba75550878a10d7acce55e85912bcf5cd9e482c3e646eb472a8a055c520f2dcba7a874f0c0f120502da
+EBUILD openipmi-2.0.27-r1.ebuild 2322 BLAKE2B b8421f48e67af99154607e36216fa69ed62330f37314764c90ce29f623343be3fc1ede6755f6e3dd082a508db045745f7955fe9383441197006170edac0668a9 SHA512 9f9c1806008f49d31aaabfd58390ae024a5df6f1365ac287637c6748eec33b676dc7205f282c7a50f17228a5d6212b3587991870341ee95d4480bb8a3417bbce
+EBUILD openipmi-2.0.28.ebuild 2282 BLAKE2B 2da57c9476099e46e2eb7d9fbb3a04e5bfc481a740b157aab5ef1a207461ec23442d2e02235cc5ad4de97a4146571942aabf2c7a2455852f2bfe996809592de1 SHA512 2e8289a67e7873097b063b11fe475c29b7cac49b95a62b3b9b32035535901b1fa377cb2cd23c34ee9cdbdbf6373335508fd189912a66c128db582d6e7592bcc4
 MISC metadata.xml 347 BLAKE2B 4857bbfde0e588b4ad2ac893f826affe46d77ead16c7565fa775580c23fdd35df745a9050b599d0ff333290a155b48cf6d571065abd8b2fe5cc4b2e136f3efc1 SHA512 f67b97714b2b543109c2bc90d8f474df13e8915b7a14fdc3a16b62f1dfbc59ac27c8e64d19429b87a63ee2c1e4812cee26d8fb797591028484b2072b1951231f
diff --git a/sys-libs/openipmi/files/openipmi-2.0.16-pthreads.patch b/sys-libs/openipmi/files/openipmi-2.0.16-pthreads.patch
deleted file mode 100644
index 7666e34e936f..000000000000
--- a/sys-libs/openipmi/files/openipmi-2.0.16-pthreads.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN OpenIPMI-2.0.16.orig/OpenIPMIpthread.pc.in OpenIPMI-2.0.16/OpenIPMIpthread.pc.in
---- OpenIPMI-2.0.16.orig/OpenIPMIpthread.pc.in	2005-08-17 05:56:02.000000000 +0200
-+++ OpenIPMI-2.0.16/OpenIPMIpthread.pc.in	2010-10-31 21:35:56.126933520 +0100
-@@ -6,6 +6,6 @@
- Name: OpenIPMIpthread
- Description: Pthread OS handler for OpenIPMI
- Version: @VERSION@
--Requires: OpenIPMI pthread
--Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIpthread
-+Requires: OpenIPMI
-+Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIpthread -lpthread
- Cflags: -I${includedir}
diff --git a/sys-libs/openipmi/files/openipmi-2.0.21-tinfo.patch b/sys-libs/openipmi/files/openipmi-2.0.21-tinfo.patch
deleted file mode 100644
index 5eb8642ab2e4..000000000000
--- a/sys-libs/openipmi/files/openipmi-2.0.21-tinfo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac	2014-01-28 20:35:02.000000000 +0100
-+++ b/configure.ac	2015-09-23 17:05:03.526010122 +0200
-@@ -861,10 +861,12 @@
-    *-sun-*) AC_DEFINE([_SUNOS], [], [Solaris's term.h does horrid things.]);;
- esac
- 
--AC_CHECK_LIB(curses, tgetent, TERM_LIBS=-lcurses,
-+PKG_CHECK_MODULES(ncurses, ncurses, TERM_LIBS=$ncurses_LIBS,
-+ [AC_CHECK_LIB(tinfo, tgetent, TERM_LIBS=-ltinfo,
-+  [AC_CHECK_LIB(curses, tgetent, TERM_LIBS=-lcurses,
-    [AC_CHECK_LIB(ncursesw, tgetent, TERM_LIBS=-lncursesw,
-     [AC_CHECK_LIB(ncurses, tgetent, TERM_LIBS=-lncurses,
--      [AC_MSG_ERROR([libtermcap, libcurses or libncurses are required!])])] )] )
-+     [AC_MSG_ERROR([libtinfo, libtermcap, libcurses or libncurses are required!])])] )] )] )] )
- 
- # Checks for header files.
- AC_FUNC_ALLOCA
diff --git a/sys-libs/openipmi/openipmi-2.0.22.ebuild b/sys-libs/openipmi/openipmi-2.0.22.ebuild
deleted file mode 100644
index c000ca432132..000000000000
--- a/sys-libs/openipmi/openipmi-2.0.22.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 python tcl"
-S="${WORKDIR}/${MY_P}"
-RESTRICT='test'
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-libs/gdbm:=
-	sys-libs/ncurses:0=
-	sys-libs/readline: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} )"
-
-PATCHES=(
-	# Bug #338499: The installed OpenIPMIpthread.pc depends on a non-existing
-	# pthread.pc. We patch it to link -lpthread directly instead.
-	"${FILESDIR}/${PN}-2.0.16-pthreads.patch"
-
-	# https://bugs.gentoo.org/501510
-	"${FILESDIR}/${PN}-2.0.21-tinfo.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# 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}"
-	eautoreconf
-}
-
-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) )
-
-	# 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+=( $(use_with tk tkinter) )
-	#else
-	#	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
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README* FAQ ChangeLog TODO doc/IPMI.pdf lanserv/README.vm
-	newdoc cmdlang/README README.cmdlang
-
-	use python && python_optimize
-}
diff --git a/sys-libs/openipmi/openipmi-2.0.26.ebuild b/sys-libs/openipmi/openipmi-2.0.26.ebuild
deleted file mode 100644
index 7a1399ffdb1a..000000000000
--- a/sys-libs/openipmi/openipmi-2.0.26.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit 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 python tcl"
-S="${WORKDIR}/${MY_P}"
-RESTRICT='test'
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-libs/gdbm:=
-	sys-libs/ncurses:0=
-	sys-libs/readline: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} )"
-
-PATCHES=(
-	# https://bugs.gentoo.org/501510
-	"${FILESDIR}/${PN}-2.0.26-tinfo.patch"
-
-	"${FILESDIR}/${PN}-2.0.26-readline.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# 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}"
-	eautoreconf
-}
-
-src_configure() {
-	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 && \
-	#	ewarn "Not building Tk GUI because it needs both Python AND Tcl"
-	#if use python && use tcl; then
-	#	myconf+=( $(use_with tk tkinter) )
-	#else
-	#	myconf+=( --without-tkinter )
-	#fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README* FAQ ChangeLog TODO doc/IPMI.pdf lanserv/README.vm
-	newdoc cmdlang/README README.cmdlang
-
-	use python && python_optimize
-}
diff --git a/sys-libs/openipmi/openipmi-2.0.27-r1.ebuild b/sys-libs/openipmi/openipmi-2.0.27-r1.ebuild
index 4d46cb0f50df..4a278338a6da 100644
--- a/sys-libs/openipmi/openipmi-2.0.27-r1.ebuild
+++ b/sys-libs/openipmi/openipmi-2.0.27-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools python-single-r1
 
diff --git a/sys-libs/openipmi/openipmi-2.0.27.ebuild b/sys-libs/openipmi/openipmi-2.0.28.ebuild
index f16da0c32639..31dc7fbff09a 100644
--- a/sys-libs/openipmi/openipmi-2.0.27.ebuild
+++ b/sys-libs/openipmi/openipmi-2.0.28.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools python-single-r1
 
@@ -16,7 +16,7 @@ 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 python tcl"
+IUSE="crypt snmp perl python static-libs tcl"
 S="${WORKDIR}/${MY_P}"
 RESTRICT='test'
 
@@ -40,10 +40,7 @@ BDEPEND="virtual/pkgconfig"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
-	# https://bugs.gentoo.org/501510
-	"${FILESDIR}/${PN}-2.0.26-tinfo.patch"
-
-	"${FILESDIR}/${PN}-2.0.26-readline.patch"
+	"${FILESDIR}/${PN}-2.0.26-tinfo.patch" #501510
 )
 
 pkg_setup() {
@@ -53,14 +50,6 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# 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} || die
-
 	# Bug #298250: parallel install fix.
 	sed -r -i \
 		-e '/^install-data-local:/s,$, install-exec-am,g' \
@@ -68,7 +57,6 @@ src_prepare() {
 
 	# 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}"
 	eautoreconf
 }
 
@@ -105,4 +93,9 @@ src_install() {
 	newdoc cmdlang/README README.cmdlang
 
 	use python && python_optimize
+
+	find "${ED}" -name "*.la" -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
 }