gentoo resync : 03.11.2019

4 files changed, 123 insertions, 5 deletions

diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index b3f8d691081c..d06aac774a8c 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -3,6 +3,7 @@ AUX libnet-1.0.2a-endian.patch 393 BLAKE2B a9dd6ce1763fb109b7f36d0cdf2c36297c0b1
 AUX libnet-1.0.2a-funroll.patch 232 BLAKE2B dc4eea13f830b03e02cab52d594dbd0322c30b2f7189ad35ebc6bd6c703f35ff5e6ae9f69ef35fc57cf224d56d09f07b71287be3c429421da7da5bb6ccf4e939 SHA512 c00749b3a17f08ba000ff26206a46a1b49f53e0a04b49df2151124e95b789854d8a3df563ad13553b35b4c683dca2be53905380a0f1d8eedb71c86d18b26127d
 AUX libnet-1.0.2a-gcc33-fix.patch 462 BLAKE2B 04fc43b82605a6200aac4edc5de509bf545d0fd103e9d088db147bcd5042c11827b918e8560792665982548033e439cd0a5af1938415c2852bd335e0f6f283f6 SHA512 ca4913145ffaf42ef1d267558ac00c096d1561a6dddf05b11f229aef969cc1601492168ae238d5d46b7015722822f9600018bc8a7cc344a4176e4d6c6e0c363f
 AUX libnet-1.0.2a-slot.patch 6244 BLAKE2B 61f4131eca23d9dc20922058e0382c38ebba480df267472bbaa88481857511c3fa2ae5ad4e6203425475d7a2c3a1421873c3d03b00a5e5cc311bec7f64b8107e SHA512 6f800d91cb16077df967227feed58ee61b60ab1d248eda5fe788c21ba2cd7c404647213f3721f19bdbe80be0c45d571234dd82f010fe9fc70c4c270c97e138b5
+AUX libnet-1.0.2a-test.patch 1172 BLAKE2B 105a23a904da361216f370b005016d205ea971855a064d45b1282faabdb11878cbc2568ffe311074eb437677e03d604497727c58273711826af125a1cc3f11a6 SHA512 3ab6e667798362d605c2a1a5b8c172c80a99d2569d4418cb47b7bb8f69ea424e718b2947ea22b43d882c556f65470bec04451d9356070b8a4fe10f6505122bf7
 AUX libnet-1.1.6-musl.patch 686 BLAKE2B 08d509fbb0dc960aa8e3fa622e958fe9b4fbadaf8cd47896c02eb90bcc897eb1a3b7699350f7a64f63a529efc325573bd5b5d730f7129ea601f6338db2d09fe3 SHA512 23bbf5e87b704b2d4cf3f6da308b29d840950fde67eb67294ed44bc18eb327b4a2bcd04218dbd1a27a2445b3df7a98af72b1d5bd1afc83cb448a9e8f403aec01
 AUX libnet-1.2-_SOURCE.patch 735 BLAKE2B af32a0eb7f6dac2fb909785f7ef95bd98d0bd92f48759ab4673d2c3f10b894bd0732fe82fa1fd60ce897c0c4b0eaefc8ff57b3cd13ec632f89ebd00376e5fee1 SHA512 698138d6d39984090fb906cc0201b720c399f0a55dd06cc8857159f0e045bd980c195876ef2662fa4e54d6dfd12e1a106e6c829dc201226c97296c2d24bc2a59
 AUX libnet-1.2-rc.patch 333 BLAKE2B 5e3d0803e985f2ec49f11236b8fdc59742aad401448e921c3c5180354f52e4bd9be28804c656ede929c107c7577c48241277642a5650e0647b0842194afecca0 SHA512 144796cbcf550982a523df46763a60ee5261c8fd80adc674c0a2075b1003623785a1c5589e6ff53a5472e43f3f16d859e71ba6fa98aaaabc767ceb4805676bcd
