From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7067D138632 for ; Wed, 23 Jan 2013 20:23:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F9C121C009; Wed, 23 Jan 2013 20:23:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C08EF21C009 for ; Wed, 23 Jan 2013 20:23:14 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8150333DA49 for ; Wed, 23 Jan 2013 20:23:13 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2166) id 4B5B62171D; Wed, 23 Jan 2013 20:23:12 +0000 (UTC) From: "Samuli Suominen (ssuominen)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ssuominen@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/udev: udev-197-r4.ebuild ChangeLog udev-197-r3.ebuild udev-9999.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: udev-197-r4.ebuild ChangeLog udev-197-r3.ebuild udev-9999.ebuild X-VCS-Directories: sys-fs/udev X-VCS-Committer: ssuominen X-VCS-Committer-Name: Samuli Suominen Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130123202312.4B5B62171D@flycatcher.gentoo.org> Date: Wed, 23 Jan 2013 20:23:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 51729c14-36b1-4f31-88b7-0651b57e4ad4 X-Archives-Hash: 16fabaf911d605c4ca9649d49c68451f ssuominen 13/01/23 20:23:12 Modified: udev-197-r4.ebuild ChangeLog udev-197-r3.ebuild udev-9999.ebuild Log: Don't use $FILESDIR in pkg_preinst() for binpkg support wrt #453726 by Fabio Erculiani (Portage version: 2.2.0_alpha155/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) Revision Changes Path 1.16 sys-fs/udev/udev-197-r4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild?rev=1.16&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild?rev=1.16&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild?r1=1.15&r2=1.16 Index: udev-197-r4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- udev-197-r4.ebuild 23 Jan 2013 11:14:36 -0000 1.15 +++ udev-197-r4.ebuild 23 Jan 2013 20:23:12 -0000 1.16 @@ -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/udev/udev-197-r4.ebuild,v 1.15 2013/01/23 11:14:36 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild,v 1.16 2013/01/23 20:23:12 ssuominen Exp $ EAPI=4 @@ -362,6 +362,10 @@ dosym /sbin/udevd "$(systemd_get_utildir)"/systemd-udevd find "${ED}/$(systemd_get_unitdir)" -name '*.service' -exec \ sed -i -e "/ExecStart/s:/lib/systemd:$(systemd_get_utildir):" {} + + + docinto gentoo + dodoc "${FILESDIR}"/80-net-name-slot.rules + docompress -x /usr/share/doc/${PF}/gentoo/80-net-name-slot.rules } pkg_preinst() @@ -382,7 +386,7 @@ if has_version ' udev-197-r3.ebuild, + udev-197-r4.ebuild, udev-9999.ebuild: + Don't use $FILESDIR in pkg_preinst() for binpkg support wrt #453726 by Fabio + Erculiani 23 Jan 2013; Samuli Suominen udev-197-r3.ebuild, udev-197-r4.ebuild, udev-9999.ebuild: 1.27 sys-fs/udev/udev-197-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-197-r3.ebuild?rev=1.27&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-197-r3.ebuild?rev=1.27&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-197-r3.ebuild?r1=1.26&r2=1.27 Index: udev-197-r3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r3.ebuild,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- udev-197-r3.ebuild 23 Jan 2013 11:14:36 -0000 1.26 +++ udev-197-r3.ebuild 23 Jan 2013 20:23:12 -0000 1.27 @@ -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/udev/udev-197-r3.ebuild,v 1.26 2013/01/23 11:14:36 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r3.ebuild,v 1.27 2013/01/23 20:23:12 ssuominen Exp $ EAPI=4 @@ -140,17 +140,6 @@ eval export {MSG{FMT,MERGE},XGETTEXT}=/bin/true fi - # This check is for maintainers only - if [[ ${PV} = 9999* ]]; then - # Support uClibc wrt bug #443030 with a safe kludge so we know when - # to check for other uses than logs. See the echo for secure_getenv - # at the end of src_prepare(). - if ! [[ $(grep -r secure_getenv * | wc -l) -eq 16 ]]; then - eerror "The line count of secure_getenv failed, see bug #443030" - die - fi - fi - # apply user patches epatch_user @@ -357,6 +346,10 @@ dosym /sbin/udevd "$(systemd_get_utildir)"/systemd-udevd find "${ED}/$(systemd_get_unitdir)" -name '*.service' -exec \ sed -i -e "/ExecStart/s:/lib/systemd:$(systemd_get_utildir):" {} + + + docinto gentoo + dodoc "${FILESDIR}"/80-net-name-slot.rules + docompress -x /usr/share/doc/${PF}/gentoo/80-net-name-slot.rules } pkg_preinst() @@ -376,7 +369,7 @@ preserve_old_lib /$(get_libdir)/libudev.so.0 net_rules="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules - [[ -f ${net_rules} ]] || cp "${FILESDIR}"/80-net-name-slot.rules "${net_rules}" + [[ -f ${net_rules} ]] || cp "${ROOT}"usr/share/doc/${PF}/gentoo/80-net-name-slot.rules "${net_rules}" } # This function determines if a directory is a mount point. 1.158 sys-fs/udev/udev-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.158&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.158&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.157&r2=1.158 Index: udev-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- udev-9999.ebuild 23 Jan 2013 11:14:36 -0000 1.157 +++ udev-9999.ebuild 23 Jan 2013 20:23:12 -0000 1.158 @@ -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/udev/udev-9999.ebuild,v 1.157 2013/01/23 11:14:36 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.158 2013/01/23 20:23:12 ssuominen Exp $ EAPI=4 @@ -362,6 +362,10 @@ dosym /sbin/udevd "$(systemd_get_utildir)"/systemd-udevd find "${ED}/$(systemd_get_unitdir)" -name '*.service' -exec \ sed -i -e "/ExecStart/s:/lib/systemd:$(systemd_get_utildir):" {} + + + docinto gentoo + dodoc "${FILESDIR}"/80-net-name-slot.rules + docompress -x /usr/share/doc/${PF}/gentoo/80-net-name-slot.rules } pkg_preinst() @@ -382,7 +386,7 @@ if has_version '