EAPI bump; fixed bug #513580 (renamed variables named "enum"), some QA

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

4 files changed, 231 insertions, 2 deletions

diff --git a/dev-java/ldapsdk/ChangeLog b/dev-java/ldapsdk/ChangeLog
index 9b2f46cf702d..92bf8e42eef7 100644
--- a/dev-java/ldapsdk/ChangeLog
+++ b/dev-java/ldapsdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ldapsdk
 # Copyright 2000-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ldapsdk/ChangeLog,v 1.16 2014/06/17 10:57:39 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ldapsdk/ChangeLog,v 1.17 2014/06/21 06:58:30 ercpe Exp $
+
+*ldapsdk-4.1.7-r4 (21 Jun 2014)
+
+  21 Jun 2014; Johann Schmitz <ercpe@gentoo.org>
+  +files/4.1.7-fix-jdk-1.7-enum.patch, +ldapsdk-4.1.7-r4.ebuild:
+  EAPI bump; fixed bug #513580 (renamed variables named "enum"), some QA
 
   17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -ldapsdk-4.1.7-r2.ebuild:
   NM: Cleanup superseeded ebuilds.
diff --git a/dev-java/ldapsdk/Manifest b/dev-java/ldapsdk/Manifest
index 37171bd30078..3f443db2e152 100644
--- a/dev-java/ldapsdk/Manifest
+++ b/dev-java/ldapsdk/Manifest
@@ -1,5 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 4.1.7-fix-jdk-1.7-enum.patch 8395 SHA256 60784d38f11a67481713641066183e6f27d4295f451640555f8435d052d04b22 SHA512 b62749328c9ca64342550771a4aeed8321b2995a81b15a103c8c3383beaa471f657c13b9eefa6035f0820c7b39e4640f6af1eec4af8bcbbce75a2d97252bc20e WHIRLPOOL 09627f846c3bbae7e0e604862e5fbd55e55d08f7171a52eef3a2b63854618a3416fcbd7b9872570fb54f6fa85606e81d025dcf680b617ffa249df3bdc8858c5b
 AUX ldapsdk-gentoo.patch 5569 SHA256 842cf79d529757a851301b881fa95d973a10cc45de112282a5eb1f10943187c7 SHA512 2b3eb2b0cd819f6a5885235eb75b20c60a1b2805910fd0f11c4e54edfa5c5c802db79378e43b02182ef6acb60eae20fa5110835e8a772c9a34daf6a4352a3b0c WHIRLPOOL b051adec27ddee91e302e482ef9e9aa0e6b75bcb8d506c700549cbacc094919293963f1c1572318475417750547c6b9b5a1ab6e491d91fb742d75cf46f91bf02
 DIST ldapsdk_java_20020819.tar.gz 1068301 SHA256 2f9599a2c5afcb0364c095728a909b73c59308a6ebf1849f6e8c3090be455df9 SHA512 e27be2a3c41db07589a0f4ee32f5b9dc2700f27aadf07c6c3db32041b3284ea8132d4aafad3cc0e132a68e1d438013df0068ea838c98cfed5ec9227f39d3c33d WHIRLPOOL 057fa56755aabedba5e74a5118e768d1653565d431f64c9f8a9033db86a4e67b7c7365ae203a2c2757591dbadec874543275e53e576fc39a82c35a2978746691
 EBUILD ldapsdk-4.1.7-r3.ebuild 1355 SHA256 f650df8dc73e6aba6f497cd26c592a842e6f85ecb85ccec97656bec79084569d SHA512 3b4df734f2e18a7196d6e194de0e9a9ec50951984f6a57941f09bef8caaca240bc2d8485bb2a025fab32611e1b6c8902ea15fa36a245fcf70958038a07ed4857 WHIRLPOOL 135bd655e00d68586d3cf213ca539f853b1c5f0368e2b1f305e220daed0e5cf6a1e5e7d68ce422b04ab81c4a6ad3dbd358afc0c1f550bb443c09e56536c11731
-MISC ChangeLog 2494 SHA256 0ea562aad945f9a80b6223638d6c7fb62ecbfc91d4f19ad238631c2997488e6a SHA512 c241a6278334dda3d712cb4814a60ba66217cf23c4a3c623bd1057c8ca1a2497bf8cc6f2be3d6a2680e492971d9666db055cb6f286e69484127b9c888e9c91cc WHIRLPOOL 7cb4be8393f4e410dfc55c9c6ccadce3a8a1df0fe0f08460997c3f2b0b13883a14b3072e8d1050e52e2888005504a678b6f4be42561c37943a1762011448e3a3
+EBUILD ldapsdk-4.1.7-r4.ebuild 1425 SHA256 922d9c72e444e100043397b63dffaf27b340c159bdde7cca0206ac009c63df94 SHA512 baadade2df683b30cad2945f0dd86e37e94d3c9a5550c118d1ebdb38c46699812e0a31ee55308c67a686b83cfcef622c95984d1a9baf621d600371f31bebb09a WHIRLPOOL 6762a681ae8cffdd04370da88f31194abdfbdc5992322b89fc210a6dfdef4310f3e30ab16650f61c23c7c87e7da22ceaf6116302ba3487a104f5eb29e461e662
+MISC ChangeLog 2715 SHA256 0248060f9b885190c903b4f166e6977f6582bfaa074bf1d64de3542f06cc2dc1 SHA512 2f0232e7a2eb787c8dd31ce5356ec6dc8093426266fcdf668e61e0e81e5fc803fc4b35bc23eef430a19a56bb2cb6b4a0aa3abf4877e95d35296f713e0feb963d WHIRLPOOL f89f71567faed7c19c9fa638b63af5bbfa9cbd30dce615ff19e1a1bbc433df966e67f5111e46cb6be5681844d118840cfe3d14d5f176a08f535e6872da74eebf
 MISC metadata.xml 239 SHA256 6255a4e8ae54c0f76e118525bddd75e0175a7c2db7becc46e107c529a42f30ca SHA512 42fef75cf142ee95dd4e046b9d9c8db8fe5fcd0b9393caef258fd70cab0c960978d3637a4619bb5317bfeb03bfc8185b82dc5bebb07291c5420fab4471048772 WHIRLPOOL b3f1d6edb2c0b2cdd0b39976e6c7a0d1c58550d3065d705eecfc0e05abfbc1f30331a87503581d2e7a84740b193c742189f26d2ec2a3ec8df793739dd7d57fca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTpS0cAAoJEKCEBkJ3xQHtsE8H+wS4pH7f5kdHxYB/iOgoSXU6
