gentoo resync : 10.11.2017

4 files changed, 2 insertions, 65 deletions

diff --git a/app-misc/symlinks/Manifest b/app-misc/symlinks/Manifest
index c96c99b2773d..5f91e197bc35 100644
--- a/app-misc/symlinks/Manifest
+++ b/app-misc/symlinks/Manifest
@@ -1,7 +1,5 @@
 DIST symlinks-1.4.tar.gz 4942 SHA256 b0bb689dd0a2c46d9a7dd111b053707aba7b9cf29c4f0bad32984b14bdbe0399 SHA512 d1efb1ca553cc9eb95f1d113e453acd22c9f0964eacec985c85c125de23ae9d636b9ced182c2673f455e5d897ad15a978a424170fce767ccc492443eac7f972f WHIRLPOOL 4161680c79b58aac890fbc60e48e1659b253a88c67ea8684fd3d2efc216d20c74b0bfb770a1c74cab49a3e9753be484f350f9726acfdcafcd76260f579348da8
-EBUILD symlinks-1.4-r2.ebuild 828 SHA256 2c192e55af3fa9daf41e1635624800610f7b1527e22741bb063f182f3d584a62 SHA512 400667af4a251dffe8be16979423ebc23e222a9d98b55ae86bb6b76e34a12237d83d86faec195606cc0f7f9cdaa46790665cea9fe97591edf5abfe4f727fc725 WHIRLPOOL 34615b2298a6033a82325fa593f3b0c750a5bc270c5e0090329e3f24aa0eaae2187cdd02daecb27e75d3e5eb2f18864bcfec9772359be5df866498ad03edaa0f
-EBUILD symlinks-1.4-r3.ebuild 838 SHA256 2c3817f2c8ba7d978aa9c7241aa57963134372d69ddc1023359f4537e79e212b SHA512 d0415832d55ac358eb804c6dad925075f294663454da30faccfbc1a0aa2772a3a6e474f756df3edb58ce7292e4bd68e9adc7af979ad6163373a30af0061a152a WHIRLPOOL c81be9ca6b9fc8106544efc3c89dfaa16167faffad30e8b2d920a563ceeca519c25de03b902dd6c827dd5da971050434d09b106bd1c5f419d11ab2aafb16b3d2
-EBUILD symlinks-1.4.ebuild 756 SHA256 6f3b2169fa5b50fc6b30fbed7c322091a6074f7905e90be0ad6b6d160559e8e5 SHA512 b56ba3fd70829262894a9e809d75f27049ede6a15270b73d3cb4dab0b69a75ae1da27be7941e0bc28ffe6205657b6a88417a67ba1d7841cfd07276c332108263 WHIRLPOOL 8699f5894256fdc4c485aa51d6b9478df51f5daf68879088899572c85b52ba8f1f155570cd88cd07c508cff4e6d57ee633a04c9fedb9f93babc1255ef5b40ee9
+EBUILD symlinks-1.4-r3.ebuild 830 SHA256 bbcc43d8b80e5168e9e0d85fcec6932124457c7792cb1301a3dc54a10c80dbf6 SHA512 5350e9cac341906ae71e710fd1e588395f2c267dfcefe772a161ec07e512341837fc8a583d667c3ebc785695a41cb2abe497cbb6352a2d8dc622273469dd6602 WHIRLPOOL 2752b16ccb9301d4fa94ba4dfced2df14d37e8c620577863b6d18bb2878cc5b70c0b9117a8bd411e692e0960439b0e6583f9eec6fa8f5afd936b2194db168fc9
 MISC ChangeLog 2724 SHA256 b8b11b9379a5b2f60c4ae79c4a04a4abc69ecdd4e71981bd7efe63c92cd495f7 SHA512 8d1caae2aa86d282b0cb0e3f013f6e4ebd019026a6a35711e71f3995c3b6b873fd79c23ef9d2ef30bc2bbf30c2a7e1a4d438a6704d46ae7ec99c83ccff7086d9 WHIRLPOOL 0fe08dce6a6d81b18f17d600937ece6665122f7c2fca99a43b30c23e277640ea460ff86b95fde169051085259564a9c7f1a3167e35919a029c2b9bbdab42825c
 MISC ChangeLog-2015 4321 SHA256 ffddc024216c8874f38c040e8b725b3bb0f02c691aac372d1adb26620044cadf SHA512 f2d4b5f2e1ac50e69ae986ca33e523e9d6137d3cc92a103e3711be862d767b1d357cc1c96ba1acb4a0747845bb68cd86717105555726359a80c7634f68f4fbc3 WHIRLPOOL c05c161d5a32570c7e755be4c1f137527a51d2a0b8a4f6e615fbd28c820e165142fda173365ed1ce562353b1bc6a88cf08da152f766af196682230689ba21cf4
 MISC metadata.xml 631 SHA256 7b4b801ad19ac13728a648dbd61d16d58645bdc355160efb12a7fe19191c1469 SHA512 69594f3511101cf9f9b3d172b0767a3b6de62a22157517ee8d55fd6dec41ff942c54563058eb0a3fd49f024ae331b143e177c026ab778dbc86f7081b6ab3051d WHIRLPOOL 858e67730051003953e8a0ef72d1d82e85e8777d16bbed167888230ac51f5b70e6b55c7836690bea7fbbdae5166d8b79dc41fb778649a601c4d09acacab53b29
diff --git a/app-misc/symlinks/symlinks-1.4-r2.ebuild b/app-misc/symlinks/symlinks-1.4-r2.ebuild
deleted file mode 100644
index 09abea25c0d3..000000000000
--- a/app-misc/symlinks/symlinks-1.4-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="Scans for and fixes broken or messy symlinks"
-HOMEPAGE="http://www.ibiblio.org/pub/linux/utils/file/"
-SRC_URI="http://www.ibiblio.org/pub/linux/utils/file/${P}.tar.gz"
-
-LICENSE="symlinks"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static"
-
-src_prepare() {
-	# could be useful if being used to repair
-	# symlinks that are preventing shared libraries from
-	# functioning.
-	use static && append-flags -static
-	append-lfs-flags
-	sed 's:-O2::g' -i Makefile || die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dobin symlinks
-	doman symlinks.8
-	dodoc symlinks.lsm
-}
diff --git a/app-misc/symlinks/symlinks-1.4-r3.ebuild b/app-misc/symlinks/symlinks-1.4-r3.ebuild
index 16be009b907d..30d018d3bce6 100644
--- a/app-misc/symlinks/symlinks-1.4-r3.ebuild
+++ b/app-misc/symlinks/symlinks-1.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ibiblio.org/pub/linux/utils/file/${P}.tar.gz"
 
 LICENSE="symlinks"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="static"
 
 DOCS=( symlinks.lsm )
diff --git a/app-misc/symlinks/symlinks-1.4.ebuild b/app-misc/symlinks/symlinks-1.4.ebuild
deleted file mode 100644
index 19890b510609..000000000000
--- a/app-misc/symlinks/symlinks-1.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="Scans for and fixes broken or messy symlinks"
-HOMEPAGE="http://www.ibiblio.org/pub/linux/utils/file/"
-SRC_URI="http://www.ibiblio.org/pub/linux/utils/file/${P}.tar.gz"
-
-LICENSE="symlinks"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="static"
-
-src_compile() {
-	# could be useful if being used to repair
-	# symlinks that are preventing shared libraries from
-	# functioning.
-	use static && append-flags -static
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} ${LDFLAGS}" || die
-}
-
-src_install() {
-	dobin symlinks || die
-	doman symlinks.8 || die
-	dodoc symlinks.lsm || die
-}