summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-01-28 20:09:56 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-01-28 20:09:56 +0000
commit9f501756e392de51c115fcf35de72b6baa769d46 (patch)
treea8dfad9cf5174ff37378c700c65eed0d62b83fe8 /x11-misc
parentalpha/arm/ia64/s390/sh/sparc stable wrt #400007 (diff)
downloadgentoo-2-9f501756e392de51c115fcf35de72b6baa769d46.tar.gz
gentoo-2-9f501756e392de51c115fcf35de72b6baa769d46.tar.bz2
gentoo-2-9f501756e392de51c115fcf35de72b6baa769d46.zip
Rename the manpages instead of setting blocker.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/efax-gtk/ChangeLog5
-rw-r--r--x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild10
2 files changed, 11 insertions, 4 deletions
diff --git a/x11-misc/efax-gtk/ChangeLog b/x11-misc/efax-gtk/ChangeLog
index 32b58842a6c1..d79955f0b398 100644
--- a/x11-misc/efax-gtk/ChangeLog
+++ b/x11-misc/efax-gtk/ChangeLog
@@ -1,9 +1,10 @@
# ChangeLog for x11-misc/efax-gtk
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/efax-gtk/ChangeLog,v 1.34 2012/01/28 20:01:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/efax-gtk/ChangeLog,v 1.35 2012/01/28 20:09:56 ssuominen Exp $
28 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> efax-gtk-3.2.9.ebuild:
- Block net-misc/efax wrt #401221 by Fabio Rossi
+ Rename efax.1 to efax-0.9a.1 and efix.1 to efix-0.9a.1 in order to prevent
+ file collision with net-misc/efax wrt #401221 by Fabio Rossi
*efax-gtk-3.2.9 (14 Jan 2012)
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild
index 204ba5d06861..b3ac68dc54ba 100644
--- a/x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild
+++ b/x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild,v 1.2 2012/01/28 20:01:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild,v 1.3 2012/01/28 20:09:56 ssuominen Exp $
EAPI=4
@@ -19,7 +19,6 @@ RDEPEND=">=dev-libs/glib-2.10
x11-libs/c++-gtk-utils:3
x11-libs/gtk+:3"
DEPEND="${RDEPEND}
- !net-misc/efax
dev-util/pkgconfig
nls? ( sys-devel/gettext )"
@@ -42,6 +41,13 @@ src_configure() {
--with-gtk-version=gtk3
}
+src_install() {
+ default
+ # http://bugs.gentoo.org/401221
+ mv -vf "${ED}"usr/share/man/man1/efax{,-0.9a}.1 || die
+ mv -vf "${ED}"usr/share/man/man1/efix{,-0.9a}.1 || die
+}
+
pkg_postinst() {
local spooldir="${EROOT}"/var/spool/fax
[[ -d ${spooldir} ]] && chown lp:lp "${spooldir}"