Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/libiconv: libiconv-1.14-r1.ebuild ChangeLog
Date: Thu, 27 Mar 2014 06:37:45
Message-Id: 20140327063741.BE9C42004F@flycatcher.gentoo.org
1 vapier 14/03/27 06:37:41
2
3 Modified: libiconv-1.14-r1.ebuild ChangeLog
4 Log:
5 Rename man pages to avoid collisions w/man-pages package with USERLAND=GNU systems #503162 by René Rhéaume.
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
8
9 Revision Changes Path
10 1.6 dev-libs/libiconv/libiconv-1.14-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libiconv/libiconv-1.14-r1.ebuild?rev=1.6&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libiconv/libiconv-1.14-r1.ebuild?rev=1.6&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libiconv/libiconv-1.14-r1.ebuild?r1=1.5&r2=1.6
15
16 Index: libiconv-1.14-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.14-r1.ebuild,v
19 retrieving revision 1.5
20 retrieving revision 1.6
21 diff -u -r1.5 -r1.6
22 --- libiconv-1.14-r1.ebuild 27 Mar 2014 06:30:41 -0000 1.5
23 +++ libiconv-1.14-r1.ebuild 27 Mar 2014 06:37:41 -0000 1.6
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2014 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.14-r1.ebuild,v 1.5 2014/03/27 06:30:41 vapier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.14-r1.ebuild,v 1.6 2014/03/27 06:37:41 vapier Exp $
29
30 EAPI="4"
31
32 @@ -16,7 +16,7 @@
33 IUSE="+static-libs"
34
35 DEPEND="!sys-libs/glibc
36 - !sys-apps/man-pages"
37 + !userland_GNU? ( !sys-apps/man-pages )"
38 RDEPEND="${DEPEND}"
39
40 src_prepare() {
41 @@ -39,4 +39,15 @@
42 # Install in /lib as utils installed in /lib like gnutar
43 # can depend on this
44 gen_usr_ldscript -a iconv charset
45 +
46 + # If we have a GNU userland, we probably have sys-apps/man-pages
47 + # installed, which means we want to rename our copies #503162.
48 + # The use of USELAND=GNU is kind of a hack though ...
49 + if use userland_GNU ; then
50 + cd "${ED}"/usr/share/man || die
51 + local f
52 + for f in man*/*.[0-9] ; do
53 + mv "${f}" "${f%/*}/${PN}-${f#*/}" || die
54 + done
55 + fi
56 }
57
58
59
60 1.47 dev-libs/libiconv/ChangeLog
61
62 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libiconv/ChangeLog?rev=1.47&view=markup
63 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libiconv/ChangeLog?rev=1.47&content-type=text/plain
64 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libiconv/ChangeLog?r1=1.46&r2=1.47
65
66 Index: ChangeLog
67 ===================================================================
68 RCS file: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v
69 retrieving revision 1.46
70 retrieving revision 1.47
71 diff -u -r1.46 -r1.47
72 --- ChangeLog 27 Mar 2014 06:30:41 -0000 1.46
73 +++ ChangeLog 27 Mar 2014 06:37:41 -0000 1.47
74 @@ -1,6 +1,10 @@
75 # ChangeLog for dev-libs/libiconv
76 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
77 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.46 2014/03/27 06:30:41 vapier Exp $
78 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.47 2014/03/27 06:37:41 vapier Exp $
79 +
80 + 27 Mar 2014; Mike Frysinger <vapier@g.o> libiconv-1.14-r1.ebuild:
81 + Rename man pages to avoid collisions w/man-pages package with USERLAND=GNU
82 + systems #503162 by René Rhéaume.
83
84 27 Mar 2014; Mike Frysinger <vapier@g.o>
85 +files/libiconv-1.14-no-gets.patch, libiconv-1.14-r1.ebuild: