fixed module loading when USE=-kmod but kmod is installed; put keymap files back in lib/udev

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

4 files changed, 69 insertions, 19 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index 92bc4ede2b0d..5e3b74cdcf55 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/eudev
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.11 2012/12/20 00:10:08 ryao Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.12 2013/01/04 21:48:47 axs Exp $
+
+*eudev-1_beta1-r2 (04 Jan 2013)
+
+  04 Jan 2013; Ian Stakenvicius <axs@gentoo.org> -eudev-1_beta1-r1.ebuild,
+  +eudev-1_beta1-r2.ebuild, +files/eudev-1_beta1-fix-modprobe-call.patch:
+  fixed module loading when USE=-kmod but kmod is installed; put keymap files
+  back in lib/udev
 
 *eudev-0-r1 (20 Dec 2012)
 
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index f6ac08620194..a436395f1d4c 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 40-gentoo.rules 349 SHA256 5d618b899475925ceccc330b6a738644aedd582d039f0cc404502637351347ea SHA512 b8d90037c08f30c9fb9e22a43c59a3627c218313b0421d4b70feba1731cda76ddc4ee6bdb99dca8df61e11f8d656a8769e172f0a584d7620213973dacfbbb4aa WHIRLPOOL a4086cd5f0e8849369389aa29ec42f5d906b00e3d650724d38ff8b4df4e36de7d3a37393b14f2f30a7102d6f2859b6847b5f4b7813be12d945ce1515494ce120
+AUX eudev-1_beta1-fix-modprobe-call.patch 900 SHA256 66925f1969e20673b19f7a8c96e9f65ecd8913e4a699dae561f91600ff8d590a SHA512 371ce3305c3b2eeb35a4947276b011b4146038e51653cb8c6b7e09db7792de68a8328db2cadd7cce76da642c30ca6c8adf8650b17ada3855358494fe34876994 WHIRLPOOL eb35ad870f9ce15564109370c0435472feaa0992617a2b71f4533fd7bfeefb25f336cc449922758abe832618e94474757a197402d1008cb0d049b7ab2fdff5b6
 AUX eudev-1_beta1-include-all-search-paths.patch 2551 SHA256 5f8d08e8d3a3ac3f900e1088b25c84b834fedfaa2356dd8dfbdd3dde99d37297 SHA512 eed48e8c17ebc6d5be65017035ff934ee333b432622ee23e7b5295b38ef02d5357c0dafffb7b150256cb285f73e3d03a47b9f1eb77ebcc2eac06d88cf372cf9d WHIRLPOOL fea8533361abbf919c0ab3efc06e418fde1dfaeca4bafa11ca1306fd484702c82d099742e6b9113c11bd073868cc09ea049466fa0f7705e032b552c337032cc7
 DIST eudev-1_beta1.tar.gz 1626318 SHA256 efd18e20cfef4733ba2922dd3160309faa53685f1c39f03a0c672db2ffc2124d SHA512 e0417a286f12126725c7c2d1592d627271ce0fcaaeb1921071a545a609c27d64f6fb9c2311718528a2620d429eb2260dd9034be06b87e8ab1f77e3ef52c4f863 WHIRLPOOL 2df34e93a4c1b6a28dfd3dcb411d26a0d33979d32d71a3ff1f78d29b6701ff9a21cc73dddfe37fa9a9f522ef7b9ae2e0851b8deb9b04ef25253b715637869bf2
 DIST udev-171-gentoo-patchset-v1.tar.bz2 796 SHA256 9524e64068d67bb55ddad16dd36a27c3ef87323421254a5bfe2431693b1bc983 SHA512 d2eef776c3cc331b5df339e865838b67b70da01e10fa75c5cb0d45cff388adfa6af4dd36677eb05cee9936331445afadcd4158ed7d96f3499ce93d6ee1e3feb6 WHIRLPOOL d1451d2002263db7bd30baa2d126fcb3ffff6a4b310f8ebfea755760b3afbd3a76ab2aa0d16e1a88cff13567a153155720c4c16c1d4624dd2a4405b29dbb3997
