Bump to EAPI 3 and fix for prefix.

Package-Manager: portage-2.2.0_alpha47/cvs/Linux i686

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index ad06416a2ed52d2df171a422e0184a7337a6cdb4..ec0bfefc8ea8e8d4c5470ef62467db2d67e19fa0 100644 (file)
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.273 2011/07/03 16:59:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.274 2011/07/26 17:53:57 zmedico Exp $
+
+  26 Jul 2011; Zac Medico <zmedico@gentoo.org> busybox-1.18.4.ebuild:
+  Bump to EAPI 3 and fix for prefix.
 
   03 Jul 2011; Mike Frysinger <vapier@gentoo.org> busybox-1.18.4.ebuild:
   Tweak devfs disable so it works #371059.

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 16fa160c1bfa6664b7e9e47ee41bb2d15450f7bb..50f15d6adf29a898784c1e299b0f1930917f6904 100644 (file)
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX busybox-1.17.0-bb.patch 1039 RMD160 abd095949a1a5797a770dd84fbdd247490a7420f SHA1 4f3399421c00961f066b65f4f1955363dc9ed746 SHA256 be449a26d5e87431e2192f79f945e3bf0c999873306d40bf9c0d6cc61da08d48
 AUX busybox-1.18.0-bb.patch 918 RMD160 e6a7be911deb07510ddf46b8a4b8b24ef5b1b29a SHA1 f4815f4cd948c300d65e553486c949c780f05752 SHA256 9e713de11f26a07e5a17d7e62eed7a10b163de91331d50541dcc2c037acbcb67
@@ -24,13 +24,13 @@ DIST busybox-1.18.3.tar.bz2 2119251 RMD160 b38e5bc8ca9d586dd1528080b6a866ad8719a
 DIST busybox-1.18.4.tar.bz2 2130598 RMD160 db21d00498b155f950a3f2fb63fa339253e536c2 SHA1 d285855e5770b0fb7caf477dd41ce0863657b975 SHA256 4d24d37bd6f1bd153e8cf9a984ec2f32f18464f73ca535e2cc2e8be9694097fa
 EBUILD busybox-1.17.4.ebuild 7921 RMD160 2b3306d4c4b21f4fa246e4963f15ad75707d6fe1 SHA1 7808c464cb6e0d2efd4bd24f3aecaef4ce3c40c4 SHA256 31ee8f50c3123db62879b2209e96e020ae143a5e5f960138924a467eef8f7c8a
 EBUILD busybox-1.18.3.ebuild 7841 RMD160 6fbecabd528d25db31d82408100b42c2eeb72712 SHA1 7978d3b3e80b08196edfbc320e7f8ae96f0c10d5 SHA256 3f1dafc13a2662312aa7bb51c95a13524a6891c154b1c4905afb75b498618744
-EBUILD busybox-1.18.4.ebuild 8198 RMD160 06f9fb213fc6e65591598247b5fb4e17c8732654 SHA1 12d20e0ee26b71ced065f6c4412f96330aec4253 SHA256 1456ea3ea5113bac314e848196fdb48183f76c92b33c784b04ce9413a59379d6
-MISC ChangeLog 40688 RMD160 14bc1932413ec756cc578c43f3bd6dba47c1b8f9 SHA1 11bde336caa2c5df29ef7bfd568de1bb3a9d1a07 SHA256 cbc9a681706d98a6e4646324314eddfd154636e947c39edb5e392b90435e29f3
+EBUILD busybox-1.18.4.ebuild 8217 RMD160 65ad6ae480d99f034483b1a1a26f3a55c2e7b891 SHA1 66dc3e7b0e4d4319234eca75879288ec34b6fd2b SHA256 0bf2bbdf7494edb047eb617e3f3ec508fe18ac8fcff12c0d6cb05c6600721308
+MISC ChangeLog 40797 RMD160 4759ba482182eeeed887d1cd6b635189d7886954 SHA1 8b3ed18d93ef8cdc8c5f98514098897129b97f8e SHA256 692240fa6551c1b0a3a49fe7b1553ec99d7a173a3c4ccc4977c699e3c5484144
 MISC metadata.xml 420 RMD160 a3d9cd7689418647525460862b05d3adfb9cd4f4 SHA1 c67d73ae61fb0180060ff7d3d13b1b5e9ef2c56c SHA256 1d2b931bd8b4026d665b485a21263438fe5892bf81af7139e409bfd61a68d55c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4QoB0ACgkQaC/OocHi7JbLigEAl/dI75345yRKW0ZXSclIjehx
-SiqpQDDu8+A5nMvOu0cA/jJc+hohy1g+9qmH54tEV8WRGZ5z+O9DWb3notKAfNWW
-=yNc7
+iEYEARECAAYFAk4u/zsACgkQ/ejvha5XGaPScgCfSaBH9s1aap0MFLOUTfy6rCxi
+1cMAoNwJjCTC5PxjalVp0p4DmV+Bi+qJ
+=78Uq
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/busybox/busybox-1.18.4.ebuild b/sys-apps/busybox/busybox-1.18.4.ebuild
index 604c4116910d38be85afb998e1ea497d2bdefa37..473af2cf8f79198d0a882ba69ff48125596b9e3e 100644 (file)
--- a/sys-apps/busybox/busybox-1.18.4.ebuild
+++ b/sys-apps/busybox/busybox-1.18.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.18.4.ebuild,v 1.2 2011/07/03 16:59:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.18.4.ebuild,v 1.3 2011/07/26 17:53:57 zmedico Exp $
 
-EAPI="2"
+EAPI="3"
 inherit eutils flag-o-matic savedconfig toolchain-funcs
 
 ################################################################################
@@ -211,7 +211,7 @@ src_install() {
        if use mdev ; then
                dodir /$(get_libdir)/mdev/
                use make-symlinks || dosym /bin/bb /sbin/mdev
-               cp "${S}"/examples/mdev_fat.conf "${D}"/etc/mdev.conf
+               cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
 
                exeinto /$(get_libdir)/mdev/
                doexe "${FILESDIR}"/mdev/*
@@ -222,7 +222,7 @@ src_install() {
        fi
 
        # bundle up the symlink files for use later
-       emake install || die
+       emake DESTDIR="${ED}" install || die
        rm _install/bin/busybox
        tar cf busybox-links.tar -C _install . || : #;die
        insinto /usr/share/${PN}
@@ -257,7 +257,7 @@ pkg_preinst() {
        fi
 
        if use make-symlinks ; then
-               mv "${D}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
+               mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
        fi
 }