Version bump, bug 439848, remove old

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xB1E955DB

8 files changed, 313 insertions, 25 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index 6434a03c156d..5448a0ea69ef 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.82 2012/09/30 17:37:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.83 2012/11/06 03:13:28 reavertm Exp $
+
+*system-config-printer-common-1.3.12 (06 Nov 2012)
+
+  06 Nov 2012; Maciej Mrozowski <reavertm@gentoo.org>
+  +files/system-config-printer-common-1.3.12-split.patch,
+  +system-config-printer-common-1.3.12.ebuild:
+  Version bump, bug 439848, remove old
 
   30 Sep 2012; Raúl Porcel <armin76@gentoo.org>
   system-config-printer-common-1.3.11-r1.ebuild:
diff --git a/app-admin/system-config-printer-common/Manifest b/app-admin/system-config-printer-common/Manifest
index 2bf22d1f873f..da128fcf824a 100644
--- a/app-admin/system-config-printer-common/Manifest
+++ b/app-admin/system-config-printer-common/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX system-config-printer-common-1.3.12-split.patch 5144 SHA256 166eaef7e5079538a8450d721e18faabf4c6ed9a9ca40f03efa82518fc9d303e SHA512 0b198600abd72adb3650c9e85bd87abee69bc8963dff2b73aa0f29759d7f120fd7538fe230bceef0c053d4024501d3ef1df07eb513afd7c5625e8ad83f6aafc7 WHIRLPOOL 4c0ad3054caf156845dfdea6d9408ed2a170317659a69268683e5af4e80b36869d2fbf3cf0046bbeb36142cd59f49496b7d08e0d51cea200e75ac05d4b0a8818
 AUX system-config-printer-common-1.3.9-cups_filters_path.patch 962 SHA256 ca11a0ab5b9ce124a0433d79b0c4ac9ce995f73ce12c39ca1e886b76e41b29df SHA512 6f9780fb87cb506788776dcc630a5bf30d071da9e2384c9fe8c7bb5bfa5bf81c67259da90666dde8b41b7230b480c76f6ccaddb4e3275b201cdf6f1e9c850636 WHIRLPOOL 7307c429ae0c1aae8cd6d6369765b67d7215c8eb0a64352ffad433de69ec0b631f70a61cf5647578dbf12105f37a00bdb5f3b87737f0ded8f51a134e7aadaf37
 AUX system-config-printer-common-1.3.9-split.patch 4636 SHA256 bcd20fcd357ce1730e172b753b67a34679342b82881395bc72afc2feded20558 SHA512 34df931edf965afcc93ba7951c3162b1f04d00a5263844b798771baa6860614c112fc18236ed1301a3cdd4732f2a2870b4703cbed75a8696e426fabc2e3fb2a7 WHIRLPOOL bff116ddee7d5b79778a27b83eb0343769513fa06f4dbe22f409ccb0cf56d3c15ab39e681d52823dffa812442e71ed75ffff1af5afec465dc757dbf068ee8241
 DIST system-config-printer-1.3.11.tar.xz 947488 SHA256 13816276895ca60c11ebc77b4209d30707b18c0489e247ea219474ee4a2f63c3 SHA512 4e50e973e404f959d8cb5b25dd6a38aa40f558408eb9818b3eb3b267b9a54f13aa97f05343cc0353ab36b32ac0a229d77109efd79b5e598fe43173072be02fac WHIRLPOOL d2372eb97263e84be9efd9bd6e190ddab2a75a327b0ece6f44ff8c9d1ee12484a82c3a2c5a2124195b0e45aa21fe3298de1025dce806ad195a7a1a84bdea80ec
+DIST system-config-printer-1.3.12.tar.xz 949008 SHA256 1905bd9fd382730a8eab80fa196b1c43bd19ce79c2169142de899697cbb1e9b1 SHA512 4e6c15b52287f2a69fabb6dafe6548874b8608f2f7a2e14534b100fbb46ad0f146b1e03a6aa4c2c9fe66dad96789454bd066616db0dd73b962bffeb478a7c6c5 WHIRLPOOL 0b8afe05a87103ef99dac50ab7db5f3fc6137de9b84e483ee3a481172e4c894e206b6d022303f1f11496a63b5698351a67070fb936f35293e83f5a20c5e21599
 DIST system-config-printer-1.3.9.tar.xz 992152 SHA256 86a655d6599484cafe57f11694d9e2d9767ece03328a8fc8254aa92c8162dfe0 SHA512 98ffcbd36ee7c70fc349a945a75b5d2ed70cc1d08b2fe4eb2dc66d0ca887675956c6dc31728a2ba0e15b5742159dd6a9b11af204090a84d5b54f3237bcae62f1 WHIRLPOOL bd81593a7bc7082157ba9e9635aa3df9d0fe6c8fcd5886933781df3d93de9c889e51df5645d3bea6bd9b8448f57d65ef37ce88445cb695b734155772b794bb23
 EBUILD system-config-printer-common-1.3.11-r1.ebuild 1992 SHA256 79133ad3ac7cbecfe2cb58c39e78ba0eb90aeabdfd48b87be49cab9073125211 SHA512 8b0131cb1805985dce7a9863ec0ab0f20c8b9dac4df81cd72a940b1d1a8ecc029dd96e0b8f7120202f66e43cbc02f1e284cd1a11bf56018cd74f15afbbe47230 WHIRLPOOL 18d24bb64770d954b3454473bbb007a3c5b414774d6b87b2ede0f7e79e596a106302dd85bd4bb753894da651929c0b8e12b3abcd791c55d0e568cdb69fe5b242
+EBUILD system-config-printer-common-1.3.12.ebuild 1997 SHA256 f99ca5c24a1c1df6aa1d0910dedf6aa59ca0a75b327dcb54db5ec8c995a457c1 SHA512 f57a8542921d4e1ac81b4f23f356a8b3ef9c0dc01bb8eb154a28a98fad2fce3854ad651ab30a8d9aa22d3767d245186d4114cccbc4609ff9901773ae9a106e5c WHIRLPOOL e3d3d31e35054043776badfd459f6efa456151d73853bf2060f072d88480172a4b10775a89dbe11becd69a960251d58fc8c08a23e2045218c0706f91ed2e47e1
 EBUILD system-config-printer-common-1.3.9-r2.ebuild 2093 SHA256 c6f31ffbea94b869d34c70790fcf40a3e94086595a8de1ef03560d5301383c10 SHA512 6ea49ab7d1c48476ba24f3f6b60a390a7eb47cf673fb2c175d7e54d17f513874c1fed0d987c8244c0d0cab523c1a2dfef6ab32628d45773f7eff30abab14c865 WHIRLPOOL 9ecaf7b4fe3c8e8d04c888122710fe0d76ba2988307ad3527c321802440595edbfeb82423a0bb31dc0dfa64f09de80797cf43c3e0fe8211a1ccccd4b5b686c5f
-MISC ChangeLog 17033 SHA256 30a3c132107f1dd9e077b02ff8ed9f700bc2dfe29260900615e0fd3274fef0be SHA512 97fea5d279b94bb9ed062c02789337871454d8d468fc514e79a0358cc06af6099ffcc38d85a66197e865182fbfa11286e02fdccb3aa7e6c2c89046993997f365 WHIRLPOOL 3e01c222b678c2ea7eccdb7d8756cda4833d8544adfcb4d8d072ab4c533f5a1a446e7c63d23ee31fb6b5b0e116da89628da61b6be9e6f32d65c6ff62658638fd
+MISC ChangeLog 17285 SHA256 8df4fc73d36a874645d52c620f761ea9598b9b3f38f6c96330ca313d2ab93cdf SHA512 1dd43412190a46fb7c227d89c29dd6d7619d70ec3101bf4f0d60ee553b5fabbf3ed2811f73ce0b7cb918d8fda07ea4b17a55a2d78264a7c36dc8e886f35cbf72 WHIRLPOOL 15080eb7f8241fb500f84c602ce59834dc90114f4da31fc7043c3c544fc58206d18a2d696b3f6d426bbfca5848e0fe837a05525b9cb55711cff1d1d247e9c236
 MISC metadata.xml 269 SHA256 4093e60c94c1276d3fce2608e758ed73b067ae7af175d26df104f4df0fbe3e8a SHA512 2e9634524d34d3ca8b09f3212921325a7460449aff6d5307a7ee547a9d386207d772198d762ef0338325864449474a16c92653547cbdceb214ec5c9a0d9d417d WHIRLPOOL 4a6977f8e8520c7d8d5ce51b169c13d3f7fbf7bdaaaf43e03f827aa7e89017a7119ffc3b944ca5fb8ee0cff35f81a7e3d3c92682a58bc53cc361516b19c717e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBog2IACgkQuQc30/atMkBh6QCgvZDlVoe+3h6DfRBb+JgG+zSP
