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 00EF3138359 for ; Wed, 16 Sep 2020 11:41:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A321E0817; Wed, 16 Sep 2020 11:41:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 ED831E0784 for ; Wed, 16 Sep 2020 11:41:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 4271D33BE25 for ; Wed, 16 Sep 2020 11:41:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B53A1366 for ; Wed, 16 Sep 2020 11:41:04 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1600256430.36ea03e2c553ebbd7deb00bfd3d35c4548b7c460.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/scim-input-pad/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild X-VCS-Directories: app-i18n/scim-input-pad/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 36ea03e2c553ebbd7deb00bfd3d35c4548b7c460 X-VCS-Branch: master Date: Wed, 16 Sep 2020 11:41:04 +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: af59273a-e4a1-4042-a2c3-30bffe010a02 X-Archives-Hash: a2c16cc4aac11bac0385611068de11c8 commit: 36ea03e2c553ebbd7deb00bfd3d35c4548b7c460 Author: David Seifert gentoo org> AuthorDate: Wed Sep 16 11:40:30 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Wed Sep 16 11:40:30 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36ea03e2 app-i18n/scim-input-pad: Port to EAPI 7 Closes: https://bugs.gentoo.org/742041 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: David Seifert gentoo.org> .../scim-input-pad/scim-input-pad-0.1.3.1.ebuild | 29 +++++++++++++--------- .../scim-input-pad/scim-input-pad-0.1.3.ebuild | 29 +++++++++++++--------- 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild index 4f87c9cc079..d6613ab82f8 100644 --- a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild +++ b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 inherit autotools @@ -14,29 +14,35 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="nls" -RDEPEND=">=app-i18n/scim-1.2.0 +RDEPEND=" + >=app-i18n/scim-1.2.0 >=x11-libs/gtk+-2.6.0:2" - -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" >=dev-util/intltool-0.33 virtual/pkgconfig" src_prepare() { - rm "${S}"/m4/intltool.m4 || die + default + + rm m4/intltool.m4 || die eautoreconf } src_configure() { - econf $(use_enable nls) + econf \ + --disable-static \ + $(use_enable nls) } src_install() { - emake DESTDIR="${D}" install - dodoc ChangeLog README + default + + # no static archives + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { - elog elog "The SCIM input pad should be startable from the SCIM (and Skim)" elog "systray icon right click menu. You will have to restart SCIM" @@ -49,7 +55,6 @@ pkg_postinst() { elog "table, from the SCIM Input Pad interface." elog elog "To add new characters to the tables, see the documentation" - elog "(README file in /usr/share/doc/${PF})." + elog "(README file in ${EROOT}/usr/share/doc/${PF})." elog - } diff --git a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild index 65ab96d29a1..0cbb2a9701e 100644 --- a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild +++ b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 inherit autotools @@ -14,29 +14,35 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="nls" -RDEPEND=">=app-i18n/scim-1.2.0 +RDEPEND=" + >=app-i18n/scim-1.2.0 >=x11-libs/gtk+-2.6.0:2" - -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" >=dev-util/intltool-0.33 virtual/pkgconfig" src_prepare() { - rm "${S}"/m4/intltool.m4 || die + default + + rm m4/intltool.m4 || die eautoreconf } src_configure() { - econf $(use_enable nls) + econf \ + --disable-static \ + $(use_enable nls) } src_install() { - emake DESTDIR="${D}" install - dodoc ChangeLog README + default + + # no static archives + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { - elog elog "The SCIM input pad should be startable from the SCIM (and Skim)" elog "systray icon right click menu. You will have to restart SCIM" @@ -49,7 +55,6 @@ pkg_postinst() { elog "table, from the SCIM Input Pad interface." elog elog "To add new characters to the tables, see the documentation" - elog "(README file in /usr/share/doc/${PF})." + elog "(README file in ${EROOT}/usr/share/doc/${PF})." elog - }