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

5 files changed, 156 insertions, 6 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 160319371263..954298ae8ff1 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -34,9 +34,11 @@ DIST glibc-2.10.1.tar.bz2 16106243 RMD160 ca102519ab32714e788a0db5dd43c2f9962c86
 DIST glibc-2.11.2-patches-3.tar.bz2 104300 RMD160 5f8d0f6616e37fce84b76a185000fb5e4fa155de SHA1 b92296a4c3f51a2cd279cd6b7848ea272c71e821 SHA256 9941fa942afcd6e5224fad04192ffbcc47464965c02196a32067e529d53c504b
 DIST glibc-2.11.2-patches-4.tar.bz2 113687 RMD160 bd7de7710ac9d834abd441b461b1ecc07c181010 SHA1 48bd6a30a74445544e04a08b14762fe64c4e1799 SHA256 259558d05233f5490324724f639154bd9882d8aa3cdf78bcea54f42ed0d70c94
 DIST glibc-2.11.2-patches-5.tar.bz2 116096 RMD160 155ffc550d46201951ccecf9e55fdd498ecd18b7 SHA1 89b74613d3a7678f93e55251d248c5dc9337c76c SHA256 7f471eea2506b214c86d2c2d49bccb120fa50ad3901a31f3182c82038fdb219f
+DIST glibc-2.11.2-patches-6.tar.bz2 117116 RMD160 5e2dda6ddd8620af9513aae1033595ebd149c8f9 SHA1 b0f4b73a49d1117649acd74523bb5358e54cbf5e SHA256 490b81357fc43f2d23a050ed39440363b223c1e3f34e77b4596b981680fd9f23
 DIST glibc-2.11.2.tar.bz2 15675392 RMD160 15d14fb6b0b58ec3fb7781efa2f8a558fcb99a7e SHA1 23b477f4816a97e007be1e98abc1ffe2af13ba9e SHA256 c2ac76ee363eed31b2a377489fb2818139f4668b5505ad583009eb9b0e228713
 DIST glibc-2.12.1-patches-4.tar.bz2 89636 RMD160 e746b43d314666be5ed6de9f83a96a618700d60e SHA1 3433058674151dbb714bf0826d77e13603b62e3d SHA256 1977abf5b8a432d0d00a7e35608aeb309ea451f6be1359b7c5d05e046274c74c
 DIST glibc-2.12.1-patches-5.tar.bz2 92009 RMD160 f4ba107afe104a283b692d1046d63bfee7d9f225 SHA1 1bf8b7dd4335f13d801a9fbb9d598fd54d60f66f SHA256 2b34b95da5b76cd7edae2bb1f02df5a105cceab6a8b86288839d0fb23a012209
+DIST glibc-2.12.1-patches-6.tar.bz2 93034 RMD160 61ceea345d40524d6b7c71af46ddc127eaf88b68 SHA1 640be07a15df583a5c493d0ce6f4a76820ab10aa SHA256 4571172d7a627047f6ba526edccde08d2c49be61c7e5713cd7ed3faabbc907a6
 DIST glibc-2.12.1.tar.bz2 15667516 RMD160 4a46745f4220f4253af0b882d0c2072499e17653 SHA1 ef5ca1e765719d3290bd24f94705f27534f3744b SHA256 759f115c52bc12c5bb453af559dcd456d32138250b7cc96e47804e3d0ec97407
 DIST glibc-2.2.5-manpages.tar.bz2 14667 RMD160 4f6e1fde042c19aca4718c8e06e19dc2786a1334 SHA1 7bb5615af98a8b5fb2ef91a47148fedef227c544 SHA256 03850134bd0c670d8b5fe5e3bad0dac2efdb7078ddf69e0dbcdba380f4d5697c
 DIST glibc-2.2.5-patches-1.0.tar.bz2 21176 RMD160 4575e4355a919b7865829d22ab86cbdcd53253ee SHA1 f8fa215694673c5ee69f00b3986bcd34d48c7d85 SHA256 39e20bbd032db00c3b0781a0055ed092e9ebcbc2f71e4c1930fd93cd67d374fd
@@ -71,9 +73,11 @@ DIST glibc-ports-2.7.tar.bz2 435392 RMD160 b9b96b357a394f29d5617aaa26a2c000bcf88
 EBUILD glibc-2.10.1-r1.ebuild 8161 RMD160 b21cba3d443ff63ebb776c9f15959c1e1e660136 SHA1 e08b8a9ef1f33e85912c5a9e70ce5fd885727bcd SHA256 19b9232a48a904243440581472a71f79bae7cc9674d26d875a6ab0b53ccee75d
 EBUILD glibc-2.11.2-r1.ebuild 8380 RMD160 14035184b6da0f4dde18390e473768a75cacf91b SHA1 b7903d9f368234a4a0cb57580b7ab97c8008eacc SHA256 0812666f36a94f0a51943d0437eb234d1c09be3fc2a0a276aa6d45ceb49e0e3d
 EBUILD glibc-2.11.2-r2.ebuild 8379 RMD160 d328e8725e94245781a4fa62e2a5c0f9f22cdbab SHA1 feb0cedeacccef84333d88a28b9de7caec3f6e7a SHA256 28cd6e65a74c3db8b7491109c805aad729f11e842603e8905741e2f4693b10f5
