udev rules go in /lib/udev instead of /$(get_libdir)/udev, reported by ssuominen. Fix doc installation, bug #367515

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

7 files changed, 33 insertions, 26 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 62957d6d8d1c..b85e1206b650 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.186 2011/08/05 09:41:16 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.187 2011/08/08 17:58:57 voyageur Exp $
+
+  08 Aug 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  sane-backends-1.0.18-r6.ebuild, sane-backends-1.0.19-r2.ebuild,
+  sane-backends-1.0.20-r3.ebuild, sane-backends-1.0.21-r1.ebuild,
+  sane-backends-1.0.22-r1.ebuild:
+  udev rules go in /lib/udev instead of /$(get_libdir)/udev, reported by
+  ssuominen. Fix doc installation, bug #367515
 
   05 Aug 2011; Bernard Cafarelli <voyageur@gentoo.org>
   sane-backends-1.0.20-r3.ebuild, -sane-backends-1.0.21.ebuild,
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index e70ef7ec550d..c1e310f43d1d 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -24,17 +24,17 @@ DIST sane-backends-1.0.21-i18n.patch 2250 RMD160 35a16305f30e41478b3de82266eff72
 DIST sane-backends-1.0.21.tar.gz 5050344 RMD160 000ae42ffd6484c54389a9468bdde1dcfc758dde SHA1 4a2789ea9dae1ece090d016abd14b0f2450d9bdb SHA256 e44e2fa2925897cf3a9c637b81224772b4483835bf546a48cf9477689022948b
 DIST sane-backends-1.0.22.tar.gz 5150661 RMD160 524713474a819331d0179fa642fef710d073f1d1 SHA1 dc04d6e6fd18791d8002c3fdb23e89fef3327135 SHA256 9f84a16800497f0b79a278531bb1a0f438de6ce8cf509fefc65a252e29f90c54
 EBUILD sane-backends-1.0.17.ebuild 3761 RMD160 f07ceda376d30bb977b5cbe120a4acd7243dcb88 SHA1 002313d0e4cd5369caf7ae21c2587d93ace69572 SHA256 523b0a02b2720cb548b7946e2e4b41ce7a6b4326414b96dfe29ad9b87b3cb4fe
-EBUILD sane-backends-1.0.18-r6.ebuild 4299 RMD160 d80870a16bbc025f7f5bf63ec792f5a8809569cd SHA1 b929cfa79c3fdc54c047019e51015427506a0761 SHA256 7d76e2047c01c7921d7a525779111624a80f58c9226990376e33700c92a061b5
-EBUILD sane-backends-1.0.19-r2.ebuild 4503 RMD160 f9339b89a1aa6530684e4cd7c721ff732e1e3381 SHA1 511ca15219f5519f2b415fedbcaec02f29058cfa SHA256 78a92bde5174dfac63977a6fd55c47aa2ddb4abf2238c475e11802675c39471e
-EBUILD sane-backends-1.0.20-r3.ebuild 4435 RMD160 69a8bc3d72eba14f5e13b1a8dac15953389fc388 SHA1 bea002c8b8e8929bceadde859593c610e1688dcb SHA256 a1da2dea06dcb2f26593d9b1e0cba11c0fef010cded6df8c76de1b4eb8812fa7
-EBUILD sane-backends-1.0.21-r1.ebuild 4661 RMD160 5e9b3c544fe3e3cd79698343748f73674f91d54f SHA1 2917d9bddcb98c42c17f8e33e720eea6e9a794bd SHA256 ab13855ecdac72734defe8e717206b64b1a81c223895948b11f5ff4f3279319b
-EBUILD sane-backends-1.0.22-r1.ebuild 4632 RMD160 14a31e406450c66d0a5b7c30e6d46e29dbe91d47 SHA1 683d92dd509226b2f71c9e759c30875d38bf18be SHA256 cef0b778cf6359b5ee783e30f07c526db8eccdfb05d952049a49bff7409c9fe6
-MISC ChangeLog 31965 RMD160 bd5ae9f5fd4fa3d503c25af48b2fa964de4d3bef SHA1 b1ed2bb5b2adc0245546154885bf1a60ff9427bc SHA256 540756a05cb3d9cb94febff624ccce8c16d9b58a927c723cd5dddca25dbe8d88
+EBUILD sane-backends-1.0.18-r6.ebuild 4279 RMD160 535498ff058528e063cbf8b4b1d7298fbf83b5f3 SHA1 5b677d4beeaba8223527cdbce576421d11b426ef SHA256 0b75e057f5c35ac8c4f180d5b555d7d4eb7294b8bcd1871cd370783ca2d444cb
+EBUILD sane-backends-1.0.19-r2.ebuild 4483 RMD160 192804949969312f480d2f0326a8240a2a8da6ff SHA1 00dded7755b057d129e7abbe6fbc5cd590943c4e SHA256 7b854ad0036baa9dc699aec4914291f4091857a919fa4759db80271f27d66816
+EBUILD sane-backends-1.0.20-r3.ebuild 4415 RMD160 10e2474a3797cab9e13b19677ce211062c160f3a SHA1 2837fcf49e028163c7aaab4a694f57d950f0cff9 SHA256 d4408cc17a8b838c059c7062c2c86bb7e11df7295ca8f5a6c91647b29040aaa1
+EBUILD sane-backends-1.0.21-r1.ebuild 4641 RMD160 fe0fa0fbeb1d2836379af62bea985461fb85302b SHA1 ac489d62b2e61b9d986bf33c359d18dbd6d443df SHA256 864f82c84673185907982c8192ecc8a6f253a9917dd0a8a768a4ebc901631ddf
+EBUILD sane-backends-1.0.22-r1.ebuild 4608 RMD160 14a3afad17e7393e97bdd9b059d4512284a01b69 SHA1 f17643a2696efeb535e56915eaf7f729f8434576 SHA256 87891b61fc1596fbb87e211579f9e5dc0d675d28b869e157dcc05d07d2fe51b1
+MISC ChangeLog 32307 RMD160 beff086eb0af38ba5238347fcc4db2d60ffcf70e SHA1 7f486f9f160c2e68d3643ecb5f56675a1955f682 SHA256 b2c8387f7c651477d692f039b886ad52ea0360f8a87743496ea0dcf25bb16174
 MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk47utEACgkQFYEBGcdFJfIseQEAoLo6jTn2Fi5ek04WT1/JKKVQ
