Version bump

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

2 files changed, 34 insertions, 35 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/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}"
 }