Version bump

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

3 files changed, 41 insertions, 42 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index 9fcfd784cb22..33b862d75887 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.97 2013/08/11 20:02:07 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.98 2013/10/20 08:27:13 pacho Exp $
+
+*system-config-printer-common-1.4.2 (20 Oct 2013)
+
+  20 Oct 2013; Pacho Ramos <pacho@gentoo.org>
+  +system-config-printer-common-1.4.2.ebuild,
+  -system-config-printer-common-1.3.11-r1.ebuild:
+  Version bump
 
 *system-config-printer-common-1.4.1 (11 Aug 2013)
 
diff --git a/app-admin/system-config-printer-common/Manifest b/app-admin/system-config-printer-common/Manifest
index feae6ff73304..f79ee3804f5b 100644
--- a/app-admin/system-config-printer-common/Manifest
+++ b/app-admin/system-config-printer-common/Manifest
@@ -4,18 +4,18 @@ Hash: SHA256
 AUX system-config-printer-common-1.3.12-split.patch 5153 SHA256 8fd364427186fb7141120d5ba185e3d1a882190652d466323914a02878a352f4 SHA512 5553c44316371fb58cd7275f713b461eaa3e94fb052b709fef62a62797caaf7e08088a0a17f23af770666a0804eb70b407a1b0919297973a0ec88d6042357b87 WHIRLPOOL 36cbdf92560e731b8565cc90794740c0f876fdbc420b5caec78378462e304c8c91ee9576e3490557c276086ec7bde286cfe05ee5a90eea5cca3d3044a4f928ee
 AUX system-config-printer-common-1.3.9-split.patch 4636 SHA256 bcd20fcd357ce1730e172b753b67a34679342b82881395bc72afc2feded20558 SHA512 34df931edf965afcc93ba7951c3162b1f04d00a5263844b798771baa6860614c112fc18236ed1301a3cdd4732f2a2870b4703cbed75a8696e426fabc2e3fb2a7 WHIRLPOOL bff116ddee7d5b79778a27b83eb0343769513fa06f4dbe22f409ccb0cf56d3c15ab39e681d52823dffa812442e71ed75ffff1af5afec465dc757dbf068ee8241
 AUX system-config-printer-common-1.4.1-split.patch 5238 SHA256 678c744c55539ef5ebfc48913de45e2f7f48047658acfe45d5c5f6fac1fc28d7 SHA512 4e629a3c7bc1ed586449c953911407910f079cac85776c5a7c4a2cbd89157ff679ee86525f9d87e50699521acdb8e3010df6c9cb9a193953e470b75f70f50b8f WHIRLPOOL d4ef925e93d446e7d886c5bab1611da175e03eb3d8d34cbbf95fec16a962d3727f92f961aecf53256d33145d9cbf830302c3c1ea7023427d818125fea8e0deeb
-DIST system-config-printer-1.3.11.tar.xz 947488 SHA256 13816276895ca60c11ebc77b4209d30707b18c0489e247ea219474ee4a2f63c3 SHA512 4e50e973e404f959d8cb5b25dd6a38aa40f558408eb9818b3eb3b267b9a54f13aa97f05343cc0353ab36b32ac0a229d77109efd79b5e598fe43173072be02fac WHIRLPOOL d2372eb97263e84be9efd9bd6e190ddab2a75a327b0ece6f44ff8c9d1ee12484a82c3a2c5a2124195b0e45aa21fe3298de1025dce806ad195a7a1a84bdea80ec
 DIST system-config-printer-1.3.12.tar.xz 949008 SHA256 1905bd9fd382730a8eab80fa196b1c43bd19ce79c2169142de899697cbb1e9b1 SHA512 4e6c15b52287f2a69fabb6dafe6548874b8608f2f7a2e14534b100fbb46ad0f146b1e03a6aa4c2c9fe66dad96789454bd066616db0dd73b962bffeb478a7c6c5 WHIRLPOOL 0b8afe05a87103ef99dac50ab7db5f3fc6137de9b84e483ee3a481172e4c894e206b6d022303f1f11496a63b5698351a67070fb936f35293e83f5a20c5e21599
 DIST system-config-printer-1.4.1.tar.xz 885832 SHA256 4e22413f3581fc1cf38af648573fa90bb7783a2c3b8be3aadf47beda101e04f8 SHA512 ae9c64eb5af34c54a38999eeac2bc5dc9972b6b78a28bc397aae5159893b956417e71b547648b22d4d225e84b1a450854e88819e803d56ad482316fe3b288159 WHIRLPOOL f0db2e55b2ff10659ef65509d6deb8f3df5192c92642568ca454511ed9d8c0bf4c6766581f83c311a951e1e959c443648172e2597734ef32ba4b05f8ea0ee798
