Fix deferred mandir definition using $(mandir) by Maksym Sditanov (bug #534116).

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 30 insertions, 20 deletions

diff --git a/sys-block/parted/ChangeLog b/sys-block/parted/ChangeLog
index 80e350fe8a64..8f24cbd3ae21 100644
--- a/sys-block/parted/ChangeLog
+++ b/sys-block/parted/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-block/parted
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/ChangeLog,v 1.58 2014/12/04 08:34:38 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/ChangeLog,v 1.59 2015/01/03 09:50:51 jer Exp $
+
+  03 Jan 2015; Jeroen Roovers <jer@gentoo.org> parted-3.2.ebuild,
+  +files/parted-3.2-po4a-mandir.patch:
+  Fix deferred mandir definition using $(mandir) by Maksym Sditanov (bug
+  #534116).
 
   04 Dec 2014; Agostino Sarubbo <ago@gentoo.org> parted-3.2.ebuild:
   Stable for ppc64, wrt bug #527846
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index 208d3cf5c0bf..98d09bae7fa6 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -6,28 +6,19 @@ AUX parted-2.4-readline.patch 340 SHA256 22ed598c1e56b0b11a8d238ca304e05d480a5eb
 AUX parted-3.1-readline.patch 340 SHA256 a6ee5fd919a2a035309b70decce60514587a27d1603f361a48dbaf2757b8a8cc SHA512 a32774fb51fee399a2d2248415efc3a9ebe948c342f42704b38b23abfa1067845e8dffd606cb24ed5f971ce7ec3e18b707f72c0d00cb20a4d0dc6350dbb12c29 WHIRLPOOL bd494816afd1c0310848538233509212397d0add3b60579264a4ca2b00babcd2144b708318c26b5e2791787e439df18921e6fc521f931298ec96476f0179260c
 AUX parted-3.1-zfs.patch 4767 SHA256 86dda57387dda83ca0380264cd8536c21cb59f91e83def29194b67e3ab07770c SHA512 2970595d4d507b5fddc3506430c5fa5f4778c493733879289e1ae6314442a29930b97acf3cdf1b1b0ff26c3c5d3b5bf4b1300a3a4ba35daf2d654a8c0d75863d WHIRLPOOL 74585b9a4f5553a7c8b3b2b6eb3871f8353ec1566dafbaea2010c995a6895f89330ff9593b58ee4bc119b7bcc4ed4f155bb279a426767031cfef70e66cd723d6
 AUX parted-3.2-devmapper.patch 1972 SHA256 a72db7a487b891b19e6b859a6deaa4defe0c603842f1a91962de553e68acc96f SHA512 3baf2090ba86242df1633bb4b50deeb6e0226b0a56ad82466ddd76f028a859e29bd021f1f251047cd2a2a5ea1c77ed0129eca8be2e97ee48c21c1d186c07b8da WHIRLPOOL c0a16dce6f967b6d4d343bec9fe34c0803fdb231aa51abede4b94080db90af8be36d232f9d24246808a59be13be7635b520b0ec6c2cd82a99515c2ad0866f876
+AUX parted-3.2-po4a-mandir.patch 275 SHA256 327ffc2ea942a58a63cf6dc21d041965ee76b3b7d4d01b36a0654dcb6b0a92ae SHA512 5ef686f56d8c3939da3f24fdb6196d8858c2f980805f1cb06020d6f6996158f62b8372a233ec3ec98aae30b41034046d615e415b3abf2648db7be88e3b45a872 WHIRLPOOL 643013b78ebd6dbd93a60e7fc46215851bcd9d3166f0df308fa9d1a3927772cf1d63d2ba0da737983b3fbb0ff125f946d27662808e6233f6c60bdf4f7425898d
 DIST parted-2.4.tar.xz 1516412 SHA256 508ff75591b9c8cc9d06f1e0b1db1a082a4b0c1b9d4efaac48b4ca46370d9073 SHA512 1f7ac11079981b176c1157bd6d858e67394bb4be9b622f91d4e78412a41c696809ed60912b8b94f3a2a924b2f43638dd5d6cb6f4c28e8dc63a2d421380cb5477 WHIRLPOOL 688a44c88ffd99523f17eb5c8722cf4ee09bd0af105ab45a7bd08050682345288182f90bbebf6fed8bdbb1a4deac965084a0f430ef6490d154671de58de50574
 DIST parted-3.1.tar.xz 1524344 SHA256 5e9cc1f91eaf016e5033d85b9b893fd6d3ffaca532a48de1082df9b94225ca15 SHA512 f29a67a16cf79f08abbfc5eeb6ad0480d834aa50e715378626dc89e3b12ce71f19202e9f38429e5521ebe877c4e74ff1e08f0b0ecbdbe79ba1c51fdcbef6e852 WHIRLPOOL 8e4c0b3f045405acbf5eab8d72d46450cb5c6adc50b9eba4ad4a9600da9ea203b412cf151d03782b045dc7f6232bd79ace85d01ce9d2faba458ee48b9df00de9
 DIST parted-3.2.tar.xz 1655244 SHA256 858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 SHA512 4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4 WHIRLPOOL af928177b893150ac6d5e0efcef542b6fa0df6b135f975078f7d8d5f7a4b109ef4c1f8eeaf6afc5c34448ff662ce4cbe5289e084f4ec05257666503a0cd3c93f
 EBUILD parted-2.4.ebuild 1387 SHA256 59ae342e7bf71a6c4f7a7def76dd52c31091c0cf2d88689a04c2bdadcfe60345 SHA512 c77e75b495461654140ca4f140111f50c2850d903955d46cd646cafefae893c2f2fab36884b60d377f45fa843269d8ea2a53616f2574412616680ceca5c6fe07 WHIRLPOOL 98d0c4085923c1c20081220c83500428cf1ebebcc7168d584f3c93cd51f02a584efeeed36b2bb4fa79cfab538cce29a9ec29b97376033f59cbbad5c24daaae15
 EBUILD parted-3.1-r1.ebuild 2207 SHA256 71d5c032cca8c270164b18e1b75e0503b253b7b0972844d28fcd4c4f2abc18b6 SHA512 93c42236684890341326850966031a59b15e305f99cd4852a238ca669c6800d5efee9be60ab5ce72d509ee305a6d4f75505749e38f1b8cd5c8938a661141431f WHIRLPOOL f018161c2b9a9a1cb2123f87f1997c5f8801861b79af206a37eaf198fbc091a8c88dbcd6a799929e4372a49b5cc100a79e102afb002d413b09e0297ef2b5ebc8
-EBUILD parted-3.2.ebuild 1335 SHA256 2b66f866a9f944ce02343dea5fdeacbcdea577d365f433ef52e20ec3ddf62f4b SHA512 86972e98192b02c7df31dd7d3d9f6505145d90f1bbfd46f241ed0271ad591722c6bfd4c6ef4cbfb39a99fcbc2f1f6a00091329762af44914756a5379e3301942 WHIRLPOOL 2badaa10212b7dbd54ea074e6232abeb9710db7de85b4454c0ee85797123a5f26e1950ff637d7605da022048e6b8147d466a30881200a3784578126cad9dd809
-MISC ChangeLog 29270 SHA256 a25b10f834f64db46c12a7d83ddd442c3601604d4b76291125c6a94d3287aded SHA512 2da5bf517bbf99d083c6ae7bb59c97554934dbed3135938d278bf33add55c18ec0d72ddf29d812d125665ad1f14a4e0dbb237a928b7cc6649d7ad5ca80ab15f1 WHIRLPOOL e1cbf1066f7a0fe99dedd75d73131997705412259cd87d276c3a481a43353ba70f055db3fcf3427ce5377340bebb50a60fd5f28c2e8a5df8966e1a4abef8a8b7
+EBUILD parted-3.2.ebuild 1409 SHA256 20854060a19e1dc5a8e198a792b287913778a6b1d46f65b2db1c7862f67db256 SHA512 ff75f8aa7bcdfe60fb35e9b98361827f65d846d759d88e19c6232cecafd36702a3ecfcf4fab2f0a368bb6fe8d255c4546ec86be21a5dacf458038bfa156f88d0 WHIRLPOOL 0debadf5c89c2aeace202d39796b4348bf96ac9ed38ca5409dc4effa8cd89eaf71a19db334bf4d48b3ce9d8d47b52a4b1ec7031069a957f4a68ba703dc70ffde
+MISC ChangeLog 29461 SHA256 76aa87c3ab48d99dd9267a815b304eb09e43d1e9f1c61b7b48ccd466a28204c6 SHA512 c25f9aaaad7f5b9d824c8308a7876eb3d570289c146b6b2dbeeccec1fec3b21154f09a15ce6dfa697179b7d950ccf7f5adc3be7ed08819b1aa74c13445f2823a WHIRLPOOL 57f6d3692727e75b2a48dde8c7a85356f8c0cc5a461d143ed71fae78f12c2d43b329229f8c1100c6e130bd27df5d631fc38c5b3e5ac594bb4adc2e0bb51fdffb
 MISC metadata.xml 654 SHA256 6e27cdd8e0c516256079e3ad9606e7b660a3fe223e3d769c3a5fc265f5d13bd2 SHA512 4e99dbb6bacc84d5dfccf4f56cd474aa5cd9368f23989b71d38101913702f5670af44f41947158b07662fcbee3ddfc36eb8cdf8c3899387a8cf4efd4c24c6ccf WHIRLPOOL 49366ca8e059614582ec750bd215ef79b2090cb615e85d1d5e5d4093c135ff9a4513862ecf9827318163a622df035855b0795ab6405427c4d48712fe2080e0fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUgByfAAoJELp701BxlEWfCgIP/2f1ErachK2JAOr/mjAqIxY/
-2A447W/eBBEiJkCzJzuKei7W41lmaiXdEEWr20kMa0i01Q4Bv6N5Cn8LiJRm9obM
-6v3VMlCbj2vlMjHVv0gI2tFfmpFYpAMEmUp9z7s4Kxj1lVaYwDME0hF7xJf8/4e0
-gtJvkoUqhK3FR5vz4FzDhUNnNRsbTp+DmxB737tQsXMTSw9Q36IGZZcZYtWOKry9
-MEqbn0jtT9EvX+5rjoY+l+tFWjJufyyP+nad+9HjQCHtq2YJn8hMC1uM9qQAIYqH
-M1+awWsGPdviT1RcPXekIgBnscjzvu7fLm2GpJ4y0uO3mfQ7fnLyQkhlt7bwTQcx
-1JzfhMG+hZV0IwHXHHE1NFPYpK3OBHUZ19DBVf6TSTsHbSf6a+rs5s/w6xA+SCNO
-j79HeQ0zhzYjxSP4OvPwgklRpPFA34pN4Z0TBqBMLRDa5jMaXjwtGO0IhlsOXxQG
-j+bhI6A72e9nFeOZ3UlsIEMEoCwbH4Vssle69o0C0DRIFB7E58fEBumcelW0cYDN
-jcnUfzhuu6gIVeLB3HWRusj09EX+9+FjiHnKN77XHyaaWq4+7mX3yBTBXd1hxxZP
-IrfbyqfUjjGCnr9bZ4GO4tK+zFuo+6JxW4yX2MEHlRi6MANwUFL0APyoI4fEWGUP
-OOvNUzbrkzQXdMb6jPgG
-=Bgi/
+iEYEAREIAAYFAlSnu4AACgkQVWmRsqeSphMsKwCeJwX4cTP7HE0zIXtBHCJzD6D2
+EugAn0yZCLl1SCuk+f3PxzVsNaaM6hVQ
+=CMHS
 -----END PGP SIGNATURE-----
diff --git a/sys-block/parted/files/parted-3.2-po4a-mandir.patch b/sys-block/parted/files/parted-3.2-po4a-mandir.patch
new file mode 100644
index 000000000000..be0a9c69f403
--- /dev/null
+++ b/sys-block/parted/files/parted-3.2-po4a-mandir.patch
@@ -0,0 +1,11 @@
+--- a/doc/po4a.mk
++++ b/doc/po4a.mk
+@@ -23,7 +23,7 @@
+ # threshold is 80%), it won't be distributed, and the build won't fail.
+ #
+ 
+-mandir = $(mandir)/$(lang)
++mandir := $(mandir)/$(lang)
+ 
+ # Inform automake that we want to install some man pages in section 1, 5
+ # and 8.
diff --git a/sys-block/parted/parted-3.2.ebuild b/sys-block/parted/parted-3.2.ebuild
index e907295615d5..2f0e55802e96 100644
--- a/sys-block/parted/parted-3.2.ebuild
+++ b/sys-block/parted/parted-3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-3.2.ebuild,v 1.12 2014/12/04 08:34:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-3.2.ebuild,v 1.13 2015/01/03 09:50:51 jer Exp $
 
 EAPI=5
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
 HOMEPAGE="http://www.gnu.org/software/parted"
@@ -32,6 +32,9 @@ DEPEND="
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.2-devmapper.patch
+
+	epatch "${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
+	eautoreconf
 }
 
 src_configure() {