From 499fc0570ad2f0d4d6cf50fe259324a5825af717 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Mon, 12 Feb 2018 18:37:07 +0100
Subject: app-laptop/ibam: Use EAPI="6". Fix applying of patches.

Bug: https://bugs.funtoo.org/browse/FL-4779
---
 app-laptop/ibam/Manifest                     |  2 +-
 app-laptop/ibam/files/ibam-0.5.2-build.patch |  8 ++--
 app-laptop/ibam/ibam-0.5.2-r3.ebuild         | 62 ---------------------------
 app-laptop/ibam/ibam-0.5.2-r4.ebuild         | 63 ++++++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 67 deletions(-)
 delete mode 100644 app-laptop/ibam/ibam-0.5.2-r3.ebuild
 create mode 100644 app-laptop/ibam/ibam-0.5.2-r4.ebuild

diff --git a/app-laptop/ibam/Manifest b/app-laptop/ibam/Manifest
index 6dffaf61d65a..ea2c7bc1ebd7 100644
--- a/app-laptop/ibam/Manifest
+++ b/app-laptop/ibam/Manifest
@@ -1,2 +1,2 @@
 DIST ibam-0.5.2.tar.gz 22149 BLAKE2B a3d9398dc34004203643d3198a3994ef3b432b909bdf9713a91a1d938a19ab9d0345105a60f3357288c2f3d2a325498a0787138e50fb445f1ea11851f1d7de1c SHA512 c70d728a2f1250ed291e663bd9f4e9ba01308fce14edf1ffd1902057de7e5527548bd06e2e3caaaeabc064d0ee123f536a626fd50b84092f6fc9201fc6bdba58
-DIST ibam_0.5.2-2.diff.gz 5914 BLAKE2B 791062b242e21d6e9624309a2bed82745fd266c935e2b73dc0104a4aa7433080dbc775edd92bdde7fb1b52383a7ab96b21b3b4f843a9c5a9671c514cf3d472da SHA512 baad1e6bdc416de6d82181e55ba5a8c9871dcdaf756172558d093384cd2f4d0fe89d37f1266407e2bea784d18e429eeab5fde0a304b63bce97c73ba9391e7556
+DIST ibam_0.5.2-2.1.diff.gz 6115 BLAKE2B 8a1ada53ed39a379f11158583b337166d74d17de808a44e3d3fb225eecef5e3f3b782088072f94dbad387b258254ccbe3fdce7d5655ff201c41d66dbeb7c6d61 SHA512 f6707e42626891aa87697bc28f124345f9f1d0dfb35620f6386dc1dca6b9c5e3a73571bf04e933091c1995d1156925029c0199c5caace497ff891c93f9011ac3
diff --git a/app-laptop/ibam/files/ibam-0.5.2-build.patch b/app-laptop/ibam/files/ibam-0.5.2-build.patch
index 77854b5f3d5a..665e50798b18 100644
--- a/app-laptop/ibam/files/ibam-0.5.2-build.patch
+++ b/app-laptop/ibam/files/ibam-0.5.2-build.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- /Makefile
++++ /Makefile
 @@ -17,8 +17,8 @@
  #
  IBAM_VERSION=0.5.2
@@ -22,7 +22,7 @@
  
  ibam-krell.so: ibam-krell.o
 -	$(CC) $(CFLAGS) -fPIC -shared -Wl -o ibam-krell.so ibam-krell.o
-+	$(CXX) $(LDFLAGS) $(CXXFLAGS) -fPIC -shared -Wl -o ibam-krell.so ibam-krell.o
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) -fPIC -shared -o ibam-krell.so ibam-krell.o
  
  ibam-krell.o: ibam-krell.cpp ibam.hpp ibam.inl
 -	$(CC) $(CFLAGS) -fPIC `pkg-config gtk+-2.0 --cflags` `gdk-pixbuf-config --cflags` -c ibam-krell.cpp
@@ -32,7 +32,7 @@
  
  ibam-krell1.so: ibam-krell1.o
 -	$(CC) $(CFLAGS) -shared -Wl -o ibam-krell1.so ibam-krell1.o
-+	$(CXX) $(LDFLAGS) $(CXXFLAGS) -shared -Wl -o ibam-krell1.so ibam-krell1.o
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) -shared -o ibam-krell1.so ibam-krell1.o
  
  ibam-krell1.o: ibam-krell1.cpp ibam.hpp ibam.inl
 -	$(CC) $(CFLAGS) -fPIC `gtk-config --cflags` `imlib-config --cflags-gdk` -c ibam-krell1.cpp
diff --git a/app-laptop/ibam/ibam-0.5.2-r3.ebuild b/app-laptop/ibam/ibam-0.5.2-r3.ebuild
deleted file mode 100644
index 2cd5cf10f92e..000000000000
--- a/app-laptop/ibam/ibam-0.5.2-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-PATCH_LEVEL=2
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Intelligent Battery Monitor"
-HOMEPAGE="http://ibam.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${PATCH_LEVEL}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gkrellm"
-
-RDEPEND="
-	gkrellm? (
-		app-admin/gkrellm
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-	)"
-DEPEND="
-	${RDEPEND}
-	gkrellm? ( virtual/pkgconfig )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
-
-	local f
-	for f in $(find . -name '*.dpatch'); do
-		epatch "${f}"
-	done
-}
-
-src_compile() {
-	tc-export CXX
-	emake
-	use gkrellm && emake krell
-}
-
-src_install() {
-	dobin ibam
-	dodoc CHANGES README REPORT
-
-	if use gkrellm; then
-		insinto /usr/$(get_libdir)/gkrellm2/plugins
-		doins ibam-krell.so
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "You will need to install sci-visualization/gnuplot if you wish to use"
-	elog "the --plot argument to ibam."
-	elog
-}
diff --git a/app-laptop/ibam/ibam-0.5.2-r4.ebuild b/app-laptop/ibam/ibam-0.5.2-r4.ebuild
new file mode 100644
index 000000000000..2076603b9f60
--- /dev/null
+++ b/app-laptop/ibam/ibam-0.5.2-r4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PATCH_LEVEL="2.1"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Intelligent Battery Monitor"
+HOMEPAGE="http://ibam.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${PATCH_LEVEL}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gkrellm"
+
+RDEPEND="
+	gkrellm? (
+		app-admin/gkrellm
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+	)"
+DEPEND="
+	${RDEPEND}
+	gkrellm? ( virtual/pkgconfig )"
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}"/${P}-build.patch \
+		"${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
+
+	eapply debian/patches/02*.dpatch
+	eapply debian/patches/03*.dpatch
+	eapply debian/patches/05*.dpatch
+
+	eapply_user
+}
+
+src_compile() {
+	tc-export CXX
+	emake
+	use gkrellm && emake krell
+}
+
+src_install() {
+	dobin ibam
+	dodoc CHANGES README REPORT
+
+	if use gkrellm; then
+		insinto /usr/$(get_libdir)/gkrellm2/plugins
+		doins ibam-krell.so
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "You will need to install sci-visualization/gnuplot if you wish to use"
+	elog "the --plot argument to ibam."
+	elog
+}
-- 
cgit v1.2.3-65-gdbad