@@ -9,7 +13,14 @@ DIST udev-gentoo-legacy-patchset-2.tar.bz2 14282 SHA256 bb2aefa50c3cc6df8cc88903
 DIST udev-gentoo-scripts-7.1.tar.bz2 16257 SHA256 1923768a98b7f00ffdc9bdf5a2c9982c494b978903ec891184d6fa0d10090fb4 SHA512 663fdd750b3f1e52a4c7639d0692290cdda9d202d4408e8aba9bfd38aaccfaa0acb79e303e98872b721cf109c62ac46921785cb5a373cc6ad8b428d0f5192836 WHIRLPOOL 49b600b034f8a6ad5e0ae6ca769971f1bb517fa0b9e31a0a7d0430ae67cf21bf4ab1db981d3eaaf78819d1e75a24a1f101eeb737448763b2990e38da912636be
 EBUILD eudev-0-r1.ebuild 16531 SHA256 9cbeb4b89ece37af2d367928b7aea72d7939891a5da21ef88e8b891acfb42a54 SHA512 316ee19e07c379d529cb618b2f873b42d869b0d0000d88b91d0ee0e86b1ef17a1b1304895fb2135fc7d83f27c9c44a2732853ad89ef118880250e1c0c974496a WHIRLPOOL 365537922f47039c3a0131254ce5a4ae8b0115524701c605abb5dbd4ac1622f7aceff97cda2a9828e8f8f9a9f94956bfc29a064c13a89a73faca7e0e663d4ded
 EBUILD eudev-0.ebuild 16515 SHA256 c21c539926e58f661c9a361e28f382241c307da6a9f7547b036832ecfd14ad1e SHA512 f970f2fceaa5d2282eed73b91764acd147cdf6642ba7b76b12aee21b987c2d21c9d917f05fadb161531c925d2033232373c8066ad3c038dba84e0bd76c9c6824 WHIRLPOOL 46675578afc6ffe407030ea5a10cb0a80dfbc9ad1e3c1bf40ebdfba2a3dd598cf04e00110393471e0d17af1639bb66ec9d78a2d7e90eeec0049013cf6d969449
-EBUILD eudev-1_beta1-r1.ebuild 5887 SHA256 18d5ace4250429c782b6aa9295b196deb95de79ff0ae33ec2ecdc1d530f3f300 SHA512 e654ce3654d3084f83741fb02a726896fb5b08617914857db53a1c14ec6b7485f2c4240da9bfa034b7ef9fd2a67b0d27d965bf57173d5a4ab86257743dbb7deb WHIRLPOOL bc907d76f66e520574b897cac6235e2506bec45efeb26e0d4fcf18f380ff1573d605fc66c5db5e65c7f8848e418ebcd0a6f831277a6624a4705189d73503e2b7
+EBUILD eudev-1_beta1-r2.ebuild 6126 SHA256 cf7fab923c4e2329e23244919c6784e8c19bac282a87cf2dacf5e4bd919a5542 SHA512 37e734368e6dcbda2e3ffe1ef671cc4941fdc687ec66a9ee2b9723541b2030c5ffd74dbba73cd9171c7f5e04139569cc5174327a4e414f2ec2b3d73543a3bbd0 WHIRLPOOL 40babe0d111d70facaecb2718ae4e6b5b9d1a01f34678c9416f393cbade94e51b94100458a77def7386fb109ceda0ea4569240c8b28837f9a0acba211ddc9e61
 EBUILD eudev-9999.ebuild 5802 SHA256 114a568bf47f475c2d64562288179018a2920def8958d60f2cb19274c8542599 SHA512 a50ce43526679ef8ef4f5533a4084b28f1fd72ce74c88baca2af68b5bc8cc85cda66555c6041451ab6d79a2a57b27bae52c209a7234ae5b38b983de666ec78c9 WHIRLPOOL 32e807acc65ca0caed16d0704d794ae474d7ce87889f4723efc1fd554ec8cfd7a472998ea882f50bc0fb31427e0df126168f8939329ac5b36762d59b134485e1
