Use udevdir value from udev.pc pkg-config file to determine correct install path(s) for the helpers and rules.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

4 files changed, 86 insertions, 11 deletions

diff --git a/sys-apps/lomoco/ChangeLog b/sys-apps/lomoco/ChangeLog
index e454132163a6..c2ffc7743851 100644
--- a/sys-apps/lomoco/ChangeLog
+++ b/sys-apps/lomoco/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/lomoco
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lomoco/ChangeLog,v 1.14 2012/07/08 19:42:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lomoco/ChangeLog,v 1.15 2012/08/13 17:33:12 ssuominen Exp $
+
+*lomoco-1.0-r7 (13 Aug 2012)
+
+  13 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> +lomoco-1.0-r7.ebuild,
+  +files/lomoco-pm-utils-r1:
+  Use udevdir value from udev.pc pkg-config file to determine correct install
+  path(s) for the helpers and rules.
 
   08 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
   Drop myself out of metadata.
diff --git a/sys-apps/lomoco/Manifest b/sys-apps/lomoco/Manifest
index cc77d449409d..763ee104a663 100644
--- a/sys-apps/lomoco/Manifest
+++ b/sys-apps/lomoco/Manifest
@@ -1,23 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX lomoco-1.0-gentoo-hardware-support.patch 8507 SHA256 b920281dd3d9926b7dd67a508cd1acfc02e200e52105ec6c075cd6999175c588 SHA512 dbd4bcc3471bff0397521d189ba60edb34e83c5c57914ea77c5abeacdfb9839e0d4e66566bf883b237bfa62cf90bc7c6911a47b510b0a49aa731d6718c16c966 WHIRLPOOL 982138e7c3381115950a457a2550dee2f76d39bb3b265d78f4c3320b48d067a2fd0755dcb0a926599a62f37ea7e48253f3742107e45d06f99c98e8e6eb496247
 AUX lomoco-1.0-updated-udev.patch 2164 SHA256 c95f2b5031de73b1f8d54c836c2b57ae2e9c9446f1a9cc793f3dda8599dca117 SHA512 e9195d61c6f8550f6a64c78866a4b7bac97948f942c58c3a5361ca90e27a4989c4d0c143e7bdacf17304a4b7e81388207e5a5816ffe662fe36c9ed41a9a71f4b WHIRLPOOL 433ff8ff30f4df1ceacebb6985524b9f14f3d5551114898bceaa01bd47432e6f81a8b94775e213572b7df571a712623c1835e704093f48e86c213dd1d9219b38
 AUX lomoco-pm-utils 92 SHA256 9ba40747f09b30838c0791703eb98e497fd4d7c307639a42f8600610ab8c6d1f SHA512 f1e238cad9b042a6f04d9cf6a13311a1f4021ffb616d43b30607cb5947cc43b27cf0860d7b6dafda412d1fdba02dde37e9cfd0acc02a60b2f2fe99fa1c26a1bc WHIRLPOOL a2c813cffc6f473de54ef9d77b129c207a037986a6a53ce39009a34b914032e1373bfe4283ce3a945356837a339e27b18ce2cc0c50e35e7b07b3a6185d37c1b8
+AUX lomoco-pm-utils-r1 82 SHA256 0591a26f14238abc1965a9cbddcc41cd9a82873058b420447e917dd770cb9d4f SHA512 316bcd13dfb18f573797c5e57cf318ac34efe347ae623a63e0b84d64360188d54308907111be54098a6c334822797c7018475b1c7930418d90e4826924117886 WHIRLPOOL 13cf317de1515724fcd09b1986fc7531d77920db60e051eb14359162c08812ebbacb8ddbb27ee011bade9e43b859f8bd2a6525668764231654de0988f60b9717
 AUX lomoco.conf 59 SHA256 229006f0d63cfa4a6c73c9db10accbc259b538b6b111e626d0b326c1fc9dc553 SHA512 99c34ea6a85adb99a05ee57a84bdf549094920883db25bda50a091eb8ec0cf8dddd3465bf75fbf7a4c9cc5f71426e0799db82ea26c5c00a41934f8a86e403e73 WHIRLPOOL 91aa2d07a958e65b98f2e2bc514994849fcd4021ec0cce02213b2dcc73d6194e90c8f3f89a77057d095c3fa6b9c0bcd3869a6bae8d6c4f4c594e17debb20e069
-DIST lomoco-1.0.tar.gz 24573 SHA256 e9e537e8bca6186f84b457394a9e934b89c36870c66aa202ed188c7aa24e9dcc
+DIST lomoco-1.0.tar.gz 24573 SHA256 e9e537e8bca6186f84b457394a9e934b89c36870c66aa202ed188c7aa24e9dcc SHA512 5cd04c956fe11112be83e8d4ad91e4a8fac1bacd03666e8959ce20f2cc372fc8c53a5ac86b94125088f6b303936f087caafe71248ca8511b6a580f58459aee9f WHIRLPOOL 2bf5368351879f7f77e1dc9a61404a6f23f3ff96a1fa943aad3954741e1492df2833f306b774bc2e44dd63ec0c85c4b8fe3661f48b7d2b82e384b9f12fa82943
 EBUILD lomoco-1.0-r4.ebuild 1132 SHA256 f437d66cfd4590f67041eddec32e8f6ed42c11038bb6f5199a0aad3d21079437 SHA512 d9b3b7660668f95829ddb7b62d366842a49650156522fb3901378eb6d05f63bcc7df17577bd743bb5e4222758b7362582533a3305dc567798eec1491ccf419f0 WHIRLPOOL 6e80a87af8fd29b532ec3e12637ab2c0d0937c27e402767b9c1712d33b9ebf0374189b29fabe35d65dfb3bd38724acac9fe02bb1831aeaa0edd6c63df1e8a17c
 EBUILD lomoco-1.0-r6.ebuild 1302 SHA256 8c3cc2e057bd35dca76d230b13503bc046396d36104c1bcad0e17dce2b57f154 SHA512 687dee74ff5b71d3d566c538001a6fbbf7bd984579f09b25bdc1919e47217e35127fccceb5ea748571dac1f4945b84c5b96de9a9990b91850b33bf98404f9852 WHIRLPOOL 03efc32b526302c387544915a21cd948a5efb738c4330780538aa9472c0e1690cc23406d314d3135d352156fe411606fc00d6477f11e0be8aba60d8ed7b1cdae
-MISC ChangeLog 2660 SHA256 5a1708217f81205a06b5367efd6e0adb8bcd5239d0e47e7fb799f59ec9f447e6 SHA512 821c5ef8cfd3f3a13f5c771f57c759deb1e52c6443da3510efeb6bb62ed9c9524dc30622ae7a669ff7ca1584878bf573d7aa49c1b7805c1b6653b6541bfc1b20 WHIRLPOOL 5b1ce6d07f6d5b9b449286d2a3d05be031c18c7330df3361d0788f20cafb8b976efde0c76130e237ec3641c1929b8d26c2fb8d81cf8b0626daa448e07aea7c4c
+EBUILD lomoco-1.0-r7.ebuild 1424 SHA256 69236dc950fe04534398f69e5eb09f9104cd209318c06f1822270fc7dfd78c78 SHA512 58c86959e6f0d57a1aac91a0cde3db9a26a91f15bce2d878ac438d91f12dc5bddbf85c54e6527746d0ce90f529270b36df112e25919324c4165a781c8653cd87 WHIRLPOOL 871e6aa7529f2c4d9c129f8142df08c2af0a23854a37a97009f41be314ec72273fe4400500d03e0580b2baa5f044b7a51e2ec0b5c9665877423946222c909cef
+MISC ChangeLog 2912 SHA256 3c810455f5071b5e85d7add8c32ebd95c476134c2a4ff465d557c9d5d9a55af2 SHA512 528efefbb8e5c6ec5ff95ff13ba0200f0bde98a678bf2848baf59fa93db97d405f793b112c524fce08e8b7d7acaaf2752defdef0ecc5d488bada7ad4880aea0f WHIRLPOOL fa736c143087cc09b3f738d8cee428ec9c545e42a8b1370cd2cab81428f6b373073288409046b66ee6d072c964a315c89afcc17c483918ee08de47ee4f0eb0e8
 MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP+eKcAAoJEBzRPIrUMBNCQRUIAJXKJlrFflURHLLmxzZi+mwi
