[gentoo-commits] repo/gentoo:master commit in: dev-libs/iniparser/

[David Seifert]

commit:     00480b83c45ae282dc5a3509f02910e6779c975e
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 29 16:31:40 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 16:31:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00480b83

dev-libs/iniparser: Port SLOT=4 to EAPI 7

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-libs/iniparser/iniparser-4.1.ebuild | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/dev-libs/iniparser/iniparser-4.1.ebuild b/dev-libs/iniparser/iniparser-4.1.ebuild
index 02c8405c8e5..56571da75ab 100644
--- a/dev-libs/iniparser/iniparser-4.1.ebuild
+++ b/dev-libs/iniparser/iniparser-4.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit multilib toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="A free stand-alone ini file parsing library"
 HOMEPAGE="https://github.com/ndevilla/iniparser"
@@ -12,26 +12,23 @@ SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="MIT"
 SLOT="4"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples static-libs"
+IUSE="doc examples"
 
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-DOCS=( AUTHORS README.md )
+BDEPEND="doc? ( app-doc/doxygen )"
 
 _newlib_so_with_symlinks() {
 	local source="${1}" base="${2}" current="${3}" revision="${4}" age="${5}"
-	local libdir="$(get_libdir)"
 
 	newlib.so ${source} ${base}.so.${current}.${revision}.${age}
+	local i
 	for i in ".${current}" '' ; do
-		dosym ${base}.so.${current}.${revision}.${age} /usr/${libdir}/${base}.so${i}
+		dosym ${base}.so.${current}.${revision}.${age} /usr/$(get_libdir)/${base}.so${i}
 	done
 }
 
 src_prepare() {
-	rm -R html || die
-	eapply_user
+	default
+	rm -r html || die
 }
 
 src_configure() {
@@ -54,7 +51,6 @@ src_test() {
 }
 
 src_install() {
-	use static-libs && newlib.a lib${PN}.a lib${PN}${SLOT}.a
 	_newlib_so_with_symlinks lib${PN}${SLOT}.so.1 lib${PN}${SLOT} 1 0 0
 
 	insinto /usr/include/${PN}${SLOT}
@@ -62,14 +58,13 @@ src_install() {
 
 	if use doc; then
 		emake -C doc
-		HTML_DOCS=html/
+		HTML_DOCS=( html/. )
 	fi
 
-	if use examples ; then
-		local examplesdir="/usr/share/doc/${PF}/examples"
-		insinto "${examplesdir}"
-		doins example/*
-		docompress -x "${examplesdir}"
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
 
 	einstalldocs