-MISC ChangeLog 1960 SHA256 1ca295808cb7f862396ad97a71192948bb12f12e6ff0e079d6719f941b34b58b SHA512 b974fc3b6b6fb73ccd3e0ca315a3d56f86038f7b915e7ba8631930e7e59e69a8d4733f614233d3fd68f5711942aafd30dd3d7e279b419dc91736bce45fce08f9 WHIRLPOOL 25d8dcbd541722013679dd5b38082930e717a966c23d3b55d0e1d14e1ec8d63ce93bedc80bc567af8ebc98edd0d1a4befc7d24401414dbce52b274359fb9722d
+MISC ChangeLog 2239 SHA256 c88f15138526f2957eb2835a0afed6426aaf865823bd17b569809a0d3e55b782 SHA512 64038387cbc3b4f8e7c290e876520891abdffa090f6e59b7e962ff3c564785bf118a32e8968e2da5c9c699f5db6014432b833a34402d3b5af19e0e3357c5217c WHIRLPOOL f07e4bd1aca845c99ce2e64f4e956f41751d911fa74f05f50bbce821c0ec45b3179de6a2028e38bcf7ff98bc36db745abd2a5fd82b8db7d550071ede999d2d2d
 MISC metadata.xml 1835 SHA256 347aea2f4eba8edf6974908b8afe8414cc9b77ba086f9c963e621aee62f7977f SHA512 568222d8fe4387db0e6d01659a399f22b4d6fa1b0be8346c8b8c3627d118d39988af3bbda818cf955a8a7aafe81fa0d7cca5b47c5057b9b28058af8763ad0d23 WHIRLPOOL 4ba012f7df5f4d8c05cc282356d8533db4db21c83729819e0c80292b92bf3d956d7d98e08e32fcf55abd85e4562d93316f6195cbc1c89345c29ccf27932d5b74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlDnTlEACgkQ2ugaI38ACPAVEAD8DhS6yOtPFaz0CtfNl6aoEp20
+fQFchsh7w3oJgQhUATUA+gJNjutmOHV7+xdn6koa1fVzXvbqIFLwVfeUtDLnK11O
+=I2ub
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-1_beta1-r1.ebuild b/sys-fs/eudev/eudev-1_beta1-r2.ebuild
index 3ed60cb710d5..378492a026bd 100644
--- a/sys-fs/eudev/eudev-1_beta1-r1.ebuild
+++ b/sys-fs/eudev/eudev-1_beta1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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_beta1-r1.ebuild,v 1.4 2012/12/20 00:09:40 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1_beta1-r2.ebuild,v 1.1 2013/01/04 21:48:47 axs Exp $
 
 EAPI=4
 
@@ -27,6 +27,7 @@ IUSE="doc gudev hwdb kmod introspection keymap +modutils +openrc selinux static-
 RESTRICT="test"
 
 COMMON_DEPEND="gudev? ( dev-libs/glib:2 )
+	hwdb? ( sys-apps/hwids[udev(+)] )
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
 	selinux? ( sys-libs/libselinux )
 	>=sys-apps/util-linux-2.20
@@ -43,7 +44,6 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt"
 
 RDEPEND="${COMMON_DEPEND}
-	hwdb? ( sys-apps/hwids )
 	openrc? ( >=sys-fs/udev-init-scripts-18 )
 	!sys-fs/udev
 	!!<=sys-fs/udev-180