@@ -10,10 +11,11 @@ AUX libnet-1.2-sizeof.patch 239 BLAKE2B 141f8d9c32d351e5f30eedfe0b92b0d9cb7ad0dd
 AUX libnet-1.2-socklen_t.patch 145 BLAKE2B 35a13516984af9f460c0778a25e205c79e7152178549203f070676dc69ae20b9c99ada7a0194ec898beaa45b403cd584a458079b1d2c458b0b1923f9628d7d8c SHA512 31e7dbee2e6d747a69d86f9cfba43d1f591d97f2868b14c9fa16884f5d1650a7602ca10e875afe5779477d9358db6121fd66371fe183a865860376fb809aef97
 DIST libnet-1.0.2a.tar.gz 140191 BLAKE2B 4107cb714b7be901250759ce5288a86922bd7cc20081a9d2c93758150d74c55844db98c43874befdfb593ec25e128d6ae2389eff7c46da79dcbb9681f649e059 SHA512 2e9a73bd767e1f46eea92e18ddd83cc3179144c8cc5b1a22b4dba50fee16173c951be4dd647a247bd7067c33b9e33489a6efb313ce1ea0c61c4a06009c3c4d95
 DIST libnet-1.2-rc3.tar.gz 676205 BLAKE2B f1aa199489e9aacc6b2bf567f5885e3b54b1044fb292693581c8fbc8fb99c565e0a9436b35914bdbda65798b00527049f279da3b3b6048e32f575f51b92c3309 SHA512 4f1c5c1a72e2c35ca3add772cb1af63e8245bb5c127e4a74fb9f619f987a4ea047bf17caaa292e9b7fa7642635773b90975d013644be0383dca93d688ca8430d
-DIST libnet-1.2-rc4.tar.gz 615726 BLAKE2B 90d2a98dc52c32ff7d97edd4f85c04e56ba5c9300b39fff560f39078dbfd451474118168c291db1fa13fb0d6af123c23a604e03d0f88609a0c131c694cffd755 SHA512 01c815c9e544f00a2b35372466ff8b372b132e3d4ee7b99557f799e0b4380777bebde2ce9bdd804314dffe88ce953f332923d9fa2bf3c186ea19e045b94edbcd
+DIST libnet-1.2.tar.gz 649191 BLAKE2B bc463c7869e0327ec2f7663c2e66a27302e368f9846235f6774f36aed66263655badaf980e7e7fb08cc2f9a7f2620129c193bbdd49bbee58401f229a69c50c2a SHA512 84430f24e000eb7728b1fbb5e620716d13d193e8b9e024cf56a08fbeeeaaf56c9122caaf7647f01e6b38b73212e592fa5cc4e8ff56b1d5f5a73aea462e84edd6
 EBUILD libnet-1.0.2a-r5.ebuild 1547 BLAKE2B ddd70dac9ecada0c45dd08e391d15a388f3a370356af91190a3f4bdc6aa267febb69b32420194ffb1a3ef88c61bb613865b87d440cc03fafa3c5384b7d1b0291 SHA512 52fbf03433c1c43f93d173051fbc1125751fb1ea1fd5190679cad0b396d38c6f3383820f7ffde729d1089e25358164cd50d360025ab98551768188591b8da92b
 EBUILD libnet-1.0.2a-r6.ebuild 1300 BLAKE2B fe48dca00c2a8d75a870249167c92c53ee7361aaa642549f48808e3bec38fe7d8e8f2f4c1f623998d72455cd27de02240e7128a72ba0c6f433b29de7e61c2621 SHA512 4ef639aa0dd8832828208cc56bd7485d9f4ce4068f74045d741ca69cbd80598eabc57dee2f965055a5c8a45e21f2288b30aa3d2e31d2876cf87029be4df16614