-2z/yOm/XVr3P5wG8Z3+QXxDYa0H9/fyL6lqKfP1OtCShBZP++9lWOwd07AWMOQF8
-P9Taad970XkUChqtccAcCVTia2ktjsSa9P2oyDw57WVzP9ASmfiO3X+QjThUkS0a
-l9xQDfdyHvLNGAu9lTmlltLV/5lB4k5j4tt2JcmoI5AuqhN59Pnw01ZhfGEgWJhM
-orwWCJHzgnsgJus22WM6pocJP6j81RTaaRsaAsoCBdfBwL/Gn8n+sazOGIdVGBLC
-3+Rp1++2CmaHzlTVLSViP0H0ONJebyv3UqUlH3rsxGJOf0OXdqrFEtF7Y7rkXzU=
-=LKci
+iQEcBAEBCAAGBQJQKTowAAoJEEdUh39IaPFN/3UH/3vJ2//nX2iQUM+DE9PhnsJC
+k/EO80LdNzivfB/BB2Yz8gPfAfFp0/kx3N/V58mvKIFgnoh6+H6Mh3lBgtiO/DVd
+ROfae1JR2+ERLPPNzvY/hpwLmh3e6b/pe4R7LMisFixy/hJZgHpsEc8S0ewkZJad
+ZVERECGB3whmwMSOONrvJxuoCZ9I5IvLTujY8rnrSyxjHjodOkJqxg2K4OFCN5KZ
+XFa7qk4t8LUCDedZTdhKWv6n5P/yqnfB6PzW74Tf9+KJ6fXedLpabdP6GuozYjRB
+O424zlEvLfQuavUrme1irxLCEkECYyf/MP2u/fqJngXS7p3dpGozpJTVXFoCHD8=
+=Oep3
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/lomoco/files/lomoco-pm-utils-r1 b/sys-apps/lomoco/files/lomoco-pm-utils-r1
new file mode 100644
index 000000000000..602de3d11571
--- /dev/null
+++ b/sys-apps/lomoco/files/lomoco-pm-utils-r1
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+case "$1" in
+    thaw|resume)
+        @UDEVDIR@/lomoco
+        ;;
+esac
diff --git a/sys-apps/lomoco/lomoco-1.0-r7.ebuild b/sys-apps/lomoco/lomoco-1.0-r7.ebuild
new file mode 100644
index 000000000000..c2ac2874681a
--- /dev/null
+++ b/sys-apps/lomoco/lomoco-1.0-r7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lomoco/lomoco-1.0-r7.ebuild,v 1.1 2012/08/13 17:33:12 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils multilib toolchain-funcs
+
+DESCRIPTION="Lomoco can configure vendor-specific options on Logitech USB mice."
+HOMEPAGE="http://www.lomoco.org/"
+SRC_URI="http://www.lomoco.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!<sys-fs/udev-114
+	virtual/libusb:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	cp -f "${FILESDIR}"/lomoco-pm-utils-r1 "${T}" || die
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	sed -i -e "s|@UDEVDIR@|${udevdir}|" "${T}"/lomoco-pm-utils-r1 || die
+
+	epatch \
+		"${FILESDIR}"/${P}-gentoo-hardware-support.patch \
+		"${FILESDIR}"/${P}-updated-udev.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	emake
+	emake udev-rules
+}
+
+src_install() {
+	default
+
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+
+	insinto "${udevdir}"/rules.d
+	newins udev/lomoco.rules 40-lomoco.rules
+
+	exeinto "${udevdir}"
+	newexe udev/udev.lomoco lomoco
+
+	insinto /etc
+	doins "${FILESDIR}"/lomoco.conf
+
+	exeinto /etc/pm/sleep.d
+	newexe "${T}"/lomoco-pm-utils-r1 lomoco
+}