public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/openipmi/files/, sys-libs/openipmi/
@ 2016-04-25  7:33 Lars Wendler
  0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2016-04-25  7:33 UTC (permalink / raw
  To: gentoo-commits

commit:     7f20951a60dcf8ef047c845bdece4259e7442c34
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 07:31:39 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 07:33:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f20951a

sys-libs/openipmi: Bump to version 2.0.21

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-libs/openipmi/Manifest                         |   1 +
 .../openipmi/files/openipmi-2.0.21-tinfo.patch     |  18 ++++
 sys-libs/openipmi/openipmi-2.0.21.ebuild           | 105 +++++++++++++++++++++
 3 files changed, 124 insertions(+)

diff --git a/sys-libs/openipmi/Manifest b/sys-libs/openipmi/Manifest
index 52e36af..87bb6b0 100644
--- a/sys-libs/openipmi/Manifest
+++ b/sys-libs/openipmi/Manifest
@@ -5,3 +5,4 @@ DIST OpenIPMI-1.4.28.tar.gz 2310138 SHA256 75fbff6c03c1bbea448aa8021aa2f0ee5c4f7
 DIST OpenIPMI-2.0.11.tar.gz 2897970 SHA256 9a824bc1faf69ef8e668dcc426c356b41abb4a18a7367c9fbbc87350df7b9cfa SHA512 266c380b83a445fd6cec5be73c8235f69229df61bf644e25d2a99dbc371e2adb66ee93c07972aa904a80f1be627d13ca2817f2815db3bb05c34e3418cd8b7392 WHIRLPOOL d9d46a8b275c25f7b6855728884189ed7ae36f03690ccc702cff32881d8a9ab481815d4105243917a4230390a4c8fd8e0181c0c8d70b800e958baad1936f4f7f
 DIST OpenIPMI-2.0.16.tar.gz 2890960 SHA256 1a2f9881f27de2bb64b70c8bf9a7c38b5447e4c9a0ec9e0bf6a2833f15893c05 SHA512 f848f805427c886f41419d1312b4b2103bccf99a395c445abf4753809a5a4780a9105d25684527d4d9f43b8047726d273d18708ac67b99bae18fc294b5ea37a9 WHIRLPOOL e070a383a0639742a6302a3e546ed1a26c4a491561daf2ef991049892f4de0659370c993c486a9c2217549cf18e9829cb6fe4497b9cc528f222c0a16d612d88a
 DIST OpenIPMI-2.0.18.tar.gz 2895686 SHA256 6c1679a1c16aade48dd929e5124d2640ff12224ac0de1bb3777e9f1030d62e01 SHA512 a6caf791fb6d5bd83234481ea3c84a408dad3eabc093dbc4681742d23b47b223d0a1715a71a9b977a03a80f5c350dd34f6591ece5ea0d9876cb6debfc80a39d4 WHIRLPOOL 3b9bd32e01c118a450c5f6ec744b5cad521d41091f786a59485b91cde05ca184bdb4d8c05d53e9494966a9a733c560190f85208bedaa3b40e2cac116e3e6a84a
+DIST OpenIPMI-2.0.21.tar.gz 3473323 SHA256 37b844d02119b94b31e2bb2bd8062ffdf6cd3eb4bc75fa6c47184e8b14fe95b8 SHA512 b684259ee5d47c36273fe6b47d60d0481c96b64b2e9421ce3190d9514e4f450b0db28d12c86a8814dcce23ba3ecfcecbbe9251d298244f1e9194a9f7563862a5 WHIRLPOOL 577da7215effe5f2e26616b4c744da42fd261263834d4d3d264220f95c4a60b3955c642d27c32af30dbf2ce0821078a463fa140edc9d3475daec7e6f84361958

diff --git a/sys-libs/openipmi/files/openipmi-2.0.21-tinfo.patch b/sys-libs/openipmi/files/openipmi-2.0.21-tinfo.patch
new file mode 100644
index 0000000..5eb8642
--- /dev/null
+++ b/sys-libs/openipmi/files/openipmi-2.0.21-tinfo.patch
@@ -0,0 +1,18 @@
+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.21.ebuild b/sys-libs/openipmi/openipmi-2.0.21.ebuild
new file mode 100644
index 0000000..0f6bcbf
--- /dev/null
+++ b/sys-libs/openipmi/openipmi-2.0.21.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils autotools python-single-r1
+
+DESCRIPTION="Library interface to IPMI"
+HOMEPAGE="http://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
+	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}"
+	elibtoolize
+	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-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
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-libs/openipmi/files/, sys-libs/openipmi/
@ 2020-05-07 14:07 Lars Wendler
  0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2020-05-07 14:07 UTC (permalink / raw
  To: gentoo-commits

commit:     ad444df6172d38eb6eeb08447c32661730bb045a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May  7 13:58:49 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May  7 14:06:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad444df6

sys-libs/openipmi: Removed old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-libs/openipmi/Manifest                         |   2 -
 .../openipmi/files/openipmi-2.0.16-pthreads.patch  |  12 ---
 .../openipmi/files/openipmi-2.0.21-tinfo.patch     |  18 ----
 sys-libs/openipmi/openipmi-2.0.22.ebuild           | 105 --------------------
 sys-libs/openipmi/openipmi-2.0.26.ebuild           | 107 --------------------
 sys-libs/openipmi/openipmi-2.0.27.ebuild           | 108 ---------------------
 6 files changed, 352 deletions(-)

diff --git a/sys-libs/openipmi/Manifest b/sys-libs/openipmi/Manifest
index 756f5ec04fb..bd5bfc2d42f 100644
--- a/sys-libs/openipmi/Manifest
+++ b/sys-libs/openipmi/Manifest
@@ -1,4 +1,2 @@
-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
 DIST OpenIPMI-2.0.28.tar.gz 3118911 BLAKE2B 0f4192dc536ec1767ee72cf9f0d2c3b021e5f8e88b4029846a27c3b6561a3c63d44f4bad7ced234a171504804d2d9cdd90d0c6a6dc178f9f76ea52f6df20b9d0 SHA512 faaca335f7ff582f396d588c6b3736b4e2756a9914becba75550878a10d7acce55e85912bcf5cd9e482c3e646eb472a8a055c520f2dcba7a874f0c0f120502da

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 7666e34e936..00000000000
--- 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 5eb8642ab2e..00000000000
--- 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 c000ca43213..00000000000
--- 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 7a1399ffdb1..00000000000
--- 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.ebuild b/sys-libs/openipmi/openipmi-2.0.27.ebuild
deleted file mode 100644
index f16da0c3263..00000000000
--- a/sys-libs/openipmi/openipmi-2.0.27.ebuild
+++ /dev/null
@@ -1,108 +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"
-BDEPEND="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} || die
-
-	# Bug #298250: parallel install fix.
-	sed -r -i \
-		-e '/^install-data-local:/s,$, install-exec-am,g' \
-		cmdlang/Makefile.{am,in} || die
-
-	# 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="${EPREFIX}"/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
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-libs/openipmi/files/, sys-libs/openipmi/
@ 2024-01-08 16:54 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-01-08 16:54 UTC (permalink / raw
  To: gentoo-commits

commit:     c798862e4a607518927bf3353524a24f2dbb480f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 16:53:34 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 16:53:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c798862e

sys-libs/openipmi: fix modern C issue w/ USE=perl

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/openipmi/files/openipmi-2.0.33-c99.patch | 56 +++++++++++++
 sys-libs/openipmi/openipmi-2.0.33-r1.ebuild       | 98 +++++++++++++++++++++++
 2 files changed, 154 insertions(+)

diff --git a/sys-libs/openipmi/files/openipmi-2.0.33-c99.patch b/sys-libs/openipmi/files/openipmi-2.0.33-c99.patch
new file mode 100644
index 000000000000..b7786c3ceab1
--- /dev/null
+++ b/sys-libs/openipmi/files/openipmi-2.0.33-c99.patch
@@ -0,0 +1,56 @@
+https://sourceforge.net/p/openipmi/patches/38/
+
+C type errors in the SWIG-generated Perl bindings
+
+The first change fixes an error with newer compilers:
+
+OpenIPMI_wrap.c: In function ‘_wrap_strconstarray_val_set’:
+OpenIPMI_wrap.c:10491:27: error: assignment to ‘const char **’ from incompatible pointer type ‘char **’
+10491 |     if (arg1) (arg1)->val = arg2;
+      |                           ^
+
+The second change is also about a compiler error:
+
+In file included from /usr/lib64/perl5/CORE/perl.h:4530,
+                 from OpenIPMI_wrap.c:751:
+OpenIPMI_wrap.c: In function ‘_wrap_ipmi_sol_conn_t_write’:
+/usr/lib64/perl5/CORE/sv.h:1952:31: error: passing argument 3 of ‘Perl_SvPV_helper’ from incompatible pointer type
+ 1952 |    Perl_SvPV_helper(aTHX_ sv, &len, flags, SvPVnormal_type_,                \
+/usr/lib64/perl5/CORE/sv.h:1972:37: note: in expansion of macro ‘SvPV_flags’
+ 1972 | #define SvPV(sv, len)               SvPV_flags(sv, len, SV_GMAGIC)
+      |                                     ^~~~~~~~~~
+OpenIPMI_wrap.c:27664:24: note: in expansion of macro ‘SvPV’
+27664 |         (&arg2)->val = SvPV(tempsv, (&arg2)->len);
+      |                        ^~~~
+In file included from /usr/lib64/perl5/CORE/perl.h:7812:
+/usr/lib64/perl5/CORE/sv_inline.h:908:33: note: expected ‘STRLEN * const’ {aka ‘long unsigned int * const’} but argument is of type ‘int *’
+  908 |                  STRLEN * const lp,
+      |                  ~~~~~~~~~~~~~~~^~
+
+But the existing code looks broken on big-endian 64-bit architectures,
+too.
+
+--- a/swig/OpenIPMI.i
++++ b/swig/OpenIPMI.i
+@@ -359,7 +359,7 @@ typedef struct iargarray
+ %}
+ typedef struct strconstarray
+ {
+-    char **val;
++    const char **val;
+     int len;
+ } strconstarray;
+ typedef struct argarray
+--- a/swig/perl/OpenIPMI_lang.i
++++ b/swig/perl/OpenIPMI_lang.i
+@@ -292,7 +292,9 @@
+ 	$1.val = NULL;
+ 	$1.len = 0;
+     } else {
+-	$1.val = SvPV(tempsv, $1.len);
++	STRLEN len;
++	$1.val = SvPV(tempsv, len);
++	$1.len = len;
+     }
+ }
+ 

