Fixed typo in D-Bus signature decorator, bug #496792 by taevago and poncho

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 133 insertions, 6 deletions

diff --git a/app-admin/system-config-printer-gnome/ChangeLog b/app-admin/system-config-printer-gnome/ChangeLog
index 42928ea80ee3..e55b2ec12c89 100644
--- a/app-admin/system-config-printer-gnome/ChangeLog
+++ b/app-admin/system-config-printer-gnome/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/system-config-printer-gnome
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.78 2013/12/08 17:36:04 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.79 2014/01/10 20:40:26 pacho Exp $
+
+*system-config-printer-gnome-1.4.3-r1 (10 Jan 2014)
+
+  10 Jan 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/system-config-printer-gnome-1.4.3-typo-dbus.patch,
+  +system-config-printer-gnome-1.4.3-r1.ebuild:
+  Fixed typo in D-Bus signature decorator, bug #496792 by taevago and poncho
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org>
   system-config-printer-gnome-1.4.3.ebuild:
diff --git a/app-admin/system-config-printer-gnome/Manifest b/app-admin/system-config-printer-gnome/Manifest
index fa178129f0f7..6f64043da1a2 100644
--- a/app-admin/system-config-printer-gnome/Manifest
+++ b/app-admin/system-config-printer-gnome/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX system-config-printer-gnome-1.3.12-split.patch 5146 SHA256 00d9f8646606d1ae0484d295515d316221b56225722966294b89d8cb2df41c74 SHA512 b4d876118b6016edcb1c15e02e237e2afe45b2fa3a6a2b82fc98ecaa58dc3c7b0a83e7a49a324638c8d8ef30262e2fda81d10d9579c978bfadb177ea2226f863 WHIRLPOOL 308148383a9c8f6640048e1e4c7a0273a7c489129be45afced39cfac47cef5c2f557e002c1a473b6b1d531cc1750178de72a51fed5c06d2fefaf4b05e175d0f1
 AUX system-config-printer-gnome-1.3.13-split.patch 5116 SHA256 8699213ccde08d0533d67f13bdff7642e05a439bdc002cd94206d7dca6ac9f8e SHA512 f9e888df317d255b9f5e6bd66b671512aadb008ebd5c2c83ae12377362cc26826176bf58b7c1c6714f684a9a2c7b49d900c333e35dee9ad9e63237966bde24c5 WHIRLPOOL 802970dd6231e32fa40ddeea19bbd3458452c5fb169657e1261e2462e19ffa831fe98c3711bf45a8a3a74eaf6f85e84ed116a42edf47f474efa4d3b105306852
 AUX system-config-printer-gnome-1.4.1-split.patch 4954 SHA256 7fa2d87091867b5e3dc468458fe34d2cf2f9f0152a4ce69adef4a6090012f221 SHA512 b0c5edf0dee28a0dbb750058dd9b63cae756e7276fce5a69db699dd77e2e13bc1f7f4520f3d09ebc140cc06d880767892dc8ec120ddc2f550e3481a08c0f0a6c WHIRLPOOL 74b2915b7f01ae909dbd39749eb38e7b2bb5e69e2cccb39e058c84655e15dddca77e8b4a0c928e18bc4c9c05fc49e82302dd0386a84bc6b13ac80b10c28f4d7d
+AUX system-config-printer-gnome-1.4.3-typo-dbus.patch 693 SHA256 8d1cf9c6fe73f773054324fbe891f6612347ef3b8c9027ec21f1578fc33efb0d SHA512 ff6ff1a2a5a2c445529439c56009064adae86191a29ba756d6bf510124fab0ca0d4f5022be5cf7e06c8f0322a7466bc87c41d6db40e1aa2aff19beb62a87e85c WHIRLPOOL 8954171813d0f25daf1511d68b4184ad20ef9145dd77147ee32f6af418455b6b24691863d49f0a11de3165e0b7bc156f3d3f186eccc0febc2d6f9cbde2102ad9
 DIST system-config-printer-1.3.12.tar.xz 949008 SHA256 1905bd9fd382730a8eab80fa196b1c43bd19ce79c2169142de899697cbb1e9b1 SHA512 4e6c15b52287f2a69fabb6dafe6548874b8608f2f7a2e14534b100fbb46ad0f146b1e03a6aa4c2c9fe66dad96789454bd066616db0dd73b962bffeb478a7c6c5 WHIRLPOOL 0b8afe05a87103ef99dac50ab7db5f3fc6137de9b84e483ee3a481172e4c894e206b6d022303f1f11496a63b5698351a67070fb936f35293e83f5a20c5e21599
 DIST system-config-printer-1.3.13.tar.xz 955636 SHA256 9a6a4fbf61b1aafa061674719321846665ee7a4e7ab96dd4747069b0927d12a6 SHA512 046501d17c33a2ff72020b3d20210c5544c6310469cba1ca21cfaee7bb153915f850c102fbd5661e8f5ff6872c8400103346e71d258113405c5c0f752c5dffc1 WHIRLPOOL 9e44a26543de5375e45fdfb576511115f8e63f8e6a7865c7d1183660672e60b4f3f1f2027fe2677f71ca256997c89ad1281799256f102bf5aa56f57844f6f055
 DIST system-config-printer-1.4.2.tar.xz 888848 SHA256 f0e464435532f73cf8c328ceb1220f02ab2acfc1dcdec729cf5a0acf4193dbea SHA512 b98f668941a2300adc3ced6995d21e0e2f56b908d6cc26388c4101669453859317fb5b5c53762c7d486e6fe5a78cb35ce451495bbc4c330dd856cc0875b947ce WHIRLPOOL dab925199fb7a9f3b5abc544c69b9d64a3d798a7fcb4b5c1f37d62538f9d93ca64230b1601d0259696e289ba8fd535d0ea12cdf369700d486a13c23ee5a16688
