From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 915FC138010 for ; Fri, 29 Mar 2013 09:41:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25394E086E; Fri, 29 Mar 2013 09:41:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A0194E086E for ; Fri, 29 Mar 2013 09:41:30 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E27D33D8A3 for ; Fri, 29 Mar 2013 09:41:29 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2230) id 67A122171D; Fri, 29 Mar 2013 09:41:28 +0000 (UTC) From: "Tomas Chvatal (scarabeus)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, scarabeus@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-4.0.9999.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: libreoffice-9999-r2.ebuild libreoffice-4.0.9999.ebuild ChangeLog X-VCS-Directories: app-office/libreoffice X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130329094128.67A122171D@flycatcher.gentoo.org> Date: Fri, 29 Mar 2013 09:41:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fa86e70f-fecd-4829-8888-3e2de1c9738f X-Archives-Hash: 2c411e99e81e9beef418490459484929 scarabeus 13/03/29 09:41:28 Modified: libreoffice-9999-r2.ebuild libreoffice-4.0.9999.ebuild ChangeLog Log: Update the pythoncflags/libs detection with the eclass functions. Put the branding mv call to prepare phase. (Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8) Revision Changes Path 1.168 app-office/libreoffice/libreoffice-9999-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.168&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.168&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.167&r2=1.168 Index: libreoffice-9999-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- libreoffice-9999-r2.ebuild 18 Mar 2013 18:59:00 -0000 1.167 +++ libreoffice-9999-r2.ebuild 29 Mar 2013 09:41:28 -0000 1.168 @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.167 2013/03/18 18:59:00 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.168 2013/03/29 09:41:28 scarabeus Exp $ EAPI=5 @@ -313,6 +313,9 @@ src_prepare() { # optimization flags export GMAKE_OPTIONS="${MAKEOPTS}" + # System python 2.7 enablement: + export PYTHON_CFLAGS=$(python_get_CFLAGS) + export PYTHON_LIBS=$(python_get_LIBS) # patchset if [[ -n ${PATCHSET} ]]; then @@ -324,8 +327,7 @@ base_src_prepare - AT_M4DIR="m4" - eautoreconf + AT_M4DIR="m4" eautoreconf # hack in the autogen.sh touch autogen.lastrun @@ -343,6 +345,11 @@ -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \ -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \ Makefile.in || die + + if use branding; then + # hack... + mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die + fi } src_configure() { @@ -401,15 +408,6 @@ fi fi - if use branding; then - # hack... - mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die - fi - - # System python 2.7 enablement: - export PYTHON_CFLAGS=`pkg-config --cflags python-${EPYTHON#python}` - export PYTHON_LIBS=`pkg-config --libs python-${EPYTHON#python}` - # system headers/libs/...: enforce using system packages # --enable-unix-qstart-libpng: use libpng splashscreen that is faster # --enable-cairo: ensure that cairo is always required 1.25 app-office/libreoffice/libreoffice-4.0.9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.25&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.25&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?r1=1.24&r2=1.25 Index: libreoffice-4.0.9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- libreoffice-4.0.9999.ebuild 18 Mar 2013 09:50:12 -0000 1.24 +++ libreoffice-4.0.9999.ebuild 29 Mar 2013 09:41:28 -0000 1.25 @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.24 2013/03/18 09:50:12 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.25 2013/03/29 09:41:28 scarabeus Exp $ EAPI=5 @@ -320,6 +320,11 @@ export ARCH_FLAGS="${CXXFLAGS}" export LINKFLAGSOPTIMIZE="${LDFLAGS}" export GMAKE_OPTIONS="${MAKEOPTS}" + # System python 2.7 enablement: + export PYTHON="${PYTHON}" + export PYTHON_CFLAGS=$(python_get_CFLAGS) + export PYTHON_LIBS=$(python_get_LIBS) + # patchset if [[ -n ${PATCHSET} ]]; then @@ -342,6 +347,11 @@ -e "s:%libdir%:$(get_libdir):g" \ -i pyuno/source/module/uno.py \ -i scripting/source/pyprov/officehelper.py || die + + if use branding; then + # hack... + mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die + fi } src_configure() { @@ -401,16 +411,6 @@ fi fi - if use branding; then - # hack... - mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die - fi - - # System python 2.7 enablement: - export PYTHON="${PYTHON}" - export PYTHON_CFLAGS=`pkg-config --cflags python-${EPYTHON#python}` - export PYTHON_LIBS=`pkg-config --libs python-${EPYTHON#python}` - # system headers/libs/...: enforce using system packages # --enable-unix-qstart-libpng: use libpng splashscreen that is faster # --enable-cairo: ensure that cairo is always required 1.455 app-office/libreoffice/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.455&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.455&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.454&r2=1.455 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v retrieving revision 1.454 retrieving revision 1.455 diff -u -r1.454 -r1.455 --- ChangeLog 28 Mar 2013 16:49:05 -0000 1.454 +++ ChangeLog 29 Mar 2013 09:41:28 -0000 1.455 @@ -1,6 +1,11 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.454 2013/03/28 16:49:05 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.455 2013/03/29 09:41:28 scarabeus Exp $ + + 29 Mar 2013; Tomáš Chvátal libreoffice-4.0.9999.ebuild, + libreoffice-9999-r2.ebuild: + Update the pythoncflags/libs detection with the eclass functions. Put the + branding mv call to prepare phase. 28 Mar 2013; Markus Meier libreoffice-4.0.1.2.ebuild: add ~arm, bug #451464