commit: b36e174780b39d0a49dde6bb2659a35bc4ab7e64
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Aug 5 22:41:37 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 5 23:52:52 2015 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=b36e1747
[dev-java/doxia] Drop: broken SRC_URI, plexus rdep
dev-java/doxia/ChangeLog | 46 ---------
dev-java/doxia/Manifest | 8 --
dev-java/doxia/doxia-1.0_alpha8_pre20070617.ebuild | 52 ----------
dev-java/doxia/doxia-1.0_alpha9_pre20070611.ebuild | 61 ------------
dev-java/doxia/doxia-1.0_beta1_pre20071024.ebuild | 108 ---------------------
dev-java/doxia/files/assemble-plexus-resources.sh | 29 ------
.../doxia-sitetools_DefaultSiteRenderer.java.diff | 15 ---
dev-java/doxia/metadata.xml | 5 -
8 files changed, 324 deletions(-)
diff --git a/dev-java/doxia/ChangeLog b/dev-java/doxia/ChangeLog
deleted file mode 100644
index f84d5af..0000000
--- a/dev-java/doxia/ChangeLog
+++ /dev/null
@@ -1,46 +0,0 @@
-# ChangeLog for dev-java/doxia
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 03 Nov 2007; kiorky <kio...@cryptelium.net>
- doxia-1.0_beta1_pre20071024.ebuild:
- fix DEPENDS
-
- 03 Nov 2007; kiorky <kio...@cryptelium.net>
- doxia-1.0_beta1_pre20071024.ebuild:
- fix DEPENDS
-
- 01 Nov 2007; kiorky <kio...@cryptelium.net>
- +doxia-1.0_beta1_pre20071024.ebuild,
- +files/doxia-sitetools_DefaultSiteRenderer.java.diff:
- new version for doxia
-
- 21 Oct 2007; kiorky <kio...@cryptelium.net>
- doxia-1.0_alpha8_pre20070617.ebuild, doxia-1.0_alpha9_pre20070611.ebuild:
- fix DEPENDS
-
- 21 Oct 2007; kiorky <kio...@cryptelium.net>
- doxia-1.0_alpha8_pre20070617.ebuild, doxia-1.0_alpha9_pre20070611.ebuild:
- bump to use lastest deps
-
- 17 Jun 2007; kiorky <kio...@cryptelium.net>
- +doxia-1.0_alpha8_pre20070617.ebuild, files/assemble-plexus-resources.sh:
- resurrecting alpha8 for maven shared
-
- 11 Jun 2007; kiorky <kio...@cryptelium.net> -doxia-1.0.ebuild,
- +doxia-1.0_alpha9_pre20070611.ebuild, +files/assemble-plexus-resources.sh:
- Maven 2.1 Bump
-
- 02 Jun 2007; kiorky <kio...@cryptelium.net> doxia-1.0.ebuild:
- moving to JAVA_MAVEN_CLASSPATH
-
- 29 May 2007; kiorky <kio...@cryptelium.net> doxia-1.0.ebuild:
- renaming EMAVEN_PROJECTS
-
- 29 May 2007; kiorky <kio...@cryptelium.net> doxia-1.0.ebuild:
- Adding maven bootstrap flag
-
- 01 May 2007; kiorky <kio...@cryptelium.net> +doxia-1.0.ebuild,
- +metadata.xml:
- Added as a maven dependency, #177501
-
diff --git a/dev-java/doxia/Manifest b/dev-java/doxia/Manifest
deleted file mode 100644
index 4d71867..0000000
--- a/dev-java/doxia/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST doxia-1.0_alpha8_pre20070617-gen-src.tar.bz2 11586 SHA256
036803b472e46026daba17ab9c6034a12104396a7550ac2c260ae2d2a0518485
-DIST doxia-1.0_alpha8_pre20070617.tar.bz2 447974 SHA256
35d2bcc73794cb069109b0ffa448d5e49a6bc0f20bdb643556641518d5738294
-DIST doxia-1.0_alpha9_pre20070611-gen-src.tar.bz2 1673 SHA256
753e165c1ca583de3f0e4c1437c0b70aa207c5965078b7c5f49d2fdd2cb5f55f
-DIST doxia-1.0_alpha9_pre20070611.tar.bz2 649841 SHA256
4d14d3bdbd6759255a8345071f77f799b749b5ff3f5a63715c629df38a38dda3
-DIST doxia-1.0_beta1_pre20071024-gen-src.tar.bz2 8647 SHA256
395afc487273bd99c9d79f54274ae8ae8c265410f9a92107c2ef1aacfb1436cb
-DIST doxia-1.0_beta1_pre20071024.tar.bz2 794216 SHA256
90a691f8d0eec59c64521e37f4b2c6eb77b5d0dd484b2453c8bd70cd4f27a849
-DIST doxia-sitetools-1.0_beta1_pre20071024-gen-src.tar.bz2 13345 SHA256
ee967214dd2cd1c66b884be1129549c887e94e23814e2649662aa6f926dcb342
-DIST doxia-sitetools-1.0_beta1_pre20071024.tar.bz2 130869 SHA256
68723b2faf0cae69c3cab79f617f4415c1596313adc3dea298321ac5f3ca3cee
diff --git a/dev-java/doxia/doxia-1.0_alpha8_pre20070617.ebuild
b/dev-java/doxia/doxia-1.0_alpha8_pre20070617.ebuild
deleted file mode 100644
index 4700ed8..0000000
--- a/dev-java/doxia/doxia-1.0_alpha8_pre20070617.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_MAVEN_BOOTSTRAP="Y"
-JAVA_MAVEN_ADD_GENERATED_STUFF="y"
-JAVA_MAVEN_GENERATED_STUFF_UNPACK_DIR="${S}"
-inherit java-maven-2
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-LICENSE="Apache-2.0"
-SLOT="1.0_alpha8"
-KEYWORDS="~x86 ~amd64"
-IUSE="source doc"
-COMMON_DEPS="
-=dev-java/jakarta-oro-2.0*
-dev-java/junit
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
-dev-java/plexus-i18n
->=dev-java/plexus-utils-1.4.7_pre20071021
-dev-java/plexus-velocity
-dev-java/velocity
-"
-DEPEND=">=virtual/jdk-1.4 ${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPS}"
-
-JAVA_MAVEN_CLASSPATH="
-jakarta-oro-2.0
-junit
-plexus-component-api-1.0_alpha33
-plexus-container-default-1.0_alpha33
-plexus-i18n
-plexus-utils-1.4.7
-plexus-velocity
-velocity
-"
-# add a patch to add interdeps while compiling:
-# doxia-sink-api for core
-# doxia-core for tkwiki
-# doxia-decoration-model for siterdr
-# doxia-core for siterdr
-JAVA_MAVEN_PROJECTS="
-doxia-sink-api doxia-core
-doxia-decoration-model
-doxia-site-renderer
-doxia-modules/doxia-module-confluence
-doxia-modules/doxia-module-docbook-simple
-doxia-modules/doxia-module-twiki
-"
-
diff --git a/dev-java/doxia/doxia-1.0_alpha9_pre20070611.ebuild
b/dev-java/doxia/doxia-1.0_alpha9_pre20070611.ebuild
deleted file mode 100644
index d85abe0..0000000
--- a/dev-java/doxia/doxia-1.0_alpha9_pre20070611.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_MAVEN_BOOTSTRAP="Y"
-inherit java-maven-2
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-MY_BASE_URL="http://dev.gentooexperimental.org/~kiorky";
-SRC_URI="${MY_BASE_URL}/${P}.tar.bz2
-${MY_BASE_URL}/${P}-gen-src.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="source doc"
-COMMON_DEPS="
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
->=dev-java/plexus-utils-1.4.7_pre20071021
-=dev-java/jakarta-oro-2.0*
-dev-java/junit
-dev-java/plexus-i18n
-dev-java/velocity
-=dev-java/itext-1.4
-dev-java/plexus-velocity"
-DEPEND=">=virtual/jdk-1.4 ${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPS}"
-
-JAVA_MAVEN_CLASSPATH="
-plexus-container-default-1.0_alpha33
-plexus-utils-1.4.7
-jakarta-oro-2.0
-junit
-itext-1.4
-plexus-i18n
-plexus-velocity
-velocity
-"
-# PLEASE KEEP THE ORDER !
-JAVA_MAVEN_PROJECTS="
-doxia-sink-api
-doxia-core
-doxia-modules/doxia-module-confluence
-doxia-modules/doxia-module-docbook-simple
-doxia-modules/doxia-module-twiki
-doxia-modules/doxia-module-xdoc
-doxia-modules/doxia-module-apt
-doxia-modules/doxia-module-itext
-doxia-modules/doxia-module-fml
-doxia-modules/doxia-module-latex
-doxia-modules/doxia-module-rtf
-doxia-modules/doxia-module-xhtml
-doxia-modules
-"
-
-src_unpack(){
- java-maven-2_src_unpack
- # add java/plexus sources generated by a maven plugin
- cd "${S}" || die
- unpack "${P}-gen-src.tar.bz2"
-}
diff --git a/dev-java/doxia/doxia-1.0_beta1_pre20071024.ebuild
b/dev-java/doxia/doxia-1.0_beta1_pre20071024.ebuild
deleted file mode 100644
index 0387217..0000000
--- a/dev-java/doxia/doxia-1.0_beta1_pre20071024.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_MAVEN_BOOTSTRAP="Y"
-JAVA_MAVEN_ADD_GENERATED_STUFF="y"
-JAVA_MAVEN_GENERATED_STUFF_UNPACK_DIR="${S}"
-inherit java-maven-2
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-MY_BASE_URL="http://dev.gentooexperimental.org/~kiorky";
-# we need to backport older site-renderer that does not exists in current
-# releases of doxia!
-SRC_URI="
-${SRC_URI}
-${MY_BASE_URL}/doxia-sitetools-${PV}.tar.bz2
-${MY_BASE_URL}/doxia-sitetools-${PV}-gen-src.tar.bz2
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="source doc"
-COMMON_DEPS="
-dev-java/commons-cli
-dev-java/fop
-=dev-java/itext-1.4
-=dev-java/jakarta-oro-2.0*
-dev-java/junit
-dev-java/plexus-cli
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
-dev-java/plexus-i18n
->=dev-java/plexus-utils-1.4.7_pre20071021
-dev-java/plexus-velocity
-dev-java/maven-plugin-api
-dev-java/velocity
-dev-java/xalan
-dev-java/commons-configuration
->=dev-java/commons-lang-2.1
-"
-DEPEND=">=virtual/jdk-1.4 ${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPS}"
-
-JAVA_MAVEN_CLASSPATH="
-xalan
-commons-configuration
-commons-cli-1
-commons-lang-2.1
-fop
-itext-1.4
-jakarta-oro-2.0
-junit
-plexus-cli
-plexus-component-api-1.0_alpha33
-plexus-container-default-1.0_alpha33
-maven-plugin-api
-plexus-i18n
-plexus-utils-1.4.7
-plexus-velocity
-velocity
-"
-# PLEASE KEEP THE ORDER !
-JAVA_MAVEN_PROJECTS="
-${PF}/doxia-sink-api
-${PF}/doxia-core
-${PF}/doxia-modules/doxia-module-confluence
-${PF}/doxia-modules/doxia-module-docbook-simple
-${PF}/doxia-modules/doxia-module-twiki
-${PF}/doxia-modules/doxia-module-xdoc
-${PF}/doxia-modules/doxia-module-apt
-${PF}/doxia-modules/doxia-module-itext
-${PF}/doxia-modules/doxia-module-fml
-${PF}/doxia-modules/doxia-module-latex
-${PF}/doxia-modules/doxia-module-rtf
-${PF}/doxia-modules/doxia-module-xhtml
-${PF}/doxia-modules
-${PF}/doxia-book
-${PF}/doxia-maven-plugin
-${PF}/
-doxia-sitetools-${PV}/
-doxia-sitetools-${PV}/doxia-decoration-model
-${PF}/doxia-modules/doxia-module-fo
-doxia-sitetools-${PV}/doxia-site-renderer
-"
-
-S="${WORKDIR}"
-JAVA_MAVEN_PATCHES="${FILESDIR}/doxia-sitetools_DefaultSiteRenderer.java.diff"
-src_unpack(){
- unpack "doxia-sitetools-${PV}.tar.bz2"
- cd "doxia-sitetools-${PV}" || die
- unpack "doxia-sitetools-${PV}-gen-src.tar.bz2"
- cd .. || die
- java-maven-2_src_unpack
- cp -rf \
- "doxia-sitetools-${PV}/doxia-doc-renderer/src/main" \
- "doxia-sitetools-${PV}/doxia-doc-renderer/src/test" \
- "${PF}/doxia-modules/doxia-module-fo/src" || die
-}
-
-# NOTE:
-# i add doxia-sitetools inside the doxia main ebuild because there is
-# interdependance between core doxia and doxia-sitetools
-# Please bear in mind to make a bundle of the twices when bumping ;)
-# for them to find and rewrite/use it. ;))
-# the scheme is :
-# TAR/doxia-PV/[[THE CO OF DOXIA]]
-# TAR/doxia-sitetools-PV/[[THE CO OF DOXIASITETOOLS]
diff --git a/dev-java/doxia/files/assemble-plexus-resources.sh
b/dev-java/doxia/files/assemble-plexus-resources.sh
deleted file mode 100755
index 62aedb1..0000000
--- a/dev-java/doxia/files/assemble-plexus-resources.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-# use to facilitate resources tarballing after generating them
-# enjoy :p
-
-assemble() {
- local dest=titi
- mkdir dest
- for i in $(find . -name generated-resources|sed -re
"s:(/target)|(\./)::g");
- do
- local maven_dest="$dest/$(dirname $i)/src/main"
- echo assemble "$i"
- mkdir -p "$maven_dest"
- cp -rf \
- "$(echo $i|sed -re
"s:generated-resources:target/generated-resources:g")/plexus" \
- "$maven_dest/resources"
- done
- for i in $(find . -name generated-sources|sed -re
"s:(/target)|(\./)::g");
- do
- local maven_dest="$dest/$(dirname $i)/src/main"
- echo assemble "$i"
- mkdir -p "$maven_dest"
- cp -rf \
- "$(echo $i|sed -re
"s:generated-sources:target/generated-sources:g")/modello" \
- "$maven_dest/java"
- done
-}
-
-assemble
-
diff --git a/dev-java/doxia/files/doxia-sitetools_DefaultSiteRenderer.java.diff
b/dev-java/doxia/files/doxia-sitetools_DefaultSiteRenderer.java.diff
deleted file mode 100644
index 80ad580..0000000
--- a/dev-java/doxia/files/doxia-sitetools_DefaultSiteRenderer.java.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Index:
doxia-sitetools-1.0_beta1_pre20071024/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
-===================================================================
----
doxia-sitetools-1.0_beta1_pre20071024/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
(révision 590331)
-+++
doxia-sitetools-1.0_beta1_pre20071024/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
(copie de travail)
-@@ -182,7 +182,9 @@
- {
- String doc = (String) k.next();
-
-- RenderingContext context = new RenderingContext(
moduleBasedir, doc, module.getParserId(), module.getExtension() );
-+ // gentoo java hack
-+ // RenderingContext context = new RenderingContext(
moduleBasedir, doc, module.getParserId(), module.getExtension() );
-+ RenderingContext context = new RenderingContext(
moduleBasedir, doc, module.getParserId());
-
- // TODO: DOXIA-111: we need a general filter here that knows
how to alter the context
- if ( doc.endsWith( ".vm" ) )
diff --git a/dev-java/doxia/metadata.xml b/dev-java/doxia/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/doxia/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>
