Added fix for bug 338499 (OpenIPMIpthread.pc depends on non-existing pthread.pc); ok'ed by robbat2 on IRC

Package-Manager: portage-2.1.9.23/cvs/Linux x86_64

4 files changed, 148 insertions, 2 deletions

diff --git a/sys-libs/openipmi/ChangeLog b/sys-libs/openipmi/ChangeLog
index 5aae724ebacd..8270e9a72249 100644
--- a/sys-libs/openipmi/ChangeLog
+++ b/sys-libs/openipmi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/openipmi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/openipmi/ChangeLog,v 1.23 2010/10/16 15:56:57 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/openipmi/ChangeLog,v 1.24 2010/10/31 21:01:50 dilfridge Exp $
+
+*openipmi-2.0.16-r1 (31 Oct 2010)
+
+  31 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  +openipmi-2.0.16-r1.ebuild, +files/openipmi-2.0.16-pthreads.patch:
+  Added fix for bug 338499 (OpenIPMIpthread.pc depends on non-existing
+  pthread.pc)
 
   16 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   openipmi-2.0.16.ebuild:
diff --git a/sys-libs/openipmi/Manifest b/sys-libs/openipmi/Manifest
index f3ba6d951783..110a6e2f15d6 100644
--- a/sys-libs/openipmi/Manifest
+++ b/sys-libs/openipmi/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX openipmi-2.0.16-pthreads.patch 546 RMD160 af00e11aafbed22b6b5eeb792c23cbf088eb55ef SHA1 4d57b6ccdd383f0d451ffb981114a4e9653dc934 SHA256 1f40883f92842a1b3d634ed23294fc26ef4a78cd3906034ad7cdf9617331e2df
 DIST OpenIPMI-1.3.18.tar.gz 993450 RMD160 6e4f96d1ef7d70cb04ce5b48558a2a4a1b7236bd SHA1 973bd78e652a533a97931baa473f00496a020cbb SHA256 d30bd5fe601c2f34367678f5b5aadaa879f35024eed6a0a585b30099560ff4af
 DIST OpenIPMI-1.4.12.tar.gz 1887180 RMD160 d7ee2701a40be9965c228e4f24ed1d7cf6ffed08 SHA1 4b2abea28e21b2e0d41d7eb20fe53686c367f7a4 SHA256 df684c19808c49c3b9b6b68ddd808c41cef283099e0b7dcb9877b5b1223048a4
 DIST OpenIPMI-1.4.14.tar.gz 1890751 RMD160 875133650b07dd40db55bfc56de9e646e7b22393 SHA1 20edc3c4c84ad3f819e04b09238ff6a6fd99f502 SHA256 53fd789ab980c57be7155d397276a7bba214a41dccbc47c86757a669f9cddae7
@@ -9,6 +13,24 @@ EBUILD openipmi-1.4.12.ebuild 1206 RMD160 c98b138164551c63b6fbea1c4f243eff72e2c4
 EBUILD openipmi-1.4.14.ebuild 1206 RMD160 3b67e0f93d99bc87281a2292c1aa8bfec60ce4be SHA1 92bdf303389899ad3664a8f431972af26c9f5668 SHA256 b261386761275ef0355986af81389a77fae8b4166b3bd1bcee890c935b3cd741
 EBUILD openipmi-1.4.28.ebuild 1216 RMD160 11818989d99e1e55cbcb1cfcf172e977335c9767 SHA1 eb51cda7bb908e91afa1752ad6f325195a236a8d SHA256 a5c6d6e179a4cacad95050917c89b12e47aab1f16fe5bf69bda18f61121b5a93
 EBUILD openipmi-2.0.11.ebuild 1969 RMD160 eb3bbed3e3a5786fd278fcb0f18591152769200b SHA1 7c9e7e74482863d837cae6ef2edab3abcbde11c6 SHA256 fcde13f37ddacccd969b5b513ebd033464951e056cd303c4263444f439614760
+EBUILD openipmi-2.0.16-r1.ebuild 3033 RMD160 9b9899a1ea442f38508ed46d47a5131227a5e6fe SHA1 cb852bd4c6230f3a4897f45d8c22842894b21e85 SHA256 29cc8d6e4b99a634ac1ca12c9adcea72700cd0fb8277d7387562de68488aae1a
 EBUILD openipmi-2.0.16.ebuild 2839 RMD160 2f6203d378e1f80f1e697b010d04a829c7d4eb77 SHA1 83beaa181602daaa9ae5f79ec799171332a3d3d8 SHA256 933d42bb938efedd877ae3382f1992cce74a4b17aed030a54e3a693f082f2211
