1 |
commit: bc65b297ed53567c1b41d8709db1bc91ac475a44 |
2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 27 23:31:45 2018 +0000 |
4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 27 23:51:59 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc65b297 |
7 |
|
8 |
dev-libs/iniparser: 4.1 + EAPI 6 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/647588 |
11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
12 |
|
13 |
dev-libs/iniparser/Manifest | 2 +- |
14 |
.../iniparser/files/iniparser-4.0-cflags.patch | 28 ----------------- |
15 |
.../iniparser/files/iniparser-4.0-soname.patch | 35 ---------------------- |
16 |
.../{iniparser-4.0.ebuild => iniparser-4.1.ebuild} | 24 +++++++-------- |
17 |
4 files changed, 12 insertions(+), 77 deletions(-) |
18 |
|
19 |
diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest |
20 |
index 8d619ca45f3..f061f9715a2 100644 |
21 |
--- a/dev-libs/iniparser/Manifest |
22 |
+++ b/dev-libs/iniparser/Manifest |
23 |
@@ -1,2 +1,2 @@ |
24 |
DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86 |
25 |
-DIST iniparser-4.0.tar.gz 41188 BLAKE2B a5ed070b9a4a99f92c54d319a7068a8d49462d512be37c2ab4ff50a6fc83d936ed577884984d4c6a6eaae5ce2f67570f8a2569be88c99cfdd56d03aebe48330f SHA512 86080d4e4cb85e252f9c75116d9a548a2f08f2131e269834a0d16597da4e4c5790dff8304be082f2a8dcc75d17585e9a8fad3f0f4766bff8914f6ef2b0d6fa05 |
26 |
+DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968 |
27 |
|
28 |
diff --git a/dev-libs/iniparser/files/iniparser-4.0-cflags.patch b/dev-libs/iniparser/files/iniparser-4.0-cflags.patch |
29 |
deleted file mode 100644 |
30 |
index 817b087e6d2..00000000000 |
31 |
--- a/dev-libs/iniparser/files/iniparser-4.0-cflags.patch |
32 |
+++ /dev/null |
33 |
@@ -1,28 +0,0 @@ |
34 |
-From 14370f5ce94cce077c798db6611ef65cd1822df2 Mon Sep 17 00:00:00 2001 |
35 |
-From: Sebastian Pipping <sebastian@×××××××.org> |
36 |
-Date: Sat, 8 Aug 2015 19:04:08 +0200 |
37 |
-Subject: [PATCH 1/2] Respect user CFLAGS |
38 |
- |
39 |
---- |
40 |
- Makefile | 5 ----- |
41 |
- 1 file changed, 5 deletions(-) |
42 |
- |
43 |
-diff --git a/Makefile b/Makefile |
44 |
-index 78708a5..744405a 100644 |
45 |
---- a/Makefile |
46 |
-+++ b/Makefile |
47 |
-@@ -6,11 +6,6 @@ |
48 |
- CC ?= gcc |
49 |
- |
50 |
- CFLAGS += -fPIC -Wall -Wextra -ansi -pedantic |
51 |
--ifndef DEBUG |
52 |
--CFLAGS += -O2 |
53 |
--else |
54 |
--CFLAGS += -g |
55 |
--endif |
56 |
- |
57 |
- # Ar settings to build the library |
58 |
- AR ?= ar |
59 |
--- |
60 |
-2.5.0 |
61 |
- |
62 |
|
63 |
diff --git a/dev-libs/iniparser/files/iniparser-4.0-soname.patch b/dev-libs/iniparser/files/iniparser-4.0-soname.patch |
64 |
deleted file mode 100644 |
65 |
index 0536b671a5c..00000000000 |
66 |
--- a/dev-libs/iniparser/files/iniparser-4.0-soname.patch |
67 |
+++ /dev/null |
68 |
@@ -1,35 +0,0 @@ |
69 |
-From c3a112a89d3cbbfe0edc4fbac366a47986d6c118 Mon Sep 17 00:00:00 2001 |
70 |
-From: Sebastian Pipping <sebastian@×××××××.org> |
71 |
-Date: Sat, 8 Aug 2015 19:10:27 +0200 |
72 |
-Subject: [PATCH 2/2] Adjust soname and make target non-phony |
73 |
- |
74 |
---- |
75 |
- Makefile | 5 +++-- |
76 |
- 1 file changed, 3 insertions(+), 2 deletions(-) |
77 |
- |
78 |
-diff --git a/Makefile b/Makefile |
79 |
-index 744405a..323e579 100644 |
80 |
---- a/Makefile |
81 |
-+++ b/Makefile |
82 |
-@@ -14,6 +14,7 @@ ARFLAGS = rcv |
83 |
- SHLD = ${CC} ${CFLAGS} |
84 |
- LDSHFLAGS = -shared -Wl,-Bsymbolic |
85 |
- LDFLAGS += -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib |
86 |
-+SONAME_CURRENT = 1 |
87 |
- |
88 |
- # Set RANLIB to ranlib on systems that require it (Sun OS < 4, Mac OSX) |
89 |
- # RANLIB = ranlib |
90 |
-@@ -52,8 +53,8 @@ libiniparser.a: $(OBJS) |
91 |
- $(QUIET_RANLIB)$(RANLIB) $@ |
92 |
- |
93 |
- libiniparser.so: $(OBJS) |
94 |
-- $(QUIET_LINK)$(SHLD) $(LDSHFLAGS) $(LDFLAGS) -o $@.0 $(OBJS) \ |
95 |
-- -Wl,-soname=`basename $@`.0 |
96 |
-+ $(QUIET_LINK)$(SHLD) $(LDSHFLAGS) $(LDFLAGS) -o $@ $(OBJS) \ |
97 |
-+ -Wl,-soname=libiniparser4.so.$(SONAME_CURRENT) |
98 |
- |
99 |
- clean: |
100 |
- $(RM) $(OBJS) |
101 |
--- |
102 |
-2.5.0 |
103 |
- |
104 |
|
105 |
diff --git a/dev-libs/iniparser/iniparser-4.0.ebuild b/dev-libs/iniparser/iniparser-4.1.ebuild |
106 |
similarity index 80% |
107 |
rename from dev-libs/iniparser/iniparser-4.0.ebuild |
108 |
rename to dev-libs/iniparser/iniparser-4.1.ebuild |
109 |
index b051667437c..d108cf9d01b 100644 |
110 |
--- a/dev-libs/iniparser/iniparser-4.0.ebuild |
111 |
+++ b/dev-libs/iniparser/iniparser-4.1.ebuild |
112 |
@@ -1,9 +1,9 @@ |
113 |
-# Copyright 1999-2017 Gentoo Foundation |
114 |
+# Copyright 1999-2018 Gentoo Foundation |
115 |
# Distributed under the terms of the GNU General Public License v2 |
116 |
|
117 |
-EAPI=5 |
118 |
+EAPI=6 |
119 |
|
120 |
-inherit eutils multilib toolchain-funcs flag-o-matic |
121 |
+inherit multilib toolchain-funcs flag-o-matic |
122 |
|
123 |
DESCRIPTION="A free stand-alone ini file parsing library" |
124 |
HOMEPAGE="https://github.com/ndevilla/iniparser" |
125 |
@@ -19,11 +19,6 @@ RDEPEND="" |
126 |
|
127 |
DOCS=( AUTHORS README.md ) |
128 |
|
129 |
-PATCHES=( |
130 |
- "${FILESDIR}"/${P}-cflags.patch |
131 |
- "${FILESDIR}"/${P}-soname.patch |
132 |
-) |
133 |
- |
134 |
_newlib_so_with_symlinks() { |
135 |
local source="${1}" base="${2}" current="${3}" revision="${4}" age="${5}" |
136 |
local libdir="$(get_libdir)" |
137 |
@@ -35,8 +30,8 @@ _newlib_so_with_symlinks() { |
138 |
} |
139 |
|
140 |
src_prepare() { |
141 |
- epatch "${PATCHES[@]}" |
142 |
rm -R html || die |
143 |
+ eapply_user |
144 |
} |
145 |
|
146 |
src_configure() { |
147 |
@@ -44,7 +39,10 @@ src_configure() { |
148 |
} |
149 |
|
150 |
_emake() { |
151 |
- emake CC="$(tc-getCC)" AR="$(tc-getAR)" V=1 "$@" |
152 |
+ emake CC="$(tc-getCC)" AR="$(tc-getAR)" V=1 \ |
153 |
+ SO_TARGET=lib${PN}${SLOT}.so.1 \ |
154 |
+ ADDITIONAL_CFLAGS= \ |
155 |
+ "$@" |
156 |
} |
157 |
|
158 |
src_compile() { |
159 |
@@ -57,14 +55,14 @@ src_test() { |
160 |
|
161 |
src_install() { |
162 |
use static-libs && newlib.a lib${PN}.a lib${PN}${SLOT}.a |
163 |
- _newlib_so_with_symlinks lib${PN}.so lib${PN}${SLOT} 1 0 0 |
164 |
+ _newlib_so_with_symlinks lib${PN}${SLOT}.so.1 lib${PN}${SLOT} 1 0 0 |
165 |
|
166 |
insinto /usr/include/${PN}${SLOT} |
167 |
doins src/*.h |
168 |
|
169 |
if use doc; then |
170 |
emake -C doc |
171 |
- dohtml -r html/* |
172 |
+ HTML_DOCS=html/ |
173 |
fi |
174 |
|
175 |
if use examples ; then |
176 |
@@ -74,5 +72,5 @@ src_install() { |
177 |
docompress -x "${examplesdir}" |
178 |
fi |
179 |
|
180 |
- dodoc "${DOCS[@]}" |
181 |
+ einstalldocs |
182 |
} |