Version bump to resolve bug #90650. This version adds optional support for dsml connection support. The cvs tag used was Oct_ndk_2005.

(Portage version: 2.0.53)

7 files changed, 91 insertions, 16 deletions

diff --git a/dev-java/jldap/ChangeLog b/dev-java/jldap/ChangeLog
index b0ddd4d218e1..5b96c9be4b3a 100644
--- a/dev-java/jldap/ChangeLog
+++ b/dev-java/jldap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jldap
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jldap/ChangeLog,v 1.4 2005/05/18 19:47:42 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jldap/ChangeLog,v 1.5 2005/12/08 13:07:53 betelgeuse Exp $
+
+*jldap-20051000 (08 Dec 2005)
+
+  08 Dec 2005; Petteri Räty <betelgeuse@gentoo.org> metadata.xml,
+  jldap-20040730.ebuild, +jldap-20051000.ebuild:
+  Version bump to resolve bug #90650. This version adds optional support for
+  dsml connection support. The cvs tag used was Oct_ndk_2005.
 
   18 May 2005; Jan Brinkmann <luckyduck@gentoo.org> jldap-20040730.ebuild:
   stable on amd64, ppc and x86
diff --git a/dev-java/jldap/Manifest b/dev-java/jldap/Manifest
index 59a401d04833..85f89b746f99 100644
--- a/dev-java/jldap/Manifest
+++ b/dev-java/jldap/Manifest
@@ -1,14 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 833ec96ab1ce7efb10c756e15302da67 ChangeLog 762
+MD5 57bee2cad66653d22af324a8c4014983 ChangeLog 1049
+MD5 300e9f6e4855d954114332676bb873f5 files/200510-javac.xml.patch 600
 MD5 746f11dbae37cf163aa34b5d858ea783 files/digest-jldap-20040730 78
-MD5 da154e6ce3ac0755232d707bca2dfe34 jldap-20040730.ebuild 1045
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDR9aDQiJ/wx066S4RAthXAJ9C6dtpcLjsrlfF1tl71ff2Ye9OMQCfYHg7
-QT/YHUlj8UDg7yPVbsbZmN4=
-=YIrJ
------END PGP SIGNATURE-----
+MD5 175c13f74fe3384a5c7b3627e8d1748d files/digest-jldap-20051000 78
+MD5 b7b590f1fda10bf3a8d255ae968e40f3 jldap-20040730.ebuild 1014
+MD5 02e9338e3e6834f6d66868ba7c123a7e jldap-20051000.ebuild 1493
+MD5 11eee8e04b637bc8bcde930118a7f0bb metadata.xml 403
diff --git a/dev-java/jldap/files/200510-javac.xml.patch b/dev-java/jldap/files/200510-javac.xml.patch
new file mode 100644
index 000000000000..0156d2db9be2
--- /dev/null
+++ b/dev-java/jldap/files/200510-javac.xml.patch
@@ -0,0 +1,12 @@
+diff -u -r jldap.old/javac.xml jldap/javac.xml
+--- jldap.old/javac.xml	2005-12-08 15:00:05.525333536 +0200
++++ jldap/javac.xml	2005-12-08 15:00:25.256333968 +0200
+@@ -90,7 +90,7 @@
+         <javac
+                 srcdir="."
+                 includes="com/novell/**/*.java,jldap/com/novell/security/sasl/*.java,org/ietf/**/*.java"
+-                excludes="com/novell/services/**/*.java"
++                excludes="com/novell/services/**/*.java,${exclude.dsmlconnection},${exclude.spmlconnection}"
+                 destdir="${build}"
+                 target="1.2"
+                 deprecation="off"
diff --git a/dev-java/jldap/files/digest-jldap-20051000 b/dev-java/jldap/files/digest-jldap-20051000
new file mode 100644
index 000000000000..791d7859e378
--- /dev/null
+++ b/dev-java/jldap/files/digest-jldap-20051000
@@ -0,0 +1 @@
+MD5 9978194298bf4d7eefb1ff49534c2289 jldap-Oct_ndk_2005-gentoo.tar.bz2 380610
diff --git a/dev-java/jldap/jldap-20040730.ebuild b/dev-java/jldap/jldap-20040730.ebuild
index 14e50f446668..bf99d0b1d04f 100644
--- a/dev-java/jldap/jldap-20040730.ebuild
+++ b/dev-java/jldap/jldap-20040730.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jldap/jldap-20040730.ebuild,v 1.6 2005/10/08 14:23:23 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jldap/jldap-20040730.ebuild,v 1.7 2005/12/08 13:07:53 betelgeuse Exp $
 
 inherit java-pkg
 
