From 983c451dc3eaea41fbe743bba86383e0467a49c6 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 30 Jun 2010 18:21:32 +0000 Subject: [PATCH] Version bump. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sys-apps/util-linux/ChangeLog | 8 +- sys-apps/util-linux/Manifest | 24 ++-- .../files/util-linux-2.18-ncursesw.patch | 14 +++ sys-apps/util-linux/util-linux-2.18.ebuild | 112 ++++++++++++++++++ sys-apps/util-linux/util-linux-9999.ebuild | 24 +++- 5 files changed, 161 insertions(+), 21 deletions(-) create mode 100644 sys-apps/util-linux/files/util-linux-2.18-ncursesw.patch create mode 100644 sys-apps/util-linux/util-linux-2.18.ebuild diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index a1a5898d97af..55e8e884b3bb 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.306 2010/03/22 19:31:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.307 2010/06/30 18:21:32 vapier Exp $ + +*util-linux-2.18 (30 Jun 2010) + + 30 Jun 2010; Mike Frysinger +util-linux-2.18.ebuild, + +files/util-linux-2.18-ncursesw.patch, util-linux-9999.ebuild: + Version bump. *util-linux-2.17.2 (22 Mar 2010) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 1b0b164e2a50..26638d3ce067 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,30 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX 0001-libblkid-fix-segfault-in-drdb.patch 1035 RMD160 d0448b1c0a9eabcc3fd4d18c3f92de468056f3e2 SHA1 066f177bb5ef156053d4deb36c6e0b8577ed1bf7 SHA256 2a2bf7340f21cb3d77f3641ef7fc4aff629b1a392c6f0e52329fc05ae9c567fa AUX crypto-loop.confd 412 RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b SHA1 2f881a24ff67115e74de7a11c66a34a745060864 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600 AUX crypto-loop.initd 1729 RMD160 fa53920677d793cf98cad994e4dabd53e53d8d04 SHA1 19d3b7c4aa95cdadde2f6fb81a391081eae04f42 SHA256 b8329250c865e79a1e761d713c2270c99d5fe96e0d5a7ca646946fab65c4b810 +AUX util-linux-2.18-ncursesw.patch 326 RMD160 ccaa9a9eb55bb0ed61b8acb5c2e306a90b397227 SHA1 6b6d1b88591f5d2a31d5f32f22bbcef682635318 SHA256 77c5a4b1c7d8df542f746937c7c6d53c73544a8158ba4dedd31a27080316ae9c DIST util-linux-2.16.1-loop-aes.patch.bz2 58371 RMD160 d759cff55d8e45a007c1a08e57fc2fc71a01b403 SHA1 5d26a6bccb301cde31358a8caae30c4729347836 SHA256 e5e4e53d1d486b8ed1fbc68f44843e67a893e810c1d8074ba8ee7ffc47382966 -DIST util-linux-ng-2.16.1.tar.bz2 3489006 RMD160 1531884c047ab2d799ddb1f8b8fcc89284fa6399 SHA1 53ba63988a82e8e3a71c96df5488959617e2a3ed SHA256 8f9fd83144f35dbd57d53eea914acd6dfad54b414ded0723f6efe06b3a167f36 DIST util-linux-ng-2.16.2.tar.bz2 3521956 RMD160 8c27748d804ad00efb153bf62f8c74756413888b SHA1 ace7a87ea61154210d9a11dd66b1b49d8130a828 SHA256 b1c3f5986b97753f3f83338b36aa25fc1370d96734313047da257df489f9a3eb -DIST util-linux-ng-2.17-20100120.diff.bz2 57932 RMD160 5525da9a83d0134b1e59e14e25b3c1a212acaa78 SHA1 e7cf9c9160fb81c099987d71971a35c3c94f8cdf SHA256 7ea15a8f3aa5c2c4073449f64ef3b1db898d81d583eb04718615fca160c57443 DIST util-linux-ng-2.17.1-20100308.diff.bz2 57867 RMD160 26584b886ac8db1ec723690a685a442615366f2c SHA1 f76a2deb4b4012e98d82517d84dfb09725533a51 SHA256 c7478553e03ba7cbe28ddb066361966567d97b0746a13396bff12a83183014a0 -DIST util-linux-ng-2.17.1.tar.bz2 3801027 RMD160 a2fd1756fc36915e3e5867411c5e217918bba96b SHA1 e1772c333ac506163ceb443a3f93e66b8e27f3fd SHA256 e9c019ea3782dc20b82d27c1240009f9e194304a77ac36f51629a487a5181390 DIST util-linux-ng-2.17.2.tar.bz2 3815657 RMD160 398aa54c6001acc16bc2d049ccbdb62824776ba3 SHA1 69275de84f7dabb7a5d90d0046c3a6b861c16a1d SHA256 c9ae801b6a5ab20b7749a278a8bf6830ef53adc5e8b7eb0ac1a9f410c774118f -DIST util-linux-ng-2.17.tar.bz2 3767857 RMD160 adedfb12e415b5e48067c579ada4b6a9317e72dd SHA1 3be54ede41d0aff87a717a0d75c8f3c0171f85f6 SHA256 8720f7233394b68d17095707c195ebb014943c1075a18fb5fd21ec108f012be3 -EBUILD util-linux-2.16.1.ebuild 2562 RMD160 b1d0723cfd7fd25d7c4b78e64b9b5153b42826b8 SHA1 8a4329a006709e91b04eed2117d2b9a987dcd2e8 SHA256 8f8d00dc0018428eca148fd0cee9ec4138584c2e4bd9cea2a6bb1dda12473271 +DIST util-linux-ng-2.18.tar.bz2 7669676 RMD160 4781871a8f86195b886e81d364d41a57d67869e3 SHA1 154db0512caae0b6e90eee4b7312d4caf3d6b978 SHA256 b8c5c07c763888aa712b4585393346667a00793127c54cef0470cfa456b031cc EBUILD util-linux-2.16.2.ebuild 2599 RMD160 c1e3c9a2b4f65074aeec0d377a85573d54c8cca6 SHA1 e2429b7a7da6de737b01719f55b9674ee2bfead8 SHA256 aac6bb667221ab92704b857d4e26805e670f5f7ba7f175706e4b3d613db6b814 -EBUILD util-linux-2.17-r1.ebuild 2701 RMD160 53aee5255405596ca1054a344ba3291d4a1337b9 SHA1 63e4db0aa929f73d633b8a35b91adaf110ac8244 SHA256 7a716f822397684f3888035aa9d97bfb09364b779d22c9c0bd8e2f24de7b19a2 -EBUILD util-linux-2.17.1.ebuild 3038 RMD160 45ff16d752c4d25b4df1ec9cd2d19a6249bf3456 SHA1 af361e7d03f19e0cb7607ebc69c743afccc7ab1b SHA256 3966c1c28599346299b12267f20d77d3746c70542571b771858776ad2a99e143 EBUILD util-linux-2.17.2.ebuild 3038 RMD160 0c15635049706de4de111a9c603e9d008fd6f4cc SHA1 83a496d4aeacda7d8b8a7e6ed7b255a2df26238a SHA256 026754bc523218762205d5a9063188aee310c12afab48c14ed0682db533c6d82 -EBUILD util-linux-2.17.ebuild 2630 RMD160 699e758f0d33872a873c5172ed5cf2ca7bf4af3c SHA1 512eeda6b7178e39246b1738790146412d894442 SHA256 f01102e7fe9016cad08b899219e0de1bfad4d07aaaaec7b5c8e923ed56476dac -EBUILD util-linux-9999.ebuild 2630 RMD160 5d43edb79aee7b5ee9007f34ade094f28bbc59f4 SHA1 de01bb30e5a93fdd79c3120ac06105b1c2627944 SHA256 d20f9093ac903a641831c5aff4725b9523205faec28aeb70861a4c6707bfa692 -MISC ChangeLog 46620 RMD160 56485a704aefc76566eb6610c624cfeef55142d7 SHA1 5f208de2260c75ffaed0f2951734a1923f375a5b SHA256 c35945ccb7a38519c6a6bd9fdb976239e8fa8832ddbb8cdd9c28fb8690f747a1 +EBUILD util-linux-2.18.ebuild 3078 RMD160 035220ebf28437a52a254c6d6c79314d654a9723 SHA1 10303540a58edda48633f15f58ca02ecb3cab8f3 SHA256 dab7292965f356a684f143143d454d4ce4b762c9f69e93d45ed434a02422b267 +EBUILD util-linux-9999.ebuild 3037 RMD160 0cc3d8b6a2c509d8a43eb2a10848fd98f2339a1e SHA1 8a27fea3b5578fe4b0c2c5582acfc4b2d05deda9 SHA256 790e2343757ca6abcd2e14f1119ecc11a078dc52b5e609ec6ec6c86c6fd11d6e +MISC ChangeLog 46809 RMD160 3820c5de5386ecc3cca0bb60eeb214664beeacd9 SHA1 78981aa28c442e68c5d4dbeead6242ee8fe929c8 SHA256 d0ee63ca8ed5be878112ff9d5beea105be706acb625874b6c24687fbcd9b1eca MISC metadata.xml 309 RMD160 d386a285872f68f80198f63be994dc8179e2254f SHA1 0e2ba366c96f233cf76e649dfa1eb1ba1ab8a897 SHA256 ccc7a0dd3a5a579aac578db211c116840fecf84e7e2c92d21efb430b51467264 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iF4EAREIAAYFAkunxsIACgkQTwhj9JtAlp7C2gD/ZBbhoc9iETKfL9l7A3IwcjQn -xHtihTKCTQnFD/oURXMA/2wSk9h8nPc0qAd1Hicx3LkUzepRGBNwFiHLxGVWqg0A -=ELsI +iF4EAREIAAYFAkwrivkACgkQTwhj9JtAlp7V3wD+ORE5MglsIsdAOR/TVTng/Ukv +9zUEkkTpbh9BYN+TIoEBALq4i9ca8nhY0poFaVg4VEdl/3apwYPWOLPM6vyrsYKj +=/Ycn -----END PGP SIGNATURE----- diff --git a/sys-apps/util-linux/files/util-linux-2.18-ncursesw.patch b/sys-apps/util-linux/files/util-linux-2.18-ncursesw.patch new file mode 100644 index 000000000000..871c63da9b06 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.18-ncursesw.patch @@ -0,0 +1,14 @@ +--- a/fdisk/cfdisk.c ++++ b/fdisk/cfdisk.c +@@ -69,7 +69,11 @@ + #elif defined(HAVE_SLANG_SLCURSES_H) + #include + #elif defined(HAVE_NCURSES_H) ++#ifdef HAVE_WIDECHAR ++#include ++#else + #include ++#endif + #elif defined(HAVE_NCURSES_NCURSES_H) + #include + #endif diff --git a/sys-apps/util-linux/util-linux-2.18.ebuild b/sys-apps/util-linux/util-linux-2.18.ebuild new file mode 100644 index 000000000000..9b27142fde66 --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.18.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2010 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.18.ebuild,v 1.1 2010/06/30 18:21:32 vapier Exp $ + +EAPI="2" + +EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git" +inherit eutils toolchain-funcs libtool flag-o-matic +[[ ${PV} == "9999" ]] && inherit git autotools + +MY_PV=${PV/_/-} +MY_P=${PN}-ng-${MY_PV} +S=${WORKDIR}/${MY_P} + +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux-ng/" +if [[ ${PV} == "9999" ]] ; then + SRC_URI="" + #KEYWORDS="" +else + SRC_URI="mirror://kernel/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2 + loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-ng-2.17.1-20100308.diff.bz2 )" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="crypt loop-aes nls old-linux perl selinux slang uclibc unicode" + +RDEPEND="!sys-process/schedutils + !sys-apps/setarch + >=sys-libs/ncurses-5.2-r2 + ! "${T}"/fallocate.c + #define _GNU_SOURCE + #include + main() { return fallocate(0, 0, 0, 0); } + EOF + append-lfs-flags + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \ + || export ac_cv_func_fallocate=no + rm -f "${T}"/fallocate.c +} + +src_configure() { + lfs_fallocate_test + econf \ + $(use_enable nls) \ + --enable-agetty \ + --enable-cramfs \ + $(use_enable old-linux elvtune) \ + --disable-init \ + --disable-kill \ + --disable-last \ + --disable-mesg \ + --enable-partx \ + --enable-raw \ + --enable-rdev \ + --enable-rename \ + --disable-reset \ + --disable-login-utils \ + --enable-schedutils \ + --disable-wall \ + --enable-write \ + --without-pam \ + $(use unicode || echo --with-ncurses) \ + $(use_with selinux) \ + $(use_with slang) \ + $(tc-has-tls || echo --disable-tls) +} + +src_install() { + emake install DESTDIR="${D}" || die "install failed" + dodoc AUTHORS NEWS README* TODO docs/* + + if ! use perl ; then #284093 + rm "${D}"/usr/bin/chkdupexe || die + rm "${D}"/usr/share/man/man1/chkdupexe.1 || die + fi + + # need the libs in / + gen_usr_ldscript -a blkid uuid + # e2fsprogs-libs didnt install .la files, and .pc work fine + rm -f "${D}"/usr/$(get_libdir)/*.la + + if use crypt ; then + newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die + newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die + fi +} diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index ce78d71967f6..32c9f120eef2 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 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.13 2009/12/01 04:52:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.14 2010/06/30 18:21:32 vapier Exp $ EAPI="2" EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git" -inherit eutils toolchain-funcs +inherit eutils toolchain-funcs libtool flag-o-matic [[ ${PV} == "9999" ]] && inherit git autotools MY_PV=${PV/_/-} @@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then #KEYWORDS="" else SRC_URI="mirror://kernel/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2 - loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-ng-2.16-20090725.diff.bz2 )" + loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-ng-2.17.1-20100308.diff.bz2 )" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi @@ -36,7 +36,6 @@ 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" @@ -48,9 +47,24 @@ src_prepare() { use loop-aes && epatch "${WORKDIR}"/util-linux-ng-*.diff fi use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c + elibtoolize +} + +lfs_fallocate_test() { + # Make sure we can use fallocate with LFS #300307 + cat <<-EOF > "${T}"/fallocate.c + #define _GNU_SOURCE + #include + main() { return fallocate(0, 0, 0, 0); } + EOF + append-lfs-flags + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \ + || export ac_cv_func_fallocate=no + rm -f "${T}"/fallocate.c } src_configure() { + lfs_fallocate_test econf \ $(use_enable nls) \ --enable-agetty \ -- 2.26.2