Update the pythoncflags/libs detection with the eclass functions. Put the branding mv call to prepare phase.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

4 files changed, 43 insertions, 30 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 51e73df1c4a4..6421ed7786c5 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -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 <scarabeus@gentoo.org> 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 <maekke@gentoo.org> libreoffice-4.0.1.2.ebuild:
   add ~arm, bug #451464
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index afde12b30ff7..9a73792d3209 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -30,14 +30,24 @@ EBUILD libreoffice-3.6.4.3.ebuild 17474 SHA256 ebfebf22f2c06bc68f4a63e2ae74a9f0f
 EBUILD libreoffice-3.6.9999.ebuild 17506 SHA256 b28b806a32ba69fc98bf06f702d838d1019479c328e6e2ac9675170ad4174c0f SHA512 32b0ec9fb805241263c73cfa35557e3f71a22256b3835e92437c19fd04f6d157faeb6ac41c635cc41ea51e6dfc697bdb5a571252bb0a877b84fe1b6296c628d2 WHIRLPOOL 393c34cb5e36263bf38ab2703a19f47348f0e31e6b93d0a972b2a9ab21a28ca235a20c97708e6fe97bf8e347efeb2d1455a2e9e248f9fdb20a053da436e994bd
 EBUILD libreoffice-4.0.0.3.ebuild 17492 SHA256 1aeebdbbdbe332bc377003e3af1383564c0051849feaf48d9fc5925c38c256af SHA512 b1c22e595355883a48dc89ca1555d9bc51ccc8df381226e9f1dba5572863e38487f5b6608cf91716105260641986e31877978a88970b5867e42e821ecfcc72db WHIRLPOOL 82e3223afb07ce9cb9714d343ad1241bd2e96096e2dd08359367c3535649ac1e0dc6a8d8a695c141d405317153eb095f3cc3d56a6189b6fd00bafe0b34617258
 EBUILD libreoffice-4.0.1.2.ebuild 17585 SHA256 b93defa911eaf654aefbe215ebebbee0c72567d9456ea234ef0c97399c69ca06 SHA512 2af9949d8323cd5293e1b682391144bd3d75f80696e5c5503b60fb2c3440ebccdd49ef707586ffd36e7bb11aba7b765efd0b6f105254afc9bca601c68c7c1ac6 WHIRLPOOL e131aca97d7aef48042687fc0ecf14f37c84c00f50d12a19abf216aa9fb7cb64768c6f93f306338373b9cb6b19da8ad6525a0d77cd66da0d935b4aedf3beea35
-EBUILD libreoffice-4.0.9999.ebuild 17556 SHA256 367a158d8b43f23395a1dd4ef98cf9e703b9b1bc463cac03ffdd5f10e368c681 SHA512 c8af7e47041e2fa6ca796625fea09a4a86581a531614e5546d06a6e3f085ecc09a8c1824c9a2fb010bf63fa78067a68b80f6e01ca006f83a441817aadb3bfe75 WHIRLPOOL f7357f87c127bd9df37b74ff4fa13686e68e2449849980d9449be754f7dceee4ef3a867ff879dec7ef60c60e49ed3d6e200f9f04e4023e19da8080c824bd235b
-EBUILD libreoffice-9999-r2.ebuild 17326 SHA256 449a6010510fa8a633abc32f02877594b3c033d90fbe7e5b41af9186490d1d21 SHA512 fb5f815d2b15f449719d047a4e851dc2c00ae3fb96b4061259ef31906271116d4b247c137848f03f3df21c04393662d4afeb9f6fb7e5b7329d4772b03e4e5827 WHIRLPOOL 71dbba2978c6c3378605ffda9e88f5eafa66f34ddc186a6fdcbc14354fb66fe8b3fa8b2671db0d6060314e1ce1e6d837d76e69accee2bec1729016bec7d269cb
-MISC ChangeLog 82627 SHA256 47201bbd7def416073202f72a1c779420391ebb66e8c3ee256284d916a3dee31 SHA512 6e1eeec3f715aee49ececa4a3f58b268b560f814e34f33a4c06707edd3c9a2989d1c2eb7e337482420a1badd796ae218c8cc86ee53c382826c6f50380a30dffa WHIRLPOOL b65df725457a654e57a7b935beadf5876ead72fea04329a7e409a97908a3c68a35b331708f46fe7233342c5307f94880bae72fc25344f253c78a3245edd0943e
+EBUILD libreoffice-4.0.9999.ebuild 17504 SHA256 1543c94d4377160d3c55b1ca820cf5796b44cc55f557ade73cb0f4a59bdfec8e SHA512 00b1a5224095c39168d4031171e68a0e2b41f3202e74f6628574d891b01309cb10dfb41d16cadb89123ead3e054d459a2c17dde13b36537f2c3a53da19ec7b9f WHIRLPOOL 3fcb1276f1f15e1b8ff34018693942e22f3913d7ccc7eadb7d003f83b03a810239889a0a527889e406822e56f2ba90d8b750dd8cfc0f6b1fb4ea97ea91c153e2
+EBUILD libreoffice-9999-r2.ebuild 17272 SHA256 019f79a52aed8ac4ff930cd59d70d1a9fcb673f20c8dc8a9069ef40dca8e5f3c SHA512 1f7fd35de2643f6370fbeb5470c24b1c9c0f28a352517369943fd1f6b795d30a6e86347c50ddeed25f077e195acd8ab6d0cc997bebb940619ae295e0ef202b66 WHIRLPOOL a9f9466e101278777d5b8c2a9f862dd676706f322667844b71ede2af8e60c1ebfe32ae8cbd44a6b98a9704f85199414975a80a8b08bc9ff92663944f1e3601f0
+MISC ChangeLog 82858 SHA256 bb01d4b0523cb8fea0bb6fafc56a39c9a90408480640a5c0a38ba38095e50896 SHA512 23cfc3c34201ee0c57e43c21e55da48229c387075e23e44dd4bb116260e9c5c8e6453dda4311197a0f7cfd26ee64f4aa53c1d80b7ef1d21efd71ef87af816494 WHIRLPOOL 6671b60bd6a139147c919b163e8fe939cd06bab9a08caa5e80f9094cb027242a377e7a5d6a5a2fa00e094648ddeee0770c88e6bc8852c68caa0ca580725303cc
 MISC metadata.xml 1176 SHA256 c1690efe4b2a0fa49801e5cbe66637e25ba71fb902115a75d363f6fe7dc444fb SHA512 2889263d6cf5388d402b2c3999d471e2a2e8c852dcd50755d9f6fd7a549e8b70af7afb66d2f58bc8b9f7bedb4d01a05dda6159c5433a5fdce20ba69f49b9d1b1 WHIRLPOOL e4b548267c79bee3de7bdec839c0fd4d2f1166ded0464d65e6103e63ffb8fb9c08c6a9ff0d01ab09c02826ff1b0b0233a55c5d49b701e963d8c732685b3267dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFUdbIACgkQkKaRLQcq0GKgRQCcCqSDURVDJirM5e7dyNQteeoe
-M+wAoIktwQnRu+Bp6Ccgj2A08J1jSJut
-=Jbd5
+iQIcBAEBCAAGBQJRVWHJAAoJEOSiRoyO7jvozkIP/2Xhie3KZ914SfTInmQu6B6U
+vLA3BnTeai+7pvkmijxxT9hj9PkrAqRMGktkEI0/YJStP8cac+KxB4Rxp7xLXHdy
+tIDG8ST9No0xrmLwPwowaaUTzdzZIfo0LiC8L49GrN/LbGOSVJVqJg8Tu+utKPqA
+ujlBwVx78glxqaTUeXihX/D+U1+/ax4ynA+xSbGr1tagHaMvVWCfBg8DLWfgoQGM
+hHjKroQzqtPEGLIm4NdNal29M9unalm8tk0DF5qbqAuVeTPoFfdoqwQus6I6R9jZ
+JeQX0agx7xZqk/KYzXb5a8MnxVj1KFURXmnl/hnXt0VTqCNqfhL07tT2kS8CIW0t
+obQ2MKsl5n7MpBjkuxRl/E/vxIcY4vsjUZOejzdSi/YUH9oLXAA+oC1dyGAAoh7c
+ZWiro0NEYfF25+jhxH5B1kVDRzKKU1qtckpUo8zmOlo7pux5y6MZm5uoh76izWVp
+einyo6yCTLNYg0hQfUtoHJKDAZx1IWhLIhyh7LyqJcUW5BK1GmrWWdyni1SnuuRC
+RMtMe5swFCW3xf2I/E4+CLP+00gp5fdQiCoyV+jlYIlsxp7DYvkjEjN3aoHR0osV
+NDJOXsl81b/lexqCljM2Pii9LpHB/wI7gG+kFQVOAPbdUM9w99nZgDubZmQOpnrj
+3fmPwz6k+pqYed05rMw6
+=zYCX
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-4.0.9999.ebuild b/app-office/libreoffice/libreoffice-4.0.9999.ebuild
index 802ea1c83656..44d30e4c463d 100644
--- a/app-office/libreoffice/libreoffice-4.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.0.9999.ebuild
@@ -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 @@ src_prepare() {
 	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 @@ src_prepare() {
 		-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 @@ src_configure() {
 		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
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 4908d265bbd4..ef738ec2f60c 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -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_unpack() {
 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 @@ src_prepare() {
 
 	base_src_prepare
 
-	AT_M4DIR="m4"
-	eautoreconf
+	AT_M4DIR="m4" eautoreconf
 	# hack in the autogen.sh
 	touch autogen.lastrun
 
@@ -343,6 +345,11 @@ src_prepare() {
 		-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 @@ src_configure() {
 		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