-DESCRIPTION="The LDAP Class Libraries for Java (JLDAP) enable you to write applications to access, manage, update, and search for information stored in directories accessible using LDAPv3. JLDAP was developed by Novell."
+DESCRIPTION="The LDAP Class Libraries for Java (JLDAP) enable you to write applications to access, manage, update, and search for information stored in directories accessible using LDAPv3."
 HOMEPAGE="http://www.openldap.org/jldap/"
 SRC_URI="mirror://gentoo/jldap-Sep_ndk_2003-gentoo.tar.bz2"
 
diff --git a/dev-java/jldap/jldap-20051000.ebuild b/dev-java/jldap/jldap-20051000.ebuild
new file mode 100644
index 000000000000..69182535fae2
--- /dev/null
+++ b/dev-java/jldap/jldap-20051000.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jldap/jldap-20051000.ebuild,v 1.1 2005/12/08 13:07:53 betelgeuse Exp $
+
+inherit base java-pkg
+
+DESCRIPTION="The LDAP Class Libraries for Java (JLDAP) enable you to write applications to access, manage, update, and search for information stored in directories accessible using LDAPv3."
+HOMEPAGE="http://www.openldap.org/jldap/"
+SRC_URI="mirror://gentoo/jldap-Oct_ndk_2005-gentoo.tar.bz2"
+
+LICENSE="OPENLDAP"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug doc dsml jikes"
+
+RDEPEND=">=virtual/jre-1.4
+		dsml? ( =dev-java/commons-httpclient-2.0* )"
+DEPEND=">=virtual/jdk-1.4
+	${REDEND}
+	>=dev-java/ant-core-1.5.1
+	jikes? ( dev-java/jikes )"
+
+S=${WORKDIR}/${PN}
+
+PATCHES="${FILESDIR}/200510-javac.xml.patch"
+
+src_compile() {
+	# TODO
+	# sgml support needs opensgml which is not packaged yet.
+	if use debug; then
+		local antflags="debug"
+	else
+		local antflags="release"
+	fi
+
+	use dsml && antflags="${antflags} -lib $(java-pkg_getjars commons-httpclient)"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	use doc && antflags="${antflags} doc"
+	ant ${antflags} || die "Failed to run ant."
+}
+
+src_install() {
+	dodoc README
+	use dsml && dodoc README.dsml
+
+	if use debug; then
+		java-pkg_dojar lib_debug/*.jar
+	else
+		java-pkg_dojar lib/*.jar
+	fi
+
+	if use doc; then
+		dohtml *.html
+		dodoc design/*
+		java-pkg_dohtml -r doc/*
+	fi
+}
diff --git a/dev-java/jldap/metadata.xml b/dev-java/jldap/metadata.xml
index 838c00a4a448..d622157fbab1 100644
--- a/dev-java/jldap/metadata.xml
+++ b/dev-java/jldap/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>java</herd>
+<longdescription>
+The LDAP Class Libraries for Java (JLDAP) enable you to write applications to 
+access, manage, update, and search for information stored in directories 
+accessible using LDAPv3. JLDAP was developed by Novell.
+</longdescription>
 </pkgmetadata>