[app-admin/system-config-printer-*] Version bump 1.1.13

6 files changed, 432 insertions, 0 deletions

diff --git a/app-admin/system-config-printer-common/Manifest b/app-admin/system-config-printer-common/Manifest
index 266c03b4a6..19675f39fc 100644
--- a/app-admin/system-config-printer-common/Manifest
+++ b/app-admin/system-config-printer-common/Manifest
@@ -1 +1,4 @@
+AUX system-config-printer-common-1.1.13-split.patch 5024 RMD160 f91fd13b5e9d112795cfb8e323253467a9943cb3 SHA1 4eb6b81ff33120e735a0aaf90df9c5562bf47560 SHA256 f17e98e85d6fb61047af3e2d2f9d9249d7a5ed538bfafc3930757f07c964e56d
+DIST system-config-printer-1.1.13.tar.bz2 1014102 RMD160 eaa7b24bc30719a836749c06f72eb502b2fe5ac5 SHA1 9a193cca59f07dd1da97c7a76d26a33c1c57df21 SHA256 6842e337101dd7924d0c02317eff3b2b32d42a6ba7a70ae51fa8ebd51db15da2
+EBUILD system-config-printer-common-1.1.13.ebuild 1333 RMD160 bd5ac3781d8e1b62dce584535785d97a04a7523a SHA1 8ec70edfe7b3320d581c3814c3ff4e0459b7fffe SHA256 f0bdc0ce95170b5b408d9b6e418a78da9d81bf5c5efc96681306700b2bc51fde
 MISC metadata.xml 253 RMD160 6f3b635ef1f334259f2a01981e9d7002f7dc0228 SHA1 3e6ea98753ec98896382980588708246940da86a SHA256 229135009db5d9ed373cccf9d1b7888f9b52cb840675141bc113f4e413a98056
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.1.13-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.1.13-split.patch
new file mode 100644
index 0000000000..620aa21729
--- /dev/null
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.1.13-split.patch
@@ -0,0 +1,164 @@
+diff -ru ../system-config-printer-1.1.12/configure.in ./configure.in
+--- ../system-config-printer-1.1.12/configure.in	2009-08-25 18:01:27.000000000 +0200
++++ ./configure.in	2009-08-28 18:32:45.000000000 +0200
+@@ -1,6 +1,6 @@
+ AC_INIT(system-config-printer, 1.1.12)
+ AC_CONFIG_SRCDIR(system-config-printer.py)
+-AM_INIT_AUTOMAKE([dist-xz dist-bzip2 subdir-objects 1.6])
++AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6])
+ IT_PROG_INTLTOOL
+ AM_GNU_GETTEXT([external])
+ AM_PATH_PYTHON
+diff -ru ../system-config-printer-1.1.12/Makefile.am ./Makefile.am
+--- ../system-config-printer-1.1.12/Makefile.am	2009-08-25 18:01:27.000000000 +0200
++++ ./Makefile.am	2009-08-28 18:57:38.000000000 +0200
+@@ -70,84 +70,22 @@
+ 	rm -f .stamp-distutils-in-builddir
+ 
+ nobase_pkgdata_SCRIPTS=				\
+-	my-default-printer.py			\
+-	pysmb.py				\
+-	system-config-printer.py		\
+-	troubleshoot/__init__.py		\
+-	applet.py
++	pysmb.py
+ 
+ nobase_pkgdata_DATA=					\
+-	AdvancedServerSettings.py			\
+-	authconn.py					\
+ 	config.py					\
+-	cupspk.py					\
+ 	debug.py					\
+-	errordialogs.py					\
+-	HIG.py						\
+-	glade.py					\
+-	GroupsPane.py					\
+-	GroupsPaneModel.py				\
+-	gtkinklevel.py					\
+-	gtkspinner.py					\
+ 	installpackage.py				\
+-	jobviewer.py					\
+ 	monitor.py					\
+-	options.py					\
+-	optionwidgets.py				\
+ 	PhysicalDevice.py				\
+ 	ppdippstr.py					\
+ 	probe_printer.py				\
+-	gtk_label_autowrap.py				\
+ 	SearchCriterion.py				\
+ 	smburi.py					\
+ 	statereason.py					\
+-	timedops.py					\
+-	ToolbarSearchEntry.py				\
+-	userdefault.py					\
+ 	XmlHelper.py					\
+-	glade/AboutDialog.glade				\
+-	glade/ConnectDialog.glade				\
+-	glade/ConnectingDialog.glade			\
+-	glade/InstallDialog.glade				\
+-	glade/JobsWindow.glade				\
+-	glade/NewPrinterName.glade				\
+-	glade/NewPrinterWindow.glade			\
+-	glade/PrinterPropertiesDialog.glade		\
+-	glade/PrintersWindow.glade				\
+-	glade/ServerSettingsDialog.glade			\
+-	glade/SMBBrowseDialog.glade			\
+-	glade/statusicon_popupmenu.glade			\
+-	glade/WaitWindow.glade				\
+-	icons/i-network-printer.png			\
+-	troubleshoot/base.py				\
+-	troubleshoot/CheckLocalServerPublishing.py	\
+-	troubleshoot/CheckNetworkServerSanity.py	\
+-	troubleshoot/CheckPPDSanity.py			\
+-	troubleshoot/CheckPrinterSanity.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		\
+-	my-default-printer
++	smburi.py					\
++	statereason.py
+ 
+ if UDEV_RULES
+ udevrulesdir=$(sysconfdir)/udev/rules.d
+@@ -162,61 +100,16 @@
+ 	udev/udev-add-printer
+ endif
+ 
+-man_MANS=					\
+-	man/system-config-printer.1		\
+-	man/system-config-printer-applet.1
+-
+ dbus_DATA =\
+ 	newprinternotification.conf
+ dbusdir = $(sysconfdir)/dbus-1/system.d/
+ 
+-desktop_DATA =\
+-	system-config-printer.desktop \
+-	print-applet.desktop \
+-	manage-print-jobs.desktop \
+-	my-default-printer.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)$(desktopdir)		\
+-	  --add-category Settings		\
+-	  --add-category HardwareSettings	\
+-	  --add-category GTK			\
+-	  my-default-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)$(desktopdir)/$(DESKTOP_PREFIX)manage-print-jobs.desktop
+-	rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)my-default-printer.desktop
+-	rm -f $(DESTDIR)$(autostartdir)/$(DESKTOP_PREFIX)print-applet.desktop
+-
+ EXTRA_DIST=\
+ 	$(nobase_pkgdata_SCRIPTS) \
+ 	$(nobase_pkgdata_DATA) \
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.1.13.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.1.13.ebuild
new file mode 100644
index 0000000000..5a28a7b2c8
--- /dev/null
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.1.13.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2009 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.1.12.ebuild,v 1.2 2009/09/12 10:29:14 armin76 Exp $
+
+EAPI="2"
+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.1/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
+SLOT="0"
+IUSE="doc"
+
+# system-config-printer split since 1.1.3
+RDEPEND="
+	!app-admin/system-config-printer:0
+	dev-libs/libxml2[python]
+	dev-python/dbus-python
+	dev-python/pycups
+	dev-python/pygobject
+	net-print/cups[dbus]
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/epydoc )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-split.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-nls
+}
+
+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="${D}" install || die "emake install failed"
+}
diff --git a/app-admin/system-config-printer-gnome/Manifest b/app-admin/system-config-printer-gnome/Manifest
index ab92959172..872c059371 100644
--- a/app-admin/system-config-printer-gnome/Manifest
+++ b/app-admin/system-config-printer-gnome/Manifest
@@ -1,4 +1,7 @@
 AUX system-config-printer-gnome-1.1.12-split.patch 3900 RMD160 697b8f5d394701371b7efc33bb685c1abce18e2d SHA1 8857cd89e33fbbbbd25b9674d22659061a008549 SHA256 52f911369a0c97ae7e43c4dd3f53cf8d0cf686d6cf9f871b81f51cef10e7634d
