* [gentoo-commits] repo/gentoo:master commit in: www-servers/resin/, www-servers/resin/files/, profiles/
@ 2021-08-24 12:39 David Seifert
0 siblings, 0 replies; only message in thread
From: David Seifert @ 2021-08-24 12:39 UTC (permalink / raw
To: gentoo-commits
commit: 7a1e8a90fa8a09a84741dc8ef5f774d92ae8433c
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Tue Aug 24 12:38:22 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Aug 24 12:38:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a1e8a90
www-servers/resin: Remove last-rited package
Bug: https://bugs.gentoo.org/781545
Closes: https://bugs.gentoo.org/674258
Closes: https://bugs.gentoo.org/771579
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
profiles/package.mask | 6 -
www-servers/resin/Manifest | 1 -
.../resin/files/resin-4.0.48-build.xml.patch | 59 -------
www-servers/resin/files/resin-4.0.48.conf | 16 --
www-servers/resin/files/resin-4.0.48.init | 36 -----
www-servers/resin/metadata.xml | 11 --
www-servers/resin/resin-4.0.48-r1.ebuild | 179 ---------------------
7 files changed, 308 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index e75bf562bc4..677f076878c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -350,12 +350,6 @@ dev-java/jsr101
# Removal on 2021-08-06. Bug #803212.
sys-kernel/bliss-kernel-bin
-# Conrad Kostecki <conikost@gentoo.org> (2021-07-23)
-# Outdated and multiple bugs open.
-# Other alternatives in tree available.
-# Removal in 30 days (2021-08-22)
-www-servers/resin
-
# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2021-07-12)
# Version 3.3.0 suffers from ridiculously high CPU usage, this version has
# therefore been retracted upstream.
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
deleted file mode 100644
index a6bcbc7275e..00000000000
--- a/www-servers/resin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST resin-4.0.48-src.zip 40883010 BLAKE2B 33588d8ccb5692efd70ede4e25949aa71b61640c090379b36ec5160c16d90da465853c56015304435f15298a358c8a3ee9ad54b423ae0547c1a7f43ac4e4bb40 SHA512 a992ebbff8af9f10e825a259e831dc340f9d74c5a117033a7eda2eb59a453d9e7d0e5e6feaf7bb36526ac65c8a7e1f55f737bb68af3e7e9647381ada995542ee
diff --git a/www-servers/resin/files/resin-4.0.48-build.xml.patch b/www-servers/resin/files/resin-4.0.48-build.xml.patch
deleted file mode 100644
index 5ef1abc63c5..00000000000
--- a/www-servers/resin/files/resin-4.0.48-build.xml.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -12,7 +12,7 @@
- <property name="eclipse.home" value="${user.home}/eclipse"/>
-
- <target name="compile"
-- depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, resin-eclipselink, gae, jasper">
-+ depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, gae">
- </target>
-
- <!--
-@@ -27,10 +27,6 @@
- </antcall>
- </target>
- -->
-- <target name="resin-eclipselink" depends="eclipselink">
-- <copy file="modules/eclipselink/dist/resin-eclipselink.jar"
-- todir="${resin.lib}"/>
-- </target>
-
- <target name="richfaces" depends="init">
- <antcall target="artifact" inheritRefs="true">
-@@ -92,13 +88,6 @@
- </antcall>
- </target>
-
-- <target name="eclipselink" depends="init">
-- <antcall target="module" inheritRefs="true">
-- <param name="module.name" value="eclipselink"/>
-- <param name="module.jar" value="resin-eclipselink.jar"/>
-- </antcall>
-- </target>
--
- <!-- gae APIs for quercus testing -->
- <target name="gae" depends="init">
- <antcall target="module" inheritRefs="true">
-@@ -437,13 +426,6 @@
- </antcall>
- </target>
-
-- <target name="jasper" depends="init">
-- <antcall target="module" inheritRefs="true">
-- <param name="module.name" value="jasper"/>
-- <param name="module.jar" value="resin-jasper.jar"/>
-- </antcall>
-- </target>
--
- <target name="version">
- <copy file="${resin.modules}/kernel/src/com/caucho/Version.tmpl"
- tofile="${resin.modules}/kernel/src/com/caucho/Version.java"
-@@ -903,7 +885,7 @@
- <delete dir="${dist}/${dist.name}"/>
- </target>
-
-- <target name="dist" depends="dist.clean, configure, compile, update, junit, eclipselink, artifacts, resin.dist.build, dist.package, quercus.war"/>
-+ <target name="dist" depends="dist.clean, configure, compile, update, junit, artifacts, resin.dist.build, dist.package, quercus.war"/>
-
- <target name="configure" depends="init">
- <copy tofile="modules/c/src/resin/Makefile.in"
diff --git a/www-servers/resin/files/resin-4.0.48.conf b/www-servers/resin/files/resin-4.0.48.conf
deleted file mode 100644
index a48840b5e9f..00000000000
--- a/www-servers/resin/files/resin-4.0.48.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# JVM Runtime
-# Using the default setting, it will determine your JVM from the system-vm
-# set using java-config.
-# See java-config(1) manual page for assistance in determining this value.
-
-# You can override this value with whatever JDK you want.
-# For a list of valid values for GENTOO_VM see output of
-# java-config -L
-#GENTOO_VM=sun-jdk-1.5
-
-# Verbose starting and stopping? (yes/no, defaults to no)
-#VERBOSE="yes"
-
-# Select which server will be started, this is an advanced feature, please refer
-# to Resin documentation.
-SERVER_ID=""
diff --git a/www-servers/resin/files/resin-4.0.48.init b/www-servers/resin/files/resin-4.0.48.init
deleted file mode 100644
index a0e5cfb49b6..00000000000
--- a/www-servers/resin/files/resin-4.0.48.init
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net
- use dns logger mysql postgresql
-}
-
-runResin() {
- JAVA_HOME=$(java-config -O)
- [ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O)
- export JAVA_HOME
-
- local extraArgs=
- if [ "${VERBOSE}" = "yes" ]; then
- extraArgs="-verbose"
- fi
-
- local msg="${1}"
- shift
-
- local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar -conf /etc/resin/resin.xml -server \"${SERVER_ID}\" -resin-home __RESIN_HOME__ -root-directory __RESIN_HOME__ ${extraArgs} ${@}"
-
- ebegin "${msg}"
- su - resin -c "${cmdline}"
- eend $?
-}
-
-start() {
- runResin "Starting Resin" "start"
-}
-
-stop() {
- runResin "Stopping Resin" "shutdown"
-}
diff --git a/www-servers/resin/metadata.xml b/www-servers/resin/metadata.xml
deleted file mode 100644
index 42183598824..00000000000
--- a/www-servers/resin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <use>
- <flag name="admin">Enable Resin admin webapp</flag>
- </use>
-</pkgmetadata>
diff --git a/www-servers/resin/resin-4.0.48-r1.ebuild b/www-servers/resin/resin-4.0.48-r1.ebuild
deleted file mode 100644
index a0c767c6628..00000000000
--- a/www-servers/resin/resin-4.0.48-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 epatch flag-o-matic multilib user
-
-DESCRIPTION="A fast Servlet and JSP engine"
-HOMEPAGE="http://www.caucho.com"
-SRC_URI="http://www.caucho.com/download/${P}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="admin doc"
-
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
- dev-java/jsr101:0
- dev-java/mojarra:2.2
- dev-java/oracle-javamail:0
- dev-java/validation-api:1.0
- dev-java/resin-servlet-api:3.1
- dev-java/glassfish-xmlrpc-api:0
- dev-java/glassfish-deployment-api:1.2"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- app-arch/unzip
- dev-libs/openssl
- >=virtual/jdk-1.6
- dev-java/ant-core:0"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="
- jsr101
- mojarra-2.2
- oracle-javamail
- validation-api-1.0
- glassfish-xmlrpc-api
- resin-servlet-api-3.1
- glassfish-deployment-api-1.2
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0.48-build.xml.patch
-)
-
-pkg_setup() {
- export RESIN_HOME="/usr/$(get_libdir)/resin"
- java-pkg-2_pkg_setup
- enewgroup resin
- enewuser resin -1 /bin/bash "${RESIN_HOME}" resin
-}
-
-src_prepare() {
- epatch "${PATCHES[@]}"
-
- # No bundled JARs!
- rm -rv "${S}"/modules/ext/*.jar "${S}"/project-jars || die
-
- java-ant_bsfix_one "${S}/build.xml"
- java-ant_bsfix_one "${S}/build-common.xml"
-
- rm -rv lib/* || die
-
- ln -s $(java-config --jdk-home)/lib/tools.jar || die
-}
-
-src_configure() {
- append-flags -fPIC -DPIC
-
- chmod 755 "${S}/configure" || die
- econf --prefix=${RESIN_HOME}
-}
-
-src_compile() {
- einfo "Building libraries..."
- emake
-
- einfo "Building jars..."
- eant || die "ant failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- einfo "Moving configuration to /etc ..."
- dodir /etc/
- mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die
- dosym /etc/resin ${RESIN_HOME}/conf
-
- einfo "Rewriting resin.xml ..."
- sed -i \
- -e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \
- -e 's,${resin.root}/doc/admin,webapps/admin,' \
- "${D}/etc/resin/resin.xml" || die
-
- einfo "Fixing log directory ..."
- rm -rv "${D}/${RESIN_HOME}"/log || die
- keepdir /var/log/resin
- dosym /var/log/resin ${RESIN_HOME}/log
-
- einfo "Installing basic documentation ..."
- dodoc README "${S}"/conf/*.xml
-
- einfo "Installing init.d script ..."
- newinitd "${FILESDIR}/${PN}-4.0.48.init" resin
- newconfd "${FILESDIR}/${PN}-4.0.48.conf" resin
-
- sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" || die
-
- einfo "Fixing location of jars ..."
- #rm -v "${S}"/lib/tools.jar || die
- java-pkg_dojar "${S}"/lib/*.jar
- rm -rv "${D}/${RESIN_HOME}"/lib || die
- dosym /usr/share/resin/lib ${RESIN_HOME}/lib
-
- dodir /var/lib/resin/webapps
- keepdir /var/lib/resin/hosts
- keepdir /var/lib/resin/resin-data
- keepdir /var/lib/resin/watchdog-data
-
- mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || die
- rm -rv "${D}/${RESIN_HOME}"/webapps || die
- dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
- dosym /var/lib/resin/hosts ${RESIN_HOME}/hosts
- dosym /var/lib/resin/resin-data ${RESIN_HOME}/resin-data
- dosym /var/lib/resin/watchdog-data ${RESIN_HOME}/watchdog-data
-
- dosym \
- "$(java-pkg_getjar resin-servlet-api-3.1 resin-servlet-api.jar)" \
- "${JAVA_PKG_JARDEST}/resin-servlet-api.jar"
-
- use admin && {
- einfo "Installing administration app ..."
- cp -a "${S}/doc/admin" "${D}/var/lib/resin/webapps/" || die
- }
- use doc && {
- einfo "Installing documentation app ..."
- cp -a "${S}/doc/resin-doc" "${D}/var/lib/resin/webapps/" || die
- }
-
- use source && {
- einfo "Installing sources ..."
- java-pkg_dosrc "${S}"/modules/*/src/* > /dev/null
- }
-
- einfo "Removing stale directories ..."
- rm -rv "${D}/${RESIN_HOME}"/{bin,doc} || die
- #rm -rv "${D}"/etc/resin/*.orig || die
-
- einfo "Fixing ownerships and permissions ..."
- fowners -R 0:root /
- fowners -R resin:resin /etc/resin
- fowners -R resin:resin /var/lib/resin
- fowners -R resin:resin /var/log/resin
-
- fperms 644 /etc/conf.d/resin
- fperms 755 /etc/init.d/resin
- fperms 750 /var/lib/resin
- fperms 750 /etc/resin
-}
-
-pkg_postinst() {
- elog
- elog " User and group 'resin' have been added."
- elog
- elog " By default, Resin runs on port 8080. You can change this"
- elog " value by editing /etc/resin/resin.properties."
- elog
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-08-24 12:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-24 12:39 [gentoo-commits] repo/gentoo:master commit in: www-servers/resin/, www-servers/resin/files/, profiles/ David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox