Version bump, remove old

(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)

4 files changed, 183 insertions, 100 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index 96dfb2926835..961f177a4bfe 100644
--- a/app-admin/system-config-printer-common/ChangeLog
+++ b/app-admin/system-config-printer-common/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/system-config-printer-common
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.28 2011/01/31 23:45:26 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.29 2011/02/16 19:27:35 reavertm Exp $
+
+*system-config-printer-common-1.3.0 (16 Feb 2011)
+
+  16 Feb 2011; Maciej Mrozowski <reavertm@gentoo.org>
+  -system-config-printer-common-1.2.4.ebuild,
+  -system-config-printer-common-1.2.5.ebuild,
+  +system-config-printer-common-1.3.0.ebuild,
+  +files/system-config-printer-common-1.3.0-split.patch:
+  Version bump, remove old
 
   31 Jan 2011; Maciej Mrozowski <reavertm@gentoo.org>
   system-config-printer-common-1.2.6.ebuild:
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.0-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.0-split.patch
new file mode 100644
index 000000000000..3a6b7d45e6d8
--- /dev/null
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.0-split.patch
@@ -0,0 +1,165 @@
+diff -ruN system-config-printer-1.3.0/Makefile.am my/Makefile.am
+--- system-config-printer-1.3.0/Makefile.am	2011-02-16 14:02:45.000000000 +0100
++++ my/Makefile.am	2011-02-16 20:19:11.586000001 +0100
+@@ -1,4 +1,4 @@
+-AM_CFLAGS=-g -O2 -Wall $(GLIB_CFLAGS)
++AM_CFLAGS=-Wall $(GLIB_CFLAGS)
+ 
+ SUBDIRS=po
+ 
+@@ -83,102 +83,23 @@
+ 	rm -f .stamp-distutils-in-builddir
+ 
+ nobase_pkgdata_SCRIPTS=				\
+-	check-device-ids.py			\
+-	pysmb.py				\
+-	scp-dbus-service.py			\
+-	system-config-printer.py		\
+-	troubleshoot/__init__.py		\
+-	applet.py
++	pysmb.py
+ 
+ nobase_pkgdata_DATA=					\
+-	asyncconn.py					\
+-	asyncipp.py					\
+-	asyncpk1.py					\
+-	authconn.py					\
+ 	config.py					\
+-	cupspk.py					\
+ 	debug.py					\
+ 	dnssdresolve.py					\
+-	errordialogs.py					\
+-	HIG.py						\
+ 	firewall.py					\
+-	gui.py						\
+-	GroupsPane.py					\
+-	GroupsPaneModel.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					\
+-	XmlHelper.py					\
+-	ui/AboutDialog.ui				\
+-	ui/ConnectDialog.ui				\
+-	ui/ConnectingDialog.ui				\
+-	ui/InstallDialog.ui				\
+-	ui/JobsWindow.ui				\
+-	ui/NewPrinterName.ui				\
+-	ui/NewPrinterWindow.ui				\
+-	ui/PrinterPropertiesDialog.ui			\
+-	ui/PrintersWindow.ui				\
+-	ui/ServerSettingsDialog.ui			\
+-	ui/SMBBrowseDialog.ui				\
+-	ui/statusicon_popupmenu.ui			\
+-	ui/WaitWindow.ui				\
+-	icons/i-network-printer.png			\
+-	troubleshoot/base.py				\
+-	troubleshoot/CheckLocalServerPublishing.py	\
+-	troubleshoot/CheckNetworkServerSanity.py	\
+-	troubleshoot/CheckPPDSanity.py			\
+-	troubleshoot/CheckPrinterSanity.py		\
+-	troubleshoot/CheckSELinux.py			\
+-	troubleshoot/CheckUSBPermissions.py		\
+-	troubleshoot/ChooseNetworkPrinter.py		\
+-	troubleshoot/ChoosePrinter.py			\
+-	troubleshoot/DeviceListed.py			\
+-	troubleshoot/ErrorLogCheckpoint.py		\
+-	troubleshoot/ErrorLogFetch.py			\
+-	troubleshoot/ErrorLogParse.py			\
+-	troubleshoot/Locale.py				\
+-	troubleshoot/LocalOrRemote.py			\
+-	troubleshoot/NetworkCUPSPrinterShared.py	\
+-	troubleshoot/PrinterStateReasons.py		\
+-	troubleshoot/PrintTestPage.py			\
+-	troubleshoot/QueueNotEnabled.py			\
+-	troubleshoot/QueueRejectingJobs.py		\
+-	troubleshoot/RemoteAddress.py			\
+-	troubleshoot/SchedulerNotRunning.py		\
+-	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
+-
+-bin_SCRIPTS=					\
+-	system-config-printer			\
+-	system-config-printer-applet		\
+-	dbus/scp-dbus-service
++	XmlHelper.py
+ 
+ if UDEV_RULES
+ udevrulesdir=$(sysconfdir)/udev/rules.d
+@@ -193,10 +114,6 @@
+ 	udev/udev-add-printer
+ 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
+@@ -210,39 +127,12 @@
+ 	dbus/org.fedoraproject.Config.Printing.service
+ dbusservicesdir = $(datadir)/dbus-1/services/
+ 
+-desktop_DATA =\
+-	system-config-printer.desktop \
+-	print-applet.desktop
+ desktopdir = $(datadir)/applications/
+ autostartdir = $(sysconfdir)/xdg/autostart/
+ 
+ DESKTOP_VENDOR=@DESKTOPVENDOR@
+ DESKTOP_PREFIX=@DESKTOPPREFIX@
+ 
+-install-desktopDATA: $(desktop_DATA)
+-	mkdir -p $(DESTDIR)$(desktopdir)
+-	mkdir -p $(DESTDIR)$(desktopdir)
+-	desktop-file-install $(DESKTOP_VENDOR)	\
+-	  --dir $(DESTDIR)$(desktopdir)		\
+-	  --add-category System			\
+-	  --add-category Settings		\
+-	  --add-category HardwareSettings	\
+-	  --add-category Printing		\
+-	  --add-category GTK			\
+-	  system-config-printer.desktop
+-	desktop-file-install $(DESKTOP_VENDOR)	\
+-	  --dir $(DESTDIR)$(autostartdir)	\
+-	  --add-category System			\
+-	  --add-category Monitor		\
+-	  --add-category GTK			\
+-	  print-applet.desktop
+-
+-uninstall-desktopDATA:
+-	rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)system-config-printer.desktop
+-	rm -f $(DESTDIR)$(autostartdir)/$(DESKTOP_PREFIX)print-applet.desktop
+-
+-desktop_in_files = $(desktop_DATA:.desktop=.desktop.in)
+-
+ EXTRA_DIST=\
+ 	$(nobase_pkgdata_SCRIPTS) \
+ 	$(nobase_pkgdata_DATA) \
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.2.5.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.2.5.ebuild
deleted file mode 100644
index a1af014d14c6..000000000000
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.2.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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-common/system-config-printer-common-1.2.5.ebuild,v 1.1 2010/10/19 21:21:27 reavertm Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-WANT_AUTOMAKE="1.11"
-inherit python autotools
-
-MY_P="${PN%-common}-${PV}"
-
-DESCRIPTION="Common modules of 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-SLOT="0"
-IUSE="doc policykit"
-
-# Needs cups running, bug 284005
-RESTRICT="test"
-
-# system-config-printer split since 1.1.3
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/libusb
-	dev-libs/libxml2[python]
-	dev-python/dbus-python
-	dev-python/pycups
-	dev-python/pygobject
-	net-print/cups[dbus]
-	sys-fs/udev
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	doc? ( dev-python/epydoc )
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-admin/system-config-printer:0
-	policykit? ( sys-auth/polkit )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.2-split.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-nls \
-		--with-udev-rules
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if 	use doc; then
-		emake html || die "emake html failed"
-	fi
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README || die "dodoc failed"
-
-	if use doc; then
-		dohtml -r html/ || die "installing html docs failed"
-	fi
-
-	emake DESTDIR="${D}" install \
-		udevrulesdir=/lib/udev/rules.d \
-		udevhelperdir=/lib/udev \
-		|| die "emake install failed"
-
-	python_convert_shebangs -q -r $(python_get_version) "${D}"
-}
-
-pkg_postinst() {
-	python_mod_optimize cupshelpers
-}
-
-pkg_postrm() {
-	python_mod_cleanup cupshelpers /usr/share/system-config-printer
-}
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.2.4.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.0.ebuild
index 6f2796f76dc8..328e8b2e642d 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.2.4.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.2.4.ebuild,v 1.2 2010/09/19 17:00:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.0.ebuild,v 1.1 2011/02/16 19:27:35 reavertm Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ MY_P="${PN%-common}-${PV}"
 
 DESCRIPTION="Common modules of 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"
+SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.3/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
@@ -28,8 +28,8 @@ COMMON_DEPEND="
 	dev-libs/libusb
 	dev-libs/libxml2[python]
 	dev-python/dbus-python
-	dev-python/pycups
-	dev-python/pygobject
+	>=dev-python/pycups-1.9.53
+	>=dev-python/pygobject-2.21.5
 	net-print/cups[dbus]
 	sys-fs/udev
 "
@@ -49,7 +49,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.2-split.patch"
+	epatch "${FILESDIR}/${PN}-1.3.0-split.patch"
 
 	eautoreconf
 }
@@ -74,12 +74,12 @@ src_install() {
 		dohtml -r html/ || die "installing html docs failed"
 	fi
 
-	emake DESTDIR="${D}" install \
+	emake DESTDIR="${ED}" install \
 		udevrulesdir=/lib/udev/rules.d \
 		udevhelperdir=/lib/udev \
 		|| die "emake install failed"
 
-	python_convert_shebangs -q -r $(python_get_version) "${D}"
+	python_convert_shebangs -q -r $(python_get_version) "${ED}"
 }
 
 pkg_postinst() {