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
commita07597c793a4ea4c24d586bf563b694c5d0a47c3 (patch)
treef781fd9bb2b2b3f8fd844ba0b0477a51da798740 /x11-misc/efax-gtk
parentalpha/arm/ia64/s390/sh/sparc stable wrt #400007 (diff)
downloadhistorical-a07597c793a4ea4c24d586bf563b694c5d0a47c3.tar.gz
historical-a07597c793a4ea4c24d586bf563b694c5d0a47c3.tar.bz2
historical-a07597c793a4ea4c24d586bf563b694c5d0a47c3.zip
Rename the manpages instead of setting blocker.
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'x11-misc/efax-gtk')
-rw-r--r--x11-misc/efax-gtk/ChangeLog5
-rw-r--r--x11-misc/efax-gtk/Manifest18
-rw-r--r--x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild10
3 files changed, 20 insertions, 13 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/Manifest b/x11-misc/efax-gtk/Manifest
index 55bd2f2d3fbe..3f45790bd771 100644
--- a/x11-misc/efax-gtk/Manifest
+++ b/x11-misc/efax-gtk/Manifest
@@ -6,17 +6,17 @@ DIST efax-gtk-3.2.2.src.tgz 1270458 RMD160 2586ed69c593119707e0303b4714c648f4fe8
DIST efax-gtk-3.2.9.src.tgz 1176921 RMD160 5cc776888823786790eda7a75fd8d5c26115fe71 SHA1 9813f5a293f7b8419a07c14cc5e0c4d9ca9fbd73 SHA256 92f4047dcbbafcebaad11f86115abed2e1ac4c34ab0dddba0bb3ad6875bee79b
EBUILD efax-gtk-3.0.18.ebuild 1171 RMD160 9a8825e741bb1118a95ae725dc7e9dae7e14648e SHA1 9f53e1561df7383e9023910772c98d7ede30a135 SHA256 9b06b646e8a546dc9af0dfc40cc8cc26b76d92a9920b998f2dfa27425a9c2108
EBUILD efax-gtk-3.2.2.ebuild 1147 RMD160 4eb0b4c06412cfa75fb33137a2dc3dd97a6864b6 SHA1 bbbe9fc08a2716289fc535f91bb8c79fc8ff59b8 SHA256 c4b36c38bcf6eae3140b3a9a09666467c61bf56ede68118884a5befdbf9deb4d
-EBUILD efax-gtk-3.2.9.ebuild 1159 RMD160 87cb6f433a0a97e0ff1c3ab4f5aa49df232d9f01 SHA1 938654141c6c6f047dd1f1dcd4e59709820d267e SHA256 fc5a224da0259e6ffcd05d5cba74a3ca20d488e644fb857028a5b7f2210f62d4
-MISC ChangeLog 4740 RMD160 6364285abd97a5cbe0bd92395494cf7ba4bad66a SHA1 7c7a824536afd8b82fddf1a0817c300b0878b7ed SHA256 2aeb32581d9c6d029d1cab0989cd62374f4b6603cdeaaff74e31310b84bbdc18
+EBUILD efax-gtk-3.2.9.ebuild 1316 RMD160 462c0891b22c56af3a3e67be50a05ef7cbfe4e47 SHA1 de7098e4f470c67c4d3f8b6130d44a8b4159bd15 SHA256 fe512da5d93d4caee1f429249a950e4673f3bfbd41ef9a11a996d6b42af5b2df
+MISC ChangeLog 4831 RMD160 76b6d9f249ee9ea1b0678f734a41fc07e9fcb662 SHA1 a517337dd7fe709a72785970f3a48b54f6142f61 SHA256 5a9eed0e157acc60cf9aa5c9ee9a7324ed78d83bf25269294441ee4a783050cb
MISC metadata.xml 165 RMD160 4ebc1c537fcebcb28586a47c958a7d0237f3bbcc SHA1 87fed26b774e4dd2226bea04c4bcc8ba39fcc4c3 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBAgAGBQJPJFOBAAoJEEdUh39IaPFNzK0IAJUIqne4esgqBdXHmkfZw//i
-678QKqmUzZc6oL+9Qx45Bdmdxd0FJ1+y3HP7EbWpDbax1q50IAnlL/epha33XCRm
-MHRP1aYEb1I30J+cUszkDIjBx+C6kOuqRATeUIufG/4LWbHTW+lX6U2xUdnhUNuo
-k1Qf2O9F/pkPsEa46Q4h6V5eatggF0VJ2kwH/C0tIrOgO6vj2BGS90kmhylPWRx1
-ufZCfYScEaomE+dyWQGo8xi50im52JbkY6bOq8y4r4ch1JeAhgfbE5IR2ObDu4eX
-WK3/wLpEEmX1XTE+ACrnB7djNVsND6DpnZ1eOBqBnUd7Tb+/2QdzZRUmmVETXAk=
-=bJvT
+iQEcBAEBAgAGBQJPJFWLAAoJEEdUh39IaPFN8GoH/17gO9NIiE54aROjFKbdLYwX
+fwErlRwy/b8ULEuPUJNF3p9anLGARj3hY/IbPg4dXIwg5IwMIfSx1eYC17k05/ko
+KIVQ4l0DNw3VywmJ4UByp3SRVeMmIYNDr8nhw55sUmsqlZhRlazy9Xd6KrMsq6TV
+u3dX0O79YlRZ45lwxYggSrBIROiVUxouAmK8gQOr6UQjS3WDmZ6YivEGU2Nv38Np
+cj3GdSem17e9UlxklaPnSPhHdn5I7PwImUxa45KLCgnna0MWyTD5B/8CceP3769g
+KycCkRvCTwcqgAqMoIJezdBckYLDnTZimcQJoY2/vhm+NCgVg2OB3NZYRp9GdM0=
+=i3m7
-----END PGP SIGNATURE-----
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}"