[net-misc/xorp] Adding ~amd64 keyword, bump, adapt to new build system, installs to /usr/local still but is now at least buildable

3 files changed, 31 insertions, 32 deletions

diff --git a/net-misc/xorp/ChangeLog b/net-misc/xorp/ChangeLog
index 1ba55f35d..f0fa01dc7 100644
--- a/net-misc/xorp/ChangeLog
+++ b/net-misc/xorp/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for net-misc/xorp
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*xorp-1.8.5 (12 Mar 2013)
+
+  12 Mar 2013; Patrick Lauer <patrick@gentoo.org> -xorp-1.4.ebuild,
+  +xorp-1.8.5.ebuild:
+  [net-misc/xorp] Adding ~amd64 keyword, bump, adapt to new build system,
+  installs to /usr/local still but is now at least buildable
+
   22 Jun 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> xorp-1.4.ebuild:
   inherit user eclass instead of eutils eclass for enewgroup
 
diff --git a/net-misc/xorp/Manifest b/net-misc/xorp/Manifest
index c8fe05a69..3c266fed9 100644
--- a/net-misc/xorp/Manifest
+++ b/net-misc/xorp/Manifest
@@ -1,6 +1,6 @@
-AUX xorp-confd 101 RMD160 e82b75d6f3b439c84b02d16864da95bfd5746d65 SHA1 b0006d54ee7f8c561347991749aa2b650fc47d65 SHA256 2a0f1fd28669a58e51966b774f793a59f85396cc18ac369b88ffe1eabc502cfc
-AUX xorp-initd 557 RMD160 9c7d4ad100ea08db2432b5f6f4b0d70625ebf16e SHA1 b9d6ce1daed9b90ff6f76168d66c1a7c770dc5d6 SHA256 f4f8b49b64a2f97ff3fb5bee53e10628faa94afac749a521a18f24434939373c
-DIST xorp-1.4.tar.gz 8496928 RMD160 4ebbc506d52e996bf15f43c0df1960cefd0dbaf6 SHA1 28f27ab220ddb571a244143c87d18685d72266ee SHA256 ec34cd5be7f0bf532fc18df148047e011279d29df025df12a3eb2cee671cab91
-EBUILD xorp-1.4.ebuild 1412 RMD160 6d08d312f8283abd28efd9aa67961b5545a64d6c SHA1 63e3bdc2bf2387eb944ca7a04c65fe43d77b9092 SHA256 21b8e95c438b6d4d0768ad0df5c4ff17412f1365ee4b785f03020d1e0612b7ed
-MISC ChangeLog 723 RMD160 319242c01d33d515e8f8d92261f7a89f399992fc SHA1 e4d23b6dd3ec24cd1ea4e04f8342b333430cb2d0 SHA256 6f7ed8526457fe2ba1554f1144a3897aa6caa2f457319c3f5a9d53ca502ecc5e
-MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82
+AUX xorp-confd 101 SHA256 2a0f1fd28669a58e51966b774f793a59f85396cc18ac369b88ffe1eabc502cfc SHA512 86d197c18c87e6331215e823acb99bf54f44fcffccfd6c3b5f225d638b7aa280331f7bb8e0d79ac643fa8fd64f69a90953a14506833d41b1eee2edda36a033f2 WHIRLPOOL d2595d6975adaf4890e6d725d5f78621be69a93844734f34aa92a9833d9c58c8fe2f2f08a201499c594b40092b3be5056f445e2859bf842d3f1648aab473b961
+AUX xorp-initd 557 SHA256 f4f8b49b64a2f97ff3fb5bee53e10628faa94afac749a521a18f24434939373c SHA512 39ef93781c0f29c7bb0271ec20a57737da0913b7394c6fb3d9ef05d126d0d19b86b837f5a09e410a806cba502a9b3f65f2cf3d5810c21f3ce9d7e3e6ecf2592e WHIRLPOOL 416d3cb2d261a7d8224bb5c743eca0a81c21d7894751ffb3f096f10cafb68988762dfaf94fe059208e229e1f3398e4e86566fad78e7346fc6ed826fd2ac0ddbc
+DIST xorp-1.8.5-src.tar.bz2 3104442 SHA256 4aa414e248f0ef3903a4ae8fd1862d8dd713a69f6bbc926d81dd693a88ef8e72 SHA512 5872937d3a307c431aaeddc5fe1cccc2f3e0a7dad35b528d6b2af6c5b7aab45f3aba5a07c1178d6af5be562e3f8e598444caf9e6aebb072079b66a7d6ddef3c6 WHIRLPOOL 3d3de3cf5de53d9dfe9c0aba2acf91e4699c2d6986dab6de138aa8ea3bf0a5c0f14cc1197dff58be3ffeeb2d0cea8ec0118955e358be80916b3e54c32a1c3f42
+EBUILD xorp-1.8.5.ebuild 1087 SHA256 f8eaf9912b754c654437ec10b275b807f373a05934d9a0e3331276756237dc53 SHA512 6662d774e0abb50b7f640e1b79e305f09c55901183d558eada740a83fa4c67b083da73fbdf38d7e75d1869fc35f3399603b412ed411b4528b8abf81f25187b8a WHIRLPOOL 3803d72d885b276958140838539dcde2ca8d1d4fe0b5d3bcb246aaa8d89d6f098f678bf21195d3e64e2463f6bb7bfb4306fe58fa18e97dff422451adf3e84474
+MISC ChangeLog 976 SHA256 664f6c743a2a289192598e9d0250043143f4d79f1b20500afbdf87f39732eb43 SHA512 7629ca6a337a69582188e404bc811f7455bb0fea449e721320fc924fd41a4f9049ccf0246c52e7de88f690c7ba9b13271894d349c7de1d151e0babfaf05f4810 WHIRLPOOL c834eeaa30c474bd93a98f4441f07e604067b8168b847e144441f8d2d73888cd7b3498d45d9265bb95221bf90ec44f19ef0e325d3486bcdb93d55bdc3cd212d0
+MISC metadata.xml 208 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82 SHA512 21d90d4547c76c80e50e134359dfbec42b158bbc16e4741738bdde5f67b7926d158dae1905948a477405b74e754ce4ed63cad910f220a709db8dfccf160e5288 WHIRLPOOL 33ec53f42c7a8c4c419989bd94e083c417574463e19c9c1322e6b96d0f5a6a52e3dd69fbedf2d11a7a77d24a93b81f3a604b6b33cac62548389537bf3e42df0e
diff --git a/net-misc/xorp/xorp-1.4.ebuild b/net-misc/xorp/xorp-1.8.5.ebuild
index 7eaf91991..c324701bf 100644
--- a/net-misc/xorp/xorp-1.4.ebuild
+++ b/net-misc/xorp/xorp-1.8.5.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit user
+EAPI="5"
+
+inherit user scons-utils
 
 DESCRIPTION="The eXtensible Open Router Platform"
 HOMEPAGE="http://www.xorp.org/"
