From c8eeb698de8455d990c2f9a1ac1cdff73cd85765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Fri, 26 Dec 2014 14:53:00 +0100
Subject: [PATCH] [sys-libs/openipmi] sync with tree

---
 sys-libs/openipmi/openipmi-2.0.21.ebuild | 29 ++++++++----------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/sys-libs/openipmi/openipmi-2.0.21.ebuild b/sys-libs/openipmi/openipmi-2.0.21.ebuild
index 430ee0c..5c8a127 100644
--- a/sys-libs/openipmi/openipmi-2.0.21.ebuild
+++ b/sys-libs/openipmi/openipmi-2.0.21.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils python-single-r1
+inherit eutils autotools python-single-r1
 
 DESCRIPTION="Library interface to IPMI"
 HOMEPAGE="http://sourceforge.net/projects/openipmi/"
@@ -20,8 +20,7 @@ IUSE="crypt snmp perl tcl python"
 S="${WORKDIR}/${MY_P}"
 RESTRICT='test'
 
-RDEPEND="dev-libs/popt
-	dev-libs/glib
+RDEPEND="dev-libs/glib:2
 	sys-libs/gdbm
 	crypt? ( dev-libs/openssl )
 	snmp? ( net-analyzer/net-snmp )
@@ -33,18 +32,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 # Gui is broken!
 #		python? ( tcl? ( tk? ( dev-lang/tk dev-tcltk/tix ) ) )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-# 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
-}
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -56,16 +45,16 @@ src_prepare() {
 	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_mod_optimize ourselves later instead.
+	# 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
+		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} || die
+		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.
@@ -99,9 +88,9 @@ src_configure() {
 }
 
 src_install() {
-	default
+	emake DESTDIR="${D}" install
 	dodoc README* FAQ ChangeLog TODO doc/IPMI.pdf lanserv/README.vm
 	newdoc cmdlang/README README.cmdlang
-	prune_libtool_files
-	use python && python_optimize "${ED}"/$(python_get_sitedir)
+
+	use python && python_optimize
 }