Respect AR/RANLIB, bug #477614

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x668310D9

4 files changed, 40 insertions, 19 deletions

diff --git a/games-util/xboxdrv/ChangeLog b/games-util/xboxdrv/ChangeLog
index b16ee234ee10..c2f28f41b5a8 100644
--- a/games-util/xboxdrv/ChangeLog
+++ b/games-util/xboxdrv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-util/xboxdrv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/xboxdrv/ChangeLog,v 1.32 2013/07/27 22:23:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/xboxdrv/ChangeLog,v 1.33 2013/10/14 22:08:04 tristan Exp $
+
+  14 Oct 2013; Tristan Heaven <tristan@gentoo.org> xboxdrv-0.8.5-r1.ebuild,
+  +files/xboxdrv-0.8.5-scons.patch:
+  Respect AR/RANLIB, bug #477614
 
   27 Jul 2013; Agostino Sarubbo <ago@gentoo.org> xboxdrv-0.8.5-r1.ebuild:
   Stable for x86, wrt bug #477430
diff --git a/games-util/xboxdrv/Manifest b/games-util/xboxdrv/Manifest
index e5c643c5de7e..185cb59f2eb9 100644
--- a/games-util/xboxdrv/Manifest
+++ b/games-util/xboxdrv/Manifest
@@ -1,31 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX xboxdrv-0.8.4-libusbx-1.0.13-fix.patch 9643 SHA256 e0b6be6447cd730ffd817cf0b08c07612479f687b130af368321e034f1ae8867 SHA512 992b304f8fef04479d537310b6f9883506787a72fb2c918906fb0d66934205188cd30f1c5c2bf7442c5ef1ba71ec932dcf1cc5e48b0e4311253deace2c1865df WHIRLPOOL 9716a8cc6ad469b110e137e03dd06c2322ec722391dc1e4b7871fd532c4be952844feb2efcec5189609f754e1dffc49c271de6206b0f09885fe11821dd1292b2
+AUX xboxdrv-0.8.5-scons.patch 356 SHA256 63956f60b3e5da208219a93627a3031140cbc47c357e7eb1251cc188c15d3c13 SHA512 da24073d39390d92d474d2dbfd2809027cb8f9fb8dd2409129cbab4bc0979d4ebfd0264e2971447a981fc68c63974603d7afeaa48c326af50b1eb9159bbc9dbf WHIRLPOOL 4b76e924a8b8c1d0aa1709830e1416f7f5f725d43ab7efcad4bd962e56b1260b15ac3182bd19c4bac5b056cd224578fe05544f13e3bede9e945f17a65c883639
 AUX xboxdrv.confd 326 SHA256 8fa28de2b0314e5ff37543c7637d29aea57b3100ddb6bcafcdb68eebc0626d87 SHA512 58f13e553058dec58f2bb941cfdb6a28bf18c1a035a15a425eb822faf1f09839fbd17c0b450c27d1a18a28403449269df48f4c3ce3153407ec407b7a808b9eee WHIRLPOOL e4eeb3b7b1371d18e0846c58bfbaea95ec99af9d62101cbad4828616c14cd36be026fabadd11eb3f375a0122a536ee9fbd3104075b9a44d35f864e2fa97b3a04
 AUX xboxdrv.initd 560 SHA256 98118d0dbba426ca3064c2577c25a63ae920b7b1ce0077531ca1966c8f2ae9ad SHA512 cdf180d1b33f5b529ad69a64df7125a8d596d3f2ba140df04a637b3a82085a4c0c295fef5143860c3fc1f45bea1eb25139acfa3270c6bd0d825ef547d24c6e0a WHIRLPOOL 3cf68cde7b297da702a64eece45d76ecf27302487453e821e111c14db35d431f89b39c40d296af48108055d09acfc2773ad16f7f35341d88fec52ca6318a454c
 DIST xboxdrv-linux-0.8.4.tar.bz2 264484 SHA256 01611a1add7f26d6b59e02fe869bbbdb2ad4358c922c85c446c2019f87ff519c SHA512 ecee6987a2be9021a70bf0fbf6eb93cca17cbac62e583ebe5bf63544217fdf9b78715ec8e709e503475421171711b7340cf2d2c297f2a75de21490bb879d1235 WHIRLPOOL 2615170b3e428da3bd57ef8d0fb3f07923289160ff669b48bf8a39f0ab2816f44367effb1af431744ef4efc2c6dcbf785ef49a3b823492be8be80fa927c5352d
 DIST xboxdrv-linux-0.8.5.tar.bz2 265805 SHA256 411195c4f5310a1a5f21f015daaf00b277f75da89df710308f8abfcf8f337e78 SHA512 954a3664462dfeff63a455f3dfea4bc14f8c3e07fa9b0c299bb523b4089faad7f8d634511eb66c023bd289adbbf18e96ce26cbcf5b8ffc9bb3088f1afe532601 WHIRLPOOL f47cdbcf40bd237715ff2b55354c6570ebbccd9cd0beb09b91869fa37db247c57019593b317d2acd767044fe92019defa01c9592bb3b63d2283103ff10dae844
 EBUILD xboxdrv-0.8.4-r1.ebuild 1072 SHA256 10c0b78085aefda0f9ed4723b96ff277a4ee46fb97d4e3c4321e8451de9740d9 SHA512 be835365b83be379ef7347177a0334866f8550e81ed429ff9aff2e2f96d82a902eda74a18b57fe9e92eb0e316471f0d27b4a0493056d9369d6e7dc18ae000ac6 WHIRLPOOL 9e92860deafcee9390b9f7c82fcf4476ce6cce3742f6f87fed7cda52978f47a4661b1d90d4e297d849ca6701595950ba3e706f1033a8b1bae99a27b4434e75f0
 EBUILD xboxdrv-0.8.4.ebuild 1009 SHA256 9e756a887c18ed59920074b370231ca95afbc1388a329ea4c8db88ee61cd588e SHA512 d05352216d53244147f3e2609b74c53e35bff4cc69ec3f66c5656df25e457fa9b42c282fcf7af143b2c47141a3808310fe38d3478774268f862609a349442c6b WHIRLPOOL 95a97d5791b2798f876dc346642fe51728bb4948a158e179b29cb5b59333da0fb69c87479edb8e278856c154d438f2bced11f84b2782b2aacf5a04078fb903eb
