Adding missing dependencies on virtual/jdk and virtual/jre. Inheriting java-pkg-opt-2 fixing bug# 153750. Thanks to Petteri Räty for his help and Sawk for reporting.

Package-Manager: portage-2.1.2_rc1-r5

4 files changed, 39 insertions, 19 deletions

diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog
index 223b90a468eb..970672ebcbef 100644
--- a/dev-libs/beecrypt/ChangeLog
+++ b/dev-libs/beecrypt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/beecrypt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.38 2006/10/24 20:40:11 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.39 2006/11/13 19:04:04 sanchan Exp $
+
+  13 Nov 2006; Sandro Bonazzola <sanchan@gentoo.org> metadata.xml,
+  beecrypt-4.1.2-r1.ebuild:
+  Adding missing dependencies on virtual/jdk and virtual/jre. Inheriting
+  java-pkg-opt-2 fixing bug# 153750. Thanks to Petteri Räty for his help and
+  Sawk for reporting.
 
   24 Oct 2006; Alon Bar-Lev <alonbl@gentoo.org>
   files/beecrypt-4.1.2-build.patch:
diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index a2210d9e0877..d81c259347bd 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX beecrypt-3.1.0-alpha.patch 321 RMD160 d97ac1d5c57cb10adf623947f556d4f0edce7928 SHA1 17b56b54a11366beef462e3d4c5a075d48f57c04 SHA256 da7c655286db874a5b96ae4413bf86d02e14d759a54d68e4de4e22e4adf10027
 MD5 9801ec0e3201addd45f08dea31ac5324 files/beecrypt-3.1.0-alpha.patch 321
 RMD160 d97ac1d5c57cb10adf623947f556d4f0edce7928 files/beecrypt-3.1.0-alpha.patch 321
@@ -48,22 +51,22 @@ EBUILD beecrypt-3.1.0-r2.ebuild 1723 RMD160 8d23c514408cb5447401b94a65b8834c8792
 MD5 b6c457c06f2f7babce8779dc33405e21 beecrypt-3.1.0-r2.ebuild 1723
 RMD160 8d23c514408cb5447401b94a65b8834c87922187 beecrypt-3.1.0-r2.ebuild 1723
 SHA256 ce7a18ed0154803578ba50d9964add3573367af04c1e55905ed43815aa417dc8 beecrypt-3.1.0-r2.ebuild 1723
-EBUILD beecrypt-4.1.2-r1.ebuild 2140 RMD160 f414d2ae77f685bc4c3bd7269db6f98daff1b1f3 SHA1 eb4793c2c47f9ab8734778cabf4ec24f5a470387 SHA256 a6ecb0d2fe53301e8aa1af1a43f3d799f9ebd3754011c4e9a1b28f86643b3f81
-MD5 7f5dfdfd28971fe7fc0d44e9a7c7a2dd beecrypt-4.1.2-r1.ebuild 2140
-RMD160 f414d2ae77f685bc4c3bd7269db6f98daff1b1f3 beecrypt-4.1.2-r1.ebuild 2140
-SHA256 a6ecb0d2fe53301e8aa1af1a43f3d799f9ebd3754011c4e9a1b28f86643b3f81 beecrypt-4.1.2-r1.ebuild 2140
+EBUILD beecrypt-4.1.2-r1.ebuild 2299 RMD160 873fe501980e8f37b81738b8f1ae9cc0bea9c893 SHA1 8e18397c497c46d29d5537d7c7b2eee9a654036a SHA256 cabb4371ab160ec833d4c583a8a171a7d30fb400c94a4a80593466cbc07c1840
+MD5 ad343e17d63e11a75c3da7986a61793c beecrypt-4.1.2-r1.ebuild 2299
+RMD160 873fe501980e8f37b81738b8f1ae9cc0bea9c893 beecrypt-4.1.2-r1.ebuild 2299
+SHA256 cabb4371ab160ec833d4c583a8a171a7d30fb400c94a4a80593466cbc07c1840 beecrypt-4.1.2-r1.ebuild 2299
 EBUILD beecrypt-4.1.2.ebuild 1571 RMD160 a81510f782805e7a69dd3fc21c3b6ad3491ec0c9 SHA1 2b15ccdc2de2fb69d131c85a179f0e3cfa93a941 SHA256 acc9b6321c2dc67140e1a0cdfc6b666779f0580fe5b473fb2a1f7ca9a1baa33e
 MD5 58efa38295c5d97f1bac7465fa9b87de beecrypt-4.1.2.ebuild 1571
 RMD160 a81510f782805e7a69dd3fc21c3b6ad3491ec0c9 beecrypt-4.1.2.ebuild 1571
 SHA256 acc9b6321c2dc67140e1a0cdfc6b666779f0580fe5b473fb2a1f7ca9a1baa33e beecrypt-4.1.2.ebuild 1571