+Qzmh3zR91cFC+zJXiZWCY0Q6+xnYsY7oSVulOhiKDc5NpKnJawWsuPzQ9lNb7B9x
+e2nOQa382VhL4wC1+D4pbRjBiMYS+BfEBMgMecYlxwkDhrsg0HlYwectatz97Bnm
+QftnPTEK+Zi2d90DSWqHjRZpEL6lc+Jj1fyCLiiTKPeTiAHaTFoNW5u4oOqnXXKj
+dI/dXByV9G9HnOvZdKeYgld5mIV/O2B6j46Ud3ywWL/t5jSUMegB3xqhRBfvOyHy
++g/NINAOVerWXjhUrhG2zErQ6R3LVFM8PULbK/o1vTQFgIEaLJiBYk56z9ocqPY=
+=gx/C
+-----END PGP SIGNATURE-----
diff --git a/dev-java/ldapsdk/files/4.1.7-fix-jdk-1.7-enum.patch b/dev-java/ldapsdk/files/4.1.7-fix-jdk-1.7-enum.patch
new file mode 100644
index 000000000000..13cdf30f843b
--- /dev/null
+++ b/dev-java/ldapsdk/files/4.1.7-fix-jdk-1.7-enum.patch
@@ -0,0 +1,151 @@
+diff --git a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
+index a0ba7e8..42834c1 100644
+--- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
++++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
+@@ -107,9 +107,9 @@ public class LDAPEntryChangeControl extends LDAPControl {
+ 	BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
+ 							   numRead);
+ 	
+-	BEREnumerated enum = (BEREnumerated)s.elementAt(0);
++	BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
+ 	    
+-	_changeTypes = enum.getValue();
++	_changeTypes = enumx.getValue();
+ 
+ 	if (s.size() > 1) {
+ 	    if (s.elementAt(1) instanceof BEROctetString) {
+diff --git a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
+index c73bb68..5539f11 100644
+--- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
++++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
+@@ -263,9 +263,9 @@ public class LDAPPersistSearchControl extends LDAPControl {
+             BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
+               numRead);
+ 
+-            BEREnumerated enum = (BEREnumerated)s.elementAt(0);
++            BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
+ 
+-            con.setChangeType(enum.getValue());
++            con.setChangeType(enumx.getValue());
+ 
+             if (s.size() > 1) {
+                 if (s.elementAt(1) instanceof BEROctetString) {
+diff --git a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
+index e126d47..b5f6809 100644
+--- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
++++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
+@@ -402,12 +402,12 @@ public final class RDN implements java.io.Serializable {
+      * @see org.ietf.ldap.util.RDN#getAttributeSyntax
+      */
+     public static String[] getAttributesForSyntax( String oid ) {
+-        Enumeration enum = m_attributehash.keys();
++        Enumeration enumx = m_attributehash.keys();
+         Vector key_v = new Vector();
+         String tmp_str = null;
+ 
+-        while ( enum.hasMoreElements() ) {
+-            tmp_str = (String)enum.nextElement();
++        while ( enumx.hasMoreElements() ) {
++            tmp_str = (String)enumx.nextElement();
+             if ( oid.equals( (String)m_attributehash.get( tmp_str ) ) ) {
+                 key_v.addElement( tmp_str );
+             }
+diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
+index a4d9e88..85cc7af 100644
+--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
++++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
+@@ -4519,9 +4519,9 @@ public class LDAPConnection
+         LDAPControl[] controls = null;
+ 
+         synchronized(m_responseControlTable) {            
+-            Enumeration enum = m_responseControlTable.keys();          
+-            while (enum.hasMoreElements()) {
+-                Object client = enum.nextElement();
++            Enumeration enumx = m_responseControlTable.keys();          
++            while (enumx.hasMoreElements()) {
++                Object client = enumx.nextElement();
+                 ResponseControls rspCtrls = (ResponseControls)m_responseControlTable.get(client);
+ 
+                 if (msgID == rspCtrls.msgID) {
+diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
+index 8e486c5..9256aa0 100644
+--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
++++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
+@@ -107,9 +107,9 @@ public class LDAPEntryChangeControl extends LDAPControl {
+ 	BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
+ 							   numRead);
+ 	
+-	BEREnumerated enum = (BEREnumerated)s.elementAt(0);
++	BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
+ 	    
+-	m_changeTypes = enum.getValue();
++	m_changeTypes = enumx.getValue();
+ 
+ 	if (s.size() > 1) {
+ 	    if (s.elementAt(1) instanceof BEROctetString) {
+diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
+index 9bab06a..a5836e8 100644
+--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
++++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
+@@ -263,9 +263,9 @@ public class LDAPPersistSearchControl extends LDAPControl {
+             BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
+               numRead);
+ 
+-            BEREnumerated enum = (BEREnumerated)s.elementAt(0);
++            BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
+ 
+-            con.setChangeType(enum.getValue());
++            con.setChangeType(enumx.getValue());
+ 
+             if (s.size() > 1) {
+                 if (s.elementAt(1) instanceof BEROctetString) {
+diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
+index 57bce3a..392d7ea 100644
+--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
++++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
+@@ -402,12 +402,12 @@ public final class RDN implements java.io.Serializable {
+      * @see netscape.ldap.util.RDN#getAttributeSyntax
+      */
+     public static String[] getAttributesForSyntax( String oid ) {
+-        Enumeration enum = m_attributehash.keys();
++        Enumeration enumx = m_attributehash.keys();
+         Vector key_v = new Vector();
+         String tmp_str = null;
+ 
+-        while ( enum.hasMoreElements() ) {
+-            tmp_str = (String)enum.nextElement();
++        while ( enumx.hasMoreElements() ) {
++            tmp_str = (String)enumx.nextElement();
+             if ( oid.equals( (String)m_attributehash.get( tmp_str ) ) ) {
+                 key_v.addElement( tmp_str );
+             }
+diff --git a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
+index 4bcb46d..7b22371 100644
+--- a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
++++ b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
+@@ -151,8 +151,8 @@ class AttributesImpl implements Attributes {
+      */
+     static LDAPAttributeSet jndiAttrsToLdapAttrSet(Attributes jndiAttrs) throws NamingException{
+         LDAPAttributeSet attrs = new LDAPAttributeSet();
+-        for (Enumeration enum = jndiAttrs.getAll(); enum.hasMoreElements();) {
+-            attrs.add(jndiAttrToLdapAttr((Attribute) enum.nextElement()));
++        for (Enumeration enumx = jndiAttrs.getAll(); enumx.hasMoreElements();) {
++            attrs.add(jndiAttrToLdapAttr((Attribute) enumx.nextElement()));
+         }
+         return attrs;
+     }    
+diff --git a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
+index 2595b8a..d9bd103 100644
+--- a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
++++ b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
+@@ -465,8 +465,8 @@ public class ObjectMapper {
+      */
+     static Attributes encodeDirCtxObj(DirContext obj, Attributes attrs) throws NamingException{
+         Attributes ctxAttrs = obj.getAttributes("");
+-        for (NamingEnumeration enum = ctxAttrs.getAll(); enum.hasMore();) {
+-            attrs.put((Attribute)enum.next());
++        for (NamingEnumeration enumx = ctxAttrs.getAll(); enumx.hasMore();) {
++            attrs.put((Attribute)enumx.next());
+         }
+         return attrs;
+     }
diff --git a/dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild b/dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild
new file mode 100644
index 000000000000..455166336a2a
--- /dev/null
+++ b/dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 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-r4.ebuild,v 1.1 2014/06/21 06:58:30 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Netscape Directory SDK for Java"
+HOMEPAGE="http://www.mozilla.org/directory/javasdk.html"
+SRC_URI="http://www.mozilla.org/directory/${PN}_java_20020819.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="4.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/jss:3.4
+	dev-java/jakarta-oro:2.0"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S=${WORKDIR}/mozilla/directory/java-sdk
+
+java_prepare() {
+	cd "${WORKDIR}"/mozilla || die
+	epatch "${FILESDIR}"/ldapsdk-gentoo.patch
+	epatch "${FILESDIR}"/${PV}-*.patch
+
+	echo "ororegexp.jar=$(java-pkg_getjars jakarta-oro-2.0)" > "${S}"/build.properties || die
+	echo "jss.jar=$(java-pkg_getjars jss-3.4)" >> "${S}"/build.properties || die
+
+	cd "${S}"/ldapjdk/lib || die
+	rm -f *.jar || die
+	java-pkg_jar-from jss-3.4
+
+	cd "${S}"/ldapsp/lib || die
+	rm *.jar || die
+
+	java-pkg_filter-compiler jikes
+}
+
+src_compile() {
+	eant dist-jdk dist-filter dist-beans dist-jndi $(use_doc build-docs)
+}
+
+src_install() {
+	java-pkg_dojar dist/packages/*.jar
+
+	use doc && java-pkg_dojavadoc dist/doc/ldapsp
+	use source && \
+		java-pkg_dosrc {ldapsp,ldapjdk}/com	{ldapjdk,ldapbeans,ldapfilter}/netscape
+}