Version bump 1.2.3

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 238 insertions, 3 deletions

diff --git a/app-admin/system-config-printer-gnome/ChangeLog b/app-admin/system-config-printer-gnome/ChangeLog
index e50cd9911acc..e499e0b13431 100644
--- a/app-admin/system-config-printer-gnome/ChangeLog
+++ b/app-admin/system-config-printer-gnome/ChangeLog
@@ -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:
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
index 000000000000..0bc5dbc6cbc7
--- /dev/null
+++ b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.2.3-split.patch
@@ -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 \
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild
index 1777164734ee..a26890b3b4b3 100644
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild
+++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild
@@ -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
index 000000000000..5a8f7ec61fa3
--- /dev/null
+++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.3.ebuild
@@ -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
+}