-EBUILD system-config-printer-common-1.3.11-r1.ebuild 1943 SHA256 bb96ab65aacdf6978d8e84c8cee818a317710cccb5924eca6efd1cbf69d7956d SHA512 3891afe01af2f3a7b1ac7ca48d65066848c1048cc2458e564750238dd690fe51b0fb523eeb2418d8a12bbc6b2a652babfb9ae32d2d34c729a518f98878d9d9f6 WHIRLPOOL f2f6a17b71c1fb4000381b7a54d7f7b314f020d0244ef8904b544ead8c277af2c972a48e3b1095ab98b8ce61dd138ed606e69304f76f1932c04c0072f852f2a5
+DIST system-config-printer-1.4.2.tar.xz 888848 SHA256 f0e464435532f73cf8c328ceb1220f02ab2acfc1dcdec729cf5a0acf4193dbea SHA512 b98f668941a2300adc3ced6995d21e0e2f56b908d6cc26388c4101669453859317fb5b5c53762c7d486e6fe5a78cb35ce451495bbc4c330dd856cc0875b947ce WHIRLPOOL dab925199fb7a9f3b5abc544c69b9d64a3d798a7fcb4b5c1f37d62538f9d93ca64230b1601d0259696e289ba8fd535d0ea12cdf369700d486a13c23ee5a16688
 EBUILD system-config-printer-common-1.3.12.ebuild 1936 SHA256 cb35c81a1ea64b108f33b85367212aeef29484af6efe3de03b8e9fef81452ca4 SHA512 f152a2ac9971fcd466c815fb81137cf792de9e58acde6d4f8cac6fd1bc15c41ca949fbe8b6033715c8e9b3f6921ede29be41b2c6747b82deabda9cce454f0a90 WHIRLPOOL 78c7384b21757a9e7779c8cb2e498eeedbec79c7d9eb3c2139b679a040d0420fe77ac4f27ce2146dcbd98108e4d330c77f3f4e985925abb76071dbe012ac897d
 EBUILD system-config-printer-common-1.4.1.ebuild 1993 SHA256 4caabddba28d037acde865f9a9151fd9c8a7fd4b81cbe19b94f232c6ba2a1456 SHA512 792a0847a14afa6966bcf842b3af117866d0cb02dbf266af06219e01c78754cdb1b6840141bbab519ce1d4d138805872817fdff6dd6c7e64897bae07ec82aa06 WHIRLPOOL 88efbe48b7bb77b804c12f52eae1fe212c07aba32b89dad00830051306bb6e1015973843b542ce5bd8c810507dd4cbc1e0e08a777a99c52fad7271d373988f2f
-MISC ChangeLog 19673 SHA256 0fe17eee3ab416dffc202cb40091cc9cb63f16e15d38cd7e7c7f371a6ee70ddf SHA512 8e0859b023474ad2128c14c9972c2edad855fed60da1a96e6afbba2bb21874f07fc42fbcd1dcba105be1c017150aab21d30b6e6572bd1bfcdb813990ef0a566e WHIRLPOOL d5acc3954e064d82c9d034d2dcca0df112af5648fad2d34206172515dc38cb9069ff902e777b3cf0b5398f9677aa8fb22508a22b81d3639ba54c2b83ad9cd999
+EBUILD system-config-printer-common-1.4.2.ebuild 1995 SHA256 6505472da1030b56ef01d986cacd4f3cf41d9fb5ee97c0fec4d489163968387b SHA512 9a6234dbeb4465f9dd77037be51cdaac3bd0db81aae9fd5b510499c6c9d61bbf3dc008d09aa6443332ac7ada4c505e770833e97c9483b2462865dd027df26df3 WHIRLPOOL c2b55b5d1216a0d14d56be27846f40880f47e5bb95056f9ee281ed20d04aedb5a0a39436bb90be9fa47275110cf2ee00000e811fa844ddb78e38fc183575b21c
+MISC ChangeLog 19884 SHA256 91bf4ead4cb1ce65e7ddaaabb52411fc97ef6cdd69086fa9ddab5d12bb3f5821 SHA512 c78ac5b501e082354cdfe305f2f23a0e54f25d9f90b1983da7b5e5469ff93ac8580148b1707b0bb7e0e83afaf4affdf29108f0266f89c331bcc4e846fb035e3e WHIRLPOOL 416e2d0fbc63eba2656253b832c710d3f6952f00d11b2d03cf5de2f71472a91c8e6e4f803a2426cf45490f96279da68f0eb802ff80fead376abe21c37ab0ea86
 MISC metadata.xml 269 SHA256 4093e60c94c1276d3fce2608e758ed73b067ae7af175d26df104f4df0fbe3e8a SHA512 2e9634524d34d3ca8b09f3212921325a7460449aff6d5307a7ee547a9d386207d772198d762ef0338325864449474a16c92653547cbdceb214ec5c9a0d9d417d WHIRLPOOL 4a6977f8e8520c7d8d5ce51b169c13d3f7fbf7bdaaaf43e03f827aa7e89017a7119ffc3b944ca5fb8ee0cff35f81a7e3d3c92682a58bc53cc361516b19c717e4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlIICeAACgkQ1fmVwcYIWAbpiwCfbTwIST+VXFFx1aLIbtqm/WIV
