gentoo resync : 10.04.2018

10 files changed, 10 insertions, 490 deletions

diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index b056a082f001..9878178f457c 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1,12 +1,6 @@
-AUX 4.0.46/build.xml.patch 2259 BLAKE2B b58e4426252f28226c47d8c28747c34801e9e1cae42951a1f39756d6b360f5892a6cdea74a59dd67887dd7debc537b75c896cbb0ad98ba0e9fc5a8a242b052ff SHA512 a1792fa2afd100238967c3d93fbe14a276a647ea5902d7fbabe70fe2d2416233486bdb604a879bd0fe8564289c5d20fb4dba3b9a8dd3eadb51c5ae0ef635de93
-AUX 4.0.46/resin.conf 542 BLAKE2B 96cc8e582b5e5af4b72d29652fa690928bedf51f8ee74d7acfd16244690eb9f346cb616e20e8711f9b85b77ee1145e74d0dca04d026e04808ded22345c7b6b67 SHA512 61b34c022712f31d3cadcf8e78095900085c8cde5ba5b8cc46d603019f461ae3271fc41a9f6b63d89aeb675de9fb72b27123fc6c6774eaee5349d37cc2c9693f
-AUX 4.0.46/resin.init 791 BLAKE2B 7ae3564f66733645ffad06c779707cac2f961417cc80a305f0c07472fb9022b935098796225406933ecf135bae0a7ecab7daf338b8c9bc51869a727decec9954 SHA512 2072f837bad7c1cf8aa54f5ca8929151837caa60c71804c71050a94902d954c7d04899e0ab91a960e608066fc237fd0c3adbc04ec57ab7851f0b48cd1faeb957
-AUX 4.0.48/build.xml.patch 2259 BLAKE2B b58e4426252f28226c47d8c28747c34801e9e1cae42951a1f39756d6b360f5892a6cdea74a59dd67887dd7debc537b75c896cbb0ad98ba0e9fc5a8a242b052ff SHA512 a1792fa2afd100238967c3d93fbe14a276a647ea5902d7fbabe70fe2d2416233486bdb604a879bd0fe8564289c5d20fb4dba3b9a8dd3eadb51c5ae0ef635de93
-AUX 4.0.48/resin.conf 542 BLAKE2B 96cc8e582b5e5af4b72d29652fa690928bedf51f8ee74d7acfd16244690eb9f346cb616e20e8711f9b85b77ee1145e74d0dca04d026e04808ded22345c7b6b67 SHA512 61b34c022712f31d3cadcf8e78095900085c8cde5ba5b8cc46d603019f461ae3271fc41a9f6b63d89aeb675de9fb72b27123fc6c6774eaee5349d37cc2c9693f
-AUX 4.0.48/resin.init 791 BLAKE2B 7ae3564f66733645ffad06c779707cac2f961417cc80a305f0c07472fb9022b935098796225406933ecf135bae0a7ecab7daf338b8c9bc51869a727decec9954 SHA512 2072f837bad7c1cf8aa54f5ca8929151837caa60c71804c71050a94902d954c7d04899e0ab91a960e608066fc237fd0c3adbc04ec57ab7851f0b48cd1faeb957
-DIST resin-4.0.46-src.zip 40400255 BLAKE2B e31505ba82a8e87ea0b28634b3055c3a01d6629483c2d5ab6af4b428c9cb5d7803b7ed7de58181222bae669412c239458c43be35f23922f3414ce7ac0173ee56 SHA512 49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f
+AUX resin-4.0.48-build.xml.patch 2186 BLAKE2B 1864f7896312c7b2952f5aac8d73924b90d4a75e9f5021804b7ba9eed37a4a45541b611897d4eddb92f3f3834044a0206324e518b8e72cc196362c94a444e435 SHA512 9bc4e5f695473945fd9a18fd28eb18e8f306fd6054bc910b5dfd86382046e2b850c7e4b0f533f012f1c0b84ef58ab61051e6a33c0c94a7f44f1d9416ee14e49c
+AUX resin-4.0.48.conf 542 BLAKE2B 96cc8e582b5e5af4b72d29652fa690928bedf51f8ee74d7acfd16244690eb9f346cb616e20e8711f9b85b77ee1145e74d0dca04d026e04808ded22345c7b6b67 SHA512 61b34c022712f31d3cadcf8e78095900085c8cde5ba5b8cc46d603019f461ae3271fc41a9f6b63d89aeb675de9fb72b27123fc6c6774eaee5349d37cc2c9693f
+AUX resin-4.0.48.init 791 BLAKE2B dd8f14fdbdb5e7be3b8511d33db86781c4595a2f925be613d31036588c2444acfe149a1e215a9d26978fa612ef223c325d6f1bdefc19722c429bdbccdb663b11 SHA512 9fa5db204bf4a3a6e040493dda96adcf86e9fff271b6a98951b03c15f00a18a62c9469d48e155bf7847229e005f8c570fd10737bb120271122a2d746ea22e13a
 DIST resin-4.0.48-src.zip 40883010 BLAKE2B 33588d8ccb5692efd70ede4e25949aa71b61640c090379b36ec5160c16d90da465853c56015304435f15298a358c8a3ee9ad54b423ae0547c1a7f43ac4e4bb40 SHA512 a992ebbff8af9f10e825a259e831dc340f9d74c5a117033a7eda2eb59a453d9e7d0e5e6feaf7bb36526ac65c8a7e1f55f737bb68af3e7e9647381ada995542ee