-DbIAoLEE+nzruU6oxKASbcL/dSeE/8hF
-=q9zt
+iEYEAREIAAYFAlCYgFgACgkQFuHa/bHpVduXCQCfd77GyINNLfKI4BOh3ca5nSvy
+jrIAn1l162VlkVLrRXz16egv5oenRFZh
+=76p7
 -----END PGP SIGNATURE-----
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.12-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.12-split.patch
new file mode 100644
index 000000000000..ca4e5599890a
--- /dev/null
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.12-split.patch
@@ -0,0 +1,177 @@
+diff -ruN system-config-printer-1.3.12/Makefile.am my/Makefile.am
+--- system-config-printer-1.3.12/Makefile.am	2012-10-04 15:51:04.000000000 +0200
++++ my/Makefile.am	2012-11-06 03:48:12.392483514 +0100
+@@ -1,4 +1,4 @@
+-CFLAGS=-g -O2 -Wall
++CFLAGS=-Wall
+ 
+ SUBDIRS=po
+ 
+@@ -84,88 +84,21 @@
+ 	rm -f .stamp-distutils-in-builddir
+ 
+ nobase_pkgdata_SCRIPTS=				\
+-	check-device-ids.py			\
+-	pysmb.py				\
+-	scp-dbus-service.py			\
+-	system-config-printer.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						\
+ 	firewall.py					\
+-	gui.py						\
+-	gtkinklevel.py					\
+-	gtkspinner.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				\
+-	gtk_label_autowrap.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
+ 
+@@ -173,18 +106,13 @@
+ cupshelpers_DATA=\
+ 	xml/preferreddrivers.xml
+ 
+-bin_SCRIPTS=					\
+-	system-config-printer			\
+-	system-config-printer-applet		\
+-	dbus/scp-dbus-service
+-
+ 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 $(libusb_LIBS) $(GLIB_LIBS)
+-udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS)
++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=$(sysconfdir)/udev
+ udevhelper_PROGRAMS=\
+ 	udev/udev-configure-printer
+@@ -202,56 +130,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.3.12.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild
new file mode 100644
index 000000000000..98d57d3a539c
--- /dev/null
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2012 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.12.ebuild,v 1.1 2012/11/06 03:13:28 reavertm Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6"
+WANT_AUTOMAKE="1.11"
+
+inherit autotools eutils python toolchain-funcs
+
+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"
+
+# Needs cups running, bug 284005
+RESTRICT="test"
+
+# system-config-printer split since 1.1.3
+COMMON_DEPEND="
+	>=dev-libs/glib-2
+	dev-libs/libxml2[python]
+	dev-python/dbus-python
+	>=dev-python/pycups-1.9.60
+	dev-python/pycurl
+	>=dev-python/pygobject-2.21.5:2
+	net-print/cups[dbus]
+	>=sys-fs/udev-172
+	virtual/libusb:1
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	doc? ( dev-python/epydoc )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<app-admin/system-config-printer-gnome-${PV}
+	policykit? ( >=sys-auth/polkit-0.104-r1 )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.3.12-split.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-nls \
+		--with-udev-rules
+}
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		udevhelperdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)" \
+		udevrulesdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)/rules.d" \
+		install
+
+	dodoc AUTHORS ChangeLog README
+	use doc && dohtml -r html/
+
+	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-gnome/ChangeLog b/app-admin/system-config-printer-gnome/ChangeLog
index 9bcb4b6d02b9..5d5c55f58c83 100644
--- a/app-admin/system-config-printer-gnome/ChangeLog
+++ b/app-admin/system-config-printer-gnome/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/system-config-printer-gnome
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.61 2012/09/30 17:41:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.62 2012/11/06 03:14:05 reavertm Exp $
+
+*system-config-printer-gnome-1.3.12 (06 Nov 2012)
+
+  06 Nov 2012; Maciej Mrozowski <reavertm@gentoo.org>
+  +files/system-config-printer-gnome-1.3.12-split.patch,
+  +system-config-printer-gnome-1.3.12.ebuild,
+  -files/system-config-printer-gnome-1.3.9-split.patch,
+  -system-config-printer-gnome-1.3.9-r1.ebuild:
+  Version bump, bug 439848, remove old
 
   30 Sep 2012; Raúl Porcel <armin76@gentoo.org>
   system-config-printer-gnome-1.3.11.ebuild:
