From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- net-dns/libidn/Manifest | 6 +- net-dns/libidn/libidn-1.35.ebuild | 114 -------------------------------------- net-dns/libidn/libidn-1.36.ebuild | 28 ++++++---- net-dns/libidn/metadata.xml | 4 +- 4 files changed, 20 insertions(+), 132 deletions(-) delete mode 100644 net-dns/libidn/libidn-1.35.ebuild (limited to 'net-dns/libidn') diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest index b6d47c7a6207..822301913332 100644 --- a/net-dns/libidn/Manifest +++ b/net-dns/libidn/Manifest @@ -1,6 +1,4 @@ AUX 50libidn-gentoo.el 455 BLAKE2B d6d3a0576c1d0b5030ae32ed5c99e198f06faa897864d06251b07ee2fd3ecbac16347d633644f30dc7428e5bdf9747b0a4d51d7541601d3fbd4be6f9f746693f SHA512 13bcc7078ae8e088014323707d451c0bfdb53414e550945248a9648afa81681db013cb523eae71116c84f1dcfbb3b87e8743971775b75c4ce6dad914b3b0a501 -DIST libidn-1.35.tar.gz 4169217 BLAKE2B 809f9e854a4f2fcd3b2d5f7cdb34e2c68a0f00f5fcffc9002ead2d2d3dcee38022b3288f29716437f65f09e259e35cc98679d9c9d943423190cebb76fcbc94fa SHA512 782260f73b1fd8ebea8a40e2b3a6866c4f67494b2b3df03748daa9c0f842a9578932e746eb4bbf2547fccb1d65d7fc99a7977759dbe58f87f2fdd26d0fe45a09 DIST libidn-1.36.tar.gz 4557804 BLAKE2B 562ea97cba7970e3f3bd1557ba9e25e4180cca1b5cb8f66539f7830baf195cd36dc513c50e2475829af42d420e3d3b73a1c002acb06579c8b8b3879dcc8f95b2 SHA512 0d66e10bf7a8de4b27f692a427d2c8e901b8bed73b0a36268d8f939205df81f6a30f0634fd3b87370d4e81c1327c0b10391fa122a0a5459c32a3541b8a2149ad -EBUILD libidn-1.35.ebuild 2629 BLAKE2B e3f8b2e80132c1590e222bee5b8d2ade62f7a6a8bf2c301ad9535394bbe1ffcaad7b8d713437a834ec049336ba7b44eba4412c2e4ae9f8b23af83b95b7083762 SHA512 7548a82b6e35b2f5bdc1653a637938eb95e75afd76832ae8f117325209c8159b858f158529860e12f9158a5df651b8dc676868982dcbd56bd9f092fa648861c7 -EBUILD libidn-1.36.ebuild 2650 BLAKE2B 8c8bd834548de8a6359ceec33753125e57c163199386d88f3d41cdeff7ad11b56ba3fc3d4a5b7c26996f0abc9333f4e16165943c1a04564196389ec9af3fa1f6 SHA512 37ae0f0a95dc4f5865f5ac6084af716c0d6246a2465fc37e6724b668a10bd2a8802aeaad8842ab71c5e9bf7c96f08735c0171c4875a91671af368ef54d2d8779 -MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db +EBUILD libidn-1.36.ebuild 2634 BLAKE2B 5f0b48cdbb94a75f991ff25b22572744434e95aba7288bc7f26cd040f2e4ed6c7971798a33eacae503f84c6535ffecece603f3ad87248533dff8bc9b3721f965 SHA512 790a94bfce214e29f975c391d1efddc1ad598970b9b0c1fcb7c522d7fb7ae97204df527e132feffaf0aaf808fbcf28799dbe40a0676fc0bced55e42c8e85821c +MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282 diff --git a/net-dns/libidn/libidn-1.35.ebuild b/net-dns/libidn/libidn-1.35.ebuild deleted file mode 100644 index 448eff85d7ee..000000000000 --- a/net-dns/libidn/libidn-1.35.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit elisp-common java-pkg-opt-2 mono-env multilib-minimal libtool ltprune - -DESCRIPTION="Internationalized Domain Names (IDN) implementation" -HOMEPAGE="https://www.gnu.org/software/libidn/" -SRC_URI="mirror://gnu/libidn/${P}.tar.gz" - -LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )" -SLOT="0/12" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc emacs java mono nls static-libs" - -DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO ) -COMMON_DEPEND=" - emacs? ( >=app-editors/emacs-23.1:* ) - mono? ( >=dev-lang/mono-0.95 ) -" -DEPEND="${COMMON_DEPEND} - nls? ( - >=sys-devel/gettext-0.17 - ) - java? ( - >=virtual/jdk-1.5 - ) -" -RDEPEND="${COMMON_DEPEND} - nls? ( - >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] - ) - java? ( - >=virtual/jre-1.5 - ) -" - -pkg_setup() { - mono-env_pkg_setup - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default - - # bundled, with wrong bytecode - rm "${S}/java/${P}.jar" || die - - elibtoolize # for Solaris shared objects -} - -multilib_src_configure() { - ECONF_SOURCE=${S} GJDOC=javadoc \ - econf \ - $(multilib_native_use_enable java) \ - $(multilib_native_use_enable mono csharp mono) \ - $(use_enable nls) \ - $(use_enable static-libs static) \ - --disable-valgrind-tests \ - --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \ - --with-packager-bug-reports="https://bugs.gentoo.org" \ - --with-packager-version="r${PR}" \ - --with-packager="Gentoo" -} - -multilib_src_compile() { - default - - if multilib_is_native_abi; then - use emacs && elisp-compile "${S}"/src/*.el - use java && use doc && emake -C java/src/main/java javadoc - fi -} - -multilib_src_test() { - # only run libidn specific tests and not gnulib tests (bug #539356) - emake -C tests check -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if multilib_is_native_abi && use java; then - java-pkg_newjar java/${P}.jar ${PN}.jar - rm -r "${ED}"/usr/share/java || die - use doc && java-pkg_dojavadoc "${S}"/doc/java - fi -} - -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" - else - rm -r "${ED}/usr/share/emacs" || die - fi - - einstalldocs - - if use doc ; then - dodoc -r doc/reference/html/ - fi - - prune_libtool_files -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/net-dns/libidn/libidn-1.36.ebuild b/net-dns/libidn/libidn-1.36.ebuild index b21166f2731e..8e8470641b95 100644 --- a/net-dns/libidn/libidn-1.36.ebuild +++ b/net-dns/libidn/libidn-1.36.ebuild @@ -10,8 +10,8 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz" LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )" SLOT="0/12" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc emacs java mono nls static-libs" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc emacs java mono nls" DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO ) COMMON_DEPEND=" @@ -44,17 +44,21 @@ src_prepare() { } multilib_src_configure() { - ECONF_SOURCE=${S} GJDOC=javadoc \ - econf \ - $(multilib_native_use_enable java) \ - $(multilib_native_use_enable mono csharp mono) \ - $(use_enable nls) \ - $(use_enable static-libs static) \ - --disable-valgrind-tests \ - --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \ - --with-packager-bug-reports="https://bugs.gentoo.org" \ - --with-packager-version="r${PR}" \ + local -x GJDOC=javadoc + + local args=( + $(multilib_native_use_enable java) + $(multilib_native_use_enable mono csharp mono) + $(use_enable nls) + --disable-static + --disable-valgrind-tests + --with-lispdir="${EPREFIX}${SITELISP}/${PN}" + --with-packager-bug-reports="https://bugs.gentoo.org" + --with-packager-version="r${PR}" --with-packager="Gentoo" + ) + + ECONF_SOURCE=${S} econf "${args[@]}" } multilib_src_compile() { diff --git a/net-dns/libidn/metadata.xml b/net-dns/libidn/metadata.xml index f8bd6f3f34f9..0319eec4c8be 100644 --- a/net-dns/libidn/metadata.xml +++ b/net-dns/libidn/metadata.xml @@ -2,7 +2,7 @@ - jer@gentoo.org - Jeroen Roovers + mgorny@gentoo.org + Michał Górny -- cgit v1.2.3