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

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 9 insertions, 189 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/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}"
-}