ercpe 14/11/11 18:21:06 Modified: tomcat-7.0.56.ebuild ChangeLog Log: Only remove .jar files, not directories; Fixed my stupid patch file (bug #528908) (Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)
Revision Changes Path 1.2 www-servers/tomcat/tomcat-7.0.56.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild?r1=1.1&r2=1.2 Index: tomcat-7.0.56.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tomcat-7.0.56.ebuild 2 Nov 2014 10:19:15 -0000 1.1 +++ tomcat-7.0.56.ebuild 11 Nov 2014 18:21:05 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild,v 1.1 2014/11/02 10:19:15 ercpe Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild,v 1.2 2014/11/11 18:21:05 ercpe Exp $ EAPI=5 @@ -48,8 +48,8 @@ } java_prepare() { - find -name '*.jar' -exec rm -frv {} + || die - epatch "${FILESDIR}/${P}-build.xml.patch" + find -type f -name '*.jar' -exec rm -frv {} + || die + epatch "${FILESDIR}/${P}-2-build.xml.patch" # For use of catalina.sh in netbeans sed -i -e "/^# ----- Execute The Requested Command/ a\ 1.331 www-servers/tomcat/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.331&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.331&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/ChangeLog?r1=1.330&r2=1.331 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v retrieving revision 1.330 retrieving revision 1.331 diff -u -r1.330 -r1.331 --- ChangeLog 2 Nov 2014 10:19:15 -0000 1.330 +++ ChangeLog 11 Nov 2014 18:21:05 -0000 1.331 @@ -1,6 +1,11 @@ # ChangeLog for www-servers/tomcat # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.330 2014/11/02 10:19:15 ercpe Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.331 2014/11/11 18:21:05 ercpe Exp $ + + 11 Nov 2014; Johann Schmitz <[email protected]> + files/tomcat-7.0.56-build.xml.patch, tomcat-7.0.56.ebuild: + Only remove .jar files, not directories; Fixed my stupid patch file (bug + #528908) *tomcat-7.0.56 (02 Nov 2014)
