[gentoo-commits] repo/gentoo:master commit in: sys-block/parted/files/, sys-block/parted/

[Andreas Hüttel]

commit:     3571d8bf77ab6a3ae461f2faa15e3ad9521b32b9
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 22:31:11 2018 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 22:31:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3571d8bf

sys-block/parted: Drop old, bug 575232

Bug: https://bugs.gentoo.org/580022
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-block/parted/Manifest                        |   2 -
 sys-block/parted/files/parted-2.4-no-gets.patch  |  10 --
 sys-block/parted/files/parted-2.4-readline.patch |  11 --
 sys-block/parted/files/parted-3.1-readline.patch |  11 --
 sys-block/parted/files/parted-3.1-zfs.patch      | 170 -----------------------
 sys-block/parted/parted-2.4-r1.ebuild            |  54 -------
 sys-block/parted/parted-2.4.ebuild               |  55 --------
 sys-block/parted/parted-3.1-r1.ebuild            |  81 -----------
 sys-block/parted/parted-3.1-r2.ebuild            |  85 ------------
 9 files changed, 479 deletions(-)

diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index 9e17484a69a..fbf95dc359e 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -1,5 +1,3 @@
-DIST parted-2.4.tar.xz 1516412 BLAKE2B fdc489ba9e0636b6f3e67d3863acf88ab3143e60aab2a75765502347e644954014530b7b1ad6dd625e6504abf936d367e65d418ba13379f57b4ba1c386583a23 SHA512 1f7ac11079981b176c1157bd6d858e67394bb4be9b622f91d4e78412a41c696809ed60912b8b94f3a2a924b2f43638dd5d6cb6f4c28e8dc63a2d421380cb5477
-DIST parted-3.1.tar.xz 1524344 BLAKE2B 51f6cb84fb0a08dc5c9f634e265e4ac7778cde9f5400771af897a8661bf6dcdcfac2b2dec817c7d0f61d3fd5f8408c065754ea756ed59491dff75595d4306a2d SHA512 f29a67a16cf79f08abbfc5eeb6ad0480d834aa50e715378626dc89e3b12ce71f19202e9f38429e5521ebe877c4e74ff1e08f0b0ecbdbe79ba1c51fdcbef6e852
 DIST parted-3.2.tar.xz 1655244 BLAKE2B 56608590b26a9b5266dacf3698d990b730bdb35d9374d1da57103fbef3ef5037e40dd2fe0f523ca8e0e75401a3b25cf543e5ca5c94cf410bbaa62ea15d6f0ba3 SHA512 4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4
 DIST parted_3.2-19.debian.tar.xz 87288 BLAKE2B f0cef2978ead9edca3e952849deb36526eea0a050d45ab480b2aa62d02ba0a1750c28e93c28a714df6629f02ccf5a1e4fbb33a6e42b82bf6685c05aeaad1756c SHA512 de3e55545d7d94668eb608c8c31440f550baaf7b664836d199f73f7a8c75bba4ff59b4c06a23459c7d522250d7c03d29fa7f727f7d1a2b1e5a0366e83a2d871a
 DIST parted_3.2-20.debian.tar.xz 87496 BLAKE2B 4409826b35b42093f16f80b1ab2f41b4caf2264c9dcfe9572fa1ddf5f51eeffa2208fc187bd7a98290ee2df92604928eae84fd2fdee78d688ec19e81f8b9efac SHA512 83f14befdd7d048976572b3e2eebfaa42649458cbcfd659db704737dce991980ddb2bc65013c5b31b04a17fc17fb756da0dda76edbcba93708afca34c56e0d22

diff --git a/sys-block/parted/files/parted-2.4-no-gets.patch b/sys-block/parted/files/parted-2.4-no-gets.patch
deleted file mode 100644
index efa6e00b8d4..00000000000
--- a/sys-block/parted/files/parted-2.4-no-gets.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -735,7 +735,6 @@
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
- 
- 

diff --git a/sys-block/parted/files/parted-2.4-readline.patch b/sys-block/parted/files/parted-2.4-readline.patch
deleted file mode 100644
index 5873ed1e5d4..00000000000
--- a/sys-block/parted/files/parted-2.4-readline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/parted/ui.c
-+++ b/parted/ui.c
-@@ -1440,7 +1440,7 @@
- #ifdef HAVE_LIBREADLINE
-   if (!opt_script_mode) {
-     rl_initialize ();
--    rl_attempted_completion_function = (CPPFunction*) complete_function;
-+    rl_attempted_completion_function = (rl_completion_func_t*) complete_function;
-     readline_state.in_readline = 0;
-   }
- #endif

diff --git a/sys-block/parted/files/parted-3.1-readline.patch b/sys-block/parted/files/parted-3.1-readline.patch
deleted file mode 100644
index 936ec00cbef..00000000000
--- a/sys-block/parted/files/parted-3.1-readline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/parted/ui.c
-+++ b/parted/ui.c
-@@ -1474,7 +1474,7 @@
- #ifdef HAVE_LIBREADLINE
-   if (!opt_script_mode) {
-     rl_initialize ();
--    rl_attempted_completion_function = (CPPFunction*) complete_function;
-+    rl_attempted_completion_function = (rl_completion_func_t*) complete_function;
-     readline_state.in_readline = 0;
-   }
- #endif

