public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in www-servers/resin: ChangeLog resin-4.0.22.ebuild
@ 2011-09-06 16:46 Krzysztof Pawlik (nelchael)
  0 siblings, 0 replies; 5+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2011-09-06 16:46 UTC (permalink / raw
  To: gentoo-commits

nelchael    11/09/06 16:46:05

  Modified:             ChangeLog
  Added:                resin-4.0.22.ebuild
  Log:
  Version bump.
  
  (Portage version: 2.1.10.13/cvs/Linux x86_64)

Revision  Changes    Path
1.108                www-servers/resin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?rev=1.108&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?rev=1.108&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?r1=1.107&r2=1.108

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- ChangeLog	15 Mar 2011 20:12:40 -0000	1.107
+++ ChangeLog	6 Sep 2011 16:46:05 -0000	1.108
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/resin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.107 2011/03/15 20:12:40 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.108 2011/09/06 16:46:05 nelchael Exp $
+
+*resin-4.0.22 (06 Sep 2011)
+
+  06 Sep 2011; Krzysztof Pawlik <nelchael@gentoo.org> +files/4.0.22/resin.conf,
+  +files/4.0.22/resin.init, +resin-4.0.22.ebuild:
+  Version bump.
 
 *resin-4.0.15 (15 Mar 2011)
 



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

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

Index: resin-4.0.22.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild,v 1.1 2011/09/06 16:46:05 nelchael Exp $

EAPI="2"

JAVA_PKG_IUSE="source"

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

DESCRIPTION="A fast Servlet and JSP 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 doc"

KEYWORDS="~amd64 ~x86"

COMMON_DEP="~dev-java/resin-servlet-api-${PV}
	dev-java/glassfish-deployment-api:1.2
	java-virtuals/javamail
	dev-java/jsr101
	dev-java/mojarra:1.2
	dev-java/validation-api:1.0"

RDEPEND=">=virtual/jdk-1.5
	${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.5
	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"

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

src_prepare() {
	for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do
		epatch "${i}"
	done;

	# Respect LDFLAGS:
	sed -i -e 's/-o/$(LDFLAGS) -o/' modules/c/src/resin_os/Makefile.in

	# No bundled JARs!
	rm -f "${S}/modules/ext/"*.jar
	rm -rf "${S}/project-jars"

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

	mkdir -p "${S}/m4"
	eautoreconf

	# Symlink our libraries:
	mkdir -p "${S}/gentoo-deps"
	cd "${S}/gentoo-deps/"
	java-pkg_jar-from --virtual javamail
	java-pkg_jar-from glassfish-deployment-api-1.2
	java-pkg_jar-from resin-servlet-api-3.0 resin-servlet-api.jar
	java-pkg_jar-from mojarra-1.2
	java-pkg_jar-from jsr101
	java-pkg_jar-from validation-api-1.0
	ln -s $(java-config --jdk-home)/lib/tools.jar
}

src_configure() {
	append-flags -fPIC -DPIC

	chmod 755 "${S}/configure"
	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"

	einfo "Fixing log directory ..."
	rm -rf "${D}/${RESIN_HOME}/log"
	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"

	einfo "Fixing location of jars ..."
	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

	einfo "Symlinking directories from /var/lib/resin ..."
	rm -rf "${D}/${RESIN_HOME}/resin-data"
	rm -rf "${D}/${RESIN_HOME}/watchdog-data"
	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"
	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" || die

	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"
	rm -fr "${D}/${RESIN_HOME}/doc"
	rm -fr "${D}/${RESIN_HOME}/keys"
	rm -fr "${D}/${RESIN_HOME}/licenses"
	rm -fr "${D}/etc/resin/"*.orig

	einfo "Fixing ownerships and permissions ..."
	chown -R 0:root "${D}/"
	chown -R resin:resin "${D}/etc/resin"
	chown -R resin:resin "${D}/var/lib/resin"
	chown -R resin:resin "${D}/var/log/resin"

	chmod 644 "${D}/etc/conf.d/resin"
	chmod 755 "${D}/etc/init.d/resin"
	chmod 750 "${D}/var/lib/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/resin/resin.xml."
	elog
}






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

* [gentoo-commits] gentoo-x86 commit in www-servers/resin: ChangeLog resin-4.0.22.ebuild
@ 2012-02-23 22:23 Krzysztof Pawlik (nelchael)
  0 siblings, 0 replies; 5+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2012-02-23 22:23 UTC (permalink / raw
  To: gentoo-commits

nelchael    12/02/23 22:23:25

  Modified:             ChangeLog resin-4.0.22.ebuild
  Log:
  Use -r1 of patches for Resin 4.0.22, fixes build issues, see bug #405433.
  
  (Portage version: 2.1.10.47/cvs/Linux x86_64)

Revision  Changes    Path
1.110                www-servers/resin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?rev=1.110&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?rev=1.110&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?r1=1.109&r2=1.110

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- ChangeLog	11 Feb 2012 18:52:28 -0000	1.109
+++ ChangeLog	23 Feb 2012 22:23:25 -0000	1.110
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/resin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.109 2012/02/11 18:52:28 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.110 2012/02/23 22:23:25 nelchael Exp $
+
+  23 Feb 2012; Krzysztof Pawlik <nelchael@gentoo.org> resin-4.0.22.ebuild:
+  Use -r1 of patches for Resin 4.0.22, fixes build issues, see bug #405433.
 
 *resin-4.0.25 (11 Feb 2012)
 



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

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

Index: resin-4.0.22.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- resin-4.0.22.ebuild	6 Sep 2011 16:46:05 -0000	1.1
+++ resin-4.0.22.ebuild	23 Feb 2012 22:23:25 -0000	1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild,v 1.1 2011/09/06 16:46:05 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild,v 1.2 2012/02/23 22:23:25 nelchael Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@
 DESCRIPTION="A fast Servlet and JSP engine."
 HOMEPAGE="http://www.caucho.com"
 SRC_URI="http://www.caucho.com/download/${P}-src.zip
-	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
+	mirror://gentoo/resin-gentoo-patches-${PV}-r1.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="admin doc"






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

* [gentoo-commits] gentoo-x86 commit in www-servers/resin: ChangeLog resin-4.0.22.ebuild
@ 2012-02-24 14:33 Agostino Sarubbo (ago)
  0 siblings, 0 replies; 5+ messages in thread
From: Agostino Sarubbo (ago) @ 2012-02-24 14:33 UTC (permalink / raw
  To: gentoo-commits

ago         12/02/24 14:33:59

  Modified:             ChangeLog resin-4.0.22.ebuild
  Log:
  Stable for amd64, wrt bug #403199
  
  (Portage version: 2.1.10.44/cvs/Linux x86_64)

Revision  Changes    Path
1.112                www-servers/resin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?rev=1.112&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?rev=1.112&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?r1=1.111&r2=1.112

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- ChangeLog	23 Feb 2012 22:45:06 -0000	1.111
+++ ChangeLog	24 Feb 2012 14:33:59 -0000	1.112
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/resin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.111 2012/02/23 22:45:06 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.112 2012/02/24 14:33:59 ago Exp $
+
+  24 Feb 2012; Agostino Sarubbo <ago@gentoo.org> resin-4.0.22.ebuild:
+  Stable for amd64, wrt bug #403199
 
   23 Feb 2012; Krzysztof Pawlik <nelchael@gentoo.org> resin-4.0.25.ebuild:
   Use -r1 of patches for Resin 4.0.25, fixes build issues.



1.3                  www-servers/resin/resin-4.0.22.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild?r1=1.2&r2=1.3

Index: resin-4.0.22.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- resin-4.0.22.ebuild	23 Feb 2012 22:23:25 -0000	1.2
+++ resin-4.0.22.ebuild	24 Feb 2012 14:33:59 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild,v 1.2 2012/02/23 22:23:25 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild,v 1.3 2012/02/24 14:33:59 ago Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@
 SLOT="0"
 IUSE="admin doc"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 COMMON_DEP="~dev-java/resin-servlet-api-${PV}
 	dev-java/glassfish-deployment-api:1.2






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

* [gentoo-commits] gentoo-x86 commit in www-servers/resin: ChangeLog resin-4.0.22.ebuild
@ 2012-02-24 14:50 Krzysztof Pawlik (nelchael)
  0 siblings, 0 replies; 5+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2012-02-24 14:50 UTC (permalink / raw
  To: gentoo-commits

nelchael    12/02/24 14:50:13

  Modified:             ChangeLog resin-4.0.22.ebuild
  Log:
  Improve ebuild, see bug #405585 and bug #405587.
  
  (Portage version: 2.1.10.47/cvs/Linux x86_64)

Revision  Changes    Path
1.113                www-servers/resin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?rev=1.113&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?rev=1.113&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?r1=1.112&r2=1.113

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- ChangeLog	24 Feb 2012 14:33:59 -0000	1.112
+++ ChangeLog	24 Feb 2012 14:50:13 -0000	1.113
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/resin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.112 2012/02/24 14:33:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.113 2012/02/24 14:50:13 nelchael Exp $
+
+  24 Feb 2012; Krzysztof Pawlik <nelchael@gentoo.org> resin-4.0.22.ebuild:
+  Improve ebuild, see bug #405585 and bug #405587.
 
   24 Feb 2012; Agostino Sarubbo <ago@gentoo.org> resin-4.0.22.ebuild:
   Stable for amd64, wrt bug #403199



1.4                  www-servers/resin/resin-4.0.22.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild?r1=1.3&r2=1.4

Index: resin-4.0.22.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- resin-4.0.22.ebuild	24 Feb 2012 14:33:59 -0000	1.3
+++ resin-4.0.22.ebuild	24 Feb 2012 14:50:13 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild,v 1.3 2012/02/24 14:33:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild,v 1.4 2012/02/24 14:50:13 nelchael Exp $
 
 EAPI="2"
 
@@ -50,20 +50,21 @@
 	done;
 
 	# Respect LDFLAGS:
-	sed -i -e 's/-o/$(LDFLAGS) -o/' modules/c/src/resin_os/Makefile.in
+	sed -i -e 's/-o/$(LDFLAGS) -o/' modules/c/src/resin_os/Makefile.in || die
 
 	# No bundled JARs!
-	rm -f "${S}/modules/ext/"*.jar
-	rm -rf "${S}/project-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"
 
-	mkdir -p "${S}/m4"
+	mkdir -p "${S}/m4" || die
+	sed -i -e 's,-O2,,g' configure.ac || die
 	eautoreconf
 
 	# Symlink our libraries:
-	mkdir -p "${S}/gentoo-deps"
+	mkdir -p "${S}/gentoo-deps" || die
 	cd "${S}/gentoo-deps/"
 	java-pkg_jar-from --virtual javamail
 	java-pkg_jar-from glassfish-deployment-api-1.2
@@ -71,13 +72,13 @@
 	java-pkg_jar-from mojarra-1.2
 	java-pkg_jar-from jsr101
 	java-pkg_jar-from validation-api-1.0
-	ln -s $(java-config --jdk-home)/lib/tools.jar
+	ln -s $(java-config --jdk-home)/lib/tools.jar || die
 }
 
 src_configure() {
 	append-flags -fPIC -DPIC
 
-	chmod 755 "${S}/configure"
+	chmod 755 "${S}/configure" || die
 	econf --prefix=${RESIN_HOME} || die "econf failed"
 }
 
@@ -104,7 +105,7 @@
 		"${D}/etc/resin/resin.xml"
 
 	einfo "Fixing log directory ..."
-	rm -rf "${D}/${RESIN_HOME}/log"
+	rm -rf "${D}/${RESIN_HOME}/log" || die
 	keepdir /var/log/resin
 	dosym /var/log/resin ${RESIN_HOME}/log
 
@@ -118,7 +119,7 @@
 	sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin"
 
 	einfo "Fixing location of jars ..."
-	rm -f "${S}/lib/tools.jar"
+	rm -f "${S}/lib/tools.jar" || die
 	java-pkg_dojar "${S}"/lib/*.jar
 	rm -fr "${D}/${RESIN_HOME}/lib"
 	dosym /usr/share/resin/lib ${RESIN_HOME}/lib
@@ -164,15 +165,15 @@
 	rm -fr "${D}/etc/resin/"*.orig
 
 	einfo "Fixing ownerships and permissions ..."
-	chown -R 0:root "${D}/"
-	chown -R resin:resin "${D}/etc/resin"
-	chown -R resin:resin "${D}/var/lib/resin"
-	chown -R resin:resin "${D}/var/log/resin"
-
-	chmod 644 "${D}/etc/conf.d/resin"
-	chmod 755 "${D}/etc/init.d/resin"
-	chmod 750 "${D}/var/lib/resin"
-	chmod 750 "${D}/etc/resin"
+	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() {






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

* [gentoo-commits] gentoo-x86 commit in www-servers/resin: ChangeLog resin-4.0.22.ebuild
@ 2012-05-07  5:21 Andreas Schuerch (nativemad)
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Schuerch (nativemad) @ 2012-05-07  5:21 UTC (permalink / raw
  To: gentoo-commits

nativemad    12/05/07 05:21:02

  Modified:             ChangeLog resin-4.0.22.ebuild
  Log:
  x86 stable, see bug 403199
  
  (Portage version: 2.1.10.49/cvs/Linux i686)

Revision  Changes    Path
1.116                www-servers/resin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?rev=1.116&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?rev=1.116&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?r1=1.115&r2=1.116

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- ChangeLog	4 Mar 2012 11:22:24 -0000	1.115
+++ ChangeLog	7 May 2012 05:21:02 -0000	1.116
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/resin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.115 2012/03/04 11:22:24 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.116 2012/05/07 05:21:02 nativemad Exp $
+
+  07 May 2012; Andreas Schuerch <nativemad@gentoo.org> resin-4.0.22.ebuild:
+  x86 stable, see bug 403199
 
 *resin-4.0.26 (04 Mar 2012)
 



1.5                  www-servers/resin/resin-4.0.22.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild?r1=1.4&r2=1.5

Index: resin-4.0.22.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- resin-4.0.22.ebuild	24 Feb 2012 14:50:13 -0000	1.4
+++ resin-4.0.22.ebuild	7 May 2012 05:21:02 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild,v 1.4 2012/02/24 14:50:13 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild,v 1.5 2012/05/07 05:21:02 nativemad Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@
 SLOT="0"
 IUSE="admin doc"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEP="~dev-java/resin-servlet-api-${PV}
 	dev-java/glassfish-deployment-api:1.2






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

end of thread, other threads:[~2012-05-07  5:22 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-23 22:23 [gentoo-commits] gentoo-x86 commit in www-servers/resin: ChangeLog resin-4.0.22.ebuild Krzysztof Pawlik (nelchael)
  -- strict thread matches above, loose matches on Subject: below --
2012-05-07  5:21 Andreas Schuerch (nativemad)
2012-02-24 14:50 Krzysztof Pawlik (nelchael)
2012-02-24 14:33 Agostino Sarubbo (ago)
2011-09-06 16:46 Krzysztof Pawlik (nelchael)

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