+AUX system-config-printer-gnome-1.1.13-split.patch 3949 RMD160 c28f144dd57171ca5fe2a1ef4325fa61de7b72c3 SHA1 ada55619333ae010bcd75e51f67d490230d2e502 SHA256 c7a60403c77973d05af50dd1cb2eaabd905e20aa1b94fe29bbe00823bbddc18c
 DIST system-config-printer-1.1.12.tar.bz2 1009644 RMD160 4d5617621133fc7d484405d091faaed601d67219 SHA1 179123707cc46850c3ad38e831c8c359dfac98d6 SHA256 c3a33293bf6bc7a50dca35ac814637e4dac04889d25ec4a96b059f4d1054f9c2
+DIST system-config-printer-1.1.13.tar.bz2 1014102 RMD160 eaa7b24bc30719a836749c06f72eb502b2fe5ac5 SHA1 9a193cca59f07dd1da97c7a76d26a33c1c57df21 SHA256 6842e337101dd7924d0c02317eff3b2b32d42a6ba7a70ae51fa8ebd51db15da2
 EBUILD system-config-printer-gnome-1.1.12.ebuild 1611 RMD160 4fca11335be27b98cb6bf626c375b6f414ba962f SHA1 a5c28ccf8e149dc11d634ec6881d06be6b6ccd00 SHA256 48e191e082ee722863f6ea824b2b8cb558f7b04abebbbf95ff6f9b0f4b16b574
