summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrice Clement <monsieurp@gentoo.org>2015-03-20 16:15:21 +0000
committerPatrice Clement <monsieurp@gentoo.org>2015-03-20 16:15:21 +0000
commitcc096c1c556a4e6f1a82bb5c325392d301c80e16 (patch)
tree3adcef10ca736da54aeb00d2e4923decedc4f718 /dev-java/commons-dbcp
parentModernize ebuild; respect CC (diff)
downloadhistorical-cc096c1c556a4e6f1a82bb5c325392d301c80e16.tar.gz
historical-cc096c1c556a4e6f1a82bb5c325392d301c80e16.tar.bz2
historical-cc096c1c556a4e6f1a82bb5c325392d301c80e16.zip
Remove slotted virtual dep in lieu of a "normal" one. We pull in at least
jdk/jre 6 since 7 is not stable yet in the tree. Signed-off-by: monsieurp@gentoo.org Package-Manager: portage-2.2.14/cvs/Linux i686 Manifest-Sign-Key: 0x93491BB8
Diffstat (limited to 'dev-java/commons-dbcp')
-rw-r--r--dev-java/commons-dbcp/ChangeLog6
-rw-r--r--dev-java/commons-dbcp/Manifest18
-rw-r--r--dev-java/commons-dbcp/commons-dbcp-2.1.ebuild6
3 files changed, 24 insertions, 6 deletions
diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog
index 257c6ead4a68..6bb75095b58b 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.65 2015/03/20 15:34:23 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.66 2015/03/20 16:15:11 monsieurp Exp $
+
+ 20 Mar 2015; Patrice Clement <monsieurp@gentoo.org> commons-dbcp-2.1.ebuild:
+ Remove slotted virtual dep in lieu of a "normal" one. We pull in at least
+ jdk/jre 6 since 7 is not stable yet in the tree.
*commons-dbcp-2.1 (20 Mar 2015)
diff --git a/dev-java/commons-dbcp/Manifest b/dev-java/commons-dbcp/Manifest
index 48f25be34f4b..8ce06cf10d9a 100644
--- a/dev-java/commons-dbcp/Manifest
+++ b/dev-java/commons-dbcp/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST commons-dbcp-1.4-src.tar.gz 932507 SHA256 f5f10846e79fc71121fe7402c61d71575506b01b59e719e974ebc4d99e6df283 SHA512 70f32ea36bae46290dc376e6040539562de98906810bd4e1985667c336e6215dc5536278000fee5d9f200cc4b97ea0a6cff74a871e962b61203741814a9c5e7b WHIRLPOOL c917bd417d95e7fc2448c87d949f440ad829ea794b943e707a23154fafaf9eeccaa2900ae7ccb27cf03c56d7e0727177e56c47f157ee85ab1be7c67d18702b26
DIST commons-dbcp2-2.1-src.tar.gz 580017 SHA256 e1a75021dc3a5314cfa0a0c65bf0bf3d8f95a289b833cf5e391149cf29367708 SHA512 830fb550cee5f9c79fad830d8b3e56417aa9dfed26093fd366693260f5b4d821baa592e60c7f5997766276049a90eacd5854b8422803825154fedee56d46409d WHIRLPOOL d4efd240eae5d891c98ad3a2fa76756fabdfa93bc17ec9d4e0b046f6dcb8e61579acfb899f338131472960aaddf25457d3a82ca00486242097319e9f7617462a
EBUILD commons-dbcp-1.4-r2.ebuild 1566 SHA256 51d389a8c47a6cbfb92d2a11cd8956fc6c48c7e150546ec711e9196ed97b9089 SHA512 8d0bdf4c5f2656e4fda268a5258c6ac2b7df742118ccbe111507ef8586717e763d4b264a2c5605e75ac69aa3ac6c5f40cd49e03bc68b77e94cd0a67cfeef5c1b WHIRLPOOL c935ab0c8659f6e5ea888cbe4e97dc8b13120afd714c1ed5d7fb0083a374820d88008805aaf7c219ff0a354c832ff40b4e364b1862f13a7cfed585b010cdef77
-EBUILD commons-dbcp-2.1.ebuild 2366 SHA256 3366c58b4d9977328a0bd72db0c21b9b2b11610dfb01954cf5cb5748aa2c4458 SHA512 32bba9d43fbf2d0bfacacd1444c01b50786e7cf930ec2041171e4e3bd41e5e91515f1816cb25a0f9cf7964f472666c5ab52c1fab8328dfb7e7bb6fb28bc41c9a WHIRLPOOL 43df3cf6acdbd758e28ffb6e70f9638395125f471efb48d31e350d19e3d8a9f66b97c28f5e108829b79fd7ab0a5c025e4bb4e3a5b7f14d8e69eaeead01eca846
-MISC ChangeLog 9309 SHA256 7363e135efd7594672baa36623aec21258e9670be3860e645d0e1f04cf3af3f5 SHA512 cba3577ffa893d50556ed90be1e0607e5c7aefc57a70c019bc0c699fb3c8384a6131cd8dc6d921ebb648c35a1e06fdab8477b352c965ea0d0e42e5f30ade6dd7 WHIRLPOOL 725c837074c9df7e990d9f2cb8a3a9094d2a705c0ad684b1eef5768197c8b4e6fae29d853f8b10027878f4e6c8d720dce953bd8407857c22699d34d04594e92f
+EBUILD commons-dbcp-2.1.ebuild 2370 SHA256 4cff7e91329a641943d43c02f4c665fca74203feeb1341c3ab56cbb2375bc9b6 SHA512 73c061cc311e41d3dc7ae53e988de75dcb1a2315409fc90cbc7289543ed446fd8e92d7f20476fb909f7ecd0653c2fb2fc0bdef76c98c41ec06e9462ad503f051 WHIRLPOOL 4886f565965055ea885cb5e60a74a8f29e4ba42275541cc76ed70469105a696abda298eae875b6667f338e0ae157301bfb0b083cd7798193d0dfd7679286b1c3
+MISC ChangeLog 9516 SHA256 64359eec2e9ca06d50b73c001e0215a5397fe93c7a83ffdc53b9e7acb240a961 SHA512 ef0a03e7e06bb29cc50edcf789727d3343324333dc143ce27cb2ec6f7184aa1ddf4e52bad6a14e8a0a03cfb016f31bd49bdbbe9b2edf0651635c8c93e462135f WHIRLPOOL 81c16de6aca56ffbb1372248000bab54e486d590484ac36c527afb457a01be2110f2c010f268902d78bd8852379c39a15dea4d9f58deeb566171fa4dd2adb448
MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJVDEeWAAoJEJGRpfGTSRu4X18IAKtVAjoF4Q6LZLkJHLF4fg9z
+6yaG0O3lEYSAFjZjbeho9AEV0jmI+T0U2y2TaHA5E+3Mb5sP6rHG5YDupp8TLQ12
+r+GLBiTeiqhtedo1YdbVmjfMfVxAqBwp3Ah5EhTLJeEwlzv2aCR2+sqqTn7N+NUS
+bb2pUm8++yRb8Y9jcDBn+fxMP1t7TBqMdALVM8lweA9D0NPCXZ2yw9BBHAI2Ohd2
+ch9j3feYzHeaOTnj/FA9BQUuwP3a1KJ+TUc9ezZBRIS43NhIDP2noUMYAFl1LfwW
+f8A8WQq3++K9vb3fiGmy3cJ4zWpHdbDNhiMKt8XtowivWCkh6hKMefIiHOMyUk4=
+=vDJB
+-----END PGP SIGNATURE-----
diff --git a/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild b/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild
index 2604eb39caf2..4ee9521eca49 100644
--- a/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild
+++ b/dev-java/commons-dbcp/commons-dbcp-2.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-java/commons-dbcp/commons-dbcp-2.1.ebuild,v 1.1 2015/03/20 15:34:23 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild,v 1.2 2015/03/20 16:15:11 monsieurp Exp $
EAPI=4
@@ -26,10 +26,10 @@ CDEPEND=">=dev-java/commons-logging-1.1.1
java-virtuals/transaction-api:0
dev-java/junit:4"
DEPEND="${CDEPEND}
- virtual/jdk:1.7
+ >=virtual/jdk-1.6
test? ( dev-java/ant-junit:0 )"
RDEPEND="
- virtual/jdk:1.7
+ >=virtual/jdk-1.6
${CDEPEND}"
S="${WORKDIR}/${MY_P}"