[app-admin/system-config-printer-common] 1.1.8 version bump

4 files changed, 236 insertions, 8 deletions

diff --git a/app-admin/system-config-printer-common/Manifest b/app-admin/system-config-printer-common/Manifest
index 3b6a4f2bae5..909f10bc0d7 100644
--- a/app-admin/system-config-printer-common/Manifest
+++ b/app-admin/system-config-printer-common/Manifest
@@ -1,4 +1,7 @@
 AUX system-config-printer-common-1.1.3-split.patch 4904 RMD160 4d2625c812b992fa3d6e0ddb8dd464dc74e28a20 SHA1 8692e9a604a98b4efca80e1eb4a39c458937b49c SHA256 bf3bd6f52a7d6abad9647d11e8d2994b6a9f9fadd83068cf8d87fbb4b0afc508
+AUX system-config-printer-common-1.1.8-split.patch 4852 RMD160 d55e4267d20d36e952b736914f8da581c98a6565 SHA1 28582d9a91f166eeff56049dd4b8481d638838b4 SHA256 1bc673c0886fd1b0cac351ca55e6c5f0f39b19ea36865fad207ebd8a3a4fa6fb
 DIST system-config-printer-1.1.3.tar.bz2 874825 RMD160 213809d747edd7b36f126a1d0d2859a34d4081e4 SHA1 758ac47d1a72eeca3e347e34ca63199c80da9696 SHA256 a3589ff575be2cf776a06b0004ff4d45ac1e3e88eb10719fae6e084ddc1e5854
+DIST system-config-printer-1.1.8.tar.bz2 1003222 RMD160 42d7f24837dda80f4192cd28cbbd215df764e93d SHA1 fee1f43de24562173e3b8cea58c6226f3fb27c70 SHA256 d7ee76aabf62e210b2a2bbdbf41f93933d983b99a2e63107d1713a327d0387eb
 EBUILD system-config-printer-common-1.1.3.ebuild 983 RMD160 056ee2dab868481dbc3030d63606e4c1ed7d2b27 SHA1 058ad3ecccf3e8d46f2f783868eca5e768e720bb SHA256 5927943d5621a2f1a726240c8129b563a54ca89b054e9f1d05cdafee395a0957
+EBUILD system-config-printer-common-1.1.8.ebuild 1185 RMD160 74d2d4ee924474a107a1fb439d87751e0f2e198d SHA1 7876a8ead580f1979286bceceaed1bf21627ad77 SHA256 b5080d033b2c5c9bfe5eeaf1a635ffac50c0e1a4bde34410749cf9ca0461bf19
 MISC metadata.xml 347 RMD160 d52c2c8ab9f214c5c4cb3a4d7e4b83a36d533b30 SHA1 4891ec212f8cc905d12201d045d2cf312d5eab2e SHA256 5f128c29e7a8ebd50e86fa49feed744e464da8208f397966f1a754f78c960014
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.1.8-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.1.8-split.patch
new file mode 100644
index 00000000000..add4ec710ec
--- /dev/null
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.1.8-split.patch
@@ -0,0 +1,163 @@
+diff -ru ../system-config-printer-1.1.8/Makefile.am ./Makefile.am
+--- ../system-config-printer-1.1.8/Makefile.am	2009-06-18 18:10:58.000000000 +0200
++++ ./Makefile.am	2009-07-16 01:50:23.000000000 +0200
+@@ -57,158 +57,32 @@
+ 	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
+-
+ 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				\
+-	gtk_treeviewtooltips.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/IPPBrowseDialog.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
+-
+-man_MANS=					\
+-	man/system-config-printer.1		\
+-	man/system-config-printer-applet.1
++	statereason.py
+ 
+ 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) \
+ 	$(nobase_sbin_SCRIPTS) \
+ 	$(bin_SCRIPTS) \
+-	setup.py \
+ 	$(EXPORT_MODULES) \
+-	man/system-config-printer.xml \
+ 	newprinternotification.conf \
+ 	bootstrap \
+ 	mkinstalldirs \
+-	system-config-printer.desktop.in \
+-	manage-print-jobs.desktop.in \
+-	my-default-printer.desktop.in \
+-	print-applet.desktop.in \
+ 	intltool-extract.in \
+ 	intltool-merge.in \
+ 	intltool-update.in \
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.1.8.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.1.8.ebuild
new file mode 100644
index 00000000000..30b21d2f7f9
--- /dev/null
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.1.8.ebuild
@@ -0,0 +1,61 @@
+# 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%-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="~amd64 ~x86"
+SLOT="0"
+IUSE="doc"
+
+# system-config-printer split since 1.1.3
+DEPEND="
+	doc? ( dev-python/epydoc )
+"
+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]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-split.patch"
+
+	eaclocal
+	eautomake
+	eautoconf
+}
+
+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/system-config-printer-gnome-1.1.3.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.8.ebuild
index c765098f5f4..0e05273adc3 100644
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.3.ebuild
+++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.8.ebuild
@@ -5,14 +5,15 @@
 EAPI="2"
 inherit python autotools
 
-DESCRIPTION="A printer administration tool"
+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/${P}.tar.bz2"
+SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.1/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
-KEYWORDS=""
 IUSE="gnome-keyring"
 
 COMMON_DEPEND="
@@ -25,7 +26,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/libintl
 "
 RDEPEND="${COMMON_DEPEND}
-	app-admin/system-config-printer-common
+	>=app-admin/system-config-printer-common-${PV}
 	dev-python/libgnome-python
 	dev-python/notify-python
 	>=dev-python/pygtk-2.4
@@ -33,9 +34,9 @@ RDEPEND="${COMMON_DEPEND}
 	gnome-keyring? ( dev-python/gnome-keyring-python )
 "
 
-APP_LINGUAS="ar bg bn bn_IN 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 mk ml mr ms nb nl nn pa pl pt pt_BR ro ru
-si sk sl sr sv ta te tr uk vi zh_CN"
+APP_LINGUAS="ar as bg bn bn_IN 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 mk ml mr ms nb nl nn or pa pl pt pt_BR ro ru
+si sk sl sr sv ta te th tr uk vi zh_CN"
 for X in ${APP_LINGUAS}; do
 	IUSE="${IUSE} linguas_${X}"
 done