Version bump #108042 by Alon Bar-Lev.

(Portage version: 2.0.51.22-r2)

3 files changed, 19 insertions, 17 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index f29ca628d8a5..ddb82cf629e6 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.122 2005/09/20 06:22:52 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.123 2005/10/05 00:08:01 vapier Exp $
+
+*util-linux-2.12r (05 Oct 2005)
+
+  05 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  -util-linux-2.12q-r2.ebuild, +util-linux-2.12r.ebuild:
+  Version bump #108042 by Alon Bar-Lev.
 
   20 Sep 2005; Hardave Riar <hardave@gentoo.org> util-linux-2.12q-r3.ebuild:
   Stable on mips, bug #105805.
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.12q-r2 b/sys-apps/util-linux/files/digest-util-linux-2.12r
index 408880da56d5..f625ad6fbd02 100644
--- a/sys-apps/util-linux/files/digest-util-linux-2.12q-r2
+++ b/sys-apps/util-linux/files/digest-util-linux-2.12r
@@ -1,4 +1,4 @@
-MD5 004b971441ef89e0b93076c21806cc7d util-linux-2.12q.tar.gz 1992810
+MD5 c261230b27fc0fbcc287c76884caf2d3 util-linux-2.12r.tar.gz 1992725
 MD5 6e0deccf97db98d2ae751577d019efa4 util-linux-2.12i.tar.gz 1975468
 MD5 dee120b17425e1edf0a0c64f0e249c20 util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800
-MD5 650186003f301362247a7d16f138eb43 loop-AES-v3.0d.tar.bz2 165472
+MD5 ab453b8d81bd36d5e56e391ee36ec5d6 loop-AES-v3.1b.tar.bz2 167804
diff --git a/sys-apps/util-linux/util-linux-2.12q-r2.ebuild b/sys-apps/util-linux/util-linux-2.12r.ebuild
index 57bd4839e636..d57216cbd55b 100644
--- a/sys-apps/util-linux/util-linux-2.12q-r2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12r.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 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.12q-r2.ebuild,v 1.4 2005/09/14 09:07:25 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12r.ebuild,v 1.1 2005/10/05 00:08:01 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
 OLD_CRYPT_VER=2.12i
-LOOP_AES_VER=3.0d
+LOOP_AES_VER=3.1b
 DESCRIPTION="Various useful Linux utilities"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
 SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.gz
@@ -17,7 +17,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="crypt old-crypt nls static pam selinux perl"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2
@@ -59,15 +59,15 @@ src_unpack() {
 	# Fix mtab updates with `mount --move /foo /bar` #104697
 	epatch "${FILESDIR}"/${PN}-2.12q-update-mtab-when-moving.patch
 
-	# Disable the -r option for non-root users #105805
-	epatch "${FILESDIR}"/${PN}-2.12-only-root-can-remount.patch
-
 	# Respect -n with -r and umount #98675
 	epatch "${FILESDIR}"/${PN}-2.12q-umount-dont-write-mtab-with-remount.patch
 
 	# A few fixes to beat update_mtab() into submission.
 	epatch "${FILESDIR}"/${PN}-2.12q-update_mtab-fixes.patch
 
+	# Use update_mtab() to avoid dups in mtab for 'mount -f'
+	epatch "${FILESDIR}"/${PN}-2.12q-use-update_mtab-for-fake.patch
+
 	# Fix unreadable df output when using devfs ... this check is kind of 
 	# a hack, but whatever, the output isnt critical at all :P
 	[[ -e /dev/.devfsd ]] && epatch "${FILESDIR}"/no-symlink-resolve.patch
@@ -80,7 +80,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-2.11z-agetty-domainname-option.patch
 
 	# Fix french translation typo #75693
-	epatch "${FILESDIR}"/${P}-i18n-update.patch
+	epatch "${FILESDIR}"/${PN}-2.12q-i18n-update.patch
 
 	# Add NFS4 support (kernel 2.5/2.6)
 	epatch "${FILESDIR}"/${PN}-2.12i-nfsv4.patch
@@ -88,11 +88,6 @@ src_unpack() {
 	# ignore managed/kudzu options #70873
 	epatch "${FILESDIR}"/${PN}-2.12i-ignore-managed.patch
 
-	# Allow util-linux to be built with -fPIC
-	# XXX: this needs to be punted as the error is in the
-	#      syscall macro which is part of linux-headers
-	epatch "${FILESDIR}"/${PN}-2.12i-pic.patch
-
 	# swapon gets confused by symlinks in /dev #69162
 	epatch "${FILESDIR}"/${PN}-2.12p-swapon-check-symlinks.patch
 
@@ -160,8 +155,9 @@ src_install() {
 	if use old-crypt ; then
 		cd "${OLD_CRYPT_P}"/mount
 		into /
-		newsbin mount mount-old-crypt || die
-		newsbin losetup losetup-old-crypt || die
+		newbin mount mount-old-crypt || die
+		newbin losetup losetup-old-crypt || die
+		fperms 4711 /bin/{mount,losetup}-old-crypt
 	fi
 }