diff --git a/app-admin/system-config-printer-gnome/Manifest b/app-admin/system-config-printer-gnome/Manifest
index d8fb081948e4..b25887bde1b3 100644
--- a/app-admin/system-config-printer-gnome/Manifest
+++ b/app-admin/system-config-printer-gnome/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 AUX system-config-printer-gnome-1.3.11-split.patch 5150 SHA256 1529c4a83ccd6fcfa6e06f2e941ed1c912bc556a26ef27989049770636da9239 SHA512 60bd7faa2073fee4d7a1db3dddfd2329791f628bcdf2e6bea3cbb3b4e29d8ae0e12fe786803534da732862929af7f3aded39cd4c2bcbd581166e02528c42ad5e WHIRLPOOL 762dd0b1b382f8115ead1b83f51ed2b984bc6c39f59d3f5efab226588c6f4f53ef0414bed1acebb486d6ab85bf20697a23d20d9fbb921c2d801166a58aa816c2
-AUX system-config-printer-gnome-1.3.9-split.patch 5067 SHA256 d66b817165adfa52a46347e03096206f8c5dd6e90d7ad1c673fcc20bfc91caae SHA512 1ac1596ace08b981062cc3d404feddaa017f2a873df9737343450b9dc1298188cd50fffb245a7f85ff3e9b1e97d9c3763c597adf2d4694d69169ef65dd680516 WHIRLPOOL 576cf5d1c4f72090d0227bfcdcee3327e11137f0bb3a9357901e9e211e35f3fd59ceb887c1e2558e8444edaa0bbea35a2b4ae2bec962fe21f0c2cb0ae3ceb5f7
+AUX system-config-printer-gnome-1.3.12-split.patch 5146 SHA256 00d9f8646606d1ae0484d295515d316221b56225722966294b89d8cb2df41c74 SHA512 b4d876118b6016edcb1c15e02e237e2afe45b2fa3a6a2b82fc98ecaa58dc3c7b0a83e7a49a324638c8d8ef30262e2fda81d10d9579c978bfadb177ea2226f863 WHIRLPOOL 308148383a9c8f6640048e1e4c7a0273a7c489129be45afced39cfac47cef5c2f557e002c1a473b6b1d531cc1750178de72a51fed5c06d2fefaf4b05e175d0f1
 DIST system-config-printer-1.3.11.tar.xz 947488 SHA256 13816276895ca60c11ebc77b4209d30707b18c0489e247ea219474ee4a2f63c3 SHA512 4e50e973e404f959d8cb5b25dd6a38aa40f558408eb9818b3eb3b267b9a54f13aa97f05343cc0353ab36b32ac0a229d77109efd79b5e598fe43173072be02fac WHIRLPOOL d2372eb97263e84be9efd9bd6e190ddab2a75a327b0ece6f44ff8c9d1ee12484a82c3a2c5a2124195b0e45aa21fe3298de1025dce806ad195a7a1a84bdea80ec
