Revision bump with patch to fix CUPS issue. Gentoo bug 278047, patch by Bailey Kong

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 81 insertions, 2 deletions

diff --git a/net-print/xfprint/ChangeLog b/net-print/xfprint/ChangeLog
index a03a151a4ccc..ea9983098401 100644
--- a/net-print/xfprint/ChangeLog
+++ b/net-print/xfprint/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/xfprint
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/xfprint/ChangeLog,v 1.22 2009/11/24 20:23:55 darkside Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/xfprint/ChangeLog,v 1.23 2010/05/12 20:33:53 darkside Exp $
+
+*xfprint-4.6.1-r1 (12 May 2010)
+
+  12 May 2010; Jeremy Olexa <darkside@gentoo.org> +xfprint-4.6.1-r1.ebuild,
+  +files/xfprint-4.6.1-xfconf_channel_fix.diff:
+  Revision bump with patch to fix CUPS issue. Gentoo bug 278047, patch by
+  Bailey Kong
 
   24 Nov 2009; Jeremy Olexa <darkside@gentoo.org> xfprint-4.6.1.ebuild:
   Add prefix keywords, as tested in prefix overlay
diff --git a/net-print/xfprint/files/xfprint-4.6.1-xfconf_channel_fix.diff b/net-print/xfprint/files/xfprint-4.6.1-xfconf_channel_fix.diff
new file mode 100644
index 000000000000..7944041f09c2
--- /dev/null
+++ b/net-print/xfprint/files/xfprint-4.6.1-xfconf_channel_fix.diff
@@ -0,0 +1,32 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=6089
+https://bugs.gentoo.org/show_bug.cgi?id=278047
+
+--- xfprint-manager/main.c.bak	2010-02-26 01:34:35.617657199 -0800
++++ xfprint-manager/main.c	2010-02-26 01:36:58.282657642 -0800
+@@ -41,6 +41,7 @@
+ #include <libxfprint/printer-list-window.h>
+ 
+ #define CHANNEL         "xfprint"
++#define PROP_PRINTING_SYSTEM  "/printing-system"
+ 
+ extern void mainwin_setup (void);
+ 
+@@ -66,15 +67,15 @@
+   channel = xfconf_channel_new (CHANNEL);
+   if (channel) {
+ 
+-    if (xfconf_channel_has_property (channel, "/XfPrint/system")) {
+-      const gchar *system_name = xfconf_channel_get_string (channel, "/XfPrint/system", "none");
++    if (xfconf_channel_has_property (channel, PROP_PRINTING_SYSTEM)) {
++      const gchar *system_name = xfconf_channel_get_string (channel, PROP_PRINTING_SYSTEM, "none");
+       if (g_ascii_strcasecmp (system_name, "none") != 0) {
+         ps = printing_system_new (system_name);
+         if (ps == NULL);
+           g_warning ("Unable to load printing system module %s", system_name);
+       }
+     } else {
+-      g_warning ("%s: XfPrint/system is not set", PACKAGE);
++      g_warning ("%s: %s is not set", PACKAGE, PROP_PRINTING_SYSTEM);
+     }
+   }
+ 
diff --git a/net-print/xfprint/xfprint-4.6.1-r1.ebuild b/net-print/xfprint/xfprint-4.6.1-r1.ebuild
new file mode 100644
index 000000000000..31d15bd87d70
--- /dev/null
+++ b/net-print/xfprint/xfprint-4.6.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/xfprint/xfprint-4.6.1-r1.ebuild,v 1.1 2010/05/12 20:33:53 darkside Exp $
+
+EAUTORECONF=yes
+EAPI=2
+inherit xfconf
+
+DESCRIPTION="Frontend for printing, management and job queue."
+HOMEPAGE="http://www.xfce.org/projects/xfprint"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+IUSE="cups debug"
+
+RDEPEND="app-text/a2ps
+	>=x11-libs/gtk+-2.10:2
+	>=xfce-base/libxfce4util-4.6
+	>=xfce-base/libxfcegui4-4.6
+	>=xfce-base/xfconf-4.6
+	cups? ( net-print/cups )
+	!cups? ( net-print/lprng )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool"
+
+pkg_setup() {
+	XFCONF="--disable-dependency-tracking
+		--enable-bsdlpr
+		$(use_enable cups)
+		$(xfconf_use_debug)"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	PATCHES="${FILESDIR}/${P}-xfconf_channel_fix.diff"
+}
+
+src_prepare() {
+	sed -i -e "/24x24/d" "${S}"/icons/Makefile.am || die "sed failed"
+	xfconf_src_prepare
+}