-MISC ChangeLog 6239 RMD160 99ae9a041d1d95d6f1b17218e26995a121979e45 SHA1 93a859c7bbba78d4aa9fd9b45f00e2ecb0e564ec SHA256 809c50443d6ad93323c30b74d4b7d29824ed138633eee4768ce4ceae7a00f81f
-MD5 8d6526e962d913d223020d718dfdf9f2 ChangeLog 6239
-RMD160 99ae9a041d1d95d6f1b17218e26995a121979e45 ChangeLog 6239
-SHA256 809c50443d6ad93323c30b74d4b7d29824ed138633eee4768ce4ceae7a00f81f ChangeLog 6239
-MISC metadata.xml 441 RMD160 78ec9e33fd6ae832d800ba544f5474e36cafd48c SHA1 0061a112b5252de7a4803ecb7b201e48be7dc5b7 SHA256 5675e81fe2ef6bb6949439f5c88e041c614a2ad8c554c685e745a457c116279d
-MD5 ca48fb502dfc8284bdf1dad98f1f1f93 metadata.xml 441
-RMD160 78ec9e33fd6ae832d800ba544f5474e36cafd48c metadata.xml 441
-SHA256 5675e81fe2ef6bb6949439f5c88e041c614a2ad8c554c685e745a457c116279d metadata.xml 441
+MISC ChangeLog 6509 RMD160 02ac4678ea42d61f071698a4dfc2a49765138873 SHA1 3aba0d63a0ac5053914cb2c39ccc05f91f657e09 SHA256 cf1e95e733e9da3601d6565d3631e18b3b0e41d6da6d75aadd9ca456b8836280
+MD5 6bc5cd027ff2378cdde84baa994fcb38 ChangeLog 6509
+RMD160 02ac4678ea42d61f071698a4dfc2a49765138873 ChangeLog 6509
+SHA256 cf1e95e733e9da3601d6565d3631e18b3b0e41d6da6d75aadd9ca456b8836280 ChangeLog 6509
+MISC metadata.xml 222 RMD160 7390d9ee64fc735357d7e6004a05d6319ccb72a4 SHA1 d288b0b582fd0342346e3ab74032b0579badbbf8 SHA256 479499bbcdd1d4d681904e4e4819e56e5e0436fdb23c1c938dcf23ea267988ec
+MD5 4841cdc9416cad66d46c6837e2d8a706 metadata.xml 222
+RMD160 7390d9ee64fc735357d7e6004a05d6319ccb72a4 metadata.xml 222
+SHA256 479499bbcdd1d4d681904e4e4819e56e5e0436fdb23c1c938dcf23ea267988ec metadata.xml 222
 MD5 5e89c22f1c896c7f858a106c0d0db568 files/digest-beecrypt-3.1.0-r1 244
 RMD160 ae96333d9000d0e124f19917912ffd08e8515ca3 files/digest-beecrypt-3.1.0-r1 244
 SHA256 c5e9f555fa1274112afc634fdef81cf428a9889c1a74a9a1a754b5de7373cb20 files/digest-beecrypt-3.1.0-r1 244
@@ -76,3 +79,10 @@ SHA256 99d90cfdcd84ee178ff78f76c1a75b7ea12bc89a29cf633a585d884de57413b8 files/di
 MD5 f036930b8f9b568a6d4f0be92dfd660a files/digest-beecrypt-4.1.2-r1 244
 RMD160 95f2cc2b7b670f7e7ebfcdb7b320386305e49ab7 files/digest-beecrypt-4.1.2-r1 244
 SHA256 99d90cfdcd84ee178ff78f76c1a75b7ea12bc89a29cf633a585d884de57413b8 files/digest-beecrypt-4.1.2-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFWMCMwmS/YhfgUiURAvNQAJ9XHguDQrq8M1k5S9XJRn38yHR9dQCfYBBS
+qtQMr/MYGOWnjVxXFesdnIs=
+=gKlE
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild b/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
index 766e7b33eb21..cb66b88083fc 100644
--- a/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
+++ b/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild,v 1.6 2006/10/23 20:26:54 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild,v 1.7 2006/11/13 19:04:04 sanchan Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
-inherit flag-o-matic eutils multilib autotools
+inherit flag-o-matic eutils multilib autotools java-pkg-opt-2
 
 DESCRIPTION="general-purpose cryptography library"
 HOMEPAGE="http://sourceforge.net/projects/beecrypt"
@@ -15,14 +15,21 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="java nocxx python threads"
 
-DEPEND="python? ( >=dev-lang/python-2.2 )
+COMMONDEPEND="python? ( >=dev-lang/python-2.2 )
 	!<app-arch/rpm-4.2.1"
 
+DEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jdk-1.4 )"
+
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.4 )"
+
 pkg_setup() {
 	ewarn "The MMX assembler code presents TEXTREL issues. If you don't want them try using"
 	ewarn "relaxed CFLAGS like -march=i686 instead of -march=pentium3 and so on."
 	ewarn "This ebuild fails on multilib system with multilib-strict on AMD64."
 	ewarn "Feel free to help upstream solving the above bugs."
+	java-pkg-opt-2_pkg_setup
 }
 
 src_unpack() {
diff --git a/dev-libs/beecrypt/metadata.xml b/dev-libs/beecrypt/metadata.xml
index 52dde0a10f4b..d0be28d810cf 100644
--- a/dev-libs/beecrypt/metadata.xml
+++ b/dev-libs/beecrypt/metadata.xml
@@ -4,8 +4,5 @@
 <herd>no-herd</herd>
 <maintainer>
 	<email>sanchan@gentoo.org</email>
-	<description>I actually don't use this packages, but since I'm working on rpm bump I'll take care of this for now.
-		Feel free to contact me if you want to take over the maintainership of this package.
-	</description>
 </maintainer>
 </pkgmetadata>