Version bump 1.2.3
authorMaciej Mrozowski <reavertm@gentoo.org>
Wed, 30 Jun 2010 04:20:17 +0000 (04:20 +0000)
committerMaciej Mrozowski <reavertm@gentoo.org>
Wed, 30 Jun 2010 04:20:17 +0000 (04:20 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

app-admin/system-config-printer-gnome/ChangeLog
app-admin/system-config-printer-gnome/Manifest
app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.2.3-split.patch [new file with mode: 0644]
app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild
app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.3.ebuild [new file with mode: 0644]

index e50cd9911acca29d929365ea32627fca3192af18..e499e0b134313da9953494563d70560dd29e6299 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/system-config-printer-gnome
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.7 2010/05/18 13:36:09 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.8 2010/06/30 04:20:16 reavertm Exp $
+
+*system-config-printer-gnome-1.2.3 (30 Jun 2010)
+
+  30 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  +system-config-printer-gnome-1.2.3.ebuild,
+  +files/system-config-printer-gnome-1.2.3-split.patch:
+  Version bump 1.2.3
 
   18 May 2010; Peter Volkov <pva@gentoo.org>
   system-config-printer-gnome-1.2.2.ebuild:
index de46213f6bccd048d870c74fb73eb5b8e00c4d35..e9380f6c2f9b5f61f75e83a3b94e9c0c47bf806b 100644 (file)
@@ -1,6 +1,9 @@
 AUX system-config-printer-gnome-1.2.2-cupspk-fileget-tmp.patch 1573 RMD160 cf90ad7e3ed86186aa4b60b8b5ec66e203e81251 SHA1 c66cf2a0b06f83c10d5eb923779bab13f40e337d SHA256 244fc71fdba0ca28f9c5e1db76579747eea9bef2a5d0e6690ec8fa4385d79e11
 AUX system-config-printer-gnome-1.2.2-split.patch 3512 RMD160 906e2e0967b63e5891ba220cb71816fa62b4fa16 SHA1 43b1bf60f1a4f7668fdd1f58ec7ba0813d08723a SHA256 56d29c283a2f2e243bf6d19f6b6327fc06262e812e7306f8aa6e6e332044bc35
+AUX system-config-printer-gnome-1.2.3-split.patch 3967 RMD160 444988ae79f2cbb8fabad3634cb075b6c4bc20f1 SHA1 4dac4e401880a46b52e6f485a96b9ee6d306af72 SHA256 eaf0c3e9a344cc04c41656c4351a6fc42962ccef46ca1e68b74a918aca48838b
 DIST system-config-printer-1.2.2.tar.xz 904696 RMD160 48c3d4a08b936d8e33ab507fd2d6e817fc3204cc SHA1 dea6e56c190d8ae7a78ebf1e707ce4c31ffcfd74 SHA256 3d581c101cda47af92098378e4b3750144de8f5357675145866761aabad64377
-EBUILD system-config-printer-gnome-1.2.2.ebuild 2037 RMD160 c34ea6ab1c7420806c28f661267648a65f171e8b SHA1 4a2b3fe8736c9acca5db5769d6d0e771c40b990c SHA256 5a86a2e0b2da365f95a70db330a865aa5516160dacb9c23b8397063deae4837b
-MISC ChangeLog 1911 RMD160 5afd652fd4750fc80d4444979e0a76bc4ccabb0f SHA1 0ab0796893d92bddbbea5d0ad0ba0485e2b4218d SHA256 c77859b5e3ec1a1800d21efae706609b71d2bc0b953d12de062080749b68e942
+DIST system-config-printer-1.2.3.tar.xz 924664 RMD160 d9e795a7861162b616b8429f4ae13e3815888133 SHA1 30fcf35474bcf0f44b530d73eb63b3c0d718352b SHA256 af84434b9f0364cabfc82667b72a953abef5731c23ba83edc32895bc8556d9e0
+EBUILD system-config-printer-gnome-1.2.2.ebuild 2020 RMD160 ab8cd16da879bdc562a9f7d464a18c2e44d8b5fb SHA1 b158267edc5f246a1d8c7140265ef2f4c8d3f83f SHA256 524034c2e9ef0395f6238787c28e0081d01dfd2c496ca6442e1d25f73ed02737
+EBUILD system-config-printer-gnome-1.2.3.ebuild 2008 RMD160 e4183d5380225e3c62f73300601d924273d9fdb2 SHA1 b43d811f5fe81bef5b684a20c1b45c703999f565 SHA256 be816260edab7d5b7a57a6de2f0d3c00a2210266405b3c9e5fef67de9cc598be
+MISC ChangeLog 2143 RMD160 c41d060bd3a946e02ab067a26b6e98881747b097 SHA1 a9eebb5fd3425ee0427f2f4f22a24681e2340cbb SHA256 b4fd19dbf9268e547158843713e7cd9eb1662497b31be193bffd034080a23604
 MISC metadata.xml 254 RMD160 f661acd63a04d82c4a9aedbe1f22e1b113db802f SHA1 822d4fb144325dd7f74d249a2dfccae18436fc0c SHA256 d39f6360d9c640cc051d3cdea582f0a1b604c98c5760dc4b1cab7e2ee2fb2036
diff --git a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.2.3-split.patch b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.2.3-split.patch
new file mode 100644 (file)
index 0000000..0bc5dbc
--- /dev/null
@@ -0,0 +1,143 @@
+diff -ru ../system-config-printer-1.2.3/Makefile.am ./Makefile.am
+--- ../system-config-printer-1.2.3/Makefile.am 2010-06-24 17:49:35.000000000 +0200
++++ ./Makefile.am      2010-06-30 06:09:00.986506862 +0200
+@@ -2,76 +2,8 @@
+ 
+ SUBDIRS=po
+ 
+-EXPORT_MODULES=                                       \
+-      cupshelpers/__init__.py                 \
+-      cupshelpers/cupshelpers.py              \
+-      cupshelpers/ppds.py                     \
+-      cupshelpers/openprinting.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 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)|" \
+-        $< > $@
+-
+-# Use distutils to build the module.
+-all-local: .stamp-distutils-in-builddir 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); 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); do               \
+-                      rm -f $$file*;                          \
+-              done;                                           \
+-      fi
+-      rm -f .stamp-distutils-in-builddir
+-
+ nobase_pkgdata_SCRIPTS=                               \
+       check-device-ids.py                     \
+-      pysmb.py                                \
+       system-config-printer.py                \
+       troubleshoot/__init__.py                \
+       applet.py
+@@ -82,9 +14,7 @@
+       asyncipp.py                                     \
+       asyncpk1.py                                     \
+       authconn.py                                     \
+-      config.py                                       \
+       cupspk.py                                       \
+-      debug.py                                        \
+       dnssdresolve.py                                 \
+       errordialogs.py                                 \
+       HIG.py                                          \
+@@ -95,23 +25,14 @@
+       gtkinklevel.py                                  \
+       gtkspinner.py                                   \
+       installdriver.py                                \
+-      installpackage.py                               \
+       jobviewer.py                                    \
+-      monitor.py                                      \
+       options.py                                      \
+       optionwidgets.py                                \
+-      PhysicalDevice.py                               \
+-      ppdippstr.py                                    \
+       ppdsloader.py                                   \
+-      probe_printer.py                                \
+       gtk_label_autowrap.py                           \
+-      SearchCriterion.py                              \
+-      smburi.py                                       \
+-      statereason.py                                  \
+       timedops.py                                     \
+       ToolbarSearchEntry.py                           \
+       userdefault.py                                  \
+-      XmlHelper.py                                    \
+       ui/AboutDialog.glade                            \
+       ui/ConnectDialog.glade                          \
+       ui/ConnectingDialog.glade                       \
+@@ -156,28 +77,10 @@
+       system-config-printer                   \
+       system-config-printer-applet
+ 
+-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 -lusb $(GLIB_LIBS)
+-udevhelperdir=$(sysconfdir)/udev
+-udevhelper_PROGRAMS=\
+-      udev/udev-configure-printer
+-udevhelper_SCRIPTS=\
+-      udev/udev-add-printer
+-endif
+-
+ man_MANS=                                     \
+       man/system-config-printer.1             \
+       man/system-config-printer-applet.1
+ 
+-dbus_DATA =                                   \
+-      newprinternotification.conf             \
+-      printerdriversinstaller.conf
+-dbusdir = $(sysconfdir)/dbus-1/system.d/
+-
+ desktop_DATA =\
+       system-config-printer.desktop \
+       print-applet.desktop \
index 1777164734eed977caff9adaebbfb722d147699d..a26890b3b4b39f635b075be17dd8b37849f2c645 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.2.2.ebuild,v 1.2 2010/05/18 13:36:09 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild,v 1.3 2010/06/30 04:20:16 reavertm Exp $
 
 EAPI="3"
 
