Fixes for bug #554408

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x30C46538

3 files changed, 21 insertions, 59 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 27d5e5425fdf..366975530365 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1116 2015/07/09 03:53:58 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1117 2015/07/10 16:43:44 williamh Exp $
+
+  10 Jul 2015; William Hubbs <williamh@gentoo.org> udev-222.ebuild:
+  Fixes for bug #554408
 
 *udev-222 (09 Jul 2015)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 38b2df6836a6..946d423a610f 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -23,9 +23,9 @@ EBUILD udev-219.ebuild 15662 SHA256 0fdad8ed3fcc5042e16767be2517f6ba3f557a540ea1
 EBUILD udev-220-r1.ebuild 15793 SHA256 8fb809d0861408b956bd9376ed3c3ae5aa114933c8b41d3df0b2a51d1c83eb36 SHA512 b1fbafa1196c55a5da852fbe10155831633f75c440d7fe8e30d2429fe8361ad9413de639d6176e1659784163159ba30a4aed2af1afbce8a7271e7221ce2e36ee WHIRLPOOL 9d8091d3cae1d40db088703c8663c603fd9e02b43338f44d0f366576f52d155f85130abf9e28964a9b5cbc8a3106b115b26d644430f5a85420e413c2406f70fc
 EBUILD udev-220-r2.ebuild 15794 SHA256 4c3e0804ad6cd3faec252f9b1d1b55724ebd791b6832ca73670d8e10bbb2ae96 SHA512 1cfbc253411a9a16e24bdfce6e652ad48656976248797c3096a6f69df7af0e9c341024d61ee893b63255d35d2d1fc324d6c0da7d0a0b0d785b443a13dd2b46ab WHIRLPOOL 14a6c7742b152af3adaa2a8c070d3750be6372c1a3a68f292372711bd43a8a352531e787c8754bc8eea4c5633e444677c757f9e0123c93361bba7f61bcee95a1
 EBUILD udev-220-r3.ebuild 15794 SHA256 2fb0aaf8da8c887308de3fd121418557ca9fa52a2d991830f89c3b41954a9f05 SHA512 9b4ce896300ab7be9cf0f80ccefa2a80448ac2fc24a3d286cc1bc9fb9b6cecd6412dc1df23cde4bbbf796cc363fbe83972cf47c1b060481af436fe3d91b6e4b0 WHIRLPOOL 70c4e170873c65b76fcef8d2f17ec37e2e20e92769bba357ba76619a92d26b1f42fcb49ab875574943cb36dbe697f7fb94a1da6f48156fb9a15f7328c4ce3acb
-EBUILD udev-222.ebuild 14719 SHA256 f07b888bbd8fca5c8873df35d496eacdf4571b3788544a820bf9f477b9d5f617 SHA512 3d206dbea823ac88e5cce3a10afee7832b035e03554fa72e66bd6a9a4e844877618aa25a19236c928c1629ca38c29b2c7670b7cc4345659b4ce32d1a4c3b1c59 WHIRLPOOL 310d3e7882f9b9a6211056267601a5a2ccc80e9f77c4412bd1b277c6115be4976ae4e54c884974cf50591edcc3ca6b038aa612ae9ad4325fe68ceb6ae9e88113
+EBUILD udev-222.ebuild 13695 SHA256 7ce619929a44b0e15835aac78856f5576a3354808dea1069d2c395a6010862fa SHA512 5b00629c467f37105ce86aafc7b341bbf22cbbfbfa88031ab71dcb14bf10247e37a0bfdb0c2d0fa7fbe1e4a11990687356f62cbfdbe6166bd4cb54cad297d3e9 WHIRLPOOL 79a62953cb2818646b4795d1f47fc7edcde028737eead0e6665948fb6ffadb8eb7839b63fc36ef4646011414871ec368cdc4a3234bb5c9ba51b3d4988a06ef80
 EBUILD udev-9999.ebuild 14722 SHA256 5d04f10c1f8a2abb6593a22f12776ae0eb02b8a7278e899a2822c3ba87f1215d SHA512 4c3763227a60d15655230e4b85cd54242bb22e5dec1ac26700e1a609c13eadd8c0ba5ab3825e5c3a0e17ebfa62e021bf42d253940bb83a744a5286e7c825a4d4 WHIRLPOOL 826a23642758b4a15fac749cd507ff6f06cc547b5d0c212c09656d640973d179a103ce8ac85a4ac06c0aabd94e727976213cc4e1a5bb8ab8080586813fedfada
