diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2010-06-30 03:33:09 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-06-30 03:33:09 +0000 |
| commit | c8c89eb61a6d314bdd06c5c70e2b07ac8fa5c91f (patch) | |
| tree | 2b0657ca2170cc94056ba4eee186bba1577900b9 /app-admin/system-config-printer-common | |
| parent | fixup deps as report by Sam Varner via email (diff) | |
| download | gentoo-2-c8c89eb61a6d314bdd06c5c70e2b07ac8fa5c91f.tar.gz gentoo-2-c8c89eb61a6d314bdd06c5c70e2b07ac8fa5c91f.tar.bz2 gentoo-2-c8c89eb61a6d314bdd06c5c70e2b07ac8fa5c91f.zip | |
Use 1.2.2 patch, set udev paths in install
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-admin/system-config-printer-common')
| -rw-r--r-- | app-admin/system-config-printer-common/files/system-config-printer-common-1.2.3-split.patch | 27 | ||||
| -rw-r--r-- | app-admin/system-config-printer-common/system-config-printer-common-1.2.3.ebuild | 7 |
2 files changed, 11 insertions, 23 deletions
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}" } |