[app-admin/system-config-printer-gnome] First testing release

4 files changed, 140 insertions, 76 deletions

diff --git a/app-admin/system-config-printer-gnome/Manifest b/app-admin/system-config-printer-gnome/Manifest
index 87440c75ca3..ab929591721 100644
--- a/app-admin/system-config-printer-gnome/Manifest
+++ b/app-admin/system-config-printer-gnome/Manifest
@@ -1,4 +1,4 @@
-AUX system-config-printer-gnome-1.1.8-split.patch 1701 RMD160 a79d8e062dfefd1a1fc12a04c8afc63e5b085140 SHA1 5f5d56e9fe28dd93cddf0631570b3e05d420ba27 SHA256 a0d86d100ef7c767d57307facf6ded9a8baa223aef83069acc01fbbf9a2b3605
-DIST system-config-printer-1.1.8.tar.bz2 1003222 RMD160 42d7f24837dda80f4192cd28cbbd215df764e93d SHA1 fee1f43de24562173e3b8cea58c6226f3fb27c70 SHA256 d7ee76aabf62e210b2a2bbdbf41f93933d983b99a2e63107d1713a327d0387eb
-EBUILD system-config-printer-gnome-1.1.8.ebuild 1611 RMD160 c8c17d75a7aabf64810e0316bda8044832b45b97 SHA1 8c715b10d91c668c32b247b7f322d2357a663fa7 SHA256 d91b5eec2b3c36f5e0509a1052b9bdffcc0fb8fb0f028666a43e7478cdbf7c79
+AUX system-config-printer-gnome-1.1.12-split.patch 3900 RMD160 697b8f5d394701371b7efc33bb685c1abce18e2d SHA1 8857cd89e33fbbbbd25b9674d22659061a008549 SHA256 52f911369a0c97ae7e43c4dd3f53cf8d0cf686d6cf9f871b81f51cef10e7634d
+DIST system-config-printer-1.1.12.tar.bz2 1009644 RMD160 4d5617621133fc7d484405d091faaed601d67219 SHA1 179123707cc46850c3ad38e831c8c359dfac98d6 SHA256 c3a33293bf6bc7a50dca35ac814637e4dac04889d25ec4a96b059f4d1054f9c2
+EBUILD system-config-printer-gnome-1.1.12.ebuild 1611 RMD160 4fca11335be27b98cb6bf626c375b6f414ba962f SHA1 a5c28ccf8e149dc11d634ec6881d06be6b6ccd00 SHA256 48e191e082ee722863f6ea824b2b8cb558f7b04abebbbf95ff6f9b0f4b16b574
 MISC metadata.xml 347 RMD160 d52c2c8ab9f214c5c4cb3a4d7e4b83a36d533b30 SHA1 4891ec212f8cc905d12201d045d2cf312d5eab2e SHA256 5f128c29e7a8ebd50e86fa49feed744e464da8208f397966f1a754f78c960014