-DIST system-config-printer-1.3.9.tar.xz 992152 SHA256 86a655d6599484cafe57f11694d9e2d9767ece03328a8fc8254aa92c8162dfe0 SHA512 98ffcbd36ee7c70fc349a945a75b5d2ed70cc1d08b2fe4eb2dc66d0ca887675956c6dc31728a2ba0e15b5742159dd6a9b11af204090a84d5b54f3237bcae62f1 WHIRLPOOL bd81593a7bc7082157ba9e9635aa3df9d0fe6c8fcd5886933781df3d93de9c889e51df5645d3bea6bd9b8448f57d65ef37ce88445cb695b734155772b794bb23
+DIST system-config-printer-1.3.12.tar.xz 949008 SHA256 1905bd9fd382730a8eab80fa196b1c43bd19ce79c2169142de899697cbb1e9b1 SHA512 4e6c15b52287f2a69fabb6dafe6548874b8608f2f7a2e14534b100fbb46ad0f146b1e03a6aa4c2c9fe66dad96789454bd066616db0dd73b962bffeb478a7c6c5 WHIRLPOOL 0b8afe05a87103ef99dac50ab7db5f3fc6137de9b84e483ee3a481172e4c894e206b6d022303f1f11496a63b5698351a67070fb936f35293e83f5a20c5e21599
 EBUILD system-config-printer-gnome-1.3.11.ebuild 2117 SHA256 8b0c319d6146f6193794cb8da72a4839c18ff0ab87aa69436a6d2d177f81368b SHA512 c022a7491a373042c402a531eb11d58756cb126cdc8bc9dc600a96ba859646975d9ba83970c2317739cd6140e24ebeda20cacc621049fa422f1a72dc348e9154 WHIRLPOOL 88aaac556dffdb3af3c30079517f4dbd80985d7cc3b68360b58472f408782b23ac4ceb456685e8fb922f9059a3b757e9be434908c51d8c9414cb523951211117
-EBUILD system-config-printer-gnome-1.3.9-r1.ebuild 2118 SHA256 81161158ca6faabc4234fb82300eceee64f2e95b6e890819dd7a7b8b8ef62315 SHA512 563194f62a86a07381af953bc56096f77e87a2429ae9625b22398422fb75e695d930a1df7b0b8a6f6e105cb516d9a83b7d5947e16fee173a2a18df43d8eedf87 WHIRLPOOL 090b990aa01ecc6228cb21f7c1331f265fad5a1a1844694f0b127ead788404607ba34d89c1bef41417cc48d8980ad6d300b5ca0e6330ad8b3c49aa992cbb8a09
-MISC ChangeLog 12463 SHA256 559bc92f127f73a22ac43c2c4efc18ed25d2d34a4f03a397710e8d34b8500385 SHA512 b6f9c63879e61f89a54d830b0e6bb8cf41e9b8422911439bed26d3360b5ac2834f078f576f7e71f13a81ddc41e93c20a426484b1be6723893845f2d202d89d85 WHIRLPOOL ca4de8544e09fff2a37c915c503a595fcd690072e209ecc9eab808f05ba9b162ad20322521f8bf31031b27b588eb958bc74a510cf06283f93d29461975f6f30f
+EBUILD system-config-printer-gnome-1.3.12.ebuild 2126 SHA256 fd22110b8988898d96223fb9d71ce577efb78c7aa149e94316e74f76196e9b5d SHA512 b716be9603e1d2de73f9642269e15fa4b9ac414ded8fff0ba5c5bb8b08856c567efb888ef16f12c0410bad1721302ca24a1a6df9f140c57b3d614496eece9310 WHIRLPOOL 33f2be6e12127b7d8a1c0156e98dc32b922db527d4d34ca98dd9c771a857aab94281ba98e341791dafbcb66d77ad258695212cfa704d6de5b08cfe38dd401310
+MISC ChangeLog 12816 SHA256 5b9d1b930c7d56f132e9a21a5516216a7217d1fd23b9a4b553eba87d45f56ba7 SHA512 52e9146a5a842e6bf6536e6c24309f1bcbdbbecacb3e069b4aea7eba3e2f275a9a4025cfc9260ee227b79cd429bd6ba3101d3ab7285fd0e90d067803168d0142 WHIRLPOOL f81f31ca987ff7ecdacca8f0c6e3c8bd68d358a202fb4045c5c72da80195ce36ea76d27e1cc2f933efa795bc93508417041903a264fda271eb3dfe028f29c79c
 MISC metadata.xml 252 SHA256 1256bc57f3264caef8f73fdf5baec132d049621d1c704d3bd2dc263d43438c80 SHA512 cc3788cd8387a476174bda230b94fe9d0daa6a072cbb2632becff0ac4376efe6e1a12e4ac44a5551e4f4603ea2e1c970c6a709c209b317aac9d851292b1c63ae WHIRLPOOL 5e419d5fbee2e1ddbdad566b0d39d41b7471573b3eb24258ba0370e7b16d44c394fa1064b1c6ef435eefcde803a669fc8860b490f1b91fa4e376abca33245704
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBohD8ACgkQuQc30/atMkBJhwCfdgkqcloU8qMYHhNxpLdJeZyZ
-afYAoI75NmpClqAiy9PBBmLUPtWbPKko
-=mTey
+iEYEAREIAAYFAlCYgH0ACgkQFuHa/bHpVdt8SgCfVfhy8FaJ9rHtxR6VuvV+s3/H
+xvkAniv+ZqQPT+vBPkAMymMpNylOtOIm
+=Yt0R
 -----END PGP SIGNATURE-----
