Dependency fixups by Samuli Suominen to address bug #492446. Removed non-stable 1.2 ebuild.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

5 files changed, 25 insertions, 20 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index c624ac4671bf..2572c98c715e 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.74 2013/11/24 14:35:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.75 2013/11/25 09:38:20 chainsaw Exp $
+
+  25 Nov 2013; Tony Vroon <chainsaw@gentoo.org> eudev-1.1.ebuild,
+  eudev-1.3.ebuild, eudev-9999.ebuild:
+  Dependency fixups by Samuli Suominen to address bug #492446. Removed
+  non-stable 1.2 ebuild.
 
   24 Nov 2013; Pacho Ramos <pacho@gentoo.org> eudev-1.3.ebuild:
   amd64 stable, bug #487238
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 20b31f34823e..d7efa7d6c289 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -9,17 +9,18 @@ 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
 DIST eudev-1.3.tar.gz 1679385 SHA256 6f1f0b15971a53c7070a44c902c7c1303f952927aa6370dbdf4d84d8bc09fac2 SHA512 5e0016fbe15eebfa68bb04fa7b5aedd7edc7a508afdc030adb7cbec4e9eca84fe16119ca73f5724ec290ad4bba179b42d2d0bc56f3aaf2a07e3c48b18374b3b3 WHIRLPOOL db748742f9149b7a232b0d630a8734e81fb1077ed581fcde88f57f299b6746bcadec0bdd9e7ad914dae848ace9199c7d664006003dc4999af3bfa1e14099f366
-EBUILD eudev-1.1.ebuild 6451 SHA256 12a1bbcf6871eaec25bd0d7cf3594254408f9c23fb9a8647a3bb82c8f5df8597 SHA512 41f3500650ad55c8089b7b5594afa366b404c3096a8532247aa8b36803fbd10b90d76766342d3a2ebb7719844511d78e93f3af1ba34129f411122d627f81e9cd WHIRLPOOL 3ebd9e705f908ad88d31e670db59c81c2f1a00987bf40fd681ae9eda56912927143cde168ca9be3327979be914ce79129e4ea29471512e49f432c985fa6f1821
+EBUILD eudev-1.1.ebuild 6434 SHA256 f6eaaf64edf99572d87aa03f54075bea39183f6d260c001de957bb2690c8ed63 SHA512 581b18b45a284a337dba5bc6c8937ff45395f2a908322b11e88300a11f5e4cc73756632ba6284ca2d628ff66e2a5400933fa48072b422263a95d94316b478f95 WHIRLPOOL 4f55aeab3c9c88f3f4b998923a3eb748adf8246dc3902b6ac1b37c842a7cea54f973eecfc9bbf5fe838f51a0f4a2176c9dc3d61bc6ebb388fbc4d4a93c897b2a
 EBUILD eudev-1.2-r1.ebuild 7801 SHA256 4220e13210af89c03884173a35f0d20454ef256596c0eb7e3eb3b0e20d1d03ae SHA512 f775b977e4e420db04cbe2e20078976e13edcdaa71b96351758b0582f0a9e8eef7b7fa837c2e7000171107660f135c72999efe74aecd6daf0f7ad455e14e5f39 WHIRLPOOL b10718c4ba3da353e1bf2af9675c3bac34412fc95c09d2de74ae6d89f9b4140cc2be83e885ee95d97642029c4a7cb695d160412bd4fdbf481ac0dd146e503b3e
 EBUILD eudev-1.2.ebuild 6849 SHA256 77bf1bcd38a4002ee62a38627f2c2b475adce54bd68e7737561b921f4f0e8eac SHA512 3ee89e9de53a2fe7c6018581ee647e82ac898e187e7f3c486951ec5f1f575d39bbc28f08c087291266d1e638161c38f8be10c33e742ef8aea4fb694dc32aa46a WHIRLPOOL e46d4180af1783c6ba67a0e10f88f1d555a0890bb021484bd63a3b7103845c2ba03122e401bcc600a7fb1219b590714bddeab8cdedae68886706ee3eadfa5cec
