gentoo Easter resync : 12.04.2020

3 files changed, 67 insertions, 3 deletions

diff --git a/net-wireless/wireless-tools/Manifest b/net-wireless/wireless-tools/Manifest
index ef5807adf6cf..97155b39a18a 100644
--- a/net-wireless/wireless-tools/Manifest
+++ b/net-wireless/wireless-tools/Manifest
@@ -1,4 +1,5 @@
 AUX wireless-tools-29-asneeded.patch 478 BLAKE2B 0006e74821cc068918450ed6598ec8dbb00bba9b5b232c866f54569609001f245e004cf377be9fb355850f8d9df2ba5f7fc47b33b8aeeb45fa9e4315a69a51fc SHA512 1b1d7e0f833fd0f6587f7d175d7d8597c637782bf37b4800e5d8e3c736a0755c0073b8f9876ea75b95be3735116f051ca40dc617818d5b7f8de61a54d66dc48d
 DIST wireless_tools.30.pre9.tar.gz 348477 BLAKE2B 7ff1f14b464aac6204e86c3f1dcd0f8acc4ea89d11feaf4700e75518dc990945a18a931a9dad76f12dd796c983aaf9b766fd57e9cdcfac57f71dcc3bbe332aa7 SHA512 0561923bca075af4754d21e1be303cbd1ce3558cb6481c9c12bc7d330a353acf8ad81a822488570e859480287999c3bb2a698c993556a92f0699743e0a527ff1
-EBUILD wireless-tools-30_pre9.ebuild 1768 BLAKE2B fe847c9861b38e619b5fe2496fea5d1e52e841d479b302faf7a2c1cf39b2c2330414b8a9128e7a7aca9d53fc0de855ab62d72219457842c8d17c07caae341056 SHA512 ae7bf5bbff8a2b1cb077c6b380895be7feea8f80a84b0c93b91ce787fa5cb20bb6aabc9b6ce8cee8fe70bac9e005e626b33604a4f4bb603d8e151be52956f7e7
+EBUILD wireless-tools-30_pre9-r1.ebuild 1781 BLAKE2B b38e21dcffa05ec43507bce7277adcc6a9e7d87a7e03a35256ba3a26c4fa4f99b3b6901108bfe725c7260ccedcf97e63da1493f752733bc234b611fe70a98ef6 SHA512 91e71d7b8f1c21d92486b4c6b0bef1cdfd0de681763615b02cc643d48b397f872126fff7d974d28d552b07ee9ac13ded30dc05c8fc2397d7f985a056b783565d
+EBUILD wireless-tools-30_pre9.ebuild 1763 BLAKE2B 13d6da1bc9bbf1ca4bfe19a83a4b8b3dfe2ca8642abde1f2711814051ca91047bbf161d069acc3dbacea8cb5dada5ace287de309c1c60121809610a01fca272c SHA512 6099ac7cd5f4615e49ef894c21278df88616479ba7a5a8d7e41e289cee43c1eacd575d36ac7804968205ac9396bdbf060a67ff127722dea362bf3e23d8838987
 MISC metadata.xml 696 BLAKE2B 2c86a6b20efe956414c0715a4ee1155554bd0c7a95bd5e7707890dbecc54e174929a54d009ba18ebda191ff36d0ed88b477cba50076566ea77ed5cac704bf576 SHA512 1884e22d6147a86977b30f4e95751498ce92306fd807a7f4a1187181ffa7b76f896eca921af26fa0ecab74fedccded36a1c103135d0282ca47263b3a637f777c
diff --git a/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
new file mode 100644
index 000000000000..9013ba6595ed
--- /dev/null
+++ b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs multilib eutils
+
+# The following works with both pre-releases and releases
+MY_P=${PN/-/_}.${PV/_/.}
+S="${WORKDIR}/${MY_P/\.pre*/}"
+
+DESCRIPTION="A collection of tools to configure IEEE 802.11 wireless LAN cards"
+HOMEPAGE="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
+SRC_URI="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="multicall"
+
+DEPEND="sys-apps/sed"
+RDEPEND=""
+
+PATCHES=("${FILESDIR}"/${PN}-29-asneeded.patch)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:^\(CC\) = gcc:\1 = $(tc-getCC):" \
+		-e "s:^\(AR\) = ar:\1 = $(tc-getAR):" \
+		-e "s:^\(RANLIB\) = ranlib:\1 = $(tc-getRANLIB):" \
+		-e "s:^\(CFLAGS=-Os\):#\1:" \
+		-e "s:\(@\$(LDCONFIG).*\):#\1:" \
+		-e "s:^\(INSTALL_MAN= \$(PREFIX)\)/man:\1/usr/share/man:" \
+		-e "s:^\(INSTALL_LIB= \$(PREFIX)\)/lib:\1/$(get_libdir)/:" \
+		-e "s:^\(INSTALL_INC= \$(PREFIX)\)/include:\1/usr/include:" \
+		-e "s:^\(BUILD_STATIC = y\):#\1:" \
+		-e '/\$(CC)/s:-Wl,-s\>::' \
+		"${S}"/Makefile || die
+}
+
+src_compile() {
+	emake
+
+	use multicall && emake iwmulticall
+}
+
+src_install() {
+	emake PREFIX="${ED}" install
+
+	if use multicall; then
+		# 'make install-iwmulticall' will overwrite some of the tools
+		# with symlinks - this is intentional (brix)
+		emake PREFIX="${ED}" install-iwmulticall
+	fi
+
+	has cs ${LINGUAS-cs} || rm -rf "${ED}"/usr/share/man/cs
+	has fr ${LINGUAS-fr} || rm -rf "${ED}"/usr/share/man/fr.{ISO8859-1,UTF-8}
+
+	dodoc CHANGELOG.h HOTPLUG-UDEV.txt IFRENAME-VS-XXX.txt PCMCIA.txt README
+	has fr ${LINGUAS-fr} && dodoc README.fr
+}
diff --git a/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild b/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild
index 5d1c1e649408..0d412dd1f216 100644
--- a/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild
+++ b/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -15,7 +15,7 @@ SRC_URI="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="multicall"
 
 DEPEND="sys-apps/sed"