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

Package-Manager: portage-2.2_pre5

4 files changed, 36 insertions, 17 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/Manifest b/sys-apps/util-linux/Manifest
index 8a32ff5db671..bd787be0962e 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -47,6 +47,7 @@ AUX util-linux-2.13-uclibc.patch 1627 RMD160 3c52bac5b792c3ee6ccf69324729793314f
 AUX util-linux-no-kill.patch 642 RMD160 cb9bef851804fbcd9a0910cb39123f65f72bbdc5 SHA1 7152a9596d9f81fcb6b2ac867d5ce1ad679ebee7 SHA256 c72803b0918589dbd409e22368853330bc84d875c91936fc5e899686c1642aaf
 DIST loop-AES-v3.1f.tar.bz2 173423 RMD160 7490e3d90727621fde3052fd1747af338518b158 SHA1 abcc9c29c16596923a0c50a9190025a08b069ef4 SHA256 f744f3dd74b554d1a2e3788752c4a63049647bfd2bae71d9fff2427c0e175ca7
 DIST loop-AES-v3.2b.tar.bz2 222018 RMD160 638d86ca21298ca0a939aca263c6fbcf1fe17029 SHA1 2d417922ef298bae379533a726cff36fd9517093 SHA256 603854463078d24a66da30e474851c55e40c761f38af521294866b16e5319a6b
+DIST loop-AES-v3.2c.tar.bz2 222421 RMD160 d6b3781103aa64aa6db738083ff2d1adb4f9ca8f SHA1 63102863459370e35f4edb26e83f548f8ce1a7bb SHA256 c0313b445cb41ef586ba9774fc7cbf41114d93064b3417cf8512da6f746d3542
 DIST util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800 RMD160 82e54aedd691aa93b67de9dfb9049a3f012a29f7 SHA1 69b757c28b6401abe454f060c2a24da49e2d129a SHA256 565a0cc6c3c148a66969276ae9d34dc34f19fbd45df2740343793ee067b3700f
 DIST util-linux-2.12i.tar.gz 1975468 RMD160 f055a94ad247dc59293f7b933c12bdda135159fc SHA1 deb940cb61d9ae0b481b6469ea496f762a2581a8 SHA256 28e2fc70d7507e158d8861c958461aef1c4bbf4157a8ebbc237943944e5a8c4a
 DIST util-linux-2.12r.tar.bz2 1370907 RMD160 51950aafd5cbcb574e69fbd6b28d15a106147e64 SHA1 740b7eb5ae1148b2200b2cd34a0a6c4b0db577e4 SHA256 b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b
@@ -59,14 +60,14 @@ EBUILD util-linux-2.12r-r8.ebuild 6784 RMD160 c84f893ea67a77fa83a2f04952ae745aaa
 EBUILD util-linux-2.13-r1.ebuild 1939 RMD160 fa606800880368364fccafdbb4b5d6ba79992cc2 SHA1 8a427d9d2f00228dca6081b388a1f7eb949f6c69 SHA256 7f77607b1a4689666d596378b9fff5af76a4cac84bf62e302cdb167a2e5d3061
 EBUILD util-linux-2.13-r2.ebuild 2420 RMD160 cf497228d22b6f3f0c5a6b80a7824887de527172 SHA1 434720501c11f981ed2a22df866b3bce5095351f SHA256 b4433a9d0b237909f02dcb5a1e0bd5acc5fc06ae2234176e2f221db2567e891e
 EBUILD util-linux-2.13.0.1.ebuild 2663 RMD160 f8b17c4d24e006bffb1ba6d0b8f095ecf08fbcd1 SHA1 79f379cb43222f611fb7b816ab21be887846cc1f SHA256 57d52398241c3fd2669554902d8817654fa23668a2eb2c231738a1df67a1ecaa
-EBUILD util-linux-2.13.1.ebuild 2377 RMD160 94faafac9cb3cd218f44b15fc84214747c6e45e0 SHA1 1bdac28c83e9bdef79cbc2e1f2951e92d1689b21 SHA256 4aee8725ae506a7fb760b85707b94bb46e154ee5589b861ab07df45dfcfec47f
-EBUILD util-linux-9999.ebuild 1695 RMD160 c61be7a1041d86884c3d5a22a922061617b911f2 SHA1 e51e149f937d0bc3d2b7cc4897ae454f0767d217 SHA256 fc4a8751c5d55865d6555a6b8c639426c4ee8700b8928d7dee205fb6d7688df3
-MISC ChangeLog 35337 RMD160 b9025b1ce79a53cb3fbb6161c586097c59a1e49e SHA1 f95ec80622666db3ad5df945b150ac0b4e5350b1 SHA256 560441801c4ac84f3b8bae32c67677c50def30ae794314aaa5b14a49dadd2499
+EBUILD util-linux-2.13.1.ebuild 2505 RMD160 67d77662fc79a865bdee553f3ab810d49d0c3250 SHA1 e163050a8386c745011373e91510098d37e595e8 SHA256 52f258b5f5bd08ce137cfde1cc855dc53e1c334dc1b0e0f4913d3b9f02aa74e8
+EBUILD util-linux-9999.ebuild 2115 RMD160 2e24b69651286dc8c751b39c7b43a9cbd6f579ab SHA1 e6d713b5b4e75bf2ede0b4a817789e75a9ef52f7 SHA256 c96b58766ac5e81ca689d2ae3e84cb9252b3129b4ea7f88b15cc2d290b86515f
+MISC ChangeLog 35526 RMD160 2a40a5f1cce4e3e318946e74ec152c8ef43f9598 SHA1 ded8b6f47aa335b4ebeea0e356923873cc1b784c SHA256 efbeb02900022e9dd4bcebf0e8bcc72d21c06421562c9c97654d925eb04995c8
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHxJq7j9hvisErhMIRAhKLAJ9spzmnSI+7/AhAhAe7TKLoqWNkeQCeLS5g
-7//4ddwKEcaqldBPRyB6+Q0=
-=6br3
+iD8DBQFH7rX9j9hvisErhMIRAhZqAJoDcjqZO6oVJm4jsiXjApkb4E7QJQCfdulT
+IQeBeWruUIHiORSJ8FnUlSA=
+=YU2u
 -----END PGP SIGNATURE-----
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
 }