public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in www-servers/resin: ChangeLog resin-3.1.5.ebuild
@ 2008-02-27 22:06 Krzysiek Pawlik (nelchael)
  0 siblings, 0 replies; 2+ messages in thread
From: Krzysiek Pawlik (nelchael) @ 2008-02-27 22:06 UTC (permalink / raw
  To: gentoo-commits

nelchael    08/02/27 22:06:36

  Modified:             ChangeLog
  Added:                resin-3.1.5.ebuild
  Log:
  Version bump.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.66                 www-servers/resin/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?rev=1.66&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?rev=1.66&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?r1=1.65&r2=1.66

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- ChangeLog	14 Dec 2007 16:10:37 -0000	1.65
+++ ChangeLog	27 Feb 2008 22:06:36 -0000	1.66
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/resin
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.65 2007/12/14 16:10:37 nelchael Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.66 2008/02/27 22:06:36 nelchael Exp $
+
+*resin-3.1.5 (27 Feb 2008)
+
+  27 Feb 2008; Krzysiek Pawlik <nelchael@gentoo.org> +resin-3.1.5.ebuild:
+  Version bump.
 
   14 Dec 2007; Krzysiek Pawlik <nelchael@gentoo.org> resin-3.1.4.ebuild:
   Use correct patches for 3.1.4.



1.1                  www-servers/resin/resin-3.1.5.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.1.5.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.1.5.ebuild?rev=1.1&content-type=text/plain

Index: resin-3.1.5.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.5.ebuild,v 1.1 2008/02/27 22:06:36 nelchael Exp $

EAPI="1"

JAVA_PKG_IUSE="doc source"

inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib autotools

DESCRIPTION="A fast Servlet 2.5 and JSP 2.0 engine."
HOMEPAGE="http://www.caucho.com"
SRC_URI="http://www.caucho.com/download/${P}-src.zip
	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
IUSE="admin"

KEYWORDS="~amd64 ~x86"

COMMON_DEP="~dev-java/resin-servlet-api-${PV}
	>=dev-java/iso-relax-20050331
	dev-java/aopalliance
	=dev-java/sun-j2ee-deployment-bin-1.1*
	dev-java/jax-ws-api:2
	dev-java/jaxb:2
	>=dev-java/sun-javamail-1.4
	>=dev-java/sun-jaf-1.1"

RDEPEND="=virtual/jdk-1.5*
	${COMMON_DEP}"
DEPEND="${RDEPEND}
	app-arch/unzip
	dev-java/ant-core
	dev-libs/openssl
	${COMMON_DEP}"

RESIN_HOME="/usr/$(get_libdir)/resin"

# Rewrites build.xml in documentation
JAVA_PKG_BSFIX="off"

src_unpack() {

	unpack ${A}
	for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do
		epatch "${i}"
	done;

	java-ant_bsfix_one "${S}/build.xml"

	sed -i -e 's/256m/384m/' "${S}/build.xml"

	cd "${S}"
	eautoreconf

}

pkg_setup() {

	java-pkg-2_pkg_setup
	enewgroup resin
	enewuser resin -1 /bin/bash ${RESIN_HOME} resin

}

src_compile() {

	append-flags -fPIC -DPIC

	chmod 755 "${S}/configure"
	econf --prefix=${RESIN_HOME} || die "econf failed"

	einfo "Building libraries..."
	# Broken with -jn where n > 1
	emake -j1 || die "emake failed"

	mkdir "${S}/lib"
	cd "${S}/lib"
	java-pkg_jar-from sun-jaf
	java-pkg_jar-from sun-javamail
	java-pkg_jar-from iso-relax
	java-pkg_jar-from aopalliance-1
	java-pkg_jar-from sun-j2ee-deployment-bin-1.1
	java-pkg_jar-from jax-ws-api-2
	java-pkg_jar-from jaxb-2
	java-pkg_jar-from resin-servlet-api-2.5 resin-servlet-api.jar jsdk-15.jar
	ln -s $(java-config --jdk-home)/lib/tools.jar
	cd "${S}"

	einfo "Building jars..."
	eant || die "ant failed"

	if use doc; then
		einfo "Building docs..."
		eant doc || die "ant doc failed"
	fi

}

src_install() {

	make DESTDIR="${D}" install || die

	dodir /etc/
	mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin"
	dosym /etc/resin ${RESIN_HOME}/conf

	keepdir /var/log/resin
	keepdir /var/log/resin
	keepdir /var/run/resin

	dosym /var/log/resin ${RESIN_HOME}/logs
	dosym /var/log/resin ${RESIN_HOME}/log

	dodoc README "${S}"/conf/*.conf

	newinitd "${FILESDIR}/${PV}/resin.init" resin
	newconfd "${FILESDIR}/${PV}/resin.conf" resin

	rm -f "${S}/lib/tools.jar"
	java-pkg_dojar "${S}"/lib/*.jar
	rm -fr "${D}/${RESIN_HOME}/lib"
	dosym /usr/share/resin/lib ${RESIN_HOME}/lib
	keepdir /usr/share/resin/log

	dodir /var/lib/resin/webapps
	mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps"
	rm -rf "${D}/${RESIN_HOME}/webapps"
	dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps

	dosym /etc/resin/resin.conf /etc/resin/resin.xml

	use admin && {
		cp -a "${S}/php" "${D}/${RESIN_HOME}/" || die "cp failed"
	}

	use source && {
		einfo "Zipping source..."
		java-pkg_dosrc "${S}"/modules/*/src/* 2> /dev/null
	}

	einfo "Removing unneeded files..."
	rm -fr "${D}/${RESIN_HOME}/bin"
	rm -f "${D}"/etc/resin/*.orig

	einfo "Fixing permissions..."
	chown -R resin:resin "${D}${RESIN_HOME}"
	chown -R resin:resin "${D}/etc/resin"
	chown -R resin:resin "${D}/var/log/resin"
	chown -R resin:resin "${D}/var/lib/resin"
	chown -R resin:resin "${D}/var/run/resin"

	chmod 644 "${D}/etc/conf.d/resin"
	chmod 755 "${D}/etc/init.d/resin"
	chmod 750 "${D}/var/lib/resin"
	chmod 750 "${D}/var/run/resin"
	chmod 750 "${D}/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/conf/resin.conf."
	elog
	elog " webapps directory was moved to /var/lib/resin/webapps"
	elog
	elog " Most options has been moved from /etc/conf.d/resin to"
	elog " /etc/resin/resin.conf."
	elog

}



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in www-servers/resin: ChangeLog resin-3.1.5.ebuild
@ 2008-04-08  7:55 Krzysiek Pawlik (nelchael)
  0 siblings, 0 replies; 2+ messages in thread
From: Krzysiek Pawlik (nelchael) @ 2008-04-08  7:55 UTC (permalink / raw
  To: gentoo-commits

nelchael    08/04/08 07:55:34

  Modified:             ChangeLog resin-3.1.5.ebuild
  Log:
  Fix config location, see bug #216832.
  (Portage version: 2.1.5_rc2)

Revision  Changes    Path
1.68                 www-servers/resin/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?rev=1.68&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?rev=1.68&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?r1=1.67&r2=1.68

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ChangeLog	17 Mar 2008 16:33:53 -0000	1.67
+++ ChangeLog	8 Apr 2008 07:55:33 -0000	1.68
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/resin
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.67 2008/03/17 16:33:53 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.68 2008/04/08 07:55:33 nelchael Exp $
+
+  08 Apr 2008; Krzysiek Pawlik <nelchael@gentoo.org> files/3.1.5/resin.init,
+  resin-3.1.5.ebuild:
+  Fix config location, see bug #216832.
 
   17 Mar 2008; Krzysiek Pawlik <nelchael@gentoo.org>
   +files/3.1.5/resin.conf, +files/3.1.5/resin.init:



1.2                  www-servers/resin/resin-3.1.5.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.1.5.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.1.5.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.1.5.ebuild?r1=1.1&r2=1.2

Index: resin-3.1.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- resin-3.1.5.ebuild	27 Feb 2008 22:06:36 -0000	1.1
+++ resin-3.1.5.ebuild	8 Apr 2008 07:55:33 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.5.ebuild,v 1.1 2008/02/27 22:06:36 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.5.ebuild,v 1.2 2008/04/08 07:55:33 nelchael Exp $
 
 EAPI="1"
 
@@ -122,7 +122,7 @@
 	java-pkg_dojar "${S}"/lib/*.jar
 	rm -fr "${D}/${RESIN_HOME}/lib"
 	dosym /usr/share/resin/lib ${RESIN_HOME}/lib
-	keepdir /usr/share/resin/log
+	dosym /var/log/resin /usr/share/resin/log
 
 	dodir /var/lib/resin/webapps
 	mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps"



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-04-08  7:55 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-27 22:06 [gentoo-commits] gentoo-x86 commit in www-servers/resin: ChangeLog resin-3.1.5.ebuild Krzysiek Pawlik (nelchael)
  -- strict thread matches above, loose matches on Subject: below --
2008-04-08  7:55 Krzysiek Pawlik (nelchael)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox