4 files changed, 23 insertions, 50 deletions
diff --git a/net-analyzer/macchanger/ChangeLog b/net-analyzer/macchanger/ChangeLog
index 09f1f42f15ee..1a1c1541641e 100644
--- a/net-analyzer/macchanger/ChangeLog
+++ b/net-analyzer/macchanger/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/macchanger
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/macchanger/ChangeLog,v 1.23 2012/09/03 21:41:18 blueness Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/macchanger/ChangeLog,v 1.24 2013/03/26 16:12:07 jer Exp $
+
+*macchanger-1.6.0 (26 Mar 2013)
+
+  26 Mar 2013; Jeroen Roovers <jer@gentoo.org> +macchanger-1.6.0.ebuild,
+  -macchanger-1.5.0-r1.ebuild, -macchanger-1.5.0.ebuild,
+  macchanger-1.5.0-r2.ebuild:
+  Version bump.
 
   03 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
   macchanger-1.5.0-r2.ebuild:
diff --git a/net-analyzer/macchanger/macchanger-1.5.0-r2.ebuild b/net-analyzer/macchanger/macchanger-1.5.0-r2.ebuild
index 4cc6f247864d..fa0969e374e5 100644
--- a/net-analyzer/macchanger/macchanger-1.5.0-r2.ebuild
+++ b/net-analyzer/macchanger/macchanger-1.5.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/macchanger/macchanger-1.5.0-r2.ebuild,v 1.2 2012/09/03 21:41:18 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/macchanger/macchanger-1.5.0-r2.ebuild,v 1.3 2013/03/26 16:12:07 jer Exp $
 
 DESCRIPTION="Utility for viewing/manipulating the MAC address of network interfaces"
 OUI_DATE="20091029" # Generated with tools/IEEE_OUI.py in the source
@@ -17,7 +17,7 @@ DEPEND=""
 
 src_unpack() {
 	unpack ${P}.tar.gz
-	zcat ${DISTDIR}/${OUI_FILE}.gz >${S}/data/OUI.list || die "Failed to update OUI list"
+	zcat "${DISTDIR}"/${OUI_FILE}.gz >${S}/data/OUI.list || die "Failed to update OUI list"
 }
 
 src_compile() {
diff --git a/net-analyzer/macchanger/macchanger-1.5.0.ebuild b/net-analyzer/macchanger/macchanger-1.5.0.ebuild
deleted file mode 100644
index 835f08572f91..000000000000
--- a/net-analyzer/macchanger/macchanger-1.5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/macchanger/macchanger-1.5.0.ebuild,v 1.9 2009/09/23 18:20:49 patrick Exp $
-
-DESCRIPTION="Utility for viewing/manipulating the MAC address of network interfaces"
-HOMEPAGE="http://www.alobbs.com/macchanger"
-SRC_URI="mirror://gnu/macchanger/${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc ~amd64"
-IUSE=""
-SLOT="0"
-
-DEPEND=""
-
-src_compile() {
-	# Shared data is installed below /lib, see Bug #57046
-	econf \
-		--bindir=/sbin \
-		--datadir=/lib \
-		|| die "configure failed"
-	emake || die "build failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	dodir /usr/bin
-	dosym /sbin/macchanger /usr/bin/macchanger
-	dosym /lib/macchanger /usr/share/macchanger
-}
diff --git a/net-analyzer/macchanger/macchanger-1.5.0-r1.ebuild b/net-analyzer/macchanger/macchanger-1.6.0.ebuild
index 117c3c021d55..c411b5a38aa9 100644
--- a/net-analyzer/macchanger/macchanger-1.5.0-r1.ebuild
+++ b/net-analyzer/macchanger/macchanger-1.6.0.ebuild
@@ -1,36 +1,34 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/macchanger/macchanger-1.5.0-r1.ebuild,v 1.6 2009/09/23 18:20:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/macchanger/macchanger-1.6.0.ebuild,v 1.1 2013/03/26 16:12:07 jer Exp $
+
+EAPI=5
 
 DESCRIPTION="Utility for viewing/manipulating the MAC address of network interfaces"
-OUI_DATE="20051212"
+OUI_DATE="20091029" # Generated with tools/IEEE_OUI.py in the source
 OUI_FILE="OUI.list-${OUI_DATE}"
 HOMEPAGE="http://www.alobbs.com/macchanger"
-SRC_URI="mirror://gnu/macchanger/${P}.tar.gz
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 		 mirror://gentoo/${OUI_FILE}.gz"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
 IUSE=""
 SLOT="0"
 
-DEPEND=""
-
 src_unpack() {
 	unpack ${P}.tar.gz
-	zcat ${DISTDIR}/${OUI_FILE}.gz >${S}/data/OUI.list || die "Failed to update OUI list"
+	zcat "${DISTDIR}"/${OUI_FILE}.gz >${S}/data/OUI.list || die "Failed to update OUI list"
 }
 
-src_compile() {
+src_configure() {
 	# Shared data is installed below /lib, see Bug #57046
 	econf \
 		--bindir=/sbin \
-		--datadir=/lib \
-		|| die "configure failed"
-	emake || die "build failed"
+		--datadir=/lib
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
+	default
 
 	dodoc AUTHORS ChangeLog NEWS README