-MISC ChangeLog 62079 SHA256 0c65f44817d537aa8617e6c1db1acb64d63f1183f08ddc629759ee7a8879fcd2 SHA512 033d64d1dc73afce5772b375926177993588af7e0282f93ac2b0760cf73cd76a4a4f6ce4a879305f1e3d63179092ff8ff471004f95cae2ff4b297e754f04543d WHIRLPOOL 3e619ecbdcd5547a345b24a377bcf72336bc919b8ab2fc667d894f628d207294a5b9c124c418c9d70763ea07dde42efcd064faa54440bbe522873d580065f1e1
+MISC ChangeLog 62172 SHA256 28017030e75332e9bbc5add4aa8bd15af04c5b425985e1f6550a4b95fe9cc35a SHA512 c3b2fb6a70e8c60983f3803434d571779a075cd47ee4ee5f76fd3838c18f94d359a14ddb8d8fab6ab4ec3f6480c88fa120289d4edd92b67ea65e54facc58a599 WHIRLPOOL 59d3b75074851c4bf9395062c87106835cd1835e5da8e45b728fa0dfd248ddabfc84b588a59e46b7a124f3a90c2ec5f8b623900a76c116359e29cb44e5f70a77
 MISC ChangeLog-2009 105929 SHA256 94137298457e8d6361cf25e664279d2f9b424f6758814e7ba90e9e2cbf1ea7e5 SHA512 f110e1aa70b11c28263ec5e88973c99426717bce62400c8e9ad860b9e7b67d4aadc053596a9e54faa9435a774c1e8aa0954ae8541760cf061beef26867871548 WHIRLPOOL 215252c0a5c249241813d1bb208da62e68c858e07d1df327cf9175ac739f214813a33c09a64afb4821445e93394dd6d6d500b33e35ed912c1eeccff3365cb7fb
 MISC ChangeLog-2010 10729 SHA256 44fe328d57b1ba342b328c7a256632e7960976a12e8e9c9791a5fc8ce52c67ca SHA512 a8c371aafe757923e24c023cbf55f3ad084f15f0f038eceaee0dffe58919a17b17bc16cb4b7b1d3f65a19c82b20330a854ec2c801f6d7c7799723ab92d255b49 WHIRLPOOL 3d34e758def921d3d2ed7369392ba5f833fc3a899181c2895fd3da6c9846cf41c9eddbf56de60a52fadd76ffd4c66d92b660b0bc6ca4dddbb2fa49fe0f93cb0b
 MISC ChangeLog-2011 11721 SHA256 363429a267f251b1ac1c34479e7afa5d7ea13811aa1ba46d7c5489860e542276 SHA512 be7bbaa68602c30ba9cb3e5037ee91ff94c35a0c2ff0b96c5eee14c0e81f8e52232bae44f1d01ff23acedabdb03fdc78f3d11a40cfed2cfef1c45fe2492f7bf4 WHIRLPOOL 3e85eb967f26a8224fd0ed5824009c62271fa5269a6a207da8c8abd7b09cc4308ff847021afcae5a86cedd723a5aeca1ce2f6712a187dfbd36118e097d74510f
@@ -34,7 +34,7 @@ MISC metadata.xml 610 SHA256 5483522dfe99f75e0f48a38a03338037f8229e8dbdb4b94aaa6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWd9CsACgkQblQW9DDEZTg1/QCZAZNMG1yRbu2YLKZJ5DVoDeLx
-wAMAn3NCDh+q7E7eOduJQoc59hTeTqBN
-=R18b
+iEYEAREIAAYFAlWf9kEACgkQblQW9DDEZTgjJwCdGBs9I7jx01KlfFRRZUmmH+Mh
+z+wAn09DDlIVi9LwLYzihb6McDJnZzps
+=50z7
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-222.ebuild b/sys-fs/udev/udev-222.ebuild
index b9be61bac639..c51f81bc92ff 100644
--- a/sys-fs/udev/udev-222.ebuild
+++ b/sys-fs/udev/udev-222.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-222.ebuild,v 1.2 2015/07/09 04:10:18 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-222.ebuild,v 1.3 2015/07/10 16:43:44 williamh Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
-IUSE="acl doc +kmod selinux static-libs"
+IUSE="acl +kmod selinux static-libs"
 
 RESTRICT="test"
 
