From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1304986-garchives=archives.gentoo.org@lists.gentoo.org> 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 0250413933E for <garchives@archives.gentoo.org>; Thu, 22 Jul 2021 21:52:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DB56E094A; Thu, 22 Jul 2021 21:52:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 23BC4E094A for <gentoo-commits@lists.gentoo.org>; Thu, 22 Jul 2021 21:52:15 +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 30FA2340B23 for <gentoo-commits@lists.gentoo.org>; Thu, 22 Jul 2021 21:52:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 96D4A7D3 for <gentoo-commits@lists.gentoo.org>; Thu, 22 Jul 2021 21:52:12 +0000 (UTC) From: "Sam James" <sam@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org> Message-ID: <1626990725.5ec3cdc903f41dfb62fa3facb0732eb80833ab01.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/libidn/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/libidn/libidn-1.38.ebuild X-VCS-Directories: net-dns/libidn/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5ec3cdc903f41dfb62fa3facb0732eb80833ab01 X-VCS-Branch: master Date: Thu, 22 Jul 2021 21:52:12 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5f28efab-2134-44a1-a896-2f94d95e633a X-Archives-Hash: 436138677a486f59732d24654389a84a commit: 5ec3cdc903f41dfb62fa3facb0732eb80833ab01 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jul 22 21:50:59 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jul 22 21:52:05 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ec3cdc9 net-dns/libidn: ebuild modernisation * Conditionalise mono-env_pkg_setup call * Use more standard structure/layout (ordering of variables, etc) * Reduced quoting * Drop trailing slash in dodoc argument * Drop COMMON_DEPEND Signed-off-by: Sam James <sam <AT> gentoo.org> net-dns/libidn/libidn-1.38.ebuild | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/net-dns/libidn/libidn-1.38.ebuild b/net-dns/libidn/libidn-1.38.ebuild index 70da61fa213..80d91922bab 100644 --- a/net-dns/libidn/libidn-1.38.ebuild +++ b/net-dns/libidn/libidn-1.38.ebuild @@ -16,28 +16,20 @@ SLOT="0/12" 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 emacs java mono nls" -DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS ) - -COMMON_DEPEND=" - mono? ( >=dev-lang/mono-0.95 ) - nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${COMMON_DEPEND} +DEPEND="mono? ( >=dev-lang/mono-0.95 ) + nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" +RDEPEND="${DEPEND} + java? ( >=virtual/jre-1.8:* )" +BDEPEND="emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) -" -RDEPEND=" - ${COMMON_DEPEND} - java? ( >=virtual/jre-1.8:* ) -" -BDEPEND=" - emacs? ( >=app-editors/emacs-23.1:* ) nls? ( >=sys-devel/gettext-0.17 ) - verify-sig? ( app-crypt/openpgp-keys-libidn ) -" + verify-sig? ( app-crypt/openpgp-keys-libidn )" + +DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS ) pkg_setup() { - mono-env_pkg_setup + use mono && mono-env_pkg_setup + java-pkg-opt-2_pkg_setup } @@ -63,7 +55,7 @@ multilib_src_configure() { --with-lispdir="${EPREFIX}${SITELISP}/${PN}" --with-packager-bug-reports="https://bugs.gentoo.org" --with-packager-version="r${PR}" - --with-packager="Gentoo" + --with-packager="Gentoo Linux" ) ECONF_SOURCE="${S}" econf "${args[@]}" @@ -99,16 +91,14 @@ multilib_src_install_all() { if use emacs; then # *.el are installed by the build system elisp-install ${PN} "${S}"/src/*.elc - elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" + elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el else - rm -r "${ED}/usr/share/emacs" || die + rm -r "${ED}"/usr/share/emacs || die fi einstalldocs - if use doc ; then - dodoc -r doc/reference/html/ - fi + use doc && dodoc -r doc/reference/html find "${ED}" -name '*.la' -delete || die }