Fixed installation location of udev rules file (bug #430112)

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 40 insertions, 13 deletions

diff --git a/net-wireless/gobi_loader/ChangeLog b/net-wireless/gobi_loader/ChangeLog
index 60337c85ddf8..b6dff22cc0e8 100644
--- a/net-wireless/gobi_loader/ChangeLog
+++ b/net-wireless/gobi_loader/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/gobi_loader
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gobi_loader/ChangeLog,v 1.4 2010/08/11 14:01:18 polynomial-c Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gobi_loader/ChangeLog,v 1.5 2012/11/16 13:21:12 polynomial-c Exp $
+
+*gobi_loader-0.7-r2 (16 Nov 2012)
+
+  16 Nov 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -gobi_loader-0.7-r1.ebuild, +gobi_loader-0.7-r2.ebuild,
+  files/gobi_loader-0.7-makefile.patch:
+  Fixed installation location of udev rules file (bug #430112).
 
   11 Aug 2010; Lars Wendler <polynomial-c@gentoo.org>
   gobi_loader-0.7-r1.ebuild, +files/gobi_loader-0.7-makefile.patch:
diff --git a/net-wireless/gobi_loader/Manifest b/net-wireless/gobi_loader/Manifest
index 86a2d5bd43ca..0e540ae0a7b4 100644
--- a/net-wireless/gobi_loader/Manifest
+++ b/net-wireless/gobi_loader/Manifest
@@ -1,5 +1,25 @@
-AUX gobi_loader-0.7-makefile.patch 686 RMD160 2565776fb06abd68041b28867ba1986169036140 SHA1 8acc0f0afd3a97816744c115d31c034076454604 SHA256 2c06ac0146f6fcbe78a08584a845a95bf923e27dee4cccbed7eba345f9ff19ff
-DIST gobi_loader-0.7.tar.gz 5056 RMD160 4e267e6cbeed215991888e7c9495cac72ee39ee2 SHA1 1f45d23818d0b0bb507c87803baecf46a0a065c2 SHA256 78bdc255451cde1caa406e146b01a88828480c9c43272de8cffdb61627be754a
-EBUILD gobi_loader-0.7-r1.ebuild 848 RMD160 975506593630b58fb0deab9f2c0f55465d6897dd SHA1 392fd1776cf2982fb6261c50efb00d82c84f3557 SHA256 671fee59548066a0c50ac200b3016b48336a69a3f38ce69653d25607cbcc9a2f
-MISC ChangeLog 1041 RMD160 dc350a1c7e947c9a32856b20e80ce3b8f3feeab4 SHA1 285b8ab64dd29112bb41e82924b689db263a3d5f SHA256 babc3666f3d69b3d8c9b23482b60c2c91db0de3eafd0d50da2ca4f3b0d3a9c17
-MISC metadata.xml 401 RMD160 bd4273613004bd64f9268fa7a13606c812db11eb SHA1 3cd7519a0c49cadb894da49919ec99522f9dec3d SHA256 df1e4b8fc27b714ec9a2e58cd0d3fd4dee2c6ebbbc856fad8eb28b48aeef22ca
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gobi_loader-0.7-makefile.patch 663 SHA256 bad425e0487511fed1fc7f3042173ea5112063cde20f7efb71b855eaa38bf221 SHA512 072ebad5c997d8f408a2821234d0ce09418165393fca6bea905154f0fccee421d44db8a895778e51476dbe426a8761b7038d23246f3a2cd308b5539ecf9f37cf WHIRLPOOL 87691cb055438ca6c02adbcf52bdd30efb09f09a1e991531ba6d3346fdb7c40e80609fdcfa23a785c08401c127d10ddb88316809c498fbee10a683fe242b6f2d
+DIST gobi_loader-0.7.tar.gz 5056 SHA256 78bdc255451cde1caa406e146b01a88828480c9c43272de8cffdb61627be754a SHA512 79b9a357a1dc11bf0eae5a7a964f8ffe4d09381384d0bfc0541bf0311bba9206055e5ef3d884648b12fa05286feec0118af11effa1db66626001ea2743a715a1 WHIRLPOOL cfc6a0f01aa9ee2b3b04004d5eb6bdd27ba66a60dcb34aef3cc8412572e1eecf5cb67be0f8a6d742b536de40bed4ebae506a11283213cef2c1390f2b0d379736
+EBUILD gobi_loader-0.7-r2.ebuild 860 SHA256 fbc8175420233e4f7902e062f29072a49c2b6cf0db263b2e094c739a43c8b699 SHA512 fef9d26a1db44d3c6d2f84f2bf72d48aa42ada53c21e800de29ac7a10f44e126af40f507a90b84535c54364339de3741fbeccb2fc93606d203e96c524b8ee210 WHIRLPOOL d44d29eae5f36dfa251390c24a1ca20e76949e325ff107a03ab684e5a627e37b31bb37d4ad4528c432ff9ddb1036f9e9287ce11dac92fb5e48c241547da48e9d
+MISC ChangeLog 1293 SHA256 fe3eed5913965676cef20952894aaf51fa68451587c00d68a2eecca1967c4b52 SHA512 919616cd97a4bf7e80f1f13f6e948797f7ab63ffc3a4fa1d6b7c7ecb74ec5ff472f90e31f7e6bc6c0ed4ce7f5e91ef5563fcc90436a5cf25969a468e5709e188 WHIRLPOOL 886fe7e24bedcec23ec43bd5244eb5ef11cab500dbe9e2e826d428caa74b632636eb242ca32ac97e0dad0cf7c525ee7f0e3d9d69fa1f1b5226a8b7ce608af566
+MISC metadata.xml 401 SHA256 df1e4b8fc27b714ec9a2e58cd0d3fd4dee2c6ebbbc856fad8eb28b48aeef22ca SHA512 0dc8b9ba48edfcf0f90ca569f0f3066f0421e6d80aea692153fc8050b37df9aa6c96a1ea42a3adc55499a9d34d700c24da648d7f324ecfa8c158b0fe7482cb60 WHIRLPOOL a611727bffd0e166a4f9a441eab9c474713bdfeb7a2d29f25298f39226255f867a153f835daca0f2e10d3a744386f069ae7a09df7495865e5c548df940606399
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQpj3JAAoJEPiazRVxLXTFhTQP/RWlOUGdGgP4V9/0212yE1PK
+I7s65eD7+pkpQxYNcvd5r2rn1gbeVk7pVHlLiIRHVlxcbj6Hs4l0FAT0fGiCuYYx
+uXITrPm14qDYm/XdRkYDOlLjHsFDCAach+3ASyDSLCqjS8ChD1pAmpCoP2z4hZD7
+km8jLztVr2uUhTcZiCr2qmw+JUpQFXBjkRal/ZAQWWDGN/PBE6OYdI6ms0MxoNSi
+WCYLUT89f94mnEGaWOiz6NuG7YXQ4oBQVueImBbjczxKPVUCkmZrns5G5Mrd2A7n
+T8cpcjvGnzpoGKkLipShYiQfw4Jr5emA66L4Y0LxUc8/5SsFh2WuK3h30DMA8/Jz
+UgH088rQGwdbGg9C+O4FIxR/cHgGHna/DVJtlNNVsQGyxErGd6gPd7+nDbMe4vVR
+2jjbUnDE9MZHVaFpLJqqsdv4R0lm6pQGd0HxAXbTEUkUf0GoNWWDymo2p6xunsBW
+voNIeYwz+vjmhFX+bH/v5rvoDJn5zMhV5AQ0Vb3cDPMP0+EkI3jFeyYvaqPs/Nju
+oiHhnQki0qfqo0h/4gMkTn9Vn0rpgb30QmZTc+Ur1RAD6jk1MesrARLSHWYNVvPK
+mOxV6ufGUiD/jCooXFhP8YJX6buFFrosc10/nRxdPIdpMbPtyrTHvS+HLKYhdaA0
+xbxrZGJObO3MJkNpOZoJ
+=gZOy
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/gobi_loader/files/gobi_loader-0.7-makefile.patch b/net-wireless/gobi_loader/files/gobi_loader-0.7-makefile.patch
index 0e0b05a613fb..ec5b4a706315 100644
--- a/net-wireless/gobi_loader/files/gobi_loader-0.7-makefile.patch
+++ b/net-wireless/gobi_loader/files/gobi_loader-0.7-makefile.patch
@@ -14,8 +14,8 @@
 -	install -D 60-gobi.rules ${prefix}/lib/udev/rules.d/60-gobi.rules
 -	mkdir -p ${prefix}/lib/firmware
 -	-udevadm control --reload-rules
-+	install -D gobi_loader ${D}${prefix}/%LIBDIR%/udev/gobi_loader
-+	install -D 60-gobi.rules ${D}${prefix}/etc/udev/rules.d/60-gobi.rules
++	install -D gobi_loader ${D}%UDEVDIR%/gobi_loader
++	install -D 60-gobi.rules ${D}%UDEVDIR%/rules.d/60-gobi.rules
 +	mkdir -p ${D}${prefix}/lib/firmware
  
  uninstall:
diff --git a/net-wireless/gobi_loader/gobi_loader-0.7-r1.ebuild b/net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild
index e59bb2527e9d..d230b07f0da9 100644
--- a/net-wireless/gobi_loader/gobi_loader-0.7-r1.ebuild
+++ b/net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gobi_loader/gobi_loader-0.7-r1.ebuild,v 1.2 2010/08/11 14:01:18 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild,v 1.1 2012/11/16 13:21:12 polynomial-c Exp $
 
 EAPI="2"
-inherit eutils multilib
+inherit eutils multilib udev
 
 DESCRIPTION="gobi_loader is a firmware loader for Qualcomm Gobi USB chipsets"
 HOMEPAGE="http://www.codon.org.uk/~mjg59/gobi_loader/"
@@ -19,7 +19,7 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-makefile.patch
-	sed "s:%LIBDIR%:$(get_libdir):" -i Makefile || die
+	sed "s:%UDEVDIR%:$(udev_get_udevdir):" -i Makefile || die
 }
 
 src_install() {