summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2005-07-12 23:19:55 +0000
committerThomas Matthijs <axxo@gentoo.org>2005-07-12 23:19:55 +0000
commitf969c1db1d1ec1333d5fd07a0c16442cd0b61460 (patch)
treebabbd3a510c2272cd9028fc0c87fa18f375411d1 /dev-java/ldapsdk
parentManual Manifest commit. (diff)
downloadhistorical-f969c1db1d1ec1333d5fd07a0c16442cd0b61460.tar.gz
historical-f969c1db1d1ec1333d5fd07a0c16442cd0b61460.tar.bz2
historical-f969c1db1d1ec1333d5fd07a0c16442cd0b61460.zip
Style/Dep fixes
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'dev-java/ldapsdk')
-rw-r--r--dev-java/ldapsdk/ChangeLog5
-rw-r--r--dev-java/ldapsdk/Manifest12
-rw-r--r--dev-java/ldapsdk/ldapsdk-4.1.7-r1.ebuild17
3 files changed, 19 insertions, 15 deletions
diff --git a/dev-java/ldapsdk/ChangeLog b/dev-java/ldapsdk/ChangeLog
index 977ad7c09355..c6962a5bb13e 100644
--- a/dev-java/ldapsdk/ChangeLog
+++ b/dev-java/ldapsdk/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/ldapsdk
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ldapsdk/ChangeLog,v 1.6 2005/04/26 01:27:43 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ldapsdk/ChangeLog,v 1.7 2005/07/12 23:19:55 axxo Exp $
+
+ 12 Jul 2005; Thomas Matthijs <axxo@gentoo.org> ldapsdk-4.1.7-r1.ebuild:
+ Style/Dep fixes
26 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
ldapsdk-4.1.7-r1.ebuild:
diff --git a/dev-java/ldapsdk/Manifest b/dev-java/ldapsdk/Manifest
index 395af62fff65..e89faedcb418 100644
--- a/dev-java/ldapsdk/Manifest
+++ b/dev-java/ldapsdk/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 18d5a4005db551a34ae724032ee9d639 ldapsdk-4.1.7-r1.ebuild 1262
-MD5 b1057c8c6cb58df8253cf0d0290bd541 ChangeLog 1080
+MD5 772ee75aa159f3a58452a89f12fdb914 ChangeLog 1169
MD5 6fb27bdccb1134d8c941a57f72aa0b59 metadata.xml 239
-MD5 fe737a838d4214efd4bc3e2b05730df6 files/ldapsdk-gentoo.patch 5569
+MD5 53379e5e1d7b46586b37054ac17110c8 ldapsdk-4.1.7-r1.ebuild 1275
MD5 82c8d76c3b282427a86a22b74777081a files/digest-ldapsdk-4.1.7-r1 74
+MD5 fe737a838d4214efd4bc3e2b05730df6 files/ldapsdk-gentoo.patch 5569
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFCbZkbKRy60XGEcJIRAq+qAJ9JN7EgSS9cnYckgtJ8M9tljG/VgQCfWfN5
-r7KItSlCRVib6sQEfnISGzM=
-=cPPE
+iD8DBQFC1FAp/rLF9B432nYRAgSRAJ9Q3i06GctP2jefnsthPbqNC0QwZgCgn904
+KNmjgwpB8iZSUDQBvclXSQE=
+=kCdq
-----END PGP SIGNATURE-----
diff --git a/dev-java/ldapsdk/ldapsdk-4.1.7-r1.ebuild b/dev-java/ldapsdk/ldapsdk-4.1.7-r1.ebuild
index 7b86c2e61715..849f55f9a602 100644
--- a/dev-java/ldapsdk/ldapsdk-4.1.7-r1.ebuild
+++ b/dev-java/ldapsdk/ldapsdk-4.1.7-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ldapsdk/ldapsdk-4.1.7-r1.ebuild,v 1.3 2005/04/26 01:27:43 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ldapsdk/ldapsdk-4.1.7-r1.ebuild,v 1.4 2005/07/12 23:19:55 axxo Exp $
inherit eutils java-pkg
@@ -13,13 +13,14 @@ SLOT="4.1"
KEYWORDS="x86 amd64 sparc"
IUSE="doc"
-S=${WORKDIR}/mozilla/directory/java-sdk
-
-DEPEND=">=virtual/jdk-1.4
- >=dev-java/ant-core-1.6.2"
RDEPEND=">=virtual/jre-1.4
=dev-java/jss-3.4*
=dev-java/jakarta-oro-2.0*"
+DEPEND=">=virtual/jdk-1.4
+ ${RDEPEND}
+ >=dev-java/ant-core-1.6.2"
+
+S=${WORKDIR}/mozilla/directory/java-sdk
src_unpack() {
unpack ${A}
@@ -28,8 +29,8 @@ src_unpack() {
epatch ${FILESDIR}/ldapsdk-gentoo.patch
cd ${S}
- echo "ororegexp.jar=`java-config -p jakarta-oro-2.0`" > build.properties
- echo "jss.jar=`java-config -p jss-3.4`" >> build.properties
+ echo "ororegexp.jar=$(java-pkg_getjars jakarta-oro-2.0)" > build.properties
+ echo "jss.jar=$(java-pkg_getjars jss-3.4)" >> build.properties
cd ${S}/ldapjdk/lib
rm -f *.jar
@@ -45,7 +46,7 @@ src_compile() {
ant ${antflags} || die "compile failed"
}
-src_install () {
+src_install() {
java-pkg_dojar dist/packages/*.jar
use doc && java-pkg_dohtml -r dist/doc/*