[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/

[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/

[Patrice Clement]

commit:     66a9358ab877e8560b801fc1fb2297d3af0178d3
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 12:06:07 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 12:06:30 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66a9358a

www-servers/resin: Drop vunerable version. Fixes security bug 431416.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 www-servers/resin/resin-4.0.44.ebuild | 193 ----------------------------------
 1 file changed, 193 deletions(-)

diff --git a/www-servers/resin/resin-4.0.44.ebuild b/www-servers/resin/resin-4.0.44.ebuild
deleted file mode 100644
index 4e356a2..0000000
--- a/www-servers/resin/resin-4.0.44.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/resin-servlet-api:3.0
-	dev-java/jsr101:0
-	dev-java/mojarra:1.2
-	dev-java/oracle-javamail:0
-	dev-java/validation-api:1.0
-	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-1.2
-oracle-javamail
-validation-api-1.0
-glassfish-xmlrpc-api
-resin-servlet-api-3.0
-glassfish-deployment-api-1.2"
-
-PATCHES=(
-	"${FILESDIR}"/"${PV}"/VarType.java.patch
-	"${FILESDIR}"/"${PV}"/resin-compile.patch
-	"${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
-
-	java-pkg_jar-from --into lib jsr101
-	java-pkg_jar-from --into lib mojarra-1.2
-	java-pkg_jar-from --into lib oracle-javamail
-	java-pkg_jar-from --into lib validation-api-1.0
-	java-pkg_jar-from --into lib glassfish-xmlrpc-api
-	java-pkg_jar-from --into lib glassfish-deployment-api-1.2
-	java-pkg_jar-from --into lib resin-servlet-api-3.0 resin-servlet-api.jar
-
-	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.0 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
-}

[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/

[David Seifert]

commit:     643eb46d61b91117d0c38df5059bf81ef16d193f
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 26 13:09:59 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 26 23:26:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=643eb46d

www-servers/resin: [QA] Consistent whitespace in metadata.xml

 www-servers/resin/metadata.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/www-servers/resin/metadata.xml b/www-servers/resin/metadata.xml
index d0b51e930c6..42183598824 100644
--- a/www-servers/resin/metadata.xml
+++ b/www-servers/resin/metadata.xml
@@ -1,11 +1,11 @@
 <?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>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<use>
+		<flag name="admin">Enable Resin admin webapp</flag>
+	</use>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/

[Patrice Clement]

commit:     dab6103d9c5839d72593654a6bef57b564fe500e
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 21:23:00 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 21:23:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dab6103d

www-servers/resin: do not call get_libdir in global scope.

Gentoo-Bug: https://bugs.gentoo.org/593402

Package-Manager: portage-2.2.28

 www-servers/resin/resin-4.0.48-r1.ebuild | 180 +++++++++++++++++++++++++++++++
 1 file changed, 180 insertions(+)

diff --git a/www-servers/resin/resin-4.0.48-r1.ebuild b/www-servers/resin/resin-4.0.48-r1.ebuild
new file mode 100644
index 00000000..54afbab
--- /dev/null
+++ b/www-servers/resin/resin-4.0.48-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+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() {
+	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} || 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
+}

[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/

[James Le Cuirot]

commit:     5676116363fce9e8efa0da74e136afdd18bbc069
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 14:54:59 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 14:54:59 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56761163

www-servers/resin: Fix accidental SLOT mismatch

wltjr sends his apologies.

Package-Manager: portage-2.2.20.1

 www-servers/resin/resin-4.0.44-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-servers/resin/resin-4.0.44-r4.ebuild b/www-servers/resin/resin-4.0.44-r4.ebuild
index 99cb5e8..dd2b257 100644
--- a/www-servers/resin/resin-4.0.44-r4.ebuild
+++ b/www-servers/resin/resin-4.0.44-r4.ebuild
@@ -44,7 +44,7 @@ mojarra-2.2
 oracle-javamail
 validation-api-1.0
 glassfish-xmlrpc-api
-resin-servlet-api-3.0
+resin-servlet-api-3.1
 glassfish-deployment-api-1.2"
 
 PATCHES=(
@@ -145,7 +145,7 @@ src_install() {
 	dosym /var/lib/resin/watchdog-data ${RESIN_HOME}/watchdog-data
 
 	dosym \
-		"$(java-pkg_getjar resin-servlet-api-3.0 resin-servlet-api.jar)" \
+		"$(java-pkg_getjar resin-servlet-api-3.1 resin-servlet-api.jar)" \
 		"${JAVA_PKG_JARDEST}/resin-servlet-api.jar"
 
 	use admin && {

[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/

[Patrice Clement]

commit:     b34cac4b8f8f26b56a28958aadb20db2a40fec54
Author:     William L. Thomson Jr <wlt <AT> o-sinc <DOT> com>
AuthorDate: Sat Sep 26 01:18:23 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 01:18:23 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b34cac4b

www-servers/resin: Changed dev-java/resin-servlet-apislot to 3.1

 www-servers/resin/{resin-4.0.44-r3.ebuild => resin-4.0.44-r4.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/resin/resin-4.0.44-r3.ebuild b/www-servers/resin/resin-4.0.44-r4.ebuild
similarity index 99%
rename from www-servers/resin/resin-4.0.44-r3.ebuild
rename to www-servers/resin/resin-4.0.44-r4.ebuild
index 93b73cc..99cb5e8 100644
--- a/www-servers/resin/resin-4.0.44-r3.ebuild
+++ b/www-servers/resin/resin-4.0.44-r4.ebuild
@@ -18,7 +18,7 @@ IUSE="admin doc"
 
 KEYWORDS="~amd64 ~x86"
 
-CDEPEND="dev-java/resin-servlet-api:3.0
+CDEPEND="dev-java/resin-servlet-api:3.1
 	dev-java/jsr101:0
 	dev-java/mojarra:2.2
 	dev-java/oracle-javamail:0

[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/

[Patrice Clement]

commit:     9a4ab04a41bc759711ecdfb0651af7c460ee3033
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 10 14:04:58 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 14:05:53 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a4ab04a

www-servers/resin: Remove java-pkg_jar-from lines. Fixes bug 560034.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../resin/{resin-4.0.44-r2.ebuild => resin-4.0.44-r3.ebuild}      | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/www-servers/resin/resin-4.0.44-r2.ebuild b/www-servers/resin/resin-4.0.44-r3.ebuild
similarity index 93%
rename from www-servers/resin/resin-4.0.44-r2.ebuild
rename to www-servers/resin/resin-4.0.44-r3.ebuild
index a02ac24..93b73cc 100644
--- a/www-servers/resin/resin-4.0.44-r2.ebuild
+++ b/www-servers/resin/resin-4.0.44-r3.ebuild
@@ -77,14 +77,6 @@ src_prepare() {
 
 	rm -rf lib/* || die
 
-	java-pkg_jar-from --into lib jsr101
-	java-pkg_jar-from --into lib mojarra-1.2
-	java-pkg_jar-from --into lib oracle-javamail
-	java-pkg_jar-from --into lib validation-api-1.0
-	java-pkg_jar-from --into lib glassfish-xmlrpc-api
-	java-pkg_jar-from --into lib glassfish-deployment-api-1.2
-	java-pkg_jar-from --into lib resin-servlet-api-3.0 resin-servlet-api.jar
-
 	ln -s $(java-config --jdk-home)/lib/tools.jar || die
 }
 

[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/

[Patrice Clement]

commit:     071ff6141aa2a1fda4153eada61a179706c733dc
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 15:11:23 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 16:00:47 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071ff614

www-servers/resin: Bump dev-java/mojarra SLOT to 2.2. Fixes security bug 501280.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 www-servers/resin/resin-4.0.44-r2.ebuild | 199 +++++++++++++++++++++++++++++++
 1 file changed, 199 insertions(+)

diff --git a/www-servers/resin/resin-4.0.44-r2.ebuild b/www-servers/resin/resin-4.0.44-r2.ebuild
new file mode 100644
index 0000000..a02ac24
--- /dev/null
+++ b/www-servers/resin/resin-4.0.44-r2.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/resin-servlet-api:3.0
+	dev-java/jsr101:0
+	dev-java/mojarra:2.2
+	dev-java/oracle-javamail:0
+	dev-java/validation-api:1.0
+	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.0
+glassfish-deployment-api-1.2"
+
+PATCHES=(
+	"${FILESDIR}"/"${PV}"/resin-compile.patch
+	"${FILESDIR}"/"${PV}"/build.xml.patch
+)
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup resin
+	enewuser resin -1 /bin/bash ${RESIN_HOME} resin
+}
+
+src_prepare() {
+	local vm_version=$(java-pkg_get-vm-version)
+
+	# #558442.
+	if [[ "${vm_version}" == "1.8" ]]; then
+		PATCHES+=("${FILESDIR}"/"${PV}"/VarType.java.patch)
+	fi
+
+	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
+
+	java-pkg_jar-from --into lib jsr101
+	java-pkg_jar-from --into lib mojarra-1.2
+	java-pkg_jar-from --into lib oracle-javamail
+	java-pkg_jar-from --into lib validation-api-1.0
+	java-pkg_jar-from --into lib glassfish-xmlrpc-api
+	java-pkg_jar-from --into lib glassfish-deployment-api-1.2
+	java-pkg_jar-from --into lib resin-servlet-api-3.0 resin-servlet-api.jar
+
+	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.0 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
+}

[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/

[Patrice Clement]

commit:     7d20c1e914f31c905f1abea76c7caf4d04591c55
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 15:23:03 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 16:00:51 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d20c1e9

www-servers/resin: Drop old.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 www-servers/resin/resin-4.0.44-r1.ebuild | 199 -------------------------------
 1 file changed, 199 deletions(-)

diff --git a/www-servers/resin/resin-4.0.44-r1.ebuild b/www-servers/resin/resin-4.0.44-r1.ebuild
deleted file mode 100644
index 5518667..0000000
--- a/www-servers/resin/resin-4.0.44-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/resin-servlet-api:3.0
-	dev-java/jsr101:0
-	dev-java/mojarra:1.2
-	dev-java/oracle-javamail:0
-	dev-java/validation-api:1.0
-	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-1.2
-oracle-javamail
-validation-api-1.0
-glassfish-xmlrpc-api
-resin-servlet-api-3.0
-glassfish-deployment-api-1.2"
-
-PATCHES=(
-	"${FILESDIR}"/"${PV}"/resin-compile.patch
-	"${FILESDIR}"/"${PV}"/build.xml.patch
-)
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup resin
-	enewuser resin -1 /bin/bash ${RESIN_HOME} resin
-}
-
-src_prepare() {
-	local vm_version=$(java-pkg_get-vm-version)
-
-	# #558442.
-	if [[ "${vm_version}" == "1.8" ]]; then
-		PATCHES+=("${FILESDIR}"/"${PV}"/VarType.java.patch)
-	fi
-
-	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
-
-	java-pkg_jar-from --into lib jsr101
-	java-pkg_jar-from --into lib mojarra-1.2
-	java-pkg_jar-from --into lib oracle-javamail
-	java-pkg_jar-from --into lib validation-api-1.0
-	java-pkg_jar-from --into lib glassfish-xmlrpc-api
-	java-pkg_jar-from --into lib glassfish-deployment-api-1.2
-	java-pkg_jar-from --into lib resin-servlet-api-3.0 resin-servlet-api.jar
-
-	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.0 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
-}

[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/

[James Le Cuirot]

commit:     a619c20057f9c323bd6e1e3cb5758d8646815c9b
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 09:38:27 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 09:39:51 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a619c200

www-servers/resin: Drop stable keywords wrt bug #558442 discussion

There is concern that the patch to make this build with Java 7 will
cause breakage. I see no harm in dropping the stable keywords until
the 1.8 virtuals are stable.

Package-Manager: portage-2.2.20.1

 www-servers/resin/resin-4.0.44-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/resin/resin-4.0.44-r1.ebuild b/www-servers/resin/resin-4.0.44-r1.ebuild
index 67410a2..5518667 100644
--- a/www-servers/resin/resin-4.0.44-r1.ebuild
+++ b/www-servers/resin/resin-4.0.44-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="admin doc"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 CDEPEND="dev-java/resin-servlet-api:3.0
 	dev-java/jsr101:0

[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/

[Patrice Clement]

commit:     444c96a89bb3cf7e1ef99ae11142058052f3d7ff
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 12:04:34 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 12:06:26 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=444c96a8

www-servers/resin: Stable for amd64+x86. Fixes bug 431416.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 www-servers/resin/resin-4.0.44-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/resin/resin-4.0.44-r1.ebuild b/www-servers/resin/resin-4.0.44-r1.ebuild
index 5518667..67410a2 100644
--- a/www-servers/resin/resin-4.0.44-r1.ebuild
+++ b/www-servers/resin/resin-4.0.44-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="admin doc"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="dev-java/resin-servlet-api:3.0
 	dev-java/jsr101:0

[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/

[Patrice Clement]

commit:     9d6fa4934b3afe77fb1f6889374cb302c4f94de2
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 09:45:34 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 09:46:09 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d6fa493

www-servers/resin: disable a patch that doesn't work with JDK versions lower than 1.8. Fixes bug 558442.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 www-servers/resin/resin-4.0.44-r1.ebuild | 199 +++++++++++++++++++++++++++++++
 1 file changed, 199 insertions(+)

diff --git a/www-servers/resin/resin-4.0.44-r1.ebuild b/www-servers/resin/resin-4.0.44-r1.ebuild
new file mode 100644
index 0000000..5518667
--- /dev/null
+++ b/www-servers/resin/resin-4.0.44-r1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/resin-servlet-api:3.0
+	dev-java/jsr101:0
+	dev-java/mojarra:1.2
+	dev-java/oracle-javamail:0
+	dev-java/validation-api:1.0
+	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-1.2
+oracle-javamail
+validation-api-1.0
+glassfish-xmlrpc-api
+resin-servlet-api-3.0
+glassfish-deployment-api-1.2"
+
+PATCHES=(
+	"${FILESDIR}"/"${PV}"/resin-compile.patch
+	"${FILESDIR}"/"${PV}"/build.xml.patch
+)
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup resin
+	enewuser resin -1 /bin/bash ${RESIN_HOME} resin
+}
+
+src_prepare() {
+	local vm_version=$(java-pkg_get-vm-version)
+
+	# #558442.
+	if [[ "${vm_version}" == "1.8" ]]; then
+		PATCHES+=("${FILESDIR}"/"${PV}"/VarType.java.patch)
+	fi
+
+	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
+
+	java-pkg_jar-from --into lib jsr101
+	java-pkg_jar-from --into lib mojarra-1.2
+	java-pkg_jar-from --into lib oracle-javamail
+	java-pkg_jar-from --into lib validation-api-1.0
+	java-pkg_jar-from --into lib glassfish-xmlrpc-api
+	java-pkg_jar-from --into lib glassfish-deployment-api-1.2
+	java-pkg_jar-from --into lib resin-servlet-api-3.0 resin-servlet-api.jar
+
+	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.0 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
+}

[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/

[Agostino Sarubbo]

commit:     cd8399cad313d3feb4451670f8a6d9975e0c9532
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 08:49:27 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 08:49:27 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd8399ca

www-servers/resin-4.0.44-r0: x86 stable wrt bug #431416

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

 www-servers/resin/resin-4.0.44.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/resin/resin-4.0.44.ebuild b/www-servers/resin/resin-4.0.44.ebuild
index 4f1e0c6..4e356a2 100644
--- a/www-servers/resin/resin-4.0.44.ebuild
+++ b/www-servers/resin/resin-4.0.44.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="admin doc"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="dev-java/resin-servlet-api:3.0
 	dev-java/jsr101:0

[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/

[Agostino Sarubbo]

commit:     87734d3141398e916521b33e6bb6f23c50cc1da5
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 08:49:02 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 08:49:02 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87734d31

www-servers/resin-4.0.44-r0: amd64 stable wrt bug #431416

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 www-servers/resin/resin-4.0.44.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/resin/resin-4.0.44.ebuild b/www-servers/resin/resin-4.0.44.ebuild
index 306e2ac..4f1e0c6 100644
--- a/www-servers/resin/resin-4.0.44.ebuild
+++ b/www-servers/resin/resin-4.0.44.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="admin doc"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 CDEPEND="dev-java/resin-servlet-api:3.0
 	dev-java/jsr101:0