-EBUILD resin-4.0.46.ebuild 4627 BLAKE2B 0b6ba785c2e58279db8cb1672f5916473fa7dba7a5e492dc449cc4be455673099ebcf516ba8cb12ed0d01d085ee9613e7b8be169b320f61fcbe14346b41efa6e SHA512 c8df57773159194651a50bc2df0684dfb9246828e046b3e492f2707e8ec6005ee1ae1601a621f4cb0327fec31d9cd9261d79b0958385bf32feda82b2371518d1
-EBUILD resin-4.0.48-r1.ebuild 4273 BLAKE2B 40abee08bb0c13354e648794b043cc621590de3a886440330dc0b128cd062de3ef3621b754cf63ea74ef42552ab3d649cd3063957157fe4002ab5d4d6225a2fa SHA512 e6977c524525d8e5299aa30ae7df0a2df7224ffbe4baab3d684ed6535fbc643912cc48726964fddfc43be98a7e87ec37603bc51c05f39975fca31cfc2e6fa501
-EBUILD resin-4.0.48.ebuild 4266 BLAKE2B 5b3b899d74b06a7da155aa9a466dad760480937ba725e5a4a2510334cd96359c382acc7476ad80acef084557ebc47d7ba031276b0d6ee7f355efaf779edc87e9 SHA512 ec04ac87fe24ffdb86ad2767a2410620cb575b9bd2d1c06e067ad083404e0f25c65718a03a3d75af1f83c23801c2a0d223effb654c2279fc45b7f2a410862c50
+EBUILD resin-4.0.48-r1.ebuild 4280 BLAKE2B 879a8d21673e8596a7e0fa5f63727c54307ea5c96d0ff919063dadac4ef0aeaad8bf726f0706e6d8edbc84761c32dc8f7b7078a5b8d94a8b4ab458af83921da9 SHA512 f7c4a58195ee768ba6a48552e1c4fd77e5f0d686a7b464fd0b4fa86b5c52b4e978473692fde45f8c76856d25c10580fb25db3c6d4e32ac65d83810d5fa137d8a
 MISC metadata.xml 305 BLAKE2B cd9ab46596ac556fb225d0d9d087c89a8f46a185aa3ed9524d6258d04b8690373efc1a587b28da5bb0485edbaa18e5f7db1b6dcc84656df09a01b7401027c48c SHA512 2f36d477675c49a8b3475b49891dd9eb45c02cbc5d83a3f60c3ba3b35252a3bdc34214dbdf2c3fb8da37138fec49281f95c3c70055fdf47a8cace006a46137e9
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 @@
-   <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/4.0.48/resin.conf b/www-servers/resin/files/4.0.48/resin.conf
deleted file mode 100644
index a48840b5e9f2..000000000000
--- a/www-servers/resin/files/4.0.48/resin.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/4.0.48/resin.init b/www-servers/resin/files/4.0.48/resin.init
deleted file mode 100644
index 2ce1af068f93..000000000000
--- a/www-servers/resin/files/4.0.48/resin.init
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 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/files/4.0.46/build.xml.patch b/www-servers/resin/files/resin-4.0.48-build.xml.patch
index dc3a413fc0bf..5ef1abc63c56 100644
--- a/www-servers/resin/files/4.0.46/build.xml.patch
+++ b/www-servers/resin/files/resin-4.0.48-build.xml.patch
@@ -1,5 +1,5 @@
---- build.xml.orig	2015-08-12 23:14:20.302000000 +0000
-+++ build.xml	2015-08-12 23:14:47.909000000 +0000
+--- a/build.xml
++++ b/build.xml
 @@ -12,7 +12,7 @@
    <property name="eclipse.home" value="${user.home}/eclipse"/>
  
diff --git a/www-servers/resin/files/4.0.46/resin.conf b/www-servers/resin/files/resin-4.0.48.conf
index a48840b5e9f2..a48840b5e9f2 100644
--- a/www-servers/resin/files/4.0.46/resin.conf
+++ b/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
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
-}