Version bump, merge splitted common and gnome packages (#508344)

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

3 files changed, 124 insertions, 1 deletions

diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index 9bd52e1f1c75..09afb845dcd8 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,3 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST system-config-printer-1.4.8.tar.xz 904068 SHA256 9f65e96434819bf4170d654ef5caa945699e48f72bf5ae8c500341409c3db2f9 SHA512 9f832f11e0e6bca32a29201b9f78d7a3ea35a46f7484548e5e71e6939fd51065e07325e12bdb1bc577ee606299cfef54759def6564923904a79f27b654ec5304 WHIRLPOOL 9ade5a1b1cab5eeccfcaa0244e9421efafb0691f4da7925d4fffe80f3b6f7f6d7171d2082f4540606d1c6af8e7929fdd41f18edbee3fe13ad68c620ff18370e1
-EBUILD system-config-printer-1.4.8.ebuild 2743 SHA256 e58168eb509e85e236776b3fe53ac4db3931e655ab0e8393d52cbb5d0f74a8dd SHA512 934bb8538dcd21bb4be0cbcbb53883a04f9673ec07c2004b17273b5980e26f6f990b2cf8c7b2b6cba195a974226f843d2bcf8bba0741cf4c6a545b9fb757f39d WHIRLPOOL 7b206fb2570b027c7a444c11fb19ca07b535219611b4d969a7eb04d6a0151f7feffaf8faa497087b218152fb49843ee61517311eb0f18c206ceefdd903314a0e
+EBUILD system-config-printer-1.4.8.ebuild 2730 SHA256 0a63a995401d719740917354561f7fe28e6d3aa476931be53dba4cd66055fbc6 SHA512 115b9e258c394160a63f740f5a8a5df0b053b8ebfebfcff7adcb2101cfc8282a477d75140e2ffeddbfd6535d8c90d574fa606ae907e808e1a0db4dc3a5b55a48 WHIRLPOOL 0f682e22fbe4d490e6bd1d1e866a5afac8db99fccfe177796a7854929bedd7caa7bc1305524d52555a4719a913bd535e30b3f476117ebe18e2307bb9f8a786a7
+MISC ChangeLog 445 SHA256 19b5e3393ba70c30a027fa590f07b8b6f7da1c0d46cba3f1d69966a982f311eb SHA512 0fcd9383940c1340c3cf6c76c50368f02c6034a4ed53e817235a75810f7d4b9bc2b911a8b074077cca31c0a97c7bbd54f010b8280225663f141766710015ee70 WHIRLPOOL 243869cbf4198bac1562035d461da3c0a64b714831af11cdb14fc29d1f5852f0e2697b69a06ae5b7e42a6adf65b12ced90bf880d2dcb76e0d3dc469407d35863
 MISC metadata.xml 269 SHA256 223d2b32fdd6706dc0c92e0089bab8662510f6fc4bc8ce1756b5d43d4764b427 SHA512 c33e8528c7476790582b26e933d4c2227b5cc70f48e574cb79cdca57aa63072881dae6bbcff048f0001a426fe9c6167bf8a14e199741698e86c2292b05217923 WHIRLPOOL 3a7cb2fb10ad681a8a82167b1b93edccc93b5166438c3892a1ad42548a300d4f02ff1667d9934dcd6164def29ff2eefaa416be28e896df738b8162f48e2f3b58
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlVSSVMACgkQCaWpQKGI+9RadgCfc5Lgt3brln18Ku8JB81joGmP
+SegAnAtk2Ty6IuAjfd6a/D0pbv+kp6hR
+=anKL
+-----END PGP SIGNATURE-----
diff --git a/app-admin/system-config-printer/metadata.xml b/app-admin/system-config-printer/metadata.xml
new file mode 100644
index 000000000000..aac0bbb8af46
--- /dev/null
+++ b/app-admin/system-config-printer/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<herd>kde</herd>
+<maintainer>
+	<email>reavertm@gentoo.org</email>
+	<name>Maciej Mrozowski</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild b/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild
new file mode 100644
index 000000000000..b17b36353575
--- /dev/null
+++ b/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild,v 1.1 2015/05/12 18:41:22 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-single-r1 systemd versionator
+
+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}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+SLOT="0"
+
+IUSE="doc gnome-keyring policykit"
+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}
+	>=dev-libs/glib-2:2
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pycairo[${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/libusb:1
+	>=virtual/udev-172
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-libs/pango[introspection]
+	gnome-keyring? ( gnome-base/libgnome-keyring[introspection] )
+	policykit? ( >=sys-auth/polkit-0.104-r1 )
+	!app-admin/system-config-printer-common
+	!app-admin/system-config-printer-gnome
+"
+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
+	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )
+"
+
+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
+
+# Bug 471472
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+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 \
+		--with-udev-rules \
+		$(systemd_with_unitdir) \
+		${myconf}
+}
+
+src_compile() {
+	gnome2_src_compile
+	use doc && emake html
+}
+
+src_install() {
+	gnome2_src_install
+	use doc && dohtml -r html/
+	python_fix_shebang "${ED}"
+}