gentoo resync : 10.02.2019

3 files changed, 4 insertions, 56 deletions

diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 18476541a851..da5574da3dd7 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,7 +1,5 @@
 DIST libidn2-2.0.4.tar.gz 2008524 BLAKE2B 7163e1eff498031c7433911533b34d993876b55d9b324aaef39c93db2cceee78dec4c8cfbf4d9dabd1dbbb03a8cbd65021f26a94758f57b32ef98dc869f744b6 SHA512 1e51bd4b8f8907531576291f1c2a8865d17429b4105418b4c98754eb982cd1cbb3adbeab4ec0c1c561d2dba11d876c7c09e5dc5b315c55a2c24986d7a2a3b4d2
-DIST libidn2-2.0.5.tar.gz 2091929 BLAKE2B 1eb52ae7c9295bf4b5d6e36e6852ffb54b10663a0e3cea06df110bd7798fcb0d1b8e3b7169e4a11e800a23fc9f606167dcb7fc2d4a684e861d73a236de5c578c SHA512 9d040d60de40316788825d8720d509d5b8a82287415e09e17792c2f32fad99ca77f43e55888b9484db69426eaa0ece59e9671eee9cc46411afbdb0f81af31a79
-DIST libidn2-2.1.0.tar.gz 2102683 BLAKE2B ef8b29e458598f59044a058e2121b08a0034cf0a14d9a7952e83722a38e03cb66152271a62b690be3ede7dad36cdb69849f1a7ccd6e61c4f75256afeb6b1d1bb SHA512 003f3bdb872f9c6f5db80bc5ad5e5dd8f414e14139f4ae15b451e955eba18f612fda8b159796e9631d741fa0a2d731e6d489f9901d2561ac35b716efe56557a2
+DIST libidn2-2.1.1a.tar.gz 2122867 BLAKE2B 616bdf4c2c5095a29511db293fa908d4cac23f77e17bb6c60f8aa8c8a8a10f1b4e8b84b82406599fe0cc7122fd89c50ec252f1716198f72496800a19924fa09c SHA512 404a739e33d324f700ac8e8119de3feef0de778bbb11be09049cb64eab447cd101883f6d489cca1e88c230f58bcaf9758fe102e571b6501450aa750ec2a4a9c6
 EBUILD libidn2-2.0.4.ebuild 1226 BLAKE2B 1c59cb393e3eb99006bfe99f21fb48de733a5cb55bb9729531e4b0f40c30ab90f187f100609aaa5ad6c98499fadf66ad457ddd96a5897703cefe00fc0e03b768 SHA512 7a77cbb77800e71ef7c77befbfb2ce16a7a74cd75f35f674686fa8435acad15b216794e6b3473d7adac6cb6e9554c6b59c37830162c66711d3af4765847ba06a
-EBUILD libidn2-2.0.5.ebuild 1239 BLAKE2B 2e1caba85c2a501947afd2a8d6291a64feb35487b6ceeeed7d0479944d3257fdbb8f189999c66bb2a774f377bbe6351b8fcabedd13ed7c72497a61caab7146ea SHA512 df5f8e536da174a039f1538c53da6827515eacd0198e8aa00c3fb71c9cca9ed52a024c68d0834e4acecca981f87462472a30c7d00a46d2a9cf5ea9da8f03e067
-EBUILD libidn2-2.1.0.ebuild 1251 BLAKE2B 6a888aeaed3965d9255f8375083a512f5d913a7e10c45ecd92f9c6ff88a0a68a1f7be0972e605c6704f7af1ee8d5e35d8453eafa4511dd766608ce61d6aea3a8 SHA512 9a5a2da4c2165578589678b37a0959d219747c77b25de943cbb187f4aaeb0bc6f9306147c326c2c44fca8b63e0b1002540bd7607dc0e4f38709aa32f2c608ee8
+EBUILD libidn2-2.1.1a.ebuild 1266 BLAKE2B 851bc4749621b14cb943bc1b031e1d8dd1f1a4f8be8448896627a3ce0f9494c608ed2179de7e5606318809238ae68ab16d5147745455b75576867b5eac2aa6ee SHA512 2ebc8c116a965693dbd788a7d4be35919e89d20e66b95f7d97f843f92f920521952e251758a8126a2206c8debe7ead16a47f2b714d798cdb737cbf4abf342437
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/net-dns/libidn2/libidn2-2.0.5.ebuild b/net-dns/libidn2/libidn2-2.0.5.ebuild
deleted file mode 100644
index 7d53fcdaf7a8..000000000000
--- a/net-dns/libidn2/libidn2-2.0.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic multilib-minimal
-
-DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
-HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2"
-SRC_URI="
-	mirror://gnu/libidn/${P}.tar.gz
-"
-
-LICENSE="GPL-2+ LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/libunistring[${MULTILIB_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	sys-apps/help2man
-"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Darwin ar chokes when TMPDIR doesn't exist (as done for some
-		# reason in the Makefile)
-		sed -i -e '/^TMPDIR = /d' Makefile.in || die
-		export TMPDIR="${T}"
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--disable-doc \
-		--disable-gtk-doc
-}
-
-multilib_src_install() {
-	default
-
-	prune_libtool_files
-}
diff --git a/net-dns/libidn2/libidn2-2.1.0.ebuild b/net-dns/libidn2/libidn2-2.1.1a.ebuild
index d5e87e2879a9..cee3c6dfa002 100644
--- a/net-dns/libidn2/libidn2-2.1.0.ebuild
+++ b/net-dns/libidn2/libidn2-2.1.1a.ebuild
@@ -11,7 +11,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2+ LGPL-3+"
-SLOT="0/4.0.0"
+SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
@@ -23,6 +23,7 @@ BDEPEND="
 	dev-lang/perl
 	sys-apps/help2man
 "
+S=${WORKDIR}/${P/a/}
 
 src_prepare() {
 	default