Fix out-of-source build of perl module, bug #509734.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 33 insertions, 30 deletions

diff --git a/media-gfx/graphite2/ChangeLog b/media-gfx/graphite2/ChangeLog
index 9a2d8b284905..42540c81261c 100644
--- a/media-gfx/graphite2/ChangeLog
+++ b/media-gfx/graphite2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/graphite2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.65 2014/03/01 13:33:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.66 2014/06/19 15:12:13 mgorny Exp $
+
+  19 Jun 2014; Michał Górny <mgorny@gentoo.org> graphite2-1.2.4-r1.ebuild:
+  Fix out-of-source build of perl module, bug #509734.
 
 *graphite2-1.2.4-r1 (01 Mar 2014)
 
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 34bd0a27175d..1cf25fbe3fd5 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -8,26 +8,26 @@ AUX graphite2-1.2.0-solaris.patch 512 SHA256 f79ba2b6c4f108fc02b76ec7e3ed046b153
 DIST graphite2-1.2.1.tgz 4665169 SHA256 7b15b749ae65c1ce3cfb4b98b8d4125e91b695ca31fa83aa51d6542109ab449d SHA512 834de9185c861f1fe54cffc2b6d12117cdd956e64167b0021ea5cb1b83deacff91a2e9d78df9a1a1c038016bf2aad252c88836c49315ca027a0fd0386d8392d9 WHIRLPOOL ec13995a19f9251bf66eeb3d66b7c8ff504ae8993868aa716cb475a69db8f675012445cd2dcb1ac594121c657aafcc1276abfa5ee38620dc6d428c1c8f51e755
 DIST graphite2-1.2.4.tgz 6938866 SHA256 4bc3d5168029bcc0aa00eb2c973269d29407be2796ff56f9c80e10736bd8b003 SHA512 fb4a7bfd5656233975ce339e4e155ccb4fd401b87e30440edab98739355596e41abf5dccf6487d53f6353840a7c87b8270ee33e79c6630cf13a25ac2cb2114de WHIRLPOOL a869dcf293ba1f1d547f86ad88c6bb27879c8ad793135ba29ea12daf19d4fb84f9660fb43bd524934970d163e8bb779a050ec37a734784e25de99bd6463f3d57
 EBUILD graphite2-1.2.1.ebuild 2181 SHA256 e61a584b0e6b798d481bb1fdf51d4964b4974c1632ed001d3a3abcb35a3710ad SHA512 b8d63286e21ec489b334b196c51ac362a0c8a9464e7ba4c6ce303d4813cfded32f354e9a1231bf3435ab60832e0e3d2e341579dab29c48ab195eb7c57f584bde WHIRLPOOL 368a02f7d2388c4dbb4c442ef49012437ad73373fcd55fe75d4b3f74833ff67f64a25042e6fb4c7ed50db0be3158d5e5062036c4a2e5dba4d6c0913367701cc0
-EBUILD graphite2-1.2.4-r1.ebuild 2224 SHA256 c791cdd3a58e6ecc7120919c8d08478977b62980fe88de3ad5853eddfd64f6ea SHA512 1004ecb4fbf2a536781718b71e8d260474662865c2bd94c179bc5f6fe0b49ac494a1845d68c12a2a5225fbff75f06f69203d7311ec2aad2b55dd3155bdc26348 WHIRLPOOL 8f6e91103560b0835c5682d9c0f098dfa500437003b1239945af17e10c5797620886333a4fa50eb6d98974c8eb34dd243ea13cc18def7a7dbd7e7e400f31285b
+EBUILD graphite2-1.2.4-r1.ebuild 2257 SHA256 0e664288ed27095d0fcd012657efcc621511f52dd9003a4e398d2637d872f1b0 SHA512 9c7088558a5478d8b1042b0c65599ae726c15284481438bcdbddf4d0991443869bd4b57840895cb465777210e5721bb228ff4e8047465b7fa40b9180741f3253 WHIRLPOOL 2608dff1ef1d3d5bbe07225d7fc8e530bfd526ae7c06de36b32899f2367cca43cf581f13ec8fe59f40dffdd446f5bf6eb8b03a1c2dbc690e43fc58eedfc643b3
 EBUILD graphite2-1.2.4.ebuild 2186 SHA256 514b056b98bce7cacbc4a6c206875a3969b97da4629100bde363fc16aa697eac SHA512 58af796e4d3c45a4b1beefc5aa850c45231d89754f50ca49c53bc78e101f00606cea22b5f615ef6b7dc086df99ea2683dcccf138460238689738b5a6b7ca4f99 WHIRLPOOL 34649afd71773a1763b5900e5391dd04c6f4c5f7ea1553cac82ca03400bbfb180e15102f463affe20cea9d2db3cf6cbc2fb9cacfa86ca3d1965a0e993fb6f66d
