| 1 |
commit: 499fc0570ad2f0d4d6cf50fe259324a5825af717 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Mon Feb 12 17:37:07 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 12 19:16:13 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=499fc057 |
| 7 |
|
| 8 |
app-laptop/ibam: Use EAPI="6". Fix applying of patches. |
| 9 |
|
| 10 |
Bug: https://bugs.funtoo.org/browse/FL-4779 |
| 11 |
|
| 12 |
app-laptop/ibam/Manifest | 2 +- |
| 13 |
app-laptop/ibam/files/ibam-0.5.2-build.patch | 8 ++++---- |
| 14 |
.../{ibam-0.5.2-r3.ebuild => ibam-0.5.2-r4.ebuild} | 19 ++++++++++--------- |
| 15 |
3 files changed, 15 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-laptop/ibam/Manifest b/app-laptop/ibam/Manifest |
| 18 |
index 6dffaf61d65..ea2c7bc1ebd 100644 |
| 19 |
--- a/app-laptop/ibam/Manifest |
| 20 |
+++ b/app-laptop/ibam/Manifest |
| 21 |
@@ -1,2 +1,2 @@ |
| 22 |
DIST ibam-0.5.2.tar.gz 22149 BLAKE2B a3d9398dc34004203643d3198a3994ef3b432b909bdf9713a91a1d938a19ab9d0345105a60f3357288c2f3d2a325498a0787138e50fb445f1ea11851f1d7de1c SHA512 c70d728a2f1250ed291e663bd9f4e9ba01308fce14edf1ffd1902057de7e5527548bd06e2e3caaaeabc064d0ee123f536a626fd50b84092f6fc9201fc6bdba58 |
| 23 |
-DIST ibam_0.5.2-2.diff.gz 5914 BLAKE2B 791062b242e21d6e9624309a2bed82745fd266c935e2b73dc0104a4aa7433080dbc775edd92bdde7fb1b52383a7ab96b21b3b4f843a9c5a9671c514cf3d472da SHA512 baad1e6bdc416de6d82181e55ba5a8c9871dcdaf756172558d093384cd2f4d0fe89d37f1266407e2bea784d18e429eeab5fde0a304b63bce97c73ba9391e7556 |
| 24 |
+DIST ibam_0.5.2-2.1.diff.gz 6115 BLAKE2B 8a1ada53ed39a379f11158583b337166d74d17de808a44e3d3fb225eecef5e3f3b782088072f94dbad387b258254ccbe3fdce7d5655ff201c41d66dbeb7c6d61 SHA512 f6707e42626891aa87697bc28f124345f9f1d0dfb35620f6386dc1dca6b9c5e3a73571bf04e933091c1995d1156925029c0199c5caace497ff891c93f9011ac3 |
| 25 |
|
| 26 |
diff --git a/app-laptop/ibam/files/ibam-0.5.2-build.patch b/app-laptop/ibam/files/ibam-0.5.2-build.patch |
| 27 |
index 77854b5f3d5..665e50798b1 100644 |
| 28 |
--- a/app-laptop/ibam/files/ibam-0.5.2-build.patch |
| 29 |
+++ b/app-laptop/ibam/files/ibam-0.5.2-build.patch |
| 30 |
@@ -1,5 +1,5 @@ |
| 31 |
---- Makefile |
| 32 |
-+++ Makefile |
| 33 |
+--- /Makefile |
| 34 |
++++ /Makefile |
| 35 |
@@ -17,8 +17,8 @@ |
| 36 |
# |
| 37 |
IBAM_VERSION=0.5.2 |
| 38 |
@@ -22,7 +22,7 @@ |
| 39 |
|
| 40 |
ibam-krell.so: ibam-krell.o |
| 41 |
- $(CC) $(CFLAGS) -fPIC -shared -Wl -o ibam-krell.so ibam-krell.o |
| 42 |
-+ $(CXX) $(LDFLAGS) $(CXXFLAGS) -fPIC -shared -Wl -o ibam-krell.so ibam-krell.o |
| 43 |
++ $(CXX) $(LDFLAGS) $(CXXFLAGS) -fPIC -shared -o ibam-krell.so ibam-krell.o |
| 44 |
|
| 45 |
ibam-krell.o: ibam-krell.cpp ibam.hpp ibam.inl |
| 46 |
- $(CC) $(CFLAGS) -fPIC `pkg-config gtk+-2.0 --cflags` `gdk-pixbuf-config --cflags` -c ibam-krell.cpp |
| 47 |
@@ -32,7 +32,7 @@ |
| 48 |
|
| 49 |
ibam-krell1.so: ibam-krell1.o |
| 50 |
- $(CC) $(CFLAGS) -shared -Wl -o ibam-krell1.so ibam-krell1.o |
| 51 |
-+ $(CXX) $(LDFLAGS) $(CXXFLAGS) -shared -Wl -o ibam-krell1.so ibam-krell1.o |
| 52 |
++ $(CXX) $(LDFLAGS) $(CXXFLAGS) -shared -o ibam-krell1.so ibam-krell1.o |
| 53 |
|
| 54 |
ibam-krell1.o: ibam-krell1.cpp ibam.hpp ibam.inl |
| 55 |
- $(CC) $(CFLAGS) -fPIC `gtk-config --cflags` `imlib-config --cflags-gdk` -c ibam-krell1.cpp |
| 56 |
|
| 57 |
diff --git a/app-laptop/ibam/ibam-0.5.2-r3.ebuild b/app-laptop/ibam/ibam-0.5.2-r4.ebuild |
| 58 |
similarity index 81% |
| 59 |
rename from app-laptop/ibam/ibam-0.5.2-r3.ebuild |
| 60 |
rename to app-laptop/ibam/ibam-0.5.2-r4.ebuild |
| 61 |
index 2cd5cf10f92..2076603b9f6 100644 |
| 62 |
--- a/app-laptop/ibam/ibam-0.5.2-r3.ebuild |
| 63 |
+++ b/app-laptop/ibam/ibam-0.5.2-r4.ebuild |
| 64 |
@@ -1,11 +1,11 @@ |
| 65 |
-# Copyright 1999-2012 Gentoo Foundation |
| 66 |
+# Copyright 1999-2018 Gentoo Foundation |
| 67 |
# Distributed under the terms of the GNU General Public License v2 |
| 68 |
|
| 69 |
-EAPI=4 |
| 70 |
+EAPI="6" |
| 71 |
|
| 72 |
-PATCH_LEVEL=2 |
| 73 |
+PATCH_LEVEL="2.1" |
| 74 |
|
| 75 |
-inherit eutils multilib toolchain-funcs |
| 76 |
+inherit toolchain-funcs |
| 77 |
|
| 78 |
DESCRIPTION="Intelligent Battery Monitor" |
| 79 |
HOMEPAGE="http://ibam.sourceforge.net/" |
| 80 |
@@ -28,14 +28,15 @@ DEPEND=" |
| 81 |
gkrellm? ( virtual/pkgconfig )" |
| 82 |
|
| 83 |
src_prepare() { |
| 84 |
- epatch \ |
| 85 |
+ eapply \ |
| 86 |
"${FILESDIR}"/${P}-build.patch \ |
| 87 |
"${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff |
| 88 |
|
| 89 |
- local f |
| 90 |
- for f in $(find . -name '*.dpatch'); do |
| 91 |
- epatch "${f}" |
| 92 |
- done |
| 93 |
+ eapply debian/patches/02*.dpatch |
| 94 |
+ eapply debian/patches/03*.dpatch |
| 95 |
+ eapply debian/patches/05*.dpatch |
| 96 |
+ |
| 97 |
+ eapply_user |
| 98 |
} |
| 99 |
|
| 100 |
src_compile() { |
Archives