Fix building without git installed.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x9C6D7DE4

4 files changed, 58 insertions, 5 deletions

diff --git a/dev-util/findbugs/ChangeLog b/dev-util/findbugs/ChangeLog
index 4c0c68c50f08..58918d8c38d9 100644
--- a/dev-util/findbugs/ChangeLog
+++ b/dev-util/findbugs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/findbugs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/findbugs/ChangeLog,v 1.4 2015/03/16 14:24:51 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/findbugs/ChangeLog,v 1.5 2015/05/18 19:46:20 chewi Exp $
+
+  18 May 2015; James Le Cuirot <chewi@gentoo.org>
+  +files/0005-Don-t-require-git-to-build.patch, findbugs-3.0.1.ebuild:
+  Fix building without git installed.
 
   16 Mar 2015;  <chewi@gentoo.org> findbugs-3.0.1.ebuild:
   Fix building with -doc. Closes bug #543442.
diff --git a/dev-util/findbugs/Manifest b/dev-util/findbugs/Manifest
index 4893ccb0306d..0035043bf4ae 100644
--- a/dev-util/findbugs/Manifest
+++ b/dev-util/findbugs/Manifest
@@ -1,12 +1,35 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch 2267 SHA256 9194d96be8a9b64ed82cb478f868c39f777dcdea5d93f2f5cb34336122c83f08 SHA512 66ba7a8f9331b020e7edfae46ca80a1a914bc4ee61b30b2e5f0b18eaf1b60e6dce124e0a3908f588b2e7e240968dcde93125aa32bdf215388b7c3f195a274f83 WHIRLPOOL 1761d47cc064e7b807474b7da4b2d54a8e882005672712e0f134c4024a778a5e67df4c480a1e663fd95522235262d124392964c89cd73bb841a6300289ea28c1
 AUX 0002-Don-t-bundle-anything-in-the-annotations-jar.patch 785 SHA256 df1b73a3743d38a2391722b75f1c848cce60fc2bab8dc1d17b740763387f7f55 SHA512 7810ac73d039bbaf74b6302e73879ac1c13edbe747e400d3d32570f7eeeb89dac5d41c05d2dd5babee4769bb3528bdf826dcb2e244e3a15d8342b9d8f45a6752 WHIRLPOOL 24e500ee5df830a114799ef6a2d835eb667d7c09f52ded9c07b8b0d10d5221b64c7a1e008a9c2f4e7c8b71fb7de479e2fa9e8ac8137c214ffcdbeb5dac6542a6
 AUX 0003-JDK-1.8-works-fine-for-me.patch 932 SHA256 982ae953eccec2713d8cc7a6780446899c0f5d331861adfe78b1a2b658ba2226 SHA512 44dcfc2a45307b71a6106f2c2a8b8343f718816c04614acf9e212cf274f33d0796bab44714c66f75a193d09666269e9e2bdc16b63daad66548faa326780e3fa0 WHIRLPOOL 4b07a37c4511ac837bf770124737a46fee72881c1f24b94c72b1c8eed0beaa8910d8aca20161d527da34d2e99b92fd1268b8845c18b7659b04ccc81a4a4cd357
 AUX 0004-Don-t-clean-before-generating-docs.patch 623 SHA256 bab289bd17f094a2a6fee7bc54b4816aa99aaed9b43e7c5372ec21741a47b3f0 SHA512 4b5eed349a60d78dee3417e20798e8bb6a1054b655438e078d217942379529cb283f36e500b78ab15a893790277111c2ec94ed8c8fe37882aaef126c0af56981 WHIRLPOOL 595a2c0aa6e47181bb9e4d5d97d2b11c22e6f84d4e0e584dd1098fd7eb0b861d67797bab96ff10dc23cd40b8c2b85180bdb69fa8cc175bbd2acd2a8662d5db9c