@@ -11,13 +12,14 @@ DIST system-config-printer-1.4.3.tar.xz 892132 SHA256 c14bb1b75929ccf31267da8cf7
 EBUILD system-config-printer-gnome-1.3.12.ebuild 2149 SHA256 10231ad6f58d9fc9c56544e566d61a74cefd1a0e94c4fea23141be51a5eedfdb SHA512 670f63be002ad04e4dd595e8455e59cf5139028f7cc31558dfebae4d51af843ca673efec6b3a573b3e6682cf4c2a25d0d608c19d6cfe265b09a8f2529f5ddfdb WHIRLPOOL 0110a6a889c3665656b5cb3010852921dd0ecab1a8595bef0ced99d7b8b327f3c1b01357d2c3e9dac529a3f5d1bd695bae3b646a43ee142fc4f500cb440a464c
 EBUILD system-config-printer-gnome-1.3.13.ebuild 2309 SHA256 c2db89f0b1545db11516376db13e6bb31f4107d1f3645861737960434b77aa73 SHA512 207c25fa424b366ca4daa0624c6a019d96dfda0c507ca323bea353a01d0d39215111f9db4e2e568ccfe246151afa797a4d40a5d30dcff4e9677dc754df6d0dce WHIRLPOOL f3877388171373405a210bf262e0559b87cf258fb2a400b98951f27f2d66f22a7f4796e420ef576b8fe057bfe64395873356da77c7c52dcc7091e27b3e7bc23a
 EBUILD system-config-printer-gnome-1.4.2.ebuild 2450 SHA256 3b6d65ab9e8277b1827b9969311fc1c9e865048776bda84ded03774fbdee8c72 SHA512 c1330713bcd04a0026c56329902b374f3bf2fd112b48efbf78ca14f082ede387ba91674411e9b3225406ac4b19aac6115b4fb0cd86960ce49765688c7d197bb8 WHIRLPOOL 4f200abe94858a0cf1bb5502ad2bba2da44568ccb901dbf1d6750fdc790d5c91d8a7f82e5c833cd1b4535e239789cd71d8a24d50b855773793c7ac275f83708f
+EBUILD system-config-printer-gnome-1.4.3-r1.ebuild 2554 SHA256 11ab18bedd8ce12e15dd9c12a77b24640a3d8d56190cde9fcce32c06626f0491 SHA512 8349398119d087060cd25419f13b96fab09bfcdcb49fa4e8821e9bc16e83359274bc332a9b5afd6063c10d646d952617f34dd42739ce2a2f8abf401c1ee47543 WHIRLPOOL b92aa1c627a81df6f34305161de37473bd9cf2efb8a4522fee50276e7d782d85443c3e5af1a3044d8b52e4d15646c3028faf7a1abebc5e8affd6daef9474f5cb
 EBUILD system-config-printer-gnome-1.4.3.ebuild 2448 SHA256 dcd29873efd981952bb1ca5359b22af1da04cd440f655d1aae38c066a6cc2dac SHA512 a14d6c87e4bcf28f7d576d78a0ee7702c83ac70737877e0f662fb20c17ea0157746d17bf941bf3ffb382bd5c0b06e7cce6bfb518b2203116a3e91c94dc343aa9 WHIRLPOOL ff6f16b2da6e504a0e5f59e8f074c75095670dc6596ea920378d1a1fa55320bc83f4a16c5700875075ef567093e6fe41d5ef6bc32e1a9a32ea53cb3235e491ed
