summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2017-01-21 01:36:10 +0100
committerLars Wendler <polynomial-c@gentoo.org>2017-01-21 01:36:10 +0100
commite422bb8f40b88a7317718049ab1e8eaa6801c91f (patch)
tree8ad2537c9eb638fb6c764806a9edb88791a879a6 /sys-apps/util-linux
parentsys-apps/util-linux: Bump to version 2.29.1 (diff)
downloadgentoo-e422bb8f40b88a7317718049ab1e8eaa6801c91f.tar.gz
gentoo-e422bb8f40b88a7317718049ab1e8eaa6801c91f.tar.bz2
gentoo-e422bb8f40b88a7317718049ab1e8eaa6801c91f.zip
sys-apps/util-linux: Removed old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'sys-apps/util-linux')
-rw-r--r--sys-apps/util-linux/Manifest1
-rw-r--r--sys-apps/util-linux/files/util-linux-2.27.1-sysmacros.patch278
-rw-r--r--sys-apps/util-linux/util-linux-2.27.1.ebuild186
3 files changed, 0 insertions, 465 deletions
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index adaf831b462e..7cadb19ce568 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,5 +1,4 @@
DIST util-linux-2.26.2.tar.xz 3863868 SHA256 0e29bda142528a48a0a953c39ff63093651a4809042e1790fbd6aa8663fd9666 SHA512 1cb8e2f32882b3f496d31c250a45cfb61bedb79f7a2802b358c23134d4257fa9bc9cde8888cfa1aaba12109f82b93345c6dc0bec2d11629ffa084f2a4476a91b WHIRLPOOL 699ff057f9930fe53f44090817c64ffe089345e7aba4c836e18cd3d2088881add805640b0e41b8d60bc08e3632be919025417feb9c2ddda454c87821a59122ed
-DIST util-linux-2.27.1.tar.xz 3964512 SHA256 0a818fcdede99aec43ffe6ca5b5388bff80d162f2f7bd4541dca94fecb87a290 SHA512 a450a0c2d26a6deaf5e53b8f6bddf59409aefb1f0aaf07393f68a418408fbc62c5da353c8ba53c7cac8ea6e3dddfad59161753d888c31f5ccea445e81accbad8 WHIRLPOOL b0641f013762a667efcb2fabe6e3e09dd09252835d841e25cde506aca3a74876ad34f8130f3227683c7e8f19359205c4014dfcd9055d860ae6e3e54621478639
DIST util-linux-2.28.2.tar.xz 4149700 SHA256 b89d37146f20bede93a42c847bce881a17e6dbd8066ff2db2bee733fa409f0cd SHA512 ac1c2d4c92bbc4eabed464cb0334c1d9b21e58df0f07f0b26e7adcfa188879de8632d195b65a4358c5e11e14ac6e09a1c6206265bbf1fab4ce122414bee7e940 WHIRLPOOL 1735e33620dba30cc1f42e60b707adb72234006b7fea242ac98c389295617bd0225563bcffa76b9d0753dfa100775dd9a2b73614843645ce667db5536842e308
DIST util-linux-2.29.1.tar.xz 4278756 SHA256 0ce40600b934ec2fecfa6bfc4efe6982d051ba96c2832b05201347aec582f54f SHA512 221fc7651eb0534c55206eaf9184b2eb55d9f838cd0e1623cadac5d4ac57a118d96cdd770b6492b39381dd1316b81553866bc0f8c25dbb52dac9641f2fa0f7fa WHIRLPOOL d509168960b0ad54ade4d03dc39dca1dcf0bb0a5b51a594f04bc02ff3a6c89fc5966cff4653dfc826f75f8864497da600c7a86039099845b98e6f9d7981cff98
DIST util-linux-2.29.tar.xz 4249020 SHA256 2c59ea67cc7b564104f60532f6e0a95fe17a91acb870ba8fd7e986f273abf9e7 SHA512 ec6d5b2ef49069341dbb805ccdaca7a2e4d6aaa4d06f34c1de24e538ed971bd83749b6c5a6ce75d72d86817edb6b4eb3396579d18cdb523eb02b92427f41d7f3 WHIRLPOOL b07750566086a183175c6ec6eb935ce2e37ffaf5eeca4b58ea7e823c6dfdd63dd52543b7009014ace20ef9cb9be363cfade85bcbfbd4fa7ac388e0eefbb80f05
diff --git a/sys-apps/util-linux/files/util-linux-2.27.1-sysmacros.patch b/sys-apps/util-linux/files/util-linux-2.27.1-sysmacros.patch
deleted file mode 100644
index 9c64e073427d..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.27.1-sysmacros.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-From 71cd37a19acef366ff12f322c78c711559764e13 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 7 Mar 2016 16:42:05 -0500
-Subject: [PATCH] include sysmacros.h where used
-
-BSD/Linux systems stick major/minor/makedev in sysmacros.h. Newer Linux
-libraries have been moving away from including sysmacros.h implicitly via
-sys/types.h, so include it directly.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
-
-diff --git a/lib/ismounted.c b/lib/ismounted.c
-index f83be65..9b0e447 100644
---- a/lib/ismounted.c
-+++ b/lib/ismounted.c
-@@ -18,6 +18,7 @@
- #include <sys/stat.h>
- #include <ctype.h>
- #include <sys/param.h>
-+#include <sys/sysmacros.h>
- #ifdef __APPLE__
- #include <sys/ucred.h>
- #include <sys/mount.h>
-diff --git a/lib/sysfs.c b/lib/sysfs.c
-index 9e973a4..4b46459 100644
---- a/lib/sysfs.c
-+++ b/lib/sysfs.c
-@@ -7,6 +7,7 @@
- * Written by Karel Zak <kzak@redhat.com>
- */
- #include <ctype.h>
-+#include <sys/sysmacros.h>
-
- #include "c.h"
- #include "at.h"
-diff --git a/login-utils/sulogin-consoles.c b/login-utils/sulogin-consoles.c
-index fe8eab1..56f5336 100644
---- a/login-utils/sulogin-consoles.c
-+++ b/login-utils/sulogin-consoles.c
-@@ -27,6 +27,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-diff --git a/libblkid/src/devname.c b/libblkid/src/devname.c
-index dbbe5b5..d583800 100644
---- a/libblkid/src/devname.c
-+++ b/libblkid/src/devname.c
-@@ -25,6 +25,7 @@
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
-+#include <sys/sysmacros.h>
- #include <dirent.h>
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
-diff --git a/libblkid/src/devno.c b/libblkid/src/devno.c
-index 58fbce5..4b8f3db 100644
---- a/libblkid/src/devno.c
-+++ b/libblkid/src/devno.c
-@@ -31,6 +31,7 @@
- #endif
- #include <fcntl.h>
- #include <inttypes.h>
-+#include <sys/sysmacros.h>
-
- #include "blkidP.h"
- #include "pathnames.h"
-diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
-index cee7008..29b4428 100644
---- a/libmount/src/tab_parse.c
-+++ b/libmount/src/tab_parse.c
-@@ -16,6 +16,7 @@
- #include <limits.h>
- #include <dirent.h>
- #include <fcntl.h>
-+#include <sys/sysmacros.h>
-
- #include "at.h"
- #include "mangle.h"
-diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
-index f72be14..e14119b 100644
---- a/misc-utils/findmnt.c
-+++ b/misc-utils/findmnt.c
-@@ -31,6 +31,7 @@
- #include <assert.h>
- #include <poll.h>
- #include <sys/statvfs.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #ifdef HAVE_LIBUDEV
- # include <libudev.h>
-diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
-index c9a39b3..6010167 100644
---- a/misc-utils/lsblk.c
-+++ b/misc-utils/lsblk.c
-@@ -26,6 +26,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <stdint.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <dirent.h>
-diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c
-index a47c1d0..7689964 100644
---- a/misc-utils/lslocks.c
-+++ b/misc-utils/lslocks.c
-@@ -30,6 +30,7 @@
- #include <dirent.h>
- #include <unistd.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
-
- #include <libmount.h>
-diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
-index 6f9e78b..2b7e712 100644
---- a/disk-utils/fsck.c
-+++ b/disk-utils/fsck.c
-@@ -30,6 +30,7 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/file.h>
- #include <fcntl.h>
- #include <limits.h>
-diff --git a/disk-utils/partx.c b/disk-utils/partx.c
-index 50bd6a4..955166b 100644
---- a/disk-utils/partx.c
-+++ b/disk-utils/partx.c
-@@ -19,6 +19,7 @@
- #include <unistd.h>
- #include <assert.h>
- #include <dirent.h>
-+#include <sys/sysmacros.h>
-
- #include <blkid.h>
- #include <libsmartcols.h>
-diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
-index 81371eb..9c1aacb 100644
---- a/disk-utils/sfdisk.c
-+++ b/disk-utils/sfdisk.c
-@@ -29,6 +29,7 @@
- #include <errno.h>
- #include <getopt.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <assert.h>
- #include <fcntl.h>
- #include <libsmartcols.h>
-diff --git a/libblkid/src/evaluate.c b/libblkid/src/evaluate.c
-index ffbe097..3d9a76b 100644
---- a/libblkid/src/evaluate.c
-+++ b/libblkid/src/evaluate.c
-@@ -12,6 +12,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <ctype.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
-diff --git a/libblkid/src/partitions/partitions.c b/libblkid/src/partitions/partitions.c
-index c8e0bfe..4ba5411 100644
---- a/libblkid/src/partitions/partitions.c
-+++ b/libblkid/src/partitions/partitions.c
-@@ -15,6 +15,7 @@
- #include <ctype.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <errno.h>
- #include <stdint.h>
- #include <inttypes.h>
-diff --git a/libblkid/src/topology/dm.c b/libblkid/src/topology/dm.c
-index e061632..993161c 100644
---- a/libblkid/src/topology/dm.c
-+++ b/libblkid/src/topology/dm.c
-@@ -17,6 +17,7 @@
- #include <string.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <unistd.h>
-
- #include "topology.h"
-diff --git a/libblkid/src/topology/evms.c b/libblkid/src/topology/evms.c
-index 7a4fd55..b59b97b 100644
---- a/libblkid/src/topology/evms.c
-+++ b/libblkid/src/topology/evms.c
-@@ -18,6 +18,7 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <unistd.h>
-
- #include "topology.h"
-diff --git a/libblkid/src/topology/lvm.c b/libblkid/src/topology/lvm.c
-index bd079d4..2ade0c2 100644
---- a/libblkid/src/topology/lvm.c
-+++ b/libblkid/src/topology/lvm.c
-@@ -17,6 +17,7 @@
- #include <string.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <unistd.h>
-
- #include "topology.h"
-diff --git a/libblkid/src/topology/md.c b/libblkid/src/topology/md.c
-index 5eba947..388f996 100644
---- a/libblkid/src/topology/md.c
-+++ b/libblkid/src/topology/md.c
-@@ -18,6 +18,7 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <unistd.h>
-
- #include "topology.h"
-diff --git a/libmount/python/fs.c b/libmount/python/fs.c
-index 0789d37..651a7c5 100644
---- a/libmount/python/fs.c
-+++ b/libmount/python/fs.c
-@@ -27,6 +27,7 @@
-
- #include "pylibmount.h"
- #include <errno.h>
-+#include <sys/sysmacros.h>
-
- #define Fs_HELP "Fs(source=None, root=None, target=None, fstype=None, options=None, attributes=None, freq=0, passno=0)"
-
-diff --git a/libmount/src/fs.c b/libmount/src/fs.c
-index 2bab7d6..ab3155d 100644
---- a/libmount/src/fs.c
-+++ b/libmount/src/fs.c
-@@ -14,6 +14,7 @@
- #include <ctype.h>
- #include <blkid.h>
- #include <stddef.h>
-+#include <sys/sysmacros.h>
-
- #include "mountP.h"
- #include "strutils.h"
-diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c
-index 1d57ab3..90a42b6 100644
---- a/sys-utils/losetup.c
-+++ b/sys-utils/losetup.c
-@@ -12,6 +12,7 @@
- #include <unistd.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <inttypes.h>
- #include <getopt.h>
-
-diff --git a/sys-utils/mountpoint.c b/sys-utils/mountpoint.c
-index ad9c1da..64d0a7e 100644
---- a/sys-utils/mountpoint.c
-+++ b/sys-utils/mountpoint.c
-@@ -31,6 +31,7 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
-
- #include <libmount.h>
-
---
-2.6.2
diff --git a/sys-apps/util-linux/util-linux-2.27.1.ebuild b/sys-apps/util-linux/util-linux-2.27.1.ebuild
deleted file mode 100644
index 08624a8c08c5..000000000000
--- a/sys-apps/util-linux/util-linux-2.27.1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
- python-single-r1 multilib-minimal systemd
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-2 autotools
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
- SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode"
-
-RDEPEND="caps? ( sys-libs/libcap-ng )
- cramfs? ( sys-libs/zlib )
- ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
- pam? ( sys-libs/pam )
- python? ( ${PYTHON_DEPS} )
- readline? ( sys-libs/readline:0= )
- selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
- slang? ( sys-libs/slang )
- !build? ( systemd? ( sys-apps/systemd ) )
- udev? ( virtual/libudev:= )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20150406-r2
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( sys-devel/bc )
- virtual/os-headers"
-RDEPEND+="
- kill? (
- !sys-apps/coreutils[kill]
- !sys-process/procps[kill]
- )
- !sys-process/schedutils
- !sys-apps/setarch
- !<sys-apps/sysvinit-2.88-r7
- !sys-block/eject
- !<sys-libs/e2fsprogs-libs-1.41.8
- !<sys-fs/e2fsprogs-1.41.8
- !<app-shells/bash-completion-1.3-r2"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- if [[ ${PV} == 9999 ]] ; then
- po/update-potfiles
- eautoreconf
- fi
- epatch "${FILESDIR}"/${P}-sysmacros.patch
- elibtoolize
-}
-
-lfs_fallocate_test() {
- # Make sure we can use fallocate with LFS #300307
- cat <<-EOF > "${T}"/fallocate.${ABI}.c
- #define _GNU_SOURCE
- #include <fcntl.h>
- main() { return fallocate(0, 0, 0, 0); }
- EOF
- append-lfs-flags
- $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
- || export ac_cv_func_fallocate=no
- rm -f "${T}"/fallocate.${ABI}.c
-}
-
-multilib_src_configure() {
- lfs_fallocate_test
- # The scanf test in a run-time test which fails while cross-compiling.
- # Blindly assume a POSIX setup since we require libmount, and libmount
- # itself fails when the scanf test fails. #531856
- tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
- export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
- export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
- ECONF_SOURCE=${S} \
- econf \
- --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
- --docdir='${datarootdir}'/doc/${PF} \
- $(multilib_native_use_enable nls) \
- --enable-agetty \
- --with-bashcompletiondir="$(get_bashcompdir)" \
- --enable-bash-completion \
- $(multilib_native_use_enable caps setpriv) \
- --disable-chfn-chsh \
- $(multilib_native_use_enable cramfs) \
- $(multilib_native_use_enable fdformat) \
- --with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
- $(use_enable kill) \
- --disable-login \
- $(multilib_native_use_enable tty-helpers mesg) \
- --disable-nologin \
- --enable-partx \
- $(multilib_native_use_with python) \
- --enable-raw \
- $(multilib_native_use_with readline) \
- --enable-rename \
- --disable-reset \
- --enable-schedutils \
- --disable-su \
- $(multilib_native_use_enable tty-helpers wall) \
- $(multilib_native_use_enable tty-helpers write) \
- $(multilib_native_use_enable suid makeinstall-chown) \
- $(multilib_native_use_enable suid makeinstall-setuid) \
- $(use_with selinux) \
- $(multilib_native_use_with slang) \
- $(use_enable static-libs static) \
- $(multilib_native_use_with systemd) \
- --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") \
- $(multilib_native_use_with udev) \
- $(tc-has-tls || echo --disable-tls)
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- default
- else
- # build libraries only
- emake -f Makefile -f - mylibs \
- <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- default
- else
- emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
- install-pkgconfigDATA install-uuidincHEADERS \
- install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
- install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
- fi
-
- if multilib_is_native_abi; then
- # need the libs in /
- gen_usr_ldscript -a blkid mount smartcols uuid
-
- use python && python_optimize
- fi
-}
-
-multilib_src_install_all() {
- dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
- # e2fsprogs-libs didnt install .la files, and .pc work fine
- prune_libtool_files
-}
-
-pkg_postinst() {
- if ! use tty-helpers; then
- elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
- fi
-
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "The agetty util now clears the terminal by default. You"
- elog "might want to add --noclear to your /etc/inittab lines."
- fi
-}