williamh 15/07/09 04:05:43 Modified: udev-9999.ebuild Log: sync live ebuild (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538)
Revision Changes Path 1.329 sys-fs/udev/udev-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.329&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.329&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.328&r2=1.329 Index: udev-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v retrieving revision 1.328 retrieving revision 1.329 diff -u -r1.328 -r1.329 --- udev-9999.ebuild 10 Jun 2015 02:37:44 -0000 1.328 +++ udev-9999.ebuild 9 Jul 2015 04:05:43 -0000 1.329 @@ -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-9999.ebuild,v 1.328 2015/06/10 02:37:44 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.329 2015/07/09 04:05:43 williamh Exp $ EAPI=5 @@ -8,11 +8,10 @@ if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd" - inherit git-2 - patchset= + inherit git-r3 else patchset= - SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz"; + SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz" if [[ -n "${patchset}" ]]; then SRC_URI="${SRC_URI} http://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz @@ -49,15 +48,11 @@ virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 - >=sys-kernel/linux-headers-3.9" -# Try with `emerge -C docbook-xml-dtd` to see the build failure without DTDs -if [[ ${PV} = 9999* ]]; then - DEPEND="${DEPEND} - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt" -fi + >=sys-kernel/linux-headers-3.9 + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt" RDEPEND="${COMMON_DEPEND} !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10" @@ -128,14 +123,16 @@ # change rules back to group uucp instead of dialout for now wrt #454556 sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die + # stub out the am_path_libcrypt function + echo 'AC_DEFUN([AM_PATH_LIBGCRYPT],[:])' > m4/gcrypt.m4 + # apply user patches epatch_user - if [[ ! -e configure ]]; then - eautoreconf - else + eautoreconf + + if ! [[ ${PV} = 9999* ]]; then check_default_rules - elibtoolize fi # Restore possibility of running --enable-static wrt #472608
