x11-misc/efax-gtk: Depend on x11-libs/c++-gtk-utils[gtk] (bug #477908 by raffaele).

Package-Manager: portage-2.3.0_rc1

4 files changed, 2 insertions, 111 deletions

diff --git a/x11-misc/efax-gtk/Manifest b/x11-misc/efax-gtk/Manifest
index 0d345168f4b6..6941bdda02bb 100644
--- a/x11-misc/efax-gtk/Manifest
+++ b/x11-misc/efax-gtk/Manifest
@@ -1,4 +1,2 @@
-DIST efax-gtk-3.2.11.src.tgz 1236415 SHA256 15f726a7cd8ba28f0934433d8bfd2c80c5b94fbe61174fe17e2c85d296ce8cd2 SHA512 35f07019983170781b86f99e6d96e0a738d49a1aadaeded76b1f185e42313c5e4b9a88daff21a57286f2a60e4113c2965ca1c4747c5352906e2f9767b5c5f715 WHIRLPOOL f7127c23d53a173ae63c07fac36148ec226a0250a6fb66d3b2a254868c9a37fc58f337c5aaac26070e3384a430aeb6e757b3c86a866d50d0dc1dc7b0b61ceb70
-DIST efax-gtk-3.2.12.src.tgz 1242786 SHA256 5014b758db9533efbf898be96b0edbda577b6cd9ea34004171731ba0ff0e210e SHA512 630e3cb3740c21b51ba5b4e6144870e9b4107bbc9367bf6d09a42b936fe642e7816cfaf657dc02f9dc030ca83657cc148dbc13d03607bf72591ce2df578ef679 WHIRLPOOL 82cb831d42f8c36a8859dd2a049fbe22af5850b8fb52b1dce54b3d6db892b3e4ee372cb624fe699141dca323d944361a36e941db54b834e0c22aa17fc48d6253
 DIST efax-gtk-3.2.13.src.tgz 1245015 SHA256 4d09de4a0c530fe24cf8d8061aae92d5c2e6b8c52120b97be0ad8e4c3b68ac37 SHA512 dde0f79df444bdaf5250eae1dc0a94184c0b32e319b04943e81178d2a744bb6e387b5aa0f2379bd23dd4c18d28c30c60083c0cda5819e5c853c1b7bdc4f5b64f WHIRLPOOL 0336f7e6cb566cc3debc76cd9e2c0e67ca4d6b796693d4c8cd56e28166380f814290df55a9feefea111bbcf3ea0f27d6ed27ffd9b10784081fd0395314218e94
 DIST efax-gtk-3.2.9.src.tgz 1176921 SHA256 92f4047dcbbafcebaad11f86115abed2e1ac4c34ab0dddba0bb3ad6875bee79b SHA512 a2a4a648b95f9143f8ad3b42c3f8f86323a2b312fed87616eddeaebe06742a5a4ae841d79f3078bf9e819288252ad4d79ec429a66116c1d2b8df8a8a13cac806 WHIRLPOOL 9e21ff1ae8787306c0c23661d6a0d998037f982f9ef37f150a90d64710f6ad1aea8adb28729eb549be981386f1f8605e908b5a1126b058c06ccc09951d38885b
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.11.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.11.ebuild
deleted file mode 100644
index f645851ebe86..000000000000
--- a/x11-misc/efax-gtk/efax-gtk-3.2.11.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="A graphical frontend for the 'efax' application"
-HOMEPAGE="http://efax-gtk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/glib-2.10
-	media-libs/tiff:0
-	x11-libs/libX11
-	x11-libs/c++-gtk-utils:3
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-DOCS="AUTHORS BUGS ChangeLog README"
-
-src_prepare() {
-	# Prevent sandbox violation with chown/chgrp and existing spooldir
-	sed -i -e '/ch.*lp.*spooldir/d' efax-gtk-faxfilter/Makefile.in || die
-
-	sed -i \
-		-e '/^Encoding/d' \
-		-e '/^Icon/s:.png::' \
-		-e '/^Categories/s:Application;::' \
-		${PN}.desktop || die
-}
-
-src_configure() {
-	econf --disable-silent-rules \
-		$(use_enable nls) \
-		--with-gtk-version=gtk3
-}
-
-src_install() {
-	default
-	# https://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}"
-}
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.12.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.12.ebuild
deleted file mode 100644
index ec228b5db51c..000000000000
--- a/x11-misc/efax-gtk/efax-gtk-3.2.12.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="A graphical frontend for the 'efax' application"
-HOMEPAGE="http://efax-gtk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/glib-2.10
-	media-libs/tiff:0=
-	x11-libs/libX11
-	x11-libs/c++-gtk-utils:0
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-DOCS="AUTHORS BUGS ChangeLog README"
-
-src_prepare() {
-	# Prevent sandbox violation with chown/chgrp and existing spooldir
-	sed -i -e '/ch.*lp.*spooldir/d' efax-gtk-faxfilter/Makefile.in || die
-
-	sed -i \
-		-e '/^Encoding/d' \
-		-e '/^Categories/s:Office;::' \
-		${PN}.desktop || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-gtk-version=gtk3
-}
-
-src_install() {
-	default
-	# File collision with net-misc/efax wrt #401221
-	mv "${ED}"usr/share/man/man1/efax{,-0.9a}.1 || die
-	mv "${ED}"usr/share/man/man1/efix{,-0.9a}.1 || die
-}
-
-pkg_postinst() {
-	local spooldir="${EROOT}"/var/spool/fax
-	[[ -d ${spooldir} ]] && chown lp:lp "${spooldir}"
-}
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.13.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.13.ebuild
index f124933a0688..9376e85fd4d8 100644
--- a/x11-misc/efax-gtk/efax-gtk-3.2.13.ebuild
+++ b/x11-misc/efax-gtk/efax-gtk-3.2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ IUSE="nls"
 RDEPEND=">=dev-libs/glib-2.10
 	media-libs/tiff:0=
 	x11-libs/libX11
-	x11-libs/c++-gtk-utils:0
+	x11-libs/c++-gtk-utils:0[gtk]
 	x11-libs/gtk+:3"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig