gentoo resync : 10.11.2019

22 files changed, 0 insertions, 1197 deletions

diff --git a/sys-block/iscsitarget/Manifest b/sys-block/iscsitarget/Manifest
deleted file mode 100644
index 1d13a6029be4..000000000000
--- a/sys-block/iscsitarget/Manifest
+++ /dev/null
@@ -1,26 +0,0 @@
-AUX ietd-conf.d 950 BLAKE2B 44af77d83235b504bf82b771351f3a7b256cb13625646f563fe24beabd7f171c2a3254a1d7f72c00f2940ce245009bce3f9ed6a828093237b3908145edd3e5a3 SHA512 779e3243f58ed8e728be36d18b040e6804e6d8e1a5f697d579327b52c184a30f6f17094de4cbee38da2f790f065445cb2571e5c4e0eda789b347f472474da578
-AUX ietd-init.d-2 2360 BLAKE2B d876f2d9cc22c93ed57046996dc0d26c32f7f229e0c2de07063bbdfd6fee6ef7ad7c47110389cd107cea957496bdcd699092ae349d378311928da16f2b442bc8 SHA512 7fb14140d1a8a1502ab93f97b089b267c3b1e028fce212fdb0b856fffa1b00a94e4516a9c61cafedefc88406f3f0f5d86e85b673687ee418a965b138f440e651
-AUX iscsitarget-0.4.15-isns-set-scn-flag.patch 507 BLAKE2B 9dccdb56779218a5426bfe0e4d059c6866ec199ad8edb0741ff406941d5ff9eaa904bfc0444c3fa7d98764ee6f657ee6ca5f5a08a32a1e60dd1694d3c96d28b5 SHA512 7da5ef15d52121fd81f3f9a6afe97d4c8259f3b255a97d5e1329720c263970fe6a6764fdaf6be4caeeec76d9e87d9be19084504de4a146d5972961e72ecd84fa
-AUX iscsitarget-0.4.17+linux-2.6.28.patch 2427 BLAKE2B 17420e9810abaa32a5bd1d5d8704e41429a084be176e859aac946a7515e90d4ff10c8d86a03dfccf0a77c7b789d232466178d7ad7ee05a2a94fadbac21ea07c9 SHA512 21c57a040f272115c7934ce576c167c29ad822e50a9d6e88146240f8d9704220ae519e7259df1bc1ae26387865e7b23af0f578c23c03d6c320cbbd151c7be909
-AUX iscsitarget-0.4.17+linux-2.6.29.patch 1123 BLAKE2B 176dfa697ba66d4c9185ca2211da0bab1100d6b008ef32d06c33e7a9751e1238a40088ff97d6984fd869feb37c0c30d2d9c7fe7b8f26b5ae59e0d690db2b63b2 SHA512 850d56c3cdac287078f8a06600d426352104ce69d051bb54c1ad4958514ae110557286068bcbb9be19b74ac864479ac8195e05e4ddf0da76a571a6d9f6f8b3a8
-AUX iscsitarget-0.4.17+linux-2.6.30.patch 1145 BLAKE2B c521f86e250290813be9c1b41d8621b6878a820535a5cc3216eaf50672a8244a9ce4432ff4b0deb28a70fbf38212fe23d902f2445c7af6d0ae8c3af32a9b25ce SHA512 0643c1037fe7aba21f6d6d9b82db19a5a20d57121c51a7b7ee6635a3768f494c3da508cb63e6e519a89d643df40f4342f6e423ee67296b6039d3c7f3b48324c9
-AUX iscsitarget-0.4.17-build.patch 580 BLAKE2B 45b9a9e453d5f73098fe6fcf85a90bc1ce555861713b9f026f3abd4066aedeca7c3823f2e9bb8caae67874659323c25d66bcec941ededf81e4524f3a95dbe233 SHA512 1ab4bf0f3cedf3b05178e73d53dcd9738f3a3bdbd3f26b4989ddee8540c418d02d1ca1cedd122475f140004bcb0beba411f0530f7cbf2c2fc46b5640b036bafb
-AUX iscsitarget-1.4.18+linux-2.6.32.patch 1342 BLAKE2B 52183c7f751ee3925c3f55cb87fe92c0187c6860e5889a38460be954330af12e8f40caa8bd45cfc4419c51b6e8a49c4284901cd1ea31e4d26afb001ae24bb7f5 SHA512 87886af4f2c78918c51fb07537e5098223d579a38cc81254a8d110ca8cfad822a46107179615b43183ef1f86f485051b0596be4e38ad150e718302bfad7dcffc
-AUX iscsitarget-1.4.19+linux-2.6.33.patch 594 BLAKE2B 5bffea4a96a8e66ce08901caf79253449287b3f76ecda8e6f7ea57f04e22db0a89b521f12deee66fdbee043e9cbc00d36c34b2f4ba71776582545254e4a89676 SHA512 8e9193b34ccfff7f187f24312ada685cb75b581ad591d7193276bfce85605eed1639ca797caa23638d7991acab312a404147a5f1a3ada1020ef7350ddf507bff
-AUX iscsitarget-1.4.20.2-respect-flags-v2.patch 381 BLAKE2B 4eb8dc0208ba7c1e77c9e35cc37dfd65f7e8dc3d9c7b64f4b8c9cd3ca2a9d17f4506a1492c2bad1eff475c27c9666ed47ac5646a041dca4ae4596f82f472bc3c SHA512 21bd981aa071b4a51619615e0a78e1babb208a7cb45d89135069272c0c1fb38b5dd62dd78632c2db07c1953ba2f95a29cc318c41b7348d319a879f8446efd5f8
-AUX iscsitarget-1.4.20.2-respect-flags.patch 878 BLAKE2B b915294bf3599e558823c714bc5380af4678bf42dd558f9f5f002a55c803dde486408d8c22339025ac91e94c2875a74f0c261686f95e474182c7b1699e642830 SHA512 132e27f9385b423c0918806cccebd2c5a9072d72348a9bad0886d5c39e6f100db24ae807ba3d04e32c5f9831a79dafcc472c33ebec3a29c830f40b07ddf93807
-AUX iscsitarget-1.4.20.2_kernel-2.6.36.patch 339 BLAKE2B fa8454dd2f138ebc257917d2dbc87a4c0cdb600fe63cabf7b131740c209d227aeef0c4dea4708b019b4dd0cd2133afbc774ebe07ddaa0b974448a23a39eaff26 SHA512 f83667b85d5a997335775e1c64cb61af6c57262dcffdd8e6c38ced30c3695ed0ab31fcd81c222c89b8200f8c4e9935f4bfeb859748fdf097e4d3f26d0c9c0488
-AUX iscsitarget-1.4.20.2_p20130103-fix-3.2-support.patch 4047 BLAKE2B 477763cd5427583b6a577a404599678e377187b545cd4dbb73b2e5942c62e34e2de897f14b3bc513734e52efcb33fcfc69f249ca9dc9d5837ee2b8278cbb2331 SHA512 52229dd30ab5c9b8f0f700315560d4d67a7a55641a4612c04728b69ca789b6d7e50e1cd21dd7deaa35edb9f28c83f69b0182414cd96ee0a121c3e58fa7cfcc57
-AUX iscsitarget-1.4.20.2_p20130103-restore-linux-2.6.32-support.patch 2806 BLAKE2B 8d2d7eae982efea6dfacf566ca5d9284cd1b32e297e995c5ed506439466680bae9e8bc861e3d82916e31b89ef62305c17b2c945e205dd12fceaed5733e4a0789 SHA512 d529496bc7dea558856cb5ba6c58695d83001f1ff91a5d9fdb7d23d042512d4ed550f1d78dfaa0bb9c3807532b0802b55e59517c9e028e4066d97aa5ba9f82f8
-DIST iscsitarget-0.4.17.tar.gz 107884 BLAKE2B c8d8637a1c28f4cd79633daeac6365a4ebacde8fd6830c946b5eb1c0cbd3c7804d090ebbb3b65398d83ffb5df9ae9c0604fe2d02b69f04f5251976c16674c48e SHA512 12e11cb4dcf98952bd655f1ecbc0a1b881a3195d36a4ae25af81059ace93997c6247403da4a5531008d88c49a831b5d160f7837e598652e99e6aca44b2a2c4a2
-DIST iscsitarget-1.4.19.tar.gz 124288 BLAKE2B b87179c7b26db8a10d8a91c45fbb552ee85dbb391ce67dd7798befd19956d8b381a9ce2bb9eb0801c6491493822f5f3b17f5ef633b86a284eb83b79bd7e143ba SHA512 f653e114e13946ca947a6d481d94f92da4a75f0678d9413a82e6ffcc8fb621e48ea111a3d979b2a0818bd9f1eb4be4d0b20d250484c7fc6a0cdb93d977cc2e5c
-DIST iscsitarget-1.4.20.2.tar.gz 138464 BLAKE2B 2a831ab72e26120a944f07a40ae9bf62034b506e5503b8ef747636635eb6d1e2e2cc32ef05eb1d01c2abd92b95834c4f46941d652d589b46a82b1c92a380ffec SHA512 e9853eb5b954f5cbb43f4ed568ac896616a845f3f9ae57841045f4ef6f6487704d94364cdf48da2c0171aef27aeffa7ca8a4653bfe956486d63578a0d4c32dc6
-DIST iscsitarget-1.4.20.2_p20130103.tar.gz 147073 BLAKE2B 0074aaf6249d758b4ca34bbfc9fff702df8369b44d4ba1abab94d3b0d49d69b0697f724729da829648b7b23e661647f5d19274a83f25769aa99a28f872f6d367 SHA512 7ed706c38a63b696ff344725308a5d476f8fc4ebee71456615274470afed4d9cb2985d0960a9e77d185e267771e6c7ece8707232d42affd11f7de76e0eaf7371
-DIST iscsitarget-1.4.20.2_p20130821.tar.xz 115664 BLAKE2B 1571d3d83119b713324dad8242a61cdfc58eea07c0f144fb06022eefdd90bef510023f90f6fc6d977c9b7cc3bb490549901c545db0c7b05c88539df554c74106 SHA512 7dcc0b0f670954f06a0018f4969122b4b264523c82dea25145fdbe25054b18909c5a4cd8b6945cc29dfd7ce8704f3d9df3f4ae23ec334e79da065158ae291fd1
-EBUILD iscsitarget-0.4.17.ebuild 1855 BLAKE2B 60f4f2a70004e015364e7a0266a652bf1891c0fa665488df332ff3a46cd049f5df3c5f2107a6b8e11f5b5aa1537b6bae877c8ccf9c314a3d3e1ebfdc3f1135fe SHA512 a9c2a0819d0db31a228d94a64657fd8b86f9723e547ad905488e7552719992437d2dc1d0ed4912141074c8905f1d1f5d202acc811b1ac1c7365974fa08ab935a
-EBUILD iscsitarget-1.4.19.ebuild 2049 BLAKE2B 69c198a2dc1142c9933b97f80f46601e6800e2b07785766d82a4c1884e39420a77343f9870f0069162978af59f518cbcaace32d99904aa2ba828d67ebe687331 SHA512 5a47565c6a961abf3a4ce6447865983e6c09044b4abb10e1eb4bf64e269bbf11d208eb2204aad237ad69705f745c8ac3158e13779131bdd5cb2c9d8442e3fca3
-EBUILD iscsitarget-1.4.20.2.ebuild 1879 BLAKE2B a3270e11636a00fc6911cbb145682a8539abe5a2c44008b05a3a2148b8d1ddfca22348d757fe725d26c2284fc17671ccc56271681c28247f16ae05c1854fb0dd SHA512 863af7d86736ea6e16f549acb5ccfe5d08abf99a681ebd1c5f8544fa4c536b1d857dcdfb49e1d32d55cfb56675ba72a0cb36db331d107abd579b22ac4343e2ee
-EBUILD iscsitarget-1.4.20.2_p20130103.ebuild 2372 BLAKE2B 41a3fbc763f0594259bfbf4e8f32595f58906f5d0de49fa7988ec38066970713c37a752da5ed3cf8d5879c949ae2abb50dc40950f9624230612a8ac1cac8e00d SHA512 79905f7f6185d2cad0ea8908923636650aa8acc325b3d7ad58643d9116f58e685e03cf7577cef3b5d2d2c8df071d82b09724bc6912e17942159f8909a60d9358
-EBUILD iscsitarget-1.4.20.2_p20130821.ebuild 2374 BLAKE2B 9725585ea57572abf34d4f24568b23566702533fdb52a2303a960944e71184d793b6dfb4d101d5b13f2125fcac5cd9a4d308ffad8bd7ebc4cecbd73ddffd5ed9 SHA512 c2cc9c5d7ee47133cc259fd5fd858935a1718e521c25144416179814474dbea9e575f53e30778d2caa0bda9fad36b98b778ae2244e89cae592e4d85a8c3f930f
-EBUILD iscsitarget-9999.ebuild 2376 BLAKE2B 1a71848f45b245483fa6001b4cf52ad1a601042104ccde6ddfc4928616b09993249b0c4a121088ad3dd1bd940e1c69578b80c550706fef9b7fd43fd272a4571b SHA512 7de6c486ff3e89c0b88cac8b85cc084f57d600a52961277e6435f7675b54b60591d9bfa882bf46188d775c6e3bb8db6512b33da39e71178f7fca5888a6c2bb17
-MISC metadata.xml 331 BLAKE2B 482afb48e121325e84b78c4054ef720782edc60d3e60d7be8be98496789ac75fdb41883404b39ca268280000ee61cee32b0889b67a147e8d857645168904b5e9 SHA512 ea245b180f35b4d42c756a6438ac8268298818bcd294f9d42318b8f034421de6bd29969e86b4c14896bf19a144df5e36fbd9b878ad67d7ecd6a389c8b094bb5c
diff --git a/sys-block/iscsitarget/files/ietd-conf.d b/sys-block/iscsitarget/files/ietd-conf.d
deleted file mode 100644
index 1cac14ae9bb5..000000000000
--- a/sys-block/iscsitarget/files/ietd-conf.d
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-# Address and port to listen on for connections.
-#ADDRESS="" # set this to non-empty to listen somewhere specific
-PORT=3260
-
-# Address of your SNS server
-# if available
-#ISNS=""
-
-# User and group to run as
-# You must ensure that the UID/GID have access to the files/devices you
-# have provided in your configuration.
-USER="root"
-GROUP="root"
-
-# Debug level - see ietd(8) for the levels
-#DEBUGLEVEL=
-
-# This setting disables the memory configuration warnings.
-# Upstream takes the general policy of forcing all of the memory settings that
-# they want, but that doesn't mesh with users that have it set higher.
-# Gentoo by default ignores the settings that are higher, but issues warnings
-# on those that are lower.
-# Uncomment the next line to disable those warnings.
-#DISABLE_MEMORY_WARNINGS=1
-
-# vim: filetype=gentoo-conf-d tw=72:
diff --git a/sys-block/iscsitarget/files/ietd-init.d-2 b/sys-block/iscsitarget/files/ietd-init.d-2
deleted file mode 100644
index 2f4f7cef8698..000000000000
--- a/sys-block/iscsitarget/files/ietd-init.d-2
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-MEM_SIZE=1048576
-DAEMON=/usr/sbin/ietd
-CONFIG_FILE=/etc/ietd.conf
-PID_FILE=/var/run/ietd.pid
-NAME="iSCSI Enterprise Target"
-
-ARGS=""
-[ -n "$USER" ] && ARGS="${ARGS} --uid=${USER}"
-[ -n "$GROUP" ] && ARGS="${ARGS} --gid=${GROUP}"
-[ -n "$ISNS" ] && ARGS="${ARGS} --isns=${ISNS}"
-[ -n "$PORT" ] && ARGS="${ARGS} --port=${PORT}"
-[ -n "$ADDRESS" ] && ARGS="${ARGS} --address=${ADDRESS}"
-[ -n "$DEBUGLEVEL" ] && ARGS="${ARGS} --debug=${DEBUGLEVEL}"
-
-depend() {
-	use net
-	after modules
-}
-checkconfig() {
-	if [ ! -f $CONFIG_FILE ]; then
-		eerror "Config file $CONFIG_FILE does not exist!"
-		return 1
-	fi
-	if [ -z "$DISABLE_MEMORY_WARNINGS" ]; then
-		check_memsize
-	fi
-}
-
-check_memsize() {
-	local wr md sysctl_key v k
-	for wr in r w; do
-		for md in max default; do
-			sysctl_key="net.core.${wr}mem_${md}"
-			v="$(sysctl -n ${sysctl_key})"
-			if [ "${v}" -lt "${MEM_SIZE}" ]; then
-				ewarn "$sysctl_key ($v) is lower than recommended ${MEM_SIZE}"
-			fi
-		done
-	done
-	for wr in "" r w; do
-		sysctl_key="net.ipv4.tcp_${wr}mem"
-		set -- $(sysctl -n ${sysctl_key})
-		for k in min default max ; do
-			if [ "${1}" -lt "${MEM_SIZE}" ]; then
-				ewarn "$sysctl_key:$k (${1}) is lower than recommended ${MEM_SIZE}"
-			fi
-			shift
-		done
-	done
-}
-
-do_modules() {
-	msg="$1"
-	shift
-	modules="$1"
-	shift
-	opts="$@"
-	for m in ${modules}; do
-		ebegin "${msg} - ${m}"
-		modprobe ${opts} $m
-		ret=$?
-		eend $ret
-		[ $ret -ne 0 ] && return $ret
-	done
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-	do_modules 'Loading iSCSI-Target modules' 'iscsi_trgt'
-	ebegin "Starting ${NAME}"
-	start-stop-daemon --start --exec $DAEMON --quiet -- ${ARGS}
-	eend $?
-}
-
-stop() {
-	ebegin "Removing ${NAME} devices"
-	# ugly, but ietadm does not allways provides correct exit values
-	RETURN="$(ietadm --op delete 2>&1)"
-	RETVAL=$?
-	if [ $RETVAL -eq 0 ] && [ "$RETURN" != "something wrong" ] ; then
-		eend 0
-	else
-		eend 1
-		eerror "ietadm failed - $RETURN"
-		return 1
-	fi
-
-	ebegin "Stopping ${NAME}"
-	start-stop-daemon --stop --quiet --exec $DAEMON --pidfile $PID_FILE
-	ret=$?
-	eend $ret
-	[ $ret -ne 0 ] && return 1
-
-	# ugly, but pid file is not removed by ietd
-	rm -f $PID_FILE
-	do_modules 'Removing iSCSI-Target modules' 'iscsi_trgt' '-r'
-	return $?
-}
-
-# vim: tw=72:
diff --git a/sys-block/iscsitarget/files/iscsitarget-0.4.15-isns-set-scn-flag.patch b/sys-block/iscsitarget/files/iscsitarget-0.4.15-isns-set-scn-flag.patch
deleted file mode 100644
index 47ca031a7469..000000000000
--- a/sys-block/iscsitarget/files/iscsitarget-0.4.15-isns-set-scn-flag.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-http://bugs.gentoo.org/180619
-
---- usr/isns.c
-+++ usr/isns.c
-@@ -215,13 +215,13 @@
- 
- #if __BYTE_ORDER == __LITTLE_ENDIAN
- #define set_scn_flag(x)						\
--{								\
-+({								\
- 	x = (x & 0x55555555) << 1 | (x & 0xaaaaaaaa) >> 1;	\
- 	x = (x & 0x33333333) << 2 | (x & 0xcccccccc) >> 2;	\
- 	x = (x & 0x0f0f0f0f) << 4 | (x & 0xf0f0f0f0) >> 4;	\
- 	x = (x & 0x00ff00ff) << 8 | (x & 0xff00ff00) >> 8;	\
- 	x = (x & 0x0000ffff) << 16 | (x & 0xffff0000) >> 16;	\
--}
-+})
- #else
- #define set_scn_flag(x) (x)
- #endif
diff --git a/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.28.patch b/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.28.patch
deleted file mode 100644
index 1f57afdba42c..000000000000
--- a/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.28.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 57551cb0529b48411f8f63a002882b7e1cf792f8 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Diego=20E.=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Wed, 25 Mar 2009 16:14:26 +0100
-Subject: [PATCH 1/2] Fix building with Linux kernel 2.6.28 and later.
-
-With changeset 30c40d2c01f68c7eb1a41ab3552bdaf5dbf300d4 of the Linux
-kernel, the functions open_bdev_excl and close_bdev_excl were replaced with
-functionally-equivalent open_bdev_exclusive and close_bdev_exclusive.
-
-The new interface uses fmode_t instead of integer flags to carry on the
-opening mode for a block device, thus require some minor changes in the
-calls.
----
- kernel/block-io.c |   22 ++++++++++++++++++++++
- 1 files changed, 22 insertions(+), 0 deletions(-)
-
-diff --git a/kernel/block-io.c b/kernel/block-io.c
-index e4a25f7..af10c7e 100644
---- a/kernel/block-io.c
-+++ b/kernel/block-io.c
-@@ -13,11 +13,18 @@
- #include <linux/blkdev.h>
- #include <linux/parser.h>
- #include <linux/buffer_head.h>
-+#include <linux/version.h>
- 
- #include "iscsi.h"
- #include "iscsi_dbg.h"
- #include "iotype.h"
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+# define HAVE_OPEN_BDEV_EXCLUSIVE 1
-+#else
-+# define HAVE_OPEN_BDEV_EXCLUSIVE 0
-+#endif
-+
- struct blockio_data {
- 	char *path;
- 	struct block_device *bdev;
-@@ -154,14 +161,22 @@ blockio_open_path(struct iet_volume *volume, const char *path)
- {
- 	struct blockio_data *bio_data = volume->private;
- 	struct block_device *bdev;
-+#if HAVE_OPEN_BDEV_EXCLUSIVE
-+	fmode_t mode = FMODE_READ | ( LUReadonly(volume) ? 0 : FMODE_WRITE );
-+#else
- 	int flags = LUReadonly(volume) ? MS_RDONLY : 0;
-+#endif
- 	int err = 0;
- 
- 	bio_data->path = kstrdup(path, GFP_KERNEL);
- 	if (!bio_data->path)
- 		return -ENOMEM;
- 
-+#if HAVE_OPEN_BDEV_EXCLUSIVE
-+	bdev = open_bdev_exclusive(path, mode, THIS_MODULE);
-+#else
- 	bdev = open_bdev_excl(path, flags, THIS_MODULE);
-+#endif
- 	if (IS_ERR(bdev)) {
- 		err = PTR_ERR(bdev);
- 		eprintk("Can't open device %s, error %d\n", path, err);
-@@ -323,9 +338,16 @@ static void
- blockio_detach(struct iet_volume *volume)
- {
- 	struct blockio_data *bio_data = volume->private;
-+#if HAVE_OPEN_BDEV_EXCLUSIVE
-+	fmode_t mode = FMODE_READ | ( LUReadonly(volume) ? 0 : FMODE_WRITE );
-+#endif
- 
- 	if (bio_data->bdev)
-+#if HAVE_OPEN_BDEV_EXCLUSIVE
-+		close_bdev_exclusive(bio_data->bdev, mode);
-+#else
- 		close_bdev_excl(bio_data->bdev);
-+#endif
- 	kfree(bio_data->path);
- 
- 	kfree(volume->private);
--- 
-1.6.2
-
diff --git a/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.29.patch b/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.29.patch
deleted file mode 100644
index 092fdc3fd9c4..000000000000
--- a/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.29.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 81373580a641732a7e4610c3d39af0c68007b892 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Wed, 25 Mar 2009 16:14:46 +0100
-Subject: [PATCH 2/2] Fix building with Linux kernel 2.6.29 and later.
-
-When building for Linux 2.6.29 or later, instead of using the NIP6
-macro (that has been removed) use the new %p6 format specifier.
----
- kernel/conn.c |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/kernel/conn.c b/kernel/conn.c
-index f96e2b6..ab561f9 100644
---- a/kernel/conn.c
-+++ b/kernel/conn.c
-@@ -6,6 +6,7 @@
- 
- #include <linux/file.h>
- #include <linux/ip.h>
-+#include <linux/version.h>
- #include <net/tcp.h>
- 
- #include "iscsi.h"
-@@ -47,8 +48,13 @@ void conn_info_show(struct seq_file *seq, struct iscsi_session *session)
- 			break;
- 		case AF_INET6:
- 			snprintf(buf, sizeof(buf),
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
-+				 "[%p6]",
-+				 &(inet6_sk(sk)->daddr));
-+#else
- 				 "[%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]",
- 				 NIP6(inet6_sk(sk)->daddr));
-+#endif
- 			break;
- 		default:
- 			break;
--- 
-1.6.2
-
diff --git a/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.30.patch b/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.30.patch
deleted file mode 100644
index fa420e97b375..000000000000
--- a/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.30.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cb1b94ffa91d71aba8e07ed018e9f43064e05a49 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Wed, 10 Jun 2009 17:24:02 +0200
-Subject: [PATCH 3/3] Fix building with Linux kernel 2.6.30 and later.
-
-With commit 99b76233803beab302123d243eea9e41149804f3 the proc_dir_entry
-structure does not have an owner any longer, this just removes the
-assignment to make the code build with the newer kernel.
----
- kernel/config.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/kernel/config.c b/kernel/config.c
-index d6c4b5e..34681f5 100644
---- a/kernel/config.c
-+++ b/kernel/config.c
-@@ -5,6 +5,7 @@
-  */
- 
- #include <linux/proc_fs.h>
-+#include <linux/version.h>
- 
- #include "iscsi.h"
- #include "iscsi_dbg.h"
-@@ -43,7 +44,9 @@ int iet_procfs_init(void)
- 	if (!(proc_iet_dir = proc_mkdir("iet", init_net.proc_net)))
- 		goto err;
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
- 	proc_iet_dir->owner = THIS_MODULE;
-+#endif
- 
- 	for (i = 0; i < ARRAY_SIZE(iet_proc_entries); i++) {
- 		ent = create_proc_entry(iet_proc_entries[i].name, 0, proc_iet_dir);
--- 
-1.6.3.1
-
diff --git a/sys-block/iscsitarget/files/iscsitarget-0.4.17-build.patch b/sys-block/iscsitarget/files/iscsitarget-0.4.17-build.patch
deleted file mode 100644
index e984bd3ec374..000000000000
--- a/sys-block/iscsitarget/files/iscsitarget-0.4.17-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- usr/Makefile
-+++ usr/Makefile
-@@ -1,16 +1,15 @@
--CFLAGS += -O2 -fno-inline -Wall -Wstrict-prototypes -g -I../include
-+CFLAGS ?= -O2 -fno-inline -g
- CFLAGS += -D_GNU_SOURCE # required for glibc >= 2.8
-+WARNFLAGS = -Wall -Wstrict-prototypes
-+CFLAGS += $(WARNFLAGS) -I../include
- PROGRAMS = ietd ietadm
--LIBS = -lcrypto
-+LDLIBS = -lcrypto
- 
- all: $(PROGRAMS)
- 
- ietd: ietd.o iscsid.o conn.o session.o target.o message.o ctldev.o log.o chap.o event.o param.o plain.o isns.o
- 
--	$(CC) $^ -o $@ $(LIBS)
--
- ietadm: ietadm.o param.o
--	$(CC) $^ -o $@
- 
- clean:
- 	rm -f *.o $(PROGRAMS)
diff --git a/sys-block/iscsitarget/files/iscsitarget-1.4.18+linux-2.6.32.patch b/sys-block/iscsitarget/files/iscsitarget-1.4.18+linux-2.6.32.patch
deleted file mode 100644
index f139e732e7de..000000000000
--- a/sys-block/iscsitarget/files/iscsitarget-1.4.18+linux-2.6.32.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 43227c1624e919efcd0cd035516c1776be55ac08 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Sun, 18 Oct 2009 12:41:28 +0200
-Subject: [PATCH] Fix building with Linux kernel 2.6.32 and later.
-
-With commit 18f2ee705d98034b0f229a3202d827468d4bffd9 of the Linux kernel,
-the sync_page_range() function has been removed.
-
-This patch changes it to filemap_write_and_wait_range() as done for the XFS
-driver in the kernel (commit af0f4414f343429971d33b0dd8dccc85c1f3dcd2).
----
- kernel/file-io.c |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/kernel/file-io.c b/kernel/file-io.c
-index dbf7b1c..e4c3fea 100644
---- a/kernel/file-io.c
-+++ b/kernel/file-io.c
-@@ -8,6 +8,7 @@
- #include <linux/blkdev.h>
- #include <linux/parser.h>
- #include <linux/writeback.h>
-+#include <linux/version.h>
- 
- #include "iscsi.h"
- #include "iscsi_dbg.h"
-@@ -88,7 +89,12 @@ static int fileio_sync(struct iet_volume *lu, struct tio *tio)
- 		count = lu->blk_cnt << lu->blk_shift;
- 	}
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32)
- 	res = sync_page_range(inode, mapping, ppos, count);
-+#else
-+	res = filemap_write_and_wait_range(mapping, ppos,
-+					   ppos + count -1);
-+#endif
- 	if (res) {
- 		eprintk("I/O error: syncing pages failed: %d\n", res);
- 		return -EIO;
--- 
-1.6.5
-
diff --git a/sys-block/iscsitarget/files/iscsitarget-1.4.19+linux-2.6.33.patch b/sys-block/iscsitarget/files/iscsitarget-1.4.19+linux-2.6.33.patch
deleted file mode 100644
index 3c2e4e426282..000000000000
--- a/sys-block/iscsitarget/files/iscsitarget-1.4.19+linux-2.6.33.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -p -up iscsitarget-1.4.19-1mdv2010.1/kernel/conn.c.2.6.33 iscsitarget-1.4.19-1mdv2010.1/kernel/conn.c
---- iscsitarget-1.4.19-1mdv2010.1/kernel/conn.c.2.6.33	2010-02-21 13:07:29.000000000 +0100
-+++ iscsitarget-1.4.19-1mdv2010.1/kernel/conn.c	2010-02-21 13:41:38.641365087 +0100
-@@ -43,7 +43,7 @@ void conn_info_show(struct seq_file *seq
- 		switch (sk->sk_family) {
- 		case AF_INET:
- 			snprintf(buf, sizeof(buf),
--				 "%u.%u.%u.%u", NIPQUAD(inet_sk(sk)->daddr));
-+				 "%u.%u.%u.%u", NIPQUAD(inet_sk(sk)->inet_daddr));
- 			break;
- 		case AF_INET6:
- 			snprintf(buf, sizeof(buf), "[%pI6]",
diff --git a/sys-block/iscsitarget/files/iscsitarget-1.4.20.2-respect-flags-v2.patch b/sys-block/iscsitarget/files/iscsitarget-1.4.20.2-respect-flags-v2.patch
deleted file mode 100644
index b675afff08ae..000000000000
--- a/sys-block/iscsitarget/files/iscsitarget-1.4.20.2-respect-flags-v2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: usr/Makefile
-===================================================================
---- usr/Makefile	(revision 446)
-+++ usr/Makefile	(working copy)
-@@ -1,4 +1,4 @@
--CFLAGS += -O2 -fno-inline -Wall -Wstrict-prototypes -I../include
-+CFLAGS += -fno-inline -Wall -Wstrict-prototypes -I../include
- CFLAGS += -D_GNU_SOURCE # required for glibc >= 2.8
- PROGRAMS = ietd ietadm
- LIBS =
diff --git a/sys-block/iscsitarget/files/iscsitarget-1.4.20.2-respect-flags.patch b/sys-block/iscsitarget/files/iscsitarget-1.4.20.2-respect-flags.patch
deleted file mode 100644
index 347650ab9407..000000000000
--- a/sys-block/iscsitarget/files/iscsitarget-1.4.20.2-respect-flags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -26,7 +26,7 @@
-   endif
- endif
- 
--KVER := $(shell $(CC) $(CFLAGS) -E -dM $(VERSION_FILE) | \
-+KVER := $(shell $(CC) $(CFLAGS) $(LDFLAGS) -E -dM $(VERSION_FILE) | \
- 	grep UTS_RELEASE | awk '{ print $$3 }' | sed 's/\"//g')
- 
- KMOD := /lib/modules/$(KVER)/extra
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -1,4 +1,4 @@
--CFLAGS += -O2 -fno-inline -Wall -Wstrict-prototypes -g -I../include
-+CFLAGS += -fno-inline -Wall -Wstrict-prototypes -I../include
- CFLAGS += -D_GNU_SOURCE # required for glibc >= 2.8
- PROGRAMS = ietd ietadm
- LIBS =
-@@ -7,10 +7,10 @@
- 
- ietd: ietd.o iscsid.o conn.o session.o target.o message.o ctldev.o log.o chap.o event.o param.o plain.o isns.o md5.o sha1.o
- 
--	$(CC) $^ -o $@ $(LIBS)
-+	$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- ietadm: ietadm.o param.o
--	$(CC) $^ -o $@
-+	$(CC) $(LDFLAGS) $^ -o $@
- 
- clean:
- 	rm -f *.o $(PROGRAMS)
diff --git a/sys-block/iscsitarget/files/iscsitarget-1.4.20.2_kernel-2.6.36.patch b/sys-block/iscsitarget/files/iscsitarget-1.4.20.2_kernel-2.6.36.patch
deleted file mode 100644
index 63c50b093368..000000000000
--- a/sys-block/iscsitarget/files/iscsitarget-1.4.20.2_kernel-2.6.36.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- trunk/kernel/conn.c	(revision 372)
-+++ trunk/kernel/conn.c	(working copy)
-@@ -44,7 +44,7 @@
- 		switch (sk->sk_family) {
- 		case AF_INET:
- 			snprintf(buf, sizeof(buf),
--				 "%u.%u.%u.%u", NIPQUAD(inet_sk(sk)->inet_daddr));
-+				 "%pI4", inet_sk(sk)->inet_daddr);
- 			break;
- 		case AF_INET6:
- 			snprintf(buf, sizeof(buf), "[%pI6]",
-
diff --git a/sys-block/iscsitarget/files/iscsitarget-1.4.20.2_p20130103-fix-3.2-support.patch b/sys-block/iscsitarget/files/iscsitarget-1.4.20.2_p20130103-fix-3.2-support.patch
deleted file mode 100644
index d41751535d31..000000000000
--- a/sys-block/iscsitarget/files/iscsitarget-1.4.20.2_p20130103-fix-3.2-support.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-diff --git a/Makefile b/Makefile
-index df41642..f2f17c8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -46,18 +46,10 @@ kver_lt = $(shell [ $(KMAJ) -lt $(1) -o \
- 	$(KMAJ) -eq $(1) -a $(KMIN) -lt $(2) -o \
-         $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -lt $(3) ] && \
- 	echo 1 || echo 0)
--kver_le = $(shell [ $(KMAJ) -lt $(1) -o \
--        $(KMAJ) -eq $(1) -a $(KMIN) -lt $(2) -o \
--        $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -le $(3) ] && \
--	echo 1 || echo 0)
--kver_gt = $(shell [ ( $(KMAJ) -gt $(1) ) -o \
-+kver_gt = $(shell [ $(KMAJ) -gt $(1) -o \
-         $(KMAJ) -eq $(1) -a $(KMIN) -gt $(2) -o \
-         $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -gt $(3) ] && \
- 	echo 1 || echo 0)
--kver_ge = $(shell [ ( $(KMAJ) -gt $(1) ) -o \
--        $(KMAJ) -eq $(1) -a $(KMIN) -gt $(2) -o \
--        $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -ge $(3) ] && \
--	echo 1 || echo 0)
- kver_lk = $(shell [ `echo $(KVER) | egrep $(1)` ] && echo 1 || echo 0)
- 
- #
-@@ -66,85 +58,93 @@ kver_lk = $(shell [ `echo $(KVER) | egrep $(1)` ] && echo 1 || echo 0)
- # base first the earlier patch sets will not need to be modified.
- #
- 
--ifeq ($(call kver_le,3,5,0),1)
-+ifeq ($(call kver_lt,3,6,0),1)
- 	PATCHES := $(PATCHES) compat-3.5.patch
- endif
- 
--ifeq ($(call kver_le,3,4,0),1)
-+ifeq ($(call kver_lt,3,5,0),1)
- 	PATCHES := $(PATCHES) compat-3.2-3.4.patch
- endif
- 
--ifeq ($(call kver_le,3,2,0),1)
-+ifeq ($(call kver_lt,3,3,0),1)
- 	PATCHES := $(PATCHES) compat-2.6.39-3.2.patch
- endif
- 
--ifeq ($(call kver_le,2,6,38),1)
-+ifeq ($(call kver_lt,2,6,39),1)
- 	PATCHES := $(PATCHES) compat-2.6.38.patch
- endif
- 
--ifeq ($(call kver_le,2,6,37),1)
-+ifeq ($(call kver_lt,2,6,38),1)
- 	PATCHES := $(PATCHES) compat-2.6.36-2.6.37.patch
- endif
- 
- # Compatibility patch for kernels > 2.6.32 <= 2.6.35
--ifeq ($(call kver_le,2,6,35),1)
-+ifeq ($(call kver_lt,2,6,36),1)
-+ifeq ($(call kver_gt,2,6,32),1)
- 	PATCHES := $(PATCHES) compat-2.6.33-2.6.35.patch
- endif
-+endif
- 
- # Compatibility patch for kernels <= 2.6.32
--ifeq ($(call kver_le,2,6,32),1)
-+ifeq ($(call kver_lt,2,6,33),1)
- 	PATCHES := $(PATCHES) compat-2.6.32.patch
- endif
- 
- # Compatibility patch for kernels <= 2.6.31
--ifeq ($(call kver_le,2,6,31),1)
-+ifeq ($(call kver_lt,2,6,32),1)
- 	PATCHES := $(PATCHES) compat-2.6.31.patch
- endif
- 
- # Compatibility patch for kernels <= 2.6.30
--ifeq ($(call kver_le,2,6,30),1)
-+ifeq ($(call kver_lt,2,6,31),1)
- 	PATCHES := $(PATCHES) compat-2.6.30.patch
- endif
- 
- # Compatibility patch for kernels <= 2.6.29
--ifeq ($(call kver_le,2,6,29),1)
-+ifeq ($(call kver_lt,2,6,30),1)
- 	PATCHES := $(PATCHES) compat-2.6.29.patch
- endif
- 
- # Compatibility patch for kernels <= 2.6.28
--ifeq ($(call kver_le,2,6,28),1)
-+ifeq ($(call kver_lt,2,6,29),1)
- 	PATCHES := $(PATCHES) compat-2.6.28.patch
- endif
- 
- # Compatibility patch for kernels >= 2.6.25 and <= 2.6.27
--ifeq ($(call kver_le,2,6,27),1)
-+ifeq ($(call kver_lt,2,6,28),1)
-+ifeq ($(call kver_gt,2,6,24),1)
- 	PATCHES := $(PATCHES) compat-2.6.25-2.6.27.patch
- endif
-+endif
- 
- # Compatibility patch for kernels <= 2.6.24
--ifeq ($(call kver_le,2,6,24),1)
-+ifeq ($(call kver_lt,2,6,25),1)
- 	PATCHES := $(PATCHES) compat-2.6.24.patch
- endif
- 
- # Compatibility patch for kernels <= 2.6.23
--ifeq ($(call kver_le,2,6,23),1)
-+ifeq ($(call kver_lt,2,6,24),1)
- 	PATCHES := $(PATCHES) compat-2.6.23.patch
- endif
- 
- # Compatibility patch for kernels <= 2.6.22
--ifeq ($(call kver_le,2,6,22),1)
-+ifeq ($(call kver_lt,2,6,23),1)
- 	PATCHES := $(PATCHES) compat-2.6.22.patch
- endif
- 
- # Compatibility patch for kernels >= 2.6.19 and <= 2.6.21
--ifeq ($(call kver_le,2,6,21),1)
-+ifeq ($(call kver_lt,2,6,22),1)
-+ifeq ($(call kver_gt,2,6,18),1)
- 	PATCHES := $(PATCHES) compat-2.6.19-2.6.21.patch
- endif
-+endif
- 
- # Compatibility patch for kernels >= 2.6.14 and <= 2.6.18
--ifeq ($(call kver_le,2,6,18),1)
-+ifeq ($(call kver_lt,2,6,19),1)
-+ifeq ($(call kver_gt,2,6,13),1)
- 	PATCHES := $(PATCHES) compat-2.6.14-2.6.18.patch
- endif
-+endif
- 
- # We don't support kernels < 2.6.14 except for explicit distros
- ifeq ($(call kver_lt,2,6,14),1)
diff --git a/sys-block/iscsitarget/files/iscsitarget-1.4.20.2_p20130103-restore-linux-2.6.32-support.patch b/sys-block/iscsitarget/files/iscsitarget-1.4.20.2_p20130103-restore-linux-2.6.32-support.patch
deleted file mode 100644
index cc6a0b8c7e3c..000000000000
--- a/sys-block/iscsitarget/files/iscsitarget-1.4.20.2_p20130103-restore-linux-2.6.32-support.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/kernel/iscsi.c b/kernel/iscsi.c
-index 9ad3047..37d7753 100644
---- a/kernel/iscsi.c
-+++ b/kernel/iscsi.c
-@@ -773,6 +773,7 @@ static void set_offset_and_length(const struct iet_volume *lu,
- 		break;
- 	case READ_16:
- 	case WRITE_16:
-+#ifdef WRITE_SAME_16
- 	case WRITE_SAME_16:
- 		*off = (u64)cmd[2] << 56 | (u64)cmd[3] << 48 |
- 			(u64)cmd[4] << 40 | (u64)cmd[5] << 32 |
-@@ -781,6 +782,7 @@ static void set_offset_and_length(const struct iet_volume *lu,
- 		*len = (u32)cmd[10] << 24 | (u32)cmd[11] << 16 |
- 			(u32)cmd[12] << 8 | (u32)cmd[13];
- 		break;
-+#endif
- 	case PERSISTENT_RESERVE_OUT:
- 		{
- 			const struct persistent_reserve_out *pr_out =
-@@ -1036,6 +1038,7 @@ static void scsi_cmnd_start(struct iscsi_conn *conn, struct iscsi_cmnd *req)
- 	case WRITE_10:
- 	case WRITE_16:
- 	case WRITE_VERIFY:
-+#ifdef WRITE_SAME_16
- 	case WRITE_SAME_16:
- 	{
- 		struct iscsi_sess_param *param = &conn->session->param;
-@@ -1104,6 +1107,7 @@ static void scsi_cmnd_start(struct iscsi_conn *conn, struct iscsi_cmnd *req)
- 		}
- 		break;
- 	}
-+#endif
- 	error:
- 	default:
- 		eprintk("Unsupported %x\n", req_hdr->scb[0]);
-diff --git a/kernel/iscsi_dbg.h b/kernel/iscsi_dbg.h
-index 8c9b928..ad5c6d4 100644
---- a/kernel/iscsi_dbg.h
-+++ b/kernel/iscsi_dbg.h
-@@ -12,7 +12,9 @@
- #define D_IOMODE	(1UL << 8)
- #define D_UAC           (1UL << 9)
- #define D_PR            (1UL << 10)
-+#ifdef WRITE_SAME_16
- #define D_VAAI		(1UL << 11)
-+#endif
- 
- #define D_DATA		(D_READ | D_WRITE)
- 
-diff --git a/kernel/target_disk.c b/kernel/target_disk.c
-index 6b1de2c..ca28e4e 100644
---- a/kernel/target_disk.c
-+++ b/kernel/target_disk.c
-@@ -408,6 +408,7 @@ static void build_write_response(struct iscsi_cmnd *cmnd)
- 		iscsi_cmnd_set_sense(cmnd, MEDIUM_ERROR, 0x03, 0x0);
- }
- 
-+#ifdef WRITE_SAME_16
- static void build_write_same_response(struct iscsi_cmnd *cmnd) {
- 	int err;
- 	struct tio *target_tio;
-@@ -475,6 +476,7 @@ static void build_write_same_response(struct iscsi_cmnd *cmnd) {
- 
- 	tio_put(target_tio);
- }
-+#endif
- 
- static void build_sync_cache_response(struct iscsi_cmnd *cmnd)
- {
-@@ -618,9 +620,11 @@ static int disk_execute_cmnd(struct iscsi_cmnd *cmnd)
- 	case WRITE_VERIFY:
- 		send_scsi_rsp(cmnd, build_write_response);
- 		break;
-+#ifdef WRITE_SAME_16
- 	case WRITE_SAME_16:
- 		send_scsi_rsp(cmnd, build_write_same_response);
- 		break;
-+#endif
- 	case SYNCHRONIZE_CACHE:
- 		send_scsi_rsp(cmnd, build_sync_cache_response);
- 		break;
-diff --git a/kernel/volume.c b/kernel/volume.c
-index 8beeb1e..6ad2a3d 100644
---- a/kernel/volume.c
-+++ b/kernel/volume.c
-@@ -446,7 +446,9 @@ int is_volume_reserved(struct iet_volume *volume, u64 sid, u8 *scb)
- 	case WRITE_10:
- 	case WRITE_12:
- 	case WRITE_16:
-+#ifdef WRITE_SAME_16
- 	case WRITE_SAME_16:
-+#endif
- 	case WRITE_VERIFY:
- 	case SYNCHRONIZE_CACHE:
- 		if (write_excl || excl_access)
diff --git a/sys-block/iscsitarget/iscsitarget-0.4.17.ebuild b/sys-block/iscsitarget/iscsitarget-0.4.17.ebuild
deleted file mode 100644
index f81ba0938839..000000000000
--- a/sys-block/iscsitarget/iscsitarget-0.4.17.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit linux-mod eutils flag-o-matic
-
-DESCRIPTION="Open Source iSCSI target with professional features"
-HOMEPAGE="http://iscsitarget.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-MODULE_NAMES="iscsi_trgt(misc:${S}/kernel)"
-CONFIG_CHECK="CRYPTO_CRC32C"
-ERROR_CFG="iscsitarget needs support for CRC32C in your kernel."
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.4.15-isns-set-scn-flag.patch #180619
-	epatch "${FILESDIR}"/${PN}-0.4.17-build.patch
-	epatch "${FILESDIR}"/${PN}-0.4.17+linux-2.6.28.patch #252608
-	epatch "${FILESDIR}"/${PN}-0.4.17+linux-2.6.29.patch
-	epatch "${FILESDIR}"/${PN}-0.4.17+linux-2.6.30.patch
-	convert_to_m "${S}"/Makefile
-}
-
-src_compile() {
-	emake usr || die "failed to build userspace"
-
-	unset ARCH
-	filter-ldflags -Wl,*
-	emake KSRC="${KERNEL_DIR}" kernel || die "failed to build module"
-}
-
-src_install() {
-	einfo "Installing userspace"
-	dosbin usr/ietd usr/ietadm || die "dosbin failed"
-	insinto /etc
-	doins etc/ietd.conf etc/initiators.{allow,deny} || die "doins failed"
-	# Upstream's provided Gentoo init script is out of date compared to
-	# their Debian init script. And isn't that nice.
-	#newinitd etc/initd/initd.gentoo ietd || die
-	newinitd "${FILESDIR}"/ietd-init.d-2 ietd || die "newinitd failed"
-	newconfd "${FILESDIR}"/ietd-conf.d ietd || die "newconfd failed"
-
-	# Lock down perms, per bug 198209
-	fperms 0640 /etc/ietd.conf /etc/initiators.{allow,deny}
-
-	doman doc/manpages/*.[1-9] || die "manpages failed"
-	dodoc ChangeLog README || die "docs failed"
-
-	einfo "Installing kernel module"
-	unset ARCH
-	linux-mod_src_install || die "modules failed"
-}
diff --git a/sys-block/iscsitarget/iscsitarget-1.4.19.ebuild b/sys-block/iscsitarget/iscsitarget-1.4.19.ebuild
deleted file mode 100644
index 7346dbb770c4..000000000000
--- a/sys-block/iscsitarget/iscsitarget-1.4.19.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit linux-mod eutils flag-o-matic
-
-DESCRIPTION="Open Source iSCSI target with professional features"
-HOMEPAGE="http://iscsitarget.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-MODULE_NAMES="iscsi_trgt(misc:${S}/kernel)"
-CONFIG_CHECK="CRYPTO_CRC32C"
-ERROR_CFG="iscsitarget needs support for CRC32C in your kernel."
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.4.15-isns-set-scn-flag.patch #180619
-	epatch "${FILESDIR}"/${PN}-0.4.17-build.patch
-	epatch "${FILESDIR}"/${PN}-1.4.18+linux-2.6.32.patch
-	if kernel_is ge 2 6 33; then
-		epatch "${FILESDIR}"/${PN}-1.4.19+linux-2.6.33.patch
-	fi
-	convert_to_m "${S}"/Makefile
-}
-
-src_compile() {
-	emake KSRC="${KERNEL_DIR}" usr || die "failed to build userspace"
-
-	unset ARCH
-	filter-ldflags -Wl,*
-	emake KSRC="${KERNEL_DIR}" kernel || die "failed to build module"
-}
-
-src_install() {
-	einfo "Installing userspace"
-
-	# Install ietd into libexec; we don't need ietd to be in the path
-	# for ROOT, since it's just a service.
-	exeinto /usr/libexec
-	doexe usr/ietd || die "doexe ietd failed"
-
-	dosbin usr/ietadm || die "dosbin failed"
-
-	insinto /etc
-	doins etc/ietd.conf etc/initiators.allow || die "doins failed"
-
-	# We moved ietd in /usr/libexec, so update the init script accordingly.
-	sed -e 's:/usr/sbin/ietd:/usr/libexec/ietd:' "${FILESDIR}"/ietd-init.d-2 > "${T}"/ietd-init.d
-	newinitd "${T}"/ietd-init.d ietd || die "newinitd failed"
-	newconfd "${FILESDIR}"/ietd-conf.d ietd || die "newconfd failed"
-
-	# Lock down perms, per bug 198209
-	fperms 0640 /etc/ietd.conf /etc/initiators.{allow,deny}
-
-	doman doc/manpages/*.[1-9] || die "manpages failed"
-	dodoc ChangeLog README RELEASE_NOTES README.initiators README.vmware || die "docs failed"
-
-	einfo "Installing kernel module"
-	unset ARCH
-	linux-mod_src_install || die "modules failed"
-}
diff --git a/sys-block/iscsitarget/iscsitarget-1.4.20.2.ebuild b/sys-block/iscsitarget/iscsitarget-1.4.20.2.ebuild
deleted file mode 100644
index 3428fb040fdc..000000000000
--- a/sys-block/iscsitarget/iscsitarget-1.4.20.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit linux-mod eutils flag-o-matic
-
-DESCRIPTION="Open Source iSCSI target with professional features"
-HOMEPAGE="http://iscsitarget.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-MODULE_NAMES="iscsi_trgt(misc:${S}/kernel)"
-CONFIG_CHECK="CRYPTO_CRC32C"
-ERROR_CFG="iscsitarget needs support for CRC32C in your kernel."
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.4.15-isns-set-scn-flag.patch #180619
-	# Respect LDFLAGS. Bug #350742
-	epatch "${FILESDIR}"/${P}-respect-flags.patch
-	# NIPQUAD removed in 2.6.36, #340449
-	if kernel_is ge 2 6 36; then
-		epatch "${FILESDIR}"/iscsitarget-1.4.20.2_kernel-2.6.36.patch
-	fi
-	convert_to_m "${S}"/Makefile
-}
-
-src_compile() {
-	emake KSRC="${KERNEL_DIR}" usr || die
-
-	unset ARCH
-	filter-ldflags -Wl,*
-	emake KSRC="${KERNEL_DIR}" kernel || die
-}
-
-src_install() {
-	einfo "Installing userspace"
-
-	# Install ietd into libexec; we don't need ietd to be in the path
-	# for ROOT, since it's just a service.
-	exeinto /usr/libexec
-	doexe usr/ietd || die
-
-	dosbin usr/ietadm || die
-
-	insinto /etc
-	doins etc/ietd.conf etc/initiators.allow || die
-
-	# We moved ietd in /usr/libexec, so update the init script accordingly.
-	sed -e 's:/usr/sbin/ietd:/usr/libexec/ietd:' "${FILESDIR}"/ietd-init.d-2 > "${T}"/ietd-init.d
-	newinitd "${T}"/ietd-init.d ietd || die
-	newconfd "${FILESDIR}"/ietd-conf.d ietd || die
-
-	# Lock down perms, per bug 198209
-	fperms 0640 /etc/ietd.conf /etc/initiators.allow
-
-	doman doc/manpages/*.[1-9] || die
-	dodoc ChangeLog README RELEASE_NOTES README.initiators README.vmware || die
-
-	einfo "Installing kernel module"
-	unset ARCH
-	linux-mod_src_install || die
-}
diff --git a/sys-block/iscsitarget/iscsitarget-1.4.20.2_p20130103.ebuild b/sys-block/iscsitarget/iscsitarget-1.4.20.2_p20130103.ebuild
deleted file mode 100644
index d0cdfe59c384..000000000000
--- a/sys-block/iscsitarget/iscsitarget-1.4.20.2_p20130103.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit linux-mod eutils flag-o-matic
-
-if [ ${PV} == "9999" ] ; then
-	inherit subversion
-	ESVN_REPO_URI="https://svn.code.sf.net/p/iscsitarget/code/trunk"
-else
-	SRC_URI="https://dev.gentoo.org/~ryao/dist/${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc x86"
-fi
-
-DESCRIPTION="Open Source iSCSI target with professional features"
-HOMEPAGE="http://iscsitarget.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-MODULE_NAMES="iscsi_trgt(misc:${S}/kernel)"
-
-pkg_setup() {
-	CONFIG_CHECK="CRYPTO_CRC32C"
-	ERROR_CFG="iscsitarget needs support for CRC32C in your kernel."
-
-	kernel_is ge 2 6 14 || die "Linux 2.6.14 or newer required"
-
-	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 6 || die "Linux 3.6 is the latest supported version."; }
-
-	linux-mod_pkg_setup
-}
-src_prepare() {
-	if [ ${PV} != "9999" ]
-	then
-		# Fix build system to apply proper patches
-		epatch "${FILESDIR}/${PN}-1.4.20.2_p20130103-fix-3.2-support.patch"
-
-		# Respect LDFLAGS. Bug #365735
-		epatch "${FILESDIR}/${PN}-1.4.20.2-respect-flags-v2.patch"
-
-		# Avoid use of WRITE_SAME_16 in Linux 2.6.32 and earlier
-		epatch "${FILESDIR}/${PN}-1.4.20.2_p20130103-restore-linux-2.6.32-support.patch"
-	fi
-
-	# Apply kernel-specific patches
-	emake KSRC="${KERNEL_DIR}" patch || die
-
-	epatch_user
-}
-
-src_compile() {
-	emake KSRC="${KERNEL_DIR}" usr || die
-
-	unset ARCH
-	filter-ldflags -Wl,*
-	emake KSRC="${KERNEL_DIR}" kernel || die
-}
-
-src_install() {
-	einfo "Installing userspace"
-
-	# Install ietd into libexec; we don't need ietd to be in the path
-	# for ROOT, since it's just a service.
-	exeinto /usr/libexec
-	doexe usr/ietd || die
-
-	dosbin usr/ietadm || die
-
-	insinto /etc
-	doins etc/ietd.conf etc/initiators.allow || die
-
-	# We moved ietd in /usr/libexec, so update the init script accordingly.
-	sed -e 's:/usr/sbin/ietd:/usr/libexec/ietd:' "${FILESDIR}"/ietd-init.d-2 > "${T}"/ietd-init.d
-	newinitd "${T}"/ietd-init.d ietd || die
-	newconfd "${FILESDIR}"/ietd-conf.d ietd || die
-
-	# Lock down perms, per bug 198209
-	fperms 0640 /etc/ietd.conf /etc/initiators.allow
-
-	doman doc/manpages/*.[1-9] || die
-	dodoc ChangeLog README RELEASE_NOTES README.initiators README.mcs README.vmware || die
-
-	einfo "Installing kernel module"
-	unset ARCH
-	linux-mod_src_install || die
-}
diff --git a/sys-block/iscsitarget/iscsitarget-1.4.20.2_p20130821.ebuild b/sys-block/iscsitarget/iscsitarget-1.4.20.2_p20130821.ebuild
deleted file mode 100644
index ed6015f7a7ee..000000000000
--- a/sys-block/iscsitarget/iscsitarget-1.4.20.2_p20130821.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit linux-mod eutils flag-o-matic
-
-if [ ${PV} == "9999" ] ; then
-	inherit subversion
-	ESVN_REPO_URI="https://svn.code.sf.net/p/iscsitarget/code/trunk"
-else
-	SRC_URI="https://dev.gentoo.org/~ryao/dist/${P}.tar.xz"
-	KEYWORDS="amd64 ~ppc x86"
-fi
-
-DESCRIPTION="Open Source iSCSI target with professional features"
-HOMEPAGE="http://iscsitarget.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-MODULE_NAMES="iscsi_trgt(misc:${S}/kernel)"
-
-pkg_setup() {
-	CONFIG_CHECK="CRYPTO_CRC32C"
-	ERROR_CFG="iscsitarget needs support for CRC32C in your kernel."
-
-	kernel_is ge 2 6 14 || die "Linux 2.6.14 or newer required"
-
-	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 11 || die "Linux 3.11 is the latest supported version."; }
-
-	linux-mod_pkg_setup
-}
-src_prepare() {
-	if [ ${PV} != "9999" ]
-	then
-		# Fix build system to apply proper patches
-		epatch "${FILESDIR}/${PN}-1.4.20.2_p20130103-fix-3.2-support.patch"
-
-		# Respect LDFLAGS. Bug #365735
-		epatch "${FILESDIR}/${PN}-1.4.20.2-respect-flags-v2.patch"
-
-		# Avoid use of WRITE_SAME_16 in Linux 2.6.32 and earlier
-		epatch "${FILESDIR}/${PN}-1.4.20.2_p20130103-restore-linux-2.6.32-support.patch"
-	fi
-
-	# Apply kernel-specific patches
-	emake KSRC="${KERNEL_DIR}" patch || die
-
-	epatch_user
-}
-
-src_compile() {
-	emake KSRC="${KERNEL_DIR}" usr || die
-
-	unset ARCH
-	filter-ldflags -Wl,*
-	emake KSRC="${KERNEL_DIR}" kernel || die
-}
-
-src_install() {
-	einfo "Installing userspace"
-
-	# Install ietd into libexec; we don't need ietd to be in the path
-	# for ROOT, since it's just a service.
-	exeinto /usr/libexec
-	doexe usr/ietd || die
-
-	dosbin usr/ietadm || die
-
-	insinto /etc
-	doins etc/ietd.conf etc/initiators.allow || die
-
-	# We moved ietd in /usr/libexec, so update the init script accordingly.
-	sed -e 's:/usr/sbin/ietd:/usr/libexec/ietd:' "${FILESDIR}"/ietd-init.d-2 > "${T}"/ietd-init.d
-	newinitd "${T}"/ietd-init.d ietd || die
-	newconfd "${FILESDIR}"/ietd-conf.d ietd || die
-
-	# Lock down perms, per bug 198209
-	fperms 0640 /etc/ietd.conf /etc/initiators.allow
-
-	doman doc/manpages/*.[1-9] || die
-	dodoc ChangeLog README RELEASE_NOTES README.initiators README.mcs README.vmware || die
-
-	einfo "Installing kernel module"
-	unset ARCH
-	linux-mod_src_install || die
-}
diff --git a/sys-block/iscsitarget/iscsitarget-9999.ebuild b/sys-block/iscsitarget/iscsitarget-9999.ebuild
deleted file mode 100644
index 8b95d3ba166a..000000000000
--- a/sys-block/iscsitarget/iscsitarget-9999.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit linux-mod eutils flag-o-matic
-
-if [ ${PV} == "9999" ] ; then
-	inherit subversion
-	ESVN_REPO_URI="https://svn.code.sf.net/p/iscsitarget/code/trunk"
-else
-	SRC_URI="https://dev.gentoo.org/~ryao/dist/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-DESCRIPTION="Open Source iSCSI target with professional features"
-HOMEPAGE="http://iscsitarget.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-MODULE_NAMES="iscsi_trgt(misc:${S}/kernel)"
-
-pkg_setup() {
-	CONFIG_CHECK="CRYPTO_CRC32C"
-	ERROR_CFG="iscsitarget needs support for CRC32C in your kernel."
-
-	kernel_is ge 2 6 14 || die "Linux 2.6.14 or newer required"
-
-	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 11 || die "Linux 3.11 is the latest supported version."; }
-
-	linux-mod_pkg_setup
-}
-src_prepare() {
-	if [ ${PV} != "9999" ]
-	then
-		# Fix build system to apply proper patches
-		epatch "${FILESDIR}/${PN}-1.4.20.2_p20130103-fix-3.2-support.patch"
-
-		# Respect LDFLAGS. Bug #365735
-		epatch "${FILESDIR}/${PN}-1.4.20.2-respect-flags-v2.patch"
-
-		# Avoid use of WRITE_SAME_16 in Linux 2.6.32 and earlier
-		epatch "${FILESDIR}/${PN}-1.4.20.2_p20130103-restore-linux-2.6.32-support.patch"
-	fi
-
-	# Apply kernel-specific patches
-	emake KSRC="${KERNEL_DIR}" patch || die
-
-	epatch_user
-}
-
-src_compile() {
-	emake KSRC="${KERNEL_DIR}" usr || die
-
-	unset ARCH
-	filter-ldflags -Wl,*
-	emake KSRC="${KERNEL_DIR}" kernel || die
-}
-
-src_install() {
-	einfo "Installing userspace"
-
-	# Install ietd into libexec; we don't need ietd to be in the path
-	# for ROOT, since it's just a service.
-	exeinto /usr/libexec
-	doexe usr/ietd || die
-
-	dosbin usr/ietadm || die
-
-	insinto /etc
-	doins etc/ietd.conf etc/initiators.allow || die
-
-	# We moved ietd in /usr/libexec, so update the init script accordingly.
-	sed -e 's:/usr/sbin/ietd:/usr/libexec/ietd:' "${FILESDIR}"/ietd-init.d-2 > "${T}"/ietd-init.d
-	newinitd "${T}"/ietd-init.d ietd || die
-	newconfd "${FILESDIR}"/ietd-conf.d ietd || die
-
-	# Lock down perms, per bug 198209
-	fperms 0640 /etc/ietd.conf /etc/initiators.allow
-
-	doman doc/manpages/*.[1-9] || die
-	dodoc ChangeLog README RELEASE_NOTES README.initiators README.mcs README.vmware || die
-
-	einfo "Installing kernel module"
-	unset ARCH
-	linux-mod_src_install || die
-}
diff --git a/sys-block/iscsitarget/metadata.xml b/sys-block/iscsitarget/metadata.xml
deleted file mode 100644
index 1b98394a3ceb..000000000000
--- a/sys-block/iscsitarget/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<upstream>
-	<remote-id type="sourceforge">iscsitarget</remote-id>
-</upstream>
-</pkgmetadata>