Update ebuild for EAPI 4.

Package-Manager: portage-2.1.10.47/cvs/Linux x86_64

3 files changed, 47 insertions, 43 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index c7b146b38f4b..31b7173d83ae 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -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.113 2012/02/24 14:50:13 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.114 2012/02/24 17:42:49 nelchael Exp $
+
+  24 Feb 2012; Krzysztof Pawlik <nelchael@gentoo.org> resin-4.0.25.ebuild:
+  Update ebuild for EAPI 4.
 
   24 Feb 2012; Krzysztof Pawlik <nelchael@gentoo.org> resin-4.0.22.ebuild:
   Improve ebuild, see bug #405585 and bug #405587.
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 851812b13753..1dc312d9bc12 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -25,17 +25,17 @@ EBUILD resin-4.0.13-r1.ebuild 4977 RMD160 590d16626e5bdcb29dcf29d143c0acfe16b97f
 EBUILD resin-4.0.14.ebuild 4976 RMD160 1aecf62dbb6f9d7c247ab32707b9d734c101e971 SHA1 0f9c882c4ffc6d00de6403dcf8d01f8d37ba2e58 SHA256 a9c4b2c10bf5b7b60b04e25ff7035366278d335adcde39dbedd01401d810b51d
 EBUILD resin-4.0.15.ebuild 4976 RMD160 846f97b4cbcb902b1e4a4c1421b75af9676a47db SHA1 d07c321a48c399c738e38f544ca9e22712c89336 SHA256 b39195c6a36def94f68003f737643bef1194bfbd02765c4b8f829a30905f171a
 EBUILD resin-4.0.22.ebuild 5047 RMD160 367c35caa2fe68ed625c2d2288a7c94d4999722b SHA1 623effc96592f339dbf3edc8903919a7a09723b5 SHA256 1d7f71d134a43d94f37725877583eaf0b27f5281037d2897b226cf5285d23fc2
-EBUILD resin-4.0.25.ebuild 4979 RMD160 9a1e1cc8fce6160ef8e4ee5a83e16e07b014c5e3 SHA1 e9a56f72330f98bcd4926d44a91303319385bef5 SHA256 d360daba96cccd9196db652a00db4802f3619a901d62f13e51fbf3dd89f058d2
-MISC ChangeLog 21172 RMD160 f68552ef30de6d0231d8625622f44d052904a42b SHA1 e35d28492c497ef95c5fbc08219d4c605ec070e2 SHA256 bfd9c24d73bdae17e132862b12a9ae7619c686c4839750b32168a1d726249113
+EBUILD resin-4.0.25.ebuild 5125 RMD160 5663b56b7a301945d9cf1f06b6c529e5222009eb SHA1 8370d8a91b46d7f8abd5c01608d7cd58518e02a0 SHA256 bb988fac94f4a57d65687f99c0ae403c5111e1a88e53c3ad1a208fe6bf990ffd
+MISC ChangeLog 21276 RMD160 6631095bd3f118910be2ea4c885ace79dc2bca8d SHA1 edcbd9d528f17c087483d65c15930e7037a57db7 SHA256 dce83cfce2d65e4bbc3e662a0dffcc7cb1806b16d42f7f95b73afc8e079e5000
 MISC metadata.xml 301 RMD160 538a8bd3441672377f3b6cbd4379f28cf9f88322 SHA1 b7a6235c113394ffc793eb809466e90675b06fb8 SHA256 3b0fbe1b181439b3be84c84aad1999588b0b4a40fcfe43c3158e114bf2acf8e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPR6OtAAoJEBZyv1r2qA5GHekH/RBXsyi3ZIvlEjMv4vvF9UP8
-rRk9H5KuLJdLZ0NDSYrjI1bx/liNvsuh/mRnKQxGsMTAilMkaflj786+cEDgsqx5
-4BL/21ah836d6/FF7UYqOuWu/sBBMiCdaK8StGeojam1j4VgUitJgS7uUht2/rtM
-V0H4PQLF7vfZdDiHIJJT+bm/TrbO21S2V+ebVEW+16u2Evc1cPpfTsgvXfwQd49I
-w4c7d3lrr29+xslY19NMtzZvefwvxxapK0GyXGTbzRD6gpli2XP2ILv3+3RY/mOb
-g3yr62AsVtXGxExhSMiH0L8XdEjTqT2cltGuGJX9I8rF1PtV36sGPf2xnetZUKA=
-=+gLP
+iQEcBAEBCgAGBQJPR8whAAoJEBZyv1r2qA5GBHkH/29whG8UB2T+UN17Qt6cNDNZ
+eBGNNa8nEKQW4jS0ja2HPwh+H2Ifcf/aPkkNZvT704sEFbhXnoTQ4rn3MmrwCzrX
+yh3p2HJ6CYCZv0S9UIbTsdXo5oDZ12re5RVLn1AH2kaB2uaXoO7Px77Q9w4Ck+oZ
+BFVtEj2z4vawU2pbavPJ+WgwpOTGFPc6Eae8T1BbVKfHdg6cjozqWPVdNSeLZaSw
+J6kTA1/d9uAlO3OCYeAtrwMxhBubkI4QRgDXicW15RSMZjku21AKV2LsTe+t3Ng0
+8319b+CBl10USls2v5Vdf1u0GXVPVRWPQ48mfp11x1ayJmEbzcvhUsjf7tJLvcM=
+=WiQa
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/resin-4.0.25.ebuild b/www-servers/resin/resin-4.0.25.ebuild
index 151f6a0e7841..d2fa9832cac2 100644
--- a/www-servers/resin/resin-4.0.25.ebuild
+++ b/www-servers/resin/resin-4.0.25.ebuild
@@ -1,8 +1,8 @@
 # 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.25.ebuild,v 1.2 2012/02/23 22:45:06 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.25.ebuild,v 1.3 2012/02/24 17:42:49 nelchael Exp $
 
-EAPI="2"
+EAPI="4"
 
 JAVA_PKG_IUSE="source"
 
@@ -50,34 +50,35 @@ src_prepare() {
 	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"
-	cd "${S}/gentoo-deps/"
+	mkdir -p "${S}/gentoo-deps" || die
+	cd "${S}/gentoo-deps/" || die
 	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
+	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"
 }
 
@@ -101,10 +102,10 @@ src_install() {
 	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"
+		"${D}/etc/resin/resin.xml" || die
 
 	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
 
@@ -115,24 +116,24 @@ src_install() {
 	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"
+	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"
+	rm -f "${S}/lib/tools.jar" || die
 	java-pkg_dojar "${S}"/lib/*.jar
-	rm -fr "${D}/${RESIN_HOME}/lib"
+	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"
-	rm -rf "${D}/${RESIN_HOME}/watchdog-data"
+	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"
+	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
@@ -140,7 +141,7 @@ src_install() {
 
 	dosym \
 		"$(java-pkg_getjar resin-servlet-api-3.0 resin-servlet-api.jar)" \
-		"${JAVA_PKG_JARDEST}/resin-servlet-api.jar" || die
+		"${JAVA_PKG_JARDEST}/resin-servlet-api.jar"
 
 	use admin && {
 		einfo "Installing administration app ..."
@@ -157,22 +158,22 @@ src_install() {
 	}
 
 	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
+	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 ..."
-	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() {