ssuominen 14/06/27 11:17:57 Modified: udev-9999.ebuild ChangeLog Log: Remove unfunctional sed -line for restoring support for older compilers wrt #510524. Completely remove dev-util/intltool dependency and pass --disable-nls wrt http://cgit.freedesktop.org/systemd/systemd/commit/?id=2f96919bcdd0978164c801b21e053fb3b31e8bac and http://cgit.freedesktop.org/systemd/systemd/commit/?id=f15515b5e6a9ebe95c938cc670df6e576fcf9176 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path 1.307 sys-fs/udev/udev-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.307&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.307&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.306&r2=1.307 Index: udev-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v retrieving revision 1.306 retrieving revision 1.307 diff -u -r1.306 -r1.307 --- udev-9999.ebuild 24 Jun 2014 22:17:36 -0000 1.306 +++ udev-9999.ebuild 27 Jun 2014 11:17:57 -0000 1.307 @@ -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.306 2014/06/24 22:17:36 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.307 2014/06/27 11:17:57 ssuominen Exp $ EAPI=5 @@ -58,8 +58,7 @@ app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets - dev-libs/libxslt - >=dev-util/intltool-0.50" + dev-libs/libxslt" fi RDEPEND="${COMMON_DEPEND} !<sys-fs/lvm2-2.02.103 @@ -125,20 +124,6 @@ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" EOF - # Remove requirements for gettext and intltool wrt bug #443028 - if ! has_version dev-util/intltool && ! [[ ${PV} = 9999* ]]; then - sed -i \ - -e '/INTLTOOL_APPLIED_VERSION=/s:=.*:=0.40.0:' \ - -e '/XML::Parser perl module is required for intltool/s|^|:|' \ - configure || die - eval export INTLTOOL_{EXTRACT,MERGE,UPDATE}=/bin/true - eval export {MSG{FMT,MERGE},XGETTEXT}=/bin/true - fi - - # compile with older versions of gcc #451110 - version_is_at_least 4.6 $(gcc-version) || \ - sed -i 's:static_assert:alsdjflkasjdfa:' src/shared/macro.h - # change rules back to group uucp instead of dialout for now wrt #454556 sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die @@ -195,6 +180,7 @@ --disable-quotacheck --disable-logind --disable-polkit + --disable-nls --disable-myhostname $(use_enable gudev) --enable-split-usr 1.1054 sys-fs/udev/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.1054&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.1054&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.1053&r2=1.1054 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v retrieving revision 1.1053 retrieving revision 1.1054 diff -u -r1.1053 -r1.1054 --- ChangeLog 24 Jun 2014 22:17:36 -0000 1.1053 +++ ChangeLog 27 Jun 2014 11:17:57 -0000 1.1054 @@ -1,6 +1,13 @@ # 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.1053 2014/06/24 22:17:36 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1054 2014/06/27 11:17:57 ssuominen Exp $ + + 27 Jun 2014; Samuli Suominen <ssuomi...@gentoo.org> udev-9999.ebuild: + Remove unfunctional sed -line for restoring support for older compilers wrt + #510524. Completely remove dev-util/intltool dependency and pass --disable-nls + wrt http://cgit.freedesktop.org/systemd/systemd/commit/?id=2f96919bcdd0978164c + 801b21e053fb3b31e8bac and http://cgit.freedesktop.org/systemd/systemd/commit/? + id=f15515b5e6a9ebe95c938cc670df6e576fcf9176 24 Jun 2014; Michał Górny <mgo...@gentoo.org> udev-208-r1.ebuild, udev-212-r1.ebuild, udev-214.ebuild, udev-9999.ebuild:
