diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2014-08-01 06:49:25 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-08-01 06:49:25 +0000 |
| commit | d7a3f3aaf400b88fecae341e0f3b63dfa34806c6 (patch) | |
| tree | c09e2ae4d852a13cbb9d9ec1b2520fe032940f82 /sys-apps | |
| parent | bump & drop old (diff) | |
| download | gentoo-2-d7a3f3aaf400b88fecae341e0f3b63dfa34806c6.tar.gz gentoo-2-d7a3f3aaf400b88fecae341e0f3b63dfa34806c6.tar.bz2 gentoo-2-d7a3f3aaf400b88fecae341e0f3b63dfa34806c6.zip | |
Fixed installation aborting with header checksum error. Added some more changes from 9999 ebuild
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/util-linux/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.25.ebuild | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index a0714a9e743f..730503bbc331 100644 --- a/sys-apps/util-linux/ChangeLog +++ b/sys-apps/util-linux/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/util-linux # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.476 2014/08/01 06:26:19 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.477 2014/08/01 06:49:25 polynomial-c Exp $ + + 01 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> util-linux-2.25.ebuild: + Fixed installation aborting with header checksum error. Added some more + changes from 9999 ebuild. 01 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> util-linux-2.25.ebuild: Removed cytune support. diff --git a/sys-apps/util-linux/util-linux-2.25.ebuild b/sys-apps/util-linux/util-linux-2.25.ebuild index a2194f9ac891..e575275d189d 100644 --- a/sys-apps/util-linux/util-linux-2.25.ebuild +++ b/sys-apps/util-linux/util-linux-2.25.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-apps/util-linux/util-linux-2.25.ebuild,v 1.2 2014/08/01 06:26:19 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.25.ebuild,v 1.3 2014/08/01 06:49:25 polynomial-c Exp $ EAPI="4" @@ -65,7 +65,6 @@ src_prepare() { po/update-potfiles eautoreconf fi - find tests/ -name bigyear -delete #489794 elibtoolize } @@ -87,13 +86,13 @@ multilib_src_configure() { export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 ECONF_SOURCE=${S} \ econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ --enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \ $(multilib_native_use_enable nls) \ --enable-agetty \ --with-bashcompletiondir="$(get_bashcompdir)" \ $(multilib_native_use_enable bash-completion) \ $(multilib_native_use_enable caps setpriv) \ + --disable-chfn-chsh \ $(multilib_native_use_enable cramfs) \ $(multilib_native_use_enable fdformat) \ --with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \ @@ -139,12 +138,13 @@ multilib_src_install() { else emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \ install-pkgconfigDATA install-uuidincHEADERS \ - install-nodist_blkidincHEADERS install-nodist_mountincHEADERS + install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \ + install-nodist_smartcolsincHEADERS fi if multilib_is_native_abi; then # need the libs in / - gen_usr_ldscript -a blkid mount uuid + gen_usr_ldscript -a blkid mount smartcols uuid use python && python_optimize fi |