dropped DOCS='' as it is not PMS-legal (bug 480892), reload hwdb if rebuilding or revbump only

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

5 files changed, 43 insertions, 24 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index d9cf3e9f46ef..5e05dd9c9af1 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/eudev
 # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.64 2013/08/12 13:26:20 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.65 2013/08/13 17:05:39 axs Exp $
+
+  13 Aug 2013; Ian Stakenvicius <axs@gentoo.org> eudev-1.2-r1.ebuild,
+  eudev-1.2.ebuild, eudev-9999.ebuild:
+  dropped DOCS='' as it is not PMS-legal (bug 480892), reload hwdb if rebuilding
+  or revbump only
 
   12 Aug 2013; Anthony G. Basile <blueness@gentoo.org> eudev-1.1.ebuild:
   Stable ppc ppc64, bug #463910
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index eafa7efe58eb..c6f6bf74159b 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -9,25 +9,15 @@ AUX udev-postmount 1207 SHA256 0220e949b1f31832a205021c0a8615e77b27b73b7c9b16ef4
 DIST eudev-1.1.tar.gz 1706277 SHA256 462659ef77802f244f55cee58fcd6b2a0cf6c24716f64fbb0c6d88a580f398a8 SHA512 e7b54eaa49e21b350341c39848712458d85cd2d3a69233e11fa7e57e93cb7db2382d1138ebd9eebf971650af85b2aebeff2b71a8396c78c444b6759523e69730 WHIRLPOOL 57782df80ef923f9507e0edf31ead8528c764e0b653f69b9ed4c42925e88d5d26a7953d21083dece84e0bcd5521b6ef81e3ffb97215de934c9b631f8dc5ecb52
 DIST eudev-1.2.tar.gz 1677976 SHA256 f9f78c2154eb174a6aab08afde9f5705a9072fc4069031a9f686cabc20beaa22 SHA512 673cd53339d62b23db615e1f67def71ed8d313dcf18edda37498db5fd507a2556073c798f81d16525594b0176fa5f0c9567bea6e4715cc0732b7651d24af4be5 WHIRLPOOL 3329ed127f0fa9696ce4fec406a2e6ff8e9d616ee4fbc6fac0a14a8b80909b6def983dd16c40e7c6abdc93f4da96805fbbb855460daddb1b1352815077b2e009
 EBUILD eudev-1.1.ebuild 6446 SHA256 4425d4accc81d3fd76f91a436281428bec4e9ad9558e0dc5d5e276de1441775a SHA512 fe7c56810ecf03c9973f56880a56ed29bba6ed8cc031fc9151d67a066ced5c9d1a80affec6bf8661bd8baa03a64c96f8636831b9949997af530a814e9597dd30 WHIRLPOOL 55aeaa3295ace7b1bcab6c2c8dd6c73e593837a8a695ed5afcb04e38590fe90d7bd2070a47005d8017ae6a3e45bca168cde358cb7b85452b5e76198670aab475