diff --git a/sys-block/parted/files/parted-3.1-zfs.patch b/sys-block/parted/files/parted-3.1-zfs.patch
deleted file mode 100644
index a87d6d34655..00000000000
--- a/sys-block/parted/files/parted-3.1-zfs.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-commit 65f838008107a688751dd5a2753c9073e9353daf
-Author: root <root@desktop.(none)>
-Date:   Fri Jun 1 16:26:34 2012 -0400
-
-    Add ZFS Support
-
-diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
-index 8d48ea1..51b4151 100644
---- a/libparted/fs/Makefile.am
-+++ b/libparted/fs/Makefile.am
-@@ -49,7 +49,8 @@ libfs_la_SOURCES =		\
-   xfs/platform_defs.h		\
-   xfs/xfs.c			\
-   xfs/xfs_sb.h			\
--  xfs/xfs_types.h
-+  xfs/xfs_types.h		\
-+  zfs/zfs.c
- 
- lib_LTLIBRARIES = libparted-fs-resize.la
- 
-diff --git a/libparted/fs/Makefile.in b/libparted/fs/Makefile.in
-index 4335eb1..e3a134b 100644
---- a/libparted/fs/Makefile.in
-+++ b/libparted/fs/Makefile.in
-@@ -1112,7 +1112,8 @@ libfs_la_SOURCES = \
-   xfs/platform_defs.h		\
-   xfs/xfs.c			\
-   xfs/xfs_sb.h			\
--  xfs/xfs_types.h
-+  xfs/xfs_types.h		\
-+  zfs/zfs.c
- 
- lib_LTLIBRARIES = libparted-fs-resize.la
- EXTRA_DIST = hfs/DOC hfs/HISTORY hfs/TODO fsresize.sym
-diff --git a/libparted/fs/zfs/Makefile.am b/libparted/fs/zfs/Makefile.am
-new file mode 100644
-index 0000000..3273c6a
---- /dev/null
-+++ b/libparted/fs/zfs/zfs.c
-@@ -0,0 +1,81 @@
-+/*
-+    libparted - a library for manipulating disk partitions
-+    Copyright (C) 2000, 2007, 2009-2010 Free Software Foundation, Inc.
-+
-+    This program is free software; you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation; either version 3 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+*/
-+
-+#include <config.h>
-+
-+#include <parted/parted.h>
-+#include <parted/endian.h>
-+
-+#if ENABLE_NLS
-+#  include <libintl.h>
-+#  define _(String) dgettext (PACKAGE, String)
-+#else
-+#  define _(String) (String)
-+#endif /* ENABLE_NLS */
-+
-+#include <unistd.h>
-+
-+#define ZFS_BLOCK_SIZES       ((int[2]){512, 0})
-+
-+#define ZFS_SIGNATURE		0x00bab10c
-+
-+struct zfs_uberblock
-+{ 
-+  uint64_t signature;
-+  uint64_t version;
-+};
-+
-+static PedGeometry*
-+zfs_probe (PedGeometry* geom)
-+{
-+	uint8_t	buf[512];
-+	struct zfs_uberblock *uber = (void *) buf;
-+
-+	if (!ped_geometry_read (geom, buf, 256, 1))
-+		return 0;
-+
-+	if ((le64toh (uber->signature) == ZFS_SIGNATURE
-+		|| be64toh (uber->signature) == ZFS_SIGNATURE)
-+		&& uber->version != 0)
-+		return ped_geometry_new (geom->dev, geom->start, geom->length);
-+	else
-+		return NULL;
-+}
-+
-+static PedFileSystemOps zfs_ops = {
-+	probe:		zfs_probe,
-+};
-+
-+static PedFileSystemType zfs_type = {
-+	next:	NULL,
-+	ops:	&zfs_ops,
-+	name:	"zfs",
-+	block_sizes: ZFS_BLOCK_SIZES
-+};
-+
-+void
-+ped_file_system_zfs_init ()
-+{
-+	ped_file_system_type_register (&zfs_type);
-+}
-+
-+void
-+ped_file_system_zfs_done ()
-+{
-+	ped_file_system_type_unregister (&zfs_type);
-+}
-diff --git a/libparted/libparted.c b/libparted/libparted.c
-index a6d86f0..6545989 100644
---- a/libparted/libparted.c
-+++ b/libparted/libparted.c
-@@ -109,6 +109,7 @@ extern void ped_file_system_hfs_init (void);
- extern void ped_file_system_fat_init (void);
- extern void ped_file_system_ext2_init (void);
- extern void ped_file_system_nilfs2_init (void);
-+extern void ped_file_system_zfs_init (void);
- 
- static void
- init_file_system_types ()
-@@ -124,6 +125,7 @@ init_file_system_types ()
- 	ped_file_system_fat_init ();
- 	ped_file_system_ext2_init ();
- 	ped_file_system_nilfs2_init ();
-+	ped_file_system_zfs_init ();
- }
- 
- extern void ped_disk_aix_done ();
-@@ -186,6 +188,7 @@ extern void ped_file_system_reiserfs_done (void);
- extern void ped_file_system_ufs_done (void);
- extern void ped_file_system_xfs_done (void);
- extern void ped_file_system_amiga_done (void);
-+extern void ped_file_system_zfs_done (void);
- 
- static void
- done_file_system_types ()
-@@ -201,6 +204,7 @@ done_file_system_types ()
- 	ped_file_system_ufs_done ();
- 	ped_file_system_xfs_done ();
- 	ped_file_system_amiga_done ();
-+	ped_file_system_zfs_done ();
- }
- 
- static void _done() __attribute__ ((destructor));
-diff --git a/scripts/data/abi/baseline_symbols.txt b/scripts/data/abi/baseline_symbols.txt
-index 9162f1a..8bb87e6 100644
---- a/scripts/data/abi/baseline_symbols.txt
-+++ b/scripts/data/abi/baseline_symbols.txt
-@@ -344,6 +344,8 @@ FUNC:ped_file_system_ufs_done
- FUNC:ped_file_system_ufs_init
- FUNC:ped_file_system_xfs_done
- FUNC:ped_file_system_xfs_init
-+FUNC:ped_file_system_zfs_done
-+FUNC:ped_file_system_zfs_init
- FUNC:ped_geometry_check
- FUNC:ped_geometry_destroy
- FUNC:ped_geometry_duplicate

diff --git a/sys-block/parted/parted-2.4-r1.ebuild b/sys-block/parted/parted-2.4-r1.ebuild
deleted file mode 100644
index 2e24db5fe76..00000000000
--- a/sys-block/parted/parted-2.4-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-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="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="+debug device-mapper nls readline selinux 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 )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.12.1-r2 )
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-no-gets.patch
-	"${FILESDIR}"/${P}-readline.patch
-)
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
-
-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
-
-	prune_libtool_files
-}

diff --git a/sys-block/parted/parted-2.4.ebuild b/sys-block/parted/parted-2.4.ebuild
deleted file mode 100644
index eb161766ad3..00000000000
--- a/sys-block/parted/parted-2.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-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="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="+debug device-mapper nls readline selinux 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 )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.12.1-r2 )
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-gets.patch
-	epatch "${FILESDIR}"/${P}-readline.patch
-}
-
-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
-}
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
-
-src_install() {
-	default
-	prune_libtool_files
-}