-MISC ChangeLog 9759 SHA256 035393c90222ffc518769e5c56812f8f17776c63c68746eaeb107702be5b7869 SHA512 ba2109d5cd0b51f5f6eaf1dfadcd832d914c47f744a053647965d498681a10d13df0f3c6c5f6f99726ff07c5c463a0d58116dea21c190326d88d590358822c65 WHIRLPOOL c7db38d4b9536966e76f9ff471ab5b7984aad49f040e3303e9e4ff6aee6a37566547e89178ca26c38922047a13f429b7205091b37d1da77029ffbb31e04c9557
+MISC ChangeLog 9892 SHA256 8539cb73d085f473f7c576ed0887aea866b508ab72cb1882008e16e5aeca6dac SHA512 b5409be3df98938bb1fd35bc9946a6c6075575e5dbf5c86aa81ec901ba45879d684216654b861866cfe16fc834d17b51afe686685ac3e46b9660b161eb3cf490 WHIRLPOOL 7225f6f114202aa379998a439d77a507f8e8626d66ff6a017d2154343f0e774371eb547cd0f9952c605b98d19f950591d487686a5c2f0fa465c1f86d832c683e
 MISC metadata.xml 163 SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2 SHA512 44b0091513637625b4b535bbe66410dde135890a60411dcdffc2cfd1750b840bc9655c90b032612ff41499007f45db7bbff28d0874e287ae7411230eea9e0446 WHIRLPOOL 142e95052e96ae05c79dc2e03bb300cc5fcf9a4fa751a55f1f85cad7ab1e597d21acec98517bf92d28a44742b98c7ff0756b660b8e7a86f77e15ed94b6e183a8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTEeGOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTov3PXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOqZ8P/06BR53aoONiPCXjLQ/XYpaY
