Convert to python-single-r1.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 119 insertions, 6 deletions

diff --git a/sys-libs/openipmi/ChangeLog b/sys-libs/openipmi/ChangeLog
index c49a2e70d6d9..daf1c24a1882 100644
--- a/sys-libs/openipmi/ChangeLog
+++ b/sys-libs/openipmi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/openipmi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/openipmi/ChangeLog,v 1.29 2014/01/29 13:36:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/openipmi/ChangeLog,v 1.30 2014/12/26 12:07:56 mgorny Exp $
+
+*openipmi-2.0.18-r1 (26 Dec 2014)
+
+  26 Dec 2014; Michał Górny <mgorny@gentoo.org> +openipmi-2.0.18-r1.ebuild:
+  Convert to python-single-r1.
 
   29 Jan 2014; Jeroen Roovers <jer@gentoo.org> openipmi-2.0.18.ebuild:
   Stable for HPPA too.
diff --git a/sys-libs/openipmi/Manifest b/sys-libs/openipmi/Manifest
index acfc2e4068c9..2c28522ac563 100644
--- a/sys-libs/openipmi/Manifest
+++ b/sys-libs/openipmi/Manifest
@@ -16,13 +16,26 @@ EBUILD openipmi-1.4.28.ebuild 1214 SHA256 3cb8f7e7dd2ef3fba1d90564c77d034785a649
 EBUILD openipmi-2.0.11.ebuild 1968 SHA256 7b7ac00ead29655fd9d179576cf8b7f1ac7572d295f32ebc7896a616bc81254d SHA512 e7fac07c87004cf868a0de7dd4b892e8b071e8fe1dd0941f1dc6f9ac984b45a86b8a2ba235af1451ca10d7e8a5c0d57e0529fe8e18ba33887023e46af1069835 WHIRLPOOL 35324c9c5250bae8f999b43de3a3e00fa6a6258c6e816ba5cc30ecb52ad540b8b627158dd55f23535752f5ce448adba68a39be4aaa8e1775b8282aac5012b405
 EBUILD openipmi-2.0.16-r1.ebuild 3029 SHA256 d715d8db81ea872811283346dbe5daf40475b8e0d88c549570e4376c0fcad24e SHA512 fd23b59ee406bdd6812138710945a028a4a44bd7a8030c629774ca38b8e4d97f97630ce88eeaf8ef0bbb2a4ffa82589f601a368ac63a3745f589b3a8e583b724 WHIRLPOOL 290ce8da5a6142f79d7a5d27f80e097f9b2d428c73be3ef0601a8fa1c1974ee79ad59c98add24c3864adec98d0f5bc30ff9d6d53372afdfd215bfd8989417049
 EBUILD openipmi-2.0.16.ebuild 2836 SHA256 6a0e371b7b222bf162ac3cb07f42b9c1e2376e1b971952c99d3879e19a52f57c SHA512 72b198061f27f8c4d5adff0b93e18a5b875673ab769875694a21f90122db5b9e1999fe70ca078047f727c6d575940cb4150f9d09bf4e3df6f79fd3801d992e55 WHIRLPOOL dfaf6ecf2ec71d940488aeab710681527d2de997fcc23c34d7e96654517433120c5389caaa5071350013b2572fdc8bafc6f905fa26f98a686311ac28e62c7c56
+EBUILD openipmi-2.0.18-r1.ebuild 2789 SHA256 cdadb668afcf13f45e0ebd288b2bb0898879e64e20fc89eb33465a9e023f9ade SHA512 e0bef1ab3dee9a757dee491f02039dfdaea7a86aa513b014230be354161561d4d0155cd095c9fab764f1c6ce314bc3797db0cf06ec2835d4622ea3ccf0829c4e WHIRLPOOL 306c349d34fbcbc91102cd8f6782718d68a1b8ccd9e276f169e9e999583c92837616bde51e7a36526e98774d6acc2c44d91dda910f28bec9df9698d65a74988e
 EBUILD openipmi-2.0.18.ebuild 3033 SHA256 2be01acb6f72147ea0dc32dc0bd9f94630c1769f67c3161d7a8759af89a3d2b7 SHA512 aceefbdfefdacedf91edb7ab4ca7912db47b7c402b85f7f1d1adaafa5c41e096d6ce1e9eb157952e06193c1feead54fdb4d19aef18402d7ac780266d647070d8 WHIRLPOOL 638e893f1b7df0a4e96d5d3e19534fa29ec668aaf2160487578f25f21f8d0b7301335d05d8509521397fc573f8b94fb60de231ce040cca2a663e0045639d3a99
