diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-06-27 11:17:57 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-06-27 11:17:57 +0000 |
| commit | aa543d25ddefa3e86d52c00d76521ed44aeb6420 (patch) | |
| tree | a57b4c131689b20a3685f4d3810738963761d188 | |
| parent | Support multilib packages in dependencies. Remove unnecessary dependencies. (diff) | |
| download | gentoo-2-aa543d25ddefa3e86d52c00d76521ed44aeb6420.tar.gz gentoo-2-aa543d25ddefa3e86d52c00d76521ed44aeb6420.tar.bz2 gentoo-2-aa543d25ddefa3e86d52c00d76521ed44aeb6420.zip | |
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)
| -rw-r--r-- | sys-fs/udev/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-fs/udev/udev-9999.ebuild | 20 |
2 files changed, 11 insertions, 18 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 98f5d72497be..15a0f65ef103 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -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 <ssuominen@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 <mgorny@gentoo.org> udev-208-r1.ebuild, udev-212-r1.ebuild, udev-214.ebuild, udev-9999.ebuild: diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index bf12191e088f..b382a7c0daf1 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -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 @@ if [[ ${PV} = 9999* ]]; then 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 @@ src_prepare() { 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 @@ multilib_src_configure() { --disable-quotacheck --disable-logind --disable-polkit + --disable-nls --disable-myhostname $(use_enable gudev) --enable-split-usr |