-uBQAoLZXAZzTt2qRnpX8djGf2/H7NWbU
-=VlVE
+iEYEAREIAAYFAlJjk+IACgkQCaWpQKGI+9SogQCeOkf/fMTE7QlGGOXnDL334MCL
+KVIAnRSdP2d2K2hR2UZL2fE3cArzgKA1
+=plBv
 -----END PGP SIGNATURE-----
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.11-r1.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.4.2.ebuild
index bf9574dc3ab7..3b5101be6d2d 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.11-r1.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.4.2.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.3.11-r1.ebuild,v 1.6 2012/12/02 22:56:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.4.2.ebuild,v 1.1 2013/10/20 08:27:13 pacho Exp $
 
-EAPI=4
+EAPI="5"
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="xml"
 
-PYTHON_DEPEND="2:2.6"
-WANT_AUTOMAKE="1.11"
-
-inherit autotools eutils python toolchain-funcs udev
+inherit autotools eutils python-single-r1 systemd
 
 MY_P=${PN%-common}-${PV}
 
@@ -16,29 +15,35 @@ HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
 SRC_URI="http://cyberelk.net/tim/data/${PN/-common}/${PV%.*}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 SLOT="0"
 IUSE="doc policykit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # Needs cups running, bug 284005
 RESTRICT="test"
 
 # system-config-printer split since 1.1.3
+#
+# Additional unhandled dependencies:
+# net-firewall/firewalld[${PYTHON_USEDEP}]
+# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
 COMMON_DEPEND="
+	${PYTHON_DEPS}
 	>=dev-libs/glib-2
-	dev-libs/libxml2[python]
-	dev-python/dbus-python
-	>=dev-python/pycups-1.9.60
-	dev-python/pycurl
-	>=dev-python/pygobject-2.21.5:2
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/pycups-1.9.60[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	net-print/cups[dbus]
-	>=virtual/udev-171
 	virtual/libusb:1
+	>=virtual/udev-172
 "
 DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
-	doc? ( dev-python/epydoc )
+	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )
 "
 RDEPEND="${COMMON_DEPEND}
 	!<app-admin/system-config-printer-gnome-${PV}
@@ -48,20 +53,19 @@ RDEPEND="${COMMON_DEPEND}
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.3.9-split.patch
+	epatch "${FILESDIR}"/${PN}-1.4.1-split.patch
 	eautoreconf
 }
 
 src_configure() {
 	econf \
 		--disable-nls \
-		--with-udev-rules
+		--with-udev-rules \
+		$(systemd_with_unitdir)
 }
 
 src_compile() {
@@ -70,22 +74,10 @@ src_compile() {
 }
 
 src_install() {
-	emake \
-		DESTDIR="${D}" \
-		udevhelperdir="$(udev_get_udevdir)" \
-		udevrulesdir="$(udev_get_udevdir)/rules.d" \
-		install
+	emake DESTDIR="${D}" install
 
 	dodoc AUTHORS ChangeLog README
 	use doc && dohtml -r html/
 
-	python_convert_shebangs -q -r $(python_get_version) "${ED}"
-}
-
-pkg_postinst() {
-	python_mod_optimize cupshelpers
-}
-
-pkg_postrm() {
-	python_mod_cleanup cupshelpers /usr/share/system-config-printer
+	python_fix_shebang "${ED}"
 }