diff --git a/sys-libs/openipmi/openipmi-2.0.33-r1.ebuild b/sys-libs/openipmi/openipmi-2.0.33-r1.ebuild
new file mode 100644
index 000000000000..26db37796649
--- /dev/null
+++ b/sys-libs/openipmi/openipmi-2.0.33-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools python-single-r1
+
+MY_PN="OpenIPMI"
+MY_P="${MY_PN}-${PV/_/-}"
+DESCRIPTION="Library interface to IPMI"
+HOMEPAGE="https://sourceforge.net/projects/openipmi/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="crypt snmp perl python static-libs tcl"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/popt
+	sys-libs/gdbm:=
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	crypt? ( dev-libs/openssl:= )
+	snmp? ( net-analyzer/net-snmp )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	tcl? ( dev-lang/tcl:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=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=(
+	"${FILESDIR}/${PN}-2.0.26-tinfo.patch" # bug #501510
+	"${FILESDIR}/${PN}-2.0.33-c99.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# For tinfo patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		# These binaries are for root!
+		--bindir="${EPREFIX}"/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
+
+	find "${ED}" -name "*.la" -delete || die
+
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-01-08 16:54 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-07 14:07 [gentoo-commits] repo/gentoo:master commit in: sys-libs/openipmi/files/, sys-libs/openipmi/ Lars Wendler
  -- strict thread matches above, loose matches on Subject: below --
2024-01-08 16:54 Sam James
2016-04-25  7:33 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox