commit: bc65b297ed53567c1b41d8709db1bc91ac475a44 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Tue Mar 27 23:31:45 2018 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Tue Mar 27 23:51:59 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc65b297
dev-libs/iniparser: 4.1 + EAPI 6 Bug: https://bugs.gentoo.org/647588 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-libs/iniparser/Manifest | 2 +- .../iniparser/files/iniparser-4.0-cflags.patch | 28 ----------------- .../iniparser/files/iniparser-4.0-soname.patch | 35 ---------------------- .../{iniparser-4.0.ebuild => iniparser-4.1.ebuild} | 24 +++++++-------- 4 files changed, 12 insertions(+), 77 deletions(-) diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest index 8d619ca45f3..f061f9715a2 100644 --- a/dev-libs/iniparser/Manifest +++ b/dev-libs/iniparser/Manifest @@ -1,2 +1,2 @@ DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86 -DIST iniparser-4.0.tar.gz 41188 BLAKE2B a5ed070b9a4a99f92c54d319a7068a8d49462d512be37c2ab4ff50a6fc83d936ed577884984d4c6a6eaae5ce2f67570f8a2569be88c99cfdd56d03aebe48330f SHA512 86080d4e4cb85e252f9c75116d9a548a2f08f2131e269834a0d16597da4e4c5790dff8304be082f2a8dcc75d17585e9a8fad3f0f4766bff8914f6ef2b0d6fa05 +DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968 diff --git a/dev-libs/iniparser/files/iniparser-4.0-cflags.patch b/dev-libs/iniparser/files/iniparser-4.0-cflags.patch deleted file mode 100644 index 817b087e6d2..00000000000 --- a/dev-libs/iniparser/files/iniparser-4.0-cflags.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 14370f5ce94cce077c798db6611ef65cd1822df2 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <[email protected]> -Date: Sat, 8 Aug 2015 19:04:08 +0200 -Subject: [PATCH 1/2] Respect user CFLAGS - ---- - Makefile | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/Makefile b/Makefile -index 78708a5..744405a 100644 ---- a/Makefile -+++ b/Makefile -@@ -6,11 +6,6 @@ - CC ?= gcc - - CFLAGS += -fPIC -Wall -Wextra -ansi -pedantic --ifndef DEBUG --CFLAGS += -O2 --else --CFLAGS += -g --endif - - # Ar settings to build the library - AR ?= ar --- -2.5.0 - diff --git a/dev-libs/iniparser/files/iniparser-4.0-soname.patch b/dev-libs/iniparser/files/iniparser-4.0-soname.patch deleted file mode 100644 index 0536b671a5c..00000000000 --- a/dev-libs/iniparser/files/iniparser-4.0-soname.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c3a112a89d3cbbfe0edc4fbac366a47986d6c118 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <[email protected]> -Date: Sat, 8 Aug 2015 19:10:27 +0200 -Subject: [PATCH 2/2] Adjust soname and make target non-phony - ---- - Makefile | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 744405a..323e579 100644 ---- a/Makefile -+++ b/Makefile -@@ -14,6 +14,7 @@ ARFLAGS = rcv - SHLD = ${CC} ${CFLAGS} - LDSHFLAGS = -shared -Wl,-Bsymbolic - LDFLAGS += -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib -+SONAME_CURRENT = 1 - - # Set RANLIB to ranlib on systems that require it (Sun OS < 4, Mac OSX) - # RANLIB = ranlib -@@ -52,8 +53,8 @@ libiniparser.a: $(OBJS) - $(QUIET_RANLIB)$(RANLIB) $@ - - libiniparser.so: $(OBJS) -- $(QUIET_LINK)$(SHLD) $(LDSHFLAGS) $(LDFLAGS) -o [email protected] $(OBJS) \ -- -Wl,-soname=`basename $@`.0 -+ $(QUIET_LINK)$(SHLD) $(LDSHFLAGS) $(LDFLAGS) -o $@ $(OBJS) \ -+ -Wl,-soname=libiniparser4.so.$(SONAME_CURRENT) - - clean: - $(RM) $(OBJS) --- -2.5.0 - diff --git a/dev-libs/iniparser/iniparser-4.0.ebuild b/dev-libs/iniparser/iniparser-4.1.ebuild similarity index 80% rename from dev-libs/iniparser/iniparser-4.0.ebuild rename to dev-libs/iniparser/iniparser-4.1.ebuild index b051667437c..d108cf9d01b 100644 --- a/dev-libs/iniparser/iniparser-4.0.ebuild +++ b/dev-libs/iniparser/iniparser-4.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit eutils multilib toolchain-funcs flag-o-matic +inherit multilib toolchain-funcs flag-o-matic DESCRIPTION="A free stand-alone ini file parsing library" HOMEPAGE="https://github.com/ndevilla/iniparser"; @@ -19,11 +19,6 @@ RDEPEND="" DOCS=( AUTHORS README.md ) -PATCHES=( - "${FILESDIR}"/${P}-cflags.patch - "${FILESDIR}"/${P}-soname.patch -) - _newlib_so_with_symlinks() { local source="${1}" base="${2}" current="${3}" revision="${4}" age="${5}" local libdir="$(get_libdir)" @@ -35,8 +30,8 @@ _newlib_so_with_symlinks() { } src_prepare() { - epatch "${PATCHES[@]}" rm -R html || die + eapply_user } src_configure() { @@ -44,7 +39,10 @@ src_configure() { } _emake() { - emake CC="$(tc-getCC)" AR="$(tc-getAR)" V=1 "$@" + emake CC="$(tc-getCC)" AR="$(tc-getAR)" V=1 \ + SO_TARGET=lib${PN}${SLOT}.so.1 \ + ADDITIONAL_CFLAGS= \ + "$@" } src_compile() { @@ -57,14 +55,14 @@ src_test() { src_install() { use static-libs && newlib.a lib${PN}.a lib${PN}${SLOT}.a - _newlib_so_with_symlinks lib${PN}.so lib${PN}${SLOT} 1 0 0 + _newlib_so_with_symlinks lib${PN}${SLOT}.so.1 lib${PN}${SLOT} 1 0 0 insinto /usr/include/${PN}${SLOT} doins src/*.h if use doc; then emake -C doc - dohtml -r html/* + HTML_DOCS=html/ fi if use examples ; then @@ -74,5 +72,5 @@ src_install() { docompress -x "${examplesdir}" fi - dodoc "${DOCS[@]}" + einstalldocs }