diff --git a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.1.12-split.patch b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.1.12-split.patch
new file mode 100644
index 00000000000..1813de431fc
--- /dev/null
+++ b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.1.12-split.patch
@@ -0,0 +1,133 @@
+diff -ru ../system-config-printer-1.1.12/configure.in ./configure.in
+--- ../system-config-printer-1.1.12/configure.in	2009-08-25 18:01:27.000000000 +0200
++++ ./configure.in	2009-08-28 19:03:53.000000000 +0200
+@@ -1,6 +1,6 @@
+ AC_INIT(system-config-printer, 1.1.12)
+ AC_CONFIG_SRCDIR(system-config-printer.py)
+-AM_INIT_AUTOMAKE([dist-xz dist-bzip2 subdir-objects 1.6])
++AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6])
+ IT_PROG_INTLTOOL
+ AM_GNU_GETTEXT([external])
+ AM_PATH_PYTHON
+diff -ru ../system-config-printer-1.1.12/Makefile.am ./Makefile.am
+--- ../system-config-printer-1.1.12/Makefile.am	2009-08-25 18:01:27.000000000 +0200
++++ ./Makefile.am	2009-08-28 22:48:07.000000000 +0200
+@@ -2,76 +2,8 @@
+ 
+ SUBDIRS=po
+ 
+-EXPORT_MODULES=					\
+-	cupshelpers/__init__.py			\
+-	cupshelpers/cupshelpers.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=				\
+ 	my-default-printer.py			\
+-	pysmb.py				\
+ 	system-config-printer.py		\
+ 	troubleshoot/__init__.py		\
+ 	applet.py
+@@ -79,9 +11,7 @@
+ nobase_pkgdata_DATA=					\
+ 	AdvancedServerSettings.py			\
+ 	authconn.py					\
+-	config.py					\
+ 	cupspk.py					\
+-	debug.py					\
+ 	errordialogs.py					\
+ 	HIG.py						\
+ 	glade.py					\
+@@ -89,22 +19,13 @@
+ 	GroupsPaneModel.py				\
+ 	gtkinklevel.py					\
+ 	gtkspinner.py					\
+-	installpackage.py				\
+ 	jobviewer.py					\
+-	monitor.py					\
+ 	options.py					\
+ 	optionwidgets.py				\
+-	PhysicalDevice.py				\
+-	ppdippstr.py					\
+-	probe_printer.py				\
+ 	gtk_label_autowrap.py				\
+-	SearchCriterion.py				\
+-	smburi.py					\
+-	statereason.py					\
+ 	timedops.py					\
+ 	ToolbarSearchEntry.py				\
+ 	userdefault.py					\
+-	XmlHelper.py					\
+ 	glade/AboutDialog.glade				\
+ 	glade/ConnectDialog.glade				\
+ 	glade/ConnectingDialog.glade			\
+@@ -166,8 +87,6 @@
+ 	man/system-config-printer.1		\
+ 	man/system-config-printer-applet.1
+ 
+-dbus_DATA =\
+-	newprinternotification.conf
+ dbusdir = $(sysconfdir)/dbus-1/system.d/
+ 
+ desktop_DATA =\
diff --git a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.1.8-split.patch b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.1.8-split.patch
deleted file mode 100644
index f1e6e370948..00000000000
--- a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.1.8-split.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -ru ../system-config-printer-1.1.8/Makefile.am ./Makefile.am
---- ../system-config-printer-1.1.8/Makefile.am	2009-06-18 18:10:58.000000000 +0200
-+++ ./Makefile.am	2009-07-16 02:01:31.000000000 +0200
-@@ -1,11 +1,5 @@
- SUBDIRS=po
- 
--EXPORT_MODULES=					\
--	cupshelpers/__init__.py			\
--	cupshelpers/cupshelpers.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
-@@ -67,9 +61,7 @@
- nobase_pkgdata_DATA=					\
- 	AdvancedServerSettings.py			\
- 	authconn.py					\
--	config.py					\
- 	cupspk.py					\
--	debug.py					\
- 	errordialogs.py					\
- 	HIG.py						\
- 	glade.py					\
-@@ -84,12 +76,9 @@
- 	optionwidgets.py				\
- 	PhysicalDevice.py				\
- 	ppdippstr.py					\
--	probe_printer.py				\
- 	gtk_label_autowrap.py				\
- 	gtk_treeviewtooltips.py				\
- 	SearchCriterion.py				\
--	smburi.py					\
--	statereason.py					\
- 	timedops.py					\
- 	ToolbarSearchEntry.py				\
- 	userdefault.py					\
-@@ -143,8 +132,6 @@
- 	man/system-config-printer.1		\
- 	man/system-config-printer-applet.1
- 
--dbus_DATA =\
--	newprinternotification.conf
- dbusdir = $(sysconfdir)/dbus-1/system.d/
- 
- desktop_DATA =\
-@@ -200,9 +187,7 @@
- 	$(nobase_sbin_SCRIPTS) \
- 	$(bin_SCRIPTS) \
- 	setup.py \
--	$(EXPORT_MODULES) \
- 	man/system-config-printer.xml \
--	newprinternotification.conf \
- 	bootstrap \
- 	mkinstalldirs \
- 	system-config-printer.desktop.in \
-@@ -211,8 +196,7 @@
- 	print-applet.desktop.in \
- 	intltool-extract.in \
- 	intltool-merge.in \
--	intltool-update.in \
--	config.py.in
-+	intltool-update.in
- 
- desktop_in_files = $(desktop_DATA:.desktop=.desktop.in)
- 
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.8.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.12.ebuild
index 0e05273adc3..d43e6ea6687 100644
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.8.ebuild
+++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.12.ebuild
@@ -34,9 +34,9 @@ RDEPEND="${COMMON_DEPEND}
 	gnome-keyring? ( dev-python/gnome-keyring-python )
 "
 
-APP_LINGUAS="ar as bg bn bn_IN 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 mk ml mr ms nb nl nn or pa pl pt pt_BR ro ru
-si sk sl sr sv ta te th tr uk vi zh_CN"
+APP_LINGUAS="ar as bg bn_IN bn 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
@@ -46,9 +46,7 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	epatch "${FILESDIR}/${P}-split.patch"
 
-	eaclocal
-	eautomake
-	eautoconf
+	eautoreconf
 }
 
 src_configure() {