commit: 7b702c672edb68142466339175606a159c4cefe9 Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> AuthorDate: Sun Mar 7 17:12:31 2021 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Mon Mar 15 19:43:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b702c67
dev-libs/libunistring: EAPI 7 Closes: https://bugs.gentoo.org/774711 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> [Revision bump, LICENSE fix] Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> ...ring-0.9.10.ebuild => libunistring-0.9.10-r1.ebuild} | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dev-libs/libunistring/libunistring-0.9.10.ebuild b/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild similarity index 83% rename from dev-libs/libunistring/libunistring-0.9.10.ebuild rename to dev-libs/libunistring/libunistring-0.9.10-r1.ebuild index 4a901467562..521b7e2ce71 100644 --- a/dev-libs/libunistring/libunistring-0.9.10.ebuild +++ b/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils multilib-minimal libtool ltprune +inherit multilib-minimal libtool DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard" HOMEPAGE="https://www.gnu.org/software/libunistring/"; SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" -LICENSE="LGPL-3 GPL-3" +LICENSE="|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )" SLOT="0/2" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc static-libs" @@ -28,17 +28,14 @@ multilib_src_configure() { econf $(use_enable static-libs static) } -multilib_src_install() { - default - - prune_libtool_files -} - multilib_src_install_all() { default if use doc; then - dohtml doc/*.html + docinto html + dodoc doc/*.html doinfo doc/*.info fi + + find "${ED}" -name '*.la' -delete || die }
