gentoo resync : 03.11.2019

4 files changed, 2 insertions, 91 deletions

diff --git a/dev-perl/libintl-perl/Manifest b/dev-perl/libintl-perl/Manifest
index c168a0d01294..285445323fe2 100644
--- a/dev-perl/libintl-perl/Manifest
+++ b/dev-perl/libintl-perl/Manifest
@@ -1,9 +1,6 @@
-AUX libintl-perl-1.240.0-sanity-2.patch 1828 BLAKE2B c2938547ae00fd06838c0827e45a884014b47098b30246b53925e2c223d6358b9282463cf5858b8e7a12dff00d1d520f65cea5ab0fbeec3163517ad9bb8de53b SHA512 9d3168ce47b0b2c4f421b2f2e5424c28d37f179d11bef3905cc8af9fffdef2837500704dc9d2ab26cbdb341dd732a5493c9c0900d88507153590ac2da46c264c
 AUX libintl-perl-1.280.0-sanity-2.patch 2085 BLAKE2B a36355f8cec583a6daac07ad9cb00f2eb7f319ead42b16337c67af9e03a6aa743f8f045529884db2c0604522823df2eaa415f0ee7460172266aa01a9074cee42 SHA512 ff855ac15c05f0410d544ddd422d684be3e77b3ddc75ebc74c83b32fdfb8ae290a0b62c60716185b5b8d595d8c2cb49cb3a22fa2f14bb1e7629323875a296896
-DIST libintl-perl-1.24.tar.gz 605626 BLAKE2B 6949f895ba54853704d5470e8a736e799d74ddbd569378254ac19ada9cc43c644f78bea1949b7a4c0072d4fe54f0744b7ad011539c6a1dd1191c6792c9347f1a SHA512 1c2c5d6d7ab21c45897195952a9f0f6ba26a9bbb7bfef0b5f3e9da282fcf94ab4ee80721164e5e3293d8abda0158e77ffbc331b8bed66aa56dd7fc7a6a91323d
 DIST libintl-perl-1.28.tar.gz 470898 BLAKE2B 6217a37f2176869dc945bd64a87a82710645153e3777fb5e4ddc674f179040d2268f326411a578314efafaa0edbd0e67aed99c4da86e20e811e1116d5cf2a86a SHA512 50f0836c1a84a22fcc8fca0fff2faeaae66774ec67b96c09a911c4969e8a610bbf20ba38167c13339b9ad9617e1fca07cb0cb1f12732f973b1cf618d502f59aa
 DIST libintl-perl-1.31.tar.gz 598187 BLAKE2B 6ce30e51cb001993d6ee3727c69010a3d8d9014334df8749704760734486e50296cdf019e185b463d4ccb3aac660526b440d4217aa5b304f749c5ecf43d18ca3 SHA512 9e22af95ecb8ae1c115114ce5d4f80bb8b1a83e4072d274a55f5946267ac29b98e9da4c01e05d0aa0051fef34a41b6297dbb44f51b8d602f3ef3786a59a6a04a
-EBUILD libintl-perl-1.240.0-r2.ebuild 920 BLAKE2B 823dbcf3fe24aa159189159fb7f1e813150dba688a6962bceda735f5bc1658b5912eb54ea8c7686a0a6907de42f12485c6b79ce5a0e2ef77810b843187f96d9e SHA512 dff0225a8f18e7427d66be99f5b7780e13c1e524102c5d86b5d630abadf6b70bc89cd50f77065927b31f70d017ecae0271d0091ad37faa6bfdb48f4b91fb9130
 EBUILD libintl-perl-1.280.0.ebuild 686 BLAKE2B 624813088c08108e1ac6cadd642013bec9491c66be25b72a5b000ae09f9343fe4b41f757f2d60a6fc619e23918b523dce7d6cf0c3baa8bf894342695d7624ca4 SHA512 2ab6318a8b462796825dc8bdd5c0302c92b201602083884df8e7dbc63a38ea2b9b823ae318e7186f6025563492cceac7a101d26ff0e1de015fb629199c7f16eb