@@ -69,7 +69,7 @@ src_configure() {
                myconf="${myconf} --enable-nls"
        fi
 
-       econf ${myconf} || die "econf failed"
+       econf ${myconf}
 }
 
 src_install() {
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.3.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.3.ebuild
new file mode 100644 (file)
index 0000000..5a8f7ec
--- /dev/null
@@ -0,0 +1,85 @@
+# Copyright 1999-2010 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.2.3.ebuild,v 1.1 2010/06/30 04:20:16 reavertm Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+WANT_AUTOMAKE="1.11"
+inherit python autotools
+
+MY_P="${PN%-gnome}-${PV}"
+
+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/1.2/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="gnome-keyring"
+
+# Needs cups running, bug 284005
+RESTRICT="test"
+
+RDEPEND="
+       >=app-admin/system-config-printer-common-${PV}
+       dev-python/libgnome-python
+       dev-python/notify-python
+       >=dev-python/pygtk-2.4
+       dev-python/pyxml
+       gnome-keyring? ( dev-python/gnome-keyring-python )
+"
+DEPEND="${RDEPEND}
+       app-text/docbook-xml-dtd:4.1.2
+       app-text/xmlto
+       dev-util/intltool
+       sys-devel/gettext
+"
+
+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}"
+
+pkg_setup() {
+       python_set_active_version 2
+}
+
+src_prepare() {
+       epatch "${FILESDIR}/${P}-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="${D}" install || die "emake install failed"
+
+       python_convert_shebangs -q -r $(python_get_version) "${D}"
+}
+
+pkg_postrm() {
+       python_mod_cleanup /usr/share/system-config-printer
+}