Version bump

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

3 files changed, 253 insertions, 2 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index c1d9ee32954e..88536cd7b711 100644
--- a/app-admin/system-config-printer-common/ChangeLog
+++ b/app-admin/system-config-printer-common/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/system-config-printer-common
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.26 2010/11/06 18:45:52 halcy0n Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.27 2011/01/27 01:24:35 reavertm Exp $
+
+*system-config-printer-common-1.2.6 (27 Jan 2011)
+
+  27 Jan 2011; Maciej Mrozowski <reavertm@gentoo.org>
+  +system-config-printer-common-1.2.6.ebuild,
+  +files/system-config-printer-common-1.2.6-split.patch:
+  Version bump
 
   06 Nov 2010; Mark Loeser <halcy0n@gentoo.org>
   system-config-printer-common-1.1.13.ebuild:
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.2.6-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.2.6-split.patch
new file mode 100644
index 000000000000..c64f03fad2f9
--- /dev/null
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.2.6-split.patch
@@ -0,0 +1,153 @@
+diff -ru system-config-printer-1.2.6/Makefile.am new/Makefile.am
+--- system-config-printer-1.2.6/Makefile.am	2011-01-14 17:04:25.000000000 +0100
++++ new/Makefile.am	2011-01-27 02:00:09.059000001 +0100
+@@ -71,90 +71,22 @@
+ 	rm -f .stamp-distutils-in-builddir
+ 
+ nobase_pkgdata_SCRIPTS=				\
+-	check-device-ids.py			\
+-	pysmb.py				\
+-	system-config-printer.py		\
+-	troubleshoot/__init__.py		\
+-	applet.py
++	pysmb.py
+ 
+ nobase_pkgdata_DATA=					\
+-	AdvancedServerSettings.py			\
+-	asyncconn.py					\
+-	asyncipp.py					\
+-	asyncpk1.py					\
+-	authconn.py					\
+ 	config.py					\
+-	cupspk.py					\
+ 	debug.py					\
+ 	dnssdresolve.py					\
+-	errordialogs.py					\
+-	HIG.py						\
+ 	firewall.py					\
+-	gui.py						\
+-	GroupsPane.py					\
+-	GroupsPaneModel.py				\
+-	gtkinklevel.py					\
+-	gtkspinner.py					\
+ 	installpackage.py				\
+-	jobviewer.py					\
+ 	monitor.py					\
+-	options.py					\
+-	optionwidgets.py				\
+ 	PhysicalDevice.py				\
+ 	ppdippstr.py					\
+-	ppdsloader.py					\
+ 	probe_printer.py				\
+-	gtk_label_autowrap.py				\
+ 	SearchCriterion.py				\
+ 	smburi.py					\
+ 	statereason.py					\
+-	timedops.py					\
+-	ToolbarSearchEntry.py				\
+-	userdefault.py					\
+-	XmlHelper.py					\
+-	ui/AboutDialog.glade				\
+-	ui/ConnectDialog.glade				\
+-	ui/ConnectingDialog.glade			\
+-	ui/InstallDialog.glade				\
+-	ui/JobsWindow.glade				\
+-	ui/NewPrinterName.glade				\
+-	ui/NewPrinterWindow.glade			\
+-	ui/PrinterPropertiesDialog.glade		\
+-	ui/PrintersWindow.glade				\
+-	ui/ServerSettingsDialog.glade			\
+-	ui/SMBBrowseDialog.glade			\
+-	ui/statusicon_popupmenu.glade			\
+-	ui/WaitWindow.glade				\
+-	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/Welcome.py
+-
+-bin_SCRIPTS=\
+-	system-config-printer			\
+-	system-config-printer-applet
++	XmlHelper.py
+ 
+ if UDEV_RULES
+ udevrulesdir=$(sysconfdir)/udev/rules.d
+@@ -169,56 +101,17 @@
+ 	udev/udev-add-printer
+ endif
+ 
+-man_MANS=					\
+-	man/system-config-printer.1		\
+-	man/system-config-printer-applet.1
+-
+ dbus_DATA =					\
+ 	newprinternotification.conf		\
+ 	printerdriversinstaller.conf
+ dbusdir = $(sysconfdir)/dbus-1/system.d/
+ 
+-desktop_DATA =\
+-	system-config-printer.desktop \
+-	print-applet.desktop \
+-	manage-print-jobs.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)$(desktopdir)		\
+-	  --add-category System			\
+-	  --add-category Monitor		\
+-	  --add-category GTK			\
+-	  manage-print-jobs.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)$(desktopdir)/$(DESKTOP_PREFIX)manage-print-jobs.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.2.6.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.2.6.ebuild
new file mode 100644
index 000000000000..785bda010ef2
--- /dev/null
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.2.6.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2011 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.2.6.ebuild,v 1.1 2011/01/27 01:24:35 reavertm Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+WANT_AUTOMAKE="1.11"
+inherit python autotools
+
+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/system-config-printer/1.2/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+SLOT="0"
+IUSE="doc policykit"
+
+# Needs cups running, bug 284005
+RESTRICT="test"
+
+# system-config-printer split since 1.1.3
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/libusb
+	dev-libs/libxml2[python]
+	dev-python/dbus-python
+	>=dev-python/pycups-1.9.53
+	dev-python/pygobject
+	net-print/cups[dbus]
+	sys-fs/udev
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	doc? ( dev-python/epydoc )
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-admin/system-config-printer:0
+	policykit? ( sys-auth/polkit )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.6-split.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-nls \
+		--with-udev-rules
+}
+
+src_compile() {
+	emake || die "emake failed"
+	if 	use doc; then
+		emake html || die "emake html failed"
+	fi
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog README || die "dodoc failed"
+
+	if use doc; then
+		dohtml -r html/ || die "installing html docs failed"
+	fi
+
+	emake DESTDIR="${ED}" install \
+		udevrulesdir=/lib/udev/rules.d \
+		udevhelperdir=/lib/udev \
+		|| die "emake install failed"
+
+	python_convert_shebangs -q -r $(python_get_version) "${ED}"
+}
+
+pkg_postinst() {
+	python_mod_optimize cupshelpers
+}
+
+pkg_postrm() {
+	python_mod_cleanup cupshelpers /usr/share/system-config-printer
+}