diff options
| -rw-r--r-- | dev-java/jdbc-jaybird/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild | 12 | ||||
| -rw-r--r-- | dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild | 10 | ||||
| -rw-r--r-- | dev-java/jruby/Manifest | 6 |
4 files changed, 16 insertions, 18 deletions
diff --git a/dev-java/jdbc-jaybird/ChangeLog b/dev-java/jdbc-jaybird/ChangeLog index 03569f857142..da60d9758c05 100644 --- a/dev-java/jdbc-jaybird/ChangeLog +++ b/dev-java/jdbc-jaybird/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/jdbc-jaybird # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.32 2010/03/20 18:00:26 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.33 2010/06/30 20:51:00 caster Exp $ + + 30 Jun 2010; Vlastimil Babka <caster@gentoo.org> + jdbc-jaybird-2.1.5-r1.ebuild, jdbc-jaybird-2.1.5-r2.ebuild: + Remove java6 USE flag and make it mandatory. *jdbc-jaybird-2.1.6 (20 Mar 2010) diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild index 3a557823008a..54e112934dfc 100644 --- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild +++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild,v 1.3 2009/11/10 14:34:30 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild,v 1.4 2010/06/30 20:51:00 caster Exp $ JAVA_PKG_IUSE="doc source examples test" @@ -13,14 +13,12 @@ SRC_URI="mirror://sourceforge/firebird/${At}.zip" LICENSE="LGPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86" -IUSE="java6" +IUSE="" -RDEPEND="java6? ( >=virtual/jre-1.6 ) - !java6? ( >=virtual/jre-1.5 ) +RDEPEND=">=virtual/jre-1.6 dev-java/ant-core dev-java/log4j" -DEPEND="java6? ( =virtual/jdk-1.6* ) - !java6? ( =virtual/jdk-1.5* ) +DEPEND="=virtual/jdk-1.6* app-arch/unzip dev-java/ant-core dev-java/log4j diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild index 68c6616bcd3d..609859468457 100644 --- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild +++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild,v 1.2 2010/01/10 10:12:42 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild,v 1.3 2010/06/30 20:51:00 caster Exp $ JAVA_PKG_IUSE="doc source examples test" @@ -13,14 +13,12 @@ SRC_URI="mirror://sourceforge/firebird/${At}.zip" LICENSE="LGPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="jni java6" +IUSE="jni" -RDEPEND="java6? ( >=virtual/jre-1.6 ) - !java6? ( >=virtual/jre-1.5 ) +RDEPEND=">=virtual/jre-1.6 dev-java/ant-core dev-java/log4j" -DEPEND="java6? ( =virtual/jdk-1.6* ) - !java6? ( =virtual/jdk-1.5* ) +DEPEND="=virtual/jdk-1.6* app-arch/unzip dev-java/ant-core dev-java/log4j diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest index d77a0cca6db8..21b83272472e 100644 --- a/dev-java/jruby/Manifest +++ b/dev-java/jruby/Manifest @@ -9,13 +9,11 @@ AUX jruby-1.4.0-system-jars-r2.patch 8332 RMD160 d59ae12abcc4184c1d9f39a3dafe769 AUX jruby-1.5.0-system-jars.patch 8113 RMD160 59ac1750a53176c90e134804d7021ca9bab39926 SHA1 d3400e71d456712756d91992a65626c86a316e08 SHA256 69f14036398c8fa2210fee8dee63e85925c37805dd8985586752fad8596c87da AUX user-test-fixes.patch 5147 RMD160 6258879413ae81a18d0c6bcaa3b0661d86a0d14a SHA1 32d3f80db383cf664c9ad1f9e52c2688ae3cbe5c SHA256 f21469d41de9f9b5fb1682596f64899a71c92332db24bf27e8c50dbb1896a92e DIST jruby-src-1.3.1.tar.gz 12076705 RMD160 ef10395dbdf9490820caa65ff6236dd99e7c62c8 SHA1 e4de71e5c01f71f236b3135e07a5841784767fd8 SHA256 9095b0bec0ee8e6cd96b72c7f2aec8a90fa429b840484d57a48d8fb760aae600 -DIST jruby-src-1.4.0.tar.gz 12731458 RMD160 70b6a34a9e1b174fe1c8f1df8ba8ea7cbfa4da37 SHA1 3d6f634e16b789a5a086327c0f09710dd29d1ec7 SHA256 b9fd84ed097ac136afce4462a13bb0752bab467db203ed3797e228a435e26d23 DIST jruby-src-1.4.1.tar.gz 12351374 RMD160 079036e7df373d444221083a9487b6ad8a676879 SHA1 282a730d33fe5ba0686297de6ff68eee443e67ab SHA256 685e6ba0a4709e06fab1158ef6e4d2b246ab91a770fe8b5c1b642d55d22c725a DIST jruby-src-1.5.1.tar.gz 11260259 RMD160 6bfa5aa1c28d1a9e250be0b8364e423caf905c17 SHA1 b022ad9a5a24a207fcb3e0ded76f70bc305b67ba SHA256 0ddfa33e42510e1c2848dacbde51a7642d7a411583a235f4e78c77036aa1bcac -EBUILD jruby-1.3.1-r1.ebuild 5363 RMD160 86c545c9ccb14cd880fde4a53a572b6bf6505e13 SHA1 d838791e0946c28e1840e42b2db0d08c183118a7 SHA256 697ce80fddf7753cecf4f318dbbbc11c14198d00661c6b4aadee5c502c67fe2a -EBUILD jruby-1.4.0-r6.ebuild 5777 RMD160 c4e0db8272cc8978f5df2b8ba961aee64b556fb8 SHA1 66403cb4213cc39cab98da522d4dbe61f64e1c6d SHA256 f61a9ca66617fe3278e39b448e55f6c22dce10e8510b4683d3a609a4a47f0a09 +EBUILD jruby-1.3.1-r1.ebuild 5350 RMD160 19a52b4bdb5fcc48a6a7d94ad9ede6aea3583327 SHA1 a92b88d5934a1e3e060c595d190782ce34165aaf SHA256 3f85aa08aa29e0f209544109f18b54318d450a28320a3692448213bee8521da4 EBUILD jruby-1.4.1-r1.ebuild 5996 RMD160 3ade1f4ce4b0cc23fde323699a2b73ff2ead2136 SHA1 7c7e2848fc0da8d7540c12a7a2100d2217c90df1 SHA256 3af0279541a852f8b770c51b8146ee91f86bc6f6237b91a0b0398281207d56b8 EBUILD jruby-1.4.1.ebuild 5993 RMD160 06e37d3b9d1e6b4bcf8048e60ab8df655a0d3d61 SHA1 587f8bbf4c60f41ac8ce33dd73c3dcb21c2c9da8 SHA256 07bd146f37ac94430458e0e239acc50c30f50542b75b6356a404050ac64d1b71 EBUILD jruby-1.5.1-r2.ebuild 5990 RMD160 235f23aed716bfffe72e5fc553d820d0b65f0144 SHA1 f9cb70c885d19d0c1bc78a1ef6cc42d2bb3cf72a SHA256 61542cdf2bcf732d5c065f88ba625c0f504626f5e7fb04b8801f2881de607390 -MISC ChangeLog 12881 RMD160 6a902a41b3e9085c1e0287c2bc43110faa431679 SHA1 974aa41e159679630c5602b4170e0be682fcf5c3 SHA256 c3c2c5a6f1cc6cf68cf03a3142bb54351794782576588ad031bcd0d55f6bda91 +MISC ChangeLog 12989 RMD160 c556266df7e09573aa5ecbfa76dfec878a4078f0 SHA1 04cd72c976ec986825e12749be576d081fc6421d SHA256 a2b033117bdbab4ee963824f43ca83c2e9bfe09d917f0d4d0bbe5cc430c7750e MISC metadata.xml 179 RMD160 3813d8d3651faaf99042cb3c776d0bc59ad7b5b4 SHA1 421371d5338c6b9b8b4950c44d78a9dbe79cf64d SHA256 0df27adc265ef6596f973641d25b64b7291c87f1b114d6895f69d222049bed1b |