williamh 15/07/10 16:43:44 Modified: udev-222.ebuild ChangeLog Log: Fixes for bug #554408 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538)
Revision Changes Path 1.3 sys-fs/udev/udev-222.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-222.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-222.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-222.ebuild?r1=1.2&r2=1.3 Index: udev-222.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-222.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- udev-222.ebuild 9 Jul 2015 04:10:18 -0000 1.2 +++ udev-222.ebuild 10 Jul 2015 16:43:44 -0000 1.3 @@ -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 @@ 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 @@ 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 @@ --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 @@ --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 @@ ) fi - # Use pregenerated copies when possible wrt #480924 - [[ ${PV} = 9999* ]] || econf_args+=( --disable-manpages ) - ECONF_SOURCE=${S} econf "${econf_args[@]}" } @@ -228,25 +223,18 @@ 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 @@ 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 @@ 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 @@ # 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() { 1.1117 sys-fs/udev/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.1117&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.1117&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.1116&r2=1.1117 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v retrieving revision 1.1116 retrieving revision 1.1117 diff -u -r1.1116 -r1.1117 --- ChangeLog 9 Jul 2015 03:53:58 -0000 1.1116 +++ ChangeLog 10 Jul 2015 16:43:44 -0000 1.1117 @@ -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 <willi...@gentoo.org> udev-222.ebuild: + Fixes for bug #554408 *udev-222 (09 Jul 2015)
