Version bump, remove old

Package-Manager: portage-2.2.0_alpha40/cvs/Linux x86_64

2 files changed, 5 insertions, 151 deletions

diff --git a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.2.6-split.patch b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.2.6-split.patch
deleted file mode 100644
index 2d9a826f7749..000000000000
--- a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.2.6-split.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-diff -ru system-config-printer-1.2.6/Makefile.am new/Makefile.am
---- system-config-printer-1.2.6/Makefile.am	2011-01-14 17:04:25.000000000 +0100
-+++ new/Makefile.am	2011-01-27 02:07:03.255000001 +0100
-@@ -2,77 +2,8 @@
- 
- SUBDIRS=po
- 
--EXPORT_MODULES=					\
--	cupshelpers/__init__.py			\
--	cupshelpers/cupshelpers.py		\
--	cupshelpers/installdriver.py		\
--	cupshelpers/ppds.py			\
--	cupshelpers/openprinting.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 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)|" \
--	  $< > $@
--
--# Use distutils to build the module.
--all-local: .stamp-distutils-in-builddir 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); 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); do		\
--			rm -f $$file*;				\
--		done;						\
--	fi
--	rm -f .stamp-distutils-in-builddir
--
- nobase_pkgdata_SCRIPTS=				\
- 	check-device-ids.py			\
--	pysmb.py				\
- 	system-config-printer.py		\
- 	troubleshoot/__init__.py		\
- 	applet.py
-@@ -83,35 +14,22 @@
- 	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					\
- 	options.py					\
- 	optionwidgets.py				\
--	PhysicalDevice.py				\
--	ppdippstr.py					\
- 	ppdsloader.py					\
--	probe_printer.py				\
- 	gtk_label_autowrap.py				\
--	SearchCriterion.py				\
--	smburi.py					\
--	statereason.py					\
- 	timedops.py					\
- 	ToolbarSearchEntry.py				\
- 	userdefault.py					\
--	XmlHelper.py					\
- 	ui/AboutDialog.glade				\
- 	ui/ConnectDialog.glade				\
- 	ui/ConnectingDialog.glade			\
-@@ -156,28 +74,10 @@
- 	system-config-printer			\
- 	system-config-printer-applet
- 
--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)
--udevhelperdir=$(sysconfdir)/udev
--udevhelper_PROGRAMS=\
--	udev/udev-configure-printer
--udevhelper_SCRIPTS=\
--	udev/udev-add-printer
--endif
--
- man_MANS=					\
- 	man/system-config-printer.1		\
- 	man/system-config-printer-applet.1
- 
--dbus_DATA =					\
--	newprinternotification.conf		\
--	printerdriversinstaller.conf
--dbusdir = $(sysconfdir)/dbus-1/system.d/
--
- desktop_DATA =\
- 	system-config-printer.desktop \
- 	print-applet.desktop \
diff --git a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.2-split.patch b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.3-split.patch
index 8f40a5eb0737..f1cf695e9505 100644
--- a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.2-split.patch
+++ b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.3-split.patch
@@ -1,5 +1,5 @@
-diff -ruN system-config-printer-1.3.2/Makefile.am my/Makefile.am
---- system-config-printer-1.3.2/Makefile.am	2011-03-16 17:44:41.000000000 +0100
+diff -ruN system-config-printer-1.3.3/Makefile.am my/Makefile.am
+--- system-config-printer-1.3.3/Makefile.am	2011-03-16 17:44:41.000000000 +0100
 +++ my/Makefile.am	2011-03-19 01:03:54.708000002 +0100
 @@ -1,90 +1,9 @@
 -AM_CFLAGS=-g -O2 -Wall $(GLIB_CFLAGS)
@@ -130,9 +130,9 @@ diff -ruN system-config-printer-1.3.2/Makefile.am my/Makefile.am
  	ToolbarSearchEntry.py				\
  	userdefault.py					\
 -	XmlHelper.py					\
- 	ui/AboutDialog.glade				\
- 	ui/ConnectDialog.glade				\
- 	ui/ConnectingDialog.glade			\
+ 	ui/AboutDialog.ui				\
+ 	ui/ConnectDialog.ui				\
+ 	ui/ConnectingDialog.ui			\
 @@ -180,28 +86,10 @@
  	system-config-printer-applet		\
  	dbus/scp-dbus-service