Add support for USE=unicode and USE=slang #208976. Update loop-aes cruft #206331.

(Portage version: 2.2_pre5)

3 files changed, 29 insertions, 11 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index ab125d63dbf9..bfc0bbc5b674 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.225 2008/02/26 23:03:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.226 2008/03/29 21:31:21 vapier Exp $
+
+  29 Mar 2008; Mike Frysinger <vapier@gentoo.org> util-linux-2.13.1.ebuild,
+  util-linux-9999.ebuild:
+  Add support for USE=unicode and USE=slang #208976. Update loop-aes cruft
+  #206331.
 
   26 Feb 2008; Mike Frysinger <vapier@gentoo.org> util-linux-2.13.1.ebuild:
   Add ioprio workaround back as it hasnt been properly fixed in this release
diff --git a/sys-apps/util-linux/util-linux-2.13.1.ebuild b/sys-apps/util-linux/util-linux-2.13.1.ebuild
index dd7b1ec05eec..bee5433118ca 100644
--- a/sys-apps/util-linux/util-linux-2.13.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.13.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.13.1.ebuild,v 1.3 2008/02/26 23:03:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.13.1.ebuild,v 1.4 2008/03/29 21:31:21 vapier Exp $
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
 inherit eutils
@@ -16,19 +16,20 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="http://www.kernel.org/pub/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2
-		loop-aes? ( http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.2b.tar.bz2 )"
+		loop-aes? ( http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.2c.tar.bz2 )"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="crypt loop-aes nls old-linux selinux"
+IUSE="crypt loop-aes nls old-linux selinux slang unicode"
 
 RDEPEND="!sys-process/schedutils
 	!sys-apps/setarch
 	>=sys-libs/ncurses-5.2-r2
 	>=sys-fs/e2fsprogs-1.34
-	selinux? ( sys-libs/libselinux )"
+	selinux? ( sys-libs/libselinux )
+	slang? ( sys-libs/slang )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/os-headers"
@@ -42,7 +43,8 @@ src_unpack() {
 		unpack ${A}
 		cd "${S}"
 		epatch "${FILESDIR}"/${PN}-2.13-uclibc.patch #203711
-		use loop-aes && epatch "${WORKDIR}"/loop-AES-*/util-linux-ng-2.13.0.1.diff
+		use loop-aes && epatch "${WORKDIR}"/loop-AES-*/util-linux-ng-*.diff
+		use unicode && sed -i 's:-lncurses:-lncursesw:' */Makefile.in #208976
 		epatch "${FILESDIR}"/${PN}-2.13-ioprio-syscalls.patch #190613
 	fi
 }
@@ -69,6 +71,7 @@ src_compile() {
 		--enable-write \
 		--without-pam \
 		$(use_with selinux) \
+		$(use_with slang) \
 		|| die "configure failed"
 	emake || die "emake failed"
 }
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 18190ac0da34..a09b6b6f7c72 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.5 2007/08/28 14:03:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.6 2008/03/29 21:31:21 vapier Exp $
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
 inherit eutils
@@ -15,19 +15,21 @@ HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux-ng/"
 if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 else
-	SRC_URI="http://www.kernel.org/pub/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2"
+	SRC_URI="http://www.kernel.org/pub/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2
+		loop-aes? ( http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.2c.tar.bz2 )"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="nls old-linux selinux"
+IUSE="crypt loop-aes nls old-linux selinux slang unicode"
 
 RDEPEND="!sys-process/schedutils
 	!sys-apps/setarch
 	>=sys-libs/ncurses-5.2-r2
 	>=sys-fs/e2fsprogs-1.34
-	selinux? ( sys-libs/libselinux )"
+	selinux? ( sys-libs/libselinux )
+	slang? ( sys-libs/slang )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/os-headers"
@@ -39,6 +41,7 @@ src_unpack() {
 		./autogen.sh || die
 	else
 		unpack ${A}
+		use loop-aes && epatch "${WORKDIR}"/loop-AES-*/util-linux-ng-*.diff
 	fi
 }
 
@@ -63,7 +66,9 @@ src_compile() {
 		--disable-wall \
 		--enable-write \
 		--without-pam \
+		$(use unicode || echo --with-ncurses) \
 		$(use_with selinux) \
+		$(use_with slang) \
 		|| die "configure failed"
 	emake || die "emake failed"
 }
@@ -71,4 +76,9 @@ src_compile() {
 src_install() {
 	emake install DESTDIR="${D}" || die "install failed"
 	dodoc AUTHORS NEWS README* TODO docs/*
+
+	if use crypt ; then
+		newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die
+		newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die
+	fi
 }