@@ -111,6 +111,7 @@ pkg_setup()
 src_prepare()
 {
 	epatch "${FILESDIR}"/${P}-include-all-search-paths.patch
+	epatch "${FILESDIR}"/${P}-fix-modprobe-call.patch
 
 	# change rules back to group uucp instead of dialout for now
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
@@ -143,11 +144,11 @@ src_configure()
 		DBUS_CFLAGS=' '
 		DBUS_LIBS=' '
 		--with-rootprefix="${EROOT}"
-		--docdir="${EROOT}/usr/share/doc/${PF}"
-		--libdir="${EROOT}/usr/$(get_libdir)"
-		--with-firmware-path="${EROOT}/usr/lib/firmware/updates:${EROOT}/usr/lib/firmware:${EROOT}/lib/firmware/updates:${EROOT}/lib/firmware"
-		--with-html-dir="${EROOT}/usr/share/doc/${PF}/html"
-		--with-rootlibdir="${EROOT}/$(get_libdir)"
+		--docdir="${EROOT}usr/share/doc/${PF}"
+		--libdir="${EROOT}usr/$(get_libdir)"
+		--with-firmware-path="${EROOT}usr/lib/firmware/updates:${EROOT}usr/lib/firmware:${EROOT}lib/firmware/updates:${EROOT}lib/firmware"
+		--with-html-dir="${EROOT}usr/share/doc/${PF}/html"
+		--with-rootlibdir="${EROOT}$(get_libdir)"
 		--exec-prefix="${EROOT}"
 		--enable-split-usr
 		$(use_enable doc gtk-doc)
@@ -169,6 +170,11 @@ src_install()
 	prune_libtool_files --all
 	rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
 
+	# place the keymaps in /$(libdir)/udev instead of /etc
+	# (fixed upstream but don't want to have to autoreconf)
+	use keymap && \
+	mv "${ED}"/etc/udev/keymaps "${ED}"/$(get_libdir)/udev/keymaps
+
 	# install gentoo-specific rules
 	insinto /usr/lib/udev/rules.d
 	doins "${FILESDIR}"/40-gentoo.rules
@@ -178,9 +184,9 @@ pkg_preinst()
 {
 	local htmldir
 	for htmldir in gudev libudev; do
-		if [[ -d ${EROOT}/usr/share/gtk-doc/html/${htmldir} ]]
+		if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]
 		then
-			rm -rf "${EROOT}"/usr/share/gtk-doc/html/${htmldir}
+			rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
 		fi
 		if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]
 		then
@@ -192,12 +198,12 @@ pkg_preinst()
 
 pkg_postinst()
 {
-	mkdir -p "${EROOT}"/run
+	mkdir -p "${EROOT}"run
 
 	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
 	# So try to remove it here (will only work if empty).
-	rmdir "${EROOT}"/dev/loop 2>/dev/null
-	if [[ -d ${EROOT}/dev/loop ]]
+	rmdir "${EROOT}"dev/loop 2>/dev/null
+	if [[ -d ${EROOT}dev/loop ]]
 	then
 		ewarn "Please make sure you remove /dev/loop,"
 		ewarn "else losetup may be confused when looking for unused devices."
@@ -205,10 +211,10 @@ pkg_postinst()
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007
-	if [[ -f ${EROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
+	if [[ -f ${EROOT}etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
-		rm -f "${EROOT}"/etc/udev/rules.d/64-device-mapper.rules
+		rm -f "${EROOT}"etc/udev/rules.d/64-device-mapper.rules
 		einfo "Removed unneeded file 64-device-mapper.rules"
 	fi
 
diff --git a/sys-fs/eudev/files/eudev-1_beta1-fix-modprobe-call.patch b/sys-fs/eudev/files/eudev-1_beta1-fix-modprobe-call.patch
new file mode 100644
index 000000000000..12bb57d242e7
--- /dev/null
+++ b/sys-fs/eudev/files/eudev-1_beta1-fix-modprobe-call.patch
@@ -0,0 +1,26 @@
+diff --git a/src/libudev/util.c b/src/libudev/util.c
+index d8c5bb2..92fd227 100644
+--- a/src/libudev/util.c
++++ b/src/libudev/util.c
+@@ -4312,7 +4312,7 @@ int execute_command(const char *command, char *const argv[])
+ 
+         if (pid == 0) {
+ 
+-                execv(command, argv);
++                execvp(command, argv);
+ 
+                 log_error("Failed to execute %s: %m", command);
+                 _exit(EXIT_FAILURE);
+diff --git a/src/udev/udev-builtin-kmod.c b/src/udev/udev-builtin-kmod.c
+index 89c7ab0..300090a 100644
+--- a/src/udev/udev-builtin-kmod.c
++++ b/src/udev/udev-builtin-kmod.c
+@@ -68,7 +68,7 @@ static int load_module(struct udev *udev, char *const alias)
+         kmod_module_unref_list(list);
+         return err;
+ #else
+-	char * const argv[] = { "-bq", alias, 0 };
++	char * const argv[] = { MODPROBE, "-bq", alias, 0 };
+ 	return execute_command(MODPROBE, argv);
+ #endif
+ }
\ No newline at end of file