+AUX 0005-Don-t-require-git-to-build.patch 700 SHA256 a590ca9d60ebce7a4bba98db820afb5af9c0aafd73c7b8f51ebf7826c776bb1f SHA512 84858e4c64bd3778cc604102df7e8ebb45c5fe4d7f64f065960d78f81c082a11e7037fcf0481d3b7d033bbcec8e24de78bead4d155672092f096029b5239d9bc WHIRLPOOL 8748f09569dd8a4977e40c3d87f5a67e926c184b557c93c705a25a75ea99d166deac1ac83278aac79dc35f05c4103e610330207d301e5f78df9c385cb78c8ec5
 AUX launchers/fb 1190 SHA256 4bbc11fcac3065b8503988043488ba70a7347de5231a045c58182fd05586ab94 SHA512 1e14856fa31f1115509f5efaa0bde86ba4d82fa195a0b2e5218e955f8c51a0b7d5868c2078e6b6fa72d05145395df63b1aa6e923af4008aa555d43c4de6231cf WHIRLPOOL cffbf923669dafea0b38358c4e1cf1ebdff2cf6d52424511c740b0e8c82d28fc27a6029dd515e7cd4c2531daa18582ce66ca32ffb003db25472a2ca490dcc918
 AUX launchers/fbwrap 41 SHA256 c8cb79523ce39f4790258ea6d85a2559cafe48169a66081b48240e462605a709 SHA512 d7b8cb9e8bbb7509b25abfa4f91efca154239f4b107680e4f6125fb236030a3eaae513b89252b7cb6e5893d52bcd3d4706e44733dc0e08a6a99e30865ea30202 WHIRLPOOL d71fce6937f6954070190abc00716e07d2debe0ea15d3a2e1c0e69645d79abe2b68d1864018e8187bdd4a3735b006c22f34a80fcbeda993a686f2bdc6ffdeb03
 AUX launchers/findbugs 1298 SHA256 75c5633e7951471d07695fda7fba2749df3c93e907e98e1c02ab8bc3313588c2 SHA512 24ba47e65452e36f885a864ae645e58b3a773570bde12371026203d3ca2cd20c2538f4acccf1159b52d2b52d2be913d6ebad794b3f17ab99d4fc3baaa47d1d82 WHIRLPOOL c75a1c36b4ee01c20873cd047f445e0d8cb3b5910e7393d8dd4ae0fa1678c3177e58bece2cdc363947ddf0505769e3a6dd980d4c9a531b5884f6b99f1ef82672
 AUX launchers/findbugs2 1290 SHA256 231464c1b31de2f1cf3defe3857c47f6b3200bee03db278858ea8a3fcd80d65a SHA512 de0eec2986596e67654ef17771c397c30b064d99d8d78dc89bd61ae309c61233091d82ee56b1965005d2dbfd9afb466b3b98554e602df43ffbf72fec60e764ab WHIRLPOOL 11675e234c755558e8bca9080608a9ac9e9b6247518f7a7ed1bb0b637e50e6baf58698f250f9668dd679604cbcfee8cc587555f550435e17097c60c4eb71b320
 DIST findbugs-3.0.1-source.zip 9625065 SHA256 bd8ec66550d419ed40283bd78a6268f9af57dcad20b732a9309fd1835abd33ff SHA512 d967769f2356f28b34d92c7451cf3e2ac004e667bfc3b049b5b10b1c19d7be2cfa0db132a77698d042300330f77a2bb5dd8c4baa0d67c37b7e5ae6da9e83a64f WHIRLPOOL 9e407cb5733560d6a548da37becdf1b1b120459a2453d85d4a345a7ff30a3ba1d92179a2586ebfac3c23c6d20f591aed6429b501d6ec791f4b1a390ab77ce387
