diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-05-24 18:38:00 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-05-24 18:38:00 +0000 |
| commit | 43c7e0a1fa4c590cfa0af91ca505e31827035052 (patch) | |
| tree | db42d384e7649a47b4d5f2993f584e6a7feeab2c /sys-apps | |
| parent | amd64/x86 stable, bug #270148 (diff) | |
| download | historical-43c7e0a1fa4c590cfa0af91ca505e31827035052.tar.gz historical-43c7e0a1fa4c590cfa0af91ca505e31827035052.tar.bz2 historical-43c7e0a1fa4c590cfa0af91ca505e31827035052.zip | |
Re-order patches when USE=loop-aes #271041 by Lars Wendler and add libtool-2 to DEPEND #271025 by Eike Hein.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/util-linux/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/util-linux/Manifest | 10 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.15-r1.ebuild | 10 |
3 files changed, 17 insertions, 9 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index 6928fd6e3444..05011cf089eb 100644 --- a/sys-apps/util-linux/ChangeLog +++ b/sys-apps/util-linux/ChangeLog @@ -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: diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 835a482e2f29..860f4736aeb5 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -43,15 +43,15 @@ DIST util-linux-ng-2.15-20090511.diff.bz2 54329 RMD160 55e872443de3b567a7fadc46f DIST util-linux-ng-2.15.tar.bz2 10184100 RMD160 93df61ee935cd9a524df68b28bc4e3adcef8d3ef SHA1 7fe31e5e56fdccfa0433fcccb1b4ce147fbbfc17 SHA256 db4dcbf99d989a8f539d7521e9e64047367fa2ccdcbb91517cdec19693a41ffd EBUILD util-linux-2.13.1.1.ebuild 2546 RMD160 592f2c38b3c01a58d2bc430f11a7db697be21cdc SHA1 aaac3b9b08bcb7918753c5ac46afa2c02608f0b2 SHA256 6954ec92e5e04058f1900df62fc1efc445fe8444f4b28e36aaef40eda332f707 EBUILD util-linux-2.14.2.ebuild 2624 RMD160 dc67e2cf5f0e7a8613e937608ebf20aec94ee382 SHA1 f6fb481c37ab3bc7a8fbbbcffc5b9644e05c0eea SHA256 ba32dade9f65e1990c2fc1beac8ae45bd4d1e153bcb0e8644996b66bc4fa1816 -EBUILD util-linux-2.15-r1.ebuild 2739 RMD160 5d072d09e32c0b632aacff3d09714bebf61fae97 SHA1 25ea82ee54c228b945a17804d075d0e363b1e5bd SHA256 1a01031c207bdd179828e0c082b4560afa98402779768f99f5fe4306a8de139a +EBUILD util-linux-2.15-r1.ebuild 2785 RMD160 99cc05d274b744a5ed353cb3ecb094c12fd1aa14 SHA1 311380c8006ab6b3c2cad0d86eccd96529e6302d SHA256 2cfc40cc6a486f25dfd086f63059b5be7e0a68781eec45323ecf43e36697e98f EBUILD util-linux-2.15.ebuild 2594 RMD160 a0b41b2aefaf88b930369a200bfb35904844334d SHA1 548005bd90ce8ad9817f1204ab790dd89965b915 SHA256 50986e05c68de97596a2b405319dea7715dca4b02c54a2a5c528d7190e0797e8 EBUILD util-linux-9999.ebuild 2112 RMD160 4c302634deb9bea06c8ba2647ec0fbdbcf2ae930 SHA1 5b3e888032ecebe8e1c5504347279dd13e6241d5 SHA256 04848332d95c545ba2553a82b912ce2aa67586deece74c63d04bc8a531c94ee8 -MISC ChangeLog 40826 RMD160 5edb12146ba19563edbcef25917c5d0dab7c9726 SHA1 08603ba476a966eb5a72db0554a6b6f593564896 SHA256 39bda75b1f9b9cb849e5544826f0ddc2e81ad17ef52aa0a39481b7e4119d0e7c +MISC ChangeLog 41017 RMD160 12310fd6992a2d18cf5980313f24679dbbe279ce SHA1 e086fe0c5e379d623a39551bf8f7ce9a0bd7ccb3 SHA256 c6238ff874a7f0c8373eb88ed545aa647ad74fcc102ea5585c318ee30bef2503 MISC metadata.xml 247 RMD160 233aa38a3ce28f169d18de949377c5c26f23bdff SHA1 b908dc27f495e4313a30a8883346d6cef6467f27 SHA256 4e9e787bd294b0810c142758275e148780035c7d00618e7808d34fe14f26c3b6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkoYZz0ACgkQn/5bYzqsSmGKlQCfWGrd0YjN1W/6Q8J1rgBxTdV8 -7LsAnA8eKvujxIIZNWzyqEu/aJIidIhO -=C3FC +iEYEARECAAYFAkoZlA4ACgkQn/5bYzqsSmFR7QCgld9K5spSPIFTnTJRHRy85Tir +8XIAniroFZXlPd+rw77AojCs9bbbfjoZ +=PqrE -----END PGP SIGNATURE----- diff --git a/sys-apps/util-linux/util-linux-2.15-r1.ebuild b/sys-apps/util-linux/util-linux-2.15-r1.ebuild index 5d70a76c09d6..066dd612d76a 100644 --- a/sys-apps/util-linux/util-linux-2.15-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.15-r1.ebuild @@ -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 @@ RDEPEND="!sys-process/schedutils 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 @@ src_unpack() { 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 |