Version bump, remove old

Package-Manager: portage-2.2.0_alpha40/cvs/Linux x86_64

10 files changed, 49 insertions, 502 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index b3f65cd49cda..a6614a41df25 100644
--- a/app-admin/system-config-printer-common/ChangeLog
+++ b/app-admin/system-config-printer-common/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-admin/system-config-printer-common
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.34 2011/06/01 16:05:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.35 2011/06/13 20:24:58 reavertm Exp $
+
+*system-config-printer-common-1.3.3 (13 Jun 2011)
+
+  13 Jun 2011; Maciej Mrozowski <reavertm@gentoo.org>
+  -system-config-printer-common-1.2.6.ebuild,
+  -files/system-config-printer-common-1.2.6-split.patch,
+  -system-config-printer-common-1.3.2.ebuild,
+  -files/system-config-printer-common-1.3.2-split.patch,
+  +system-config-printer-common-1.3.3.ebuild,
+  +files/system-config-printer-common-1.3.3-split.patch:
+  Version bump, remove old
 
   01 Jun 2011; Brent Baude <ranger@gentoo.org>
   system-config-printer-common-1.2.2.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
deleted file mode 100644
index c64f03fad2f9..000000000000
--- a/app-admin/system-config-printer-common/files/system-config-printer-common-1.2.6-split.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-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/files/system-config-printer-common-1.3.2-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.3-split.patch
index 9d470584daea..f83affaa14ea 100644
--- a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.2-split.patch
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.3-split.patch
@@ -1,6 +1,6 @@
-diff -ruN system-config-printer-1.3.2/Makefile.am my/Makefile.am
---- system-config-printer-1.3.2/Makefile.am	2011-03-16 17:44:41.000000000 +0100
-+++ my/Makefile.am	2011-03-19 00:46:48.354000001 +0100
+diff -ruN system-config-printer-1.3.3/Makefile.am my/Makefile.am
+--- system-config-printer-1.3.3/Makefile.am	2011-05-26 16:01:08.000000000 +0200
++++ my/Makefile.am	2011-06-13 22:16:15.323226198 +0200
 @@ -1,4 +1,4 @@
 -AM_CFLAGS=-g -O2 -Wall $(GLIB_CFLAGS)
 +AM_CFLAGS=-Wall $(GLIB_CFLAGS)
@@ -57,19 +57,19 @@ diff -ruN system-config-printer-1.3.2/Makefile.am my/Makefile.am
 -	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				\
+-	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	\
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
deleted file mode 100644
index 38ddbe9f18ba..000000000000
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.2.6.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.3 2011/02/23 17:04:46 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-2.21.5
-	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
-	!<app-admin/system-config-printer-gnome-${PV}
-	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
-}
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.2.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.3.ebuild
index cd3eebd9cea5..a166f500295e 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.2.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.2.ebuild,v 1.1 2011/03/19 00:14:04 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.3.ebuild,v 1.1 2011/06/13 20:24:58 reavertm Exp $
 
 EAPI="3"
 
@@ -50,7 +50,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.2-split.patch"
+	epatch "${FILESDIR}/${PN}-1.3.3-split.patch"
 
 	eautoreconf
 }
diff --git a/app-admin/system-config-printer-gnome/ChangeLog b/app-admin/system-config-printer-gnome/ChangeLog
index 1fbf718a665b..dc0559698c2b 100644
--- a/app-admin/system-config-printer-gnome/ChangeLog
+++ b/app-admin/system-config-printer-gnome/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-admin/system-config-printer-gnome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.23 2011/03/19 00:16:58 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.24 2011/06/13 20:25:45 reavertm Exp $
+
+*system-config-printer-gnome-1.3.3 (13 Jun 2011)
+
+  13 Jun 2011; Maciej Mrozowski <reavertm@gentoo.org>
+  -system-config-printer-gnome-1.2.6.ebuild,
+  -files/system-config-printer-gnome-1.2.6-split.patch,
+  -system-config-printer-gnome-1.3.2.ebuild,
+  -files/system-config-printer-gnome-1.3.2-split.patch,
+  +system-config-printer-gnome-1.3.3.ebuild,
+  +files/system-config-printer-gnome-1.3.3-split.patch:
+  Version bump, remove old
 
 *system-config-printer-gnome-1.3.2 (19 Mar 2011)
 
diff --git a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.2.6-split.patch b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.2.6-split.patch
deleted file mode 100644
index 2d9a826f7749..000000000000
--- a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.2.6-split.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-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:07:03.255000001 +0100
-@@ -2,77 +2,8 @@
- 
- SUBDIRS=po
- 
--EXPORT_MODULES=					\
--	cupshelpers/__init__.py			\
--	cupshelpers/cupshelpers.py		\
--	cupshelpers/installdriver.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)|" \
--	  $< > $@
--
--# 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=				\
- 	check-device-ids.py			\
--	pysmb.py				\
- 	system-config-printer.py		\
- 	troubleshoot/__init__.py		\
- 	applet.py
-@@ -83,35 +14,22 @@
- 	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			\
-@@ -156,28 +74,10 @@
- 	system-config-printer			\
- 	system-config-printer-applet
- 
--if UDEV_RULES
--udevrulesdir=$(sysconfdir)/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 -lusb $(GLIB_LIBS)
--udevhelperdir=$(sysconfdir)/udev
--udevhelper_PROGRAMS=\
--	udev/udev-configure-printer
--udevhelper_SCRIPTS=\
--	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 \
diff --git a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.2-split.patch b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.3-split.patch
index 8f40a5eb0737..f1cf695e9505 100644
--- a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.2-split.patch
+++ b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.3-split.patch
@@ -1,5 +1,5 @@
-diff -ruN system-config-printer-1.3.2/Makefile.am my/Makefile.am
---- system-config-printer-1.3.2/Makefile.am	2011-03-16 17:44:41.000000000 +0100
+diff -ruN system-config-printer-1.3.3/Makefile.am my/Makefile.am
+--- system-config-printer-1.3.3/Makefile.am	2011-03-16 17:44:41.000000000 +0100
 +++ my/Makefile.am	2011-03-19 01:03:54.708000002 +0100
 @@ -1,90 +1,9 @@
 -AM_CFLAGS=-g -O2 -Wall $(GLIB_CFLAGS)
@@ -130,9 +130,9 @@ diff -ruN system-config-printer-1.3.2/Makefile.am my/Makefile.am
  	ToolbarSearchEntry.py				\
  	userdefault.py					\
 -	XmlHelper.py					\
- 	ui/AboutDialog.glade				\
- 	ui/ConnectDialog.glade				\
- 	ui/ConnectingDialog.glade			\
+ 	ui/AboutDialog.ui				\
+ 	ui/ConnectDialog.ui				\
+ 	ui/ConnectingDialog.ui			\
 @@ -180,28 +86,10 @@
  	system-config-printer-applet		\
  	dbus/scp-dbus-service
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.6.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.6.ebuild
deleted file mode 100644
index 43dbd36a8078..000000000000
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.6.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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-gnome/system-config-printer-gnome-1.2.6.ebuild,v 1.3 2011/02/16 19:00:09 reavertm Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="xml"
-WANT_AUTOMAKE="1.11"
-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.2/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-SLOT="0"
-IUSE="gnome-keyring"
-
-# Needs cups running, bug 284005
-RESTRICT="test"
-
-RDEPEND="
-	~app-admin/system-config-printer-common-${PV}
-	dev-python/notify-python
-	>=dev-python/pygtk-2.4
-	gnome-keyring? ( dev-python/gnome-keyring-python )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/xmlto-0.0.22
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-APP_LINGUAS="ar as bg bn_IN bn br 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}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.6-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 \
-		--with-desktop-vendor=Gentoo \
-		--without-udev-rules \
-		${myconf}
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README || die "dodoc failed"
-
-	emake DESTDIR="${ED}" install || die "emake install failed"
-
-	python_convert_shebangs -q -r $(python_get_version) "${ED}"
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/system-config-printer
-}
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.2.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.3.ebuild
index 41ee2ab5e030..636acbb25432 100644
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.2.ebuild
+++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # 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-gnome/system-config-printer-gnome-1.3.2.ebuild,v 1.1 2011/03/19 00:16:58 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.3.ebuild,v 1.1 2011/06/13 20:25:45 reavertm Exp $
 
 EAPI="3"
 
@@ -50,7 +50,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.2-split.patch"
+	epatch "${FILESDIR}/${PN}-1.3.3-split.patch"
 
 	eautoreconf
 }