Fix dependencies and call java-pkg-2_pkg_setup in pkg_setup.

Package-Manager: portage-2.1.2.5

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 33b27d1ca2a373fe16fd9434228f14c9d381786d..16012193b84057380eb1b6c51ac96ab1a743e48d 100644 (file)
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/resin
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.41 2007/04/21 20:49:17 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.42 2007/04/29 12:32:28 betelgeuse Exp $
+
+  29 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> resin-3.1.0.ebuild:
+  Fix dependencies and call java-pkg-2_pkg_setup in pkg_setup.
 
   21 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org> resin-2.1.17.ebuild:
   Use newinitd, newconfd and doenvd, see bug #174266.

diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 366a7c9f64d087c797e6befa1268ecef19fd201b..66af8628d975f1eff81887120d09b43c5bcc8b1b 100644 (file)
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -52,14 +52,14 @@ EBUILD resin-3.0.22.ebuild 3645 RMD160 5b754dc37188011708113dcc6f26a37c150fef7d
 MD5 229d25c69e2af561515be0b5eb329df9 resin-3.0.22.ebuild 3645
 RMD160 5b754dc37188011708113dcc6f26a37c150fef7d resin-3.0.22.ebuild 3645
 SHA256 34584df51d13e007baa792aefa1836a3c50149949d4ee536093a2918d2dcfe19 resin-3.0.22.ebuild 3645
-EBUILD resin-3.1.0.ebuild 3390 RMD160 72aeea9a6b01767056e31cf8fb564eb56716fb76 SHA1 e481a07d6b96860f476ffea89ee282def3cd6437 SHA256 564e6e0e676c44c5a0238ce1e1a8a910b33368d4b981fb7d18dc71d69e05b8b9
-MD5 4bdc2a1adaf9fb9bc3b2e2e204b87c2c resin-3.1.0.ebuild 3390
-RMD160 72aeea9a6b01767056e31cf8fb564eb56716fb76 resin-3.1.0.ebuild 3390
-SHA256 564e6e0e676c44c5a0238ce1e1a8a910b33368d4b981fb7d18dc71d69e05b8b9 resin-3.1.0.ebuild 3390
-MISC ChangeLog 8589 RMD160 1d9877557be57940556f28d37f28dd8e489bc2f1 SHA1 4d79d01c8fb45e636c1f5e4910b3555edbf057e3 SHA256 60e35bbb3a65f88c7f7206bb0de014123b65afdc7a8e6f6785413e37c230e028
-MD5 91c77b47826bcd9e2e398286566949a1 ChangeLog 8589
-RMD160 1d9877557be57940556f28d37f28dd8e489bc2f1 ChangeLog 8589
-SHA256 60e35bbb3a65f88c7f7206bb0de014123b65afdc7a8e6f6785413e37c230e028 ChangeLog 8589
+EBUILD resin-3.1.0.ebuild 3414 RMD160 6b035fe45f333ee8575fa1db103d9d0b8d1cd1fc SHA1 1af831d9c9666989984209d56e1f335ed551a25a SHA256 190fa9f8cc11f79ebee51e4ef7e11b259e6580d4a63d4897618c5e5b30b6400a
+MD5 e30fb1782de0b53e35678fe8e0d9e0c6 resin-3.1.0.ebuild 3414
+RMD160 6b035fe45f333ee8575fa1db103d9d0b8d1cd1fc resin-3.1.0.ebuild 3414
+SHA256 190fa9f8cc11f79ebee51e4ef7e11b259e6580d4a63d4897618c5e5b30b6400a resin-3.1.0.ebuild 3414
+MISC ChangeLog 8728 RMD160 e665866bc8aff584c1717c3ee5eceb8b64ace198 SHA1 93b5bda919709bd92369d9603d88fbcb4e958ed4 SHA256 aab3c458b5c072349918d557844ce6a77001d6670270d9dcc6a9803a0fb1ad6a
+MD5 fbf2d8ee8699087acc7808fa1a260b56 ChangeLog 8728
+RMD160 e665866bc8aff584c1717c3ee5eceb8b64ace198 ChangeLog 8728
+SHA256 aab3c458b5c072349918d557844ce6a77001d6670270d9dcc6a9803a0fb1ad6a ChangeLog 8728
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229
 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229
@@ -76,7 +76,7 @@ SHA256 8af0d2e1d33ccff5b8ef7c6cfc0097f92c557d9179a3c1145ea103f7c40a1171 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGKnj6go/w9rxVVVERAt3ZAJ4sVBZ9rBT4FBy/ondHsayxiAVojwCeO0ci
-Ios0AHPrG17f6TQKq0hZgew=
-=GMXe
+iD8DBQFGNJBhcxLzpIGCsLQRAu0oAJ4uYriSUXQ+ilug2bUjPfOQRjAWfQCfUp2J
+rNELFkYPRNmc0GRza+3mJ8A=
+=Q/T7
 -----END PGP SIGNATURE-----

diff --git a/www-servers/resin/resin-3.1.0.ebuild b/www-servers/resin/resin-3.1.0.ebuild
index 4020bdba4ebb5e2465ee2ce163ba6d2578bd284d..b88734bb21d688835e473c4261b51208ef8581f8 100644 (file)
--- a/www-servers/resin/resin-3.1.0.ebuild
+++ b/www-servers/resin/resin-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.0.ebuild,v 1.3 2007/04/11 10:07:26 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.0.ebuild,v 1.4 2007/04/29 12:32:28 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -16,11 +16,11 @@ IUSE="admin"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="=virtual/jdk-1.5*
-       >=dev-java/iso-relax-20050331"
-DEPEND="${RDEPEND}
+       >=dev-java/iso-relax-20050331
        dev-java/aopalliance
        >=dev-java/sun-javamail-1.4
-       >=dev-java/sun-jaf-1.1
+       >=dev-java/sun-jaf-1.1"
+DEPEND="${RDEPEND}
        dev-java/ant-core
        dev-libs/openssl"
 
@@ -40,6 +40,7 @@ src_unpack() {
 
 pkg_setup() {
 
+       java-pkg-2_pkg_setup
        enewgroup resin
        enewuser resin -1 /bin/bash ${RESIN_HOME} resin