-EBUILD eudev-1.2-r1.ebuild 7372 SHA256 f44efdb1a37dbf097bfe6431f91e707fa5a3c415759e4410acd7b978c0d2ca9d SHA512 c0b1efda4db41db9753f87920df8c5a0aac6d1e85608dd7eed9cf7712ca4c27269731481e15c665bd7c35ab234d67348e6f10ea87130f1cdd33e201126bcb63d WHIRLPOOL 7628f53309739cc5ce18ddc7e50a673e9b3ad8275db582204ab8e60bf1d752dc127061a160a8cefcd5ddbc03a8875e6b38db5917f31a6a5c7aa0c953e01a4117
-EBUILD eudev-1.2.ebuild 6412 SHA256 afbb99644ed8683c085879f17405bd541e35c5090b90840bf1f515b4ef02286f SHA512 b84b90bb3d1706cd0fe898ed8c90f2223b3cb602220a45f7333bc3df0f19b479443b6067794bfcb46906de853b86bd4fce5903f94d7fb6672f5023adbaf3ba57 WHIRLPOOL 8604f71996704e47df59cbf6e5b0eaed7579c3a297fd2c722f6ca06fbdd2964d4a9e5053e912de56cf83ac618452499071e75870ff05b3143bc34c790b47a397
-EBUILD eudev-9999.ebuild 7364 SHA256 1530e36df6e6572185616011cbafdfdb807f2746909fa152cb67bd5dc579bff6 SHA512 0c140a8943326f1eaabefcddf64d14e8a4caa0209f0d6d9024620a7b2fac29e42dc7ccb37a8fd37b63224edcb0f9f3307cc036694520d1d717ba4e3f3284a063 WHIRLPOOL 92bcac6bd67d629c79478d868a4a80814e3d8a491fadcabbf807cc1494401818b2a9844bc171611dd70f233f3f51ca99d0a3a762ddb7a8402548378de33a0090
-MISC ChangeLog 10366 SHA256 11d3a33213124d2cc6e1ce994c66353426563f1f4bbe19d7d4f30b10bff1c56d SHA512 c438bcc793b2d1b1f838f26a2d22b200b924fb6737f75da4fe44056a4203ace607f0702e46cef59d02baaec04cd910df1c55baca8ae11e35804b1de53bbab26b WHIRLPOOL e5d9588a68e17cfb5b7f39a54d00d78d8c8607b8fc8581cca8e1ba97c48b6ee1076a8826831e16dccffb9d6c724c699ce1718804598a880c7a30949646f4c386
+EBUILD eudev-1.2-r1.ebuild 7825 SHA256 d150c1b322373626715625bf96c69e7f1bc75311a28e7b0a1219056dcb259489 SHA512 a2096c70bf39587f7a4e68cde0770505502d3327c0f3c44f518619a752c3e7d43376c6a4ee20726ba769de41f313648ca37e19ed355fc47211c9d63f001c55c2 WHIRLPOOL b390f9e223fcb15d4cc46e6ed54ce14b06faf0b9c79d4de55ff0581195d2a4241374a56350917c99c2b3a31c0c8aa25b44ccc6671ffd3503e266258b15030345
+EBUILD eudev-1.2.ebuild 6873 SHA256 0a6146024ae3a8f738dc24c7ce0e04ea68c4079e310d00b26d1dbcb904933974 SHA512 3a446a1b355248d12f33c5016ca8f41abb6548bd220db9016e2fc5f3c8183e12e31d6786b1cb208a4459070dac0a02a5b0a429a309e1b351023207fd05def065 WHIRLPOOL 14d5a08ee32ff2f26ad522d58bdc8778f4fae32c79f2e5036be138375be843fc730f6400f0803ec0172aca850202aa56bb013bf0e7cb615a1da61bc43ffd3d98
+EBUILD eudev-9999.ebuild 7839 SHA256 bc03fae8d39129dbaca9b52beeafe9c176c32e09ed8d3adacdabb8bafbc67cd4 SHA512 1f94ea693c01411768cef16181da43439713ebb2355070960f7032e82096d765a0db04194c69c67e1f370dda92310400fa0e8fa448449278eb17acecdf0b71e9 WHIRLPOOL b7c3540e79d598e5b520c72a702b029c5a0cfe38bcc6a7834659afaf234675469e590f3a75d688cc26afc80474c787968b84cd218ab589c46a3870ae738648eb
+MISC ChangeLog 10570 SHA256 bda430bd5dac0240bdce9567f6ca93c8a7c6e328710613e387a857cbe03bf89a SHA512 64bcd260b6b01a1066c897d2f34266cd383f1fa84318db20ddeb513e43e245a01382ae00521da175e9dfc846c13b8283fa460141d49cc8079db7e13c61210f41 WHIRLPOOL fc68e7b556a086f5b0872e0e23870a3c546b6c3276e0afd866a424e5e28880831f8d771723bacf370eb2ef15aba5ffe9a0f813dd795974861191462bb54b46d4
 MISC metadata.xml 956 SHA256 2dc374ed7a7236fc2044a93429e8ff9ce68474f5fce8961aff1209914d4bdbcd SHA512 e164394dee8fbd2afb6258fac4899b24607bbde5ec1e1d3cba51059a11768a653e2d841fecad902da0f85cdc579b3e8e2ea64e94d107a448fd1fdcf8362db4d9 WHIRLPOOL c6d492ca4498e509c8e04aead71a89b4481e8294c661968bdc7ca3081bfe116dd486f5676c3dfe08f5c43658a9f37d1fcb815c9378301a8c385852f83ea27544
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSCONOAAoJEJOE+m71LUu6ZBwP/iTaPuJRZXtVw0JoBH6Qx71h
-cSWHGvkb3k1t5X+b+B4hZM0iU4kqzUbk12MY0EgrjARz8XcWQbeA7RJ5kRRj409t
-EnNNS7DMPUgz8mb5i2paxQ8kQjt7hbNVOHsAr2MjI/mdZC896bPHxiNrXjqiYnqu
-5K7qGQyonWpnEVsjuV5ulpXCwivKHABIpfn9Xc7tMcqc9h+aOjYzjBF+5+01sIYH
-eBFjxkEkFeqxZnvo/x41rH/HvYLAaZh1xPIQOmzapT07LcGJeMOlJu6m6sfrDeUV
-wLAhqyZ5SVYtB5Bf5NHeOoSqmZru5ytjbXxsVc83Izb2gXxSoLIWEZAOysFYj6xs
-EPkFNRxHiX0B2b6u7j1Ibomcc0xdvB/yTxBzEuQiN5GrHsmJe+MEODQP05m6jyl6
-NyQB46UKm5+VRFahoIsSMgtOZYmxYFS1syYI74d9YtuG5ppxex5waDdDHC2chvu8
-5+1j5AV4WHgl5T/+YIMTNJZMi/Wf8FJd9Y3Rfl7xT1gZUob9OXWbbX3D+NgquGgf
-WrCrFVKvOBxvyp5i0y1LuNpKp+wCseqCUWhqUJ78CVVT1oBT3ck1S63PGNoYp2ir
-iE+mI8J5aLLVwDHEQlpX32k9O5GF8Ydd6RX5FYDzHjUIl2BCbTDPkL/Rt5fKpJsl
-igVwRiQcT/g/paqyjRLf
-=3OAP
+iF4EAREIAAYFAlIKZ3gACgkQ2ugaI38ACPAGFAD9HqMLwbX2b/6Fo18ywSQVsuZN
+eWmn+IPd9HVQRd6F9twA/0NX1SliUQcoMscZr1iMRKTro+D0FMvPMczbBytqn8AH
+=czps
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-1.2-r1.ebuild b/sys-fs/eudev/eudev-1.2-r1.ebuild
index b776187b3376..9187986a7fc1 100644
--- a/sys-fs/eudev/eudev-1.2-r1.ebuild
+++ b/sys-fs/eudev/eudev-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.2-r1.ebuild,v 1.4 2013/08/08 19:47:52 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.2-r1.ebuild,v 1.5 2013/08/13 17:05:39 axs Exp $
 
 EAPI="5"
 
