Version bump 1.2.3

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 269 insertions, 2 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index 21faac70eab2..91790470d580 100644
--- a/app-admin/system-config-printer-common/ChangeLog
+++ b/app-admin/system-config-printer-common/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/system-config-printer-common
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.19 2010/05/18 18:06:03 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.20 2010/06/30 02:47:51 reavertm Exp $
+
+*system-config-printer-common-1.2.3 (30 Jun 2010)
+
+  30 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  +system-config-printer-common-1.2.3.ebuild,
+  +files/system-config-printer-common-1.2.3-split.patch:
+  Version bump 1.2.3
 
   18 May 2010; Maciej Mrozowski <reavertm@gentoo.org> metadata.xml:
   List myself as maintainer
diff --git a/app-admin/system-config-printer-common/Manifest b/app-admin/system-config-printer-common/Manifest
index a18e257434ff..4b896b12624c 100644
--- a/app-admin/system-config-printer-common/Manifest
+++ b/app-admin/system-config-printer-common/Manifest
@@ -1,8 +1,11 @@
 AUX system-config-printer-common-1.1.13-split.patch 5024 RMD160 f91fd13b5e9d112795cfb8e323253467a9943cb3 SHA1 4eb6b81ff33120e735a0aaf90df9c5562bf47560 SHA256 f17e98e85d6fb61047af3e2d2f9d9249d7a5ed538bfafc3930757f07c964e56d
 AUX system-config-printer-common-1.2.2-split.patch 4415 RMD160 99f2b5713819af743822d937c7cf85e4ac9c0c7e SHA1 61316652a803d954527856b87d176e60662e8ee6 SHA256 7c983e148ccf067d1c43b8b50042069ad13a54899340ff794c30b3d9a3218c00
+AUX system-config-printer-common-1.2.3-split.patch 4851 RMD160 23da7f1a58863d75507539df00b3efeb85c119b3 SHA1 c671009573486c41d2e9582fcc094e5d907571e0 SHA256 a6a3a398f319cf242dc39f3f27e1911949c70e9f3678fb057dd88cb5d76b6f90
 DIST system-config-printer-1.1.13.tar.bz2 1014102 RMD160 eaa7b24bc30719a836749c06f72eb502b2fe5ac5 SHA1 9a193cca59f07dd1da97c7a76d26a33c1c57df21 SHA256 6842e337101dd7924d0c02317eff3b2b32d42a6ba7a70ae51fa8ebd51db15da2
 DIST system-config-printer-1.2.2.tar.xz 904696 RMD160 48c3d4a08b936d8e33ab507fd2d6e817fc3204cc SHA1 dea6e56c190d8ae7a78ebf1e707ce4c31ffcfd74 SHA256 3d581c101cda47af92098378e4b3750144de8f5357675145866761aabad64377
+DIST system-config-printer-1.2.3.tar.xz 924664 RMD160 d9e795a7861162b616b8429f4ae13e3815888133 SHA1 30fcf35474bcf0f44b530d73eb63b3c0d718352b SHA256 af84434b9f0364cabfc82667b72a953abef5731c23ba83edc32895bc8556d9e0
 EBUILD system-config-printer-common-1.1.13.ebuild 1404 RMD160 60f918d3ce37c9a01439356994f52f5821979b2c SHA1 5d58a284d7aedd90010a32c3bb4ad6f7d9cbb549 SHA256 1f1c010fdc4f35fc100be37bcfd8a8e30d495d25d86774d3247a5c25e8cd502a
 EBUILD system-config-printer-common-1.2.2.ebuild 1842 RMD160 4380e536c74320d90daa8ffbc8d162701acde3d2 SHA1 b955ea94aa9f5ba292a4d19449ac113d14ec7835 SHA256 a9ec3ceb034105149bb5c2ab67076dcddd8b3ed2743d6a3b29ebb00b279bc245
