diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
| commit | a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch) | |
| tree | 8c764c1cc0576389ce22abd317bceba71ea5732d /sys-block | |
| parent | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff) | |
gentoo resync : 04.05.2021
Diffstat (limited to 'sys-block')
26 files changed, 128 insertions, 559 deletions
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz Binary files differindex e2ddde3e0173..a69905f42e9a 100644 --- a/sys-block/Manifest.gz +++ b/sys-block/Manifest.gz diff --git a/sys-block/blktrace/Manifest b/sys-block/blktrace/Manifest index e996c285ff40..04a1eccd8bf9 100644 --- a/sys-block/blktrace/Manifest +++ b/sys-block/blktrace/Manifest @@ -1,10 +1,6 @@ -AUX blktrace-1.1.0-ldflags-parallel-make.patch 3043 BLAKE2B e6c3c6fd23795f18665ddc39ab55b351c1250cdb29bbbc171d8fcf4f0a0f2b2be94e7f697e2fd83d1dc56353aa98a8604fc540cb82e5c2800990dee0b9c01fbd SHA512 d119ef833ca50527a9f2705ff4a741a9d091625286253bf0d7440f695326eaa753232965bf69a6dad4ea24cf411ef2a992d4226e009d9b4fcadbec616c384fce AUX blktrace-1.2.0-ldflags.patch 2748 BLAKE2B 2e5bb94aeb829d6f187bb22c109f732fd442df20c1da4acc4cb31fff46d51e9dc37f0aa2c2bceac661c334c0f1727214fba4ee22455e4df2a58efb817d9eb1c3 SHA512 d0a411020f7ca01beea5c7915e1d934c93120d86111d789fd2c7719d10b116e56634b86fe5f37717e104c6493bbce2878df2abf9ddea8ba87089cb2f0a01c084 AUX blktrace-1.2.0-overlapping-io-stats.patch 1973 BLAKE2B 2ba883a033f24b9c3b70bab6f4b1c0843452cb1ec63b5d3efda549b0ff99d01170e43b9bcb8ab9ccb3206792aac7f69bc1b1fee5e39378159d4c30463bc8abc3 SHA512 b72a7f6bb03105e7e10116c70bc79d4fe131f223cf5d56649850f777c59226a8c78d7f0dc758fba97891f2f29bde903e41c7bf5e04cae710058a3e38017c02b7 AUX blktrace-1.2.0-parallel-build.patch 2300 BLAKE2B 87ff4b31b845aee1fe8f14a8a6d35d08d386969eee05c07b2e1b3de2fa2f039d49d699228ef01793cee935ecea5517c9603956866ac3f677eafbb153f9b5382f SHA512 fbb2b217b73072e408e1bad7e3b663935cb005c4ee5cf3dbb1d02cc17b55b511f5982e108545159d0968e8b6ec759441953fd127ad0beeb8661d51fcf9ba6ca1 -DIST blktrace-1.1.0.tar.bz2 395445 BLAKE2B 8a19142991527813942e6377baa5de825572196e75ea43606f2ae2db73d9278c8178f104910ecd92593a70fe9c86c36ebd718e09599e88824f5faaddca5bd7cd SHA512 52ed3b66e1ec62c2204d44037d4d13218fd0229ae694493a21f1e83bfc8aeb029edc96b2be83f39cc3e79500abad56cd5a71c8c4e6dd836661777662f3628355 DIST blktrace-1.2.0.tar.bz2 395193 BLAKE2B 8f8505f27985f0451f75ced0e438a88758482227e83ba8de235986ab3f116cf38d5aec340d1e7ce3dc3aa5a97c0bd4c46265687976e7326a54ea2e7cce4afc82 SHA512 ce82c8010ca5c2868746d8eb7c6a107fc7382c05df949eeff79e612f5b1a98301a5aa5ab39de0766ea1c074f95e378ba985401cbeba9a296e3182da7d7a23b86 -EBUILD blktrace-1.1.0-r1.ebuild 1225 BLAKE2B cfa2dcb047d08a5040a1f60dfb2f0070966a50275be9c1dd91c9b7d114b9f9d0a6a5e33fc6072075e0acda71be6be6df79c45985bfa3b637d2823cdcb1f780ab SHA512 5e616a2ed9c4faefab6b8e6bd78b87059db726c73286b152a128177f99e10af91caa3111d94bd5039dd02b5dabbe211fada80efca0da4bf03056606807b02b87 -EBUILD blktrace-1.1.0.ebuild 1240 BLAKE2B 0424f0219c8b1c8d64e4b6574358e903c100a00fba19be7f47e61be04e89a56913f87f398c4e2eda34049877a83a397a15c5cbe55a26e5b5829ea0cb7d93fbf6 SHA512 c56e3b597f0fa1d09cd2c7fc4a63fc0fca80a7eeaab34d1d812e984cf1e93f3730b996ee4523fa92e8d0d44017e5af57d6355d7b05e8b7c03fdf7d1ee2e1cfb6 EBUILD blktrace-1.2.0.ebuild 1370 BLAKE2B 9f79673ec496b7e8a5373af3ee2d53e44c306de91a45d74c11d6c5a92def87ac22cb50294aa1971f914e7c6923cfe5e619b18e3565639e8fb8de8ab777d9055a SHA512 3b48df771890b653872add3533114dead2ba9eac4d1f46aa935ecf6b691a4771da036f57aad4f5b9a5803e5584676d9cf5c889360e340b1e5eed966a47c70acf MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd diff --git a/sys-block/blktrace/blktrace-1.1.0-r1.ebuild b/sys-block/blktrace/blktrace-1.1.0-r1.ebuild deleted file mode 100644 index 29c03c431b25..000000000000 --- a/sys-block/blktrace/blktrace-1.1.0-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs flag-o-matic linux-info - -MY_PN="blktrace" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue" -HOMEPAGE="https://git.kernel.dk/cgit/blktrace/" -SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="~amd64 ~arm ~ppc ~x86" -IUSE="doc" - -RDEPEND="dev-libs/libaio" -# This is a Linux specific app! -DEPEND="${RDEPEND} - sys-kernel/linux-headers - doc? ( - virtual/latex-base - >=app-text/texlive-core-2014 - ) -" -S="${WORKDIR}/${MY_P}" - -CONFIG_CHECK="~BLK_DEV_IO_TRACE" -WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine" - -PATCHES=( "${FILESDIR}"/${PN}-1.1.0-ldflags-parallel-make.patch ) - -src_compile() { - append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}" - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" - if use doc; then - export VARTEXFONTS="${T}/fonts" - emake docs - fi -} - -src_install() { - emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" - einstalldocs - use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf -} diff --git a/sys-block/blktrace/blktrace-1.1.0.ebuild b/sys-block/blktrace/blktrace-1.1.0.ebuild deleted file mode 100644 index dd119541f90c..000000000000 --- a/sys-block/blktrace/blktrace-1.1.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit epatch toolchain-funcs flag-o-matic linux-info - -DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue" -HOMEPAGE="https://git.kernel.dk/cgit/blktrace/" -MY_PN="blktrace" -MY_P="${MY_PN}-${PV}" -SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc" -RDEPEND="" -# This is a Linux specific app! -DEPEND="${RDEPEND} - sys-kernel/linux-headers - doc? ( - virtual/latex-base - >=app-text/texlive-core-2014 - ) - dev-libs/libaio" -S="${WORKDIR}/${MY_P}" - -CONFIG_CHECK="~BLK_DEV_IO_TRACE" -WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.1.0-ldflags-parallel-make.patch -} - -src_compile() { - append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}" - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" - if use doc; then - export VARTEXFONTS="${T}/fonts" - emake docs - fi -} - -src_install() { - emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" - dodoc README - use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf -} diff --git a/sys-block/blktrace/files/blktrace-1.1.0-ldflags-parallel-make.patch b/sys-block/blktrace/files/blktrace-1.1.0-ldflags-parallel-make.patch deleted file mode 100644 index f26799238feb..000000000000 --- a/sys-block/blktrace/files/blktrace-1.1.0-ldflags-parallel-make.patch +++ /dev/null @@ -1,105 +0,0 @@ ---- blktrace-1.1.0/btreplay/Makefile -+++ blktrace-1.1.0/btreplay/Makefile -@@ -32,10 +32,10 @@ - $(CC) $(CFLAGS) -c -o $*.o $< - - btrecord: btrecord.o -- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) - - btreplay: btreplay.o -- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) - - depend: - @$(CC) -MM $(CFLAGS) *.c 1> .depend ---- blktrace-1.1.0/btt/Makefile -+++ blktrace-1.1.0/btt/Makefile -@@ -38,7 +38,7 @@ - $(CC) $(CFLAGS) -c -o $*.o $< - - btt: $(OBJS) -- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) - - ifneq ($(wildcard .depend),) - include .depend ---- blktrace-1.1.0/iowatcher/Makefile -+++ blktrace-1.1.0/iowatcher/Makefile -@@ -19,7 +19,7 @@ - $(CC) -o $*.o -c $(ALL_CFLAGS) $< - - iowatcher: blkparse.o plot.o main.o tracers.o mpstat.o fio.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) -lm - - depend: - @$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend ---- blktrace-1.1.0/Makefile -+++ blktrace-1.1.0/Makefile -@@ -4,41 +4,35 @@ - PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon - LIBS = -lpthread - SCRIPTS = btrace -+SUBDIRS = btreplay btt iowatcher - --ALL = $(PROGS) $(SCRIPTS) btt/btt btreplay/btrecord btreplay/btreplay \ -+ALL = $(PROGS) $(SCRIPTS) -+INSTALL_ALL = $(ALL) btt/btt btreplay/btrecord btreplay/btreplay \ - btt/bno_plot.py iowatcher/iowatcher - --all: $(ALL) -+all: $(ALL) $(SUBDIRS) -+.PHONY: $(SUBDIRS) - --btt/btt: -- $(MAKE) -C btt -- --iowatcher/iowatcher: -- $(MAKE) -C iowatcher -- --btreplay/btrecord: -- $(MAKE) -C btreplay -- --btreplay/btreplay: -- $(MAKE) -C btreplay -+$(SUBDIRS): $(PROGS) -+ $(MAKE) -C $@ - - %.o: %.c - $(CC) -o $*.o -c $(ALL_CFLAGS) $< - - blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) - - blktrace: blktrace.o act_mask.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) - - verify_blkparse: verify_blkparse.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) - - blkrawverify: blkrawverify.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) - - blkiomon: blkiomon.o rbtree.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt - - $(PROGS): | depend - -@@ -84,9 +78,10 @@ - $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) - $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1 - $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man8 -- $(INSTALL) -m 755 $(ALL) $(DESTDIR)$(bindir) -+ $(INSTALL) -m 755 $(INSTALL_ALL) $(DESTDIR)$(bindir) - $(INSTALL) -m 644 doc/*.1 $(DESTDIR)$(mandir)/man1 - $(INSTALL) -m 644 doc/*.8 $(DESTDIR)$(mandir)/man8 -+ $(INSTALL) -m 644 iowatcher/*.1 $(DESTDIR)$(mandir)/man1 - - ifneq ($(wildcard .depend),) - include .depend diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest index f5dadc20e08a..a1b247eb0bd4 100644 --- a/sys-block/fio/Manifest +++ b/sys-block/fio/Manifest @@ -1,5 +1,5 @@ AUX fio-2.2.13-libmtd.patch 398 BLAKE2B b1519ed240879f1260e3f5859c9cada3f41161457b7e06e5e764ac3a6656c3a6439fb5f0380cf90bbd6f2133f25e80419e108d725ea4672adfdd976bee94846f SHA512 18792d4ea3dbc2664d9e24541a07d82a50cd60bb7ff2d14bcdadd2207341c003ad2d298d99d65fd72c88813073b17d03a710a50db4df52ee72d49d9e9bcfe400 AUX fio-3.20-fno-common.patch 1220 BLAKE2B dcfaac74241111cae75ebf956f34258ce883b6abb360b51eaa6bf80c91770d0d4307818e7daf63dc284c3b21a0869d54523d9b4c5cb4733fac898d05c17c8933 SHA512 04e435073204d158d6e8a5de87681cd70fa76c80c82b4c86e3e12650288c3bb2c0c457d64e05812e94f9e07172b5df36542f330306bdbab8222ec2464bda12f4 DIST fio-3.20.tar.bz2 912040 BLAKE2B 44f8c20a390a6382aadc07881c1e7c65cca932099a1b3992e848669cf2a52b410fde67f9ae576efcd0d8e88ceec04174b6bc077d4b3f9b615b59be9f24f62bed SHA512 4e073754c95cb8d6416a80f48ca61003f34d664717f67a3f29b554e9205f8fe3553595ba6f8a8e9cb3463022d5c83be961f5b5a1ebcd2a9f4da9406a9986c1fb -EBUILD fio-3.20-r2.ebuild 4434 BLAKE2B f95ebb55386b67e87ac213f8627ecc6dbca158dddc3a2e69e0c3ba4a6939c06db11cb99d26e7bc426fe7c23eee1abb58a9bacb87fd86dbbd3aa3b8a73edb739d SHA512 a3f48d160ff9feeb6cc6439cd59fef828b648bda35fc35352dbac9e333b62b5607e5331a83d879ad89301ba2a434efcfa12c0952a1c4ab33dfee68d715cbee15 +EBUILD fio-3.20-r2.ebuild 4337 BLAKE2B cad2afe783c27e7e55fa8884d5fd8725ebf6f7900319970d7f837a999bc461e2cc8e882a7c86bdaeab3b60ecb07f11a2f1344122bcd0398e91602cf2852652c3 SHA512 b36adb5fa50b176031a63d4aa06bcf4bf2740b1daac62ddecdb542f437c03e858e43e332636eabcf9d3bf47c69e2e2192ee4549de95fded13a96aa48c03cc2a8 MISC metadata.xml 1172 BLAKE2B e35bbaaa15c8cd095791a4a23a7344314a015ea42bb864b11bb165d340585ee667f969426282465b834a7d092ab6885736e55ec8d4fe950001fbb6336fdfdc14 SHA512 defbc7f932a5ab83b67da58a601ef62784b27f2268f8a8dd5057c02fb441b164bd0945217fa52a0e06803c74b5168dda3b4668de52f593d5cade428bd2f79e86 diff --git a/sys-block/fio/fio-3.20-r2.ebuild b/sys-block/fio/fio-3.20-r2.ebuild index 0fd2c508cb22..272495d4ce18 100644 --- a/sys-block/fio/fio-3.20-r2.ebuild +++ b/sys-block/fio/fio-3.20-r2.ebuild @@ -17,9 +17,8 @@ SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 x86" -IUSE="aio curl glusterfs gnuplot gtk libressl io-uring numa python rbd rdma static tcmalloc test zbc zlib" +IUSE="aio curl glusterfs gnuplot gtk io-uring numa python rbd rdma static tcmalloc test zbc zlib" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) - libressl? ( curl ) gnuplot? ( python ) io-uring? ( aio )" RESTRICT="!test? ( test )" @@ -30,8 +29,7 @@ BDEPEND="virtual/pkgconfig" LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] ) curl? ( net-misc/curl:=[static-libs(+)] - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) + dev-libs/openssl:0=[static-libs(+)] ) glusterfs? ( sys-cluster/glusterfs[static-libs(+)] ) gtk? ( dev-libs/glib:2[static-libs(+)] ) diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest index 0d4838e2fe7a..444157778bcb 100644 --- a/sys-block/gparted/Manifest +++ b/sys-block/gparted/Manifest @@ -1,5 +1,7 @@ DIST gparted-1.1.0.tar.gz 4032829 BLAKE2B d47d45e77a3d9dc29e9fa0428aaa7c12bb863cb70ac11f4055cbcc0a0fde8019fbb20266b7f810d6a47c5239248486049c8e9813ead8e88081dd16f445da036a SHA512 afaad690fccbec7385b078a299b78bf4f0f83999e2661f89cb97f9e8f2b30ee41f0535450075e3a7174967e77c75024df78863d0d90d5e8dc726a487b4ae0bae DIST gparted-1.2.0.tar.gz 4057490 BLAKE2B 55b03f6bfe99ccccc7394dd64783c89511e48f8c9dd3d64792bb517a27ff5e77fc3be6bbd3ba140efd2ee525cffa4ba8d3136fd947e2d6e45a30f8bcaefb7a89 SHA512 10375ae351805597ec22aa7a7cc13e03bd08c45047c1a48c68194d6129b27f16035d2633d48db0d71923f6b45946ad6a218c17bfac7c38747ed7f908182c5445 +DIST gparted-1.3.0.tar.gz 4167440 BLAKE2B 87af5285a54af2ceb75eb6580b6492f7bcf6d8d2a9b4d614761b60c2b1776b2a8e14064ed5a77091074c5c5ff87169f3525fec2f37a280d35289677aaf75eba5 SHA512 8349ebdf2312e32df9f40d24aa42a4604897ebae72e58fd1046ab0897b3380a762b49f74bdcf3bd570b4e7a3468b6f225c22290c6b1b799911da17408912288b EBUILD gparted-1.1.0.ebuild 2172 BLAKE2B 9b3ca7d93c60746378c1d3c83b2fb74af17a70c43a0e1fd3f8c00a12b58ddc3be80560c785fbda89b99d2a0d0f582dba3a4e6e0f9779c5d6032555cf217e3cf1 SHA512 7fcc0b78d4de2d58a08794dcab6b5b025646ca52e186db9984493131a7f6b158cdb5f3dbfe066d8f7d02b5f1c8d91fc888af8be0ea79b53125b00e252a1c6b65 EBUILD gparted-1.2.0.ebuild 2673 BLAKE2B f5052c34eb937555932c82febc900f002ab9a9a28806c04d0384df3cebc5cb33598ce0a7ff39ba0ec750ceeb69e8f473203f75e3978de2e4de750f2e93585cf0 SHA512 a8173ed2b47ac231e0320e0e582bc25c5a79cca6c09073b3c497bf68f5694796a1d08e9b72d86c2afabdaaa5276d64aa4bcab44db2edb7ac7fe73045c9ad6622 +EBUILD gparted-1.3.0.ebuild 2673 BLAKE2B f5052c34eb937555932c82febc900f002ab9a9a28806c04d0384df3cebc5cb33598ce0a7ff39ba0ec750ceeb69e8f473203f75e3978de2e4de750f2e93585cf0 SHA512 a8173ed2b47ac231e0320e0e582bc25c5a79cca6c09073b3c497bf68f5694796a1d08e9b72d86c2afabdaaa5276d64aa4bcab44db2edb7ac7fe73045c9ad6622 MISC metadata.xml 2003 BLAKE2B c1568f7b030ae6d3f0ddc3724424bac3701fd470a535c5cedb8c5fb01f2c7f4f20476075be0033dacaf59bc9797f155c7fecc7ea4ef19ac4545454c275b82010 SHA512 03814c5741c01c342ebaa7b4923253f8efeb7beeb5026866dbc8a28ce1b3c3562c06eff108a15f2365070d389a84fe6d498bde39ed0632a63cf1eef412b3b97b diff --git a/sys-block/gparted/gparted-1.3.0.ebuild b/sys-block/gparted/gparted-1.3.0.ebuild new file mode 100644 index 000000000000..2990599fa1ef --- /dev/null +++ b/sys-block/gparted/gparted-1.3.0.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit gnome2 optfeature virtualx + +DESCRIPTION="Gnome Partition Editor" +HOMEPAGE="https://gparted.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2+ FDL-1.2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="kde policykit wayland" + +DEPEND=" + !policykit? ( + kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) ) + policykit? ( >=sys-auth/polkit-0.102 ) + >=dev-cpp/glibmm-2.56.1:2 + >=dev-cpp/gtkmm-3.24:3.0 + >=dev-libs/glib-2.58.3-r1:2 + >=sys-block/parted-3.2:= + >=dev-libs/libsigc++-2.10.1:2 +" +RDEPEND="${DEPEND} + >=sys-apps/util-linux-2.33.2 + wayland? ( x11-apps/xhost ) +" +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + >=dev-util/intltool-0.51.0-r2 + dev-util/itstool + sys-devel/gettext + virtual/pkgconfig +" + +src_configure() { + gnome2_src_configure \ + --enable-doc \ + --enable-online-resize \ + $(use_enable wayland xhost-root) \ + GKSUPROG=kdesu \ + ac_cv_prog_have_scrollkeeper_update=no +} + +src_install() { + gnome2_src_install + + local _ddir="${D}"/usr/share/applications + local _bdir="${D}"/usr/bin + + if ! use policykit; then + if use kde; then + cp "${_ddir}"/gparted{,-kde}.desktop || die + cp "${_bdir}"/gparted{,-kde} || die + sed -i -e '/Exec/ s:gparted:gparted-kde:' "${_ddir}"/gparted-kde.desktop || die + echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop || die + fi + else + sed -i -e 's:kdesu::' "${_bdir}"/gparted || die + fi + + mv "${ED}"/usr/share/{appdata,metainfo} +} + +src_test() { + virtx emake check +} + +pkg_postinst() { + gnome2_pkg_postinst + + optfeature_header + optfeature "BTRFS support" sys-fs/btrfs-progs + optfeature "DMRAID support" sys-fs/dmraid sys-fs/multipath-tools + optfeature "Encrypted device / LUKS support" sys-fs/cryptsetup + optfeature "exFAT support" sys-fs/exfatprogs + optfeature "EXT2/EXT3/EXT4 support" sys-fs/e2fsprogs + optfeature "F2FS support" sys-fs/f2fs-tools + optfeature "FAT support" sys-fs/dosfstools sys-fs/mtools + optfeature "HFS support" sys-fs/diskdev_cmds sys-fs/hfsutils virtual/udev + optfeature "JFS support" sys-fs/jfsutils + optfeature "MDADM support" sys-fs/mdadm + optfeature "NTFS support" sys-fs/ntfs3g[ntfsprogs] + optfeature "Reiser4 support" sys-fs/reiser4progs + optfeature "ReiserFS support" sys-fs/reiserfsprogs + optfeature "UDF support" sys-fs/udftools + optfeature "XFS support" sys-fs/xfsprogs sys-fs/xfsdump +} diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest index 518981742c2d..d6f41f7169dd 100644 --- a/sys-block/mbuffer/Manifest +++ b/sys-block/mbuffer/Manifest @@ -5,8 +5,8 @@ DIST mbuffer-20200505.tgz 146020 BLAKE2B b85742f710405e29775c7d25e9c1be733fd94d7 DIST mbuffer-20200929.tgz 147855 BLAKE2B abbcb4b29013ed24b4135a8b7576a0e728c3b5f1987558f0582711b1b00333caea8b55a02c4506ac179a4dae04977ee64572df09a210bf34bd71fd336be7e418 SHA512 332106205ea8743c9cf47529106c04ac15801a02b116d8e0c0fd3baadad51331c9f4ba1c8fa125edb42940cf401048a45ba23e2dac0e5189671bcf0ecee36996 DIST mbuffer-20210209.tgz 147894 BLAKE2B ff6b1da468d34b1fef66178200f68998da0ef4042424845157afbd59e53dbef9e3d003ec9c1a663b28c0e3291d515841bb0a29dabf72a4dd781f6dde2b69b17d SHA512 82a3fd769c6935164db41dbc2e189fef27068c5d4604be923f42f6a9ba3dc3668e6918ba838a0015e9b5becde8b42c9268aa679e3aadb770c517873790f842d1 DIST mbuffer-20210328.tgz 148009 BLAKE2B b369fdae908cfa239e70d092f512f1613215f1a38e5f2dba9403edeb5579fe14a099f0b9950572c1e294c7d5938bd5a363a1cc3239b4553ecd24c6b805fbfe27 SHA512 69f7cac7fe49a86944092d642c6138455ba95da8e6d00abd41b37d126a9f03c3252e69795c5fb5bf8e56d0ce1461bde6b51f48c5eb7073ee49ee4e6df83d834d -EBUILD mbuffer-20200505.ebuild 1580 BLAKE2B 7d4d32ea78865d3fe29f94f77e2c2228814b37587bf97ceea6010ef0c99da441bba41344c2b5c4ba38cba7eb64a3e803a5f48ad4785d4bbac858db75fc891352 SHA512 eac277d0ec3650f05087ba0c3e50b15e088eda8c7de182d40334318c44cf54e895c8885bd3a42473cceb31882dbf5ec57f8792ce23c69ca8fe64f18f504dca6d -EBUILD mbuffer-20200929.ebuild 1582 BLAKE2B b9437a653554366b43dc1bba1b84fdefcfd85873141bdc19416d281b23d720fb14e9003ffbd9310e012903c04aa38d9cbb7c5da4f019777105d90710808b29ae SHA512 7f755da461b9028347feab8d76987d345cc1999dc2519c59bf2bfcd7077f4c2a57fb094be541f13b60722ce0420a7555e5edc63d5e056377c86eb432d522c151 -EBUILD mbuffer-20210209.ebuild 1586 BLAKE2B 2b37d5199d3e4d8dec45677169a8585ef117630f82bf850e32d0f7d90c47726419d0884cc071d34402f2b7f70c741da5af04f4ffce889eb51740e16ba466f0d6 SHA512 41841737e3827d8299733d3d32e880aebf7eeff90a31ae6c66d012a4db4469d47b15a91d366d9a8288d65ff3061db8a246e7eb8cab6974362ada7d21b357990b -EBUILD mbuffer-20210328.ebuild 1586 BLAKE2B 2b37d5199d3e4d8dec45677169a8585ef117630f82bf850e32d0f7d90c47726419d0884cc071d34402f2b7f70c741da5af04f4ffce889eb51740e16ba466f0d6 SHA512 41841737e3827d8299733d3d32e880aebf7eeff90a31ae6c66d012a4db4469d47b15a91d366d9a8288d65ff3061db8a246e7eb8cab6974362ada7d21b357990b +EBUILD mbuffer-20200505.ebuild 1519 BLAKE2B be5a13fa42bf39a6df4480fb29e666cfe8767f12f74f34e98cbabfee8f31c9fad8fe3c4c4bf958aae25b8502c8fd39b39bc1cdf6cb8bad22b18ea233472d3d31 SHA512 51d7881cf3b395ae5aaad49f239c6be8877f5c4a6874723070a045006b9de5d338cfda66883682b9a243d1def7df353d66c45525c4ef125f9eaa4e8666fce060 +EBUILD mbuffer-20200929.ebuild 1521 BLAKE2B da7dd2378791a6413f2736dbf2b2b9221185d4d3224afbd01c70695f6e173a72c527df1406c25a01680bd0a4d6b8fd4bdc2703fb7f7047043f2f8dae49447e76 SHA512 dd974612b0cf04bda6c60cb841bd1419b76702091a493ad907baa16f58109715dff4f9b1399bcd758fa470043e629605a6ccadde396a8b5f4f79a39a6012f7fa +EBUILD mbuffer-20210209.ebuild 1525 BLAKE2B 7e679c246ce656064853ec65561a425f0e0d2c74980008e9d1213d72c0320d1b0bd0d3e8b513b45a2e46cd516d9bdbf9eef6eba313ec927e6039e551dafa4399 SHA512 02c9cb2c90a0cf0561704fa688449296182ae3e3e74452013fcc1e719be525e6bb72e36dcc99efb2689e49b3e5672fe4d0e850dfdcb72c04bd589badbf36649c +EBUILD mbuffer-20210328.ebuild 1525 BLAKE2B 7e679c246ce656064853ec65561a425f0e0d2c74980008e9d1213d72c0320d1b0bd0d3e8b513b45a2e46cd516d9bdbf9eef6eba313ec927e6039e551dafa4399 SHA512 02c9cb2c90a0cf0561704fa688449296182ae3e3e74452013fcc1e719be525e6bb72e36dcc99efb2689e49b3e5672fe4d0e850dfdcb72c04bd589badbf36649c MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-block/mbuffer/mbuffer-20200505.ebuild b/sys-block/mbuffer/mbuffer-20200505.ebuild index 3f4bfb12c78d..0d0ef3285dbb 100644 --- a/sys-block/mbuffer/mbuffer-20200505.ebuild +++ b/sys-block/mbuffer/mbuffer-20200505.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,15 +12,14 @@ SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz" LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 arm ~arm64 ppc x86" -IUSE="debug libressl ssl test" +IUSE="debug ssl test" REQUIRED_USE="test? ( ssl )" RESTRICT="!test? ( test )" RDEPEND="ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= )" DEPEND="${RDEPEND}" diff --git a/sys-block/mbuffer/mbuffer-20200929.ebuild b/sys-block/mbuffer/mbuffer-20200929.ebuild index ae2a126c6962..11f5f9cf4e19 100644 --- a/sys-block/mbuffer/mbuffer-20200929.ebuild +++ b/sys-block/mbuffer/mbuffer-20200929.ebuild @@ -12,15 +12,14 @@ SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz" LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 arm ~arm64 ppc x86" -IUSE="debug libressl ssl test" +IUSE="debug ssl test" REQUIRED_USE="test? ( ssl )" RESTRICT="!test? ( test )" RDEPEND="ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= )" DEPEND="${RDEPEND}" diff --git a/sys-block/mbuffer/mbuffer-20210209.ebuild b/sys-block/mbuffer/mbuffer-20210209.ebuild index 715e227db5dc..b5df3c74c1a2 100644 --- a/sys-block/mbuffer/mbuffer-20210209.ebuild +++ b/sys-block/mbuffer/mbuffer-20210209.ebuild @@ -12,15 +12,14 @@ SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="debug libressl ssl test" +IUSE="debug ssl test" REQUIRED_USE="test? ( ssl )" RESTRICT="!test? ( test )" RDEPEND="ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= )" DEPEND="${RDEPEND}" diff --git a/sys-block/mbuffer/mbuffer-20210328.ebuild b/sys-block/mbuffer/mbuffer-20210328.ebuild index 715e227db5dc..b5df3c74c1a2 100644 --- a/sys-block/mbuffer/mbuffer-20210328.ebuild +++ b/sys-block/mbuffer/mbuffer-20210328.ebuild @@ -12,15 +12,14 @@ SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="debug libressl ssl test" +IUSE="debug ssl test" REQUIRED_USE="test? ( ssl )" RESTRICT="!test? ( test )" RDEPEND="ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= )" DEPEND="${RDEPEND}" diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest index 85e723287d58..0ed60bc649ef 100644 --- a/sys-block/open-iscsi/Manifest +++ b/sys-block/open-iscsi/Manifest @@ -3,19 +3,15 @@ AUX initiatorname.iscsi 1152 BLAKE2B 32ddfef007a3cef2c22c6f49319587065d527000d0d AUX iscsid-conf.d 422 BLAKE2B 2871024472d5308b395aeb8c67f7b47aed4618790295d3ef7e51aaddd32f12fafbe1b8542fc8a34d5da0233a26ee557c7e9613fa8436d9c9312a9e2f6902a1e5 SHA512 d197bbe2ce610cc2d4a1269c8d7a067ca5e3b0f3d8bb0804c2c39e0cf512bcbf7b5de45b7d6ffd5cf918dc395c7cf32c40e64b4348d00a4d0223ee44c463709a AUX iscsid-init.d 2094 BLAKE2B e13fc820e74a79e3c1f220b827c3188b6cb3bc149f450e3ee668d851faacd59e1e44b51250ba3f53a321d287eb81b580a332605226564269dbcd3e2762c0c95e SHA512 a5544e35da3433dfde96984d2e5783991d961554b8843f4f96d4317a38d7534864882342633ed0dc15c2f9e49a419e51958593b0de1ce84644938dafabe392fc AUX iscsidev.sh 2119 BLAKE2B 60d71177fa788b942ece6d1a1d17b9157956ccd5a1781b022a56da6f13c9dc8485008fd3c6530ae9b798ce3034c9cc3c960d43a196bfb06b73746390a8af91e7 SHA512 b4ed7fad25e3f000134a77f3aea2702f03ff75e99ecf49e580085127ab58de5a64bea9c4fc2ae5b324deafd0a860494d1a8dc1223db7d3679b960552f0c00813 -AUX open-iscsi-2.0.873-Makefiles.patch 5441 BLAKE2B 62e50709bc2241fb12dc4c31982e323b4d766997470bb141fd209afde7db936141fe3138cc894eddf0676a1ce4aa45332c73e520806953719b9ffaa14431abb1 SHA512 8dd3433db748f2fd0da0ab6a1059d7058eb09c527e9d039e768bc359a6b665da3e5c13463c32f35d7c630a3b901a689315ece3adb88cccabe452352658705f33 -AUX open-iscsi-2.0.873-memset.patch 680 BLAKE2B 52ce4e6f1ad919334c154205bf335a3dcfe6e3c499cb4db06ec3775af33c91175caf776bb9b1efcec6fcbd57328cf80037d42d18f0b03c7a2c7ba9ecd2df2df7 SHA512 1fb0615d443ce913409f5e6e3cc217149c2586cf1b4175d34512337929c1e2209391808e8f2192742d2f3bfb382e21eaa90e596b6c3e3383ee1a5b735a30fd9b AUX open-iscsi-2.0.874-Makefiles.patch 4087 BLAKE2B cba133471f1c22987cd8be4e7ea4629ef415f8a50da81fc53068745a85fff1aae0f82d9401035b3066906e9cab7d307249402bacc8cd767bf46d8d1a740061fb SHA512 c535a45c627aaa8fd168d4c96f782090b9ae829003ec59c6ead7f34d15f4e52c71916aa014209ac35fd3b29296bb46b603d8df2072be463c5fcc90338784665c AUX open-iscsi-2.0.874-musl-ethtool-compat.patch 2230 BLAKE2B fada90cbf8173364b795be4756805ac0ae45575b785796d6aec9eb6781003974b0d4450e758d42e45778672ba053122b533d8e56bb9c8db1fbf31aa7e8bfe6dc SHA512 09a3b828773e0d7c5d98f8ba8c0683bd1ef5fd83860fafaa75d89cce9e09cebc68bfaea62091aeadeb1d1adfe5318c0af9bfa0a74f2d802568abe1a59b4ebf03 AUX open-iscsi-2.0.874-musl-fixes.patch 1478 BLAKE2B a58a8eec59c7dd05e121ab8213dad21d21cb33c91e8b4763816ce6fccc8f9d8f57d9e7bd246e3417e78da0ce61cade5a29433b2b44d025875cd2199dee2e6353 SHA512 264313bc8de01bcad1db858c0b99ca2c294c22eb1b2693e0445083a895afd0cdc9178ff2dad5de18628a6e61723ad5d2e0c0d4789ce07ccae131f575747aa382 AUX open-iscsi-2.0.875-include-sysmacros.patch 603 BLAKE2B 9c3fcf3bfd0a2ee04c31dd01dbb50680bc9bb434523f0e298d55b762be11f0cd4ef5c7b254466859f755f9e733e8ceaa54795f7dc57518c5136be5ff8001cffe SHA512 686698edc063fbdc47f07dea76ef95e8ae1038eeb3f012f4b6bc098cb0740e9988fc45779e921f4f01ef418d505f194c427308927c67d7af06e03e12b1ae9064 AUX open-iscsi-2.1.1-Makefiles.patch 2185 BLAKE2B ab4dc518f12f0975cf472c94dfa883e98dcce57b2d203c39730ee67c4e6b548ff6554dd4ec8ffd7a624aca99e38c88284ea1bd41cbf89f077e5017e4bc45fd5a SHA512 1b37cfde4889d2f00f91cd173cb323fcb131040ac14351bb66aa4b8250cb527334e869faac4b0fa1ee9160ed7f44ffe2c9cd9a78075d3fec2ca32e0c27c0ba4b -DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36 DIST open-iscsi-2.1.3.tar.gz 619746 BLAKE2B 884e24ae6e16578f3cbd8ccea2557e820d4bf4d20c7f88890100ca93f48df88dc7284cc4eca19d93187516fd21a2c5b71eb53f0d8fe395d2ce42fd202dc355d6 SHA512 0de417dc45b765458c5a1f09029b5df9b5c18d45d7a8fb6b38d539b7013f512a3c8731d5046f554611eccc77b93fea0df30fe4932d79cea44776ac944c398a52 DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91 SHA512 ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3 -EBUILD open-iscsi-2.0.873-r1.ebuild 2542 BLAKE2B 3bad7daf68d479e7d458fa57ebc997c2027e4852f475e5bb5435c42b339c9c8268104b975f1b1e3383ac8b511230d84e75ca2481aba878429ab9ba6f1616af89 SHA512 a057f4a49b1e8e38ce20177520eac1f6e0e36200019bfd2ae4d019c1e2075a5420367596c756343508979d383be0410636d1ac768485acdba5e37ecdbae6f75f EBUILD open-iscsi-2.0.875.ebuild 3710 BLAKE2B 19bdadc17ba56edadb5ff18eaf00e08ef71fb4baef0cfaed73355bf09b2c4311f8cb9d99f9220ddcb14bdcbce0a1dc782ef895916f19d06c0fbc1f5297115974 SHA512 dbedc69c799eb9172d7c150102a58b79bfa1a40c5841a05819339c866204503a70f3482701b2faf667f07dcda6c2d4275f4b2c5a6c0f3009755a86d5951f4bf2 -EBUILD open-iscsi-2.1.3.ebuild 4031 BLAKE2B 9326eae6ab5b87246c57c8d22eb8eb405067a788aaa770fd2dd9ebc0b6e8ffab649ec93fc3de2739357f261a2bf1368a3691b420a4b9defa4017602f7422d85e SHA512 bb812652153d0f2df9b3ade204b28373d55b9490bb06d5793d2b53b2ff31e2bd3ea677761ddc13a73e5efcacf181f2371c1e6be0d623daa3d3567afe86511c03 -EBUILD open-iscsi-2.1.4-r1.ebuild 4055 BLAKE2B c2f93f6e5fd37d4a539f14f4f47f01ac1d36bb885388a7563d699a26aa82f7eeba1c3a601d19cb1f1fb920ca398bdf76a189c9d310fc07882c7f112bb9d23de3 SHA512 49fb0acc1ebe9ff0b8a56e39d18edcf41976011275a79ded8801285922358b932cfc13930237632a4ba99c501d3a2a0c96a3d6aa1767c01dde8b691078b4aa77 +EBUILD open-iscsi-2.1.3.ebuild 3971 BLAKE2B 04dd9d677937f775b07ec0c6cd85e7410908b6f718a2b342f461b1fa081c7f43c915958ef15fc9c421680772540da11540c2418761f42b5683b6831e4b3dc332 SHA512 f372f6ee0273731f6d68492f704fa332729817167fd10be8de0ddf53efaf9185de40324fb3c1fd5f54a1b443330b5444ae27140ea51febcfd24ca13a128a0909 +EBUILD open-iscsi-2.1.4-r1.ebuild 3995 BLAKE2B 23e00f5793c64838e6b41994ccc3917f6dc3d4862f40bba19ff0964dac000d1e84c1760363384a39af09f929b3dbadc235abc69843a91c6844d82300d7939e13 SHA512 06bf03dd81e8b121eaff611d1f3467775def562b5d32a270114262475ea6f0639464048fa7f5a36e2a917f8215c91dab96e78570183f212167da0da86cb980bf MISC metadata.xml 458 BLAKE2B 78071dafcae7bfa7045dcc2724e55ffa92b12658356bdc0a7b7f01214a7681c265a986bc7113e9b4f5f73f3a795a11ba88a2040f0e791129cdd89c70c6dfbaf7 SHA512 3a84213f60f1baee774962a70a4f5f2dbd5f8f353e746a88217451d409561613d6656b56ea1e917441dd300a0945441473f1b090b16d40d8887ad5680dc59c01 diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.873-Makefiles.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.873-Makefiles.patch deleted file mode 100644 index db5d6d14ec5a..000000000000 --- a/sys-block/open-iscsi/files/open-iscsi-2.0.873-Makefiles.patch +++ /dev/null @@ -1,161 +0,0 @@ -diff --git a/Makefile b/Makefile -index c5d9700..4dbff18 100644 ---- a/Makefile -+++ b/Makefile -@@ -14,8 +14,8 @@ mandir = $(prefix)/share/man - etcdir = /etc - initddir = $(etcdir)/init.d - --MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 --PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi_discovery utils/iscsi-iname -+MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 doc/iscsistart.8 doc/iscsi-iname.8 -+PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi_discovery utils/iscsi-iname usr/iscsistart - INSTALL = install - ETCFILES = etc/iscsid.conf - IFACEFILES = etc/iface.example -@@ -84,11 +84,11 @@ install_programs: $(PROGRAMS) - # ugh, auto-detection is evil - # Gentoo maintains their own init.d stuff - install_initd: -- if [ -f /etc/debian_version ]; then \ -+ if [ -f $(DESTDIR)$(etcdir)/debian_version ]; then \ - $(MAKE) install_initd_debian ; \ -- elif [ -f /etc/redhat-release ]; then \ -+ elif [ -f $(DESTDIR)$(etcdir)/redhat-release ]; then \ - $(MAKE) install_initd_redhat ; \ -- elif [ -f /etc/SuSE-release ]; then \ -+ elif [ -f $(DESTDIR)$(etcdir)/SuSE-release ]; then \ - $(MAKE) install_initd_suse ; \ - fi - -@@ -115,7 +115,7 @@ install_iface: $(IFACEFILES) - $(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi/ifaces - - install_etc: $(ETCFILES) -- if [ ! -f /etc/iscsi/iscsid.conf ]; then \ -+ if [ ! -f $(DESTDIR)$(etcdir)/iscsi/iscsid.conf ]; then \ - $(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi ; \ - $(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi ; \ - fi -@@ -128,11 +128,11 @@ install_kernel: - $(MAKE) -C kernel install_kernel - - install_iname: -- if [ ! -f /etc/iscsi/initiatorname.iscsi ]; then \ -- echo "InitiatorName=`$(DESTDIR)/sbin/iscsi-iname`" > $(DESTDIR)/etc/iscsi/initiatorname.iscsi ; \ -+ if [ ! -f $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ]; then \ -+ echo "InitiatorName=`$(DESTDIR)$(sbindir)/iscsi-iname`" > $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ; \ - echo "***************************************************" ; \ -- echo "Setting InitiatorName to `cat $(DESTDIR)/etc/iscsi/initiatorname.iscsi`" ; \ -- echo "To override edit /etc/iscsi/initiatorname.iscsi" ; \ -+ echo "Setting InitiatorName to `cat $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi`" ; \ -+ echo "To override edit $(etcdir)/iscsi/initiatorname.iscsi" ; \ - echo "***************************************************" ; \ - fi - -diff --git a/usr/Makefile b/usr/Makefile -index 673b7f1..83507f3 100644 ---- a/usr/Makefile -+++ b/usr/Makefile -@@ -54,18 +54,18 @@ all: $(PROGRAMS) - - iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ - iscsid.o session_mgmt.o discoveryd.o -- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns - - iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o -- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns - - iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ - iscsistart.o statics.o -- $(CC) $(CFLAGS) -static $^ -o $@ -+ $(CC) $(CFLAGS) -static $(LDFLAGS) $^ -o $@ - clean: -- rm -f *.o $(PROGRAMS) .depend $(LIBSYS) -+ $(RM) *.o $(PROGRAMS) .depend $(LIBSYS) - - depend: -- gcc $(CFLAGS) -M `ls *.c` > .depend -+ $(CC) $(CFLAGS) -M `ls *.c` > .depend - - -include .depend -diff --git a/utils/Makefile b/utils/Makefile -index 2c7e891..62c49fa 100644 ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -1,17 +1,18 @@ - # This Makefile will work only with GNU make. - --CFLAGS += $(OPTFLAGS) -O2 -fno-inline -Wall -Wstrict-prototypes -g -+OPTFLAGS ?= -O2 -g -+CFLAGS += $(OPTFLAGS) -fno-inline -Wall -Wstrict-prototypes - PROGRAMS = iscsi-iname - - all: $(PROGRAMS) - - iscsi-iname: md5.o iscsi-iname.o -- $(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@ -+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@ - - clean: -- rm -f *.o $(PROGRAMS) .depend -+ $(RM) *.o $(PROGRAMS) .depend - - depend: -- gcc $(CFLAGS) -M `ls *.c` > .depend -+ $(GCC) $(CFLAGS) -M `ls *.c` > .depend - - -include .depend -diff --git a/utils/fwparam_ibft/Makefile b/utils/fwparam_ibft/Makefile -index c72bb7f..a36c2d2 100644 ---- a/utils/fwparam_ibft/Makefile -+++ b/utils/fwparam_ibft/Makefile -@@ -26,18 +26,18 @@ OBJS := fw_entry.o fwparam_sysfs.o $(SYSDEPS_OBJS) ../../usr/iscsi_net_util.o - OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o - CLEANFILES = $(OBJS) *.output *~ - --OPTFLAGS ?= -O2 -g -fPIC -+OPTFLAGS ?= -O2 -g - WARNFLAGS ?= -Wall -Wstrict-prototypes --CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -I../../include -I../../usr -D_GNU_SOURCE -+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -fPIC -I../../include -I../../usr -D_GNU_SOURCE - - all: $(OBJS) - - clean: -- rm -f *.o $(CLEANFILES) .depend -+ $(RM) *.o $(CLEANFILES) .depend - - $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h - - depend: -- gcc $(CFLAGS) -M `ls *.c` > .depend -+ $(CC) $(CFLAGS) -M `ls *.c` > .depend - - -include .depend -diff --git a/utils/sysdeps/Makefile b/utils/sysdeps/Makefile -index 53c10e5..19cfe19 100644 ---- a/utils/sysdeps/Makefile -+++ b/utils/sysdeps/Makefile -@@ -1,15 +1,16 @@ - # This Makefile will work only with GNU make. - --CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -O2 -fno-inline -Wall -Wstrict-prototypes -g -+OPTFLAGS ?= -O2 -g -+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -fno-inline -Wall -Wstrict-prototypes - - SYSDEPS_OBJS=sysdeps.o - - all: $(SYSDEPS_OBJS) - - clean: -- rm -f *.o .depend -+ $(RM) *.o .depend - - depend: -- gcc $(CFLAGS) -M `ls *.c` > .depend -+ $(CC) $(CFLAGS) -M `ls *.c` > .depend - - -include .depend diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.873-memset.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.873-memset.patch deleted file mode 100644 index c56669192f09..000000000000 --- a/sys-block/open-iscsi/files/open-iscsi-2.0.873-memset.patch +++ /dev/null @@ -1,24 +0,0 @@ -clear the size of the storage, not the size of the pointer - ---- a/usr/md5.c -+++ b/usr/md5.c -@@ -127,7 +127,7 @@ MD5Final(md5byte digest[16], struct MD5Context *ctx) - - byteSwap(ctx->buf, 4); - memcpy(digest, ctx->buf, 16); -- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ -+ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ - } - - #ifndef ASM_MD5 ---- a/utils/md5.c -+++ b/utils/md5.c -@@ -133,7 +133,7 @@ MD5Final(md5byte digest[16], struct MD5Context *ctx) - - byteSwap(ctx->buf, 4); - memcpy(digest, ctx->buf, 16); -- memset(ctx, 0, sizeof (ctx)); /* In case it's sensitive */ -+ memset(ctx, 0, sizeof (*ctx)); /* In case it's sensitive */ - } - - #ifndef ASM_MD5 diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild deleted file mode 100644 index 18707375b859..000000000000 --- a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit versionator linux-info epatch flag-o-matic toolchain-funcs udev - -MY_P="${PN}-$(replace_version_separator 2 "-")" - -DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720" -HOMEPAGE="http://www.open-iscsi.com/" -SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" -IUSE="debug slp" - -DEPEND="slp? ( net-libs/openslp )" -RDEPEND="${DEPEND} - sys-fs/lsscsi - sys-apps/util-linux" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - linux-info_pkg_setup - - if kernel_is -lt 2 6 16; then - die "Sorry, your kernel must be 2.6.16-rc5 or newer!" - fi - - # Needs to be done, as iscsid currently only starts, when having the iSCSI - # support loaded as module. Kernel builtion options don't work. See this for - # more information: - # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966 - # If there's a new release, check whether this is still valid! - CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP" - if linux_config_exists; then - for module in ${CONFIG_CHECK_MODULES}; do - linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" - done - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-Makefiles.patch - epatch "${FILESDIR}"/${P}-memset.patch - - sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die -} - -src_configure() { - use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI - append-lfs-flags - - cd utils/open-isns || die - - # SSL (--with-security) is broken - econf $(use_with slp) \ - --without-security -} - -src_compile() { - # Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build - # is messed up already here, so it's not making it that much worse. - KSRC="${KV_DIR}" CFLAGS="" \ - emake \ - OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \ - AR="$(tc-getAR)" CC="$(tc-getCC)" \ - user -} - -src_install() { - emake DESTDIR="${ED}" sbindir="/usr/sbin" install - - dodoc README THANKS - - docinto test/ - dodoc test/* - - insinto /etc/iscsi - newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example - - # udev pieces - udev_dorules "${FILESDIR}"/99-iscsi.rules - exeinto /etc/udev/scripts - doexe "${FILESDIR}"/iscsidev.sh - - newconfd "${FILESDIR}"/iscsid-conf.d iscsid - newinitd "${FILESDIR}"/iscsid-init.d iscsid - - keepdir /var/db/iscsi - fperms 700 /var/db/iscsi - fperms 600 /etc/iscsi/iscsid.conf -} diff --git a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild index 01e5e10c4e07..923041df6776 100644 --- a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild +++ b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild @@ -12,15 +12,14 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0/0.2" KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" -IUSE="debug infiniband libressl +tcp rdma systemd" +IUSE="debug infiniband +tcp rdma systemd" DEPEND=" sys-apps/kmod sys-block/open-isns:= sys-kernel/linux-headers infiniband? ( sys-fabric/ofed ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= systemd? ( sys-apps/systemd ) " RDEPEND="${DEPEND} diff --git a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild index 48c3a385ff33..32d4e406f51f 100644 --- a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild +++ b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild @@ -12,15 +12,14 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0/0.2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug infiniband libressl +tcp rdma systemd" +IUSE="debug infiniband +tcp rdma systemd" DEPEND=" sys-apps/kmod sys-block/open-isns:= sys-kernel/linux-headers infiniband? ( sys-fabric/ofed ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= systemd? ( sys-apps/systemd ) " RDEPEND="${DEPEND} diff --git a/sys-block/open-isns/Manifest b/sys-block/open-isns/Manifest index ba8fda7a2637..53366b3ed731 100644 --- a/sys-block/open-isns/Manifest +++ b/sys-block/open-isns/Manifest @@ -1,12 +1,11 @@ AUX open-isns-0.100-no_Werror.patch 1235 BLAKE2B 4ecc08979a1cd1bacc46608b98419fbc5ef6bb571dc55682e1dd39ac1434bdf6e7972fc6ebd42dd4256e1be929a28a0b5ab76fd66131ff72e8962c2b2a61e1f7 SHA512 4831f745b3c2853f2eb57bc3df84261853d6e20b82c05902a3dc295f234aa81d2e075f18041cbe894d7f855d0d8f8d62c188dd7a19809a7ed48bef091bbc68f1 AUX open-isns-0.100-respect-AR.patch 539 BLAKE2B f343794fe2bdec792654c9a0ee18bf7b8890a2f05bd80f43140f4bed8d260a3fb1c6a00725b285e17f46d8fedce310aa48f404a56a6a77ae60a530355f47a7bb SHA512 a88ecd07ae28528cc5e9a1bdca1dcc8a5999abb9742c6f0c712fa8eae5fd1f76b01dff9d6f8041a4188eafb8acd376a0054335c66028893e431fe041e0694cf4 -AUX open-isns-0.98-libressl-compatibility.patch 463 BLAKE2B ed542e70bbd96b78b2e339dd7eced0b4edf87af62b189fc02ae431946161bb6385ffd2f8d6cf0f60edcc2092e9b57e2272e7e2fa4da0eb8f80c2a19f7d02e75e SHA512 dfce1df2699e24085f4c88340d5fb7e3f878d182608301c79b0f5736b0e29f3c79b0d37650d925cc06d429b59e9697b634ab1d16706fabbdf4b443bdcf4c9bc3 DIST open-isns-0.100.tar.gz 300611 BLAKE2B a40e8d2bd6e5ac8ed8475d3d50ed6256871134547a044a6b51102ad47c66c335f06372b29e5585df4e59ecd7a817e5f2e48c5e944eea31333ab9f45d51040306 SHA512 ccf49ba1c60d46ae49b75424a966abc1f7e104c8ffa13013951a58a8f0ccaa1cf550f24fd2743fcaba1211a0ec8033c5df5249b7a108ae5974d4f1144dd3b169 DIST open-isns-0.101.tar.gz 301912 BLAKE2B 98c9c36640ee4d3796538a00e7ab2e4cfb057abc66a56d27ce2eb133d591ea87bcb0e4ffb31b6d72d8e8c806edffb65600c0ae7cd63c61058f36037e3db79214 SHA512 e5a392127b0d85f36e9e4aa963c0c502af8c5aea0aba6d12abb4425649969dcc20ba6e87a99083626d981438439b17b71a86320f816042d82ed5dbe7e7a63e77 DIST open-isns-0.98.tar.gz 278410 BLAKE2B f90df85de4d5fd2abdcd267e3c873dff62fcac523ee280e21def057eca366bbba21c2b3bfbf5cc0798b8d0f3b0d5028ebb49000cccc850abdfb85142a7b66c34 SHA512 04263b9ace9d272f4e3776c4e1a034815475590d4b4864217a6200fcd5baea391cd788723db3c17fe0d764efc9769a70a3d2167b00e5998fb4bcb8d5fe2547ed DIST open-isns-0.99.tar.gz 282831 BLAKE2B 7140daf08fda894bcbed3e25b122909ad0ed86b4f3db2e42a23b97480dea554194d2a33a3ebdf4e2017a57c2023dd8589f2e2fcfa60470cc3a6a3fbfb0d0ccbc SHA512 90a2297535c5e939f83c761173ce5f5f88e68adc31e41e833b23d07b6dc6959572ae7184db0084b861918199a877b251ebae4b4a7456fdd8c93400dc8457adc9 -EBUILD open-isns-0.100.ebuild 1261 BLAKE2B e3506bb9111cbca5e33a53d03213361687f572181971bd9760b3f0416e39ae748fe0b4288b45e1c4ec7feb2338365b31c80a8e7ca950fbc2d666cb9d45624c33 SHA512 19ec911eebf9c99572334c8fb71a67f6db12e951d9cc6c10023dc1e96186d65df8882075ac6ad3302c9a69a93a543e34dcf8911ae8468506391b77110ccbe98f -EBUILD open-isns-0.101.ebuild 1193 BLAKE2B 7ddcc9de1b8ad65734b9a34668ac6f2fa901b03c073a7f2e6a861ebbdf6a938e805c8d7ce2e325ef1083f1d053d6da8a82a82d347d23bff51e80e8bfac8d5152 SHA512 25465d2f691b14506b5f92c42cb2a5bdc23eb6a85824008b13c089e778f1382e3bf91a344c6f0daa1c2fe5c6e31c817cdde013dab1283addd6ceb463feb49770 -EBUILD open-isns-0.98.ebuild 928 BLAKE2B 8d53b62dba7fb03ae459ab22359357963792eb9c9946bd552cf5ea013ea0edfe81c5e0d90d92d87005d5799a2c93e0623b33d12d2696e6ae7962f1f5b58c6f6c SHA512 d7a56dd39dd319172e58a10900a556695033e7314a80c1bae6e6796d80c088a82ee0ff22e7cd77251f07b1f47b828673d55dab15b741af91f0a396fe784d7f9b -EBUILD open-isns-0.99.ebuild 1092 BLAKE2B 1e0ce4502ab428063bae59b56a2f6df6353fcbaf839e37c4fb5a6602be2e70c3f41bc8a8fbd98c680a84a70452fd46043b3f90a2e9e6d650fb8beff287ca6e70 SHA512 56a48b518e7d8316cc77c92cf8160fe792920a781f4e0f30f861e3803a0e228f913f579eaeb92d41df38d94af966687d72e12dc84fcec9892c227d64f236f914 +EBUILD open-isns-0.100.ebuild 1144 BLAKE2B c8592e1f6d767fae9756f51473d5966d0988002b3f5fa22f46b053452e031de749d7467c4b9f320aae24146363b9cd0e814f54114f52eba4596e1f4ea5f69d17 SHA512 955e10101807666d194151e3ba2147f531c6d1b474093d489e44334e4cfbda93ba5dbb7829f616290544dc61c3438307fafe3afcd52831edb9f2b686cc12fd39 +EBUILD open-isns-0.101.ebuild 1076 BLAKE2B a6af812d00e2918c214246b14891d4d85edb2a0d7626a235489391a1e369c68413ebb2dde028e13b01680d91556a9d80a58fb4bca5302aef44805b0c51dde69d SHA512 e9e5f7237b2b24480f1f60f77ec1516c577ed88cd66b1fdbdfb258c8d5d97e38285b9ab6bd49453bf1198576e8d064f240ce48c0b69c38270da56637f69136c4 +EBUILD open-isns-0.98.ebuild 806 BLAKE2B 24c75b271c6604021020d671a5df0ce0767339757a74e8ecd60115b79c06fd0678dd81722a0b17cb987896d5c3766b5ead98e84b69c4f533c734b91c9df26dbe SHA512 aaa566ef607a1bf689e990d2809d70a9600497ae81f0781949ffd98c36999896d8b1e5a27adcc51e46e38ab2c5df01d3d95c259378ee5ad44c17958e1dbdb8ee +EBUILD open-isns-0.99.ebuild 964 BLAKE2B a04c57b02cca53049460f7c2158fbd291b84dbff31303d4a65d6430eced23330e144414c8368ad99b5369c895d8729ae7d3031743910d33e7867d6de6f9f3f28 SHA512 b7d05a8e14c5bd1164c03845f4094afa98f01897d600d8a5c65ef70548bcc3da06732f1d3e4159823fc1ebe47108d85455c9861b95bfe8d8103b69e081580ac8 MISC metadata.xml 342 BLAKE2B 3ecae5f098564e59660a3e1de7a3b6ee2dcb7cd2d7ad2acc37e61680910e1fbd5edd2540e20783ca642440bc947cdb40feb6a84e434aba123346f48c6ee48265 SHA512 02d015cd6497b76f48eea880b745556f1a433db2893b91ef8254cf40a1bda2209feb42c01ff29dd6e4a3fdf588a8905076952e838b89a29ab99ccfc39927940a diff --git a/sys-block/open-isns/files/open-isns-0.98-libressl-compatibility.patch b/sys-block/open-isns/files/open-isns-0.98-libressl-compatibility.patch deleted file mode 100644 index b4d5ae63786d..000000000000 --- a/sys-block/open-isns/files/open-isns-0.98-libressl-compatibility.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/pki.c.orig -+++ b/pki.c -@@ -30,7 +30,7 @@ - #endif - /* OpenSSL 1.1 made a lot of structures opaque, so we need to - * define the 1.1 wrappers in previous versions. */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - #define EVP_PKEY_base_id(o) ((o)->type) - #define EVP_PKEY_get0_DSA(o) ((o)->pkey.dsa) - static EVP_MD_CTX *EVP_MD_CTX_new(void) diff --git a/sys-block/open-isns/open-isns-0.100.ebuild b/sys-block/open-isns/open-isns-0.100.ebuild index 63213dbfd792..fa1351cf05c8 100644 --- a/sys-block/open-isns/open-isns-0.100.ebuild +++ b/sys-block/open-isns/open-isns-0.100.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,19 +12,16 @@ SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug libressl ssl static" +IUSE="debug ssl static" DEPEND=" ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= ) " RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/${PN}-0.98-libressl-compatibility.patch" - "${FILESDIR}/${PN}-0.100-respect-AR.patch" # Upstream patches (can usually be removed with next version bump) diff --git a/sys-block/open-isns/open-isns-0.101.ebuild b/sys-block/open-isns/open-isns-0.101.ebuild index 5f7c4bb83ec7..395977907a5d 100644 --- a/sys-block/open-isns/open-isns-0.101.ebuild +++ b/sys-block/open-isns/open-isns-0.101.ebuild @@ -12,19 +12,16 @@ SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug libressl ssl static" +IUSE="debug ssl static" DEPEND=" ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= ) " RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/${PN}-0.98-libressl-compatibility.patch" - "${FILESDIR}/${PN}-0.100-respect-AR.patch" ) diff --git a/sys-block/open-isns/open-isns-0.98.ebuild b/sys-block/open-isns/open-isns-0.98.ebuild index 6cf8f4626f76..98e5c2e8a451 100644 --- a/sys-block/open-isns/open-isns-0.98.ebuild +++ b/sys-block/open-isns/open-isns-0.98.ebuild @@ -12,18 +12,15 @@ SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="debug libressl slp ssl static" +IUSE="debug slp ssl static" DEPEND=" ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= ) slp? ( net-libs/openslp )" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${P}-libressl-compatibility.patch" ) - src_configure() { use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI append-lfs-flags diff --git a/sys-block/open-isns/open-isns-0.99.ebuild b/sys-block/open-isns/open-isns-0.99.ebuild index e9c2b890b984..e7290c1b77b5 100644 --- a/sys-block/open-isns/open-isns-0.99.ebuild +++ b/sys-block/open-isns/open-isns-0.99.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,18 +12,15 @@ SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug libressl slp ssl static" +IUSE="debug slp ssl static" DEPEND=" ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= ) slp? ( net-libs/openslp )" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-0.98-libressl-compatibility.patch" ) - src_configure() { use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI append-lfs-flags |