gentoo auto-resync : 11:07:2022 - 01:28:44

5 files changed, 2 insertions, 139 deletions

diff --git a/sys-block/libzbc/Manifest b/sys-block/libzbc/Manifest
index b1e74ad35e99..800055e1d23b 100644
--- a/sys-block/libzbc/Manifest
+++ b/sys-block/libzbc/Manifest
@@ -1,7 +1,3 @@
-AUX libzbc-5.5.1-gcc-10.patch 2745 BLAKE2B d652144129c02bad8fa39b1587d54726e36c892b124c69084844737aa7604e16a00574569e95e6a0913f43002c4ff7240cbff017440b76842e013fdf25de6172 SHA512 d51a926e6db51df874f6cfdb73a7e85a4dd9a837fef62e6727f5e32b31fde8b9e1a2df0c06cdec0b5a9b53ab275761331566bf73f57811cbf39ebd91ee571212
-AUX libzbc-no-automagic-gtk-dep.patch 976 BLAKE2B 211a33a5eac0239526f050de30187b3392e953a257457de88c47eab39b9db518b2f9f7ea3110f6fd294ed2f54270f9a2cd25cdc38620ce7a62f2e3e68af088a6 SHA512 b1278b7d91bfabb577488016749a69714958601219a47a31794af4a22361a8f2621bdb1a964beaf78d7c73d00f934647a66e90681853abbcb5f8c7e969d981c7
-DIST libzbc-5.5.1.tar.gz 128638 BLAKE2B 3cb636f29ff29bb87c86bd800231a1b45f517822e5785af599a6385705dffa1e90574e4bd2c1b310d5a0dab094cf6e878fc80b6178ea4eb028d5d1d174e7559a SHA512 cb060d06839ea207ed2e32e940348176dd0eff2279cbdb72f565bef177eb4a195feea67c4d1ed5f455e3839475e0f4557a45774129e3d9e009ea38f9134ae159
 DIST libzbc-5.9.0.tar.gz 131517 BLAKE2B eb05214ffea376930f1b4327152da687067023eab929ed1db123ea3bc80e0f036dfbe9889da2707f1c3842120d4fc3b2c8ab471731d45d5483fe947c21fc7cad SHA512 bcdf294d86867736826af06ad6d18dec31630b3f5bc6e3e98c228bec6a30efcce76a27e3c66a08ce670614ca016dc079894320cff340bafe126fcb40973e8302
-EBUILD libzbc-5.5.1.ebuild 804 BLAKE2B 8909462a8bf9a3d07b2184eff23bb543bd8b66bed38ed573f01164297ecf687aaf409ccff703263e1eafa3ed4da03d04aeb3701e0a08c036141e1b2db2651943 SHA512 cb664f86d1fcd7f74a5bd1e28ce07d042e1cdeb601f8abcfda20cba8784092ac11d4e33d99922839d074be635a14b831ada0e99ad3a895d394c05834153c1b48
-EBUILD libzbc-5.9.0.ebuild 725 BLAKE2B 7ce0df5ed76d97a3c0610b2430552f73caa99102120bde310968ecd7747caa3045f6d9b06c1a8a8dd9e7fcd13f6e20cbff247d87205e6737554d222c929b01ae SHA512 39b849eaf81fbbc2690563a518cec3fcdba1080bf60ec83061e8cbc87609acc629f2f2339b51a0e836cb42261a3122580f69623f532ea648d730fef55144d7fb
+EBUILD libzbc-5.9.0.ebuild 720 BLAKE2B 19675d29bbb269c223e81cb48a27cc98abe0cfc5d865618fdf6e8aedbd8e810c7b27aae95d5d07d988b623d8e32a02d19dfb4fd0e62a35574b9e1e1170ef00d5 SHA512 fac4180745846a5fc4de0bd4ef2dc731ac545257b2d7c2741901e55a22d68fe2a6342384406a46a7bc1571e669350350689ffb8201e228a8ee91a2e6e610a280
 MISC metadata.xml 837 BLAKE2B 67dae957eefb0f1fc387e2488f4b04e56398bf036db1ac198d1ac2986fc70d9aa40376bb8d96aae223e79156a78dffa7348b5f2d578e138879b55aedb6f46e74 SHA512 2879a3b463bd30221be2f1ca7ea6ce3425dfaedab2c2b5666216cd76608844287dda50957e5386e6fd20e2689887f00b8a65a015bc9fef9c5928f9d4e9349740
