commit: 35a7abe239da3203093fc4905b5194f69d158702 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Mon Jun 14 10:17:15 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Mon Jun 14 10:17:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35a7abe2
dev-java/freemarker: Remove last-rited pkg Closes: https://bugs.gentoo.org/790551 Closes: https://bugs.gentoo.org/688094 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> gentoo.org> dev-java/freemarker/Manifest | 1 - dev-java/freemarker/files/build.xml.patch | 60 ------------------------ dev-java/freemarker/freemarker-2.3.25.ebuild | 69 ---------------------------- dev-java/freemarker/metadata.xml | 12 ----- profiles/package.mask | 6 --- 5 files changed, 148 deletions(-) diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest deleted file mode 100644 index 0b12f6c1225..00000000000 --- a/dev-java/freemarker/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST freemarker-2.3.25.tar.gz 1873971 BLAKE2B 52c64938c67ac0303b07f4aa74c3fc7ccc0be68bd37a7c6c663ac0849acc9f2236d1028abb377efa6fdb518840b1961e71c1a02a37388864f9be14b3b443f28a SHA512 32a41a73a2f71a4e0ae8829da2c09e07204aa2b4a6899e2c7a3db0bde5d3e129ec7b44b7299a20165d7eb88f4f7d1bd9f0b7a1fd116dc11493134bec2306d1ac diff --git a/dev-java/freemarker/files/build.xml.patch b/dev-java/freemarker/files/build.xml.patch deleted file mode 100644 index 33701f89175..00000000000 --- a/dev-java/freemarker/files/build.xml.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -Naur a/build.xml b/build.xml ---- a/build.xml 2016-06-14 19:48:01.000000000 +0100 -+++ b/build.xml 2016-12-22 22:41:41.988262564 +0000 -@@ -27,6 +27,10 @@ - xmlns:u="http://freemarker.org/util"; - > - -+ <path id="gentoo.classpath"> -+ <pathelement path="${gentoo.classpath}/"/> -+ </path> -+ - <!-- ================================================================== --> - <!-- Properties --> - <!-- ================================================================== --> -@@ -143,13 +147,11 @@ - /> - - <mkdir dir="${_javaccOutputDir}" /> -- <ivy:retrieve conf="parser" pattern="build/javacc-home.tmp/[artifact].[ext]" /> - <javacc:generate - target="src/main/javacc/FTL.jj" - outputdirectory="${_javaccOutputDir}" - javacchome="build/javacc-home.tmp" - /> -- <delete dir="build/javacc-home.tmp" /> - - <replace - file="${_javaccOutputDir}/FMParser.java" -@@ -271,6 +273,7 @@ - verify="yes" stubversion="1.2" - /> - -+<!-- - <ivy:cachepath conf="build.jsp2.0" pathid="ivy.dep.jsp2.0" /> - <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" - debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8" -@@ -286,6 +289,7 @@ - freemarker/ext/jsp/FreeMarkerJspFactory21.java, - freemarker/ext/jsp/FreeMarkerJspApplicationContext.java" - /> -+!--> - - <!-- There's no build.jsp2.0, as those classes are part of the common build subset. --> - -@@ -301,6 +305,7 @@ - freemarker/ext/jsp/FreeMarkerJspApplicationContext.java" - /> - -+<!-- - <ivy:cachepath conf="build.jython2.0" pathid="ivy.dep.jython2.0" /> - <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" - debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8" -@@ -325,6 +330,7 @@ - includes=" - freemarker/ext/jython/_Jython22VersionAdapter.java" - /> -+!--> - - <ivy:cachepath conf="build.jython2.5" pathid="ivy.dep.jython2.5" /> - <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" diff --git a/dev-java/freemarker/freemarker-2.3.25.ebuild b/dev-java/freemarker/freemarker-2.3.25.ebuild deleted file mode 100644 index a2a490feb6c..00000000000 --- a/dev-java/freemarker/freemarker-2.3.25.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="incubator-${PN}" -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="A Java tool to generate text output based on templates" -HOMEPAGE="http://freemarker.org/"; -SRC_URI="https://github.com/apache/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0" -SLOT="2.3" -KEYWORDS="amd64 x86" - -CP_DEPEND="dev-java/avalon-logkit:2.0 - dev-java/commons-logging:0 - dev-java/dom4j:1 - dev-java/jaxen:1.1 - dev-java/jython:2.7 - dev-java/log4j:0 - dev-java/rhino:1.6 - dev-java/slf4j-api:0 - dev-java/xalan:0 - java-virtuals/servlet-api:2.5" - -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.7" - -DEPEND="${CP_DEPEND} - >=virtual/jdk-1.7 - dev-java/javacc:0" - -S="${WORKDIR}/${MY_PN}-${PV}" - -PATCHES=( - "${FILESDIR}"/build.xml.patch -) - -EANT_BUILD_TARGET="compile" -EANT_EXTRA_ARGS="-Ddeps.available=true" -JAVA_ANT_REWRITE_CLASSPATH="true" - -src_prepare() { - default - - rm -rv \ - src/main/java/freemarker/ext/jdom \ - src/main/java/freemarker/ext/xml/_JdomNavigator.java \ - src/main/java/freemarker/ext/beans/JRebelClassChangeNotifier.java || die - - sed -i \ - -e '/<ivy:cachepath/d' \ - -e 's/"ivy\.dep[^"]*"/"gentoo.classpath"/g' \ - -e "s:javacchome=\"[^\"]*\":javacchome=\"${EPREFIX%/}/usr/share/javacc/lib\":g" \ - build.xml || die - - java-pkg-2_src_prepare -} - -src_install() { - jar cf ${PN}.jar -C build/classes . || die - java-pkg_dojar ${PN}.jar - - dodoc README - use doc && java-pkg_dojavadoc build/api -} diff --git a/dev-java/freemarker/metadata.xml b/dev-java/freemarker/metadata.xml deleted file mode 100644 index e471a93e212..00000000000 --- a/dev-java/freemarker/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Java</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">freemarker</remote-id> - <remote-id type="github">apache/incubator-freemarker</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index dff970df12f..8f4fee36122 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -315,12 +315,6 @@ dev-java/squareness-jlf # see bug: https://bugs.gentoo.org/784065 dev-java/werken-xpath -# Miroslav Šulc <[email protected]> (2021-05-16) -# no consumer, does not compile, not with jdk-11 -# and not even with openjdk:8 -# see bug: https://bugs.gentoo.org/790551 -dev-java/freemarker - # Sergei Trofimovich <[email protected]> (2021-05-16) # Mask gcc-7 branch (ended upstream support). Please switch # to a freshed gcc branch.