-MISC ChangeLog 3303 RMD160 5382ab54b1a0cf902f2e0a43c07dc4a030c2efdd SHA1 5bc98eadc95ed96fb50b90fa0083dceddef24045 SHA256 7811e0873f7d5b378cb3ce16d77b8d60bef1fa0f366e61c7000a603a5f62e939
+MISC ChangeLog 3551 RMD160 85d2df6333af5dbf088fd65bce1e41feeea1fae5 SHA1 2d4a1ee9ad8fdf9bc3ab28aed6603a297b3eee16 SHA256 86bf4fa11acb9a5f84c4ee46cd550729bf466ace1d87f7ac3d1c8c02c4263c03
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBAgAGBQJMzdkUAAoJENwGBM22xffemZIP/Rj/6Pg2+XbKTAHo6A/0NKY9
+1HL+zurlkzYYv394N+MK9uLzF6u+5YHMA0g8FyhUY+AL2mM/QuIFHlv+RWeEpeQn
+8fb4AElenOycZs6Eeip+8lhQF6krbE/PIizNAnVFTct9SSNVR4wvb13RnKvQhU5E
+mlRDkiBOU/q3MPv/JKQmRkZyF2Ud3R+4AEpxxWnD71GQLjin9N91ozKNuH5+c4ud
+vOj8kz84vRiRcgpmsxSQeEwwzmlItTXMnKUtEYivTqrbMbHP5ArB9O8ER6SEdaA6
+ro002cbfmXPMQQlLBdOKEa+JWpTijab3QSXLdifUzMSbyQ5WivEzip+NOF6nFseA
+eI59nF8bmOPvTikV7erCqTiDIJCCbXf4RkPq6obKzH1J1F5zFUfmKW70vJNmcovH
+XMMkGEt1LJd3D/Oafoa2SD+O590Ja8iI0TQ+0a8uNjlKh3V0W2tiW5Ifd8eDROpR
+YcrQRMO0cGPiqtRoenIlsCC3JyWxyPKQbHy0v/ZTswnzpcwOZHlFz7+KdSd50Yc5
+wYuy+w820aIHZQNSkh6Q/us19iTdIvlBy6NgkIWm1laXD7T0+GrWRYTOrfJagIMt
+S1fZ+OxC5H+zi+ziOqYrPPhlJOvna2D3tXIyC0XqtUwwOK1uyrccDg1KRRftWIsP
+akgQ1rFLIZf5NWFjwzRR
+=wQc9
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/openipmi/files/openipmi-2.0.16-pthreads.patch b/sys-libs/openipmi/files/openipmi-2.0.16-pthreads.patch
new file mode 100644
index 000000000000..7666e34e936f
--- /dev/null
+++ b/sys-libs/openipmi/files/openipmi-2.0.16-pthreads.patch
@@ -0,0 +1,12 @@
+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/openipmi-2.0.16-r1.ebuild b/sys-libs/openipmi/openipmi-2.0.16-r1.ebuild
new file mode 100644
index 000000000000..5e57c5fd4b97
--- /dev/null
+++ b/sys-libs/openipmi/openipmi-2.0.16-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/openipmi/openipmi-2.0.16-r1.ebuild,v 1.1 2010/10/31 21:01:50 dilfridge Exp $
+
+inherit eutils autotools python
+
+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 ~ia64 ~ppc ~x86"
+IUSE="crypt snmp perl tcl python"
+S="${WORKDIR}/${MY_P}"
+RESTRICT='test'
+
+RDEPEND="dev-libs/glib
+	sys-libs/gdbm
+	crypt? ( dev-libs/openssl )
+	snmp? ( net-analyzer/net-snmp )
+	perl? ( dev-lang/perl )
+	python? ( dev-lang/python )
+	tcl? ( dev-lang/tcl )"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.21
+	dev-util/pkgconfig"
+# Gui is broken!
+#		python? ( tcl? ( tk? ( dev-lang/tk dev-tcltk/tix ) ) )"
+
+# Upstream doesn't use --without properly
+use_yesno() {
+	yesmsg="yes"
+	[ -n "$3" ] && yesmsg="$3"
+	if use $1; then
+		echo "--with-$2=${yesmsg}"
+	else
+		echo "--without-$2"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	# Bug #338499: The installed OpenIPMIpthread.pc depends on a non-existing
+	# pthread.pc. We patch it to link -lpthread directly instead.
+	epatch "${FILESDIR}/${P}-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_mod_optimize ourselves later instead.
+	sed -r -i \
+		-e '/INSTALL.*\.py[oc] /d' \
+		-e '/install-exec-local/s,OpenIPMI.pyc OpenIPMI.pyo,,g' \
+		"${S}"/swig/python/Makefile.{am,in}
+
+	# Bug #298250: parallel install fix.
+	sed -r -i \
+		-e '/^install-data-local:/s,$, install-exec-am,g' \
+		"${S}"/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_compile() {
+	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 || die "econf failed"
+	emake || die "emake $i failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README* FAQ ChangeLog TODO doc/IPMI.pdf lanserv/README.emulator
+	newdoc cmdlang/README README.cmdlang
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize $(python_get_sitedir)/OpenIPMI.py
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup $(python_get_sitedir)/OpenIPMI.py
+}