[gentoo-commits] gentoo-x86 commit in sys-apps/util-linux: ChangeLog util-linux-2.15-r1.ebuild

["Mike Frysinger (vapier)" <vapier@gentoo.org>]

vapier      09/05/24 18:38:00

  Modified:             ChangeLog util-linux-2.15-r1.ebuild
  Log:
  Re-order patches when USE=loop-aes #271041 by Lars Wendler and add libtool-2 to DEPEND #271025 by Eike Hein.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.267                sys-apps/util-linux/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/util-linux/ChangeLog?rev=1.267&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/util-linux/ChangeLog?rev=1.267&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/util-linux/ChangeLog?r1=1.266&r2=1.267

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- ChangeLog	23 May 2009 21:14:31 -0000	1.266
+++ ChangeLog	24 May 2009 18:38:00 -0000	1.267
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.266 2009/05/23 21:14:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.267 2009/05/24 18:38:00 vapier Exp $
+
+  24 May 2009; Mike Frysinger <vapier@gentoo.org> util-linux-2.15-r1.ebuild:
+  Re-order patches when USE=loop-aes #271041 by Lars Wendler and add
+  libtool-2 to DEPEND #271025 by Eike Hein.
 
   23 May 2009; Mike Frysinger <vapier@gentoo.org> util-linux-2.14.2.ebuild,
   files/util-linux-2.15-old-libselinux.patch:



1.2                  sys-apps/util-linux/util-linux-2.15-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/util-linux/util-linux-2.15-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/util-linux/util-linux-2.15-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/util-linux/util-linux-2.15-r1.ebuild?r1=1.1&r2=1.2

Index: util-linux-2.15-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.15-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-2.15-r1.ebuild	23 May 2009 21:14:31 -0000	1.1
+++ util-linux-2.15-r1.ebuild	24 May 2009 18:38:00 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.15-r1.ebuild,v 1.1 2009/05/23 21:14:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.15-r1.ebuild,v 1.2 2009/05/24 18:38:00 vapier Exp $
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
 inherit eutils autotools
@@ -31,6 +31,7 @@
 	selinux? ( sys-libs/libselinux )
 	slang? ( sys-libs/slang )"
 DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2
 	nls? ( sys-devel/gettext )
 	virtual/os-headers"
 
@@ -44,9 +45,12 @@
 		cd "${S}"
 		#epatch "${FILESDIR}"/${PN}-2.13-uclibc.patch #203711
 		epatch "${FILESDIR}"/${P}-cpuid-pic.patch #269001
-		epatch "${FILESDIR}"/${P}-losetup-symlinks.patch #269264
+		if use loop-aes ; then
+			epatch "${WORKDIR}"/util-linux-ng-*.diff
+		else
+			epatch "${FILESDIR}"/${P}-losetup-symlinks.patch #269264
+		fi
 		epatch "${FILESDIR}"/${P}-old-libselinux.patch #270168
-		use loop-aes && epatch "${WORKDIR}"/util-linux-ng-*.diff
 		eautoreconf
 	fi
 	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c