Clean up ebuild after 4 years of bitrot. Now 64-bit compile-safe and no sandbox errors.

Package-Manager: portage-2.1.4.1

3 files changed, 32 insertions, 11 deletions

diff --git a/app-misc/egads/ChangeLog b/app-misc/egads/ChangeLog
index 6c0e7a2f2e28..58feed65ad3d 100644
--- a/app-misc/egads/ChangeLog
+++ b/app-misc/egads/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/egads
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/egads/ChangeLog,v 1.7 2007/02/09 07:15:02 flameeyes Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/egads/ChangeLog,v 1.8 2008/02/08 02:04:27 robbat2 Exp $
+
+  08 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> egads-0.9.5.ebuild:
+  Clean up ebuild after 4 years of bitrot. Now 64-bit compile-safe and no
+  sandbox errors.
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/app-misc/egads/Manifest b/app-misc/egads/Manifest
index f3d6a6c99070..7abf93fe3128 100644
--- a/app-misc/egads/Manifest
+++ b/app-misc/egads/Manifest
@@ -1,4 +1,4 @@
 DIST egads-0.9.5.tar.gz 302708 RMD160 7912259cb016617c2ae30d58b5b6d54a83996f67 SHA1 2e53a0ed8a775d86de7669c4ca767093ca0a6b1f SHA256 606d68e284540d357115d7c2d2952d22a2b293fe77f00599396aeeb5b47e36a1
-EBUILD egads-0.9.5.ebuild 755 RMD160 e3c1dbd0659bccbc3dd178030b7774e3374de631 SHA1 d631e467ce1f642fe7876a1e428eedfca3510319 SHA256 d246945293810602f78cb81e50d6dfbcb6796d45556088c05d64855e01384c7c
-MISC ChangeLog 861 RMD160 02cb168ab8277601de2de65a30dfff9be4658044 SHA1 28cc8cd57cc73242478745e1c7906437db04d073 SHA256 03767c5d6e6f3909ae67dcd89031c9acc1cbb798b878fb17f14c91b29624aeba
+EBUILD egads-0.9.5.ebuild 1100 RMD160 19337aded3912123ef82e3650585ce6a66d515bd SHA1 b01d75414894f24cb7e7400b205a20185a36c247 SHA256 ec0ffded7615433bed66480dffdc8bb39d0c32bbc86f4655225044ff04ce18d4
+MISC ChangeLog 1025 RMD160 e1208002d7eac87effe3fddc4a707d1464d52a96 SHA1 c73bfa06404bbd4a86b51d177570377b19760788 SHA256 71ad7a2a0bdc97f9287b54aab7854442c7384e32f6e9ac652e6d02f0fcaf1bb6
 MISC metadata.xml 279 RMD160 f84566b5a463b59cc5ddd8a2210a54de9492ed2f SHA1 98caf044b8fce3f5ff202c7f7b71f0dcb9d51947 SHA256 785db7b7f8e4f9a526dc574ce2aa10024cc83af170f38ec9af9f56c23fc15543
diff --git a/app-misc/egads/egads-0.9.5.ebuild b/app-misc/egads/egads-0.9.5.ebuild
index 8adbda37ad3c..2e816ab95f3d 100644
--- a/app-misc/egads/egads-0.9.5.ebuild
+++ b/app-misc/egads/egads-0.9.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/egads/egads-0.9.5.ebuild,v 1.6 2005/07/21 17:17:26 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/egads/egads-0.9.5.ebuild,v 1.7 2008/02/08 02:04:27 robbat2 Exp $
 
 DESCRIPTION="Entropy Gathering And Distribution System"
 HOMEPAGE="http://www.securesoftware.com/download_${PN}.htm"
@@ -8,22 +8,39 @@ SRC_URI="http://www.securesoftware.com/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~ppc x86"
+KEYWORDS="~ppc x86 ~amd64"
 IUSE=""
 
 DEPEND="virtual/libc"
 
 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"
+}
+
 src_compile() {
-	econf --with-egads-datadir="${egadsdatadir}" --with-bindir=/usr/sbin || die
-	emake || die
+	econf \
+		--with-egads-datadir="${egadsdatadir}" \
+		--with-bindir=/usr/sbin \
+		|| die
+	emake LIBDIR="/usr/$(get_libdir)" || die
 }
 
 src_install() {
 	keepdir ${egadsdatadir}
-	fperm +t ${egadsdatadir}
-	einstall BINDIR=${D}/usr/sbin || die
+	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
 }