@@ -103,7 +103,7 @@ pkg_setup() {
 src_prepare() {
 	if ! [[ ${PV} = 9999* ]]; then
 		# secure_getenv() disable for non-glibc systems wrt bug #443030
-		if ! [[ $(grep -r secure_getenv * | wc -l) -eq 28 ]]; then
+		if ! [[ $(grep -r secure_getenv * | wc -l) -eq 25 ]]; then
 			eerror "The line count for secure_getenv() failed, see bug #443030"
 			die
 		fi
@@ -159,7 +159,6 @@ multilib_src_configure() {
 		--docdir=/usr/share/doc/${PF}
 		$(multilib_native_use_enable static-libs static)
 		--disable-nls
-		$(multilib_native_use_enable doc gtk-doc)
 		--disable-python-devel
 		--disable-dbus
 		$(multilib_native_use_enable kmod)
@@ -185,7 +184,6 @@ multilib_src_configure() {
 		--disable-myhostname
 		$(multilib_is_native_abi || echo "--disable-manpages")
 		--enable-split-usr
-		--with-html-dir=/usr/share/doc/${PF}/html
 		--without-python
 		--with-bashcompletiondir="$(get_bashcompdir)"
 		--with-rootprefix=
@@ -198,9 +196,6 @@ multilib_src_configure() {
 		)
 	fi
 
-	# Use pregenerated copies when possible wrt #480924
-	[[ ${PV} = 9999* ]] || econf_args+=( --disable-manpages )
-
 	ECONF_SOURCE=${S} econf "${econf_args[@]}"
 }
 
@@ -228,25 +223,18 @@ multilib_src_compile() {
 			collect
 			scsi_id
 			v4l_id
-			accelerometer
 			mtd_probe
 		)
 		emake "${helper_targets[@]}"
 
-		if [[ ${PV} = 9999* ]]; then
-			local man_targets=(
-				man/udev.conf.5
-				man/systemd.link.5
-				man/udev.7
-				man/systemd-udevd.service.8
-				man/udevadm.8
-			)
-			emake "${man_targets[@]}"
-		fi
-
-		if use doc; then
-			emake -C docs/libudev
-		fi
+		local man_targets=(
+			man/udev.conf.5
+			man/systemd.link.5
+			man/udev.7
+			man/systemd-udevd.service.8
+			man/udevadm.8
+		)
+		emake "${man_targets[@]}"
 	else
 		local lib_targets=( libudev.la )
 		emake "${lib_targets[@]}"
@@ -266,10 +254,8 @@ multilib_src_install() {
 			install-udevlibexecPROGRAMS
 			install-dist_udevconfDATA
 			install-dist_udevrulesDATA
-			install-girDATA
 			install-pkgconfiglibDATA
 			install-pkgconfigdataDATA
-			install-typelibsDATA
 			install-dist_docDATA
 			libudev-install-hook
 			install-directories-hook
@@ -291,16 +277,7 @@ multilib_src_install() {
 			dist_network_DATA="network/99-default.link"
 		)
 		emake -j1 DESTDIR="${D}" "${targets[@]}"
-
-		if use doc; then
-			emake -C docs/libudev DESTDIR="${D}" install
-		fi
-
-		if [[ ${PV} = 9999* ]]; then
-			doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8}
-		else
-			doman "${S}"/man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8}
-		fi
+		doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8}
 	else
 		local lib_LTLIBRARIES="libudev.la" \
 			pkgconfiglib_DATA="src/libudev/libudev.pc" \
@@ -336,24 +313,6 @@ multilib_src_install_all() {
 	# maintainer note: by not letting the upstream build-sys create the .so
 	# link, you also avoid a parallel make problem
 	mv "${D}"/usr/share/man/man8/systemd-udevd{.service,}.8
-
-	if ! [[ ${PV} = 9999* ]]; then
-		insinto /usr/share/doc/${PF}/html/libudev
-		doins "${S}"/docs/libudev/html/*
-	fi
-}
-
-pkg_preinst() {
-	local htmldir
-	for htmldir in libudev; do
-		if [[ -d ${ROOT%/}/usr/share/gtk-doc/html/${htmldir} ]]; then
-			rm -rf "${ROOT%/}"/usr/share/gtk-doc/html/${htmldir}
-		fi
-		if [[ -d ${D}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-			dosym ../../doc/${PF}/html/${htmldir} \
-				/usr/share/gtk-doc/html/${htmldir}
-		fi
-	done
 }
 
 pkg_postinst() {