From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 31F731395D4 for ; Fri, 31 Jul 2015 12:46:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4986D14023; Fri, 31 Jul 2015 12:45:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A57F914023 for ; Fri, 31 Jul 2015 12:45:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 75E01340A1B for ; Fri, 31 Jul 2015 12:45:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3170D115 for ; Fri, 31 Jul 2015 12:45:55 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1438267378.3e2612a6a0c31791b2765e90eeb11bff74750ad5.chewi@gentoo> Subject: [gentoo-commits] proj/java:master commit in: dev-java/xml-xmlbeans/files/, dev-java/xml-xmlbeans/ X-VCS-Repository: proj/java X-VCS-Files: dev-java/xml-xmlbeans/ChangeLog dev-java/xml-xmlbeans/Manifest dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-jam.patch dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-piccolo.patch dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-remove-jamsupport.patch dev-java/xml-xmlbeans/metadata.xml dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild X-VCS-Directories: dev-java/xml-xmlbeans/ dev-java/xml-xmlbeans/files/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 3e2612a6a0c31791b2765e90eeb11bff74750ad5 X-VCS-Branch: master Date: Fri, 31 Jul 2015 12:45:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 15387181-82a9-4965-a38c-eb574e7ea27b X-Archives-Hash: 492f72df5ee05c563ee862fd9cfa9cf7 commit: 3e2612a6a0c31791b2765e90eeb11bff74750ad5 Author: Andreas Sturmlechner gmail com> AuthorDate: Thu Jul 30 14:42:58 2015 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Thu Jul 30 14:42:58 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=3e2612a6 [dev-java/xml-xmlbeans] Drop same version as in portage dev-java/xml-xmlbeans/ChangeLog | 152 --------------------- dev-java/xml-xmlbeans/Manifest | 1 - .../files/xml-xmlbeans-2.6.0-jam.patch | 64 --------- .../files/xml-xmlbeans-2.6.0-piccolo.patch | 14 -- .../xml-xmlbeans-2.6.0-remove-jamsupport.patch | 37 ----- dev-java/xml-xmlbeans/metadata.xml | 23 ---- dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild | 93 ------------- 7 files changed, 384 deletions(-) diff --git a/dev-java/xml-xmlbeans/ChangeLog b/dev-java/xml-xmlbeans/ChangeLog deleted file mode 100644 index a0c8a38..0000000 --- a/dev-java/xml-xmlbeans/ChangeLog +++ /dev/null @@ -1,152 +0,0 @@ -# ChangeLog for dev-java/xml-xmlbeans -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-xmlbeans/ChangeLog,v 1.35 2013/09/17 17:15:56 tomwij Exp $ - -*xml-xmlbeans-2.6.0 (17 Sep 2013) - - 17 Sep 2013; Tom Wijsman - +files/xml-xmlbeans-2.6.0-jam.patch, +files/xml-xmlbeans-2.6.0-piccolo.patch, - +files/xml-xmlbeans-2.6.0-remove-jamsupport.patch, +xml-xmlbeans-2.6.0.ebuild: - Version bump to 2.6.0, imported from dmol overlay; made additional adjustments - like adding missing dependencies and simplifying maintenance. Fixes bug - #173129. Thanks to Kim, Arfrever, Karsten, dmol and Java herd for helping. - - 28 Jul 2013; Fabian Groffen - xml-xmlbeans-1.0.4_pre20041217-r1.ebuild: - Marked ~x64-macos, bug #435528 - - 05 Feb 2013; Rick Farina - xml-xmlbeans-1.0.4_pre20041217-r1.ebuild, - xml-xmlbeans-1.0.4_pre20041217.ebuild: - adding ~arm - -*xml-xmlbeans-1.0.4_pre20041217-r1 (13 Jan 2013) - - 13 Jan 2013; Ralph Sennhauser - +xml-xmlbeans-1.0.4_pre20041217-r1.ebuild: - Don't leak jre into DEPND, may confuse vm switching code. #432904 - EAPI bump, use slot deps and java_prepare. - - 15 Apr 2012; Mike Frysinger - xml-xmlbeans-1.0.4_pre20041217.ebuild: - Add back ia64 love #349020 by Dennis Schridde. - - 01 Jan 2012; Ralph Sennhauser - xml-xmlbeans-1.0.4_pre20041217.ebuild: - Drop ia64 support #345433 - - 24 Apr 2010; Fabian Groffen - xml-xmlbeans-1.0.4_pre20041217.ebuild: - Marked ~sparc-solaris ~x86-solaris, bug #314093 - - 03 Jan 2010; Christian Faulhammer - xml-xmlbeans-1.0.4_pre20041217.ebuild: - Transfer Prefix keywords - - 23 May 2007; Diego Pettenò ChangeLog: - Add ~x86-fbsd keyword. Bug #176906. - - 09 May 2007; Raúl Porcel - xml-xmlbeans-1.0.4_pre20041217.ebuild: - Add ~ia64 wrt #160813 - -*xml-xmlbeans-1.0.4_pre20041217 (09 May 2007) - - 09 May 2007; Vlastimil Babka - +xml-xmlbeans-1.0.4_pre20041217.ebuild, -xml-xmlbeans-20041217-r1.ebuild: - Change version to one that will allow future bump. Will seems like a - downgrade, that's fine. - - 25 Apr 2007; Petteri Räty - xml-xmlbeans-20041217-r1.ebuild: - Add dev-java/ant-core to RDEPEND. - - 25 Apr 2007; Petteri Räty - -xml-xmlbeans-20041217.ebuild: - Remove generation 1 ebuild. - - 15 Apr 2007; Markus Rothe - xml-xmlbeans-20041217-r1.ebuild: - Stable on ppc64 - - 06 Apr 2007; Petteri Räty - xml-xmlbeans-20041217-r1.ebuild: - Mark stable on amd64 wrt bug #173559. - - 06 Apr 2007; nixnut xml-xmlbeans-20041217-r1.ebuild: - Stable on ppc wrt bug 173559 - - 06 Apr 2007; Christian Faulhammer - xml-xmlbeans-20041217-r1.ebuild: - filter jikes and stable x86, bug 173559 - - 14 Feb 2007; Markus Rothe - xml-xmlbeans-20041217-r1.ebuild: - Added ~ppc64 - - 21 Jan 2007; Diego Pettenò - xml-xmlbeans-20041217-r1.ebuild: - Add ~x86-fbsd keyword (see the various bugs for netbeans 5.5-r2). - -*xml-xmlbeans-20041217-r1 (26 Dec 2006) - - 26 Dec 2006; Petteri Räty - +xml-xmlbeans-20041217-r1.ebuild: - Migrated to generation 2. - - 05 Oct 2006; Gustavo Zacarias - xml-xmlbeans-20041217.ebuild: - Dropping sparc keywords, see #96229 - - 11 Mar 2006; Michael Hanselmann - xml-xmlbeans-20041217.ebuild: - Stable on ppc. - - 11 Sep 2005; Thomas Matthijs - xml-xmlbeans-20041217.ebuild: - Disable junit #100895 - - 22 Aug 2005; Gustavo Zacarias - xml-xmlbeans-20041217.ebuild: - Stable on sparc - - 20 Jul 2005; Gustavo Zacarias - xml-xmlbeans-20041217.ebuild: - Gimme ~sparc - - 09 Jul 2005; Thomas Matthijs - xml-xmlbeans-20041217.ebuild: - fix deps - - 12 Jun 2005; Jan Brinkmann - xml-xmlbeans-20041217.ebuild: - Updated dev-java/jaxen dependency. - - 16 May 2005; Jan Brinkmann - xml-xmlbeans-20041217.ebuild: - stable on amd64 and x86, added ~ppc to KEYWORDS - - 16 Mar 2005; Jan Brinkmann - xml-xmlbeans-20041217.ebuild: - xml-xmlbeans now makes use of java-pkg_dosrc - - 10 Jan 2005; Jan Brinkmann - xml-xmlbeans-20041217.ebuild: - finally fixed the junit dependency nightmare. fixes #77097. - - 08 Jan 2005; Jan Brinkmann - xml-xmlbeans-20041217.ebuild: - updated ant dependency because junit needs ant-tasks. fixes #77097. - - 03 Jan 2005; Jan Brinkmann xml-xmlbeans-20041217.ebuild: - Updated junit dependency and added source useflag. Fixes #75906 - - 24 Dec 2004; Thomas Matthijs - files/xml-xmlbeans-gentoo.patch, xml-xmlbeans-20041217.ebuild: - fix #75528 - -*xml-xmlbeans-20041217 (19 Dec 2004) - - 19 Dec 2004; Karl Trygve Kalleberg xml-xmlbeans-20041217.ebuild: - Initial import. Ebuild submitted by the wunderbar Jan Brinkmann - . Fixes #74818. diff --git a/dev-java/xml-xmlbeans/Manifest b/dev-java/xml-xmlbeans/Manifest deleted file mode 100644 index a3efb24..0000000 --- a/dev-java/xml-xmlbeans/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xmlbeans-2.6.0-src.zip 9005098 SHA256 3dff52b0854236adbbff9dc76722372415cd9a8f406f6133886a6c5228595390 SHA512 162dc3d283ebf9f7fae823a2ae8d835b708c2cbeed48349c85996e60b2b8dfe0e51b17bd37eb34327c6452b2c0fc7df8a4902816b145993e36ca614ceb43b2b7 WHIRLPOOL cd775fa268e56aa02d744be67012d807e1cebf978d453610b48a8ca865f8d1587f27ced161d622d5d6ae0badab80de80ee4b46b7bf3bb753f69242c20d1e03d5 diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-jam.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-jam.patch deleted file mode 100644 index 8081f71..0000000 --- a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-jam.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java ---- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java 2010-04-14 08:30:34.000000000 +0300 -+++ src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java 2012-09-05 23:03:48.617016181 +0300 -@@ -27,10 +27,10 @@ - import org.apache.xmlbeans.XmlError; - import org.apache.xmlbeans.InterfaceExtension; - import org.apache.xmlbeans.PrePostExtension; --import org.apache.xmlbeans.impl.jam.JamClassLoader; --import org.apache.xmlbeans.impl.jam.JamService; --import org.apache.xmlbeans.impl.jam.JamServiceFactory; --import org.apache.xmlbeans.impl.jam.JamServiceParams; -+import org.codehaus.jam.JamClassLoader; -+import org.codehaus.jam.JamService; -+import org.codehaus.jam.JamServiceFactory; -+import org.codehaus.jam.JamServiceParams; - import org.apache.xmlbeans.impl.schema.StscState; - - import javax.xml.namespace.QName; -diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java ---- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java 2010-04-14 08:30:34.000000000 +0300 -+++ src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java 2012-09-05 23:09:00.320097542 +0300 -@@ -18,10 +18,10 @@ - import org.apache.xmlbeans.impl.xb.xmlconfig.Extensionconfig; - import org.apache.xmlbeans.InterfaceExtension; - import org.apache.xmlbeans.XmlObject; --import org.apache.xmlbeans.impl.jam.JMethod; --import org.apache.xmlbeans.impl.jam.JClass; --import org.apache.xmlbeans.impl.jam.JParameter; --import org.apache.xmlbeans.impl.jam.JamClassLoader; -+import org.codehaus.jam.JMethod; -+import org.codehaus.jam.JClass; -+import org.codehaus.jam.JParameter; -+import org.codehaus.jam.JamClassLoader; - - public class InterfaceExtensionImpl implements InterfaceExtension - { -diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java ---- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java 2010-04-14 08:30:34.000000000 +0300 -+++ src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java 2012-09-05 23:06:48.081760004 +0300 -@@ -17,9 +17,9 @@ - - import org.apache.xmlbeans.XmlObject; - import org.apache.xmlbeans.PrePostExtension; --import org.apache.xmlbeans.impl.jam.JamClassLoader; --import org.apache.xmlbeans.impl.jam.JClass; --import org.apache.xmlbeans.impl.jam.JMethod; -+import org.codehaus.jam.JamClassLoader; -+import org.codehaus.jam.JClass; -+import org.codehaus.jam.JMethod; - import org.apache.xmlbeans.impl.xb.xmlconfig.Extensionconfig; - - -diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java ---- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java 2010-04-14 08:30:34.000000000 +0300 -+++ src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java 2012-09-05 23:06:33.710940667 +0300 -@@ -3,7 +3,7 @@ - import javax.xml.namespace.QName; - - import org.apache.xmlbeans.UserType; --import org.apache.xmlbeans.impl.jam.JamClassLoader; -+import org.codehaus.jam.JamClassLoader; - import org.apache.xmlbeans.impl.xb.xmlconfig.Usertypeconfig; - - public class UserTypeImpl implements UserType diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-piccolo.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-piccolo.patch deleted file mode 100644 index 866dc0f..0000000 --- a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-piccolo.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur /tmp/xmlbeans-2.6.0.orig/src/store/org/apache/xmlbeans/impl/store/Locale.java src/store/org/apache/xmlbeans/impl/store/Locale.java ---- /tmp/xmlbeans-2.6.0.orig/src/store/org/apache/xmlbeans/impl/store/Locale.java 2012-09-05 14:31:47.743396340 +0300 -+++ src/store/org/apache/xmlbeans/impl/store/Locale.java 2012-09-05 14:35:31.527582989 +0300 -@@ -106,8 +106,8 @@ - import org.apache.xmlbeans.impl.values.TypeStoreUser; - import org.apache.xmlbeans.impl.values.TypeStoreUserFactory; - --import org.apache.xmlbeans.impl.piccolo.xml.Piccolo; --import org.apache.xmlbeans.impl.piccolo.io.FileFormatException; -+import com.bluecast.xml.Piccolo; -+import com.bluecast.io.FileFormatException; - - public final class Locale - implements DOMImplementation, SaajCallback, XmlLocale diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-remove-jamsupport.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-remove-jamsupport.patch deleted file mode 100644 index 23467d2..0000000 --- a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-remove-jamsupport.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/build.xml -+++ b/build.xml -@@ -433,7 +433,6 @@ - - - -- - - - -@@ -488,7 +487,7 @@ - store.classes, saaj_api.classes, - marshal.classes, xpath.classes, oldxbean.jar, xsdschema.classes, - xmlinputstream.classes, resolver.jar, xbean_xpath.jar, -- piccolo.classes, tools.classes, jamsupport.classes"> -+ piccolo.classes, tools.classes"> - - -@@ -711,17 +710,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- - - - diff --git a/dev-java/xml-xmlbeans/metadata.xml b/dev-java/xml-xmlbeans/metadata.xml deleted file mode 100644 index 3f89838..0000000 --- a/dev-java/xml-xmlbeans/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - -java - - - -XMLBeans is a tool that allows you to access the full power of XML in a Java -friendly way. It is an XML-Java binding tool. The idea is that you can take -advantage the richness and features of XML and XML Schema and have these -features mapped as naturally as possible to the equivalent Java language and -typing constructs. XMLBeans uses XML Schema to compile Java interfaces and -classes that you can then use to access and modify XML instance data. Using -XMLBeans is similar to using any other Java interface/class, you will see things -like getFoo or setFoo just as you would expect when working with Java. While a -major use of XMLBeans is to access your XML instance data with strongly typed -Java classes there are also API's that allow you access to the full XML infoset -(XMLBeans keeps full XML Infoset fidelity) as well as to allow you to reflect -into the XML schema itself through an XML Schema Object model. - - - diff --git a/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild deleted file mode 100644 index 7f479f6..0000000 --- a/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild,v 1.1 2013/09/17 17:15:56 tomwij Exp $ - -EAPI="5" - -JAVA_PKG_IUSE="doc source" - -inherit eutils java-pkg-2 java-ant-2 - -MY_P="xmlbeans-${PV}" - -DESCRIPTION="An XML-Java binding tool." -HOMEPAGE="http://xmlbeans.apache.org/" -SRC_URI="http://archive.apache.org/dist/xmlbeans/source/${MY_P}-src.zip" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="~amd64" - -COMMON_DEP="dev-java/annogen:0 - dev-java/ant-core:0 - dev-java/piccolo:0 - dev-java/saxon:9 - dev-java/xml-commons-resolver:0" - -RDEPEND=">=virtual/jre-1.6 - ${COMMON_DEP}" - -DEPEND=">=virtual/jdk-1.6 - ${COMMON_DEP}" - -S="${WORKDIR}/${MY_P}" - -java_prepare() { - # Preserve the old xbean jar, which is required for bootstrapping schemas. - mv external/lib/oldxbean.jar "${T}"/ || die - - # Remove bundled binary files. - find . -name '*.jar' -exec rm -v {} + || die - - pushd external/lib > /dev/null || die - find . -iname '*.zip' -exec rm -v {} + || die - - # Symlink the dependencies. - ln -s ${JAVA_HOME}/jre/lib/rt.jar jsr173_1.0_api_bundle.jar - ln -s ${JAVA_HOME}/jre/lib/rt.jar jsr173_1.0_api.jar - mkdir xml-commons-resolver-1.1 || die - java-pkg_jar-from xml-commons-resolver{,.jar} xcresolver.zip - java-pkg_jar-from xml-commons-resolver{,.jar,-1.1/resolver.jar} - - # Put back the preserved old xbean jar. - mv "${T}"/oldxbean.jar . || die - popd > /dev/null || die - - # Remove broken jamsupport. - epatch "${FILESDIR}"/${P}-remove-jamsupport.patch - - # Patch package imports. - epatch "${FILESDIR}"/${P}-piccolo.patch - epatch "${FILESDIR}"/${P}-jam.patch - - # Create empty directories to let the build pass. - mkdir -p build/classes/{jam,piccolo} -} - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="annogen,ant-core,piccolo,saxon-9" - -EANT_BUILD_TARGET="deploy" -EANT_DOC_TARGET="docs" - -EANT_EXTRA_ARGS="-Dpiccolo.classes.notRequired=true" -EANT_EXTRA_ARGS+=" -Djam.classes.notRequired=true" -EANT_EXTRA_ARGS+=" -Dsaxon9.jar.exists=true" - -src_install() { - java-pkg_dojar build/lib/xbean*.jar - - dodoc NOTICE.txt README.txt - if use doc; then - java-pkg_dojavadoc build/docs/reference - java-pkg_dohtml -r docs - fi - - use source && java-pkg_dosrc src/* -} - -pkg_postinst() -{ - ewarn "This package uses an old binary xbean to bootstrap its schemas." - ewarn "If you do not trust the binary part of this build, please unmerge." -}