gentoo resync : 23.06.2018

4 files changed, 2 insertions, 94 deletions

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 8b35b2acfaad..9d7302358282 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,9 +1,6 @@
 AUX diffutils-3.5-fix_macros.patch 928 BLAKE2B caa78e408cfcdf299277d5f8ee24be3d255571377d7c711bd90cd0ed710016929d7b9a68934d852fc9c9410b73e144259a2cc2264b2751ca444403b9ae37c065 SHA512 ad0cff0aea2ac560b3c0171141b6d1975d2ffb8684a20697464471355cdb161dea5967b72732b4de5ff9375a2ba2f29aae532967abe5311820de817afaf354ba
-DIST diffutils-3.3.tar.xz 1197832 BLAKE2B 8819e84f6d1d9ae30dccba01934ba506fd9e2033cc7ac8e2dc827868f6b8ce54c76129167d8754215d0637f9e731ca1176ffa83abd80eb95e37a29776e29afa1 SHA512 b04b998717e45e8fd1ba675957dad1909beeed68ffc41c0d9bbaddaf78965f9e63af5a8d8811bb94f33a3cddcad2fe1ad794e52e545def9ce96c092999a74a83
 DIST diffutils-3.5.tar.xz 1360996 BLAKE2B a2348911daff19a73a00985e8528888306f88be36bc2b2433bbd1a2a4dd37da06845df718c797b571e85b7f7fdaac8cb0514098b4c14dd634d531d12ba034be6 SHA512 758229637e3703215adf66c5df04126ae594424abaf2cad8f1fa482bd9759e90838c943ef56e0129beb1396f5932ed9337c8396679da3de32e49bb43d423fd6b
 DIST diffutils-3.6.tar.xz 1398296 BLAKE2B 1b0a1443f676a1c09d25ad0be4c2d936156da8e690fade9d39d94be3850c502db24c3f508178a51e817437069db2d110fb4577cd67b2cf645c11a1f26a043e3d SHA512 3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
-EBUILD diffutils-3.3.ebuild 1437 BLAKE2B c2fc69bfbfa2dfd0953b9f1cb80a4a7a4980740dbc5cbba631e3311e4ee548fcbee51c3c191709b890a90e8f46409689c217762a64cbdef672383bcca23c4aff SHA512 d0f286f68b667e5049bd0713336308f43f6fd75353e285d9753a2f1d43a94e218beca55a6df58d834dacc968c672d64e0daa0229c3654da4239da57c99004bcf
-EBUILD diffutils-3.5.ebuild 1247 BLAKE2B 49832f42580e2660ec1d772997044d9634549008507213efb82085d83bedc3b0ee41520bc32f470d0015983226ea8fa00e80cbbaaa015f41c2822bffb6c12dd3 SHA512 f3a2ae443bd782fd4c2079ee0817771ee1b07ff8b45c86012de2440895accf9248719c966b253e7df7a1162926dd1a62b584abc2e53325b997f755db1ce768ef
+EBUILD diffutils-3.5.ebuild 1246 BLAKE2B a0fbe671325f6a5593ebf54a84a97115464167f6279290baaa4582b8c7232defe0224c98ab44c3e12c6c67cdd19306ead9be32c89a3081c6721dfcd07f6eb73f SHA512 8b9f2c83ad6d6c2b2ac005396127d9f1bea5962c9455aa4bf7b962ce76cf36d05d3c08764dcf3b89c4863b3b9bd352fac04c7fb0bf54d098d46b84045a389d8b
 EBUILD diffutils-3.6-r1.ebuild 1262 BLAKE2B 84ddcf13a502dea3e94ef2a3b3cc0fccad1314d058d8f3f4776c8c1f7afdf03b523c0dbb9cad4f7c6ca5e8d85bb2fe166b8ca9259b4f7cb68b13f13d1168af6a SHA512 7b044025f77a91eab38517943c6cecadb2da6309001cde7160e113d39a37af62c1a3373b9ea4d8925301bb6d179f1653a647129932e431ec5ae28a2c2d2cca13
-EBUILD diffutils-3.6.ebuild 1166 BLAKE2B d4c28e6a0eab8b9c66fa6c07199c4ee6d7b862e0c4fdee27dc2bac56e8bb3a0ba87e7ca91605f12bacd9b3bc2695cb4987523465003009bfb20674dc10ffdd89 SHA512 2ac74317252603d3da51aa5a038ad3da40c77ac94a53bea59e82e93c66a64a7dff87c10beb8ba469e83c016f57cbf8fd23d5b08a87d92939947547916387bd9a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/diffutils/diffutils-3.3.ebuild b/sys-apps/diffutils/diffutils-3.3.ebuild
deleted file mode 100644
index ebe4d3023998..000000000000
--- a/sys-apps/diffutils/diffutils-3.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit flag-o-matic
-
-DESCRIPTION="Tools to make diffs and compare files"
-HOMEPAGE="https://www.gnu.org/software/diffutils/"
-SRC_URI="mirror://gnu-alpha/diffutils/${P}.tar.xz
-	mirror://gnu/diffutils/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-DEPEND="app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_prepare() {
-	# Disable gnulib build test that has no impact on the source.
-	# Re-enable w/next version bump (and gnulib is updated). #554728
-	[[ ${PV} != "3.3" ]] && die "re-enable test #554728"
-	echo 'exit 0' > gnulib-tests/test-update-copyright.sh || die
-
-	sed -i 's:@mkdir_p@:@MKDIR_P@:g' po/Makefile.in.in || die #464604
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# Disable automagic dependency over libsigsegv; see bug #312351.
-	export ac_cv_libsigsegv=no
-
-	econf \
-		--with-packager="Gentoo" \
-		--with-packager-version="${PVR}" \
-		--with-packager-bug-reports="https://bugs.gentoo.org/" \
-		$(use_enable nls)
-}
-
-src_test() {
-	# explicitly allow parallel testing
-	emake check
-}
diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild b/sys-apps/diffutils/diffutils-3.5.ebuild
index 5a731d693b20..af38207bd6b3 100644
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ b/sys-apps/diffutils/diffutils-3.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/diffutils/diffutils-3.6.ebuild b/sys-apps/diffutils/diffutils-3.6.ebuild
deleted file mode 100644
index 58f25710df80..000000000000
--- a/sys-apps/diffutils/diffutils-3.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic
-
-DESCRIPTION="Tools to make diffs and compare files"
-HOMEPAGE="https://www.gnu.org/software/diffutils/"
-SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
-	mirror://gnu-alpha/diffutils/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-DEPEND="app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# Disable automagic dependency over libsigsegv; see bug #312351.
-	export ac_cv_libsigsegv=no
-
-	local myeconfargs=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR}"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# explicitly allow parallel testing
-	emake check
-}