gentoo resync : 13.10.2019

3 files changed, 3 insertions, 55 deletions

diff --git a/app-misc/egads/Manifest b/app-misc/egads/Manifest
index 529c00a362ef..8c06291f577f 100644
--- a/app-misc/egads/Manifest
+++ b/app-misc/egads/Manifest
@@ -1,4 +1,3 @@
 DIST egads-0.9.5.tar.gz 302708 BLAKE2B d9d08f08d09b4e5dc3f49f9c0fa14f9ed9a96f74576bcfbada9c9490c544711c05e84266e208a251c74d44ccbc453e3dbb8ce7bd5e3171a401cfc91d04e70c20 SHA512 b3138d31165f25c4b4b83b72eeee5fd0ea80e2d89a1a67f1d6d40c82afd849ef76ebdb5e71165eb80c00c971dd0bb4e9660fcb70ffedb7e14a003be90ce91e7b
-EBUILD egads-0.9.5-r1.ebuild 1013 BLAKE2B 8f27b783b53c6082b6d18e7a276042761f6a549eba2e3a626c2f1867d2cef7c2216342152acd6f108c3858ebe8c7b27dd28db372335793dcfe674d54a2cf058c SHA512 5f2c413108bb0442bbba029299bc29fb26a1b648daa1070f810526e61769c9f9bd8d371b8baf43cd84d0516128f175ef03638892597fb279ec1a5c44c1091eb3
-EBUILD egads-0.9.5.ebuild 1053 BLAKE2B 7a5adc5173ea61428091aeb001df7304b741c102c08f4c1982c23eccfa2ac7225048fbdf4a07819299fff53670237e1d93bdf98bbb86496efe0318e0397e637c SHA512 50c4e616310d2e2c8004c71d303a4b4d3902038fa42d42479111af1e70a8decd0ed54b05e78105a0219f3f00f7904dfc32b86d7aec4aa3a3edeff540c3396f18
+EBUILD egads-0.9.5-r1.ebuild 1009 BLAKE2B 2d9bead82f24e25080bf1d60ed49cca975d0e70d3fece86ba366885be2936115a8bc34c89091ae87231edb964e09b4c6e8a9227586204466f34ca6dd20dc2d3b SHA512 ce40d6f21d82b6a7788653d44bf059de43d7052b08947480a4ec3416ae8bb9f12b08ef3d61cce133b7653bb1010823d4fd012c057c21a4445c09d832f7db1248
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/app-misc/egads/egads-0.9.5-r1.ebuild b/app-misc/egads/egads-0.9.5-r1.ebuild
index 47f7d23b3a5e..415f97ec2038 100644
--- a/app-misc/egads/egads-0.9.5-r1.ebuild
+++ b/app-misc/egads/egads-0.9.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.securesoftware.com/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 EGADS_DATADIR=/var/run/egads
 
diff --git a/app-misc/egads/egads-0.9.5.ebuild b/app-misc/egads/egads-0.9.5.ebuild
deleted file mode 100644
index e6296724932f..000000000000
--- a/app-misc/egads/egads-0.9.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Entropy Gathering And Distribution System"
-HOMEPAGE="http://www.securesoftware.com/download_${PN}.htm"
-SRC_URI="http://www.securesoftware.com/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-egadsdatadir=/var/run/egads
-
-src_unpack() {
-	unpack ${A}
-	sed -i \
-		-e '/^BINDIR/d' \
-		-e '/^LIBDIR/d' \
-		-e '/^INCLUDEDIR/d' \
-		"${S}"/Makefile.in || die "Failed to fix Makefile.in"
-	tc-export CC AR RANLIB
-}
-
-src_compile() {
-	econf \
-		--with-egads-datadir="${egadsdatadir}" \
-		--with-bindir=/usr/sbin \
-		|| die
-	emake LIBDIR="/usr/$(get_libdir)" || die
-}
-
-src_install() {
-	keepdir ${egadsdatadir}
-	fperms +t ${egadsdatadir}
-	# NOT parallel safe, and no DESTDIR support
-	emake -j1 install \
-		BINDIR="${D}"/usr/sbin \
-		LIBDIR="${D}"/usr/$(get_libdir) \
-		INCLUDEDIR="${D}"/usr/include \
-		|| die
-	dodoc README* doc/*.txt
-	dohtml doc/*.html
-}