+EBUILD glibc-2.11.2-r3.ebuild 8387 RMD160 086e7c6749fe80205373bb92d071f080bb826b28 SHA1 391d1f086b5f8e81e2c3240fdd2eae2379e6775a SHA256 9823dc8032932e32a515df13bd404fddeeca7c95b40b5a3a5354259b1fe428ef
 EBUILD glibc-2.11.2.ebuild 8370 RMD160 342c97350747f0de699bb533971f58c240db889d SHA1 f56d0df6a07d7782cf1397a6f3d6d27382419eff SHA256 9674646b18ae27e6d03b0ef5612b4f47a298a4fbb71cbe9b2ed8c3f12318a136
 EBUILD glibc-2.12.1-r1.ebuild 8737 RMD160 8c41d7f4cb0160c0b4bf280e500261272213f2fd SHA1 55b22b83677444a9c103e9b02872000efc202a03 SHA256 486475f1b06269f36334475b7839c58b02799de3693fbca996f1204195fa5e73
 EBUILD glibc-2.12.1-r2.ebuild 8737 RMD160 d3ac61f7913a36da3c5c2e1d0b47c0b2543ca51e SHA1 0cf6351b0d16d0f04569bcba193aaa0760fb0747 SHA256 46bf9130b25136a3cd9993483a9fea9cecd9c238856946a53cf4c27d180da57b
+EBUILD glibc-2.12.1-r3.ebuild 8740 RMD160 fa093404bd7f25c315e8969b06025a1e00b18fa0 SHA1 2f20a7a3da90bc82e71560f579e3d2650131d596 SHA256 28ca7cfb525eb2973f84e7d2c86a35e393070d44d016df2ceb1b94e223b87b50
 EBUILD glibc-2.2.5-r10.ebuild 4847 RMD160 829dc6d11434ff2d8d202277595b0817b1a9ab28 SHA1 19523459701cabf750a777b17cbe0af34d4688dd SHA256 454a2b5d6201ab615f00c50987c7ac0328d22cc66db582851fcd27e2a967b17f
 EBUILD glibc-2.5-r4.ebuild 38684 RMD160 7cc84f40f23c1b78303a7b38d2579b8fde32efc1 SHA1 509f71b1d4c22105d6c30b5759711cb4a407fae8 SHA256 afe1d1ce196d191712767adf21dfb3c92d2bfc7a3c65e0f9c319d65701c2e6de
 EBUILD glibc-2.5.1.ebuild 38760 RMD160 0dad53d7789c5208233e3539eacba99e0841cbfe SHA1 3c03c80ab88d36bfb7a61e7b04c7e8c2f635aa1c SHA256 4ddf5f33c2de73283c4848787efc8acf5a3c6abc5a343aa553653e7480efca37
@@ -82,12 +86,12 @@ EBUILD glibc-2.7-r2.ebuild 12945 RMD160 8099396dc1820a98341f410e31d7d20c77daa928
 EBUILD glibc-2.8_p20080602-r1.ebuild 13488 RMD160 6b58dc46eb346a67557e5ce6b84a10a3688d649a SHA1 a89f61f4add7950715fedd27a4cc9fb68599f4c1 SHA256 f560d233bb3b0bcdda61fe6d052f54c253d43c9b31f7a2070e9b2f4003131b30
 EBUILD glibc-2.9_p20081201-r2.ebuild 7772 RMD160 ad3a0203d514fea907712ada8a9c3970267aa823 SHA1 690094c7a7b7c5a0b016f41ba519d4ecaa8a1cea SHA256 bb909d9117328ca426af80e6b6d78cb3a96b0efe03d511ead4bf8d62341f42a2
 EBUILD glibc-2.9_p20081201-r3.ebuild 7806 RMD160 6d696692a2e122bfdc149aea75368cea00bce92c SHA1 0df0da8ccd0a95084f849bdb92bfc3389efba74f SHA256 995c0e939cc7146e347d3f8caafbf4ad720a7caa7dfd0a9562f5a2877533a45c
-MISC ChangeLog 131069 RMD160 1d3ede8182597ead5b8a444749e8ca12ebc6a1f0 SHA1 eb72491fce496f6e2f3487dc71243406b214da80 SHA256 f11752a2479e921c43b84a93d6d64a09db8059bbf32e447b31b0ed90ec49b98b
+MISC ChangeLog 131308 RMD160 c8b9d204f96da1dd73f9c3acd1feee2e36b9b861 SHA1 809d6943602927e397c8129fb22113a8dcdbdd29 SHA256 52a3c36add7f8634c8d41d3a14c5d669310650650aad38dafc7f5db8870c902c
 MISC metadata.xml 539 RMD160 cf4d236b54a77b3cea382d53e4e61721bd14169b SHA1 b54ad589378da193ddc89676f8468c6d1b79521f SHA256 d7cb6dd119c81b5bf12c360af3705ca31a56ffa8bec999b44faa63c183719c31
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEUEARECAAYFAkzL7SoACgkQkKaRLQcq0GKzpQCglfFWoA1TfICOMQUAJFkrKod+
-saUAljHiqTiZMJKWz7GVY7sLGtxu+xg=
-=riAm
+iEYEARECAAYFAkzN2WgACgkQAiZjviIA2Xg1ZwCgoTdSL9lLz3p+9DRC8suknk0O
+/bUAoK3j8i+bwE7cLx7cZMNPdREcCSDu
+=G3Nu
 -----END PGP SIGNATURE-----
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
+}