-EBUILD libintl-perl-1.310.0.ebuild 830 BLAKE2B 63ac9c6a4f0f6938efc5f3adf0ee7b6930a6d3ac536a222a29ea3040c2a06c114edd33323b1fceb860c28127512f0b07c580f5ec5777f61b9509c4775f5986fb SHA512 0392e3f875ae6a8572dd44c8519ec5e673089150281009ae85eb462748a11c4bf0d9856c60622f0bcd34e61cb093f76fb7e11bdf146983a22ffbf08a3f124e4d
+EBUILD libintl-perl-1.310.0.ebuild 822 BLAKE2B 9b79e2472bc5aace5241692825cf46d165645dcf41c0058ee2709c687306f5d9df697262ed5a3bb479be1443b9ca218bcdecff35b1349ff9f0ce2ee3a93b45b9 SHA512 1a13268308630c5b3e9c7983d667cdb7e3efa8a4566af35f9041e3ccdfaa8feb78f9dfb8249b9301cd7b6d4780c5a7e1f50b3057d3df1bec76a97d83da89a396
 MISC metadata.xml 11484 BLAKE2B 6d4b9ed8ddbab8219bf47d61bf1985895f7c78753943039e4ba178b01bb907a5216f0704f77e1c501d76e50401e5b3f4e7fd29e8a193bd65a3fc54c6e0e4029a SHA512 264a3f0d04a6eef4b8c730634af0de431798057d6a8fe9b802a999ff446ffbba53cc9fe2746f128002808a8e72f575387107784aff2c8707999c1c068bbc3b4d
diff --git a/dev-perl/libintl-perl/files/libintl-perl-1.240.0-sanity-2.patch b/dev-perl/libintl-perl/files/libintl-perl-1.240.0-sanity-2.patch
deleted file mode 100644
index e6adbf1419b8..000000000000
--- a/dev-perl/libintl-perl/files/libintl-perl-1.240.0-sanity-2.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -ruN libintl-perl-1.24.orig/Makefile.PL libintl-perl-1.24/Makefile.PL
---- libintl-perl-1.24.orig/Makefile.PL	2015-04-03 15:28:12.000000000 +0200
-+++ libintl-perl-1.24/Makefile.PL	2016-06-01 00:06:12.000000000 +0200
-@@ -163,47 +163,6 @@
- 
- package MY;
- 
--# FIXME: This is really a hack! Problem: Depending on the build system,
--# we may or may not build and install the XS version.  If the XS version
--# is being built, the directory blib/arch will be populated, if it is
--# not being built, blib/arch will be empty.  Unfortunately, if blib/arch
--# is not empty, *all* library files will be installed in the architecture
--# dependent locations, if it is empty, they will be installed in the
--# architecture independent tree.
--#
--# Unfortunately, ExtUtils::MakeMaker does not take care of uninstalling
--# files from previous installations.  Consequently, we cannot determine
--# which version of the library will be loaded, since this depends on the
--# current value of @INC.
--#
--# The solution does not really make me happy.  The Makefile will be patched,
--# so that instead of ExtUtils::Install a custom module MyInstall.pm will
--# be used.  This custom module overwrites the subroutine that detects
--# whether a directory is empty in ExtUtils::Install, and will lie if that
--# directory happens to be "blib/arch".  This little hack effectively disables 
--# the annoying behavior of ExtUtils::Install (and I sincerely hope that
--# this is portable).
--sub libscan 
--{
--	my ($self, $file) = @_;
--
--	return if 'MyInstall.pm' eq $file;
--
--	$self->SUPER::libscan ($file);	
--}
--
--sub tools_other 
--{
--	my $self = shift;
--
--	my $fragment = $self->SUPER::tools_other (@_);
--
--	$fragment =~ s/^MOD_INSTALL\s*=\s*(.*?)-MExtUtils::Install
--		/MOD_INSTALL =$1-MMyInstall/msx;
--
--	return $fragment;
--}
--
- package main;
- 
- my $name = $0;
diff --git a/dev-perl/libintl-perl/libintl-perl-1.240.0-r2.ebuild b/dev-perl/libintl-perl/libintl-perl-1.240.0-r2.ebuild
deleted file mode 100644
index 942ef2ce8d96..000000000000
--- a/dev-perl/libintl-perl/libintl-perl-1.240.0-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=GUIDO
-DIST_VERSION=1.24
-inherit perl-module
-
-DESCRIPTION="High-Level Interface to Uniforum Message Translation"
-HOMEPAGE="http://guido-flohr.net/projects/libintl-perl ${HOMEPAGE}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-PATCHES=( "${FILESDIR}/${P}-sanity-2.patch" )
-
-src_test() {
-	if grep -q '^de_' <( locale -a ) ; then
-		if grep -q '^de_AT$' <( locale -a ) ; then
-			perl-module_src_test
-		else
-			ewarn "Skipping tests, known broken with de_ and without de_AT"
-		fi
-	else
-		perl-module_src_test
-	fi
-}
diff --git a/dev-perl/libintl-perl/libintl-perl-1.310.0.ebuild b/dev-perl/libintl-perl/libintl-perl-1.310.0.ebuild
index 15961da26caa..c8f155e6dfb5 100644
--- a/dev-perl/libintl-perl/libintl-perl-1.310.0.ebuild
+++ b/dev-perl/libintl-perl/libintl-perl-1.310.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://guido-flohr.net/projects/libintl-perl ${HOMEPAGE}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="minimal"
 
 RDEPEND="