Explicitly inherit eutils, autotools.eclass no longer provides it (bug #416847, thanks to wilson and Wuodan). Drop unused patch.

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

5 files changed, 15 insertions, 178 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index f0aa38c94408..06adf8c7f91e 100644
--- a/app-admin/system-config-printer-common/ChangeLog
+++ b/app-admin/system-config-printer-common/ChangeLog
@@ -1,6 +1,14 @@
 # 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.68 2012/05/03 18:02:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.69 2012/05/21 17:36:38 tetromino Exp $
+
+  21 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/system-config-printer-common-1.3.3-split.patch,
+  system-config-printer-common-1.3.6.ebuild,
+  system-config-printer-common-1.3.7.ebuild,
+  system-config-printer-common-1.3.9-r1.ebuild:
+  Explicitly inherit eutils, autotools.eclass no longer provides it (bug
+  #416847, thanks to wilson and Wuodan). Drop unused patch.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org>
   system-config-printer-common-1.3.6.ebuild,
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.3-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.3-split.patch
deleted file mode 100644
index f83affaa14ea..000000000000
--- a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.3-split.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-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)
- 
- SUBDIRS=po
- 
-@@ -83,102 +83,22 @@
- 	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
-+	pysmb.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						\
--	GroupsPane.py					\
--	GroupsPaneModel.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					\
--	XmlHelper.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
--
--cupshelpersdir=$(sysconfdir)/cupshelpers
--cupshelpers_DATA=\
--	xml/preferreddrivers.xml
--
--bin_SCRIPTS=					\
--	system-config-printer			\
--	system-config-printer-applet		\
--	dbus/scp-dbus-service
-+	XmlHelper.py
- 
- if UDEV_RULES
- udevrulesdir=$(sysconfdir)/udev/rules.d
-@@ -193,56 +113,17 @@
- 	udev/udev-add-printer
- 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.6.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.6.ebuild
index 296dbce81f56..b43e183dc5bd 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.6.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.6.ebuild
@@ -1,12 +1,12 @@
 # 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.6.ebuild,v 1.11 2012/05/03 18:02:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.6.ebuild,v 1.12 2012/05/21 17:36:38 tetromino Exp $
 
 EAPI="3"
 
 PYTHON_DEPEND="2"
 WANT_AUTOMAKE="1.11"
-inherit python autotools
+inherit eutils python autotools
 
 MY_P="${PN%-common}-${PV}"
 
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild
index 07da7dbda30f..db929bd9cab3 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild
@@ -1,12 +1,12 @@
 # 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.7.ebuild,v 1.11 2012/05/03 18:02:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild,v 1.12 2012/05/21 17:36:38 tetromino Exp $
 
 EAPI="3"
 
 PYTHON_DEPEND="2"
 WANT_AUTOMAKE="1.11"
-inherit python autotools
+inherit eutils python autotools
 
 MY_P="${PN%-common}-${PV}"
 
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild
index 2187d147ddd1..85953b83f2e9 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild
@@ -1,12 +1,12 @@
 # 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.9-r1.ebuild,v 1.6 2012/05/03 18:02:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild,v 1.7 2012/05/21 17:36:38 tetromino Exp $
 
 EAPI="3"
 
 PYTHON_DEPEND="2"
 WANT_AUTOMAKE="1.11"
-inherit python autotools
+inherit eutils python autotools
 
 MY_P="${PN%-common}-${PV}"