-EBUILD xboxdrv-0.8.5-r1.ebuild 1086 SHA256 cbcabeea7ef295475963d9d5924f021088cd047f08db905e0f9a59c8b0a91390 SHA512 6454f86f015710ec642d1d39d30f0262bc07b392fa14a8ab97046da1c7544eb9ead47efafb2e05bf4aed4964564849c874d3ddf90dd901d2657b91a3d4c34b58 WHIRLPOOL 23edadf468407258c5c54b0dcd1eca10f6efc2a819d6896f43ad47a107e18d1ed35832daa4ff42f074cb15ff32a875e3f1c3079a5fd84d33533b630f64c595c6
+EBUILD xboxdrv-0.8.5-r1.ebuild 1183 SHA256 51ef13e8287990fd5a02769d45da862976acebe4e7ea217cccd86243c5ef96f1 SHA512 93f8ae4fd4c95c20c4c8822a28133fd3a71359f306b08bef12d47ecf56dc9177a90019b2f609704ed61acce82dec7b60e0fd459745fb24a9f741ab74462480b9 WHIRLPOOL ed2b46501ff09f3e10aec8202e3facbd2510932fa31440f367c93324336a22b4c12b56ecd0c8add2c8069462cfd50c295cfc3d2419a462fb875d9301386d2886
 EBUILD xboxdrv-0.8.5.ebuild 996 SHA256 63a989c9e45b61658ad2dd65d0221164cf7dc0d17ecb48ca9514ef478a6b30e4 SHA512 828641747ede60cf4c65c3f95900af5e0304266a34964ef24057e6d7f674fbd525310f1c9ec05155b67a92f488d6ed9bedad52122a928aef025f5e20dd9879c0 WHIRLPOOL 42918665547500254cf1e21b42e1323672cf621d15de8e5c3f69cdd38fa821a6224513a370183e5b43bd988df17f36b812e2202068e401903a20deef5f1b9e37
