464958 478656 Version bump, bug #464958. Move to python-single-r1 and EAPI=5. Always install systemd unit files and fix path to udev helpers with an updated 'split' patch, bug #478656.

(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806)

3 files changed, 273 insertions, 1 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index 0eb29256e58b..9fcfd784cb22 100644
--- a/app-admin/system-config-printer-common/ChangeLog
+++ b/app-admin/system-config-printer-common/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/system-config-printer-common
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.96 2013/04/09 16:40:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.97 2013/08/11 20:02:07 eva Exp $
+
+*system-config-printer-common-1.4.1 (11 Aug 2013)
+
+  11 Aug 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  +system-config-printer-common-1.4.1.ebuild,
+  +files/system-config-printer-common-1.4.1-split.patch:
+  464958 478656 Version bump, bug #464958. Move to python-single-r1 and EAPI=5.
+  Always install systemd unit files and fix path to udev helpers with an
+  updated 'split' patch, bug #478656.
 
   09 Apr 2013; Agostino Sarubbo <ago@gentoo.org>
   system-config-printer-common-1.3.12.ebuild:
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.4.1-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.4.1-split.patch
new file mode 100644
index 000000000000..9f586f850251
--- /dev/null
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.4.1-split.patch
@@ -0,0 +1,180 @@
+--- a/Makefile.am	2013-08-11 23:10:53.838280533 +0200
++++ b/Makefile.am	2013-08-11 23:31:55.429404471 +0200
+@@ -1,5 +1,5 @@
+-CFLAGS=-g -O2 -Wall
++AM_CFLAGS=-Wall
+ 
+ SUBDIRS=po
+ 
+ EXPORT_MODULES=					\
+@@ -84,87 +82,21 @@
+ 	rm -f .stamp-distutils-in-builddir
+ 
+ nobase_pkgdata_SCRIPTS=				\
+-	check-device-ids.py			\
+-	pysmb.py				\
+-	scp-dbus-service.py			\
+-	system-config-printer.py		\
+-	install-printerdriver.py		\
+-	troubleshoot/__init__.py		\
+-	applet.py
++	check-device-ids.py
+ 
+ nobase_pkgdata_DATA=					\
+-	asyncconn.py					\
+-	asyncipp.py					\
+-	asyncpk1.py					\
+-	authconn.py					\
+ 	config.py					\
+-	cupspk.py					\
+ 	debug.py					\
+ 	dnssdresolve.py					\
+-	errordialogs.py					\
+-	HIG.py						\
+ 	firewallsettings.py					\
+-	gui.py						\
+-	gtkinklevel.py					\
+ 	installpackage.py				\
+-	jobviewer.py					\
+ 	monitor.py					\
+-	newprinter.py					\
+-	options.py					\
+-	optionwidgets.py				\
+ 	PhysicalDevice.py				\
+-	ppdcache.py					\
+ 	ppdippstr.py					\
+-	ppdsloader.py					\
+-	printerproperties.py				\
+ 	probe_printer.py				\
+ 	SearchCriterion.py				\
+-	serversettings.py				\
+ 	smburi.py					\
+ 	statereason.py					\
+-	timedops.py					\
+-	ToolbarSearchEntry.py				\
+-	userdefault.py					\
+-	ui/AboutDialog.ui				\
+-	ui/ConnectDialog.ui				\
+-	ui/ConnectingDialog.ui				\
+-	ui/InstallDialog.ui				\
+-	ui/JobsWindow.ui				\
+-	ui/NewPrinterName.ui				\
+-	ui/NewPrinterWindow.ui				\
+-	ui/PrinterPropertiesDialog.ui			\
+-	ui/PrintersWindow.ui				\
+-	ui/ServerSettingsDialog.ui			\
+-	ui/SMBBrowseDialog.ui				\
+-	ui/statusicon_popupmenu.ui			\
+-	ui/WaitWindow.ui				\
+-	icons/i-network-printer.png			\
+-	troubleshoot/base.py				\
+-	troubleshoot/CheckLocalServerPublishing.py	\
+-	troubleshoot/CheckNetworkServerSanity.py	\
+-	troubleshoot/CheckPPDSanity.py			\
+-	troubleshoot/CheckPrinterSanity.py		\
+-	troubleshoot/CheckSELinux.py			\
+-	troubleshoot/CheckUSBPermissions.py		\
+-	troubleshoot/ChooseNetworkPrinter.py		\
+-	troubleshoot/ChoosePrinter.py			\
+-	troubleshoot/DeviceListed.py			\
+-	troubleshoot/ErrorLogCheckpoint.py		\
+-	troubleshoot/ErrorLogFetch.py			\
+-	troubleshoot/ErrorLogParse.py			\
+-	troubleshoot/Locale.py				\
+-	troubleshoot/LocalOrRemote.py			\
+-	troubleshoot/NetworkCUPSPrinterShared.py	\
+-	troubleshoot/PrinterStateReasons.py		\
+-	troubleshoot/PrintTestPage.py			\
+-	troubleshoot/QueueNotEnabled.py			\
+-	troubleshoot/QueueRejectingJobs.py		\
+-	troubleshoot/RemoteAddress.py			\
+-	troubleshoot/SchedulerNotRunning.py		\
+-	troubleshoot/ServerFirewalled.py		\
+-	troubleshoot/Shrug.py				\
+-	troubleshoot/VerifyPackages.py			\
+-	troubleshoot/Welcome.py				\
+ 	xml/preferreddrivers.rng			\
+ 	xml/validate.py
+ 
+@@ -172,20 +104,14 @@
+ cupshelpers_DATA=\
+ 	xml/preferreddrivers.xml
+ 
+-bin_SCRIPTS=					\
+-	system-config-printer			\
+-	install-printerdriver			\
+-	system-config-printer-applet		\
+-	dbus/scp-dbus-service
+-
+ if UDEV_RULES
+-udevrulesdir=$(sysconfdir)/udev/rules.d
++udevrulesdir=$(shell pkg-config --variable=udevdir udev)/rules.d
+ udevrules_DATA=udev/70-printers.rules
+ udev_udev_configure_printer_SOURCES=\
+ 	udev/udev-configure-printer.c
+-udev_udev_configure_printer_LDADD= -lcups -ludev $(libusb_LIBS) $(GLIB_LIBS)
+-udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS)
+-udevhelperdir=$(sysconfdir)/udev
++udev_udev_configure_printer_LDADD= -lcups $(libudev_LIBS) $(libusb_LIBS) $(GLIB_LIBS)
++udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libudev_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS)
++udevhelperdir=$(shell pkg-config --variable=udevdir udev)
+ udevhelper_PROGRAMS=\
+ 	udev/udev-configure-printer
+ udevhelper_SCRIPTS=\
+@@ -202,56 +128,17 @@
+ 
+ endif
+ 
+-man_MANS=					\
+-	man/system-config-printer.1		\
+-	man/system-config-printer-applet.1
+-
+ dbus_DATA =					\
+ 	dbus/com.redhat.NewPrinterNotification.conf		\
+ 	dbus/com.redhat.PrinterDriversInstaller.conf
+ dbusdir = $(sysconfdir)/dbus-1/system.d/
+ 
+-dbusinterfaces_DATA =				\
+-	dbus/org.fedoraproject.Config.Printing.xml
+-dbusinterfacesdir = $(datadir)/dbus-1/interfaces/
+-
+-dbusservices_DATA =				\
+-	dbus/org.fedoraproject.Config.Printing.service
+-dbusservicesdir = $(datadir)/dbus-1/services/
+-
+-desktop_DATA =\
+-	system-config-printer.desktop \
+-	print-applet.desktop
+ desktopdir = $(datadir)/applications/
+ autostartdir = $(sysconfdir)/xdg/autostart/
+ 
+ DESKTOP_VENDOR=@DESKTOPVENDOR@
+ DESKTOP_PREFIX=@DESKTOPPREFIX@
+ 
+-install-desktopDATA: $(desktop_DATA)
+-	mkdir -p $(DESTDIR)$(desktopdir)
+-	mkdir -p $(DESTDIR)$(desktopdir)
+-	desktop-file-install $(DESKTOP_VENDOR)	\
+-	  --dir $(DESTDIR)$(desktopdir)		\
+-	  --add-category System			\
+-	  --add-category Settings		\
+-	  --add-category HardwareSettings	\
+-	  --add-category Printing		\
+-	  --add-category GTK			\
+-	  system-config-printer.desktop
+-	desktop-file-install $(DESKTOP_VENDOR)	\
+-	  --dir $(DESTDIR)$(autostartdir)	\
+-	  --add-category System			\
+-	  --add-category Monitor		\
+-	  --add-category GTK			\
+-	  print-applet.desktop
+-
+-uninstall-desktopDATA:
+-	rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)system-config-printer.desktop
+-	rm -f $(DESTDIR)$(autostartdir)/$(DESKTOP_PREFIX)print-applet.desktop
+-
+-desktop_in_files = $(desktop_DATA:.desktop=.desktop.in)
+-
+ EXTRA_DIST=\
+ 	$(nobase_pkgdata_SCRIPTS) \
+ 	$(nobase_pkgdata_DATA) \
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.4.1.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.4.1.ebuild
new file mode 100644
index 000000000000..ffc52a9d21dd
--- /dev/null
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.4.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.4.1.ebuild,v 1.1 2013/08/11 20:02:07 eva Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils python-single-r1 systemd
+
+MY_P=${PN%-common}-${PV}
+
+DESCRIPTION="Common modules of Red Hat's printer administration tool"
+HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
+SRC_URI="http://cyberelk.net/tim/data/${PN/-common}/${PV%.*}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+SLOT="0"
+IUSE="doc policykit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Needs cups running, bug 284005
+RESTRICT="test"
+
+# system-config-printer split since 1.1.3
+#
+# Additional unhandled dependencies:
+# net-firewall/firewalld[${PYTHON_USEDEP}]
+# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/pycups-1.9.60[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	net-print/cups[dbus]
+	virtual/libusb:1
+	>=virtual/udev-172
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<app-admin/system-config-printer-gnome-${PV}
+	policykit? ( >=sys-auth/polkit-0.104-r1 )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4.1-split.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-nls \
+		--with-udev-rules \
+		$(systemd_with_unitdir)
+}
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog README
+	use doc && dohtml -r html/
+
+	python_fix_shebang "${ED}"
+}