Workaround parallel docs make/install, bug 471472.

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key B1E955DB)

3 files changed, 4 insertions, 270 deletions

diff --git a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.11-split.patch b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.11-split.patch
deleted file mode 100644
index d517845ee37b..000000000000
--- a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.11-split.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-diff -ruN system-config-printer-1.3.11/Makefile.am my/Makefile.am
---- system-config-printer-1.3.11/Makefile.am	2012-08-01 13:25:49.000000000 +0200
-+++ my/Makefile.am	2012-08-06 01:56:22.391528895 +0200
-@@ -1,90 +1,8 @@
--CFLAGS=-g -O2 -Wall
-+CFLAGS=-Wall
- 
- SUBDIRS=po
- 
--EXPORT_MODULES=					\
--	cupshelpers/__init__.py			\
--	cupshelpers/cupshelpers.py		\
--	cupshelpers/installdriver.py		\
--	cupshelpers/ppds.py			\
--	cupshelpers/openprinting.py		\
--	cupshelpers/xmldriverprefs.py
--
--EXPORT_MODULES_GEN=				\
--	cupshelpers/config.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_p) 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)|" \
--	  $< > $@
--
--cupshelpers/config.py: cupshelpers/config.py.in Makefile
--	$(mkdir_p) cupshelpers
--	sed \
--	  -e "s|\@prefix\@|$(prefix)|" \
--	  -e "s|\@sysconfdir\@|$(sysconfdir)|" \
--	  -e "s|\@cupsserverbindir\@|$(cupsserverbindir)|" \
--	  $< > $@
--
--# Use distutils to build the module.
--all-local: .stamp-distutils-in-builddir config.py cupshelpers/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) $(EXPORT_MODULES_GEN); 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)			\
--			$(EXPORT_MODULES_GEN); do		\
--			rm -f $$file*;				\
--		done;						\
--	fi
--	rm -f .stamp-distutils-in-builddir
--
- nobase_pkgdata_SCRIPTS=				\
--	check-device-ids.py			\
- 	pysmb.py				\
- 	scp-dbus-service.py			\
- 	system-config-printer.py		\
-@@ -96,33 +14,21 @@
- 	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					\
-@@ -165,52 +71,17 @@
- 	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
-+	troubleshoot/Welcome.py
- 
- 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)
--udevhelperdir=$(sysconfdir)/udev
--udevhelper_PROGRAMS=\
--	udev/udev-configure-printer
--udevhelper_SCRIPTS=\
--	udev/udev-add-printer
--
--if HAVE_SYSTEMD
--%.service: %.service.in
--	$(AM_V_GEN)sed -e 's,@udevhelperdir\@,$(udevhelperdir),g' $< > $@
--systemdsystemunit_DATA = \
--	udev/udev-configure-printer.service
--CLEANFILES = \
--	$(systemdsystemunit_DATA)
--endif
--
--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/
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.11.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.11.ebuild
deleted file mode 100644
index 56cc0a30f84f..000000000000
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.11.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.11.ebuild,v 1.5 2012/11/07 20:10:25 pacho Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="xml"
-WANT_AUTOMAKE="1.11"
-inherit eutils 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.3/${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/pycups-1.9.60
-	>=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/desktop-file-utils
-	dev-util/intltool
-	virtual/pkgconfig
-	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.3.11-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.12.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.12.ebuild
index fe28b073a5f8..44b533c5292b 100644
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.12.ebuild
+++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.12.ebuild,v 1.10 2013/04/09 16:40:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.12.ebuild,v 1.11 2013/05/27 23:08:44 reavertm Exp $
 
 EAPI="3"
 
@@ -48,6 +48,9 @@ done
 
 S="${WORKDIR}/${MY_P}"
 
+# Bug 471472
+MAKEOPTS=-j1
+
 pkg_setup() {
 	python_set_active_version 2
 }