From 9efdea37fbfa020b9ce98afd8f10847017dd7aa0 Mon Sep 17 00:00:00 2001 From: Martin Väth Date: Tue, 11 Sep 2018 07:32:49 +0200 Subject: sys-block/parted: fix for >=sys-libs/glibc-2.26 --- sys-block/parted/files/parted-3.2-sysmacros.patch | 28 ++++++++ sys-block/parted/parted-2.4-r2.ebuild | 81 ---------------------- sys-block/parted/parted-2.4-r3.ebuild | 82 +++++++++++++++++++++++ 3 files changed, 110 insertions(+), 81 deletions(-) create mode 100644 sys-block/parted/files/parted-3.2-sysmacros.patch delete mode 100644 sys-block/parted/parted-2.4-r2.ebuild create mode 100644 sys-block/parted/parted-2.4-r3.ebuild (limited to 'sys-block') diff --git a/sys-block/parted/files/parted-3.2-sysmacros.patch b/sys-block/parted/files/parted-3.2-sysmacros.patch new file mode 100644 index 00000000..a29e7619 --- /dev/null +++ b/sys-block/parted/files/parted-3.2-sysmacros.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/580022 + +From dec8995fe80508374beba6356f6ecbba8ef6b18b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Tue, 21 Jun 2016 15:01:08 -0400 +Subject: [PATCH] include sysmacros.h for major/minor/makedev + +Linux C libs are moving away from including this header implicitly via +sys/types.h, so include it explicitly. +--- + libparted/arch/linux.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c +index 326b95619d31..e5c168be3c68 100644 +--- a/libparted/arch/linux.c ++++ b/libparted/arch/linux.c +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + #include + #include /* for uname() */ + #include +-- +2.8.2 + diff --git a/sys-block/parted/parted-2.4-r2.ebuild b/sys-block/parted/parted-2.4-r2.ebuild deleted file mode 100644 index 1e912c7b..00000000 --- a/sys-block/parted/parted-2.4-r2.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" -HOMEPAGE="https://www.gnu.org/software/parted" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="+debug device-mapper nls readline selinux standalone static-libs" -RESTRICT="test" - -# specific version for gettext needed -# to fix bug 85999 -RDEPEND=" - >=sys-fs/e2fsprogs-1.27 - >=sys-libs/ncurses-5.2:0= - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) - readline? ( >=sys-libs/readline-5.2:0= ) - selinux? ( sys-libs/libselinux ) - standalone? ( !sys-block/parted:0 ) - !standalone? ( sys-block/parted:0 ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -BDEPEND="nls? ( >=sys-devel/gettext-0.12.1-r2 )" -PATCHES=( - "${FILESDIR}"/${P}-no-gets.patch - "${FILESDIR}"/${P}-readline.patch -) -DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} ) - -src_prepare() { - if ! use standalone; then - sed -i -e "s/GNU parted/GNU parted2/" "${S}"/configure.ac - sed -i -e "s/partedinclude_HEADERS/partedinclude_NOINST/" \ - "${S}"/include/parted/Makefile.am || die - sed -i -e "/SUBDIRS.*=/{s/[[:space:]]*partprobe//}" \ - -e "s/pc_DATA/pc_NOINST/" \ - "${S}"/Makefile.am || die - sed -i -e "/partprobe.8/d" -e "s/parted[.]8.*/parted2.8/" \ - "${S}"/doc/C/Makefile.am || die - sed -i -e "s/parted/parted2/g" \ - -e "s/PARTED/PARTED2/g" -e "s/Parted/Parted2/g" \ - "${S}"/doc/parted*.* \ - "${S}"/doc/Makefile.am || die - mv "${S}"/doc/C/parted{,2}.8 || die - mv "${S}"/doc/parted{,2}.texi || die - mv "${S}"/doc/parted{,2}-pt_BR.texi || die - fi - default - use standalone || eautoreconf -} - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable device-mapper) \ - $(use_enable nls) \ - $(use_enable selinux) \ - $(use_enable static-libs static) \ - $(use_with readline) \ - --disable-Werror \ - --disable-rpath \ - --disable-silent-rules -} - -src_install() { - default - if ! use standalone; then - mv "${ED}"/usr/sbin/parted{,2} || die - rm "${ED}"/usr/$(get_libdir)/libparted.so || die - fi - find "${D}" -name '*.la' -delete || die -} diff --git a/sys-block/parted/parted-2.4-r3.ebuild b/sys-block/parted/parted-2.4-r3.ebuild new file mode 100644 index 00000000..05432868 --- /dev/null +++ b/sys-block/parted/parted-2.4-r3.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools + +DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" +HOMEPAGE="https://www.gnu.org/software/parted" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="+debug device-mapper nls readline selinux standalone static-libs" +RESTRICT="test" + +# specific version for gettext needed +# to fix bug 85999 +RDEPEND=" + >=sys-fs/e2fsprogs-1.27 + >=sys-libs/ncurses-5.2:0= + device-mapper? ( >=sys-fs/lvm2-2.02.45 ) + readline? ( >=sys-libs/readline-5.2:0= ) + selinux? ( sys-libs/libselinux ) + standalone? ( !sys-block/parted:0 ) + !standalone? ( sys-block/parted:0 ) +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" +BDEPEND="nls? ( >=sys-devel/gettext-0.12.1-r2 )" +PATCHES=( + "${FILESDIR}"/${P}-no-gets.patch + "${FILESDIR}"/${P}-readline.patch + "${FILESDIR}"/${PN}-3.2-sysmacros.patch +) +DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} ) + +src_prepare() { + if ! use standalone; then + sed -i -e "s/GNU parted/GNU parted2/" "${S}"/configure.ac + sed -i -e "s/partedinclude_HEADERS/partedinclude_NOINST/" \ + "${S}"/include/parted/Makefile.am || die + sed -i -e "/SUBDIRS.*=/{s/[[:space:]]*partprobe//}" \ + -e "s/pc_DATA/pc_NOINST/" \ + "${S}"/Makefile.am || die + sed -i -e "/partprobe.8/d" -e "s/parted[.]8.*/parted2.8/" \ + "${S}"/doc/C/Makefile.am || die + sed -i -e "s/parted/parted2/g" \ + -e "s/PARTED/PARTED2/g" -e "s/Parted/Parted2/g" \ + "${S}"/doc/parted*.* \ + "${S}"/doc/Makefile.am || die + mv "${S}"/doc/C/parted{,2}.8 || die + mv "${S}"/doc/parted{,2}.texi || die + mv "${S}"/doc/parted{,2}-pt_BR.texi || die + fi + default + use standalone || eautoreconf +} + +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable device-mapper) \ + $(use_enable nls) \ + $(use_enable selinux) \ + $(use_enable static-libs static) \ + $(use_with readline) \ + --disable-Werror \ + --disable-rpath \ + --disable-silent-rules +} + +src_install() { + default + if ! use standalone; then + mv "${ED}"/usr/sbin/parted{,2} || die + rm "${ED}"/usr/$(get_libdir)/libparted.so || die + fi + find "${D}" -name '*.la' -delete || die +} -- cgit v1.2.3-18-g5258