-MISC ChangeLog 4448 SHA256 ba85a41cfcaf0dc32210726937458cedb404df8e82a530dedb2332e3a6257ec9 SHA512 9774841404ec33d58afd7a5ff02bb94337b7e4786efc8eb27573c55d82c8f5da655afb9a10ecaf7c26b8bef8ec2bab971c4bf41fb7382bbb2a0a29286360c38a WHIRLPOOL ecdb98669b4504867ac893414a6b72f11c718582e278ad7ecacdca4be87a403b6b9984ea976e87f4de3f45e2c53c7fa73bc40af9de9a58c9d884638d174b1e86
+MISC ChangeLog 4598 SHA256 419bb1d246493460c3ba9e0cf20163fe0bcfdb28c3df5371ab31a3ba524faf8d SHA512 2eccd31d2ab023b240c2c1d31a621cf6cbcf26ee29d6572cc8875cdf21f39e018f66e7623ffa1fb4af559b78fd8b303103e004172e497a14f738865a37b157ff WHIRLPOOL 917df79afc9e77eec2d3530b71281f99d38682bb1c6bee65a6d7f38c6a87a4a461fd765f016ffcef55557d10aa5e22bc187471b3d5fb886fb09e75c894276048
 MISC metadata.xml 254 SHA256 94013c86722577c3622e96f1c5a36b40520c1115a3edd5843b366a0cea0b23c6 SHA512 c154f0ec5e052c95141c1e182294e35c49bd8404157765a75b18025ad4b969d5007fab3363861f8e15dccd989e499d0eec4bafdc060bbf4400004969be8a6d8e WHIRLPOOL 536a04b316c96f02ebeb6d8198bccf0b0a7de25707d5b7f69b4cbf0e81e6919c4345d03b22b6f87aa72fe6bebf3aa14f42a94cd31194491e93bfeb775897a68d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR9EhmAAoJELp701BxlEWf/xMP/1M7s3A3U7OIvnPulrdyqhgY
