summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrice Clement <monsieurp@gentoo.org>2015-06-22 22:12:08 +0000
committerPatrice Clement <monsieurp@gentoo.org>2015-06-22 22:12:08 +0000
commit37488f6cebaf555b39c6e9eddcdadeeb90c59034 (patch)
treefce49ea4d839c02905204d190366a3066a5eb84a /dev-java
parentAdd upstream patch to fix build on musl profiles, spotted by Felix Janda <fel... (diff)
downloadhistorical-37488f6cebaf555b39c6e9eddcdadeeb90c59034.tar.gz
historical-37488f6cebaf555b39c6e9eddcdadeeb90c59034.tar.bz2
historical-37488f6cebaf555b39c6e9eddcdadeeb90c59034.zip
Don't choke on errors when compiling the Javadoc.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org> Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x93491BB8
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/jaffl/ChangeLog5
-rw-r--r--dev-java/jaffl/Manifest18
-rw-r--r--dev-java/jaffl/jaffl-0.5.11.ebuild9
3 files changed, 21 insertions, 11 deletions
diff --git a/dev-java/jaffl/ChangeLog b/dev-java/jaffl/ChangeLog
index ee7d66a75f63..0a1ac42e03ec 100644
--- a/dev-java/jaffl/ChangeLog
+++ b/dev-java/jaffl/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/jaffl
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaffl/ChangeLog,v 1.12 2015/06/08 12:53:18 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaffl/ChangeLog,v 1.13 2015/06/22 22:12:01 monsieurp Exp $
+
+ 22 Jun 2015; Patrice Clement <monsieurp@gentoo.org> jaffl-0.5.11.ebuild:
+ Don't choke on errors when compiling the Javadoc.
08 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+files/jaffl-0.5.11-GNUmakefile.patch, +files/jaffl-0.5.11-library-path.patch,
diff --git a/dev-java/jaffl/Manifest b/dev-java/jaffl/Manifest
index 848e5df3d80a..6d94cc58ebe0 100644
--- a/dev-java/jaffl/Manifest
+++ b/dev-java/jaffl/Manifest
@@ -7,17 +7,17 @@ AUX library-path-0.5.1.patch 445 SHA256 c8d08190ac6b5161630019cdb9abfd90941dab3e
DIST jaffl-0.5.1.tar.gz 558817 SHA256 ba392468edcac21f8765dea717bede0cf3ce6488c85471ce1010e4f6973b034f SHA512 735417cc4110b63df39b43a9d96bf0c2b894abb3d7fc8886bdb33086c0d1003f9e41777a499efe60e8b6f8b3768cb4ec59ac0950455dc20922fe9fad4367bbf6 WHIRLPOOL 8ca384e7145ae43f741f06a4d7fcb7ddf8fbfd0c62e57beeaf4d2b17540b477d92dd54a4138b75bc600740da81eb8e8d56dd1ac05d6da5ccd4e009b946084fc1
DIST jaffl-0.5.11.tar.gz 559465 SHA256 77a7e7bf0b98521ed749238fec8eb184426b074010874a9ee9f076e27b74ac6a SHA512 efa5479901ac6d21310af7d482298281189b7d91b806a273cf99faacb4ee0ec6862427077e2553153c3741a640371199cf78750cd4de9f9fdd92e3f1962d7728 WHIRLPOOL 6970de5819e6335c454584a5071290ed10ace121197a5f4396063dbc9eae388bffa573ab921c6896c018f4f3c1441a0dda54952de8a7527cb5aebefe0a7127f3
EBUILD jaffl-0.5.1.ebuild 2066 SHA256 a07d165461897a87203236ac36f484468d901bc394c2623b8b81d2b0401bb0cb SHA512 b85aacb4f65424d9f99a9192c62a35a85c4f793e23c57bd294e45ed1bd964d1a7b6c40fe1543a78989b305fd7788c23384049164bd6374e1b224550acfa2ddda WHIRLPOOL 2a15d09d0718b77c6c8a0ab98b59a698d0ab6c3670bf911a9f50071721da7c3950bbde2487b66e64f1f3fc7e660771fb48c7e7b5d531c5a47b6abe63e3ba4069
-EBUILD jaffl-0.5.11.ebuild 2146 SHA256 d2002db879f11c083756722850802a22d1172ab5c5a867a42a9ed0ad6269861c SHA512 96bc99ed03b1baad83fe2779b25e4303e1ddacfc13b50f75cf4485ff724903601ab168f3916f70e7f179b0f7b966b2737d1784b8ec9fc3f6b40d8e1ff009d531 WHIRLPOOL 72fac6bcbe3756401d900ea97ac1409242966764dcf33097b3da58a9b7c9fee5180360009ddb517b9dcc9173106ce0c486a352f7b26301b13af78ed8e6f6075b
-MISC ChangeLog 1903 SHA256 25784eb9a7a0e57d76fe43d1e41b367fc1bc123c47d2c0ab57e8fdea3ba2f604 SHA512 927a3fadaec30bc7c9cf209d234284f1f874399b62d5ac1971de1cdfc002827cab5f03665394ec9f7b9aa2a11fdd3f9e109423ff79d2c67b73dacc5b686597e3 WHIRLPOOL 4255997688bfcc00c8a8cd8c10ebb8051ed955c6f173112d24a3bcdffe3accd4ee03ecae8e553280e6daf12e2bb193dd37124f247db8759998ae2bd472cceca0
+EBUILD jaffl-0.5.11.ebuild 2332 SHA256 e1305168ea15fe9ddd08f562b44650da9a263a8aaa60d5c9b3c2ecce849cbf02 SHA512 7fb8abfa95bf66b5335ce035cce02284a03237a0b8e58f15f5d21eca1a8a123190af45e32b013904751fed790d2a8ac177c616b78e200804540f49791b574f51 WHIRLPOOL fa50b3b6978475cdeb8628204562676b10d7a027d8461ae8a55de6b67c4aafa5a836968cff254cfbccee4a34bbea2a99e252d29a0b4338227a2ac723ea914cf2
+MISC ChangeLog 2031 SHA256 3c4738bc3e5768a49e460607be360ea3ae34262a90716934ce29877fa4ad4228 SHA512 3203d592c25383a4ab3ea046c02c5038ba132dcc9bac2cfaa41c15730b9cb1321228d51cd9397c07abcba934dc2fb4641bea25b39af9cc0c6e3137afffda129c WHIRLPOOL 2de7c57ee0ae11f4bf08ba6dfeeca6955299f8ef5c2ff1f1d6419cbfbfe6ad4a7da8ca2bccfd14d80a1f84ccf6e2acc5cf99437947cce65ebcfb125d88fd52e2
MISC metadata.xml 416 SHA256 2309ae0b6289f8d89aa8d462e7fb9bc9d4bf16d50057455ae187d960f48b85f9 SHA512 91c1e479dc79dc4b85d0c8261c16825f248df6419b2234411252ab7d11ba3ab2b158aa0d33e60b007860c58152ca24420286fc1c17abcfe8a5a283951f325e2a WHIRLPOOL 78a8a3ee9680da7a0b1905d336a33aa40e3613ab183b5e7226b2f10814bfe3e9a63c7357349571f4490be7c72686940abe9f545857375685e3f51e6d81dccf34
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQEcBAEBCAAGBQJVdY/AAAoJEJGRpfGTSRu43msIAK2XpnBDaY8A3FV6Ni+SraYy
-jXK9NWTHlF07yhLGulWeepWTFjRmXcrYDuzJKe2+D/rX4b7//PEuU8o99FWeYb1W
-zX8H3ogLtZOBgEE68bhPulVVHrXrhF0ixRRxKXJDQTe42XTmMErAaRrgHgOkg2hJ
-RTniAZljc82mbTNxKpD08kyAdzSw8WXPylaWTqiwAxDcv8K5Nm6OQlVEGPht8h8S
-k5WsqmBG3AaCRnj3uDP8is61aphRNNSElic2dHVJLyTGmT5E0x2qWVxeTqodC7am
-h6/IadD6MAGbho+L8krfbUKvUXI1P1SxXOLd0SZ4s8oLHsU0GeWFwjXUzyUnUj8=
-=EAPd
+iQEcBAEBCAAGBQJViJanAAoJEJGRpfGTSRu4Cf4IAKECphZGHA+tVD5vxnKHRoV3
+9POfwiK7RSqhMuViOsOHXvZMFPWtDXfFoawPlU5/MnjG4CYKyvotgmtlaa7zjz0B
+yb/HSdn5JNw6Q1ORdrw1LgmcrUfzNMxuZMkGxaSO2aD0AlTTW7lOE4n+6auLLVMZ
+eoTww9mpCDHjNwrOb+xdUs4WB7Uzsvuyl9tGiyI9JOEPlFXYnNFaxE2niVJdrDVL
+4x+DVrTHh2l4fUYsqUkR0Xe0VMxtEty1DE6Y/LJfF9gOn0JQ3grSK81JL1t75Z2J
+owI6GSzBM0dsc++HYLbmavtzM84vRDV/cf+KdmBI9byYu6XFSfR33qdszsIHlLM=
+=1Pcs
-----END PGP SIGNATURE-----
diff --git a/dev-java/jaffl/jaffl-0.5.11.ebuild b/dev-java/jaffl/jaffl-0.5.11.ebuild
index 0ff0787bfc62..c750a0c3ee66 100644
--- a/dev-java/jaffl/jaffl-0.5.11.ebuild
+++ b/dev-java/jaffl/jaffl-0.5.11.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-java/jaffl/jaffl-0.5.11.ebuild,v 1.3 2015/06/08 12:53:18 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaffl/jaffl-0.5.11.ebuild,v 1.4 2015/06/22 22:12:01 monsieurp Exp $
EAPI="5"
@@ -48,6 +48,13 @@ java_prepare() {
epatch "${FILESDIR}"/${P}-library-path.patch
epatch "${FILESDIR}"/${P}-GNUmakefile.patch
+ # Don't choke on errors from generating the Javadoc
+ cd "${S}" || die
+ java-ant_xml-rewrite -f ./nbproject/build-impl.xml \
+ -c -e javadoc \
+ -a failonerror \
+ -v no
+
java-pkg_jar-from --into lib jffi-1.2
java-pkg_jar-from --into lib jnr-x86asm
java-pkg_jar-from --into lib asm-3 asm.jar asm-3.2.jar