From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Plfdw-0007wo-0Z for garchives@archives.gentoo.org; Sat, 05 Feb 2011 10:45:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C452E09D4; Sat, 5 Feb 2011 10:45:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 26EFCE09D4 for ; Sat, 5 Feb 2011 10:45:20 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3A9271B4084 for ; Sat, 5 Feb 2011 10:45:19 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 763) id CB12620054; Sat, 5 Feb 2011 10:45:17 +0000 (UTC) From: "Andreas Proschofsky (suka)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, suka@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-office/openoffice: ChangeLog openoffice-3.2.0.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog openoffice-3.2.0.ebuild X-VCS-Directories: app-office/openoffice X-VCS-Committer: suka X-VCS-Committer-Name: Andreas Proschofsky Content-Type: text/plain; charset=utf8 Message-Id: <20110205104517.CB12620054@flycatcher.gentoo.org> Date: Sat, 5 Feb 2011 10:45:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 61ba20415da69869089b0de7b1efc1bc suka 11/02/05 10:45:17 Modified: ChangeLog openoffice-3.2.0.ebuild Log: Also fix pax stuff and bump EAPI in older ebuild =20 (Portage version: 2.1.9.35/cvs/Linux x86_64) Revision Changes Path 1.546 app-office/openoffice/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice/ChangeLog?rev=3D1.546&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice/ChangeLog?rev=3D1.546&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice/ChangeLog?r1=3D1.545&r2=3D1.546 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v retrieving revision 1.545 retrieving revision 1.546 diff -u -r1.545 -r1.546 --- ChangeLog 5 Feb 2011 10:40:31 -0000 1.545 +++ ChangeLog 5 Feb 2011 10:45:17 -0000 1.546 @@ -1,6 +1,9 @@ # ChangeLog for app-office/openoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.5= 45 2011/02/05 10:40:31 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.5= 46 2011/02/05 10:45:17 suka Exp $ + + 05 Feb 2011; Andreas Proschofsky openoffice-3.2.0.eb= uild: + Also fix pax stuff and bump EAPI in older ebuild =20 05 Feb 2011; Andreas Proschofsky +files/ooo-build-3.0.1.2-prefix.patch, openoffice-3.2.1-r1.ebuild: 1.30 app-office/openoffice/openoffice-3.2.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice/openoffice-3.2.0.ebuild?rev=3D1.30&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice/openoffice-3.2.0.ebuild?rev=3D1.30&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice/openoffice-3.2.0.ebuild?r1=3D1.29&r2=3D1.30 Index: openoffice-3.2.0.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.= ebuild,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- openoffice-3.2.0.ebuild 7 Nov 2010 19:45:55 -0000 1.29 +++ openoffice-3.2.0.ebuild 5 Feb 2011 10:45:17 -0000 1.30 @@ -1,15 +1,15 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.= 0.ebuild,v 1.29 2010/11/07 19:45:55 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.= 0.ebuild,v 1.30 2011/02/05 10:45:17 suka Exp $ =20 WANT_AUTOMAKE=3D"1.9" -EAPI=3D"2" +EAPI=3D"3" KDE_REQUIRED=3D"optional" CMAKE_REQUIRED=3D"never" PYTHON_DEPEND=3D"2" PYTHON_USE_WITH=3D"threads" =20 -inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag= -o-matic java-pkg-opt-2 kde4-base mono multilib python toolchain-funcs +inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag= -o-matic java-pkg-opt-2 kde4-base mono multilib pax-utils python toolchai= n-funcs =20 IUSE=3D"binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono = nsplugin odk opengl pam templates" =20 @@ -364,18 +364,18 @@ make DESTDIR=3D"${D}" install || die "Installation failed!" =20 # Fix the permissions for security reasons - chown -RP root:0 "${D}" + chown -RP root:0 "${ED}" =20 # record java libraries if use java; then - java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/${BASIS}/program/= classes/*.jar - java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/ure/share/java/*.= jar + java-pkg_regjar "${ED}"/usr/$(get_libdir)/openoffice/${BASIS}/program= /classes/*.jar + java-pkg_regjar "${ED}"/usr/$(get_libdir)/openoffice/ure/share/java/*= .jar fi =20 # Upstream places the bash-completion module in /etc. Gentoo places the= m in # /usr/share/bash-completion. bug 226061 - dobashcompletion "${D}"/etc/bash_completion.d/ooffice.sh ooffice - rm -rf "${D}"/etc/bash_completion.d/ || die "rm failed" + dobashcompletion "${ED}"/etc/bash_completion.d/ooffice.sh ooffice + rm -rf "${ED}"/etc/bash_completion.d/ || die "rm failed" =20 } =20 @@ -385,7 +385,7 @@ fdo-mime_mime_database_update BASHCOMPLETION_NAME=3Dooffice && bash-completion_pkg_postinst =20 - ( [[ -x /sbin/chpax ]] || [[ -x /sbin/paxctl ]] ) && [[ -e /usr/$(get_l= ibdir)/openoffice/program/soffice.bin ]] && scanelf -Xzm /usr/$(get_libdi= r)/openoffice/program/soffice.bin + pax-mark -m /usr/$(get_libdir)/openoffice/program/soffice.bin =20 # Add available & useful jars to openoffice classpath use java && /usr/$(get_libdir)/openoffice/${BASIS}/program/java-set-cla= sspath $(java-config --classpath=3Djdbc-mysql 2>/dev/null) >/dev/null