-mLENTpXjbazkcNX4KccA/ApB7685s7Tm6svLj/tiqK5T2rS9w7mYHmItPAolWYNU
-=gRju
+iF4EAREIAAYFAk5AI/IACgkQFYEBGcdFJfILMQD9HzrlZiCJdbKTzcc6r8Wx4ShR
+PBoMbMOZpLzI3jRal+0A/RA4G+SCrV/uqeKx6iVMOt5P8/Fnqr24tM1N9HVMO5n0
+=Boe1
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/sane-backends/sane-backends-1.0.18-r6.ebuild b/media-gfx/sane-backends/sane-backends-1.0.18-r6.ebuild
index 3ea9ad1d0602..dc06fd03d66e 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.18-r6.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.18-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.18-r6.ebuild,v 1.15 2011/01/21 20:52:27 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.18-r6.ebuild,v 1.16 2011/08/08 17:58:57 voyageur Exp $
 
 EAPI="1"
 
@@ -140,8 +140,8 @@ src_install () {
 		cd ../..
 	fi
 	cd tools/udev
-	dodir /$(get_libdir)/udev/rules.d
-	insinto /$(get_libdir)/udev/rules.d
+	dodir /lib/udev/rules.d
+	insinto /lib/udev/rules.d
 	newins libsane.rules 70-libsane.rules
 	cd ../..
 	dodoc NEWS AUTHORS ChangeLog* README README.linux
diff --git a/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild
index 0bf174499885..9da6798a1435 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild,v 1.17 2011/01/21 20:52:27 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild,v 1.18 2011/08/08 17:58:57 voyageur Exp $
 
 EAPI="1"
 
@@ -144,8 +144,8 @@ src_install () {
 		cd ../..
 	fi
 	cd tools/udev
-	dodir /$(get_libdir)/udev/rules.d
-	insinto /$(get_libdir)/udev/rules.d
+	dodir /lib/udev/rules.d
+	insinto /lib/udev/rules.d
 	newins libsane.rules 70-libsane.rules
 	cd ../..
 	dodoc NEWS AUTHORS ChangeLog* README README.linux
diff --git a/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild
index 316077dc72f7..b4e7015b67c2 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild,v 1.7 2011/08/05 09:31:25 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild,v 1.8 2011/08/08 17:58:57 voyageur Exp $
 
 EAPI="1"
 
@@ -205,8 +205,8 @@ src_install () {
 		cd ../..
 	fi
 	cd tools/udev
-	dodir /$(get_libdir)/udev/rules.d
-	insinto /$(get_libdir)/udev/rules.d
+	dodir /lib/udev/rules.d
+	insinto /lib/udev/rules.d
 	newins libsane.rules 70-libsane.rules
 	cd ../..
 	dodoc NEWS AUTHORS ChangeLog* README README.linux
diff --git a/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild
index 7162cb0c24cb..e62e8d3080e7 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild,v 1.11 2011/08/05 09:31:25 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild,v 1.12 2011/08/08 17:58:57 voyageur Exp $
 
 EAPI="1"
 
@@ -212,8 +212,8 @@ src_install () {
 		cd ../..
 	fi
 	cd tools/udev
-	dodir /$(get_libdir)/udev/rules.d
-	insinto /$(get_libdir)/udev/rules.d
+	dodir /lib/udev/rules.d
+	insinto /lib/udev/rules.d
 	newins libsane.rules 41-libsane.rules
 	cd ../..
 	dodoc NEWS AUTHORS ChangeLog* README README.linux
diff --git a/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild
index ed249c36d279..ac31857fe831 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild,v 1.2 2011/08/05 09:31:25 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild,v 1.3 2011/08/08 17:58:57 voyageur Exp $
 
 EAPI="4"
 
@@ -208,10 +208,10 @@ src_install () {
 		exeinto /etc/hotplug/usb
 		doins tools/hotplug/libsane.usermap
 		doexe tools/hotplug/libusbscanner
-		newdoc tools/hotplug/README tools/hotplug/README.hotplug
+		newdoc tools/hotplug/README README.hotplug
 		echo >> "${D}"/etc/env.d/30sane "USB_DEVFS_PATH=/dev/bus/usb"
 	fi
-	insinto /$(get_libdir)/udev/rules.d
+	insinto /lib/udev/rules.d
 	newins tools/udev/libsane.rules 41-libsane.rules
 
 	dodoc NEWS AUTHORS ChangeLog* README README.linux