Drop old (#508854)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 12 insertions, 554 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index afe24ce007c8..0fe40de8ff6d 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.108 2014/08/21 10:38:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.109 2014/11/13 11:09:49 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/system-config-printer-common-1.3.12-split.patch,
+  -files/system-config-printer-common-1.3.13-split.patch,
+  -system-config-printer-common-1.3.12.ebuild,
+  -system-config-printer-common-1.3.13.ebuild:
+  Drop old (#508854)
 
   21 Aug 2014; Agostino Sarubbo <ago@gentoo.org>
   system-config-printer-common-1.4.3.ebuild:
diff --git a/app-admin/system-config-printer-common/Manifest b/app-admin/system-config-printer-common/Manifest
index 9915dceb4cec..946b47a89de3 100644
--- a/app-admin/system-config-printer-common/Manifest
+++ b/app-admin/system-config-printer-common/Manifest
@@ -1,31 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX system-config-printer-common-1.3.12-split.patch 5153 SHA256 8fd364427186fb7141120d5ba185e3d1a882190652d466323914a02878a352f4 SHA512 5553c44316371fb58cd7275f713b461eaa3e94fb052b709fef62a62797caaf7e08088a0a17f23af770666a0804eb70b407a1b0919297973a0ec88d6042357b87 WHIRLPOOL 36cbdf92560e731b8565cc90794740c0f876fdbc420b5caec78378462e304c8c91ee9576e3490557c276086ec7bde286cfe05ee5a90eea5cca3d3044a4f928ee
-AUX system-config-printer-common-1.3.13-split.patch 5175 SHA256 2992cbc0b0c72995680d7b0e55f36005d6d55da846aa5dbfe7fcad21236cb2bf SHA512 d64c37b5871bc0811e2b8ff5f8e3e6b0c7b9401a84dd70ebfcb525353e5021df7a5b19e0a6251acfb2aa18889a95c7cabe03ebcde7a6b3613827251442c27739 WHIRLPOOL d5754373f43bfaab50071efcafc0027459e4d360ea40db2d6649a128b042cbd708c2c7432f3e6ba86fafe727c69abf1a92454621307202f4f55fa7c9dc8ce949
 AUX system-config-printer-common-1.4.1-split.patch 5238 SHA256 678c744c55539ef5ebfc48913de45e2f7f48047658acfe45d5c5f6fac1fc28d7 SHA512 4e629a3c7bc1ed586449c953911407910f079cac85776c5a7c4a2cbd89157ff679ee86525f9d87e50699521acdb8e3010df6c9cb9a193953e470b75f70f50b8f WHIRLPOOL d4ef925e93d446e7d886c5bab1611da175e03eb3d8d34cbbf95fec16a962d3727f92f961aecf53256d33145d9cbf830302c3c1ea7023427d818125fea8e0deeb
-DIST system-config-printer-1.3.12.tar.xz 949008 SHA256 1905bd9fd382730a8eab80fa196b1c43bd19ce79c2169142de899697cbb1e9b1 SHA512 4e6c15b52287f2a69fabb6dafe6548874b8608f2f7a2e14534b100fbb46ad0f146b1e03a6aa4c2c9fe66dad96789454bd066616db0dd73b962bffeb478a7c6c5 WHIRLPOOL 0b8afe05a87103ef99dac50ab7db5f3fc6137de9b84e483ee3a481172e4c894e206b6d022303f1f11496a63b5698351a67070fb936f35293e83f5a20c5e21599
-DIST system-config-printer-1.3.13.tar.xz 955636 SHA256 9a6a4fbf61b1aafa061674719321846665ee7a4e7ab96dd4747069b0927d12a6 SHA512 046501d17c33a2ff72020b3d20210c5544c6310469cba1ca21cfaee7bb153915f850c102fbd5661e8f5ff6872c8400103346e71d258113405c5c0f752c5dffc1 WHIRLPOOL 9e44a26543de5375e45fdfb576511115f8e63f8e6a7865c7d1183660672e60b4f3f1f2027fe2677f71ca256997c89ad1281799256f102bf5aa56f57844f6f055
 DIST system-config-printer-1.4.3.tar.xz 892132 SHA256 c14bb1b75929ccf31267da8cf774bed923c4ea3eb0deddcc255221c0b8844c0f SHA512 36584b7caa26765160beaf3cddc9b4e7bad05d93e3a7960911f2e6a129e7c811fabcd25cc728c2eb0c7aa14f0f1dd66425f2d767adc8ee6eaaa4a3a0b77d280f WHIRLPOOL cc955dd3c979b75bbb40a98c1ad13276f7775807c098ac97bf9c5cf37109f24073d2d886695e357f8a417ab34ce5aa8fea5cc7add4dddf4f67fb00c3fb529e45
-EBUILD system-config-printer-common-1.3.12.ebuild 1932 SHA256 24950a633b4c2c2d8593148fcea399ffe8e7b42db91fc042c4fefbd05d1b462b SHA512 5ac6a59a96b95985f6842b52f327834a4288d997e84c9be33c1c7afc1bc9f1dc4e5d5a774773fa8aa2f2ee7b220d8857dd273123bf1b739ebfec2898cf0a7208 WHIRLPOOL 8097062100981e8d914d2df453ca7103b242fc24d379ca68c123d9f72aff8274ad3e5bc4bab707219d85e482d722e019e4cd1aa1a6d8d11bb76ffec80810c8c4
-EBUILD system-config-printer-common-1.3.13.ebuild 2100 SHA256 31aeda18f868ce50c230a3078435e149bb67be7253057a4c1ae20d35db5c543e SHA512 c062b0c78d8ad8a88bfb0dab9da1f98fb777d4cfe05e5fe5f14ff4ad01b75fc4055b1c192066ad1e47a6b0859676d68663d385fc548d96b6c246bed3aa0218b6 WHIRLPOOL 6bd9afbd4986e8699358f4017f0916312d3beadcef53391eec273555454603443c0d2a360cd7da9c921f86d1eb475a355021fd92ce0e26da64f242574131362c
 EBUILD system-config-printer-common-1.4.3.ebuild 1950 SHA256 faff1a55265c0046395cbc56a7c72b646b0168ee750e500dba6f298978373392 SHA512 1ccb2b840bf434060e4362900e7edc9735ec10f060ac3c4d22328661d836ffb1a394c50e628d057c00be1d94ad23b5bacae72ff0bd0dd60a7211b40de3fb1015 WHIRLPOOL 4f5b0c07730fec849391adbd6fbfce347b5390a9de3e0a1c5530208aca381c2692f635a82fdcee96e7798233c0dfdf73ad5050d75e8f8fd695b549d852ec4216
-MISC ChangeLog 21664 SHA256 008a861d7d6e8ac6ed2cef4048a3f5f6f4b3adde4bd26eb5f783a4a1dbaedbd8 SHA512 ee53ffe69c323a94ff5595e5eb0222dc208ed5f42e211e18110952cb97550090de1ef85dc0f2ede5ee8c9c82569e8d5116bfe4b6d8b51260d2b34e75b90bc7fc WHIRLPOOL 08f98544581fb7a56ff9d0d02d1f5b0ca987f7793c1db14cc4f81b417eeb763bbda12a731202061f73d46d3cca101ddde35c6044ec1f66b3a84d250c65d981f4
+MISC ChangeLog 21944 SHA256 cab8187c51151f4332d0cdcbacb7a4acc967ddfe41012f79ecdc5cb2ab659b50 SHA512 96300d19b22711738c8d35b2912f32f4b4fab0ef7b7e9a87d05b3677f8d68d8e6388f2624ea704c09e1b10bbc18fbbf8c67a55abb27e57854ba7d66415ea6a7b WHIRLPOOL 5b79b9f3edbacb2b163a54e18b3039224764b9e2b63541e67c1a3c9b38f565ae6c198c44ea48c5def3ff9ec2eebf646cfc6814dcca6404ed7cd85acc946fdbd0
 MISC metadata.xml 269 SHA256 4093e60c94c1276d3fce2608e758ed73b067ae7af175d26df104f4df0fbe3e8a SHA512 2e9634524d34d3ca8b09f3212921325a7460449aff6d5307a7ee547a9d386207d772198d762ef0338325864449474a16c92653547cbdceb214ec5c9a0d9d417d WHIRLPOOL 4a6977f8e8520c7d8d5ce51b169c13d3f7fbf7bdaaaf43e03f827aa7e89017a7119ffc3b944ca5fb8ee0cff35f81a7e3d3c92682a58bc53cc361516b19c717e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT9cwaAAoJELp701BxlEWf/LwP/RJAUTbK8+qwq/O6bB2L6kkF
-mb9becyKO5c8BBs2fV3QhPDeIJF4xihv/U6CXQg1ymbATZjhV4gfSHtSZOThL8i2
-b6UIvlYhNdSQvf4JEwtudazNmN8FWZ2y0CwTDHFtB8wtlue7B1pCo1Abpp4io0L9
-FUcRdeOScukaHB7ZNAA89NtA/Yqk0k1TRljRylyuU/WvrNV0L8eSTgOCfdOY5obb
-enHupCM5qcoMxYe/fTae7rQk7/uiTz8cEVuaXcfdSEvlTASMVDXY7XPqKnYXycnJ
-HdYgtTcBdD3H5wt5h0XHk/AYCK+M3FZVfNzLU0PjAc0x0E/cW4iYt1F1BFYzo+Zc
-IJpIlxBQG/gxjXVTrDw1En8FgRb/08wjwPx3I6QUPmj7rJMC6eTmQHjd+IaMDwHb
-xYcHtDIXE+AfUB/Mj0FXLBmprwjX3U3ZcK5hpafbkAYKUVL1pmQ1IF4qsf5fboNB
-CcHj93qaz/l/4Nw1REEIZcv8iYeyiYORnP5/2WufwdD2CUO8FBwANhmiL1WS1u6i
-nj8i70fAhz4Tv7XD2Qyl5wZMtAlhCMwmn38dA3Nn3Y1ygVwgKL3xMsR2R3hryAgZ
-2zi/vZC18tuGBberALAxkkFWgOoeiSvrfEOK4W1/3qMYugfJI+ptW0+TC9SxZzOo
-W051xk/AM0kRSRMmjXTZ
-=TTwz
+iEUEAREIAAYFAlRkkX4ACgkQCaWpQKGI+9SzjgCePcY5qq+NjcUmfr/0038in/b/
+RlAAmL9+GHGO/SI608VfgYqRAZ91DB8=
+=04sv
 -----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
deleted file mode 100644
index f2240045f887..000000000000
--- a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.12-split.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-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-19 00:45:25.702660438 +0100
-@@ -1,5 +1,3 @@
--CFLAGS=-g -O2 -Wall
--
- SUBDIRS=po
- 
- EXPORT_MODULES=					\
-@@ -84,88 +82,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 +104,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 +128,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/files/system-config-printer-common-1.3.13-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.13-split.patch
deleted file mode 100644
index 172289811f65..000000000000
--- a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.13-split.patch
+++ /dev/null
@@ -1,178 +0,0 @@
---- system-config-printer-1.3.13/Makefile.am.org	2013-10-27 22:22:54.057495728 +0100
-+++ system-config-printer-1.3.13/Makefile.am	2013-10-27 22:29:26.054299236 +0100
-@@ -1,5 +1,3 @@
--CFLAGS=-g -O2 -Wall
--
- SUBDIRS=po
- 
- EXPORT_MODULES=					\
-@@ -84,89 +82,21 @@
- 	rm -f .stamp-distutils-in-builddir
- 
- nobase_pkgdata_SCRIPTS=				\
--	check-device-ids.py			\
--	pysmb.py				\
--	scp-dbus-service.py			\
--	system-config-printer.py		\
--	install-printerdriver.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
- 
-@@ -174,19 +104,13 @@
- cupshelpers_DATA=\
- 	xml/preferreddrivers.xml
- 
--bin_SCRIPTS=					\
--	system-config-printer			\
--	install-printerdriver			\
--	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
-@@ -204,56 +128,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
deleted file mode 100644
index f4befde72175..000000000000
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2014 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.13 2014/07/30 19:17:42 ssuominen Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-WANT_AUTOMAKE="1.11"
-
-inherit autotools eutils python toolchain-funcs udev
-
-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]
-	>=virtual/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="$(get_udevdir)" \
-		udevrulesdir="$(get_udevdir)/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-common/system-config-printer-common-1.3.13.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.13.ebuild
deleted file mode 100644
index d49ad887f9d5..000000000000
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.13.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2014 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.13.ebuild,v 1.2 2014/07/30 19:17:42 ssuominen Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_{6,7} )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils python-single-r1 udev systemd
-
-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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Needs cups running, bug 284005
-RESTRICT="test"
-
-# system-config-printer split since 1.1.3
-#
-# Additional unhandled dependencies:
-# net-firewall/firewalld[${PYTHON_USEDEP}]
-# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	>=dev-python/pycups-1.9.60[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-2.21.5:2[${PYTHON_USEDEP}]
-	net-print/cups[dbus]
-	virtual/libusb:1
-	>=virtual/udev-172
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<app-admin/system-config-printer-gnome-${PV}
-	policykit? ( >=sys-auth/polkit-0.104-r1 )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3.13-split.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-nls \
-		--with-udev-rules \
-		$(systemd_with_unitdir)
-}
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		udevhelperdir="$(get_udevdir)" \
-		udevrulesdir="$(get_udevdir)/rules.d" \
-		install
-
-	dodoc AUTHORS ChangeLog README
-	use doc && dohtml -r html/
-
-	python_fix_shebang "${ED}"
-}