Use 1.2.2 patch, set udev paths in install

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 13 insertions, 25 deletions

diff --git a/app-admin/system-config-printer-common/Manifest b/app-admin/system-config-printer-common/Manifest
index 4b896b12624c..1afaa3d5b99f 100644
--- a/app-admin/system-config-printer-common/Manifest
+++ b/app-admin/system-config-printer-common/Manifest
@@ -1,11 +1,11 @@
 AUX system-config-printer-common-1.1.13-split.patch 5024 RMD160 f91fd13b5e9d112795cfb8e323253467a9943cb3 SHA1 4eb6b81ff33120e735a0aaf90df9c5562bf47560 SHA256 f17e98e85d6fb61047af3e2d2f9d9249d7a5ed538bfafc3930757f07c964e56d
 AUX system-config-printer-common-1.2.2-split.patch 4415 RMD160 99f2b5713819af743822d937c7cf85e4ac9c0c7e SHA1 61316652a803d954527856b87d176e60662e8ee6 SHA256 7c983e148ccf067d1c43b8b50042069ad13a54899340ff794c30b3d9a3218c00
-AUX system-config-printer-common-1.2.3-split.patch 4851 RMD160 23da7f1a58863d75507539df00b3efeb85c119b3 SHA1 c671009573486c41d2e9582fcc094e5d907571e0 SHA256 a6a3a398f319cf242dc39f3f27e1911949c70e9f3678fb057dd88cb5d76b6f90
+AUX system-config-printer-common-1.2.3-split.patch 4415 RMD160 99f2b5713819af743822d937c7cf85e4ac9c0c7e SHA1 61316652a803d954527856b87d176e60662e8ee6 SHA256 7c983e148ccf067d1c43b8b50042069ad13a54899340ff794c30b3d9a3218c00
 DIST system-config-printer-1.1.13.tar.bz2 1014102 RMD160 eaa7b24bc30719a836749c06f72eb502b2fe5ac5 SHA1 9a193cca59f07dd1da97c7a76d26a33c1c57df21 SHA256 6842e337101dd7924d0c02317eff3b2b32d42a6ba7a70ae51fa8ebd51db15da2
 DIST system-config-printer-1.2.2.tar.xz 904696 RMD160 48c3d4a08b936d8e33ab507fd2d6e817fc3204cc SHA1 dea6e56c190d8ae7a78ebf1e707ce4c31ffcfd74 SHA256 3d581c101cda47af92098378e4b3750144de8f5357675145866761aabad64377
 DIST system-config-printer-1.2.3.tar.xz 924664 RMD160 d9e795a7861162b616b8429f4ae13e3815888133 SHA1 30fcf35474bcf0f44b530d73eb63b3c0d718352b SHA256 af84434b9f0364cabfc82667b72a953abef5731c23ba83edc32895bc8556d9e0
 EBUILD system-config-printer-common-1.1.13.ebuild 1404 RMD160 60f918d3ce37c9a01439356994f52f5821979b2c SHA1 5d58a284d7aedd90010a32c3bb4ad6f7d9cbb549 SHA256 1f1c010fdc4f35fc100be37bcfd8a8e30d495d25d86774d3247a5c25e8cd502a
 EBUILD system-config-printer-common-1.2.2.ebuild 1842 RMD160 4380e536c74320d90daa8ffbc8d162701acde3d2 SHA1 b955ea94aa9f5ba292a4d19449ac113d14ec7835 SHA256 a9ec3ceb034105149bb5c2ab67076dcddd8b3ed2743d6a3b29ebb00b279bc245
-EBUILD system-config-printer-common-1.2.3.ebuild 1864 RMD160 3048d4d1af5767b576043ec15f0aed2ea0692f20 SHA1 2530c8cb3ffc41e3ecc0e59372f71f16011efc81 SHA256 a7cbbc66d00214536d4ab8f1d4a0c3fbd2beeaff03a7d12fbb285703dd5915a8
+EBUILD system-config-printer-common-1.2.3.ebuild 1931 RMD160 a0d13cb3d28872335547e131ffbf29c515ae80d6 SHA1 a940a8d1c6617757de55c0e4cb7a0e194e7f10ed SHA256 2833927adfddf27f7435b41d84d65b439cf1effe8640e5b921b7c79445c6c452
 MISC ChangeLog 4410 RMD160 2ec017dbfa593311251707ce290d76deecf29825 SHA1 af0976e1ce5518b0eaad67ce6c0cfca9c44671cd SHA256 0d06b3b99c3c61a24cb97f9f6d6ba649d2caca817915691cf3d631560e06964a
 MISC metadata.xml 250 RMD160 808009b9f58fce9939f063485d0b4d169284835b SHA1 c1c82594f1e4863d60b9cc13738c38c9f037959c SHA256 2de207fcfb05447fa92af07c30ac1bf8422377ba2f555a8685833778611f2a94
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.2.3-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.2.3-split.patch
index d49e00a00605..6257fd0ee71a 100644
--- a/app-admin/system-config-printer-common/files/system-config-printer-common-1.2.3-split.patch
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.2.3-split.patch
@@ -1,13 +1,7 @@
-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 04:38:40.435974659 +0200
-@@ -1,4 +1,4 @@
--AM_CFLAGS=-g -O2 -Wall $(GLIB_CFLAGS)
-+AM_CFLAGS=-Wall $(GLIB_CFLAGS)
- 
- SUBDIRS=po
- 
-@@ -70,155 +70,45 @@
+diff -ru ../system-config-printer-1.2.2/Makefile.am ./Makefile.am
+--- ../system-config-printer-1.2.2/Makefile.am	2010-05-07 16:19:03.000000000 +0200
++++ ./Makefile.am	2010-05-17 20:36:37.657216914 +0200
+@@ -70,91 +70,20 @@
  	rm -f .stamp-distutils-in-builddir
  
  nobase_pkgdata_SCRIPTS=				\
@@ -100,17 +94,8 @@ diff -ru ../system-config-printer-1.2.3/Makefile.am ./Makefile.am
 +	XmlHelper.py
  
  if UDEV_RULES
--udevrulesdir=$(sysconfdir)/udev/rules.d
-+udevrulesdir=/lib/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
-+udevhelperdir=/lib/udev
- udevhelper_PROGRAMS=\
- 	udev/udev-configure-printer
- udevhelper_SCRIPTS=\
+ udevrulesdir=/lib/udev/rules.d
+@@ -169,56 +98,17 @@
  	udev/udev-add-printer
  endif
  
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.2.3.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.2.3.ebuild
index 7ab3be12c940..74968785c0aa 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.2.3.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.2.3.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-common/system-config-printer-common-1.2.3.ebuild,v 1.1 2010/06/30 02:47:51 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.2.3.ebuild,v 1.2 2010/06/30 03:33:09 reavertm Exp $
 
 EAPI="3"
 
@@ -74,7 +74,10 @@ src_install() {
 		dohtml -r html/ || die "installing html docs failed"
 	fi
 
-	emake DESTDIR="${D}" install || die "emake install failed"
+	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}"
 }