-MISC ChangeLog 15300 SHA256 583372ce54601e7f59319ada3fd893e7cc70c124a1bddb3a2c827174927c0b21 SHA512 702abd9c57777e15401beaa27f772578b3911ab2ade137caad4f0bc5e1574aef8a12e222b9703c6adb595c9b97577157add1cbb08c34962cf34c9d9ca2b88f0b WHIRLPOOL 3daef50c1b909a4982c30dc3bd12299dc4c7b4d9ee74f96c1585f594c34813fdd305f9d48c87b91f66a359d6dc8c746c9ab3aefb0c89f68cd0ff5f3417826e6c
+MISC ChangeLog 15585 SHA256 ef654bdba10fef828b625ca0e8034aeb635616ab5bc5f8734c7025ea2717f5b9 SHA512 3f9f220c92cde894f5123a5ee2babf216036e4863d47d4eeaba7498f3c45b12326c531bedfb44da0fb4b68d0d49718f7aa3fdc0b0e9e56b3ac9175a5a36c7f01 WHIRLPOOL 923bdba19672b540de7f9ffb17d902c9d341dc758cd997bccd0bec7e62545a280464042a9a261a981556369973fb56f868cf332b68aaed69f490efa8fd0fe119
 MISC metadata.xml 252 SHA256 1256bc57f3264caef8f73fdf5baec132d049621d1c704d3bd2dc263d43438c80 SHA512 cc3788cd8387a476174bda230b94fe9d0daa6a072cbb2632becff0ac4376efe6e1a12e4ac44a5551e4f4603ea2e1c970c6a709c209b317aac9d851292b1c63ae WHIRLPOOL 5e419d5fbee2e1ddbdad566b0d39d41b7471573b3eb24258ba0370e7b16d44c394fa1064b1c6ef435eefcde803a669fc8860b490f1b91fa4e376abca33245704
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkrgUACgkQCaWpQKGI+9SnzgCgguBPctPxYSTqhFpZ7XnrSo4j
-u9QAoIiIXem9rih6e0vQNdelbDQ0txR+
-=QJOz
+iEYEAREIAAYFAlLQWrsACgkQCaWpQKGI+9RSwgCbB8NL+E4ypYSyGAOX5U7kLb6I
+JlAAn3I6s+B8Mdc+v/4Wgo/MUx2nf172
+=D4xY
 -----END PGP SIGNATURE-----
diff --git a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.4.3-typo-dbus.patch b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.4.3-typo-dbus.patch
new file mode 100644
index 000000000000..724116723feb
--- /dev/null
+++ b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.4.3-typo-dbus.patch
@@ -0,0 +1,21 @@
+From 27b6803432fcbf3593f96d85645485766c1f1d0f Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh@redhat.com>
+Date: Fri, 25 Oct 2013 15:27:30 +0000
+Subject: Fixed typo in D-Bus signature decorator (bug #1023449).
+
+---
+diff --git a/scp-dbus-service.py b/scp-dbus-service.py
+index 28b3c15..00a084e 100644
+--- a/scp-dbus-service.py
++++ b/scp-dbus-service.py
+@@ -367,7 +367,7 @@ class ConfigPrintingNewPrinterDialog(dbus.service.Object):
+         pass
+ 
+     @dbus.service.signal(dbus_interface=CONFIG_NEWPRINTERDIALOG_IFACE,
+-                         signature='a{s}')
++                         signature='a(s)')
+     def DriverDownloadChecked(self, installed_files):
+         pass
+ 
+--
+cgit v0.9.2
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.4.3-r1.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..8a24af5f0af8
--- /dev/null
+++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.4.3-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2014 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.4.3-r1.ebuild,v 1.1 2014/01/10 20:40:26 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools gnome2 eutils python-single-r1 versionator
+
+MY_P="${PN%-gnome}-${PV}"
+MY_V="$(get_version_component_range 1-2)"
+
+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/${MY_V}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+SLOT="0"
+IUSE="gnome-keyring"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Needs cups running, bug 284005
+RESTRICT="test"
+
+# Additional unhandled dependencies
+# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
+# python samba client: smbc
+# selinux: needed for troubleshooting
+RDEPEND="
+	${PYTHON_DEPS}
+	~app-admin/system-config-printer-common-${PV}
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	>=dev-python/pycups-1.9.60[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-libs/pango[introspection]
+	gnome-keyring? ( gnome-base/libgnome-keyring[introspection] )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/xmlto-0.0.22
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+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}"
+
+# Bug 471472
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4.1-split.patch
+
+	# Fixed typo in D-Bus signature decorator, bug #496792
+	epatch "${FILESDIR}/${P}-typo-dbus.patch"
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+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
+
+	gnome2_src_configure \
+		--with-desktop-vendor=Gentoo \
+		--without-udev-rules \
+		${myconf}
+}
+
+src_install() {
+	gnome2_src_install
+	python_fix_shebang "${ED}"
+}