From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 188141387FD for ; Thu, 27 Mar 2014 06:37:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 90E7AE0A6B; Thu, 27 Mar 2014 06:37:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A690E0A6B for ; Thu, 27 Mar 2014 06:37:43 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F385E33FCF2 for ; Thu, 27 Mar 2014 06:37:42 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id BE9C42004F; Thu, 27 Mar 2014 06:37:41 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/libiconv: libiconv-1.14-r1.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: libiconv-1.14-r1.ebuild ChangeLog X-VCS-Directories: dev-libs/libiconv X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20140327063741.BE9C42004F@flycatcher.gentoo.org> Date: Thu, 27 Mar 2014 06:37:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1407c0b9-6e4c-4dd1-98e9-f4791a0ab47f X-Archives-Hash: 066c4c8a1656139bc8534fbbc64eecac vapier 14/03/27 06:37:41 Modified: libiconv-1.14-r1.ebuild ChangeLog Log: Rename man pages to avoid collisions w/man-pages package with USERLAND=GNU systems #503162 by René Rhéaume. (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200) Revision Changes Path 1.6 dev-libs/libiconv/libiconv-1.14-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libiconv/libiconv-1.14-r1.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libiconv/libiconv-1.14-r1.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libiconv/libiconv-1.14-r1.ebuild?r1=1.5&r2=1.6 Index: libiconv-1.14-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.14-r1.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libiconv-1.14-r1.ebuild 27 Mar 2014 06:30:41 -0000 1.5 +++ libiconv-1.14-r1.ebuild 27 Mar 2014 06:37:41 -0000 1.6 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.14-r1.ebuild,v 1.5 2014/03/27 06:30:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.14-r1.ebuild,v 1.6 2014/03/27 06:37:41 vapier Exp $ EAPI="4" @@ -16,7 +16,7 @@ IUSE="+static-libs" DEPEND="!sys-libs/glibc - !sys-apps/man-pages" + !userland_GNU? ( !sys-apps/man-pages )" RDEPEND="${DEPEND}" src_prepare() { @@ -39,4 +39,15 @@ # Install in /lib as utils installed in /lib like gnutar # can depend on this gen_usr_ldscript -a iconv charset + + # If we have a GNU userland, we probably have sys-apps/man-pages + # installed, which means we want to rename our copies #503162. + # The use of USELAND=GNU is kind of a hack though ... + if use userland_GNU ; then + cd "${ED}"/usr/share/man || die + local f + for f in man*/*.[0-9] ; do + mv "${f}" "${f%/*}/${PN}-${f#*/}" || die + done + fi } 1.47 dev-libs/libiconv/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libiconv/ChangeLog?rev=1.47&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libiconv/ChangeLog?rev=1.47&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libiconv/ChangeLog?r1=1.46&r2=1.47 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- ChangeLog 27 Mar 2014 06:30:41 -0000 1.46 +++ ChangeLog 27 Mar 2014 06:37:41 -0000 1.47 @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libiconv # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.46 2014/03/27 06:30:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.47 2014/03/27 06:37:41 vapier Exp $ + + 27 Mar 2014; Mike Frysinger libiconv-1.14-r1.ebuild: + Rename man pages to avoid collisions w/man-pages package with USERLAND=GNU + systems #503162 by René Rhéaume. 27 Mar 2014; Mike Frysinger +files/libiconv-1.14-no-gets.patch, libiconv-1.14-r1.ebuild: