From aab7410b99c4ab41883b03641398e138860a0c2e Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sat, 13 Feb 2016 13:59:55 +0000 Subject: [PATCH] dev-java/gjdoc: Remove package, superseded by gnu-classpath --- dev-java/gjdoc/Manifest | 1 - dev-java/gjdoc/files/0.7.9-main-execute.patch | 17 ----- dev-java/gjdoc/files/gjdoc | 3 - dev-java/gjdoc/files/gjdoc-0.7.7-gcp.patch | 56 -------------- dev-java/gjdoc/gjdoc-0.7.9-r3.ebuild | 73 ------------------- dev-java/gjdoc/metadata.xml | 18 ----- 6 files changed, 168 deletions(-) delete mode 100644 dev-java/gjdoc/Manifest delete mode 100644 dev-java/gjdoc/files/0.7.9-main-execute.patch delete mode 100644 dev-java/gjdoc/files/gjdoc delete mode 100644 dev-java/gjdoc/files/gjdoc-0.7.7-gcp.patch delete mode 100644 dev-java/gjdoc/gjdoc-0.7.9-r3.ebuild delete mode 100644 dev-java/gjdoc/metadata.xml diff --git a/dev-java/gjdoc/Manifest b/dev-java/gjdoc/Manifest deleted file mode 100644 index b358cc7eb8b1..000000000000 --- a/dev-java/gjdoc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gjdoc-0.7.9.tar.gz 752491 SHA256 3d07eb7ea85c71614ae1ff8a64f70f9b9df0210194313ac159b71fef63389043 SHA512 462f629650e48a0c15f80ef6cd14656745d3ad8b7424fee425b449a7f206e76c142be3a63ca099166f5e3177d74e2c26a5db33e206013c62ff60242e95f33a81 WHIRLPOOL 9a7f69ff8a92129204f25aff2206864ea219da4a2040637719c46648be95cc6e1d4f4b6941bcd631d25b7f8140caafa700fd621229c7e3637ae5c3f8d0bbc1be diff --git a/dev-java/gjdoc/files/0.7.9-main-execute.patch b/dev-java/gjdoc/files/0.7.9-main-execute.patch deleted file mode 100644 index 79a8e5f34730..000000000000 --- a/dev-java/gjdoc/files/0.7.9-main-execute.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: src/com/sun/tools/javadoc/Main.java -=================================================================== -RCS file: /sources/classpath/gjdoc/src/com/sun/tools/javadoc/Main.java,v -retrieving revision 1.3 -diff -u -r1.3 Main.java ---- src/com/sun/tools/javadoc/Main.java 12 May 2007 10:40:10 -0000 1.3 -+++ src/com/sun/tools/javadoc/Main.java 15 Feb 2009 00:32:57 -0000 -@@ -6,4 +6,9 @@ - { - gnu.classpath.tools.gjdoc.Main.main(args); - } -+ -+ public static int execute(String[] args) -+ { -+ return gnu.classpath.tools.gjdoc.Main.execute(args); -+ } - } diff --git a/dev-java/gjdoc/files/gjdoc b/dev-java/gjdoc/files/gjdoc deleted file mode 100644 index cfa2b84ec225..000000000000 --- a/dev-java/gjdoc/files/gjdoc +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -$(java-config --java) -classpath "$(java-config --classpath=gjdoc,antlr):$CLASSPATH" gnu.classpath.tools.gjdoc.Main ${1+"$@"} diff --git a/dev-java/gjdoc/files/gjdoc-0.7.7-gcp.patch b/dev-java/gjdoc/files/gjdoc-0.7.7-gcp.patch deleted file mode 100644 index a09b745931a7..000000000000 --- a/dev-java/gjdoc/files/gjdoc-0.7.7-gcp.patch +++ /dev/null @@ -1,56 +0,0 @@ -Index: gjdoc-0.7.7/configure.ac -=================================================================== ---- gjdoc-0.7.7.orig/configure.ac -+++ gjdoc-0.7.7/configure.ac -@@ -101,6 +101,38 @@ AC_SUBST(jni_linkflag) - AM_CONDITIONAL([ENABLE_XMLDOCLET], [test x${enable_xmldoclet} = xyes]) - AM_CONDITIONAL([ENABLE_NATIVE], [test x${enable_native} = xyes]) - -+dnl Start testing for cp -u availability -+dnl Fallback to rsync otherwise -+ -+AC_MSG_CHECKING([for working cp -u]) -+ -+: ${TMPDIR=/tmp} -+{ -+ tmp=` -+ (umask 077 && mktemp -d "$TMPDIR/fooXXXXXX") 2>/dev/null -+ ` && test -n "$tmp" && test -d "$tmp" -+} || { -+ tmp=$TMPDIR/foo$$-$RANDOM -+ (umask 077 && mkdir "$tmp") -+} || AC_MSG_ERROR([Unable to create a temporary directory]) -+ -+touch "$tmp/origin" -+if cp -u "$tmp/origin" "$tmp/destination" 2>/dev/null; then -+ AC_MSG_RESULT([yes]) -+ CP_U="cp -u" -+else -+ AC_MSG_RESULT([no]) -+ AC_CHECK_PROG([CP_U], [rsync], [rsync -u]) -+fi -+ -+rm -rf "$tmp/origin" -+ -+if test "x$CP_U" = "x"; then -+ AC_MSG_ERROR([Unable to find a workign cp -u implementation.]) -+fi -+ -+AC_SUBST([CP_U]) -+ - AC_CONFIG_FILES([gjdoc.sh src/resources/version.properties], [chmod +x gjdoc.sh]) - - AC_OUTPUT([Makefile docs/Makefile]) -Index: gjdoc-0.7.7/Makefile.am -=================================================================== ---- gjdoc-0.7.7.orig/Makefile.am -+++ gjdoc-0.7.7/Makefile.am -@@ -385,7 +385,7 @@ gjdoc_resources_src = $(patsubst %, $(sr - - gnu-classpath-tools-gjdoc-$(VERSION).jar: $(srcdir)/gjdoc.manifest src/resources/version.properties $(gnu_classpath_tools_gjdoc_jar_CLASSES) $(gnu_classpath_tools_gjdoc_jar_GENCLASSES) $(gjdoc_resources_src) - for res in $(gjdoc_resources) ; \ -- do cp -u $(srcdir)/src/resources/$$res $$res ; done -+ do $(CP_U) $(srcdir)/src/resources/$$res $$res ; done - $(JAR) cfm $@ $(srcdir)/gjdoc.manifest \ - $(gjdoc_resources) \ - -C src/resources version.properties \ diff --git a/dev-java/gjdoc/gjdoc-0.7.9-r3.ebuild b/dev-java/gjdoc/gjdoc-0.7.9-r3.ebuild deleted file mode 100644 index bed1537c92c6..000000000000 --- a/dev-java/gjdoc/gjdoc-0.7.9-r3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -JAVA_PKG_IUSE="source" - -inherit eutils autotools java-pkg-2 - -DESCRIPTION="A javadoc compatible Java source documentation generator" -HOMEPAGE="https://www.gnu.org/software/cp-tools/" -SRC_URI="mirror://gnu/classpath/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" - -# Possible USE flags. -# -# native: to --enable-native -# doc: to generate javadoc -# debug: There is a debug doclet installed by default but maybe could -# have a wrapper that uses it. -# -IUSE="xmldoclet" - -CDEPEND=">=dev-java/antlr-2.7.1:0[java(+)]" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.4" - -DEPEND="${CDEPEND} - >=virtual/jdk-1.4" - -src_prepare() { - epatch "${FILESDIR}/${PN}-0.7.7-gcp.patch" - epatch "${FILESDIR}/0.7.9-main-execute.patch" - AT_M4DIR="m4" eautoreconf -} - -src_configure() { - # I think that configure will do --enable-native if it finds gcj - # so we'll disable it explicitly - local myc="--with-antlr-jar=$(java-pkg_getjar antlr antlr.jar) --disable-native" - myc="${myc} --disable-dependency-tracking" - - # Does not work with gcc 3.* and without these it tries to use gij - # see bug #116804 for details - - # TODO ideally, would respect JAVACFLAGS - JAVA="java" JAVAC="javac $(java-pkg_javac-args)" \ - econf ${myc} \ - $(use_enable xmldoclet) -} - -src_compile() { - default # Don't use from java-pkg-2 -} - -src_install() { - local jars="com-sun-tools-doclets-Taglet gnu-classpath-tools-gjdoc com-sun-javadoc" - for jar in ${jars}; do - java-pkg_newjar ${jar}-${PV}.jar ${jar}.jar - done - - java-pkg_dolauncher ${PN} --main gnu.classpath.tools.gjdoc.Main - dodoc AUTHORS ChangeLog NEWS README - - cd "${S}"/docs - emake DESTDIR="${D}" install - - use source && java-pkg_dosrc "${S}/src"/{com,gnu} -} diff --git a/dev-java/gjdoc/metadata.xml b/dev-java/gjdoc/metadata.xml deleted file mode 100644 index 3ece93859547..000000000000 --- a/dev-java/gjdoc/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - java@gentoo.org - Java - - -Gjdoc provides a framework for generating documentation in various -formats from java source files. It implements all features of the -traditional javadoc tool version 1.4 - except for one unimplemented -option (-serialwarn), it is fully command-line compatible and it -provides a compatible Doclet API (package com.sun.javadoc). - - - Also build support for the xml doclet that generates output in xml instead of the traditional html javadoc. - - -- 2.26.2