Always apply amd64 build patch, and convert ebuild to EAPI=4 #428228 by Richard Yao.

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

4 files changed, 41 insertions, 28 deletions

diff --git a/sys-devel/bin86/ChangeLog b/sys-devel/bin86/ChangeLog
index aa63ee3199ba..82a946caa992 100644
--- a/sys-devel/bin86/ChangeLog
+++ b/sys-devel/bin86/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/bin86
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/ChangeLog,v 1.20 2010/12/07 05:04:10 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/ChangeLog,v 1.21 2012/07/29 15:44:56 vapier Exp $
+
+  29 Jul 2012; Mike Frysinger <vapier@gentoo.org> bin86-0.16.18.ebuild,
+  files/bin86-0.16.17-amd64-build.patch:
+  Always apply amd64 build patch, and convert ebuild to EAPI=4 #428228 by
+  Richard Yao.
 
 *bin86-0.16.18 (07 Dec 2010)
 
diff --git a/sys-devel/bin86/Manifest b/sys-devel/bin86/Manifest
index 48336e4db025..8f75ee94eec6 100644
--- a/sys-devel/bin86/Manifest
+++ b/sys-devel/bin86/Manifest
@@ -1,18 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX bin86-0.16.17-amd64-build.patch 296 RMD160 3712bb3c652baa0cbf8a61a474d78605f33af1c1 SHA1 ed41fe9834fa79d9985a950c81c232055cc7b6e4 SHA256 b74c997f8a4ae79780be3b91e67fe16661db0866bef032c800bd22a9dd98fef5
-AUX bin86-0.16.18-headers.patch 634 RMD160 3d9030e6e0e4d56b398d212760b9494e7cc3ac5c SHA1 cc6763e72347107d6f887e67612f07ec9c7ae95e SHA256 edfa0518c4a375821ee1ae9051d020711699fa423b168977761c01d73745bf01
-DIST bin86-0.16.17.tar.gz 152400 RMD160 b0ae5aff632a3528214749e256f5ab498f1a7fa4 SHA1 656f06b4b26d08412132e338baa25e42d713eeec SHA256 429ba36cb6220083ad7cf56d644b7265d401e631c93eb42f4b7ab9bb48c6829c
-DIST bin86-0.16.18.tar.gz 146383 RMD160 e5c039429b963c4127804911e91a9ddb2eb6729c SHA1 68f408573d4e350e65cbd505896eb8786e5f8383 SHA256 10b1aa5c0813e0bb01b8cab8b06543809e75b06b8e55db462351887c4a9ed831
-EBUILD bin86-0.16.17.ebuild 1012 RMD160 090f62573b21496000d9557b631fb83ba2e11d45 SHA1 aa2bac55e3f3304ea54716201e4dbc0a6dc45e97 SHA256 3e58664d4a5526113000fffd42b0a5e757da904f7345a61fa3a01f64d7744781
-EBUILD bin86-0.16.18.ebuild 1043 RMD160 e20521e355e065dd816e47e5ee817f7bb5f406d3 SHA1 364650cc35d2b20bbda893052ddc45fc9e23845c SHA256 5079872bbe9810135981fe01d52cd871e7230aa55f410e215db72a1832db9346
-MISC ChangeLog 3067 RMD160 3f933c37c4ee7bc7a88155587582181b054dc066 SHA1 d3dbd10258722667c24d8a9769a95d2b84877d85 SHA256 06dfd1b10dd7553b20e0a09f99aecf9f569ce3acadebb029321492cd8da7c0fe
-MISC metadata.xml 319 RMD160 1d2d20aa7a5ae862fcdd2810d5e751d2a757ed9f SHA1 15970eb6f4e72242e829cbde51de14d1747641c5 SHA256 1ccfe2384962ce56aa526105e30acd99af6ddfd361a67e2dfe7367a56a69e3d4
+AUX bin86-0.16.17-amd64-build.patch 327 SHA256 607e7233c0499ceafe3f91596a27bcdaa470cf7ca45e845b08ed38b3bbe2aef5 SHA512 8e4102c5b0848249c69fd9b3f16a93b12bbe8dce9771b78514bf423bec7b0144677f4eae07cb0ea479bf03dbd21092fdb2ce0a028df95f28c37d48b660466c13 WHIRLPOOL b9224447f5b81422e072543fe7f3ae86dceefbb4a7a388f0b8d876b5876bf77150db81e14b83d7287d6f0caf1e393913345578f14792efad41154b082bb4ff96
+AUX bin86-0.16.18-headers.patch 634 SHA256 edfa0518c4a375821ee1ae9051d020711699fa423b168977761c01d73745bf01 SHA512 9a25734c4634fce06d5abe4bc57014d9d055db7869fd62e72854be3b0118c720e484f273f99f3ecef1a22b83b006ee3a37d88096677c195b62ad0d3fb9c2c125 WHIRLPOOL 3599dbd7002a52d19a83707b9c7e31855b0fd989137050f278343bb80c452fbed66cd5e891e5514edea6fb59ca084c657c9803f1ec6deea4bf1d914a0ef8ace5
+DIST bin86-0.16.17.tar.gz 152400 SHA256 429ba36cb6220083ad7cf56d644b7265d401e631c93eb42f4b7ab9bb48c6829c SHA512 154b367772cca27f1ff65c6f5db21e20223e90a87129f0308d8a03d99c0a8df6918eafa8e5cb889909aca8f637b7aa24ea1a14a44e5f2d9ccd9af511c01374bd WHIRLPOOL b45758367090b2aab33dbdb6033f8ce66f1f122123eff38321216f513fa6b1fe49a91bafcb7f87568bf92e75d915635980447b37de95602611b10041d276840c
+DIST bin86-0.16.18.tar.gz 146383 SHA256 10b1aa5c0813e0bb01b8cab8b06543809e75b06b8e55db462351887c4a9ed831 SHA512 73751df158210ed75bd4238f7e10630e997ff5fd950860fd794c9dc1e32d682e0f6838063ab6961c1247d3d2c61fadeb56a4fabfba26959369a5248a76e0ca7b WHIRLPOOL d71828d24012fdeac580ed049708fa81c2cc94eac0ab9022fbd9e3e5d6c1ca6f432cdd042efc0a7249497f28b28b2104d06e591abf9ba97bc55da4342bdad2b6
+EBUILD bin86-0.16.17.ebuild 1012 SHA256 3e58664d4a5526113000fffd42b0a5e757da904f7345a61fa3a01f64d7744781 SHA512 dbb5732b82af0bc84a2350ca4af127b33d74a4acc3a0c9cc2f4b9e02ddba43cda7c4cab5178d2c0cce7b1839eed69ebc17f6d9b1963ba6495d0fa2ab6ea7f8d9 WHIRLPOOL dc2de261865fe18327eccd7e21a591d60b0016b223b5f28ce041fada577ec7e7294559e9f76c138404b123002091c7831975eac48a1d33fa19ab7d34799ea7b7
+EBUILD bin86-0.16.18.ebuild 928 SHA256 69ae79a1ea03dcb8ef855fd56d2880a1a22fed4155bc0e137bfe6e114fd9426e SHA512 285f3fb010c4b004cd8d42f247aa41e789df1801c2120fa520b17dc4a3636c2c7720ea0609946aa1bebf87eaa32eb7ff661ebbe8acaa4395c6d68b3c703d9236 WHIRLPOOL bc0477542044241cb527fb57ebc3f77ca5439fe28a0907465e5dc406cbf5deb774578e9331fe0eed0969bebf8060cf8358bde86ccd94cf1dc202b6ef22f39490
+MISC ChangeLog 3270 SHA256 56bbe18eade31ba0adceadab0c897c2914bf3f12c2807030deb87095a5d603e6 SHA512 1b03b6cdda0d8fb73d866e6865391ce41c1ca907493487de6b7af7e4a73714e74d8b9076234ffeb0b1ea17a21c32d96c46e24581d021c4c167217049cfdf5493 WHIRLPOOL 51e5265c55bfb7e27555629147f4e58039c7bce0f0b19ab7fcfa784c66e39f8a1a556af99f13bd0d8ed3dcb63e5078a5e98aead06ac7134b52cb851efa8e7c7e
+MISC metadata.xml 319 SHA256 1ccfe2384962ce56aa526105e30acd99af6ddfd361a67e2dfe7367a56a69e3d4 SHA512 5fe63911211427ce913c754d545745cdfd32b7a911b1a683f51851572c03c72e5c7298d0ecf6b31737bf749b08fb1750d994034173160b505c77cdd80e0449c6 WHIRLPOOL 2269f48062db5bf98210b417466f1349d3898c3660c870a2761a96e6f69f8091c44d0e3a8fba43dea0b6f59bbe500b6e9be3638e468f2c7dfb99054776839bf6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAkz9yEUACgkQTwhj9JtAlp4DhwD/ZUS5F5oy8PkkQqzgCNPygqgY
-vZSsg10g8admJlBKALcA/20pnw5oKjWVkYkCL7+wXx5DaAbQBRazfRyYwtKYpEH8
-=RLTn
+iQIcBAEBAgAGBQJQFVqMAAoJELEHsLL7fEFW0NUP/ArzDmHYZXiydCmTnC40CCeD
+JGNoebnVPIJ8/8NpBaUHyypLzJTnBTNRD/NYHx69AcT3xnCUfws8Z7zBnk+t39Ol
+INzWXvTR+/hHY59vZfIT+hWKwl+VMx1ZxrgEDe9p3uuH4w1vJM2kjF2VN569S3dm
+d8VyR/7sbmbgUk+IHmpmigOD20Dr3Y1sl2ptKdCRRuLJp4K1yrYS4aQK7gvussgd
+h81oC0flznOwFkmJ7RycZkUkkU8uDDHuBPUinxcz+CjJmGTcUmzWS0fUexEim62C
+W23u6y0q7RRVXzKHcx8+7KrBzRhzW77KG/toddg/22uZi6HY9FyG6WbyHU3wU3YC
+Y1syJcvRiN0L7g00BWEKEd+bI6uba29tNqqcfhDeGYVcRl0ePVQrjPTkhweV+er9
+ZpygP98kctiSXT/HJf/hpPrpyL1WfR8UjDPAe7Bvu85gjYOVappc+sOrIDusfj/O
+2IKiNMVAdIoWQ/VkCwrvyuQNoHZqBlj2rqb/DEjcDO/D+8g0MUOeswcmPJmFul1i
+URYJETQlchICGPDKzrvagWfnU75yFhSH53wujPCA3iwlKsvSXP0k3y9D+IScmDOO
+cJZ2h3fDi6LQe7+l2z+f/usjy5x8k/7km1tSgUfRRxYMy6KHIt0vY+lprEYZ2yeU
+9hUFE+kdTxH0opv0Id7O
+=BMrA
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/bin86/bin86-0.16.18.ebuild b/sys-devel/bin86/bin86-0.16.18.ebuild
index 9ded497423b3..60fc2d131fda 100644
--- a/sys-devel/bin86/bin86-0.16.18.ebuild
+++ b/sys-devel/bin86/bin86-0.16.18.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.16.18.ebuild,v 1.1 2010/12/07 05:04:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.16.18.ebuild,v 1.2 2012/07/29 15:44:56 vapier Exp $
+
+EAPI="4"
 
 inherit toolchain-funcs eutils
 
