From 71700d3292df66e329c1b5cc6db652b6ddcaf5c7 Mon Sep 17 00:00:00 2001 From: "Marty E. Plummer" Date: Sun, 8 Apr 2018 16:31:03 -0500 Subject: [PATCH] www-servers/resin: drop old Package-Manager: Portage-2.3.28, Repoman-2.3.9 Closes: https://github.com/gentoo/gentoo/pull/7902 --- www-servers/resin/Manifest | 1 - .../resin/files/4.0.48/build.xml.patch | 59 ------ www-servers/resin/files/4.0.48/resin.conf | 16 -- www-servers/resin/files/4.0.48/resin.init | 36 ---- ...xml.patch => resin-4.0.48-build.xml.patch} | 4 +- .../{4.0.46/resin.conf => resin-4.0.48.conf} | 0 .../{4.0.46/resin.init => resin-4.0.48.init} | 2 +- www-servers/resin/resin-4.0.46.ebuild | 183 ------------------ www-servers/resin/resin-4.0.48-r1.ebuild | 6 +- www-servers/resin/resin-4.0.48.ebuild | 180 ----------------- 10 files changed, 6 insertions(+), 481 deletions(-) delete mode 100644 www-servers/resin/files/4.0.48/build.xml.patch delete mode 100644 www-servers/resin/files/4.0.48/resin.conf delete mode 100644 www-servers/resin/files/4.0.48/resin.init rename www-servers/resin/files/{4.0.46/build.xml.patch => resin-4.0.48-build.xml.patch} (95%) rename www-servers/resin/files/{4.0.46/resin.conf => resin-4.0.48.conf} (100%) rename www-servers/resin/files/{4.0.46/resin.init => resin-4.0.48.init} (94%) delete mode 100644 www-servers/resin/resin-4.0.46.ebuild delete mode 100644 www-servers/resin/resin-4.0.48.ebuild diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest index cc3fd798799b..a6bcbc7275e5 100644 --- a/www-servers/resin/Manifest +++ b/www-servers/resin/Manifest @@ -1,2 +1 @@ -DIST resin-4.0.46-src.zip 40400255 BLAKE2B e31505ba82a8e87ea0b28634b3055c3a01d6629483c2d5ab6af4b428c9cb5d7803b7ed7de58181222bae669412c239458c43be35f23922f3414ce7ac0173ee56 SHA512 49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f DIST resin-4.0.48-src.zip 40883010 BLAKE2B 33588d8ccb5692efd70ede4e25949aa71b61640c090379b36ec5160c16d90da465853c56015304435f15298a358c8a3ee9ad54b423ae0547c1a7f43ac4e4bb40 SHA512 a992ebbff8af9f10e825a259e831dc340f9d74c5a117033a7eda2eb59a453d9e7d0e5e6feaf7bb36526ac65c8a7e1f55f737bb68af3e7e9647381ada995542ee diff --git a/www-servers/resin/files/4.0.48/build.xml.patch b/www-servers/resin/files/4.0.48/build.xml.patch deleted file mode 100644 index dc3a413fc0bf..000000000000 --- a/www-servers/resin/files/4.0.48/build.xml.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- build.xml.orig 2015-08-12 23:14:20.302000000 +0000 -+++ build.xml 2015-08-12 23:14:47.909000000 +0000 -@@ -12,7 +12,7 @@ - - - -+ depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, gae"> - - - -- -- -- - - - -@@ -92,13 +88,6 @@ - - - -- -- -- -- -- -- -- - - - -@@ -437,13 +426,6 @@ - - - -- -- -- -- -- -- -- - - - - -- -+ - - - diff --git a/www-servers/resin/files/4.0.46/resin.conf b/www-servers/resin/files/resin-4.0.48.conf similarity index 100% rename from www-servers/resin/files/4.0.46/resin.conf rename to www-servers/resin/files/resin-4.0.48.conf diff --git a/www-servers/resin/files/4.0.46/resin.init b/www-servers/resin/files/resin-4.0.48.init similarity index 94% rename from www-servers/resin/files/4.0.46/resin.init rename to www-servers/resin/files/resin-4.0.48.init index 2ce1af068f93..a0e5cfb49b67 100644 --- a/www-servers/resin/files/4.0.46/resin.init +++ b/www-servers/resin/files/resin-4.0.48.init @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 depend() { diff --git a/www-servers/resin/resin-4.0.46.ebuild b/www-servers/resin/resin-4.0.46.ebuild deleted file mode 100644 index 1143cbb5c629..000000000000 --- a/www-servers/resin/resin-4.0.46.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-ant-2 eutils 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=">=virtual/jre-1.6 - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.6 - app-arch/unzip - dev-libs/openssl - dev-java/ant-core:0 - ${CDEPEND}" - -RESIN_HOME="/usr/$(get_libdir)/resin" - -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}"/"${PV}"/build.xml.patch -) - -pkg_setup() { - java-pkg-2_pkg_setup - enewgroup resin - enewuser resin -1 /bin/bash ${RESIN_HOME} resin -} - -src_prepare() { - epatch "${PATCHES[@]}" - - # No bundled JARs! - rm -f "${S}/modules/ext/"*.jar || die - rm -rf "${S}/project-jars" || die - - java-ant_bsfix_one "${S}/build.xml" - java-ant_bsfix_one "${S}/build-common.xml" - - rm -rf 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} || die "econf failed" -} - -src_compile() { - einfo "Building libraries..." - emake || die "make failed" - - einfo "Building jars..." - eant || die "ant failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "Install failed" - - einfo "Moving configuration to /etc ..." - dodir /etc/ - mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed" - 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 -rf "${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}/${PV}/resin.init" resin - newconfd "${FILESDIR}/${PV}/resin.conf" resin - - sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" || die - - einfo "Fixing location of jars ..." - rm -f "${S}/lib/tools.jar" || die - java-pkg_dojar "${S}"/lib/*.jar - rm -fr "${D}/${RESIN_HOME}/lib" || die - dosym /usr/share/resin/lib ${RESIN_HOME}/lib - - einfo "Symlinking directories from /var/lib/resin ..." - rm -rf "${D}/${RESIN_HOME}/resin-data" || die - rm -rf "${D}/${RESIN_HOME}/watchdog-data" || die - 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 "mv of webapps failed" - rm -rf "${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 -fr "${D}/${RESIN_HOME}/bin" || die - rm -fr "${D}/${RESIN_HOME}/doc" || die - rm -fr "${D}/${RESIN_HOME}/keys" || die - rm -fr "${D}/${RESIN_HOME}/licenses" || die - rm -fr "${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 -} diff --git a/www-servers/resin/resin-4.0.48-r1.ebuild b/www-servers/resin/resin-4.0.48-r1.ebuild index ea6a53c71fd4..ad098405d02f 100644 --- a/www-servers/resin/resin-4.0.48-r1.ebuild +++ b/www-servers/resin/resin-4.0.48-r1.ebuild @@ -50,7 +50,7 @@ EANT_GENTOO_CLASSPATH=" " PATCHES=( - "${FILESDIR}"/"${PV}"/build.xml.patch + "${FILESDIR}"/${PN}-4.0.48-build.xml.patch ) pkg_setup() { @@ -112,8 +112,8 @@ src_install() { dodoc README "${S}"/conf/*.xml einfo "Installing init.d script ..." - newinitd "${FILESDIR}/${PV}/resin.init" resin - newconfd "${FILESDIR}/${PV}/resin.conf" resin + 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 diff --git a/www-servers/resin/resin-4.0.48.ebuild b/www-servers/resin/resin-4.0.48.ebuild deleted file mode 100644 index 228b75bbb0b1..000000000000 --- a/www-servers/resin/resin-4.0.48.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-ant-2 eutils 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" - -RESIN_HOME="/usr/$(get_libdir)/resin" - -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}"/"${PV}"/build.xml.patch -) - -pkg_setup() { - 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} || die "econf failed" -} - -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}/${PV}/resin.init" resin - newconfd "${FILESDIR}/${PV}/resin.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 -} -- 2.26.2