From: W. Trevor King <wking@tremily.us>
Date: Fri, 22 Jun 2012 03:02:36 +0000 (-0400)
Subject: Remove dev-java
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=refs%2Fheads%2Fdev-java%2Fjoda-convert;p=wtk-overlay.git

Remove dev-java

The hdfview changes were accepted upstream in the science overlay:

  commit 709daeff6aa4a3691d83f26a2fb837748cb21478
  Author: Sébastien Fabbro <sebfabbro@gmail.com>
  Date:   Mon May 14 23:26:29 2012 +0100

    dev-java/hdf-java: Version bump. Added use flag hdfview. Adapted from the wtk overlay

    (Portage version: 2.1.10.56/git/Linux x86_64, unsigned Manifest commit)

At the same time Sébastien pulled in the other dependencies.  I hope I
never have to package any Java for Gentoo again ;).
---

diff --git a/dev-java/joda-convert/Manifest b/dev-java/joda-convert/Manifest
deleted file mode 100644
index 066aec7..0000000
--- a/dev-java/joda-convert/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 1.1-build.xml 3819 RMD160 a6be19d47be61f5d2019cfb93d85318b56bcfc61 SHA1 d258b44e22445f77422567e660e04fc3f66f3426 SHA256 57571f3abdd51f9048acf47104a732aa4d6a3bbf7ae74221991dc5b64c335e59
-DIST joda-convert-1.1.tar.gz 24233 RMD160 f343caf5354f03c52e0e63d674db41af689a17ef SHA1 c0175fd89088e50a31e7ab46e6e36b45f9f81dde SHA256 dba2096aeffe59aa9268bddfb5102111f52f30b14a120118b5fd14f338af6657
-EBUILD joda-convert-1.1.ebuild 1402 RMD160 f1fe8912a13b5e6ecf87b0f9ebdb045559772fc7 SHA1 d6d02573474ab5e2744540698d53a5a07f69e124 SHA256 68daf2f92e236f62b99f93c4c51257eb6a7e8ee7a70901e9ed246b4b400af455
-EBUILD joda-convert-9999.ebuild 1402 RMD160 f1fe8912a13b5e6ecf87b0f9ebdb045559772fc7 SHA1 d6d02573474ab5e2744540698d53a5a07f69e124 SHA256 68daf2f92e236f62b99f93c4c51257eb6a7e8ee7a70901e9ed246b4b400af455
diff --git a/dev-java/joda-convert/files/1.1-build.xml b/dev-java/joda-convert/files/1.1-build.xml
deleted file mode 100644
index 07fe6e0..0000000
--- a/dev-java/joda-convert/files/1.1-build.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-<project name="Joda convert" default="all" basedir=".">
-  <target name="init" description="Sets build properties">
-    <!-- package configuration -->
-    <property name="package.version" value="devel"/>
-    <!-- directory locations -->
-    <property name="src" value="${basedir}/src"/>
-    <property name="src.lib" value="${src}/main/java"/>
-    <property name="src.test" value="${src}/test/java"/>
-    <property name="build" value="${basedir}/build"/>
-    <property name="build.lib" value="${build}/lib"/>
-    <property name="build.test" value="${build}/test"/>
-    <property name="doc" value="${basedir}/doc"/>
-    <property name="doc.api" value="${doc}/api"/>
-    <!-- external dependencies -->
-    <property name="junit.jar" value="junit.jar"/>
-    <!-- classpaths -->
-    <path id="project.class.path">
-    </path>
-    <path id="test.class.path">
-      <!--pathelement location="${junit.jar}"/--> <!-- handled by Gentoo's ANT_TASKS -->
-    </path>
-    <path id="build.lib.class.path">
-      <pathelement location="${build.lib}"/>
-    </path>
-    <path id="build.test.class.path">
-      <pathelement location="${build.test}"/>
-    </path>
-  </target>
-  <target name="all" depends="jar,javadoc"
-          description="Pseudo-target that builds JAR and Javadoc"/>
-  <target name="build-lib" depends="init"
-          description="Compiles the library classes">
-    <mkdir dir="${build.lib}"/>
-    <javac destdir="${build.lib}" srcdir="${src.lib}" debug="true"
-           deprecation="true" includeantruntime="false">
-      <classpath refid="project.class.path"/>
-      <classpath refid="build.lib.class.path"/>
-      <!--compilerarg line="-Xlint:unchecked"/-->
-    </javac>
-    <!--copy todir="${build}">
-      <mappedresources>
-        <fileset dir="${src}" includes="**/test/test.fits*"/>
-        <globmapper from="*" to="*"/>
-      </mappedresources>
-    </copy-->
-  </target>
-  <target name="build-tests" depends="build-lib"
-          description="Compiles the test classes">
-    <mkdir dir="${build.test}"/>
-    <javac destdir="${build.test}" srcdir="${src.test}" debug="true"
-           deprecation="true" includeantruntime="false">
-      <classpath refid="project.class.path"/>
-      <classpath refid="test.class.path"/>
-      <classpath refid="build.lib.class.path"/>
-    </javac>
-  </target>
-  <target name="build" depends="build-lib"
-          description="Alias for build-lib"/>
-  <target name="test" depends="build-tests">
-    <junit>
-      <classpath refid="project.class.path"/>
-      <classpath refid="test.class.path"/>
-      <classpath refid="build.lib.class.path"/>
-      <classpath refid="build.test.class.path"/>
-      <formatter type="brief" usefile="false" />
-      <batchtest>
-        <fileset dir="${build.test}">
-          <include name="**/*.class" />
-          <exclude name="**/*$*.class" />
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-  <target name="javadoc" depends="init"
-          description="Generates Javadoc API documentation">
-    <mkdir dir="${doc.api}"/>
-    <javadoc packagenames="*"
-             sourcepath="${src.lib}" destdir="${doc.api}"
-             author="true"       version="true"
-             use="true"          private="true"/>
-  </target>
-  <target name="jar" depends="build-lib"
-          description="Builds a project JAR file">
-    <jar basedir="${build.lib}" jarfile="${build}/joda-convert.jar">
-      <manifest>
-        <attribute name="Version" value="${package.version}"/>
-      </manifest>
-    </jar>
-  </target>
-  <target name="clean" depends="init"
-          description="Erase all generated files and dirs">
-    <delete dir="${build}" verbose="true"/>
-    <delete dir="${doc}" verbose="true"/>
-    <delete verbose="true">
-        <fileset dir="${basedir}" includes="*.jar"/>
-    </delete>
-  </target>
-</project>
diff --git a/dev-java/joda-convert/joda-convert-1.1.ebuild b/dev-java/joda-convert/joda-convert-1.1.ebuild
deleted file mode 120000
index 861c2b0..0000000
--- a/dev-java/joda-convert/joda-convert-1.1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-joda-convert-9999.ebuild
\ No newline at end of file
diff --git a/dev-java/joda-convert/joda-convert-9999.ebuild b/dev-java/joda-convert/joda-convert-9999.ebuild
deleted file mode 100644
index 61fb4ef..0000000
--- a/dev-java/joda-convert/joda-convert-9999.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/JodaOrg/${PN}.git"
-	SRC_URI=""
-	MY_P="${P}"
-else
-	#MY_P="${P}-src"
-	#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-	#S="${WORKDIR}/${MY_P}"
-	SRC_URI="http://github.com/JodaOrg/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="A Java library for Object <-> String conversion."
-HOMEPAGE="http://${PN}.sourceforge.net/"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit4
-		dev-java/hamcrest-core
-	)"
-RDEPEND=">=virtual/jre-1.5"
-
-JAVA_PKG_WANT_SOURCE="5"
-EANT_EXTRA_ARGS="-Dpacakge.version=${PV}"
-EANT_GENTOO_CLASSPATH="junit-4"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_unpack() {
-	# Work around GitHub's "${PN}-<SHA1>" directory name
-	if [[ "${PV}" == "9999" ]]; then
-		git-2_src_unpack
-	else
-		unpack "${A}"
-		mv *-"${PN}"-*/* "${S}"
-	fi
-}
-
-src_prepare() {
-	cp "${FILESDIR}/1.1-build.xml" build.xml
-}
-
-src_test() {
-	ANT_TASKS="ant-junit4" eant test
-}
-
-src_install() {
-	java-pkg_newjar "build/${PN}.jar" "${PN}.jar"
-
-	dodoc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt || die
-	use doc && java-pkg_dojavadoc doc/api
-	use source && java-pkg_dosrc src/main/java/*
-}