-wQN/ePbsDcGvHfnV5Ss3cprzcqEeib4q2CdrwaNSijYiuBTJkvk4ADoN2sk5bqeU
-u+hqM0/P0WkQSSafphAshTbsMUsTTY44sp3Dnf1tSHAMKfp+OVOG1TZUdFvidAcC
-ANxwe0T2iWZMIEDJA6G/Hm71ZQq9aVgnGb7xf1ThboNOq4DGmobPyFe9sWaHZORh
-kPDu+HQ9pQ2cO05vLOrTAuGCrfTjzOdF9IgHNxwUGfuFp24mWc7QtEWQxcKGDM73
-y6XkJKdEE2RO2KLWYQW94d9YdxPrMr01O0YaKOKsP0DxZYJAgrjFGhi4RcsKGpDS
-+L7FTKkX0/RXJl2ZJecASWUnpB8llQXsSjRwpEDzYwTx5gt2FAz3dOxTEXCdI/3Q
-oihY66tA8MN1fViexAz0eBUfmlXIP5WcE6McaoL7UCNKHN9pbcmZPTeOZIb46paO
-h41QQdgOmlRLv+PQ/btQcJFpyGUeS4G8Haj+8n3dyd5jd37BQJFu+qHyvd/nnUDo
-qUcf/cnLpXd+AeLsSN22QXf9UUoe19NmEpE0wdfRrsFrRQj9SLDMdsKuWXUSPB3B
-6ou0+pfaAfFnKA+59GJ6du0C0YMUc33yTpGprmnQ9fo3J1R92ojoeHK60cw5eefV
-StDViPAWcVhIV6uQMVj5
-=rc5W
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOm/EQAKfkzRAhxLJnqzIAUXg/QOMu
+qkOEVjDbH5s5NjMQxVkls3YAX2Q2NxNXHmSsvWUaN6+PYifXtnnOdMByU8epHNoX
+8ENx593U789CCiRh2fSYCKl78+kblet0nXfb2UKshxL17DxOgjOpxdWSyyCq4/A+
+nnnQHdmbrZmIk83llQhLxFruuuf20lfdZrDh01MoDVa7SvsQctVzFr/bSkO13N6z
+OfzOIYzhr4oLScE6O2cWdD1Q1nRy6AAvPQZs29KxfjWeus5ZnkXZuJhTdDBt7Nxa
+ZY3W22N+5RktLN30VOGSQf9SOa54V6evHAtKN+t0XS1/eLnWPZGJd1mMtDLLFyWZ
+5SUNB0l2OMLV69wmBaElLyUK/cOC3uoq3IryDcxm+GmXtC+YR1BMUXs+HYhyF+3Z
+nzwJwlsO/+h88Q5otbY1ZL9jgtirN5SxQt+hSvB0vtPoVWg2EosVLFITRn4y3Oea
+1R6cXENCRYMB4ELiMmu6F3QQFMDkE4Z14TM7/9UBMLT4utRANOqZ3DGCh0h+u4ox
+ka2W99ke5JomZyYZiUI9+kg9KHJ7c1XVlhvKo977IPq1G/WpkEd8wnuk/GcV/iD7
+Nq4ePn/MFyAVj2dTkeqOJKDKRTxGR/2uF79JlyzvL4liDFP42/XSy+X6r5SnUgci
+nP2eJLX7uV4cHuXmVpAS
+=dlVe
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphite2/graphite2-1.2.4-r1.ebuild b/media-gfx/graphite2/graphite2-1.2.4-r1.ebuild
index 7034f95d8d54..1bb5de5bca69 100644
--- a/media-gfx/graphite2/graphite2-1.2.4-r1.ebuild
+++ b/media-gfx/graphite2/graphite2-1.2.4-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.2.4-r1.ebuild,v 1.1 2014/03/01 13:33:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.2.4-r1.ebuild,v 1.2 2014/06/19 15:12:13 mgorny Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 
 GENTOO_DEPEND_ON_PERL="no"
-inherit eutils cmake-multilib perl-module python-any-r1
+inherit eutils perl-module python-any-r1 cmake-multilib
 
 DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
 HOMEPAGE="http://graphite.sil.org/"
@@ -46,14 +46,6 @@ pkg_setup() {
 src_prepare() {
 	cmake-utils_src_prepare
 
-	# fix perl linking
-	if use perl; then
-		_check_build_dir init
-		sed -i \
-			-e "s:@BUILD_DIR@:\"${CMAKE_BUILD_DIR}/src\":" \
-			contrib/perl/Build.PL || die
-	fi
-
 	# make tests optional
 	if ! use test; then
 		sed -i \
@@ -62,7 +54,7 @@ src_prepare() {
 	fi
 }
 
-src_configure() {
+multilib_src_configure() {
 	local mycmakeargs=(
 		"-DVM_MACHINE_TYPE=direct"
 		# http://sourceforge.net/p/silgraphite/bugs/49/
@@ -70,7 +62,15 @@ src_configure() {
 			echo "-DGRAPHITE2_NSEGCACHE:BOOL=ON")
 	)
 
-	cmake-multilib_src_configure
+	cmake-utils_src_configure
+
+	# fix perl linking
+	if multilib_is_native_abi && use perl; then
+		_check_build_dir init
+		sed -i \
+			-e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
+			"${S}"/contrib/perl/Build.PL || die
+	fi
 }
 
 src_compile() {