diff --git a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.9-split.patch b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.12-split.patch
index 6367ce14487f..864aecfb1c5b 100644
--- a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.9-split.patch
+++ b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.12-split.patch
@@ -1,7 +1,7 @@
-diff -ruN system-config-printer-1.3.9/Makefile.am my2/Makefile.am
---- system-config-printer-1.3.9/Makefile.am	2011-10-26 14:14:19.000000000 +0200
-+++ my2/Makefile.am	2012-03-07 00:39:47.445321514 +0100
-@@ -1,89 +1,8 @@
+diff -ruN system-config-printer-1.3.12/Makefile.am my/Makefile.am
+--- system-config-printer-1.3.12/Makefile.am	2012-10-04 15:51:04.000000000 +0200
++++ my/Makefile.am	2012-11-06 04:05:52.745405001 +0100
+@@ -1,90 +1,8 @@
 -CFLAGS=-g -O2 -Wall
 +CFLAGS=-Wall
  
@@ -56,6 +56,7 @@ diff -ruN system-config-printer-1.3.9/Makefile.am my2/Makefile.am
 -	sed \
 -	  -e "s|\@prefix\@|$(prefix)|" \
 -	  -e "s|\@sysconfdir\@|$(sysconfdir)|" \
+-	  -e "s|\@cupsserverbindir\@|$(cupsserverbindir)|" \
 -	  $< > $@
 -
 -# Use distutils to build the module.
@@ -92,7 +93,7 @@ diff -ruN system-config-printer-1.3.9/Makefile.am my2/Makefile.am
  	pysmb.py				\
  	scp-dbus-service.py			\
  	system-config-printer.py		\
-@@ -95,33 +14,21 @@
+@@ -96,33 +14,21 @@
  	asyncipp.py					\
  	asyncpk1.py					\
  	authconn.py					\
@@ -126,7 +127,7 @@ diff -ruN system-config-printer-1.3.9/Makefile.am my2/Makefile.am
  	timedops.py					\
  	ToolbarSearchEntry.py				\
  	userdefault.py					\
-@@ -164,52 +71,17 @@
+@@ -165,52 +71,17 @@
  	troubleshoot/ServerFirewalled.py		\
  	troubleshoot/Shrug.py				\
  	troubleshoot/VerifyPackages.py			\
@@ -149,8 +150,8 @@ diff -ruN system-config-printer-1.3.9/Makefile.am my2/Makefile.am
 -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)
--udev_udev_configure_printer_CFLAGS=$(AM_CFLAGS) $(GLIB_CFLAGS)
+-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
 -udevhelper_PROGRAMS=\
 -	udev/udev-configure-printer
@@ -161,7 +162,7 @@ diff -ruN system-config-printer-1.3.9/Makefile.am my2/Makefile.am
 -%.service: %.service.in
 -	$(AM_V_GEN)sed -e 's,@udevhelperdir\@,$(udevhelperdir),g' $< > $@
 -systemdsystemunit_DATA = \
--	udev/udev-configure-printer.service
+-	udev/configure-printer@.service
 -CLEANFILES = \
 -	$(systemdsystemunit_DATA)
 -endif
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.9-r1.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.12.ebuild
index 2b1d56caf630..018cf9381ee0 100644
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.9-r1.ebuild
+++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.9-r1.ebuild,v 1.10 2012/07/15 16:21:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.12.ebuild,v 1.1 2012/11/06 03:14:05 reavertm Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
 SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.3/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 SLOT="0"
 IUSE="gnome-keyring"
 
@@ -53,7 +53,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.9-split.patch"
+	epatch "${FILESDIR}/${PN}-1.3.12-split.patch"
 	eautoreconf
 }