From c7969dfffe01fded69e97153727764b107112716 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Wed, 30 Oct 2013 18:05:19 +0000 Subject: Version bump, drop old. (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) --- app-admin/system-config-printer-gnome/ChangeLog | 12 +- .../system-config-printer-gnome-1.3.13-split.patch | 182 +++++++++++++++++++++ .../system-config-printer-gnome-1.3.13.ebuild | 90 ++++++++++ .../system-config-printer-gnome-1.4.1.ebuild | 102 ------------ .../system-config-printer-gnome-1.4.3.ebuild | 93 +++++++++++ 5 files changed, 376 insertions(+), 103 deletions(-) create mode 100644 app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.13-split.patch create mode 100644 app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.13.ebuild delete mode 100644 app-admin/system-config-printer-gnome/system-config-printer-gnome-1.4.1.ebuild create mode 100644 app-admin/system-config-printer-gnome/system-config-printer-gnome-1.4.3.ebuild (limited to 'app-admin/system-config-printer-gnome') diff --git a/app-admin/system-config-printer-gnome/ChangeLog b/app-admin/system-config-printer-gnome/ChangeLog index c4be4c3bf71c..00d7ca96c77e 100644 --- a/app-admin/system-config-printer-gnome/ChangeLog +++ b/app-admin/system-config-printer-gnome/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-admin/system-config-printer-gnome # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.75 2013/10/20 08:27:54 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.76 2013/10/30 18:05:19 pacho Exp $ + +*system-config-printer-gnome-1.3.13 (30 Oct 2013) +*system-config-printer-gnome-1.4.3 (30 Oct 2013) + + 30 Oct 2013; Pacho Ramos + +files/system-config-printer-gnome-1.3.13-split.patch, + +system-config-printer-gnome-1.3.13.ebuild, + +system-config-printer-gnome-1.4.3.ebuild, + -system-config-printer-gnome-1.4.1.ebuild: + Version bump, drop old. *system-config-printer-gnome-1.4.2 (20 Oct 2013) diff --git a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.13-split.patch b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.13-split.patch new file mode 100644 index 000000000000..c3b79631ac2b --- /dev/null +++ b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.13-split.patch @@ -0,0 +1,182 @@ +--- system-config-printer-1.3.13/Makefile.am.org 2013-10-27 22:22:54.057495728 +0100 ++++ system-config-printer-1.3.13/Makefile.am 2013-10-27 22:36:30.230851350 +0100 +@@ -1,90 +1,6 @@ +-CFLAGS=-g -O2 -Wall +- + SUBDIRS=po + +-EXPORT_MODULES= \ +- cupshelpers/__init__.py \ +- cupshelpers/cupshelpers.py \ +- cupshelpers/installdriver.py \ +- cupshelpers/ppds.py \ +- cupshelpers/openprinting.py \ +- cupshelpers/xmldriverprefs.py +- +-EXPORT_MODULES_GEN= \ +- cupshelpers/config.py +- +-### Automake hooks for Distutils. +-# The distutils module doesn't understand srcdir != builddir, +-# so we copy in, along with the cupshelpers modules, into +-# the builddir for 'all', 'install-exec', and 'clean' hooks. +-.stamp-distutils-in-builddir: setup.py $(EXPORT_MODULES) +- if [ "$(top_srcdir)" != "$(top_builddir)" ]; then \ +- cp $(top_srcdir)/setup.py .; \ +- $(mkdir_p) cupshelpers; \ +- for file in $(EXPORT_MODULES); do \ +- cp $(top_srcdir)/$$file $$file; \ +- done; \ +- fi +- touch .stamp-distutils-in-builddir +- +-dist-hook: mk-ChangeLog +-.PHONE: mk-ChangeLog +-mk-ChangeLog: +- if test -d .git; then \ +- $(top_srcdir)/gitlog-to-changelog \ +- --since=2009-05-01 -- --no-merges \ +- > $(distdir)/cl ; \ +- mv -f $(distdir)/cl $(distdir)/ChangeLog ; \ +- fi +- +-config.py: config.py.in Makefile +- sed \ +- -e "s|\@prefix\@|$(prefix)|" \ +- -e "s|\@datadir\@|$(datadir)|" \ +- -e "s|\@localedir\@|$(localedir)|" \ +- -e "s|\@VERSION\@|$(VERSION)|" \ +- -e "s|\@PACKAGE\@|$(PACKAGE)|" \ +- $< > $@ +- +-cupshelpers/config.py: cupshelpers/config.py.in Makefile +- $(mkdir_p) cupshelpers +- sed \ +- -e "s|\@prefix\@|$(prefix)|" \ +- -e "s|\@sysconfdir\@|$(sysconfdir)|" \ +- -e "s|\@cupsserverbindir\@|$(cupsserverbindir)|" \ +- $< > $@ +- +-# Use distutils to build the module. +-all-local: .stamp-distutils-in-builddir config.py cupshelpers/config.py +- $(PYTHON) setup.py build +- +-# Use distutils to install the module. +-install-exec-local: .stamp-distutils-in-builddir +- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) +- +-# Uninstall the module, crossing our fingers that we know enough +-# about how distutils works to do this. Unfortunately, distutils +-# doesn't provide a way to do this itself. +-uninstall-local: +- rm -f $(DESTDIR)/$(pythondir)/cupshelpers*.egg-info +- for file in $(EXPORT_MODULES) $(EXPORT_MODULES_GEN); do \ +- rm -f $(DESTDIR)/$(pythondir)/$$file*; \ +- done +- +-# Tell distutils to clean up. +-clean-local: +- -$(PYTHON) setup.py clean --all +- if [ "$(top_srcdir)" != "$(top_builddir)" ]; then \ +- rm -f setup.py; \ +- for file in $(EXPORT_MODULES) \ +- $(EXPORT_MODULES_GEN); do \ +- rm -f $$file*; \ +- done; \ +- fi +- rm -f .stamp-distutils-in-builddir +- + nobase_pkgdata_SCRIPTS= \ +- check-device-ids.py \ + pysmb.py \ + scp-dbus-service.py \ + system-config-printer.py \ +@@ -97,33 +13,21 @@ + asyncipp.py \ + asyncpk1.py \ + authconn.py \ +- config.py \ + cupspk.py \ +- debug.py \ +- dnssdresolve.py \ + errordialogs.py \ + HIG.py \ +- firewall.py \ + gui.py \ + gtkinklevel.py \ + gtkspinner.py \ +- installpackage.py \ + jobviewer.py \ +- monitor.py \ + newprinter.py \ + options.py \ + optionwidgets.py \ +- PhysicalDevice.py \ + ppdcache.py \ +- ppdippstr.py \ + ppdsloader.py \ + printerproperties.py \ +- probe_printer.py \ + gtk_label_autowrap.py \ +- SearchCriterion.py \ + serversettings.py \ +- smburi.py \ +- statereason.py \ + timedops.py \ + ToolbarSearchEntry.py \ + userdefault.py \ +@@ -166,13 +70,7 @@ + troubleshoot/ServerFirewalled.py \ + troubleshoot/Shrug.py \ + troubleshoot/VerifyPackages.py \ +- troubleshoot/Welcome.py \ +- xml/preferreddrivers.rng \ +- xml/validate.py +- +-cupshelpersdir=$(sysconfdir)/cupshelpers +-cupshelpers_DATA=\ +- xml/preferreddrivers.xml ++ troubleshoot/Welcome.py + + bin_SCRIPTS= \ + system-config-printer \ +@@ -180,39 +78,10 @@ + system-config-printer-applet \ + dbus/scp-dbus-service + +-if UDEV_RULES +-udevrulesdir=$(sysconfdir)/udev/rules.d +-udevrules_DATA=udev/70-printers.rules +-udev_udev_configure_printer_SOURCES=\ +- udev/udev-configure-printer.c +-udev_udev_configure_printer_LDADD= -lcups -ludev $(libusb_LIBS) $(GLIB_LIBS) +-udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS) +-udevhelperdir=$(sysconfdir)/udev +-udevhelper_PROGRAMS=\ +- udev/udev-configure-printer +-udevhelper_SCRIPTS=\ +- udev/udev-add-printer +- +-if HAVE_SYSTEMD +-%.service: %.service.in +- $(AM_V_GEN)sed -e 's,@udevhelperdir\@,$(udevhelperdir),g' $< > $@ +-systemdsystemunit_DATA = \ +- udev/configure-printer@.service +-CLEANFILES = \ +- $(systemdsystemunit_DATA) +-endif +- +-endif +- + man_MANS= \ + man/system-config-printer.1 \ + man/system-config-printer-applet.1 + +-dbus_DATA = \ +- dbus/com.redhat.NewPrinterNotification.conf \ +- dbus/com.redhat.PrinterDriversInstaller.conf +-dbusdir = $(sysconfdir)/dbus-1/system.d/ +- + dbusinterfaces_DATA = \ + dbus/org.fedoraproject.Config.Printing.xml + dbusinterfacesdir = $(datadir)/dbus-1/interfaces/ diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.13.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.13.ebuild new file mode 100644 index 000000000000..bf519543932c --- /dev/null +++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.13.ebuild @@ -0,0 +1,90 @@ +# 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.3.13.ebuild,v 1.1 2013/10/30 18:05:19 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/notify-python + >=dev-python/pycups-1.9.60[${PYTHON_USEDEP}] + >=dev-python/pygtk-2.4 + gnome-keyring? ( gnome-base/libgnome-keyring ) +" +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.3.13-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.1.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.4.1.ebuild deleted file mode 100644 index 233d0df68817..000000000000 --- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.4.1.ebuild +++ /dev/null @@ -1,102 +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.1.ebuild,v 1.1 2013/08/11 20:05:15 eva Exp $ - -EAPI="5" -PYTHON_COMPAT=( python2_{6,7} ) -PYTHON_REQ_USE="xml" - -inherit autotools eutils fdo-mime 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 -} - -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 - - econf \ - --with-desktop-vendor=Gentoo \ - --without-udev-rules \ - ${myconf} -} - -src_install() { - dodoc AUTHORS ChangeLog README || die "dodoc failed" - - emake DESTDIR="${ED}" install || die "emake install failed" - - python_fix_shebang "${ED}" -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} 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 new file mode 100644 index 000000000000..8ed876d58fc1 --- /dev/null +++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.4.3.ebuild @@ -0,0 +1,93 @@ +# 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.1 2013/10/30 18:05:19 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}" +} -- cgit v1.2.3-65-gdbad