-rgaRgychR7jmCERA8Q31IxXoEfu2r4gekmqSS9etLxnBdr/KFMxc5qs4BtUW15qR
-e75PM4OHoR2HbMYu6+s9+LHTEli5X0x431lOrUOgMASGa/+VrkLmAvK3BdjlJ2p0
-8o07cs8b44yKzWGDp8zKcGDALdHaazT2y0gkFt1Z1XXzHfzfvg8KMUZ7uXxKs9WG
-8RSxROS+bAVOPiRmLHzxDUkdy6u/AJMYu/UCT/lUPoUr+cvOkvrEFMVA5tGPynpJ
-zXF5X9FaCuQ+UcXdhCjEOwTXm+NDgK9LLelFkN6iUqcRdYEokI8lBoAUegu/ENvF
-pBQVqu6IbPZgKFE4seSxpWiPQOPAikcqGAU8gwvk2T/YPudwkKAwbeKk7dQstTe/
-0A7YIcS2hPUre4Z2NefvZaphiGES80F8RB/000RmrHXLUPm/dqtMbcvyfUJqTvbG
-8StYX2I12OVQV7lHSMaEcsWp7lMT+zubtC7s3INs9eIvTcAHs9igE/j60T5q1zx7
-EBHoYrBoQXmZ8TyaRX4Y13TPRqujL9TWX9FBIZC+cSLaG0DGv9qGd9qRcHBQat1f
-tPxaHbDHUtTOvjsE2Zo9FaDIdcsbA69HKK9LjdYThVzphoqLRynQcxooSUWjI7BL
-w3N/cI5/MPBvAfDtszZg
-=JMkg
+iQIcBAEBCAAGBQJSXGtFAAoJEN3Y2YlmgxDZ+ekQAMAPGBuHEJ/JoSzbuyByQC+v
+29VNE8m92DCyF4pZGHrEvH6gS14qC4WXfgBMNEHG2kt5uo6dvGSL7dlNb4WiaDBD
+QziOrx7lckXIMF+kmt+V0PRL33TkgwAws6jro2mFY09KfAMN4D6c/wA0Lkxw8Rtq
+Lec5lD1R9wOM2efsw4u/t9Nr+ZStqZ2yEKLtUM4XTw6zJvha+ckT3iWCd1DfC7E9
+fcRqYqNj31/SGoFbq2HYzh5dcMT+kCC3aUl39jn3BFH2OW1AOnKwfCy0XfgXQqfK
+jcFZpdOp6W/ImN6HbcbfhUU4ghwXsKsofCcIBoqZVRS1vHEtGQxJzPjmmi4o+/fc
+QqGytieqaKpZgHOaSetCx1EuT6ghDvLCwPN6r+Ih7rFy8vaGvpIenxMie5VFkboU
+lBsyplA9XKthO5dlsy+8RUfonqsmlOx3XvN8bhk5s9xfEdxCyZgf536cHnoK93Om
+IE6oQWpmilOxm96S+hR1ulpjc1Wev5kSGG/X/1I2PTSe9GL1Wqkifbdx01XJ5+Bb
+Xs+aVMNopbaUePkxzFuB3xptponKZV0bi0l1UNFY/0lyCzINyiF3biSehzBD057U
+9NGg98Hm8SLjIi4qFMz0PbNwk+xlXMtdyqbmmAy1G684talRSh/Do72Gc4PiHM1V
+WXJvxuJfl2elHWxZKuCS
+=eObb
 -----END PGP SIGNATURE-----
diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.5-scons.patch b/games-util/xboxdrv/files/xboxdrv-0.8.5-scons.patch
new file mode 100644
index 000000000000..cb81f6d51470
--- /dev/null
+++ b/games-util/xboxdrv/files/xboxdrv-0.8.5-scons.patch
@@ -0,0 +1,13 @@
+http://dev.gentoo.org/~vapier/scons-blows.txt
+
+--- SConstruct
++++ SConstruct
+@@ -85,6 +85,8 @@
+ opts.Add('LINKFLAGS', 'Linker Compiler flags')
+ opts.Add('CC', 'C Compiler')
+ opts.Add('CXX', 'C++ Compiler')
++opts.Add('AR', 'Archiver')
++opts.Add('RANLIB', 'Archive indexer')
+ opts.Add('BUILD', 'Build type: release, custom, development')
+ 
+ opts.Update(env)
diff --git a/games-util/xboxdrv/xboxdrv-0.8.5-r1.ebuild b/games-util/xboxdrv/xboxdrv-0.8.5-r1.ebuild
index d7f1ff3f53bc..9c53f26d1d9f 100644
--- a/games-util/xboxdrv/xboxdrv-0.8.5-r1.ebuild
+++ b/games-util/xboxdrv/xboxdrv-0.8.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/xboxdrv/xboxdrv-0.8.5-r1.ebuild,v 1.3 2013/07/27 22:23:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/xboxdrv/xboxdrv-0.8.5-r1.ebuild,v 1.4 2013/10/14 22:08:04 tristan Exp $
 
 EAPI=5
 inherit base linux-info scons-utils toolchain-funcs
@@ -27,11 +27,14 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 CONFIG_CHECK="~INPUT_EVDEV ~INPUT_JOYDEV ~INPUT_UINPUT ~!JOYSTICK_XPAD"
+PATCHES=( "${FILESDIR}"/${P}-scons.patch )
 
 src_compile() {
 	escons \
 		BUILD=custom \
 		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
 		CXXFLAGS="-Wall ${CXXFLAGS}" \
 		LINKFLAGS="${LDFLAGS}"
 }