From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 042F71382C5 for ; Mon, 15 Mar 2021 19:43:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53C93E0828; Mon, 15 Mar 2021 19:43:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3A9FAE0828 for ; Mon, 15 Mar 2021 19:43:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 06E31335D99 for ; Mon, 15 Mar 2021 19:43:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E2EB478 for ; Mon, 15 Mar 2021 19:43:52 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1615837426.7b702c672edb68142466339175606a159c4cefe9.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libunistring/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libunistring/libunistring-0.9.10-r1.ebuild dev-libs/libunistring/libunistring-0.9.10.ebuild X-VCS-Directories: dev-libs/libunistring/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 7b702c672edb68142466339175606a159c4cefe9 X-VCS-Branch: master Date: Mon, 15 Mar 2021 19:43:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cac8d45c-0d3b-45e0-8076-f3f56835df62 X-Archives-Hash: bc1f1c02adf1fd841d89e64313c9641b commit: 7b702c672edb68142466339175606a159c4cefe9 Author: David Michael gmail com> AuthorDate: Sun Mar 7 17:12:31 2021 +0000 Commit: Ulrich Müller gentoo 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 gmail.com> [Revision bump, LICENSE fix] Signed-off-by: Ulrich Müller 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 }