+EBUILD libnet-1.0.2a-r7.ebuild 1360 BLAKE2B 7eb74daee74199f0cfa2c4b76681c9462bdae4b0cdb4dbcd257770b254364cfc3c937597d27c15132390bda0a7576ed1d2d71d0f4d56e5480592eaa57570a90d SHA512 5a8fb0e8282ef9750dba493ff5a06cfecb455d862bd18ac45a37332a4cf90c8c6d05fed2d553f8eff1caf2ac3b4f648fd09427f17b509fc19b8779f0cc25fbe3
 EBUILD libnet-1.2.9999.ebuild 692 BLAKE2B c0d3f44c1efcd3b3cfc7bea53da3d12273fcb747b1c3ac0a0432eefd5e5d6213bbbf4b85d1c2e5ed7d8c489b894892f967a66e829df5e81d43768ed8421327cb SHA512 5bc4dbe2242afe4e83e46964fc7dded71b8d77bd7793dd6191d76d421f926b8848b0de265d684ad33e327f3a698a7153691cc431125f53d3cb81199ab0f00c3a
+EBUILD libnet-1.2.ebuild 745 BLAKE2B 0684f4e8d8fcda516243a72100f884285f3df859adccca8f9f2a62cdfdf8ac018718ac7650d8abf615deed02fd05671b23c1d7f6e166369d8bc519a9007d8dc6 SHA512 43b8d699541e28547c6610f1bf7930ccaee517949d0661e3b4d433de231d8d9e75f8be810a334eda429da807c1186bf747983eb51df7a71ad2a31beb462c89bd
 EBUILD libnet-1.2_rc3-r1.ebuild 1177 BLAKE2B a55b2b372255c92e2ca74f5408ffe85f36df6ef50ba62cd0e4d24cf0b0f3a52f9271168b0042c12c47446afffccee2b60938b5fea19fe81c4c8926f19136a752 SHA512 c6bea7f97ea6c5a8c1330347ce258716c66248ad4036ddb6353fd73636f20d52757c5d4006865a7d779347ab8512c908d7634d7d17c99eef9dc6e0d2ce9a2af0
-EBUILD libnet-1.2_rc4.ebuild 802 BLAKE2B 7e1e42f622c4046be068259d653bc912bd7d3cc008ebe9073ed0f75acbf99339d48c154796f697a9f8007823f10258935ef1cf7fd1b2594fe60f1d5cb7a3d5b8 SHA512 aee2b9821fb0b9b72a7b5920b8296a976713b1031271afea5351df96461d19ea8ca042904568926f297f4055385acd356fbb5b80cd90d75ad95dbc6ba42918a9
 MISC metadata.xml 1223 BLAKE2B 298fe374db9d5ea958dc437c06804b63b4460912df52701942cad3794a9f6d6d64df47484b09fd67f276e960e30cc4c34d91318410a689c70565c6b6cede1671 SHA512 2049508adf4563ee25fdd204a6f2c22a08e53605df0b95d7a5a41c407b5b2d01263132b2aca71a24f8bbc57b64a91146ca2130117fd6181b6ba67079e6c9a10c
