From c7e65af066dd14ca95ceec501a66d4b49cb8b597 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Miroslav=20=C5=A0ulc?= Date: Wed, 19 Oct 2011 00:57:29 +0000 Subject: [PATCH] dev-java/commons-dbcp: fixed bug #387241 Package-Manager: portage-2.1.10.29/cvs/Linux x86_64 --- dev-java/commons-dbcp/ChangeLog | 6 ++++- dev-java/commons-dbcp/Manifest | 24 ++----------------- .../commons-dbcp/commons-dbcp-1.4-r1.ebuild | 4 ++-- 3 files changed, 9 insertions(+), 25 deletions(-) diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog index 6ea684b32145..7eaac2326c59 100644 --- a/dev-java/commons-dbcp/ChangeLog +++ b/dev-java/commons-dbcp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/commons-dbcp # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.54 2011/02/27 14:26:39 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.55 2011/10/19 00:57:29 fordfrog Exp $ + + 19 Oct 2011; Miroslav Å ulc commons-dbcp-1.4-r1.ebuild: + Fixed compilation of version 1.4 by restricting it to compile with JDK 1.6 + (bug #387241) 27 Feb 2011; Markos Chandras commons-dbcp-1.4-r1.ebuild: diff --git a/dev-java/commons-dbcp/Manifest b/dev-java/commons-dbcp/Manifest index 0aadf27050e9..f34d6d93b34e 100644 --- a/dev-java/commons-dbcp/Manifest +++ b/dev-java/commons-dbcp/Manifest @@ -1,27 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - DIST commons-dbcp-1.2.2-src.tar.gz 641291 RMD160 271dcf459e2a4693f193481130bef67ac42e26ab SHA1 34ce36c8bb2f0e125e668066ae938bf9391e88b9 SHA256 62ba04a48f14cfe7d3aa415fb3a57547955a63a6f422ac79ca1da08f3660edd9 DIST commons-dbcp-1.4-src.tar.gz 932507 RMD160 0e057beab5c97eddb0587683502ae46f8fb395da SHA1 48702486eaba6ec40fb65e912c8f597d80654f54 SHA256 f5f10846e79fc71121fe7402c61d71575506b01b59e719e974ebc4d99e6df283 EBUILD commons-dbcp-1.2.2-r1.ebuild 1465 RMD160 2843c85e9596f2fa699692d82fb97522d75aadc6 SHA1 0b761020f0b801348f721ba5bd1d3faea3fa376e SHA256 733c10dd31332d5c73375484151881f2d01b478c1b525048df0d09f07f8f89a6 -EBUILD commons-dbcp-1.4-r1.ebuild 1575 RMD160 c5388f83aa8f7cf07f8c0bcf46a1d546553f3b56 SHA1 7bfb6c8035784dde41eab8064a7b8f4f83f944a4 SHA256 b51fcb6ce5d93df00ef7b25a36428d0dccfb2be2c90bf237b660c37d20d7cb06 +EBUILD commons-dbcp-1.4-r1.ebuild 1573 RMD160 7ab571b35469c9c6eddc39ab2659972980be6a03 SHA1 6d62555575abf805d24108abaf3d67ee06d9265e SHA256 396abcb248ef307288a0d7981aa55f20df0b43cc4d145375c91d780c244d4d88 EBUILD commons-dbcp-1.4.ebuild 1504 RMD160 33554a43da57a6c79388a5c24e137720d6d4c008 SHA1 e7f63a39058dada22c5d95f13014ea2620444d80 SHA256 02084d8203e504f148d6313ab167e8588540f31c87ecd08f10af0d5794f49ecf -MISC ChangeLog 7524 RMD160 0f278b0fa921ffc8524d17e35cc9b6cfb97c973c SHA1 d5877b574760781046078d7c7475f8394ac5d1cb SHA256 330bbb867425d3dd482c572c2d8cb85414f69af634d6acdedb1cd8dad49b8b40 +MISC ChangeLog 7698 RMD160 9ea5cbe428b5ad8c5a6d704a8a308ad29a8a6ad8 SHA1 386c46788cd455ad196f3870c93bdc7b5c20e214 SHA256 8c1e437ef0098bc85f3cbcece12fa867cd38cd30dc2df7298922d63ebe7d0fe4 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iQIcBAEBCgAGBQJNal7pAAoJEPqDWhW0r/LCCFUP/j/0wZuhNGXd70lk/5xBRqx/ -pmU0Fg8Pyr3f119nwFoz/XNR7ZmzN/M3QzctISUOBAWGHcPtusqyiovlXZakfI+u -L85NZzTNf5CLY6oTEYq9opQRODr8AHdSv8zeAoswlZgDxNNMRYrJlG8GG7ad5FtR -GpKK9es3Ncma3wv4X7s5Wxs6qAwzVL16zxGMzpAsGZORpP31sDUfN4ydh7J3//xq -GLr6CfkKVV/BJxKzDprTDQ35ia6LDKE3QLoItw58hSfS9BHHmjbJ0MXZwlYh5zNJ -bN+ga52LbluFFKDhUltQLS4vPGlrpAQNr7PySWLcKYD0ahGDjl/QnhHzJW0L0dPR -kgvULjq1jBaD0H2Ig/Ujvdi1dKxlmwUfc2EStA0hw3y2mueJkIg0USL0/7p3KBtJ -4PV8A6NC+nv5wQRn0cMDLVF3iNOjuu2pk3omuT/6AbSs4HxDfnHRU3E+nBBIDe+C -vHs09ePjd5wsdTWs/6rOoet74euU9UieBqkIRX4nMenb61btBhhBVkLIf1xPjlDX -HR8jI9LIgjdYn5mW7S9Dh1H8Zz99ky5eTToyHtZxpebPBg7q7+nPq7BTHy1wd3mS -Q7H3U87N97oX+6Q2FTco5XxiNBN92oZD/+j89WbaTkWs/ysSjfq6tAwdoruwglMV -uLUsym1xrgQ3OSIDe2Hc -=jQyC ------END PGP SIGNATURE----- diff --git a/dev-java/commons-dbcp/commons-dbcp-1.4-r1.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.4-r1.ebuild index a4af73b9d802..8204643cff8b 100644 --- a/dev-java/commons-dbcp/commons-dbcp-1.4-r1.ebuild +++ b/dev-java/commons-dbcp/commons-dbcp-1.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.4-r1.ebuild,v 1.2 2011/02/27 14:26:39 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.4-r1.ebuild,v 1.3 2011/10/19 00:57:29 fordfrog Exp $ EAPI=2 JAVA_PKG_IUSE="doc source test" @@ -14,7 +14,7 @@ COMMON_DEP=">=dev-java/commons-pool-1.3 dev-java/glassfish-transaction-api:0" RDEPEND=">=virtual/jre-1.6 ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.6 +DEPEND="virtual/jdk:1.6 test? ( dev-java/junit:0 www-servers/tomcat:6 -- 2.26.2