sync live ebuild

Package-Manager: portage-2.2.0_alpha72/cvs/Linux i686

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 6b6f6297c72e95a05c9f5286f2d7b7fea7d95936..d613b527ab1a9354f0e4abcbac778d6fcde47182 100644 (file)
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.608 2011/11/07 04:19:01 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.609 2011/11/07 04:55:18 williamh Exp $
+
+  07 Nov 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  sync live ebuild.
 
 *udev-174-r1 (07 Nov 2011)
 

diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index f389697be1d71c5cee3f97cf6a8c98aaccb33e4d..0d87c7eb15711d9ddbd61ba4648ea9aed5bd264f 100644 (file)
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,27 +1,28 @@
 # Copyright 1999-2011 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.56 2011/11/06 02:36:06 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.57 2011/11/07 04:55:18 williamh Exp $
 
 EAPI=4
 
 KV_min=2.6.34
-#PATCHSET=${P}-gentoo-patchset-v1
+patchversion=1
 scriptversion=5
-scriptname=${PN}-gentoo-scripts
-udev_rules_md5=a585b848976900cd15cf729e8ef11c61
+udev_rules_md5=f7ceae528475742f75516c532ec95a88
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
 
 [[ ${PV} == "9999" ]] && vcs="git-2 autotools"
 inherit ${vcs} eutils flag-o-matic multilib toolchain-funcs linux-info systemd
 
+scriptname=${PN}-gentoo-scripts
 if [[ ${PV} != "9999" ]]
 then
        KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
        SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
-       if [[ -n "${PATCHSET}" ]]
+       if [[ -n "${patchversion}" ]]
        then
-               SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2"
+               patchset=${P}-patchset-${patchversion}
+               SRC_URI="${SRC_URI} mirror://gentoo/${patchset}.tar.bz2"
        fi
        scriptname="${scriptname}-${scriptversion}"
        SRC_URI="${SRC_URI} mirror://gentoo/${scriptname}.tar.bz2"
@@ -49,8 +50,13 @@ DEPEND="${COMMON_DEPEND}
        keymap? ( dev-util/gperf )
        dev-util/pkgconfig
        virtual/os-headers
-       !<sys-kernel/linux-headers-2.6.34
-       test? ( app-text/tree )"
+       !<sys-kernel/linux-headers-2.6.34"
+
+if [[ $PV == "9999" ]]
+then
+       DEPEND="${DEPEND}
+               test? ( app-text/tree )"
+fi
 
 if [[ ${PV} == "9999" ]] || use doc
 then
@@ -124,9 +130,9 @@ fi
 src_prepare()
 {
        # backport some patches
-       if [[ -n "${PATCHSET}" ]]
+       if [[ -n "${patchset}" ]]
        then
-               EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \
+               EPATCH_SOURCE="${WORKDIR}/${patchset}" EPATCH_SUFFIX="patch" \
                        EPATCH_FORCE="yes" epatch
        fi