-MISC ChangeLog 4252 SHA256 6179d24fff636446b145f365c31da9c9415e562d8aac2426d90af8a51fb6bd25 SHA512 456bad8579d8fac7aeb5cf57c7bb2660f54ebaa519e2e094aadb774a1ee802e579969f568b4ce64a4718459ccc3f7131f7143570220a9ea529afac8bfa409bc4 WHIRLPOOL af87daab6a6c41c528dd39687d4a1bf3f8c2a298e0df0b9e3892c33c167f584030e4525b57c48b3f732f3ab6eb1a4b5619fb3594f758c98250ebb500c11d6d02
+MISC ChangeLog 4400 SHA256 ebffcfc68fde2be3d75bfdacc4fcd9bbc7c2252f9f7f45db7d15723fcce93ac3 SHA512 5e663171e71aadbed7be80ce2a47619e0765e870d0b1d76bd2f957e24c2f2698d1942c80f92b078dd132fa2dd6e21a9386f9cb9d390a96cb121bd59d3a71b712 WHIRLPOOL 03fb91c7de0227cff91d403db4c48943572089e8ff3fbfed90a8ac40e83f4bb8cb424a1a41f6ce4066ade3d3004f41f44616d60436002bb9bd921c44e2753642
 MISC metadata.xml 163 SHA256 a8aa48f63dab89c2af1f961029dea0ebf68a618dba59ac4661ea915dc85e18f0 SHA512 1744b806c2ddddbeee4d2b1e23c7f1ccf0d9427f679a65bd22cde617399d3a5bb30aada17ba5b648a3a46d9e1169b9d30ede4551fb8756dffc4e3e9306b199cf WHIRLPOOL b5af95c50999aaf066e6466928866baa34c6425459a580ab0712ba3e3ea518dc37a4082007043307ff169b1f8efe4f6a632d27d016b6fd307bf463cb47b78d55
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlLpA/kACgkQVWmRsqeSphNWzQCfTI9nkJB/WRV8NtyZAjDbbwmJ
-WJ0An3xs7If19DhRw86KWQ2aaQDMq8ns
-=WRUs
+iQJ8BAEBCABmBQJUnU+dXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOWHUQANWWkpwrmInzXEhQBO5T9+qe
+hma8aGicj3eDz4vixfipJ2rIvLv1el8feIK0o9akuhsPHyETVQCUB59O5eTPo5gH
+6n9DudBp+5UB5xpbmpoyvyBtZUPcl6NmyBGfbbtUYN8aTKdAFy4HXaC1bjXZciVM
+J+J5yb20sXUwWMzt1MchkIGXwq7ztgQtuRKKJ+SCQJwEpVeeRDv8GThkuv7bT6st
+TYtbmbIeoMe9xxDAETnLewx2/ooxiu3IL4TmDB8/R1AXhFRysRarqy7QLPlHbBzU
+Myi8hrBkCWbsjNq9LdYdLjOaQXsFGayiOReo2Q5jSQLGOLup3ebV9nix7koNJSIE
+/YjHrI3NihkhHcKTZ//CI1ez7DRTFRun3kKZ+SWfaS1E4sYCgdLBJrOOpNJKt9nx
+GcOgKBqLygKGHO+zac773ZTWO/bbj2ZtIj66luAHr3TsowWNfrCCgpAoNkqr5HG2
+yNgH3SEN9PXUM/7WF52/CGHeifZtOL9Jo816TarN7un0W69x0MTJ5eGY35eLK52c
+32F+pLs6AJiCXo4579FO2E257TeJMc8I/hx7rOWi+5fqFOrilAKTqY0ti0NFA6zG
+Cz4BxjIrX4lzKX+ASse1lol3zyqKL7jerFO8tA7RHmoi/Jcs3eyxZVJFXLofgKs6
+Od/sMrWfhjFYCa+NkCR1
+=LrTn
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/openipmi/openipmi-2.0.18-r1.ebuild b/sys-libs/openipmi/openipmi-2.0.18-r1.ebuild
new file mode 100644
index 000000000000..3e6e1db16cf0
--- /dev/null
+++ b/sys-libs/openipmi/openipmi-2.0.18-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/openipmi/openipmi-2.0.18-r1.ebuild,v 1.1 2014/12/26 12:07:56 mgorny Exp $
+
+EAPI=5
+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 tcl python"
+S="${WORKDIR}/${MY_P}"
+RESTRICT='test'
+
+RDEPEND="dev-libs/glib:2
+	sys-libs/gdbm
+	crypt? ( dev-libs/openssl )
+	snmp? ( net-analyzer/net-snmp )
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	tcl? ( dev-lang/tcl )"
+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
+}