diff --git a/net-libs/libnet/files/libnet-1.0.2a-test.patch b/net-libs/libnet/files/libnet-1.0.2a-test.patch
new file mode 100644
index 000000000000..8bbb2ac45d19
--- /dev/null
+++ b/net-libs/libnet/files/libnet-1.0.2a-test.patch
@@ -0,0 +1,54 @@
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -9,31 +9,31 @@
+ all: test
+ 
+ test:
+-	if ! test -e ../lib/libnet.a; then \
+-	    cd .. &&  make; \
++	if ! test -e ../lib/libnet-1.0.a; then \
++	    cd .. &&  $(MAKE); \
+ 	fi
+-	cd Random; make all
+-	cd ICMP; make all
+-	cd UDP; make all
+-	cd TCP; make all
+-	cd Ethernet; make all
+-	cd OSPF; make all
++	cd Random; $(MAKE) all
++	cd ICMP; $(MAKE) all
++	cd UDP; $(MAKE) all
++	cd TCP; $(MAKE) all
++	cd Ethernet; $(MAKE) all
++	cd OSPF; $(MAKE) all
+ 
+ clean:
+-	cd Random; make clean
+-	cd ICMP; make clean
+-	cd UDP; make clean
+-	cd TCP; make clean
+-	cd Ethernet; make clean
+-	cd OSPF; make clean
++	cd Random; $(MAKE) clean
++	cd ICMP; $(MAKE) clean
++	cd UDP; $(MAKE) clean
++	cd TCP; $(MAKE) clean
++	cd Ethernet; $(MAKE) clean
++	cd OSPF; $(MAKE) clean
+ 
+ distclean: clean
+-	cd TCP; make distclean
+-	cd UDP; make distclean
+-	cd ICMP; make distclean
+-	cd Random; make distclean
+-	cd Ethernet; make distclean
+-	cd OSPF; make distclean
++	cd TCP; $(MAKE) distclean
++	cd UDP; $(MAKE) distclean
++	cd ICMP; $(MAKE) distclean
++	cd Random; $(MAKE) distclean
++	cd Ethernet; $(MAKE) distclean
++	cd OSPF; $(MAKE) distclean
+ 	rm -f Makefile
+ 
+ # EOF
diff --git a/net-libs/libnet/libnet-1.0.2a-r7.ebuild b/net-libs/libnet/libnet-1.0.2a-r7.ebuild
new file mode 100644
index 000000000000..5419190c2e16
--- /dev/null
+++ b/net-libs/libnet/libnet-1.0.2a-r7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+DESCRIPTION="library providing an API for commonly used low-level network functions"
+HOMEPAGE="http://www.packetfactory.net/libnet/"
+SRC_URI="http://www.packetfactory.net/libnet/dist/deprecated/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 HPND"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2a-gcc33-fix.patch
+	"${FILESDIR}"/${PN}-1.0.2a-slot.patch
+	"${FILESDIR}"/${PN}-1.0.2a-endian.patch
+	"${FILESDIR}"/${PN}-1.0.2a-_SOURCE.patch
+	"${FILESDIR}"/${PN}-1.0.2a-funroll.patch
+	"${FILESDIR}"/${PN}-1.0.2a-test.patch
+
+)
+S=${WORKDIR}/Libnet-${PV}
+
+src_prepare() {
+	default
+
+	cd "${S}"
+	mv libnet-config.in libnet-${SLOT}-config.in || die "moving libnet-config"
+
+	cd "${S}"/include
+	ln -s libnet.h libnet-${SLOT}.h
+
+	cd libnet
+	for f in *.h ; do
+		ln -s ${f} ${f/-/-${SLOT}-} || die
+	done
+
+	cd "${S}"/doc
+	ln -s libnet.3 libnet-${SLOT}.3 || die
+
+	cd "${S}"
+
+	eautoconf
+
+	tc-export AR RANLIB
+}
+
+src_test() {
+	emake -C test
+}
+
+src_install() {
+	default
+	doman "${D}"/usr/man/man3/libnet-1.0.3
+	rm -r "${D}"/usr/man
+
+	dodoc VERSION doc/{README,TODO*,CHANGELOG*}
+	newdoc README README.1st
+	docinto example ; dodoc example/libnet*
+	docinto Ancillary ; dodoc doc/Ancillary/*
+}
diff --git a/net-libs/libnet/libnet-1.2_rc4.ebuild b/net-libs/libnet/libnet-1.2.ebuild
index 8a6dcf74cdce..1fd8b0b6e396 100644
--- a/net-libs/libnet/libnet-1.2_rc4.ebuild
+++ b/net-libs/libnet/libnet-1.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="library providing an API for commonly used low-level network functions"
 HOMEPAGE="http://libnet-dev.sourceforge.net/ https://github.com/libnet/libnet"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV/_/-}/${P/_/-}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 HPND"
 SLOT="1.1"
@@ -13,9 +13,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="static-libs"
 
 DOCS=(
-	ChangeLog.md README.md doc/{MIGRATION,RAWSOCKET_NON_SEQUITUR,TODO}
+	ChangeLog.md README.md doc/MIGRATION.md
 )
-S=${WORKDIR}/${P/_/-}
 
 src_configure() {
 	econf $(use_enable static-libs static)