-SRC_URI="http://www.xorp.org/releases/${PV}/${P}.tar.gz"
+SRC_URI="http://www.xorp.org/releases/current/${P}-src.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="static debug ipv6 snmp"
+KEYWORDS="~amd64 ~x86"
+IUSE="snmp"
 
 DEPEND=">=dev-lang/python-2.0
 	dev-libs/openssl
@@ -20,39 +22,29 @@ DEPEND=">=dev-lang/python-2.0
 RDEPEND="${DEPEND}
 	net-analyzer/traceroute"
 
+S="${WORKDIR}/${PN}"
+
 pkg_setup() {
 	enewgroup xorp
 }
 
-src_compile() {
-	econf \
-		$(use_enable static) \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_with snmp) \
-		--prefix="/usr/xorp" \
-		|| die "econf failed"
-
-	# -Werror prevents building snmp agent...
-	find "${S}" -name Makefile -exec sed -i -e '/^C.*FLAGS/s/-Werror//g' '{}' \;
-
-	emake -j1 || die "emake failed"
+src_configure() {
+	myesconsargs=(
+		$(use_scons snmp ENABLE_SNMP)
+		)
 }
 
-src_test() {
-	emake check || die "emake check failed"
+src_compile() {
+	escons
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	insinto /etc/xorp
-	newins rtrmgr/config.boot.sample config.boot.dist
+	escons DESTDIR="${D}" install || die "emake install failed"
 
 	newconfd "${FILESDIR}/xorp-confd" xorp
 	newinitd "${FILESDIR}/xorp-initd" xorp
 
-	dodoc BUGS ERRATA README RELEASE_NOTES TODO VERSION
+	dodoc BUGS ERRATA RELEASE_NOTES VERSION
 }
 
 pkg_postinst() {