projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8b95339)
Version bump which fixes #373381 by Chris Richards. Add USE=static-libs support...
authorMike Frysinger <vapier@gentoo.org>
Mon, 29 Aug 2011 21:25:15 +0000 (21:25 +0000)
committerMike Frysinger <vapier@gentoo.org>
Mon, 29 Aug 2011 21:25:15 +0000 (21:25 +0000)
Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

sys-apps/util-linux/ChangeLog patch | blob | history
sys-apps/util-linux/util-linux-2.20.ebuild [new file with mode: 0644] patch | blob
sys-apps/util-linux/util-linux-9999.ebuild patch | blob | history

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index ecd5b9ed4babdb1b230994bb1cc2814bc3289924..b989e6f6e3985cd38dfc8a4d1a8d8492d1002659 100644 (file)
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.347 2011/07/29 07:42:14 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.348 2011/08/29 21:25:15 vapier Exp $
+
+*util-linux-2.20 (29 Aug 2011)
+
+  29 Aug 2011; Mike Frysinger <vapier@gentoo.org> +util-linux-2.20.ebuild,
+  util-linux-9999.ebuild:
+  Version bump which fixes #373381 by Chris Richards. Add USE=static-libs
+  support #378269 by Agostino Sarubbo. Sync changes between live git and stable
+  release ebuilds. Block older sysvinits since we now install the mountpoint
+  util ourselves.
 
   29 Jul 2011; Zac Medico <zmedico@gentoo.org> util-linux-2.19.1-r1.ebuild,
   util-linux-9999.ebuild:
diff --git a/sys-apps/util-linux/util-linux-2.20.ebuild b/sys-apps/util-linux/util-linux-2.20.ebuild
new file mode 100644 (file)
index 0000000..6a358a7
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.20.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2011 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.20.ebuild,v 1.1 2011/08/29 21:25:15 vapier Exp $
+
+EAPI="3"
+
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+inherit eutils toolchain-funcs libtool flag-o-matic
+[[ ${PV} == "9999" ]] && inherit git autotools
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
+if [[ ${PV} == "9999" ]] ; then
+       SRC_URI=""
+       #KEYWORDS=""
+else
+       SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.bz2
+               loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.19.1-20110510.diff.bz2 )"
+       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+cramfs crypt loop-aes ncurses nls old-linux perl selinux slang static-libs uclibc unicode"
+
+RDEPEND="!sys-process/schedutils
+       !sys-apps/setarch
+       !<sys-apps/sysvinit-2.88-r3
+       !<sys-libs/e2fsprogs-libs-1.41.8
+       !<sys-fs/e2fsprogs-1.41.8
+       cramfs? ( sys-libs/zlib )
+       ncurses? ( >=sys-libs/ncurses-5.2-r2 )
+       perl? ( dev-lang/perl )
+       selinux? ( sys-libs/libselinux )
+       slang? ( sys-libs/slang )"
+DEPEND="${RDEPEND}
+       nls? ( sys-devel/gettext )
+       virtual/os-headers"
+
+src_prepare() {
+       if [[ ${PV} == "9999" ]] ; then
+               po/update-potfiles
+               autopoint --force
+               eautoreconf
+       else
+               use loop-aes && epatch "${WORKDIR}"/util-linux-*.diff
+       fi
+       use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
+       elibtoolize
+}
+
+lfs_fallocate_test() {
+       # Make sure we can use fallocate with LFS #300307
+       cat <<-EOF > "${T}"/fallocate.c
+       #define _GNU_SOURCE
+       #include <fcntl.h>
+       main() { return fallocate(0, 0, 0, 0); }
+       EOF
+       append-lfs-flags
+       $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \
+               || export ac_cv_func_fallocate=no
+       rm -f "${T}"/fallocate.c
+}
+
+usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
+src_configure() {
+       lfs_fallocate_test
+       econf \
+               --enable-fs-paths-extra=/usr/sbin \
+               $(use_enable nls) \
+               --enable-agetty \
+               $(use_enable cramfs) \
+               $(use_enable old-linux elvtune) \
+               --with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
+               --disable-kill \
+               --disable-last \
+               --disable-mesg \
+               --enable-partx \
+               --enable-raw \
+               --enable-rename \
+               --disable-reset \
+               --disable-login-utils \
+               --enable-schedutils \
+               --disable-wall \
+               --enable-write \
+               --without-pam \
+               $(use_with selinux) \
+               $(use_with slang) \
+               $(use_enable static-libs static) \
+               $(tc-has-tls || echo --disable-tls)
+}
+
+src_install() {
+       emake install DESTDIR="${D}" || die "install failed"
+       dodoc AUTHORS NEWS README* TODO docs/*
+
+       if ! use perl ; then #284093
+               rm "${ED}"/usr/bin/chkdupexe || die
+               rm "${ED}"/usr/share/man/man1/chkdupexe.1 || die
+       fi
+
+       # need the libs in /
+       gen_usr_ldscript -a blkid uuid
+       # e2fsprogs-libs didnt install .la files, and .pc work fine
+       rm -f "${ED}"/usr/$(get_libdir)/*.la
+
+       if use crypt ; then
+               newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die
+               newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die
+       fi
+}
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index c12f97bb0093e8109043a814fb14b1cf5abfa771..1c5a0a4b6d7aa16ce39688bf947d5319084bafdd 100644 (file)
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.21 2011/07/29 07:42:14 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.22 2011/08/29 21:25:15 vapier Exp $
 
-EAPI="2"
+EAPI="3"
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 inherit eutils toolchain-funcs libtool flag-o-matic
@@ -18,16 +18,18 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.bz2"
+       SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.bz2
+               loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.19.1-20110510.diff.bz2 )"
        KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+cramfs crypt ncurses nls old-linux perl selinux slang uclibc unicode"
+IUSE="+cramfs crypt loop-aes ncurses nls old-linux perl selinux slang static-libs uclibc unicode"
 
 RDEPEND="!sys-process/schedutils
        !sys-apps/setarch
+       !<sys-apps/sysvinit-2.88-r3
        !<sys-libs/e2fsprogs-libs-1.41.8
        !<sys-fs/e2fsprogs-1.41.8
        cramfs? ( sys-libs/zlib )
@@ -44,6 +46,8 @@ src_prepare() {
                po/update-potfiles
                autopoint --force
                eautoreconf
+       else
+               use loop-aes && epatch "${WORKDIR}"/util-linux-*.diff
        fi
        use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
        elibtoolize
@@ -72,7 +76,6 @@ src_configure() {
                $(use_enable cramfs) \
                $(use_enable old-linux elvtune) \
                --with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
-               --disable-init \
                --disable-kill \
                --disable-last \
                --disable-mesg \
@@ -87,6 +90,7 @@ src_configure() {
                --without-pam \
                $(use_with selinux) \
                $(use_with slang) \
+               $(use_enable static-libs static) \
                $(tc-has-tls || echo --disable-tls)
 }
 
@@ -95,14 +99,14 @@ src_install() {
        dodoc AUTHORS NEWS README* TODO docs/*
 
        if ! use perl ; then #284093
-               rm "${D}"/usr/bin/chkdupexe || die
-               rm "${D}"/usr/share/man/man1/chkdupexe.1 || die
+               rm "${ED}"/usr/bin/chkdupexe || die
+               rm "${ED}"/usr/share/man/man1/chkdupexe.1 || die
        fi
 
        # need the libs in /
        gen_usr_ldscript -a blkid uuid
        # e2fsprogs-libs didnt install .la files, and .pc work fine
-       rm -f "${D}"/usr/$(get_libdir)/*.la
+       rm -f "${ED}"/usr/$(get_libdir)/*.la
 
        if use crypt ; then
                newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die
Unnamed repository; edit this file 'description' to name the repository.