Version bump. Fixes bug 535882.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

3 files changed, 104 insertions, 10 deletions

diff --git a/dev-java/bcpg/ChangeLog b/dev-java/bcpg/ChangeLog
index cf3eceec7e87..2bf1576bbdfa 100644
--- a/dev-java/bcpg/ChangeLog
+++ b/dev-java/bcpg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/bcpg
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpg/ChangeLog,v 1.3 2014/08/03 09:59:14 sera Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpg/ChangeLog,v 1.4 2015/08/01 16:41:30 monsieurp Exp $
+
+*bcpg-1.52 (01 Aug 2015)
+
+  01 Aug 2015; Patrice Clement <monsieurp@gentoo.org> +bcpg-1.52.ebuild:
+  Version bump. Fixes bug 535882.
 
   03 Aug 2014; Ralph Sennhauser <sera@gentoo.org> -bcpg-1.49-r1.ebuild:
   Remove old
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest
index c217eafbdd25..81a81b9d3a49 100644
--- a/dev-java/bcpg/Manifest
+++ b/dev-java/bcpg/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA256
 
 DIST bcpg-jdk15on-150.tar.gz 691012 SHA256 7a5097f02db626c2dd2b8c05fdb90c09b1c14a9aaec341fa7c94b0d956790b0c SHA512 763d253b9bb45b7e7fab75d557daa784c3d4a503ced979adc986e5688c3939db248853c864a2f4bec6d5b1dd9ed668d5f278c91b5607774fc703971d0b330fe6 WHIRLPOOL b14e374c3750f2a717dbfee3644bb1b69fa626bf04ccb00ef1762cdac81043422d92c4759c63d0dbb0e2d467701214885e064fc3e79a8d72d9111f7323284ba4
+DIST bcpg-jdk15on-152.tar.gz 748424 SHA256 1b46377c860ee519642f2bb2df285cb5ce5f1d2cb83f2a44d5887b693b6a5405 SHA512 1619a8cd4024129876266415406882ac5df3dd84fd3e01d7593304874ad641fe72ae95150d0e4414b294e2e5ca8eb39e41a25658f9502b4cd9622fbf0f3d45a0 WHIRLPOOL f203c55a62ee7274a39fcfb94e756f43bbf0cee0da14fc4981af6fab8c7615c7337eb1fda12d159dc464dff6af982fe9464dbebd7b091399a2ce5e956e501f7a
 EBUILD bcpg-1.50.ebuild 1924 SHA256 429eae9d55c2701e87ed6a67701cda9a1c63fd61f147b34cea92b75ec865ec1f SHA512 743a29304781d15115cd50e598334ce1a5c81da763bb23134e88a505cfe3fdeac8b25b7a8ece7f778f94492669e451984c8e28c70fe245401c10698e9d667420 WHIRLPOOL 853593a66e4a3a2a0d9c1d0d73370edfdda8c523c40f15393f2965982ada37d7a86d053f6c4ad76478806a0bdb73dd1a84be04442f49d1d447feace74b36c656
-MISC ChangeLog 657 SHA256 52733013c6a1aa7752c1aa26de02578102ba2e3877413954c2c3a5247756a9ac SHA512 db85cf77c3453846ca3f534918e47c4bf60e65df279b60a583315850c26be4c4d3570816aaabc0c6bef9ac44ad31aa3de56decbb6c2ca999135234fd8df33dd3 WHIRLPOOL 4e30aeeeed72e29850821106e0019a376ed5f55ab2b4ddd6587c328e85b7b4e712a34b4adedabc0cf073865d80a24a882da284bd06fc39bf3b0ab4cc72c6f7c3
+EBUILD bcpg-1.52.ebuild 1911 SHA256 ac763fc385fb0076d31bc59cda12c4dcce37b1907a3a3e01a8512563e453b9a2 SHA512 653e21627803b009fdc508674b481018d4d19a7cb00b1ae7e6f9654a4f744dd94579920b6a3405ed543a24ece9b033217bcb7eef637309e1b23c8dab67838449 WHIRLPOOL 127b39f907083033507608740d7cc08efdd7a6055018e9ba22ff1669c586c7c07f7dca9f98529b87ec650876fdb1cbe4384fa9037e776e02fcd55486503aa303
+MISC ChangeLog 796 SHA256 2ec7b85f5cbac526a71ea90c8742d45c888a999689a86d087d48c02f754258df SHA512 edf23b7b917a04078a484d047973a38e827caa8f984fb8982967449c4fe91d65e08371c44cedbf0927893ebcf1bf34b588c68ea6bc439a864dd46a605e691ade WHIRLPOOL 72ed915dc640d64f1057dbc97a92f0aff346b4b9924f0f353a3d3fbebee3231d124acef32f69a68333556206e0c7c6270ee1e1ff26728d7b02718f64fe833b29
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT3gf6AAoJELjwI6Q8XPdapMoH/0isMnPplN9H/OM3P0Wo897K
-+no2OdI8tVC9GpWO8opaemtgddhraux0PeXPonIvxUxX9YhdELwyBts5L/HcmVKG
-/d1q/wa+AINqfYk6oGJefHBL/R/u01xrQWa5mMU2tLD8qMZkg2ZbRFMKKXCnUIha
-gKia+VJ/FPila8rZVjEwsHVT1tYNUkIOpXFzN8MqQl1oivgEnQJ/PdPNr7C7vxTp
-cO8qyRfW9dEiCHt+SDr07Rd+4cv/KwkUrHo+6HWnSXicIZsU6RMqIY5NMr5IO9TG
-SUW7+1gybAnpM5PpW4HhzivJdkRJT6OjaGXgk882kqlthdMkaslOm1WBfc/dlF4=
-=ATcQ
+iQEcBAEBCAAGBQJVvQT/AAoJEJGRpfGTSRu4V6QH/if6ukiBb0WONJqCuBLY8HHd
+yPUX4F1ygsAis+nvhqT+JIJkVyezSgpf/aG0LaTmyZnqCzVkRBg81a0AEWhx+ido
+E78mpza3dPGp72g6/WsaGeRpoGChg96Je7LiUhAfgeJc8qb/IRBRKhejkX6OavSr
+B7fZwB8oitskxMUlqUVBpDhk5AFDlqOw9mwDQUnavB3HHT1evCjLDzWpvBguiWMM
+t+0OkAWztMP5kQzXDqMKEd4bjcaWzT8KR04r6sy3YgGgc9pU7zySp6jG1oxDFD0B
+q4SIKBa6m4mMhrZUTBJrJ3kSrBXBfI88StL7FKaEuXRpbP60P8pfICRwtxnhf6E=
+=o8+5
 -----END PGP SIGNATURE-----
diff --git a/dev-java/bcpg/bcpg-1.52.ebuild b/dev-java/bcpg/bcpg-1.52.ebuild
new file mode 100644
index 000000000000..450628b4dffa
--- /dev/null
+++ b/dev-java/bcpg/bcpg-1.52.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpg/bcpg-1.52.ebuild,v 1.1 2015/08/01 16:41:30 monsieurp Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+# Tests are currently broken. Appears to need older version of bcprov; but since bcprov is not slotted, this can cause conflicts.
+# Needs further investigation; though, only a small part has tests and there are no tests for bcpg itself.
+RESTRICT="test"
+
+CDEPEND="
+	>=dev-java/bcprov-${PV}:0[test?]"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	test? (
+		dev-java/junit:0
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	mkdir "${S}"/classes
+
+	if use test; then
+		java-pkg_jar-from --build-only junit
+	fi
+
+	java-pkg_jar-from bcprov
+}
+
+src_compile() {
+	find org -name "*.java" > "${T}"/src.list
+
+	local cp="bcprov.jar"
+	if use test ; then
+		cp="${cp}:junit.jar"
+	else
+		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
+	fi
+
+	ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
+
+	cd "${S}"/classes || die
+
+	jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
+}
+
+src_test() {
+	local cp="${PN}.jar:bcprov.jar:junit.jar"
+	local pkg="org.bouncycastle"
+
+	java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests
+
+	grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/${PN}.jar
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}