-EBUILD eudev-1.3.ebuild 7889 SHA256 f15a44f3ac4770544cc59e15327a40c12702bed2570014934dd3fc7c7d8f104b SHA512 2562060d0a49593070ac659479063ac4e2745e738b54906e4c9557cf288317b6f75d7ab54e83b2b8f3c65c759fd4cb3351025f118b9dd8260ca789545d9f8055 WHIRLPOOL c63ff071092862701031bdd0847940d54dd8fd1282b267306808d9118dd6b3737d61ec8d481b9aba804f69d3c3e93d0d16dc019153b770dc62bb72a2e969659d
-EBUILD eudev-9999.ebuild 7839 SHA256 bc03fae8d39129dbaca9b52beeafe9c176c32e09ed8d3adacdabb8bafbc67cd4 SHA512 1f94ea693c01411768cef16181da43439713ebb2355070960f7032e82096d765a0db04194c69c67e1f370dda92310400fa0e8fa448449278eb17acecdf0b71e9 WHIRLPOOL b7c3540e79d598e5b520c72a702b029c5a0cfe38bcc6a7834659afaf234675469e590f3a75d688cc26afc80474c787968b84cd218ab589c46a3870ae738648eb
-MISC ChangeLog 11499 SHA256 a4685d2b4a385c01190d3362da2898c1d90569e4e30f9b2b92c371a0e86d2ff7 SHA512 86e7a8bc9a74603c1b5068a2a23dd678ffcffb70b167fe41dff451a45ed8d522b75bc17f218c56251c2ae746f1e2286983c51d906955a9a04d3ac5baef46afe6 WHIRLPOOL 16997b2b95649e696ad438d80cb8b67255879b35491aeceb4995decd1afef71d2faf24b7f71876d7380138f4b07b0175a1c633e95d0a7fad5f6bd67e5ffc3c9c
+EBUILD eudev-1.3.ebuild 7896 SHA256 6811692f96f8d7bf6ee2908e47bc8aa8a361338e1cd6d4942bb8fecffb12c99e SHA512 cca2ea40db87c6ae38483f63ae3522fa88fb9e14c6f54bdfa57588092bd38f56d5d5060a08c273ff23090e29500df1b306f2056eb7f4f37688ced6279d65606a WHIRLPOOL 03ec56aa77bd3acbc537144e06f8a09465dbc07f1ddb1a56938e8561e7d90bb810c51c24ad8c05fb5e72399ccd233becd7d110ec3a125486d550b8828545fc71
+EBUILD eudev-9999.ebuild 7845 SHA256 b938fd05142f9d5e185c37aa3b81868a947f0d4f69450c1c2861981d6ba95641 SHA512 ca83e0391c4f96bf1c82bd81522970a1ba11426d55674b9315884e03813fbfa651cd06118ab8837f7609394cb28866efebf073074eb9f78d71574061982dc413 WHIRLPOOL 681f2ef4f53a68668f1bb175d7900729f2259c17d8144655250845954db38c3abbf58cc4ccfd39657858a190a44c359bac52c5528a2b4efecc34de9ffe240bb7
+MISC ChangeLog 11704 SHA256 9dedcfbb37cb993cab0cd6a59db135b1d7dbdc73f21d4e6807072e41fdfd3203 SHA512 599828312a787c083ed54ebac6c6ac6c87f9a03d484ca4cdd67bd36cf9347d1eb4710921d7440d45c30b7211a05c0877384e15e1bc9bf8df007d9cb889e41ebf WHIRLPOOL fccdb7ea28c315077791e5e3aab49413564c0b68448a83b64e5569973dbd484a327cfafbf6c42e9b90c8736d5ec3199cc7e71b1a88ba041b189e83875d4293d4
+MISC eudev-9999.ebuild.orig 7839 SHA256 bc03fae8d39129dbaca9b52beeafe9c176c32e09ed8d3adacdabb8bafbc67cd4 SHA512 1f94ea693c01411768cef16181da43439713ebb2355070960f7032e82096d765a0db04194c69c67e1f370dda92310400fa0e8fa448449278eb17acecdf0b71e9 WHIRLPOOL b7c3540e79d598e5b520c72a702b029c5a0cfe38bcc6a7834659afaf234675469e590f3a75d688cc26afc80474c787968b84cd218ab589c46a3870ae738648eb
 MISC metadata.xml 956 SHA256 2dc374ed7a7236fc2044a93429e8ff9ce68474f5fce8961aff1209914d4bdbcd SHA512 e164394dee8fbd2afb6258fac4899b24607bbde5ec1e1d3cba51059a11768a653e2d841fecad902da0f85cdc579b3e8e2ea64e94d107a448fd1fdcf8362db4d9 WHIRLPOOL c6d492ca4498e509c8e04aead71a89b4481e8294c661968bdc7ca3081bfe116dd486f5676c3dfe08f5c43658a9f37d1fcb815c9378301a8c385852f83ea27544
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKSDrsACgkQCaWpQKGI+9TFsgCaA4ZJ+FwTyVXXX2EyqeMBgXKV
-B/oAn0f60R28VzTxnMYEA4abY9FnJ9wM
-=26hb
+iEYEAREIAAYFAlKTGoYACgkQp5vW4rUFj5rxYgCgkwcyCjD20tZnUynaz903GvZ6
+ph8AoLvdo2jhp2JaLxxTh4nJbotaHP7S
+=0V71
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-1.1.ebuild b/sys-fs/eudev/eudev-1.1.ebuild
index 410966996315..d26059d7f839 100644
--- a/sys-fs/eudev/eudev-1.1.ebuild
+++ b/sys-fs/eudev/eudev-1.1.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.1.ebuild,v 1.13 2013/09/03 13:35:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.1.ebuild,v 1.14 2013/11/25 09:38:20 chainsaw Exp $
 
 EAPI="5"
 
