diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2015-01-03 09:50:51 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2015-01-03 09:50:51 +0000 |
| commit | 1c2baab268297ed4000a8aed5b9f074c04f1c915 (patch) | |
| tree | 75bee19016627dc9296fe1cc9a62a99257f8ef6e /sys-block | |
| parent | mask GGZ for removal (diff) | |
| download | gentoo-2-1c2baab268297ed4000a8aed5b9f074c04f1c915.tar.gz gentoo-2-1c2baab268297ed4000a8aed5b9f074c04f1c915.tar.bz2 gentoo-2-1c2baab268297ed4000a8aed5b9f074c04f1c915.zip | |
Fix deferred mandir definition using $(mandir) by Maksym Sditanov (bug #534116).
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'sys-block')
| -rw-r--r-- | sys-block/parted/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-block/parted/files/parted-3.2-po4a-mandir.patch | 11 | ||||
| -rw-r--r-- | sys-block/parted/parted-3.2.ebuild | 9 |
3 files changed, 24 insertions, 5 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/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() { |