diff --git a/sys-block/parted/parted-3.1-r1.ebuild b/sys-block/parted/parted-3.1-r1.ebuild
deleted file mode 100644
index 011ec68857d..00000000000
--- a/sys-block/parted/parted-3.1-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils
-
-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="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="+debug device-mapper nls readline selinux static-libs test"
-
-# specific version for gettext needed
-# to fix bug 85999
-RDEPEND="
-	>=sys-fs/e2fsprogs-1.27
-	>=sys-libs/ncurses-5.7-r7
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	readline? ( >=sys-libs/readline-5.2 )
-	selinux? ( sys-libs/libselinux )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.12.1-r2 )
-	virtual/pkgconfig
-	test? (
-		>=dev-libs/check-0.9.3
-		dev-perl/Digest-CRC
-	)
-"
-
-src_prepare() {
-	# Remove tests known to FAIL instead of SKIP without OS/userland support
-	sed -i libparted/tests/Makefile.am \
-		-e 's|t3000-symlink.sh||g' || die "sed failed"
-	sed -i tests/Makefile.am \
-		-e '/t4100-msdos-partition-limits.sh/d' \
-		-e '/t4100-dvh-partition-limits.sh/d' \
-		-e '/t6000-dm.sh/d' || die "sed failed"
-	# there is no configure flag for controlling the dev-libs/check test
-	sed -i configure.ac \
-		-e "s:have_check=[a-z]*:have_check=$(usex test):g" || die
-
-	epatch "${FILESDIR}"/${PN}-3.1-zfs.patch
-	epatch "${FILESDIR}"/${PN}-3.1-readline.patch
-
-	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-rpath \
-		--disable-silent-rules
-}
-
-src_test() {
-	if use debug; then
-		# Do not die when tests fail - some requirements are not
-		# properly checked and should not lead to the ebuild failing.
-		emake check
-	else
-		ewarn "Skipping tests because USE=-debug is set."
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
-	dodoc doc/{API,FAT,USER.jp}
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}

diff --git a/sys-block/parted/parted-3.1-r2.ebuild b/sys-block/parted/parted-3.1-r2.ebuild
deleted file mode 100644
index 92ce2da8bcb..00000000000
--- a/sys-block/parted/parted-3.1-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-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="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="+debug device-mapper nls readline selinux static-libs test"
-
-# specific version for gettext needed
-# to fix bug 85999
-RDEPEND="
-	>=sys-fs/e2fsprogs-1.27
-	>=sys-libs/ncurses-5.7-r7
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	readline? ( >=sys-libs/readline-5.2 )
-	selinux? ( sys-libs/libselinux )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.12.1-r2 )
-	virtual/pkgconfig
-	test? (
-		>=dev-libs/check-0.9.3
-		dev-perl/Digest-CRC
-	)
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-zfs.patch
-	"${FILESDIR}"/${PN}-3.1-readline.patch
-)
-DOCS=(
-	AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp}
-)
-
-src_prepare() {
-	default
-
-	# Remove tests known to FAIL instead of SKIP without OS/userland support
-	sed -i libparted/tests/Makefile.am \
-		-e 's|t3000-symlink.sh||g' || die "sed failed"
-	sed -i tests/Makefile.am \
-		-e '/t4100-msdos-partition-limits.sh/d' \
-		-e '/t4100-dvh-partition-limits.sh/d' \
-		-e '/t6000-dm.sh/d' || die "sed failed"
-	# there is no configure flag for controlling the dev-libs/check test
-	sed -i configure.ac \
-		-e "s:have_check=[a-z]*:have_check=$(usex test):g" || die
-
-	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-rpath \
-		--disable-silent-rules
-}
-
-src_test() {
-	if use debug; then
-		# Do not die when tests fail - some requirements are not
-		# properly checked and should not lead to the ebuild failing.
-		emake check
-	else
-		ewarn "Skipping tests because USE=-debug is set."
-	fi
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-}