Fix installed filelist (to match with scp-common-1.3.9-r1).

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

3 files changed, 194 insertions, 4 deletions

diff --git a/app-admin/system-config-printer-gnome/ChangeLog b/app-admin/system-config-printer-gnome/ChangeLog
index 5ccff9e41987..5d0c2eb04c13 100644
--- a/app-admin/system-config-printer-gnome/ChangeLog
+++ b/app-admin/system-config-printer-gnome/ChangeLog
@@ -1,6 +1,14 @@
 # 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.46 2012/03/05 22:43:02 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.47 2012/03/07 01:29:13 reavertm Exp $
+
+*system-config-printer-gnome-1.3.9-r1 (07 Mar 2012)
+
+  07 Mar 2012; Maciej Mrozowski <reavertm@gentoo.org>
+  +files/system-config-printer-gnome-1.3.9-split.patch,
+  +system-config-printer-gnome-1.3.9-r1.ebuild,
+  -system-config-printer-gnome-1.3.9.ebuild:
+  Fix installed filelist (to match with scp-common-1.3.9-r1).
 
 *system-config-printer-gnome-1.3.9 (05 Mar 2012)
 
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.9-split.patch
new file mode 100644
index 000000000000..6367ce14487f
--- /dev/null
+++ b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.9-split.patch
@@ -0,0 +1,182 @@
+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 @@
+-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)|" \
+-	  $< > $@
+-
+-# 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		\
+@@ -95,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					\
+@@ -164,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 -lusb $(GLIB_LIBS)
+-udev_udev_configure_printer_CFLAGS=$(AM_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.9.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.9-r1.ebuild
index 424cad80c49f..c0ef956b4e7b 100644
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.9.ebuild
+++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.9-r1.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.ebuild,v 1.1 2012/03/05 22:43:02 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.9-r1.ebuild,v 1.1 2012/03/07 01:29:13 reavertm Exp $
 
 EAPI="3"
 
@@ -24,7 +24,7 @@ IUSE="gnome-keyring"
 RESTRICT="test"
 
 RDEPEND="
-	~app-admin/system-config-printer-common-${PV}
+	=app-admin/system-config-printer-common-${PVR}
 	dev-python/notify-python
 	>=dev-python/pycups-1.9.60
 	>=dev-python/pygtk-2.4
@@ -53,7 +53,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.5-split.patch"
+	epatch "${FILESDIR}/${PN}-1.3.9-split.patch"
 	eautoreconf
 }