+EBUILD system-config-printer-gnome-1.1.13.ebuild 1611 RMD160 4fca11335be27b98cb6bf626c375b6f414ba962f SHA1 a5c28ccf8e149dc11d634ec6881d06be6b6ccd00 SHA256 48e191e082ee722863f6ea824b2b8cb558f7b04abebbbf95ff6f9b0f4b16b574
 MISC metadata.xml 347 RMD160 d52c2c8ab9f214c5c4cb3a4d7e4b83a36d533b30 SHA1 4891ec212f8cc905d12201d045d2cf312d5eab2e SHA256 5f128c29e7a8ebd50e86fa49feed744e464da8208f397966f1a754f78c960014
diff --git a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.1.13-split.patch b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.1.13-split.patch
new file mode 100644
index 0000000000..47e2ab2c98
--- /dev/null
+++ b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.1.13-split.patch
@@ -0,0 +1,134 @@
+diff -ru ../system-config-printer-1.1.13/configure.in ./configure.in
+--- ../system-config-printer-1.1.13/configure.in	2009-09-14 16:13:21.000000000 +0200
++++ ./configure.in	2009-09-24 02:59:04.000000000 +0200
+@@ -1,6 +1,6 @@
+ AC_INIT(system-config-printer, 1.1.13)
+ AC_CONFIG_SRCDIR(system-config-printer.py)
+-AM_INIT_AUTOMAKE([dist-xz dist-bzip2 subdir-objects 1.6])
++AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6])
+ IT_PROG_INTLTOOL
+ AM_GNU_GETTEXT([external])
+ AM_PATH_PYTHON
+diff -ru ../system-config-printer-1.1.13/Makefile.am ./Makefile.am
+--- ../system-config-printer-1.1.13/Makefile.am	2009-09-04 11:35:47.000000000 +0200
++++ ./Makefile.am	2009-09-24 02:55:11.000000000 +0200
+@@ -2,77 +2,8 @@
+ 
+ SUBDIRS=po
+ 
+-EXPORT_MODULES=					\
+-	cupshelpers/__init__.py			\
+-	cupshelpers/cupshelpers.py		\
+-	cupshelpers/ppds.py			\
+-	cupshelpers/openprinting.py
+-
+-### Automake hooks for Distutils.
+-# The distutils module doesn't understand srcdir != builddir,
+-# so we copy in, along with the cupshelpers modules, into
+-# the builddir for 'all', 'install-exec', and 'clean' hooks.
+-.stamp-distutils-in-builddir:	setup.py $(EXPORT_MODULES)
+-	if [ "$(top_srcdir)" != "$(top_builddir)" ]; then	\
+-		cp $(top_srcdir)/setup.py .;			\
+-		mkdir cupshelpers;				\
+-		for file in $(EXPORT_MODULES); do		\
+-			cp $(top_srcdir)/$$file $$file;		\
+-		done;						\
+-	fi
+-	touch .stamp-distutils-in-builddir
+-
+-dist-hook: mk-ChangeLog
+-.PHONE: mk-ChangeLog
+-mk-ChangeLog:
+-	if test -d .git; then				\
+-	  $(top_srcdir)/gitlog-to-changelog		\
+-	    --since=2009-05-01 -- --no-merges		\
+-	    > $(distdir)/cl ;				\
+-	  mv -f $(distdir)/cl $(distdir)/ChangeLog ;	\
+-	fi
+-
+-config.py: config.py.in Makefile
+-	sed \
+-	  -e "s|\@prefix\@|$(prefix)|" \
+-	  -e "s|\@datadir\@|$(datadir)|" \
+-	  -e "s|\@localedir\@|$(localedir)|" \
+-	  -e "s|\@VERSION\@|$(VERSION)|" \
+-	  -e "s|\@PACKAGE\@|$(PACKAGE)|" \
+-	  -e "s|\@WITH_POLKIT_1\@|$(WITH_POLKIT_1)|" \
+-	  $< > $@
+-
+-# Use distutils to build the module.
+-all-local: .stamp-distutils-in-builddir config.py
+-	$(PYTHON) setup.py build
+-
+-# Use distutils to install the module.
+-install-exec-local: .stamp-distutils-in-builddir
+-	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
+-
+-# Uninstall the module, crossing our fingers that we know enough
+-# about how distutils works to do this.  Unfortunately, distutils
+-# doesn't provide a way to do this itself.
+-uninstall-local:
+-	rm -f $(DESTDIR)/$(pythondir)/cupshelpers*.egg-info
+-	for file in $(EXPORT_MODULES); do				\
+-		rm -f $(DESTDIR)/$(pythondir)/$$file*;			\
+-	done
+-
+-# Tell distutils to clean up.
+-clean-local:
+-	-$(PYTHON) setup.py clean --all
+-	if [ "$(top_srcdir)" != "$(top_builddir)" ]; then	\
+-		rm -f setup.py;					\
+-		for file in $(EXPORT_MODULES); do		\
+-			rm -f $$file*;				\
+-		done;						\
+-	fi
+-	rm -f .stamp-distutils-in-builddir
+-
+ nobase_pkgdata_SCRIPTS=				\
+ 	my-default-printer.py			\
+-	pysmb.py				\
+ 	system-config-printer.py		\
+ 	troubleshoot/__init__.py		\
+ 	applet.py
+@@ -80,9 +11,7 @@
+ nobase_pkgdata_DATA=					\
+ 	AdvancedServerSettings.py			\
+ 	authconn.py					\
+-	config.py					\
+ 	cupspk.py					\
+-	debug.py					\
+ 	errordialogs.py					\
+ 	HIG.py						\
+ 	glade.py					\
+@@ -90,22 +19,13 @@
+ 	GroupsPaneModel.py				\
+ 	gtkinklevel.py					\
+ 	gtkspinner.py					\
+-	installpackage.py				\
+ 	jobviewer.py					\
+-	monitor.py					\
+ 	options.py					\
+ 	optionwidgets.py				\
+-	PhysicalDevice.py				\
+-	ppdippstr.py					\
+-	probe_printer.py				\
+ 	gtk_label_autowrap.py				\
+-	SearchCriterion.py				\
+-	smburi.py					\
+-	statereason.py					\
+ 	timedops.py					\
+ 	ToolbarSearchEntry.py				\
+ 	userdefault.py					\
+-	XmlHelper.py					\
+ 	glade/AboutDialog.glade				\
+ 	glade/ConnectDialog.glade				\
+ 	glade/ConnectingDialog.glade			\
+@@ -167,8 +87,6 @@
+ 	man/system-config-printer.1		\
+ 	man/system-config-printer-applet.1
+ 
+-dbus_DATA =\
+-	newprinternotification.conf
+ dbusdir = $(sysconfdir)/dbus-1/system.d/
+ 
+ desktop_DATA =\
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.13.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.13.ebuild
new file mode 100644
index 0000000000..d43e6ea668
--- /dev/null
+++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.13.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+inherit python autotools
+
+MY_P="${PN%-gnome}-${PV}"
+
+DESCRIPTION="Gnome frontend for a 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.1/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="gnome-keyring"
+
+COMMON_DEPEND="
+	dev-lang/python
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-util/intltool
+	virtual/libintl
+"
+RDEPEND="${COMMON_DEPEND}
+	>=app-admin/system-config-printer-common-${PV}
+	dev-python/libgnome-python
+	dev-python/notify-python
+	>=dev-python/pygtk-2.4
+	dev-python/pyxml
+	gnome-keyring? ( dev-python/gnome-keyring-python )
+"
+
+APP_LINGUAS="ar as bg bn_IN bn bs ca cs cy da de el en_GB es et fa fi fr gu he
+hi hr hu hy id is it ja ka kn ko lo lv mai mk ml mr ms nb nl nn or pa pl pt_BR
+pt ro ru si sk sl sr@latin sr sv ta te th tr uk vi zh_CN zh_TW"
+for X in ${APP_LINGUAS}; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-split.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# disable installation of translations when LINGUAS not chosen
+	if [[ -z "${LINGUAS}" ]]; then
+		myconf="${myconf} --disable-nls"
+	else
+		myconf="${myconf} --enable-nls"
+	fi
+
+	econf ${myconf} || die "econf failed"
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog README || die "dodoc failed"
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+}