@@ -43,7 +43,6 @@ DEPEND="${COMMON_DEPEND}
 	test? ( app-text/tree dev-lang/perl )"
 
 RDEPEND="${COMMON_DEPEND}
-	hwdb? ( >=sys-apps/hwids-20121202.2[udev] )
 	!sys-fs/udev
 	!sys-apps/coldplug
 	!sys-apps/systemd
@@ -51,8 +50,8 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-fs/device-mapper
 	!<sys-fs/udev-init-scripts-18"
 
-PDEPEND=">=virtual/udev-180
-	<virtual/udev-206
+PDEPEND="hwdb? ( <sys-apps/hwids-20130915[udev] )
+	>=virtual/udev-180
 	openrc? ( >=sys-fs/udev-init-scripts-18 )"
 
 pkg_pretend()
diff --git a/sys-fs/eudev/eudev-1.3.ebuild b/sys-fs/eudev/eudev-1.3.ebuild
index c8ca2c3466be..8eb0aab9d821 100644
--- a/sys-fs/eudev/eudev-1.3.ebuild
+++ b/sys-fs/eudev/eudev-1.3.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.3.ebuild,v 1.5 2013/11/24 14:35:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.3.ebuild,v 1.6 2013/11/25 09:38:20 chainsaw Exp $
 
 EAPI="5"
 
@@ -47,8 +47,6 @@ DEPEND="${COMMON_DEPEND}
 	test? ( app-text/tree dev-lang/perl )"
 
 RDEPEND="${COMMON_DEPEND}
-	hwdb? ( >=sys-apps/hwids-20121202.2[udev] )
-	keymap? ( >=sys-apps/hwids-20130717-r1[udev] )
 	!sys-fs/udev
 	!sys-apps/coldplug
 	!sys-apps/systemd
@@ -56,7 +54,9 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-fs/device-mapper
 	!<sys-fs/udev-init-scripts-18"
 
-PDEPEND=">=virtual/udev-180
+PDEPEND="hwdb? ( >=sys-apps/hwids-20130717-r1[udev] )
+	keymap? ( >=sys-apps/hwids-20130717-r1[udev] )
+	>=virtual/udev-206-r2
 	openrc? ( >=sys-fs/udev-init-scripts-18 )"
 
 REQUIRED_USE="keymap? ( hwdb )"
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index bbc50eb304a0..a06586c2143b 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.38 2013/08/13 17:05:39 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.39 2013/11/25 09:38:20 chainsaw Exp $
 
 EAPI="5"
 
@@ -47,8 +47,6 @@ DEPEND="${COMMON_DEPEND}
 	test? ( app-text/tree dev-lang/perl )"
 
 RDEPEND="${COMMON_DEPEND}
-	hwdb? ( >=sys-apps/hwids-20121202.2[udev] )
-	keymap? ( >=sys-apps/hwids-20130717-r1[udev] )
 	!sys-fs/udev
 	!sys-apps/coldplug
 	!sys-apps/systemd
@@ -56,7 +54,9 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-fs/device-mapper
 	!<sys-fs/udev-init-scripts-18"
 
-PDEPEND=">=virtual/udev-180
+PDEPEND="hwdb? ( >=sys-apps/hwids-20130717-r1[udev] )
+	keymap? ( >=sys-apps/hwids-20130717-r1[udev] )
+	>=virtual/udev-180
 	openrc? ( >=sys-fs/udev-init-scripts-18 )"
 
 REQUIRED_USE="keymap? ( hwdb )"