ssuominen 14/05/14 18:25:40 Modified: udev-9999.ebuild udev-212-r1.ebuild ChangeLog Log: Synchronize 212-r1 with 9999 for most part. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path 1.296 sys-fs/udev/udev-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.296&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.296&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.295&r2=1.296 Index: udev-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v retrieving revision 1.295 retrieving revision 1.296 diff -u -r1.295 -r1.296 --- udev-9999.ebuild 28 Apr 2014 17:54:55 -0000 1.295 +++ udev-9999.ebuild 14 May 2014 18:25:40 -0000 1.296 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.295 2014/04/28 17:54:55 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.296 2014/05/14 18:25:40 ssuominen Exp $ EAPI=5 @@ -9,6 +9,7 @@ if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd" inherit git-2 + patchset= else patchset= SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz"; @@ -42,13 +43,14 @@ !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" +# Force new make >= -r4 to skip some parallel build issues DEPEND="${COMMON_DEPEND} dev-util/gperf sys-libs/libcap virtual/os-headers virtual/pkgconfig - !<sys-devel/make-3.82-r4 - !<sys-kernel/linux-headers-2.6.32 + >=sys-devel/make-3.82-r4 + >=sys-kernel/linux-headers-2.6.32 doc? ( >=dev-util/gtk-doc-1.18 )" # Try with `emerge -C docbook-xml-dtd` to see the build failure without DTDs if [[ ${PV} = 9999* ]]; then 1.13 sys-fs/udev/udev-212-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-212-r1.ebuild?rev=1.13&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-212-r1.ebuild?rev=1.13&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-212-r1.ebuild?r1=1.12&r2=1.13 Index: udev-212-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-212-r1.ebuild,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- udev-212-r1.ebuild 14 May 2014 18:22:26 -0000 1.12 +++ udev-212-r1.ebuild 14 May 2014 18:25:40 -0000 1.13 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-212-r1.ebuild,v 1.12 2014/05/14 18:22:26 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-212-r1.ebuild,v 1.13 2014/05/14 18:25:40 ssuominen Exp $ EAPI=5 @@ -9,6 +9,7 @@ if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd" inherit git-2 + patchset= else patchset=1 SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz"; @@ -482,9 +483,7 @@ local net_rules_path="${ROOT%/}"/etc/udev/rules.d local net_name_slot="${net_rules_path}"/80-net-name-slot.rules local net_setup_link="${net_rules_path}"/80-net-setup-link.rules - if [[ -e ${net_setup_link} ]]; then - net_move=no - else + if [[ ! -e ${net_setup_link} ]]; then [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then net_move=yes 1.1031 sys-fs/udev/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.1031&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.1031&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.1030&r2=1.1031 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v retrieving revision 1.1030 retrieving revision 1.1031 diff -u -r1.1030 -r1.1031 --- ChangeLog 14 May 2014 18:22:26 -0000 1.1030 +++ ChangeLog 14 May 2014 18:25:40 -0000 1.1031 @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1030 2014/05/14 18:22:26 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1031 2014/05/14 18:25:40 ssuominen Exp $ + + 14 May 2014; Samuli Suominen <ssuomi...@gentoo.org> udev-212-r1.ebuild, + udev-9999.ebuild: + Synchronize 212-r1 with 9999 for most part. 14 May 2014; Samuli Suominen <ssuomi...@gentoo.org> udev-212-r1.ebuild: Flip sys-devel/make and sys-kernel/linux-headers blockers to DEPENDs to ensure