-MISC ChangeLog 4180 RMD160 e840bbefef0506a34845b4ad47de875f4bc44078 SHA1 31754f831d79c7e89360b7961e14eae7c0c049d2 SHA256 e580bebf6d586f383bc66b68a8ad7e4aa055c90b8d02c2017c6367f3a4417a3b
+EBUILD system-config-printer-common-1.2.3.ebuild 1864 RMD160 3048d4d1af5767b576043ec15f0aed2ea0692f20 SHA1 2530c8cb3ffc41e3ecc0e59372f71f16011efc81 SHA256 a7cbbc66d00214536d4ab8f1d4a0c3fbd2beeaff03a7d12fbb285703dd5915a8
+MISC ChangeLog 4410 RMD160 2ec017dbfa593311251707ce290d76deecf29825 SHA1 af0976e1ce5518b0eaad67ce6c0cfca9c44671cd SHA256 0d06b3b99c3c61a24cb97f9f6d6ba649d2caca817915691cf3d631560e06964a
 MISC metadata.xml 250 RMD160 808009b9f58fce9939f063485d0b4d169284835b SHA1 c1c82594f1e4863d60b9cc13738c38c9f037959c SHA256 2de207fcfb05447fa92af07c30ac1bf8422377ba2f555a8685833778611f2a94
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.2.3-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.2.3-split.patch
new file mode 100644
index 000000000000..d49e00a00605
--- /dev/null
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.2.3-split.patch
@@ -0,0 +1,169 @@
+diff -ru ../system-config-printer-1.2.3/Makefile.am ./Makefile.am
+--- ../system-config-printer-1.2.3/Makefile.am	2010-06-24 17:49:35.000000000 +0200
++++ ./Makefile.am	2010-06-30 04:38:40.435974659 +0200
+@@ -1,4 +1,4 @@
+-AM_CFLAGS=-g -O2 -Wall $(GLIB_CFLAGS)
++AM_CFLAGS=-Wall $(GLIB_CFLAGS)
+ 
+ SUBDIRS=po
+ 
+@@ -70,155 +70,45 @@
+ 	rm -f .stamp-distutils-in-builddir
+ 
+ nobase_pkgdata_SCRIPTS=				\
+-	check-device-ids.py			\
+-	pysmb.py				\
+-	system-config-printer.py		\
+-	troubleshoot/__init__.py		\
+-	applet.py
++	pysmb.py
+ 
+ nobase_pkgdata_DATA=					\
+-	AdvancedServerSettings.py			\
+-	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					\
+-	installdriver.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			\
+-	ui/InstallDialog.glade				\
+-	ui/JobsWindow.glade				\
+-	ui/NewPrinterName.glade				\
+-	ui/NewPrinterWindow.glade			\
+-	ui/PrinterPropertiesDialog.glade		\
+-	ui/PrintersWindow.glade				\
+-	ui/ServerSettingsDialog.glade			\
+-	ui/SMBBrowseDialog.glade			\
+-	ui/statusicon_popupmenu.glade			\
+-	ui/WaitWindow.glade				\
+-	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/Welcome.py
+-
+-bin_SCRIPTS=\
+-	system-config-printer			\
+-	system-config-printer-applet
++	XmlHelper.py
+ 
+ if UDEV_RULES
+-udevrulesdir=$(sysconfdir)/udev/rules.d
++udevrulesdir=/lib/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
++udevhelperdir=/lib/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 \
+-	manage-print-jobs.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)$(desktopdir)		\
+-	  --add-category System			\
+-	  --add-category Monitor		\
+-	  --add-category GTK			\
+-	  manage-print-jobs.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)$(desktopdir)/$(DESKTOP_PREFIX)manage-print-jobs.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.2.3.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.2.3.ebuild
new file mode 100644
index 000000000000..7ab3be12c940
--- /dev/null
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.2.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2010 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.2.3.ebuild,v 1.1 2010/06/30 02:47:51 reavertm Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+WANT_AUTOMAKE="1.11"
+inherit python autotools
+
+MY_P="${PN%-common}-${PV}"
+
+DESCRIPTION="Common modules of 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.2/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="doc policykit"
+
+# Needs cups running, bug 284005
+RESTRICT="test"
+
+# system-config-printer split since 1.1.3
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/libusb
+	dev-libs/libxml2[python]
+	dev-python/dbus-python
+	dev-python/pycups
+	dev-python/pygobject
+	net-print/cups[dbus]
+	sys-fs/udev
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	doc? ( dev-python/epydoc )
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-admin/system-config-printer:0
+	policykit? ( sys-auth/polkit )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-split.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-nls \
+		--with-udev-rules
+}
+
+src_compile() {
+	emake || die "emake failed"
+	if 	use doc; then
+		emake html || die "emake html failed"
+	fi
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog README || die "dodoc failed"
+
+	if use doc; then
+		dohtml -r html/ || die "installing html docs failed"
+	fi
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	python_convert_shebangs -q -r $(python_get_version) "${D}"
+}
+
+pkg_postinst() {
+	python_mod_optimize cupshelpers
+}
+
+pkg_postrm() {
+	python_mod_cleanup cupshelpers /usr/share/system-config-printer
+}