Version bump, bug 439848, remove old

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key B1E955DB)

3 files changed, 23 insertions, 13 deletions

diff --git a/app-admin/system-config-printer-gnome/ChangeLog b/app-admin/system-config-printer-gnome/ChangeLog
index 9bcb4b6d02b9..5d5c55f58c83 100644
--- a/app-admin/system-config-printer-gnome/ChangeLog
+++ b/app-admin/system-config-printer-gnome/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/system-config-printer-gnome
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.61 2012/09/30 17:41:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.62 2012/11/06 03:14:05 reavertm Exp $
+
+*system-config-printer-gnome-1.3.12 (06 Nov 2012)
+
+  06 Nov 2012; Maciej Mrozowski <reavertm@gentoo.org>
+  +files/system-config-printer-gnome-1.3.12-split.patch,
+  +system-config-printer-gnome-1.3.12.ebuild,
+  -files/system-config-printer-gnome-1.3.9-split.patch,
+  -system-config-printer-gnome-1.3.9-r1.ebuild:
+  Version bump, bug 439848, remove old
 
   30 Sep 2012; Raúl Porcel <armin76@gentoo.org>
   system-config-printer-gnome-1.3.11.ebuild:
diff --git a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.9-split.patch b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.12-split.patch
index 6367ce14487f..864aecfb1c5b 100644
--- a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.9-split.patch
+++ b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.12-split.patch
@@ -1,7 +1,7 @@
-diff -ruN system-config-printer-1.3.9/Makefile.am my2/Makefile.am
---- system-config-printer-1.3.9/Makefile.am	2011-10-26 14:14:19.000000000 +0200
-+++ my2/Makefile.am	2012-03-07 00:39:47.445321514 +0100
-@@ -1,89 +1,8 @@
+diff -ruN system-config-printer-1.3.12/Makefile.am my/Makefile.am
+--- system-config-printer-1.3.12/Makefile.am	2012-10-04 15:51:04.000000000 +0200
++++ my/Makefile.am	2012-11-06 04:05:52.745405001 +0100
+@@ -1,90 +1,8 @@
 -CFLAGS=-g -O2 -Wall
 +CFLAGS=-Wall
  
@@ -56,6 +56,7 @@ diff -ruN system-config-printer-1.3.9/Makefile.am my2/Makefile.am
 -	sed \
 -	  -e "s|\@prefix\@|$(prefix)|" \
 -	  -e "s|\@sysconfdir\@|$(sysconfdir)|" \
+-	  -e "s|\@cupsserverbindir\@|$(cupsserverbindir)|" \
 -	  $< > $@
 -
 -# Use distutils to build the module.
@@ -92,7 +93,7 @@ diff -ruN system-config-printer-1.3.9/Makefile.am my2/Makefile.am
  	pysmb.py				\
  	scp-dbus-service.py			\
  	system-config-printer.py		\
-@@ -95,33 +14,21 @@
+@@ -96,33 +14,21 @@
  	asyncipp.py					\
  	asyncpk1.py					\
  	authconn.py					\
@@ -126,7 +127,7 @@ diff -ruN system-config-printer-1.3.9/Makefile.am my2/Makefile.am
  	timedops.py					\
  	ToolbarSearchEntry.py				\
  	userdefault.py					\
-@@ -164,52 +71,17 @@
+@@ -165,52 +71,17 @@
  	troubleshoot/ServerFirewalled.py		\
  	troubleshoot/Shrug.py				\
  	troubleshoot/VerifyPackages.py			\
@@ -149,8 +150,8 @@ diff -ruN system-config-printer-1.3.9/Makefile.am my2/Makefile.am
 -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)
--udev_udev_configure_printer_CFLAGS=$(AM_CFLAGS) $(GLIB_CFLAGS)
+-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
@@ -161,7 +162,7 @@ diff -ruN system-config-printer-1.3.9/Makefile.am my2/Makefile.am
 -%.service: %.service.in
 -	$(AM_V_GEN)sed -e 's,@udevhelperdir\@,$(udevhelperdir),g' $< > $@
 -systemdsystemunit_DATA = \
--	udev/udev-configure-printer.service
+-	udev/configure-printer@.service
 -CLEANFILES = \
 -	$(systemdsystemunit_DATA)
 -endif
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.9-r1.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.12.ebuild
index 2b1d56caf630..018cf9381ee0 100644
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.9-r1.ebuild
+++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.9-r1.ebuild,v 1.10 2012/07/15 16:21:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.12.ebuild,v 1.1 2012/11/06 03:14:05 reavertm Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
 SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.3/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 SLOT="0"
 IUSE="gnome-keyring"
 
@@ -53,7 +53,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.9-split.patch"
+	epatch "${FILESDIR}/${PN}-1.3.12-split.patch"
 	eautoreconf
 }