diff --git a/sys-block/libzbc/files/libzbc-5.5.1-gcc-10.patch b/sys-block/libzbc/files/libzbc-5.5.1-gcc-10.patch
deleted file mode 100644
index 78511bf521d2..000000000000
--- a/sys-block/libzbc/files/libzbc-5.5.1-gcc-10.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-https://github.com/hgst/libzbc/commit/1f3a63432bb5a4ca47a5839181c8f13512848b6c
-https://bugs.gentoo.org/707808
-
-From 1f3a63432bb5a4ca47a5839181c8f13512848b6c Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Mon, 16 Mar 2020 08:01:44 +0100
-Subject: [PATCH] build: avoid double definition of zbc_log_drv etc.
-
-When -fno-common is in use, what compiler writers are trying to make
-a standard, libzbc fails to build.
-
-$ make V=1
-Making all in .
-make[1]: Entering directory '~/libzbc'
-/bin/sh ./libtool  --tag=CC   --mode=link gcc  -fPIC -fno-common -O2 -g -pthread -Wl,--version-script,./exports -release '5.8.5'  -o libzbc.la -rpath /usr/lib lib/libzbc_la-zbc.lo lib/libzbc_la-zbc_block.lo lib/libzbc_la-zbc_sg.lo lib/libzbc_la-zbc_scsi.lo lib/libzbc_la-zbc_ata.lo lib/libzbc_la-zbc_fake.lo
-libtool: link: gcc -shared  -fPIC -DPIC  lib/.libs/libzbc_la-zbc.o lib/.libs/libzbc_la-zbc_block.o lib/.libs/libzbc_la-zbc_sg.o lib/.libs/libzbc_la-zbc_scsi.o lib/.libs/libzbc_la-zbc_ata.o lib/.libs/libzbc_la-zbc_fake.o    -O2 -g -pthread -Wl,--version-script -Wl,./exports   -pthread -Wl,-soname -Wl,libzbc-5.8.5.so -o .libs/libzbc-5.8.5.so
-/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: lib/.libs/libzbc_la-zbc_block.o:~/libzbc/lib/zbc.h:269: multiple definition of `zbc_log_level'; lib/.libs/libzbc_la-zbc.o:~/libzbc/lib/zbc.h:269: first defined here
-/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: lib/.libs/libzbc_la-zbc_block.o:~/libzbc/lib/zbc.h:195: multiple definition of `zbc_fake_drv'; lib/.libs/libzbc_la-zbc.o:~/libzbc/lib/zbc.h:195: first defined here
-
-References: https://bugzilla.suse.com/show_bug.cgi?id=1160244
----
- lib/zbc.h | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/lib/zbc.h b/lib/zbc.h
-index 7dec298..73d76db 100644
---- a/lib/zbc.h
-+++ b/lib/zbc.h
-@@ -177,22 +177,22 @@ static inline void zbc_set_errno(enum zbc_sk sk, enum zbc_asc_ascq asc_ascq)
- /**
-  * Block device driver (requires kernel support).
-  */
--struct zbc_drv zbc_block_drv;
-+extern struct zbc_drv zbc_block_drv;
- 
- /**
-  * ZAC (ATA) device driver (uses SG_IO).
-  */
--struct zbc_drv zbc_ata_drv;
-+extern struct zbc_drv zbc_ata_drv;
- 
- /**
-  * ZBC (SCSI) device driver (uses SG_IO).
-  */
--struct zbc_drv zbc_scsi_drv;
-+extern struct zbc_drv zbc_scsi_drv;
- 
- /**
-  * ZBC emulation driver (file or block device).
-  */
--struct zbc_drv zbc_fake_drv;
-+extern struct zbc_drv zbc_fake_drv;
- 
- #define container_of(ptr, type, member) \
-     ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
-@@ -266,7 +266,7 @@ enum {
- /**
-  * Library log level.
-  */
--int zbc_log_level;
-+extern int zbc_log_level;
- 
- #define zbc_print(stream,format,args...)		\
- 	do {						\
diff --git a/sys-block/libzbc/files/libzbc-no-automagic-gtk-dep.patch b/sys-block/libzbc/files/libzbc-no-automagic-gtk-dep.patch
deleted file mode 100644
index c6545033b435..000000000000
--- a/sys-block/libzbc/files/libzbc-no-automagic-gtk-dep.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 122fd22..5ab9783 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -31,10 +31,22 @@ AC_CHECK_HEADER(libgen.h, [], [AC_MSG_ERROR([Couldn't find libgen.h])])
- AC_CHECK_HEADERS([linux/fs.h linux/blkzoned.h])
- 
- # Conditionals
-+AC_ARG_WITH([gtk3],
-+	AS_HELP_STRING([--without-gtk3], [Do not build gzbc even if gtk3 is present]))
-+
-+AS_IF([test "x$with_gtk3" != "xno"],
-+	[PKG_CHECK_MODULES([GTK], [gtk+-3.0], [HAVE_GTK3=1], [HAVE_GTK3=0])],
-+	[have_gtk3=no])
-+
-+AS_IF([test "x$with_gtk3" = "xyes"],
-+	[PKG_CHECK_MODULES([GTK], [gtk+-3.0], [HAVE_GTK3=1], [HAVE_GTK3=0])],
-+	[AS_IF([test "x$with_gtk3" = "xyes"],
-+		[AC_MSG_ERROR([gtk3 requested but not found])
-+	])
-+])
- 
- # Build gzbc only if GTK3 is installed.
--PKG_CHECK_MODULES([GTK], [gtk+-3.0], [HAVE_GTK3=1], [HAVE_GTK3=0])
--AM_CONDITIONAL([BUILD_GZBC], [test "$HAVE_GTK3" -eq 1])
-+AM_CONDITIONAL([BUILD_GZBC], [test "$HAVE_GTK3" = 1])
- 
- # Build test suite
- AC_ARG_WITH([test],
diff --git a/sys-block/libzbc/libzbc-5.5.1.ebuild b/sys-block/libzbc/libzbc-5.5.1.ebuild
deleted file mode 100644
index cda85212ec9a..000000000000
--- a/sys-block/libzbc/libzbc-5.5.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A library and tools for working with ZBC and ZAC disks"
-HOMEPAGE="https://github.com/hgst/libzbc"
-SRC_URI="https://github.com/hgst/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
-IUSE="gtk"
-
-DEPEND="virtual/pkgconfig
-	>=sys-kernel/linux-headers-4.13
-	gtk? ( x11-libs/gtk+:3 )"
-
-PATCHES=(
-	"${FILESDIR}/libzbc-no-automagic-gtk-dep.patch"
-	"${FILESDIR}/${P}-gcc-10.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with gtk gtk3) \
-		--disable-static
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-block/libzbc/libzbc-5.9.0.ebuild b/sys-block/libzbc/libzbc-5.9.0.ebuild
index f1c4a1a768fe..d478f8d6ecef 100644
--- a/sys-block/libzbc/libzbc-5.9.0.ebuild
+++ b/sys-block/libzbc/libzbc-5.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hgst/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~s390 ~sparc x86"
 IUSE="gtk"
 
 DEPEND="