@@ -60,7 +60,6 @@ PDEPEND=">=virtual/udev-180
 	openrc? ( >=sys-fs/udev-init-scripts-18 )"
 
 REQUIRED_USE="keymap? ( hwdb )"
-DOCS=""
 
 pkg_pretend()
 {
@@ -244,6 +243,14 @@ pkg_postinst()
 
 	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
 		udevadm hwdb --update --root="${ROOT%/}"
+
+                # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		# reload database after it has be rebuilt, but only if we are not upgrading
+		# also pass if we are -9999 since who knows what hwdb related changes there might be
+		if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \
+		[[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
+			udevadm control --reload
+                fi
 	fi
 
 	ewarn
diff --git a/sys-fs/eudev/eudev-1.2.ebuild b/sys-fs/eudev/eudev-1.2.ebuild
index 83040ca8e747..4579dc20e022 100644
--- a/sys-fs/eudev/eudev-1.2.ebuild
+++ b/sys-fs/eudev/eudev-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.2.ebuild,v 1.3 2013/08/08 15:19:47 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.2.ebuild,v 1.4 2013/08/13 17:05:39 axs Exp $
 
 EAPI="5"
 
@@ -207,6 +207,14 @@ pkg_postinst()
 
 	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
 		udevadm hwdb --update --root="${ROOT%/}"
+
+                # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		# reload database after it has be rebuilt, but only if we are not upgrading
+		# also pass if we are -9999 since who knows what hwdb related changes there might be
+		if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \
+		[[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
+			udevadm control --reload
+                fi
 	fi
 
 	ewarn
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index c35ca9350661..bbc50eb304a0 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.37 2013/08/08 19:47:52 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.38 2013/08/13 17:05:39 axs Exp $
 
 EAPI="5"
 
@@ -60,7 +60,6 @@ PDEPEND=">=virtual/udev-180
 	openrc? ( >=sys-fs/udev-init-scripts-18 )"
 
 REQUIRED_USE="keymap? ( hwdb )"
-DOCS=""
 
 pkg_pretend()
 {
@@ -244,7 +243,17 @@ pkg_postinst()
 		einfo "Removed unneeded file 64-device-mapper.rules"
 	fi
 
-	use hwdb && udevadm hwdb --update --root="${ROOT%/}"
+	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
+		udevadm hwdb --update --root="${ROOT%/}"
+
+		# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		# reload database after it has be rebuilt, but only if we are not upgrading
+		# also pass if we are -9999 since who knows what hwdb related changes there might be
+		if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \
+		[[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
+			udevadm control --reload
+		fi
+	fi
 
 	ewarn
 	ewarn "You need to restart eudev as soon as possible to make the"