drop old and adapt to latest pygobject don't providing python2.6 support

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

5 files changed, 14 insertions, 197 deletions

diff --git a/app-admin/system-config-printer-gnome/ChangeLog b/app-admin/system-config-printer-gnome/ChangeLog
index c45e22ee2ed2..a3336b0c83c4 100644
--- a/app-admin/system-config-printer-gnome/ChangeLog
+++ b/app-admin/system-config-printer-gnome/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/system-config-printer-gnome
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.83 2014/03/09 11:53:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.84 2014/04/26 08:13:29 pacho Exp $
+
+  26 Apr 2014; Pacho Ramos <pacho@gentoo.org>
+  -system-config-printer-gnome-1.4.2.ebuild,
+  -system-config-printer-gnome-1.4.3.ebuild,
+  system-config-printer-gnome-1.4.3-r1.ebuild:
+  drop old and adapt to latest pygobject don't providing python2.6 support
 
   09 Mar 2014; Pacho Ramos <pacho@gentoo.org>
   system-config-printer-gnome-1.4.3-r1.ebuild:
diff --git a/app-admin/system-config-printer-gnome/Manifest b/app-admin/system-config-printer-gnome/Manifest
index 981b6ea75af7..d06ed83b729b 100644
--- a/app-admin/system-config-printer-gnome/Manifest
+++ b/app-admin/system-config-printer-gnome/Manifest
@@ -7,19 +7,16 @@ AUX system-config-printer-gnome-1.4.1-split.patch 4954 SHA256 7fa2d87091867b5e3d
 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
 DIST system-config-printer-1.4.3.tar.xz 892132 SHA256 c14bb1b75929ccf31267da8cf774bed923c4ea3eb0deddcc255221c0b8844c0f SHA512 36584b7caa26765160beaf3cddc9b4e7bad05d93e3a7960911f2e6a129e7c811fabcd25cc728c2eb0c7aa14f0f1dd66425f2d767adc8ee6eaaa4a3a0b77d280f WHIRLPOOL cc955dd3c979b75bbb40a98c1ad13276f7775807c098ac97bf9c5cf37109f24073d2d886695e357f8a417ab34ce5aa8fea5cc7add4dddf4f67fb00c3fb529e45
 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 2552 SHA256 cf1657523933012c794f1864e1bc169d04091b20bc065558810ba9459aa7450b SHA512 f61e96f5713d1ab16eb17fb56cbb16a276b927ca339345786eda1ef477ad9bb9756db2e1c0dfc10f84bce8bb355ea444c9ff670f78860ba24b2fa130f153693f WHIRLPOOL b9e3f3195927219a5e8c91d1e72511f2f36c653d3d28429ca74db3ea9b9ac98b15fcbf82785f929c8181580ce28956984f480e578b7931983b447eb12dc33b96
-EBUILD system-config-printer-gnome-1.4.3.ebuild 2448 SHA256 dcd29873efd981952bb1ca5359b22af1da04cd440f655d1aae38c066a6cc2dac SHA512 a14d6c87e4bcf28f7d576d78a0ee7702c83ac70737877e0f662fb20c17ea0157746d17bf941bf3ffb382bd5c0b06e7cce6bfb518b2203116a3e91c94dc343aa9 WHIRLPOOL ff6f16b2da6e504a0e5f59e8f074c75095670dc6596ea920378d1a1fa55320bc83f4a16c5700875075ef567093e6fe41d5ef6bc32e1a9a32ea53cb3235e491ed
-MISC ChangeLog 16067 SHA256 be5f1c8df3244eddc7154c21bfcd794b2f0377b4edfc6a3efa7ad9cd0dbea5c7 SHA512 9325715e0d8ed67610e7118231317d5e1e8102cc86ff9798a95a94a3518e6a91a0a2a70e7fa4a26da4b35c83674bc1a6faf2b5925c16d3b7f4fffd4f85fe87b8 WHIRLPOOL 62191a3b1f9e11e91375ac6b9c69af8f8816b412a53efd49a055e8c6edce0cc45b96f72c9bc9efffffeef35b5ca1d08102f050afdac7f0b646946d10edb9bae7
+EBUILD system-config-printer-gnome-1.4.3-r1.ebuild 2548 SHA256 2261631658c264f39da994c8becc88499849c9cd65b049229de9b51bdc99ee03 SHA512 667def09bf477b64b1058b053933d42c6fa0b3093af54d76817f208e1783f809faa4a1923debed55160478e97c77638104e198311a48babe262831859a52e985 WHIRLPOOL 098ca58e250443f6852fbbc8dea4821999c33ae22831e61a6260665b7dbcdc0b3aab83d5e5053c42d5aa25dbf6e8a3d9dd822bf3a333008f40f55b4bd875f5eb
+MISC ChangeLog 16326 SHA256 475619fc2556d5d96899abcd8f7c11de265c2f52ca7aebda42bb7f9dad7f6da2 SHA512 c8785387c875dcd0b26700717901c3cfea5b49032760cbb34ac65116762f03270b264dcf563d21577a73e58a3b48c963b865a63b79a8c342e9d371be29312f43 WHIRLPOOL fc17cb2ffa7699866005affa4fb90d852dfdd9360718f05c0e26a14f5c934845edbb264e7ec6633a244c85178dccf46d7807a17f633611783fd04e16ea147999
 MISC metadata.xml 252 SHA256 1256bc57f3264caef8f73fdf5baec132d049621d1c704d3bd2dc263d43438c80 SHA512 cc3788cd8387a476174bda230b94fe9d0daa6a072cbb2632becff0ac4376efe6e1a12e4ac44a5551e4f4603ea2e1c970c6a709c209b317aac9d851292b1c63ae WHIRLPOOL 5e419d5fbee2e1ddbdad566b0d39d41b7471573b3eb24258ba0370e7b16d44c394fa1064b1c6ef435eefcde803a669fc8860b490f1b91fa4e376abca33245704
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMcViAACgkQCaWpQKGI+9RMkwCdExEfEV8XdmczUaSHAb2fev/a
-gn0AnR8Uql3t1tzP1cJU7FCRj27gWmPN
-=V/f/
+iEYEAREIAAYFAlNbaqoACgkQCaWpQKGI+9RpdQCeMLwi6Yjd61AHx0e8+6R/hyc5
+uPAAni1K6RAtl8Aa9V2mDiY2lHOAdUoR
+=OHSt
 -----END PGP SIGNATURE-----
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.4.2.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.4.2.ebuild
deleted file mode 100644
index 18a5f753bb61..000000000000
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.4.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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-gnome/system-config-printer-gnome-1.4.2.ebuild,v 1.1 2013/10/20 08:27:54 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
-	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}"
-}
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
index 3f20db08151f..583f9172c0c4 100644
--- 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
@@ -1,10 +1,10 @@
 # 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.5 2014/03/09 11:53:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.4.3-r1.ebuild,v 1.6 2014/04/26 08:13:29 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="xml"
 
 inherit autotools gnome2 eutils python-single-r1 versionator
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.4.3.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.4.3.ebuild
deleted file mode 100644
index 6dd0341ae107..000000000000
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.4.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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-gnome/system-config-printer-gnome-1.4.3.ebuild,v 1.3 2013/12/08 17:36:04 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
-	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}"
-}