-EBUILD findbugs-3.0.1.ebuild 3008 SHA256 320d447e91ac854f309fed30f2c2f825d6382d52912e4b718c4650545d737e74 SHA512 7642125d8265a4998a1ab267b49d2f71b8690990f84b82ae7cf2b0e4fcd59123da6173048bf9b23f2099ff9b7c395c71d9d7a7893f1d70e744c3212c56ac9da1 WHIRLPOOL 08a4954bea60ebb3c69697bf452ea5924af902e483182cb1cb664bd56bdaf8517f8dd909f5e63ff3f8fddb2c327be2a2c0899a8d1e761c9aae1c6e184abb67ad
-MISC ChangeLog 1407 SHA256 34d753fd4c31e8c77b7eacdfa5375f78188e7a5d00a086060415473f2f7c3aed SHA512 d7ff33d652f0016fc434d776ce003d5ef7bb4e8b12d25bafb8b202434e04e94a4098097d20d580f469741d47954009dc03ad4ae678057625479adf93943e6989 WHIRLPOOL 0f33d08d3f4170a1a70fa4452bf9c8e60c5d6dc71802d203b2bafa2fd783d18f40ca77cb15dea498c36b4c77752e3c8aaed452fdb31fd48567554084318b096e
+EBUILD findbugs-3.0.1.ebuild 3064 SHA256 a73ea80183b9883999d684e042b03a7c21c7e5dac05a6c68ba0e3e13318558c9 SHA512 690c94d08ee2d94358dcab9d9e35d3ed8f966df75ddf17ff7e9445f485bfabfe1637a6ff5a139ee90eeaefd0cfe64c2b2630eb4fe9f8ce6ba07cfcf7fcc5a63d WHIRLPOOL e646dd672c03bb7052f9b74bd3dca8fa438b0473648391cbab79666e9ab31a9bdbc929731915395c50cd49cfa326c91d7425e2ac3b2547b3223d765007e26907
+MISC ChangeLog 1567 SHA256 724b8cd6391073f4b5f86289b5b40285f5ac0827e470cb59207aff568f85b523 SHA512 867c1d65b87757e661d5908c3d1c374a742e93d859001c85573cfc897c80e578c7bb8c38deac84912ef0d319289350556566c4e38690ed17a3667ca68ba3e6a1 WHIRLPOOL d55ed4ed3f7cbff7a017870a7f0bfa3518fca632b99b8356efb4b9ffb603049b97bfc68df33f82abd54a04082b70f8714fea36cdeab00f2a94f06c0fd2776116
 MISC metadata.xml 899 SHA256 1b1288ef152173f2cb2542d572fcdb38301e85861422f64799b99d278feaa6f8 SHA512 5f91257821879ebc310b58331efe7e0c5a767f7c00746d1f9ad6454c29f6d8dea1e426649d1a5c3f0973f46d38c9bc11c26a4451341c620b4a2c3f17e983d43b WHIRLPOOL a27339a7c8bc7de597eecc57d43bc1d8a911e45ada3f05aa8006f0de3c3b6395fc6a3e7701bde1d0549cb263eea7fbf470cf3e7787161aff657f56122e55e015
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJVWkGTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kcTcP/jQB3INhg84KW98LuOGZT0uj
+JIhlQ6CAStsLQhooOE5Fb0AlHB4KOHJCP21KU328KzUEJIltwM8QK03ctOEYgXKt
+c2qAZGtixguqF+XAjJSez/iajh42ub/iM4TJ0tJ0Z4HQq7G9C7tlIjrl+2kQruTd
+CBh4wiDsz9GeOX1TTmjdd4nfNvgBPdsOvGU8dS3fo8cqExg0rSDV5WT57fDTDffJ
+ME1KRCgFvE8raCIcgQSdVIClA+bA6wRAruOlQrueAbqmKn5wAf9UgiZVjs8HQdkr
+/MJ8kAhVU3QQK8DXc/mt/p25rQ5r6OC8+nxbbaTPK+aYduX+RaYFnDE6hDyqUUvB
+dqGDqYGiTV7Ci4rI/zyiNI2Pzew3oT9MGM7AbYLoIHNQ0ImI9wObUSvgznJuRB59
+1HRui4frvuX5P390UBfmrlus1lrGGUOEJeKgsOCEmeZgO2On0NrPMBg5/v+ZAI9z
+9ZCbTZqa/Yi/05VnvwRnD80XbncwlFaUdysC8d81Pfl0hZpXWzN2nvK9jGzujDKo
+HVvIn7WU62PuB7oHO142BY42QHPYDDbCjver+IydNTJeNE39TdbFoAhoe4M1Q8vQ
+4Hr1WCB/MBEsM0r1Bv+sEoeZfU5LW5HARJoVQNtlXZJhr/urooJD2r1roaJce85u
+B52pv8FCOv0cbvFpXhw0
+=JUvb
+-----END PGP SIGNATURE-----
diff --git a/dev-util/findbugs/files/0005-Don-t-require-git-to-build.patch b/dev-util/findbugs/files/0005-Don-t-require-git-to-build.patch
new file mode 100644
index 000000000000..acdff2ce96d2
--- /dev/null
+++ b/dev-util/findbugs/files/0005-Don-t-require-git-to-build.patch
@@ -0,0 +1,25 @@
+From cbf9d81dba1ef0a42f79391c87845d7875a13993 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Mon, 18 May 2015 20:41:58 +0100
+Subject: [PATCH 5/5] Don't require git to build
+
+---
+ findbugs/build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/findbugs/build.xml b/findbugs/build.xml
+index d0cbc04..42c6d09 100644
+--- a/findbugs/build.xml
++++ b/findbugs/build.xml
+@@ -636,7 +636,7 @@
+     </target>
+ 
+ 
+-    <target name="version" depends="classes,-get-git-revision" >
++    <target name="version" depends="classes" >
+         <echo>${gitrnum}</echo>
+         <java classpathref="tools.classpath"
+               output="${version.props.file}"
+-- 
+2.3.3
+
diff --git a/dev-util/findbugs/findbugs-3.0.1.ebuild b/dev-util/findbugs/findbugs-3.0.1.ebuild
index eb076ac0384e..2b04860d8bfb 100644
--- a/dev-util/findbugs/findbugs-3.0.1.ebuild
+++ b/dev-util/findbugs/findbugs-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/findbugs/findbugs-3.0.1.ebuild,v 1.2 2015/03/16 14:24:51 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/findbugs/findbugs-3.0.1.ebuild,v 1.3 2015/05/18 19:46:20 chewi Exp $
 
 EAPI=5
 
@@ -60,7 +60,8 @@ java_prepare() {
 		"${FILESDIR}/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch" \
 		"${FILESDIR}/0002-Don-t-bundle-anything-in-the-annotations-jar.patch" \
 		"${FILESDIR}/0003-JDK-1.8-works-fine-for-me.patch" \
-		"${FILESDIR}/0004-Don-t-clean-before-generating-docs.patch"
+		"${FILESDIR}/0004-Don-t-clean-before-generating-docs.patch" \
+		"${FILESDIR}/0005-Don-t-require-git-to-build.patch"
 
 	# Remove bundled jars.
 	find -name "*.jar" -delete || die