@@ -13,9 +15,7 @@ SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	sed -i \
 		-e '/^PREFIX/s:=.*:=$(DESTDIR)/usr:' \
 		-e '/^MANDIR/s:)/man/man1:)/share/man/man1:' \
@@ -24,15 +24,11 @@ src_unpack() {
 		-e "/^LDFLAGS/s:=.*:=${LDFLAGS}:" \
 		Makefile || die
 	epatch "${FILESDIR}"/${P}-headers.patch #347817
-	use amd64 && epatch "${FILESDIR}"/${PN}-0.16.17-amd64-build.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
+	epatch "${FILESDIR}"/${PN}-0.16.17-amd64-build.patch
+	tc-export CC
 }
 
 src_install() {
 	dodir /usr/bin /usr/share/man/man1
-	emake install DESTDIR="${D}" || die
-	dodoc README* ChangeLog
+	default
 }
diff --git a/sys-devel/bin86/files/bin86-0.16.17-amd64-build.patch b/sys-devel/bin86/files/bin86-0.16.17-amd64-build.patch
index 496d79020383..b494a8b724de 100644
--- a/sys-devel/bin86/files/bin86-0.16.17-amd64-build.patch
+++ b/sys-devel/bin86/files/bin86-0.16.17-amd64-build.patch
@@ -1,5 +1,7 @@
 This should make it built on other archictectures as well
 
+https://bugs.gentoo.org/428228
+
 --- ld/x86_aout.h
 +++ ld/x86_aout.h
 @@ -13,7 +13,9 @@
@@ -8,7 +10,7 @@ This should make it built on other archictectures as well
  #else
 -typedef char Long[4];
 +#define __OUT_OK 1
-+#include <sys/types.h>
++#include <inttypes.h>
 +typedef int32_t Long;
  #endif